In progress work to save space on the Gemma.

Author: tannewt

atmel-samd/boards/gemma_m0/mpconfigboard.h

@@ -5,6 +5,7 @@
 
 #define MICROPY_HW_APA102_MOSI   &pin_PA04
 #define MICROPY_HW_APA102_SCK    &pin_PA05
+#define MICROPY_HW_APA102_SERCOM SERCOM0
 
 #define MICROPY_PORT_A        (PORT_PA04 | PORT_PA05 | PORT_PA24 | PORT_PA25)
 #define MICROPY_PORT_B        (0)

atmel-samd/main.c

@@ -480,12 +480,12 @@ void samd21_init(void) {
     tick_init();
 
     // Uncomment to init PIN_PA17 for debugging.
-    // struct port_config pin_conf;
-    // port_get_config_defaults(&pin_conf);
-    //
-    // pin_conf.direction  = PORT_PIN_DIR_OUTPUT;
-    // port_pin_set_config(MICROPY_HW_LED1, &pin_conf);
-    // port_pin_set_output_level(MICROPY_HW_LED1, false);
+    struct port_config pin_conf;
+    port_get_config_defaults(&pin_conf);
+
+    pin_conf.direction  = PORT_PIN_DIR_OUTPUT;
+    port_pin_set_config(PIN_PA17, &pin_conf);
+    port_pin_set_output_level(PIN_PA17, false);
 
     rgb_led_status_init();
 

atmel-samd/mpconfigport.h

@@ -122,7 +122,6 @@ typedef long mp_off_t;
 
 // extra built in modules to add to the list of known ones
 extern const struct _mp_obj_module_t microcontroller_module;
-extern const struct _mp_obj_module_t bitbangio_module;
 extern const struct _mp_obj_module_t nativeio_module;
 extern const struct _mp_obj_module_t board_module;
 extern const struct _mp_obj_module_t uos_module;
@@ -133,6 +132,7 @@ extern const struct _mp_obj_module_t samd_module;
 
 // Internal flash size dependent settings.
 #if BOARD_FLASH_SIZE > 192000
+    extern const struct _mp_obj_module_t bitbangio_module;
     #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
     #define EXTRA_BUILTIN_MODULES \
         { MP_OBJ_NEW_QSTR(MP_QSTR_bitbangio), (mp_obj_t)&bitbangio_module }

atmel-samd/rgb_led_status.c

@@ -3,10 +3,10 @@
 
 #include "mphalport.h"
 
-#include "shared-bindings/bitbangio/SPI.h"
+#include "shared-bindings/nativeio/SPI.h"
 #include "shared-bindings/nativeio/DigitalInOut.h"
 #include "shared-bindings/neopixel_write/__init__.h"
-#include "shared-module/bitbangio/types.h"
+#include "common-hal/nativeio/types.h"
 #include "rgb_led_status.h"
 #include "samd21_pins.h"
 
@@ -16,8 +16,8 @@ static nativeio_digitalinout_obj_t status_neopixel;
 #endif
 
 #if defined(MICROPY_HW_APA102_MOSI) && defined(MICROPY_HW_APA102_SCK)
-static uint8_t status_apa102_color[12] = {0, 0, 0, 0, 0xff, 0, 0, 0};
-static bitbangio_spi_obj_t status_apa102;
+static uint8_t status_apa102_color[12] = {0, 0, 0, 0, 0xff, 0, 0, 0, 0, 0, 0, 0};
+static nativeio_spi_obj_t status_apa102;
 #endif
 
 #if defined(MICROPY_HW_NEOPIXEL) || (defined(MICROPY_HW_APA102_MOSI) && defined(MICROPY_HW_APA102_SCK))
@@ -30,12 +30,14 @@ void rgb_led_status_init() {
         common_hal_nativeio_digitalinout_switch_to_output(&status_neopixel, false, DRIVE_MODE_PUSH_PULL);
     #endif
     #if defined(MICROPY_HW_APA102_MOSI) && defined(MICROPY_HW_APA102_SCK)
-        shared_module_bitbangio_spi_construct(&status_apa102,
-                                              MICROPY_HW_APA102_SCK,
-                                              MICROPY_HW_APA102_MOSI,
-                                              NULL);
-        shared_module_bitbangio_spi_try_lock(&status_apa102);
-        shared_module_bitbangio_spi_configure(&status_apa102, 100000, 0, 1, 8);
+
+    port_pin_set_output_level(PIN_PA17, true);
+        common_hal_nativeio_spi_construct(&status_apa102,
+                                          MICROPY_HW_APA102_SCK,
+                                          MICROPY_HW_APA102_MOSI,
+                                          NULL);
+        //common_hal_nativeio_spi_try_lock(&status_apa102);
+        //common_hal_nativeio_spi_configure(&status_apa102, 100000, 0, 1, 8);
     #endif
 }
 
@@ -57,7 +59,7 @@ void new_status_color(uint32_t rgb) {
         status_apa102_color[5] = rgb & 0xff;
         status_apa102_color[6] = (rgb >> 8) & 0xff;
         status_apa102_color[7] = (rgb >> 16) & 0xff;
-        shared_module_bitbangio_spi_write(&status_apa102, status_apa102_color, 8);
+        //common_hal_nativeio_spi_write(&status_apa102, status_apa102_color, 8);
     #endif
 }
 
@@ -67,8 +69,8 @@ void temp_status_color(uint32_t rgb) {
         common_hal_neopixel_write(&status_neopixel, colors, 3, true);
     #endif
     #if defined(MICROPY_HW_APA102_MOSI) && defined(MICROPY_HW_APA102_SCK)
-        uint8_t colors[12] = {0, 0, 0, 0, 0xff, rgb & 0xff, (rgb >> 8) & 0xff, (rgb >> 16) & 0xff, 0x0, 0x0, 0x0, 0x0};
-        shared_module_bitbangio_spi_write(&status_apa102, colors, 8);
+        //uint8_t colors[12] = {0, 0, 0, 0, 0xff, rgb & 0xff, (rgb >> 8) & 0xff, (rgb >> 16) & 0xff, 0x0, 0x0, 0x0, 0x0};
+        //common_hal_nativeio_spi_write(&status_apa102, colors, 8);
     #endif
 }
 
@@ -77,7 +79,7 @@ void clear_temp_status() {
         common_hal_neopixel_write(&status_neopixel, status_neopixel_color, 3, true);
     #endif
     #if defined(MICROPY_HW_APA102_MOSI) && defined(MICROPY_HW_APA102_SCK)
-        shared_module_bitbangio_spi_write(&status_apa102, status_apa102_color, 12);
+        //common_hal_nativeio_spi_write(&status_apa102, status_apa102_color, 12);
     #endif
 }