Merge pull request #8642 from jepler/synthio-note-amplitude-signed

Synthio: Allow amplitude to be signed (+ other stuff)

Author: tannewt

ports/unix/main.c

@@ -54,6 +54,34 @@
 #include "genhdr/mpversion.h"
 #include "input.h"
 
+#if defined(MICROPY_UNIX_COVERAGE) // CIRCUITPY-CHANGE
+#include "py/objstr.h"
+typedef int os_getenv_err_t;
+mp_obj_t common_hal_os_getenv(const char *key, mp_obj_t default_);
+os_getenv_err_t common_hal_os_getenv_str(const char *key, char *value, size_t value_len);
+os_getenv_err_t common_hal_os_getenv_int(const char *key, mp_int_t *value);
+
+STATIC mp_obj_t mod_os_getenv_int(mp_obj_t var_in) {
+    mp_int_t value;
+    os_getenv_err_t result = common_hal_os_getenv_int(mp_obj_str_get_str(var_in), &value);
+    if (result == 0) {
+        return mp_obj_new_int(value);
+    }
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(mod_os_getenv_int_obj, mod_os_getenv_int);
+
+STATIC mp_obj_t mod_os_getenv_str(mp_obj_t var_in) {
+    char buf[4096];
+    os_getenv_err_t result = common_hal_os_getenv_str(mp_obj_str_get_str(var_in), buf, sizeof(buf));
+    if (result == 0) {
+        return mp_obj_new_str_copy(&mp_type_str, (byte *)buf, strlen(buf));
+    }
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(mod_os_getenv_str_obj, mod_os_getenv_str);
+#endif
+
 // Command line options, with their defaults
 STATIC bool compile_only = false;
 STATIC uint emit_opt = MP_EMIT_OPT_NONE;
@@ -596,6 +624,8 @@ MP_NOINLINE int main_(int argc, char **argv) {
         // CIRCUITPY-CHANGE: test native base classes work as needed by CircuitPython libraries.
         extern const mp_obj_type_t native_base_class_type;
         mp_store_global(MP_QSTR_NativeBaseClass, MP_OBJ_FROM_PTR(&native_base_class_type));
+        mp_store_global(MP_QSTR_getenv_int, MP_OBJ_FROM_PTR(&mod_os_getenv_int_obj));
+        mp_store_global(MP_QSTR_getenv_str, MP_OBJ_FROM_PTR(&mod_os_getenv_str_obj));
     }
     #endif
 

shared-module/synthio/Note.c

@@ -214,7 +214,7 @@ STATIC uint32_t pitch_bend(uint32_t frequency_scaled, int32_t bend_value) {
 #define ONE MICROPY_FLOAT_CONST(1.)
 #define ALMOST_ONE (MICROPY_FLOAT_CONST(32767.) / 32768)
 
-uint32_t synthio_note_step(synthio_note_obj_t *self, int32_t sample_rate, int16_t dur, uint16_t loudness[2]) {
+uint32_t synthio_note_step(synthio_note_obj_t *self, int32_t sample_rate, int16_t dur, int16_t loudness[2]) {
     int panning = synthio_block_slot_get_scaled(&self->panning, -ALMOST_ONE, ALMOST_ONE);
     int left_panning_scaled, right_panning_scaled;
     if (panning >= 0) {
@@ -225,7 +225,7 @@ uint32_t synthio_note_step(synthio_note_obj_t *self, int32_t sample_rate, int16_
         left_panning_scaled = 32767 + panning;
     }
 
-    int amplitude = synthio_block_slot_get_scaled(&self->amplitude, ZERO, ALMOST_ONE);
+    int amplitude = synthio_block_slot_get_scaled(&self->amplitude, -ALMOST_ONE, ALMOST_ONE);
     left_panning_scaled = (left_panning_scaled * amplitude) >> 15;
     right_panning_scaled = (right_panning_scaled * amplitude) >> 15;
     loudness[0] = (loudness[0] * left_panning_scaled) >> 15;

shared-module/synthio/Note.h

@@ -55,6 +55,6 @@ typedef struct synthio_note_obj {
 } synthio_note_obj_t;
 
 void synthio_note_recalculate(synthio_note_obj_t *self, int32_t sample_rate);
-uint32_t synthio_note_step(synthio_note_obj_t *self, int32_t sample_rate, int16_t dur, uint16_t loudness[2]);
+uint32_t synthio_note_step(synthio_note_obj_t *self, int32_t sample_rate, int16_t dur, int16_t loudness[2]);
 void synthio_note_start(synthio_note_obj_t *self, int32_t sample_rate);
 bool synthio_note_playing(synthio_note_obj_t *self);

shared-module/synthio/__init__.c

@@ -172,7 +172,7 @@ int16_t mix_down_sample(int32_t sample) {
     return sample;
 }
 
-static bool synth_note_into_buffer(synthio_synth_t *synth, int chan, int32_t *out_buffer32, int16_t dur, uint16_t loudness[2]) {
+static bool synth_note_into_buffer(synthio_synth_t *synth, int chan, int32_t *out_buffer32, int16_t dur, int16_t loudness[2]) {
     mp_obj_t note_obj = synth->span.note_obj[chan];
 
     int32_t sample_rate = synth->sample_rate;
@@ -298,7 +298,7 @@ STATIC mp_obj_t synthio_synth_get_note_filter(mp_obj_t note_obj) {
     return mp_const_none;
 }
 
-STATIC void sum_with_loudness(int32_t *out_buffer32, int32_t *tmp_buffer32, uint16_t loudness[2], size_t dur, int synth_chan) {
+STATIC void sum_with_loudness(int32_t *out_buffer32, int32_t *tmp_buffer32, int16_t loudness[2], size_t dur, int synth_chan) {
     if (synth_chan == 1) {
         for (size_t i = 0; i < dur; i++) {
             *out_buffer32++ += (*tmp_buffer32++ *loudness[0]) >> 16;
@@ -344,7 +344,7 @@ void synthio_synth_synthesize(synthio_synth_t *synth, uint8_t **bufptr, uint32_t
             continue;
         }
 
-        uint16_t loudness[2] = {synth->envelope_state[chan].level, synth->envelope_state[chan].level};
+        int16_t loudness[2] = {synth->envelope_state[chan].level, synth->envelope_state[chan].level};
 
         if (!synth_note_into_buffer(synth, chan, tmp_buffer32, dur, loudness)) {
             // for some other reason, such as being above nyquist, note

tests/circuitpython/getenv.py

@@ -82,7 +82,7 @@ def run_test(key, content):
     run_test(f"key{i}", content_good)
 
 run_test(f"K", b"K = 7\r\n")
-print(os.getenv_int("K"))
+print(getenv_int("K"))
 
 # Test value without trailing newline
 run_test(f"noeol", b"noeol=3")

tests/circuitpython/synth_block_scale_offset.py.exp

@@ -122,7 +122,7 @@
 0.6026482747395835 -1.794703450520833 0.1920551757812494 -5.397351725260417
 0.6239809570312501 -1.7520380859375 0.1280571289062498 -5.37601904296875
 0.6453136393229166 -1.709372721354167 0.0640590820312501 -5.354686360677084
-0.6666463216145831 -1.666707356770834 6.103515625044409e-05 -5.333353678385417
+0.6666463216145831 -1.666707356770834 6.103515625044408e-05 -5.333353678385417
 0.6879790039062498 -1.6240419921875 -0.06393701171874921 -5.31202099609375
 0.7093116861979163 -1.581376627604167 -0.1279350585937489 -5.290688313802084
 0.7306443684895827 -1.538711263020835 -0.1919331054687481 -5.269355631510417

tests/circuitpython/synth_note_amplitude.py

@@ -3,8 +3,8 @@
 
 @synth_test
 def gen(synth):
-    l = LFO(bend_out, offset=0.2, scale=0.8, rate=4, once=True)
+    l = LFO(sine, offset=0.2, scale=0.8, rate=2)
     yield [l]
-    n = Note(128, amplitude=l)
+    n = Note(8, amplitude=l)
     synth.press(n)
-    yield 1 / 4
+    yield 2