codal_app: Add microbit_hal_audio_select_pin/speaker functions.

Author: dpgeorge

src/codal_app/main.h

@@ -29,6 +29,7 @@
 #include "MicroBit.h"
 
 extern MicroBit uBit;
+extern NRF52Pin *const pin_obj[];
 
 void serial_interrupt_handler(Event evt);
 

src/codal_app/microbithal.cpp

@@ -28,11 +28,7 @@
 #include "MicroBitDevice.h"
 #include "neopixel.h"
 
-extern "C" {
-
-#include "microbithal.h"
-
-static NRF52Pin *const pin_obj[] = {
+NRF52Pin *const pin_obj[] = {
     &uBit.io.P0,
     &uBit.io.P1,
     &uBit.io.P2,
@@ -66,7 +62,6 @@ static NRF52Pin *const pin_obj[] = {
     &uBit.io.usbTx,
     &uBit.io.usbRx,
     &uBit.io.irq1,
-    &uBit.io.speaker, // MICROBIT_HAL_PIN_AUDIO
 };
 
 static Button *const button_obj[] = {
@@ -83,6 +78,10 @@ static const PullMode pin_pull_mode_mapping[] = {
 static uint8_t pin_pull_state[32 + 6];
 static uint16_t button_state[2];
 
+extern "C" {
+
+#include "microbithal.h"
+
 void microbit_hal_background_processing(void) {
     // This call takes about 200us.
     Event(DEVICE_ID_SCHEDULER, DEVICE_SCHEDULER_EVT_IDLE);
@@ -115,7 +114,7 @@ int microbit_hal_pin_get_pull(int pin) {
 }
 
 int microbit_hal_pin_set_analog_period_us(int pin, int period) {
-    if (pin == MICROBIT_HAL_PIN_AUDIO) {
+    if (pin == MICROBIT_HAL_PIN_MIXER) {
         uBit.audio.virtualOutputPin.setAnalogPeriodUs(period);
         return 0;
     }
@@ -148,7 +147,7 @@ int microbit_hal_pin_read_analog_u10(int pin) {
 }
 
 void microbit_hal_pin_write_analog_u10(int pin, int value) {
-    if (pin == MICROBIT_HAL_PIN_AUDIO) {
+    if (pin == MICROBIT_HAL_PIN_MIXER) {
         uBit.audio.virtualOutputPin.setAnalogValue(value);
         return;
     }

src/codal_app/microbithal.h

@@ -30,6 +30,10 @@
 extern "C" {
 #endif
 
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
 // These numbers refer to indices in the (private) pin_obj table.
 #define MICROBIT_HAL_PIN_P0     (0)
 #define MICROBIT_HAL_PIN_P1     (1)
@@ -54,7 +58,7 @@ extern "C" {
 #define MICROBIT_HAL_PIN_SPEAKER (20)
 #define MICROBIT_HAL_PIN_USB_TX (30)
 #define MICROBIT_HAL_PIN_USB_RX (31)
-#define MICROBIT_HAL_PIN_AUDIO  (33)
+#define MICROBIT_HAL_PIN_MIXER  (33)
 
 // These match the micro:bit v1 constants.
 #define MICROBIT_HAL_PIN_PULL_UP (0)
@@ -128,6 +132,8 @@ int microbit_hal_microphone_get_level(void);
 
 const uint8_t *microbit_hal_get_font_data(char c);
 
+void microbit_hal_audio_select_pin(int pin);
+void microbit_hal_audio_select_speaker(bool enable);
 void microbit_hal_audio_set_volume(int value);
 void microbit_hal_audio_play_expression_by_name(const char *name);
 

src/codal_app/microbithal_audio.cpp

@@ -59,6 +59,19 @@ extern "C" {
 
 #include "microbithal.h"
 
+void microbit_hal_audio_select_pin(int pin) {
+    if (pin < 0) {
+        uBit.audio.setPinEnabled(false);
+    } else {
+        uBit.audio.setPinEnabled(true);
+        uBit.audio.setPin(*pin_obj[pin]);
+    }
+}
+
+void microbit_hal_audio_select_speaker(bool enable) {
+    uBit.audio.setSpeakerEnabled(enable);
+}
+
 // Input value has range 0-255 inclusive.
 void microbit_hal_audio_set_volume(int value) {
     if (value >= 255) {