Merge branch 'master' into dev/small_buffer

tomcombriat · web-flow · commit 5d6b2a61896a · 2026-01-05T12:39:10.000+01:00
diff --git a/LICENCE.LGPL b/LICENCE.LGPL
diff --git a/LICENSE.TXT b/LICENSE.TXT
@@ -2,6 +2,6 @@ Mozzi - Sound Synthesis Library for Arduino
 
 Copyright 2012-2024 Tim Barrass and the Mozzi Team
 
-Mozzi is licensed under the GNU Lesser General Public Licence (LGPL) Version 2.1 or later. A full copy of this licence is included in these sources as LICENCE.LPGL.
+Mozzi is licensed under the GNU Lesser General Public Licence (LGPL) Version 2.1 or later. A full copy of this licence is included in these sources as LICENCE.LGPL.
 
 Note that some of the provided code examples show the use of separate third-party libraries, which may come with different licences.
diff --git a/config/mozzi_config_documentation.h b/config/mozzi_config_documentation.h
@@ -119,7 +119,7 @@
  * may only be useful for relatively simple sketches. The increased frequency response can also make
  * unwanted artefacts of low resolution synthesis calculations more apparent, so it's not always a bonus.
  *
- * It is highly recommended to keep the audio rate a power of two (16384, 32678, 64536, etc.), as some internal calculations can be highly be optimised for speed, this way.
+ * It is highly recommended to keep the audio rate a power of two (16384, 32678, 65536, etc.), as some internal calculations can be highly be optimised for speed, this way.
  *
  * @note
  * For compatibility reasons, the option MOZZI_AUDIO_RATE is automatically set to the same value as this option, and you will find some uses of that in old (pre Mozzi 2.0) code examples.
diff --git a/examples/07.Envelopes/Phasemod_Envelope/Phasemod_Envelope.ino b/examples/07.Envelopes/Phasemod_Envelope/Phasemod_Envelope.ino
@@ -16,7 +16,7 @@
    Mozzi is licensed under the GNU Lesser General Public Licence (LGPL) Version 2.1 or later.
 */
 
-#define MOZZI_CONTROL_RATE 640 // quite fast, keeps modulation smooth
+#define MOZZI_CONTROL_RATE 64 // quite fast, keeps modulation smooth
 #include <Mozzi.h>
 #include <Oscil.h>
 #include <tables/cos8192_int8.h>
diff --git a/examples/09.Delays/ReverbTank_HIFI/ReverbTank_HIFI.ino b/examples/09.Delays/ReverbTank_HIFI/ReverbTank_HIFI.ino
@@ -24,7 +24,7 @@
    Mozzi is licensed under the GNU Lesser General Public Licence (LGPL) Version 2.1 or later.
 */
 
-#define MOZZI_CONTROL_RATE 640 // quite fast, keeps modulation smooth
+#define MOZZI_CONTROL_RATE 64 // quite fast, keeps modulation smooth
 #include <Mozzi.h>
 #include <ReverbTank.h>
 #include <Oscil.h>
diff --git a/examples/09.Delays/ReverbTank_STANDARD/ReverbTank_STANDARD.ino b/examples/09.Delays/ReverbTank_STANDARD/ReverbTank_STANDARD.ino
@@ -24,7 +24,7 @@
    Mozzi is licensed under the GNU Lesser General Public Licence (LGPL) Version 2.1 or later.
 */
 
-#define MOZZI_CONTROL_RATE 640 // quite fast, keeps modulation smooth
+#define MOZZI_CONTROL_RATE 64 // quite fast, keeps modulation smooth
 #include <Mozzi.h>
 #include <ReverbTank.h>
 #include <Oscil.h>
diff --git a/extras/website/examples/examples/07.Envelopes/Phasemod_Envelope/Phasemod_Envelope.ino b/extras/website/examples/examples/07.Envelopes/Phasemod_Envelope/Phasemod_Envelope.ino
@@ -16,7 +16,7 @@
    Mozzi is licensed under the GNU Lesser General Public Licence (LGPL) Version 2.1 or later.
 */
 
-#define MOZZI_CONTROL_RATE 640 // quite fast, keeps modulation smooth
+#define MOZZI_CONTROL_RATE 64 // quite fast, keeps modulation smooth
 #include <Mozzi.h>
 #include <Oscil.h>
 #include <tables/cos8192_int8.h>
diff --git a/extras/website/examples/examples/09.Delays/ReverbTank_HIFI/ReverbTank_HIFI.ino b/extras/website/examples/examples/09.Delays/ReverbTank_HIFI/ReverbTank_HIFI.ino
@@ -24,7 +24,7 @@
    Mozzi is licensed under the GNU Lesser General Public Licence (LGPL) Version 2.1 or later.
 */
 
-#define MOZZI_CONTROL_RATE 640 // quite fast, keeps modulation smooth
+#define MOZZI_CONTROL_RATE 64 // quite fast, keeps modulation smooth
 #include <Mozzi.h>
 #include <ReverbTank.h>
 #include <Oscil.h>
diff --git a/extras/website/examples/examples/09.Delays/ReverbTank_STANDARD/ReverbTank_STANDARD.ino b/extras/website/examples/examples/09.Delays/ReverbTank_STANDARD/ReverbTank_STANDARD.ino
@@ -24,7 +24,7 @@
    Mozzi is licensed under the GNU Lesser General Public Licence (LGPL) Version 2.1 or later.
 */
 
-#define MOZZI_CONTROL_RATE 640 // quite fast, keeps modulation smooth
+#define MOZZI_CONTROL_RATE 64 // quite fast, keeps modulation smooth
 #include <Mozzi.h>
 #include <ReverbTank.h>
 #include <Oscil.h>
diff --git a/extras/website/learn/configuration/index.markdown b/extras/website/learn/configuration/index.markdown
@@ -73,5 +73,5 @@ Not all options are available on all boards. If you want to set an option only f
 For an up-to-date list of configuration options available in Mozzi, you will have to look at two places in the API documentation, because not all options are
 supported on all platforms:
 
-  - [Generic Configuration options](Mozzi/doc/html/group__config.html)
-  - [Hardware specific info](Mozzi/doc/html/hardware.html)
+  - [Generic Configuration options](/Mozzi/doc/html/group__config.html)
+  - [Hardware specific info](/Mozzi/doc/html/hardware.html)
diff --git a/internal/MozziGuts_impl_ESP8266.hpp b/internal/MozziGuts_impl_ESP8266.hpp
@@ -48,7 +48,7 @@ uint16_t output_buffer_size = 0;
 
 #  if MOZZI_IS(MOZZI_AUDIO_MODE, MOZZI_OUTPUT_PDM_VIA_I2S)
 } // namespace MozziPrivate
-#    include <I2S.h>
+
 namespace MozziPrivate {
 inline bool canBufferAudioOutput() {
   return (i2s_available() >= MOZZI_PDM_RESOLUTION);
@@ -60,7 +60,7 @@ inline void audioOutput(const AudioOutput f) {
 }
 #  elif MOZZI_IS(MOZZI_AUDIO_MODE, MOZZI_OUTPUT_I2S_DAC)
 } // namespace MozziPrivate
-#    include <I2S.h>
+
 namespace MozziPrivate {
 inline bool canBufferAudioOutput() {
   return (i2s_available() >= MOZZI_PDM_RESOLUTION);

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@`
`119`	`119`	`* may only be useful for relatively simple sketches. The increased frequency response can also make`
`120`	`120`	`* unwanted artefacts of low resolution synthesis calculations more apparent, so it's not always a bonus.`
`121`	`121`	`*`
`122`		`- * It is highly recommended to keep the audio rate a power of two (16384, 32678, 64536, etc.), as some internal calculations can be highly be optimised for speed, this way.`
	`122`	`+ * It is highly recommended to keep the audio rate a power of two (16384, 32678, 65536, etc.), as some internal calculations can be highly be optimised for speed, this way.`
`123`	`123`	`*`
`124`	`124`	`* @note`
`125`	`125`	`* For compatibility reasons, the option MOZZI_AUDIO_RATE is automatically set to the same value as this option, and you will find some uses of that in old (pre Mozzi 2.0) code examples.`