First pass updates.

I've skipped to latest master as it has changes that require source
level updates here that I expect to be in the 2.1 release.

- Add new sound source files
- Update conversions to use new HAL constants
- Update sound expression HAL for function name change

Largely untested at this point but it builds.

Author: microbit-matt-hillsdon

lib/micropython-microbit-v2

@@ -59,6 +59,8 @@ SRC_C += \
 	main.c \
 	mphalport.c \
 
+# Upgrading?
+# Compare to lib/micropython-microbit-v2/src/codal_port/Makefile
 SRC_C += $(addprefix $(CODAL_PORT)/, \
 	drv_display.c \
 	drv_image.c \
@@ -78,6 +80,7 @@ SRC_C += $(addprefix $(CODAL_PORT)/, \
 	microbit_pinaudio.c \
 	microbit_pinmode.c \
 	microbit_sound.c \
+	microbit_soundeffect.c \
 	microbit_soundevent.c \
 	microbit_speaker.c \
 	microbit_spi.c \
@@ -91,6 +94,7 @@ SRC_C += $(addprefix $(CODAL_PORT)/, \
 	modmusic.c \
 	modmusictunes.c \
 	modos.c \
+	modpower.c \
 	modradio.c \
 	modspeech.c \
 	modthis.c \

src/Makefile

@@ -53,8 +53,13 @@ export const MICROBIT_HAL_ACCELEROMETER_EVT_8G = 10;
 export const MICROBIT_HAL_ACCELEROMETER_EVT_SHAKE = 11;
 export const MICROBIT_HAL_ACCELEROMETER_EVT_2G = 12;
 
-export const MICROBIT_HAL_MICROPHONE_LEVEL_THRESHOLD_LOW = 1;
-export const MICROBIT_HAL_MICROPHONE_LEVEL_THRESHOLD_HIGH = 2;
+// Microphone events, passed to microbit_hal_level_detector_callback().
+export const MICROBIT_HAL_MICROPHONE_EVT_THRESHOLD_LOW = 1;
+export const MICROBIT_HAL_MICROPHONE_EVT_THRESHOLD_HIGH = 2;
+
+// Threshold kind, passed to microbit_hal_microphone_set_threshold().
+export const MICROBIT_HAL_MICROPHONE_SET_THRESHOLD_LOW = 0;
+export const MICROBIT_HAL_MICROPHONE_SET_THRESHOLD_HIGH = 1;
 
 export const MICROBIT_HAL_LOG_TIMESTAMP_NONE = 0;
 export const MICROBIT_HAL_LOG_TIMESTAMP_MILLISECONDS = 1;

src/board/constants.ts

@@ -12,8 +12,10 @@ import {
   MICROBIT_HAL_ACCELEROMETER_EVT_TILT_LEFT,
   MICROBIT_HAL_ACCELEROMETER_EVT_TILT_RIGHT,
   MICROBIT_HAL_ACCELEROMETER_EVT_TILT_UP,
-  MICROBIT_HAL_MICROPHONE_LEVEL_THRESHOLD_HIGH,
-  MICROBIT_HAL_MICROPHONE_LEVEL_THRESHOLD_LOW,
+  MICROBIT_HAL_MICROPHONE_EVT_THRESHOLD_HIGH,
+  MICROBIT_HAL_MICROPHONE_EVT_THRESHOLD_LOW,
+  MICROBIT_HAL_MICROPHONE_SET_THRESHOLD_HIGH,
+  MICROBIT_HAL_MICROPHONE_SET_THRESHOLD_LOW,
 } from "./constants";
 
 export function convertAudioBuffer(source: number, target: AudioBuffer) {
@@ -26,23 +28,14 @@ export function convertAudioBuffer(source: number, target: AudioBuffer) {
   return target;
 }
 
-export function convertSoundEventStringToNumber(value: "low" | "high"): number {
+export function convertStringToSoundThresoldNumber(
+  value: "low" | "high"
+): number {
   switch (value) {
     case "low":
-      return MICROBIT_HAL_MICROPHONE_LEVEL_THRESHOLD_LOW;
+      return MICROBIT_HAL_MICROPHONE_SET_THRESHOLD_LOW;
     case "high":
-      return MICROBIT_HAL_MICROPHONE_LEVEL_THRESHOLD_HIGH;
-    default:
-      throw new Error(`Invalid value ${value}`);
-  }
-}
-
-export function convertSoundEventNumberToString(value: number): "low" | "high" {
-  switch (value) {
-    case MICROBIT_HAL_MICROPHONE_LEVEL_THRESHOLD_LOW:
-      return "low";
-    case MICROBIT_HAL_MICROPHONE_LEVEL_THRESHOLD_HIGH:
-      return "high";
+      return MICROBIT_HAL_MICROPHONE_SET_THRESHOLD_HIGH;
     default:
       throw new Error(`Invalid value ${value}`);
   }

src/board/conversions.ts

@@ -1,4 +1,8 @@
-import { convertSoundEventStringToNumber } from "./conversions";
+import {
+  MICROBIT_HAL_MICROPHONE_EVT_THRESHOLD_HIGH,
+  MICROBIT_HAL_MICROPHONE_EVT_THRESHOLD_LOW,
+} from "./constants";
+import { convertStringToSoundEventNumber } from "./conversions";
 import { RangeSensor, State } from "./state";
 
 type SoundLevelCallback = (v: number) => void;
@@ -48,9 +52,9 @@ export class Microphone {
     const low = this.soundLevel.lowThreshold!;
     const high = this.soundLevel.highThreshold!;
     if (prev > low && curr <= low) {
-      this.soundLevelCallback!(convertSoundEventStringToNumber("low"));
+      this.soundLevelCallback!(MICROBIT_HAL_MICROPHONE_EVT_THRESHOLD_LOW);
     } else if (prev < high && curr >= high!) {
-      this.soundLevelCallback!(convertSoundEventStringToNumber("high"));
+      this.soundLevelCallback!(MICROBIT_HAL_MICROPHONE_EVT_THRESHOLD_HIGH);
     }
   }
 

src/board/microphone.ts

@@ -73,7 +73,7 @@ void mp_js_hal_audio_speech_init(uint32_t sample_rate);
 void mp_js_hal_audio_speech_write_data(const uint8_t *buf, size_t num_samples);
 void mp_js_hal_audio_period_us(int period);
 void mp_js_hal_audio_amplitude_u10(int amplitude);
-void mp_js_hal_audio_play_expression_by_name(const char *name);
+void mp_js_hal_audio_play_expression(const char *name);
 void mp_js_hal_audio_stop_expression(void);
 bool mp_js_hal_audio_is_expression_active(void);
 

src/jshal.h

@@ -207,8 +207,7 @@ mergeInto(LibraryManager.library, {
 
   mp_js_hal_microphone_set_threshold: function (kind, value) {
     board.microphone.setThreshold(
-      // `+ 1` is temporary, see https://github.com/microbit-foundation/micropython-microbit-v2/pull/109
-      conversions.convertSoundEventNumberToString(kind + 1),
+      conversions.convertStringToSoundThresoldNumber(kind),
       value
     );
   },
@@ -217,8 +216,8 @@ mergeInto(LibraryManager.library, {
     return board.microphone.soundLevel.value;
   },
 
-  mp_js_hal_audio_play_expression_by_name: function (name) {
-    return board.audio.playSoundExpression(UTF8ToString(name));
+  mp_js_hal_audio_play_expression: function (data) {
+    return board.audio.playSoundExpression(UTF8ToString(data));
   },
 
   mp_js_hal_audio_stop_expression: function () {

src/jshal.js

@@ -431,8 +431,8 @@ bool microbit_hal_audio_is_expression_active(void) {
     return mp_js_hal_audio_is_expression_active();
 }
 
-void microbit_hal_audio_play_expression_by_name(const char *name) {
-    mp_js_hal_audio_play_expression_by_name(name);
+void microbit_hal_audio_play_expression(const char *name) {
+    mp_js_hal_audio_play_expression(name);
 }
 
 void microbit_hal_audio_stop_expression(void) {