Merge pull request #4399 from tyomitch/patch-2

[stm] implementation of audiopwmio
adafruit · Apr 5, 2021 · bf58afd · bf58afd
2 parents e962b24 + 4ee7812
commit bf58afd
Show file tree

Hide file tree

Showing 14 changed files with 484 additions and 6 deletions.
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
@@ -411,6 +411,10 @@ msgstr ""
 msgid "AnalogOut not supported on given pin"
 msgstr ""
 
+#: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
+msgid "Another PWMAudioOut is already active"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/pulseio/PulseOut.c
 #: ports/cxd56/common-hal/pulseio/PulseOut.c
 msgid "Another send is already active"
@@ -525,6 +529,7 @@ msgid "Buffer is too small"
 msgstr ""
 
 #: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c
+#: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
 #, c-format
 msgid "Buffer length %d too big. It must be less than %d"
 msgstr ""
@@ -974,6 +979,10 @@ msgstr ""
 msgid "Failed to allocate wifi scan memory"
 msgstr ""
 
+#: ports/stm/common-hal/audiopwmio/PWMAudioOut.c
+msgid "Failed to buffer the sample"
+msgstr ""
+
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Failed to connect: internal error"
 msgstr ""

diff --git a/ports/stm/boards/espruino_pico/mpconfigboard.mk b/ports/stm/boards/espruino_pico/mpconfigboard.mk
@@ -20,6 +20,8 @@ LD_FILE = boards/STM32F401xd_fs.ld
 # lto for this port, and if other stuff hasn't been added in the
 # meantime
 CIRCUITPY_ULAB = 0
+CIRCUITPY_AUDIOCORE = 0
+CIRCUITPY_AUDIOPWMIO = 0
 CIRCUITPY_BUSDEVICE = 0
 CIRCUITPY_BITMAPTOOLS = 0
 CIRCUITPY_FRAMEBUFFERIO = 0

diff --git a/ports/stm/boards/espruino_wifi/mpconfigboard.mk b/ports/stm/boards/espruino_wifi/mpconfigboard.mk
@@ -11,3 +11,7 @@ MCU_PACKAGE = UFQFPN48
 
 LD_COMMON = boards/common_default.ld
 LD_FILE = boards/STM32F411_fs.ld
+
+# Too big for the flash
+CIRCUITPY_AUDIOCORE = 0
+CIRCUITPY_AUDIOPWMIO = 0
diff --git a/ports/stm/boards/meowbit_v121/board.c b/ports/stm/boards/meowbit_v121/board.c
@@ -27,15 +27,15 @@
 #include "supervisor/board.h"
 #include "mpconfigboard.h"
 
+#include "shared-bindings/audiopwmio/PWMAudioOut.h"
 #include "shared-bindings/board/__init__.h"
-#include "shared-bindings/displayio/FourWire.h"
 #include "shared-module/displayio/__init__.h"
 #include "shared-module/displayio/mipi_constants.h"
 #include "shared-bindings/busio/SPI.h"
 
 #include "supervisor/spi_flash_api.h"
 
-displayio_fourwire_obj_t board_display_obj;
+audiopwmio_pwmaudioout_obj_t board_buzz_obj;
 
 #define DELAY 0x80
 
@@ -113,6 +113,11 @@ void board_init(void) {
         60, // native_frames_per_second
         true, // backlight_on_high
         false); // SH1107_addressing
+
+    board_buzz_obj.base.type = &audiopwmio_pwmaudioout_type;
+    common_hal_audiopwmio_pwmaudioout_construct(&board_buzz_obj,
+        &pin_PB08, NULL, 0x8000);
+    never_reset_pin_number(pin_PB08.port, pin_PB08.number);
 }
 
 bool board_requests_safe_mode(void) {

diff --git a/ports/stm/boards/meowbit_v121/pins.c b/ports/stm/boards/meowbit_v121/pins.c
@@ -1,8 +1,11 @@
 #include "shared-bindings/board/__init__.h"
 #include "supervisor/spi_flash_api.h"
 
+#include "shared-bindings/audiopwmio/PWMAudioOut.h"
 #include "shared-module/displayio/__init__.h"
 
+extern audiopwmio_pwmaudioout_obj_t board_buzz_obj;
+
 STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_LED_RED), MP_ROM_PTR(&pin_PB04) },
     { MP_ROM_QSTR(MP_QSTR_LED_GREEN), MP_ROM_PTR(&pin_PB05) },
@@ -15,7 +18,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_DISP_RST), MP_ROM_PTR(&pin_PB10) },
     { MP_ROM_QSTR(MP_QSTR_DISP_BL), MP_ROM_PTR(&pin_PB03) },
 
-    { MP_ROM_QSTR(MP_QSTR_BUZZ), MP_ROM_PTR(&pin_PB08) },
+    { MP_ROM_QSTR(MP_QSTR_BUZZ), MP_ROM_PTR(&board_buzz_obj) },
     { MP_ROM_QSTR(MP_QSTR_BTNA), MP_ROM_PTR(&pin_PB09) },
     { MP_ROM_QSTR(MP_QSTR_BTNB), MP_ROM_PTR(&pin_PC03) },
     { MP_ROM_QSTR(MP_QSTR_RIGHT), MP_ROM_PTR(&pin_PB02) },

diff --git a/ports/stm/boards/pyb_nano_v2/mpconfigboard.mk b/ports/stm/boards/pyb_nano_v2/mpconfigboard.mk
@@ -12,3 +12,7 @@ MCU_PACKAGE = UFQFPN48
 
 LD_COMMON = boards/common_default.ld
 LD_FILE = boards/STM32F411_fs.ld
+
+# Too big for the flash
+CIRCUITPY_AUDIOCORE = 0
+CIRCUITPY_AUDIOPWMIO = 0
diff --git a/ports/stm/boards/stm32f411ce_blackpill/mpconfigboard.mk b/ports/stm/boards/stm32f411ce_blackpill/mpconfigboard.mk
@@ -15,3 +15,7 @@ MCU_PACKAGE = UFQFPN48
 
 LD_COMMON = boards/common_default.ld
 LD_FILE = boards/STM32F411_fs.ld
+
+# Too big for the flash
+CIRCUITPY_AUDIOCORE = 0
+CIRCUITPY_AUDIOPWMIO = 0
diff --git a/ports/stm/boards/stm32f411ve_discovery/mpconfigboard.mk b/ports/stm/boards/stm32f411ve_discovery/mpconfigboard.mk
@@ -11,3 +11,7 @@ MCU_PACKAGE = LQFP100_f4
 
 LD_COMMON = boards/common_default.ld
 LD_FILE = boards/STM32F411_fs.ld
+
+# Too big for the flash
+CIRCUITPY_AUDIOCORE = 0
+CIRCUITPY_AUDIOPWMIO = 0