djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Synthio: Allow amplitude to be signed (+ other stuff)
This commit is contained in:
Scott Shawcroft 2023-11-21 13:18:35 -08:00 committed by GitHub
commit 79155af0ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 16205 additions and 2089 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ports/unix/main.c
View File

@ -54,6 +54,34 @@
#include "genhdr/mpversion.h" #include "genhdr/mpversion.h"
#include "input.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 // Command line options, with their defaults
STATIC bool compile_only = false; STATIC bool compile_only = false;
STATIC uint emit_opt = MP_EMIT_OPT_NONE; 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. // CIRCUITPY-CHANGE: test native base classes work as needed by CircuitPython libraries.
extern const mp_obj_type_t native_base_class_type; 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_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 #endif

4
shared-module/synthio/Note.c
View File

@ -214,7 +214,7 @@ STATIC uint32_t pitch_bend(uint32_t frequency_scaled, int32_t bend_value) {
#define ONE MICROPY_FLOAT_CONST(1.) #define ONE MICROPY_FLOAT_CONST(1.)
#define ALMOST_ONE (MICROPY_FLOAT_CONST(32767.) / 32768) #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 panning = synthio_block_slot_get_scaled(&self->panning, -ALMOST_ONE, ALMOST_ONE);
int left_panning_scaled, right_panning_scaled; int left_panning_scaled, right_panning_scaled;
if (panning >= 0) { 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; 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; left_panning_scaled = (left_panning_scaled * amplitude) >> 15;
right_panning_scaled = (right_panning_scaled * amplitude) >> 15; right_panning_scaled = (right_panning_scaled * amplitude) >> 15;
loudness[0] = (loudness[0] * left_panning_scaled) >> 15; loudness[0] = (loudness[0] * left_panning_scaled) >> 15;

2
shared-module/synthio/Note.h
View File

@ -55,6 +55,6 @@ typedef struct synthio_note_obj {
} synthio_note_obj_t; } synthio_note_obj_t;
void synthio_note_recalculate(synthio_note_obj_t *self, int32_t sample_rate); 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); void synthio_note_start(synthio_note_obj_t *self, int32_t sample_rate);
bool synthio_note_playing(synthio_note_obj_t *self); bool synthio_note_playing(synthio_note_obj_t *self);

6
shared-module/synthio/__init__.c
View File

@ -172,7 +172,7 @@ int16_t mix_down_sample(int32_t sample) {
return 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]; mp_obj_t note_obj = synth->span.note_obj[chan];
int32_t sample_rate = synth->sample_rate; 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; 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) { if (synth_chan == 1) {
for (size_t i = 0; i < dur; i++) { for (size_t i = 0; i < dur; i++) {
*out_buffer32++ += (*tmp_buffer32++ *loudness[0]) >> 16; *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; 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)) { if (!synth_note_into_buffer(synth, chan, tmp_buffer32, dur, loudness)) {
// for some other reason, such as being above nyquist, note // for some other reason, such as being above nyquist, note

2
tests/circuitpython/getenv.py
View File

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

2
tests/circuitpython/synth_block_scale_offset.py.exp
View File

@ -122,7 +122,7 @@
0.6026482747395835 -1.794703450520833 0.1920551757812494 -5.397351725260417 0.6026482747395835 -1.794703450520833 0.1920551757812494 -5.397351725260417
0.6239809570312501 -1.7520380859375 0.1280571289062498 -5.37601904296875 0.6239809570312501 -1.7520380859375 0.1280571289062498 -5.37601904296875
0.6453136393229166 -1.709372721354167 0.0640590820312501 -5.354686360677084 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.6879790039062498 -1.6240419921875 -0.06393701171874921 -5.31202099609375
0.7093116861979163 -1.581376627604167 -0.1279350585937489 -5.290688313802084 0.7093116861979163 -1.581376627604167 -0.1279350585937489 -5.290688313802084
0.7306443684895827 -1.538711263020835 -0.1919331054687481 -5.269355631510417 0.7306443684895827 -1.538711263020835 -0.1919331054687481 -5.269355631510417

6
tests/circuitpython/synth_note_amplitude.py
View File

@ -3,8 +3,8 @@ from synthnotehelper import *
@synth_test @synth_test
def gen(synth): 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] yield [l]
n = Note(128, amplitude=l) n = Note(8, amplitude=l)
synth.press(n) synth.press(n)
yield 1 / 4 yield 2

18176
tests/circuitpython/synth_note_amplitude.py.exp
View File

File diff suppressed because it is too large Load Diff

6
tests/circuitpython/synthesizer_note.py.exp
View File

@ -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] [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.0, amplitude=1.0, bend=0.0, waveform=None, envelope=None, filter=None, 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, waveform_loop_start=0, waveform_loop_end=16384, envelope=None, filter=None, ring_frequency=0.0, ring_bend=0.0, ring_waveform=None, ring_waveform_loop_start=0, ring_waveform_loop_end=16384),)
[-16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383, 16382, 16382, 16382, 16382, 16382, -16383, -16383, -16383, -16383, -16383] [-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.0, amplitude=1.0, bend=0.0, waveform=None, envelope=None, filter=None, 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=None, 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, waveform_loop_start=0, waveform_loop_end=16384, envelope=None, filter=None, ring_frequency=0.0, ring_bend=0.0, ring_waveform=None, ring_waveform_loop_start=0, ring_waveform_loop_end=16384), Note(frequency=830.6076004423605, panning=0.0, amplitude=1.0, bend=0.0, waveform=None, waveform_loop_start=0, waveform_loop_end=16384, envelope=None, filter=None, ring_frequency=0.0, ring_bend=0.0, ring_waveform=None, ring_waveform_loop_start=0, ring_waveform_loop_end=16384))
[-1, -1, -1, -1, -1, -1, -1, -1, 28045, -1, -1, -1, -1, -28046, -1, -1, -1, -1, 28045, -1, -1, -1, -1, -28046] [-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.0, amplitude=1.0, bend=0.0, waveform=None, envelope=None, filter=None, 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, waveform_loop_start=0, waveform_loop_end=16384, envelope=None, filter=None, ring_frequency=0.0, ring_bend=0.0, ring_waveform=None, ring_waveform_loop_start=0, ring_waveform_loop_end=16384),)
[-1, -1, -1, 28045, -1, -1, -1, -1, -1, -1, -1, -1, 28045, -1, -1, -1, -1, -28046, -1, -1, -1, -1, 28045, -1] [-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) (-5242, 5241)
(-10485, 10484) (-10485, 10484)

52
tests/circuitpython/synthlfo.py.exp
View File

@ -72,29 +72,29 @@
0.3786666666666667 0.9999389657750726 0.07999755859375251 1.423014179150163 0.0 0.8399743652343719 0.999969482421875 0.9599999999999987 0.3942279687500003 0.9199999999999985 0.9199999999999985 0.3786666666666667 0.9999389657750726 0.07999755859375251 1.423014179150163 0.0 0.8399743652343719 0.999969482421875 0.9599999999999987 0.3942279687500003 0.9199999999999985 0.9199999999999985
0.384 0.9999389657750726 0.05333170572916924 1.42187647081577 0.0 0.8933060709635384 0.999969482421875 0.973333333333332 0.3945124045138892 0.9466666666666651 0.9466666666666651 0.384 0.9999389657750726 0.05333170572916924 1.42187647081577 0.0 0.8933060709635384 0.999969482421875 0.973333333333332 0.3945124045138892 0.9466666666666651 0.9466666666666651
0.3893333333333333 0.9999389657750726 0.02666585286458595 1.421307616648573 0.0 0.9466377766927051 0.999969482421875 0.9866666666666653 0.3946546223958336 0.9733333333333317 0.9733333333333317 0.3893333333333333 0.9999389657750726 0.02666585286458595 1.421307616648573 0.0 0.9466377766927051 0.999969482421875 0.9866666666666653 0.3946546223958336 0.9733333333333317 0.9733333333333317
0.3946666666666667 0.9999389657750726 6.103329360485077e-05 1.421306314644712 0.0 0.9999694824218716 0.999969482421875 0.999969482421875 0.3946549479067329 0.999999999999998 0.999999999999998 0.3946666666666667 0.9999389657750726 6.103329360485076e-05 1.421306314644712 0.0 0.9999694824218716 0.999969482421875 0.999969482421875 0.3946549479067329 0.9999999999999984 0.9999999999999984
0.4 0.9999389657750726 6.103329360485077e-05 1.42130501264085 0.999969482421875 0.9466377766927115 0.999969482421875 0.999969482421875 0.3946552734176321 0.02666666666666506 0.02666666666666506 0.4 0.9999389657750726 6.103329360485076e-05 1.42130501264085 0.999969482421875 0.9466377766927115 0.999969482421875 0.999969482421875 0.3946552734176321 0.02666666666666506 0.02666666666666506
0.4053333333333333 0.9999389657750726 6.103329360485077e-05 1.421303710636988 0.999969482421875 0.8933060709635448 0.999969482421875 0.999969482421875 0.3946555989285314 0.05333333333333172 0.05333333333333172 0.4053333333333333 0.9999389657750726 6.103329360485076e-05 1.421303710636988 0.999969482421875 0.8933060709635448 0.999969482421875 0.999969482421875 0.3946555989285314 0.05333333333333172 0.05333333333333172
0.4106666666666666 0.9999389657750726 6.103329360485077e-05 1.421302408633126 0.999969482421875 0.8399743652343782 0.999969482421875 0.999969482421875 0.3946559244394306 0.07999999999999839 0.07999999999999839 0.4106666666666666 0.9999389657750726 6.103329360485076e-05 1.421302408633126 0.999969482421875 0.8399743652343782 0.999969482421875 0.999969482421875 0.3946559244394306 0.07999999999999839 0.07999999999999839
0.416 0.9999389657750726 6.103329360485077e-05 1.421301106629265 0.999969482421875 0.7866426595052117 0.999969482421875 0.999969482421875 0.3946562499503298 0.106666666666665 0.106666666666665 0.416 0.9999389657750726 6.103329360485076e-05 1.421301106629265 0.999969482421875 0.7866426595052117 0.999969482421875 0.999969482421875 0.3946562499503298 0.106666666666665 0.106666666666665
0.4213333333333333 0.9999389657750726 6.103329360485077e-05 1.421299804625403 0.999969482421875 0.7333109537760448 0.999969482421875 0.999969482421875 0.3946565754612291 0.1333333333333317 0.1333333333333317 0.4213333333333333 0.9999389657750726 6.103329360485076e-05 1.421299804625403 0.999969482421875 0.7333109537760448 0.999969482421875 0.999969482421875 0.3946565754612291 0.1333333333333317 0.1333333333333317
0.4266666666666667 0.9999389657750726 6.103329360485077e-05 1.421298502621541 0.999969482421875 0.6799792480468783 0.999969482421875 0.999969482421875 0.3946569009721283 0.1599999999999984 0.1599999999999984 0.4266666666666667 0.9999389657750726 6.103329360485076e-05 1.421298502621541 0.999969482421875 0.6799792480468783 0.999969482421875 0.999969482421875 0.3946569009721283 0.1599999999999984 0.1599999999999984
0.432 0.9999389657750726 6.103329360485077e-05 1.42129720061768 0.999969482421875 0.6266475423177114 0.999969482421875 0.999969482421875 0.3946572264830275 0.1866666666666651 0.1866666666666651 0.432 0.9999389657750726 6.103329360485076e-05 1.42129720061768 0.999969482421875 0.6266475423177114 0.999969482421875 0.999969482421875 0.3946572264830275 0.1866666666666651 0.1866666666666651
0.4373333333333333 0.9999389657750726 6.103329360485077e-05 1.421295898613818 0.999969482421875 0.5733158365885449 0.999969482421875 0.999969482421875 0.3946575519939268 0.2133333333333317 0.2133333333333317 0.4373333333333333 0.9999389657750726 6.103329360485076e-05 1.421295898613818 0.999969482421875 0.5733158365885449 0.999969482421875 0.999969482421875 0.3946575519939268 0.2133333333333317 0.2133333333333317
0.4426666666666667 0.9999389657750726 6.103329360485077e-05 1.421294596609956 0.999969482421875 0.5199841308593781 0.999969482421875 0.999969482421875 0.394657877504826 0.2399999999999984 0.2399999999999984 0.4426666666666667 0.9999389657750726 6.103329360485076e-05 1.421294596609956 0.999969482421875 0.5199841308593781 0.999969482421875 0.999969482421875 0.394657877504826 0.2399999999999984 0.2399999999999984
0.448 0.9999389657750726 6.103329360485077e-05 1.421293294606095 0.999969482421875 0.4666524251302116 0.999969482421875 0.999969482421875 0.3946582030157252 0.2666666666666651 0.2666666666666651 0.448 0.9999389657750726 6.103329360485076e-05 1.421293294606095 0.999969482421875 0.4666524251302116 0.999969482421875 0.999969482421875 0.3946582030157252 0.2666666666666651 0.2666666666666651
0.4533333333333333 0.9999389657750726 6.103329360485077e-05 1.421291992602233 0.999969482421875 0.4133207194010449 0.999969482421875 0.999969482421875 0.3946585285266245 0.2933333333333317 0.2933333333333317 0.4533333333333333 0.9999389657750726 6.103329360485076e-05 1.421291992602233 0.999969482421875 0.4133207194010449 0.999969482421875 0.999969482421875 0.3946585285266245 0.2933333333333317 0.2933333333333317
0.4586666666666667 0.9999389657750726 6.103329360485077e-05 1.421290690598371 0.999969482421875 0.3599890136718782 0.999969482421875 0.999969482421875 0.3946588540375237 0.3199999999999984 0.3199999999999984 0.4586666666666667 0.9999389657750726 6.103329360485076e-05 1.421290690598371 0.999969482421875 0.3599890136718782 0.999969482421875 0.999969482421875 0.3946588540375237 0.3199999999999984 0.3199999999999984
0.4640000000000001 0.9999389657750726 6.103329360485077e-05 1.421289388594509 0.999969482421875 0.3066573079427115 0.999969482421875 0.999969482421875 0.3946591795484229 0.3466666666666651 0.3466666666666651 0.4640000000000001 0.9999389657750726 6.103329360485076e-05 1.421289388594509 0.999969482421875 0.3066573079427115 0.999969482421875 0.999969482421875 0.3946591795484229 0.3466666666666651 0.3466666666666651
0.4693333333333333 0.9999389657750726 6.103329360485077e-05 1.421288086590648 0.999969482421875 0.2533256022135448 0.999969482421875 0.999969482421875 0.3946595050593222 0.3733333333333317 0.3733333333333317 0.4693333333333333 0.9999389657750726 6.103329360485076e-05 1.421288086590648 0.999969482421875 0.2533256022135448 0.999969482421875 0.999969482421875 0.3946595050593222 0.3733333333333317 0.3733333333333317
0.4746666666666667 0.9999389657750726 6.103329360485077e-05 1.421286784586786 0.999969482421875 0.1999938964843782 0.999969482421875 0.999969482421875 0.3946598305702214 0.3999999999999984 0.3999999999999984 0.4746666666666667 0.9999389657750726 6.103329360485076e-05 1.421286784586786 0.999969482421875 0.1999938964843782 0.999969482421875 0.999969482421875 0.3946598305702214 0.3999999999999984 0.3999999999999984
0.48 0.9999389657750726 6.103329360485077e-05 1.421285482582924 0.999969482421875 0.1466621907552115 0.999969482421875 0.999969482421875 0.3946601560811207 0.4266666666666651 0.4266666666666651 0.48 0.9999389657750726 6.103329360485076e-05 1.421285482582924 0.999969482421875 0.1466621907552115 0.999969482421875 0.999969482421875 0.3946601560811207 0.4266666666666651 0.4266666666666651
0.4853333333333333 0.9999389657750726 6.103329360485077e-05 1.421284180579062 0.999969482421875 0.09333048502604482 0.999969482421875 0.999969482421875 0.3946604815920199 0.4533333333333317 0.4533333333333317 0.4853333333333333 0.9999389657750726 6.103329360485076e-05 1.421284180579062 0.999969482421875 0.09333048502604482 0.999969482421875 0.999969482421875 0.3946604815920199 0.4533333333333317 0.4533333333333317
0.4906666666666666 0.9999389657750726 6.103329360485077e-05 1.421282878575201 0.999969482421875 0.03999877929687814 0.999969482421875 0.999969482421875 0.3946608071029191 0.4799999999999985 0.4799999999999985 0.4906666666666666 0.9999389657750726 6.103329360485076e-05 1.421282878575201 0.999969482421875 0.03999877929687814 0.999969482421875 0.999969482421875 0.3946608071029191 0.4799999999999985 0.4799999999999985
0.496 0.9999389657750726 6.103329360485077e-05 1.421281576571339 0.0 0.01333292643228842 0.999969482421875 0.999969482421875 0.3946611326138184 0.506666666666665 0.506666666666665 0.496 0.9999389657750726 6.103329360485076e-05 1.421281576571339 0.0 0.01333292643228842 0.999969482421875 0.999969482421875 0.3946611326138184 0.506666666666665 0.506666666666665
0.5013333333333333 0.9999389657750726 6.103329360485077e-05 1.421280274567477 0.0 0.066664632161455 0.999969482421875 0.999969482421875 0.3946614581247176 0.5333333333333316 0.5333333333333316 0.5013333333333333 0.9999389657750726 6.103329360485076e-05 1.421280274567477 0.0 0.066664632161455 0.999969482421875 0.999969482421875 0.3946614581247176 0.5333333333333316 0.5333333333333316
0.5066666666666667 0.9999389657750726 6.103329360485077e-05 1.421278972563615 0.0 0.1199963378906216 0.999969482421875 0.999969482421875 0.3946617836356168 0.5599999999999983 0.5599999999999983 0.5066666666666667 0.9999389657750726 6.103329360485076e-05 1.421278972563615 0.0 0.1199963378906216 0.999969482421875 0.999969482421875 0.3946617836356168 0.5599999999999983 0.5599999999999983
0.512 0.9999389657750726 6.103329360485077e-05 1.421277670559754 0.0 0.1733280436197881 0.999969482421875 0.999969482421875 0.3946621091465161 0.5866666666666649 0.5866666666666649 0.512 0.9999389657750726 6.103329360485076e-05 1.421277670559754 0.0 0.1733280436197881 0.999969482421875 0.999969482421875 0.3946621091465161 0.5866666666666649 0.5866666666666649
0.5173333333333333 0.9999389657750726 6.103329360485077e-05 1.421276368555892 0.0 0.2266597493489547 0.999969482421875 0.999969482421875 0.3946624346574153 0.6133333333333315 0.6133333333333315 0.5173333333333333 0.9999389657750726 6.103329360485076e-05 1.421276368555892 0.0 0.2266597493489547 0.999969482421875 0.999969482421875 0.3946624346574153 0.6133333333333315 0.6133333333333315
0.5226666666666667 0.9999389657750726 6.103329360485077e-05 1.42127506655203 0.0 0.2799914550781212 0.999969482421875 0.999969482421875 0.3946627601683145 0.6399999999999981 0.6399999999999981 0.5226666666666667 0.9999389657750726 6.103329360485076e-05 1.42127506655203 0.0 0.2799914550781212 0.999969482421875 0.999969482421875 0.3946627601683145 0.6399999999999981 0.6399999999999981
0.528 0.9999389657750726 6.103329360485077e-05 1.421273764548169 0.0 0.3333231608072878 0.999969482421875 0.999969482421875 0.3946630856792138 0.6666666666666647 0.6666666666666647 0.528 0.9999389657750726 6.103329360485076e-05 1.421273764548169 0.0 0.3333231608072878 0.999969482421875 0.999969482421875 0.3946630856792138 0.6666666666666647 0.6666666666666647

3
tests/run-tests.py
View File

@ -180,6 +180,8 @@ def run_micropython(pyb, args, test_file, is_special=False):
"basics/builtin_help.py", "basics/builtin_help.py",
"thread/thread_exc2.py", "thread/thread_exc2.py",
"esp32/partition_ota.py", "esp32/partition_ota.py",
"circuitpython/traceback_test.py", # CIRCUITPY-CHANGE
"circuitpython/traceback_test_chained.py", # CIRCUITPY-CHANGE
) )
had_crash = False had_crash = False
if pyb is None: if pyb is None:
@ -977,6 +979,7 @@ the last matching regex is used:
if args.test_dirs is None: if args.test_dirs is None:
test_dirs = ( test_dirs = (
"basics", "basics",
"circuitpython", # CIRCUITPY-CHANGE
"micropython", "micropython",
"misc", "misc",
"extmod", "extmod",

5
tools/git-checkout-latest-tag.sh
View File

@ -1,8 +1,11 @@
#!/bin/bash #!/bin/bash
set -eo pipefail
# SPDX-FileCopyrightText: 2014 MicroPython & CircuitPython contributors (https://github.com/adafruit/circuitpython/graphs/contributors) # SPDX-FileCopyrightText: 2014 MicroPython & CircuitPython contributors (https://github.com/adafruit/circuitpython/graphs/contributors)
# #
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
git fetch --tags git fetch --tags
git checkout $(git describe --tags `git rev-list --tags --max-count=1`) latest_tag="$(git describe --tags `git rev-list --tags --max-count=1`)"
git checkout $latest_tag