synthio: simplify block logic a bit by converting from float just once

jepler · jepler · commit c435c469f45e · 2023-05-18T11:55:01.000-05:00
diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c
@@ -553,9 +553,9 @@ mp_float_t synthio_block_slot_get(synthio_block_slot_t *slot) {
         return MICROPY_FLOAT_CONST(0.);
     }
 
-    mp_float_t value;
-    if (mp_obj_get_float_maybe(slot->obj, &value)) {
-        return value;
+    // all numbers previously converted to float in synthio_block_assign_slot
+    if (mp_obj_is_float(slot->obj)) {
+        return mp_obj_get_float(slot->obj);
     }
 
     synthio_block_base_t *block = MP_OBJ_TO_PTR(slot->obj);
@@ -564,9 +564,10 @@ mp_float_t synthio_block_slot_get(synthio_block_slot_t *slot) {
     }
 
     block->last_tick = synthio_global_tick;
-    // previously verified by call to mp_proto_get
+    // previously verified by call to mp_proto_get in synthio_block_assign_slot
     const synthio_block_proto_t *p = mp_type_get_protocol_slot(mp_obj_get_type(slot->obj));
-    block->value = value = p->tick(slot->obj);
+    mp_float_t value = p->tick(slot->obj);
+    block->value = value;
     return value;
 }
 
@@ -597,5 +598,8 @@ void synthio_block_assign_slot(mp_obj_t obj, synthio_block_slot_t *slot, qstr ar
         mp_raise_TypeError_varg(translate("%q must be of type %q, not %q"), arg_name, MP_QSTR_BlockInput, mp_obj_get_type_qstr(obj));
     }
 
-    slot->obj = obj;
+    slot->obj = mp_obj_new_float(value);
+}
+bool synthio_obj_is_block(mp_obj_t obj) {
+    return mp_proto_get(MP_QSTR_synthio_block, obj);
 }
diff --git a/shared-module/synthio/block.h b/shared-module/synthio/block.h
@@ -56,3 +56,4 @@ int32_t synthio_block_slot_get_scaled(synthio_block_slot_t *block_slot, mp_float
 
 // Assign an object (which may be a float or a synthio_block_obj_t) to an block slot
 void synthio_block_assign_slot(mp_obj_t obj, synthio_block_slot_t *block_slot, qstr arg_name);
+bool synthio_obj_is_block(mp_obj_t obj);
diff --git a/tests/circuitpython/synthesizer_note.py.exp b/tests/circuitpython/synthesizer_note.py.exp
@@ -1,10 +1,10 @@
 ()
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
-(Note(frequency=830.6076004423605, panning=0, amplitude=1, bend=0, waveform=None, envelope=None, filter=True, ring_frequency=0.0, ring_bend=0, ring_waveform=None),)
+(Note(frequency=830.6076004423605, panning=0.0, amplitude=1.0, bend=0.0, waveform=None, envelope=None, filter=True, ring_frequency=0.0, ring_bend=0.0, ring_waveform=None),)
 [-16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383]
-(Note(frequency=830.6076004423605, panning=0, amplitude=1, bend=0, waveform=None, envelope=None, filter=True, ring_frequency=0.0, ring_bend=0, ring_waveform=None), Note(frequency=830.6076004423605, panning=0, amplitude=1, bend=0, waveform=None, envelope=None, filter=True, ring_frequency=0.0, ring_bend=0, ring_waveform=None))
+(Note(frequency=830.6076004423605, panning=0.0, amplitude=1.0, bend=0.0, waveform=None, envelope=None, filter=True, ring_frequency=0.0, ring_bend=0.0, ring_waveform=None), Note(frequency=830.6076004423605, panning=0.0, amplitude=1.0, bend=0.0, waveform=None, envelope=None, filter=True, ring_frequency=0.0, ring_bend=0.0, ring_waveform=None))
 [-1, -1, -1, -1, -1, -1, -1, -1, 28045, -1, -1, -1, -1, -28046, -1, -1, -1, -1, 28045, -1, -1, -1, -1, -28046]
-(Note(frequency=830.6076004423605, panning=0, amplitude=1, bend=0, waveform=None, envelope=None, filter=True, ring_frequency=0.0, ring_bend=0, ring_waveform=None),)
+(Note(frequency=830.6076004423605, panning=0.0, amplitude=1.0, bend=0.0, waveform=None, envelope=None, filter=True, ring_frequency=0.0, ring_bend=0.0, ring_waveform=None),)
 [-1, -1, -1, 28045, -1, -1, -1, -1, -1, -1, -1, -1, 28045, -1, -1, -1, -1, -28046, -1, -1, -1, -1, 28045, -1]
 (-5242, 5241)
 (-10484, 10484)
diff --git a/tests/circuitpython/synthmath.py.exp b/tests/circuitpython/synthmath.py.exp

Original file line number	Diff line number	Diff line change
`@@ -553,9 +553,9 @@ mp_float_t synthio_block_slot_get(synthio_block_slot_t *slot) {`
`553`	`553`	`return MICROPY_FLOAT_CONST(0.);`
`554`	`554`	`}`
`555`	`555`
`556`		`- mp_float_t value;`
`557`		`- if (mp_obj_get_float_maybe(slot->obj, &value)) {`
`558`		`- return value;`
	`556`	`+ // all numbers previously converted to float in synthio_block_assign_slot`
	`557`	`+ if (mp_obj_is_float(slot->obj)) {`
	`558`	`+ return mp_obj_get_float(slot->obj);`
`559`	`559`	`}`
`560`	`560`
`561`	`561`	`synthio_block_base_t *block = MP_OBJ_TO_PTR(slot->obj);`
`@@ -564,9 +564,10 @@ mp_float_t synthio_block_slot_get(synthio_block_slot_t *slot) {`
`564`	`564`	`}`
`565`	`565`
`566`	`566`	`block->last_tick = synthio_global_tick;`
`567`		`- // previously verified by call to mp_proto_get`
	`567`	`+ // previously verified by call to mp_proto_get in synthio_block_assign_slot`
`568`	`568`	`const synthio_block_proto_t *p = mp_type_get_protocol_slot(mp_obj_get_type(slot->obj));`
`569`		`- block->value = value = p->tick(slot->obj);`
	`569`	`+ mp_float_t value = p->tick(slot->obj);`
	`570`	`+ block->value = value;`
`570`	`571`	`return value;`
`571`	`572`	`}`
`572`	`573`
`@@ -597,5 +598,8 @@ void synthio_block_assign_slot(mp_obj_t obj, synthio_block_slot_t *slot, qstr ar`
`597`	`598`	`mp_raise_TypeError_varg(translate("%q must be of type %q, not %q"), arg_name, MP_QSTR_BlockInput, mp_obj_get_type_qstr(obj));`
`598`	`599`	`}`
`599`	`600`
`600`		`- slot->obj = obj;`
	`601`	`+ slot->obj = mp_obj_new_float(value);`
	`602`	`+}`
	`603`	`+bool synthio_obj_is_block(mp_obj_t obj) {`
	`604`	`+ return mp_proto_get(MP_QSTR_synthio_block, obj);`
`601`	`605`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,3 +56,4 @@ int32_t synthio_block_slot_get_scaled(synthio_block_slot_t *block_slot, mp_float`
`56`	`56`
`57`	`57`	`// Assign an object (which may be a float or a synthio_block_obj_t) to an block slot`
`58`	`58`	`void synthio_block_assign_slot(mp_obj_t obj, synthio_block_slot_t *block_slot, qstr arg_name);`
	`59`	`+bool synthio_obj_is_block(mp_obj_t obj);`