Merge branch 'beta-updates' of https://github.com/microbit-foundation…

…/micropython-microbit-v2-simulator into beta-updates
microbit-foundation · Mar 27, 2024 · 41e7ce3 · 41e7ce3
2 parents c971228 + 88e2baf
commit 41e7ce3
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 10 deletions.
diff --git a/lib/micropython-microbit-v2 b/lib/micropython-microbit-v2
diff --git a/src/jshal.h b/src/jshal.h
@@ -56,7 +56,6 @@ int mp_js_hal_pin_set_analog_period_us(int pin, int period);
 
 int mp_js_hal_display_get_pixel(int x, int y);
 void mp_js_hal_display_set_pixel(int x, int y, int value);
-void mp_js_hal_display_clear(void);
 int mp_js_hal_display_read_light_level(void);
 
 int mp_js_hal_accelerometer_get_x(void);

diff --git a/src/jshal.js b/src/jshal.js
@@ -163,10 +163,6 @@ mergeInto(LibraryManager.library, {
     Module.board.display.setPixel(x, y, value);
   },
 
-  mp_js_hal_display_clear: function () {
-    Module.board.display.clear();
-  },
-
   mp_js_hal_display_read_light_level: function () {
     return Module.board.display.lightLevel.value;
   },

diff --git a/src/microbithal_js.c b/src/microbithal_js.c
@@ -318,10 +318,6 @@ void microbit_hal_display_enable(int value) {
     */
 }
 
-void microbit_hal_display_clear(void) {
-    mp_js_hal_display_clear();
-}
-
 int microbit_hal_display_get_pixel(int x, int y) {
     return mp_js_hal_display_get_pixel(x, y);
 }

diff --git a/src/mpconfigport.h b/src/mpconfigport.h
@@ -87,6 +87,8 @@
 #define MICROPY_PY_TIME                         (1)
 #define MICROPY_PY_MACHINE_PULSE                (1)
 
+#define MICROPY_PY_SPEECH_DEFAULT_MODE          (3)
+
 #define MICROPY_HW_ENABLE_RNG                   (1)
 
 // The simulator provides its own version of the relevant mbfs methods.
+19 −14		.github/workflows/build.yml
+1 −1		lib/codal
+0 −2		src/codal_app/microbithal_microphone.cpp
+30 −23		src/codal_port/microbit_microphone.c
+3 −14		src/codal_port/modaudio.c
+2 −2		src/codal_port/modaudio.h
+13 −1		src/codal_port/modspeech.c
+0 −17		src/codal_port/mpconfigport.h
+17 −0		src/codal_port/mphalport.h