Merge pull request #2291 from hierophect/stm32-neopixel

STM32: Neopixel support

ports/stm32f4/boards/feather_stm32f405_express/mpconfigboard.h

@@ -35,11 +35,13 @@
 #define AUTORESET_DELAY_MS 500
 #define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000)
 
+#define MICROPY_HW_NEOPIXEL (&pin_PC00)
+
 // On-board flash
-#define SPI_FLASH_MOSI_PIN          &pin_PB05
-#define SPI_FLASH_MISO_PIN          &pin_PB04
-#define SPI_FLASH_SCK_PIN           &pin_PB03
-#define SPI_FLASH_CS_PIN            &pin_PA15
+#define SPI_FLASH_MOSI_PIN          (&pin_PB05)
+#define SPI_FLASH_MISO_PIN          (&pin_PB04)
+#define SPI_FLASH_SCK_PIN           (&pin_PB03)
+#define SPI_FLASH_CS_PIN            (&pin_PA15)
 
 #define DEFAULT_I2C_BUS_SCL (&pin_PB06)
 #define DEFAULT_I2C_BUS_SDA (&pin_PB07)

ports/stm32f4/boards/feather_stm32f405_express/pins.c

@@ -26,6 +26,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PB10) },
     { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PB11) },
 
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PC00) },
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },

ports/stm32f4/common-hal/microcontroller/Pin.c

@@ -26,11 +26,17 @@
  */
 
 #include "shared-bindings/microcontroller/Pin.h"
+#include "shared-bindings/digitalio/DigitalInOut.h"
+#include "supervisor/shared/rgb_led_status.h"
 
 #include "py/mphal.h"
 #include "stm32f4/pins.h"
 #include "stm32f4xx_hal.h"
 
+#ifdef MICROPY_HW_NEOPIXEL
+bool neopixel_in_use;
+#endif
+
 #if MCU_PACKAGE == 144
     #define GPIO_PORT_COUNT 7
     GPIO_TypeDef * ports[GPIO_PORT_COUNT] = {GPIOA, GPIOB, GPIOC, GPIOD, GPIOE, GPIOF, GPIOG};
@@ -53,20 +59,29 @@ void reset_all_pins(void) {
     for (uint8_t i = 0; i < GPIO_PORT_COUNT; i++) {
         HAL_GPIO_DeInit(ports[i], ~never_reset_pins[i]);
     }
+
+    #ifdef MICROPY_HW_NEOPIXEL
+    neopixel_in_use = false;
+    #endif
 }
 
 // Mark pin as free and return it to a quiescent state.
 void reset_pin_number(uint8_t pin_port, uint8_t pin_number) {
     if (pin_port == 0x0F) {
         return;
     }
-
-    // Clear claimed bit.
+    // Clear claimed bit & reset
     claimed_pins[pin_port] &= ~(1<<pin_number);
-    // Reset the pin
     HAL_GPIO_DeInit(ports[pin_port], 1<<pin_number);
-}
 
+    #ifdef MICROPY_HW_NEOPIXEL
+    if (pin_port == MICROPY_HW_NEOPIXEL->port && pin_number == MICROPY_HW_NEOPIXEL->number) {
+        neopixel_in_use = false;
+        rgb_led_status_init();
+        return;
+    }
+    #endif
+}
 
 void never_reset_pin_number(uint8_t pin_port, uint8_t pin_number) {
     never_reset_pins[pin_port] |= 1<<pin_number;
@@ -83,13 +98,25 @@ void common_hal_reset_pin(const mcu_pin_obj_t* pin) {
 void claim_pin(const mcu_pin_obj_t* pin) {
     // Set bit in claimed_pins bitmask.
     claimed_pins[pin->port] |= 1<<pin->number;
+
+    #ifdef MICROPY_HW_NEOPIXEL
+    if (pin == MICROPY_HW_NEOPIXEL) {
+        neopixel_in_use = true;
+    }
+    #endif
 }
 
 bool pin_number_is_free(uint8_t pin_port, uint8_t pin_number) {
     return !(claimed_pins[pin_port] & 1<<pin_number);
 }
 
 bool common_hal_mcu_pin_is_free(const mcu_pin_obj_t *pin) {
+    #ifdef MICROPY_HW_NEOPIXEL
+    if (pin == MICROPY_HW_NEOPIXEL) {
+        return !neopixel_in_use;
+    }
+    #endif
+
     return pin_number_is_free(pin->port, pin->number);
 }
 

ports/stm32f4/common-hal/microcontroller/Pin.h

@@ -31,6 +31,14 @@
 
 #include "peripherals/stm32f4/pins.h"
 
+#ifdef MICROPY_HW_NEOPIXEL
+extern bool neopixel_in_use;
+#endif
+#ifdef MICROPY_HW_APA102_MOSI
+extern bool apa102_sck_in_use;
+extern bool apa102_mosi_in_use;
+#endif
+
 void reset_all_pins(void);
 // reset_pin_number takes the pin number instead of the pointer so that objects don't
 // need to store a full pointer.

ports/stm32f4/common-hal/neopixel_write/__init__.c

@@ -0,0 +1,96 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/mphal.h"
+#include "shared-bindings/neopixel_write/__init__.h"
+
+#include "tick.h"
+#include "common-hal/microcontroller/Pin.h"
+#include "stm32f4xx_hal.h"
+#include "stm32f4xx_ll_gpio.h"
+
+uint64_t next_start_tick_ms = 0;
+uint32_t next_start_tick_us = 1000;
+
+//sysclock divisors
+#define MAGIC_800_INT  900000  // ~1.11 us  -> 1.2  field
+#define MAGIC_800_T0H  2800000  // ~0.36 us -> 0.44 field
+#define MAGIC_800_T1H  1350000  // ~0.74 us -> 0.84 field
+
+void common_hal_neopixel_write (const digitalio_digitalinout_obj_t* digitalinout, uint8_t *pixels, 
+                                uint32_t numBytes) {
+    uint8_t *p = pixels, *end = p + numBytes, pix = *p++, mask = 0x80;
+    uint32_t start = 0;
+    uint32_t cyc = 0;
+
+    //assumes 800_000Hz frequency
+    //Theoretical values here are 800_000 -> 1.25us, 2500000->0.4us, 1250000->0.8us
+    //But they don't work, possibly due to bad optimization? Use tested magic values instead
+    uint32_t sys_freq = HAL_RCC_GetSysClockFreq();
+    uint32_t interval = sys_freq/MAGIC_800_INT;
+    uint32_t t0 = (sys_freq/MAGIC_800_T0H);
+    uint32_t t1 = (sys_freq/MAGIC_800_T1H);
+
+    // This must be called while interrupts are on in case we're waiting for a
+    // future ms tick.
+    wait_until(next_start_tick_ms, next_start_tick_us);
+
+    GPIO_TypeDef * p_port = pin_port(digitalinout->pin->port);
+    uint32_t p_mask = pin_mask(digitalinout->pin->number);
+
+    __disable_irq();
+    // Enable DWT in debug core. Useable when interrupts disabled, as opposed to Systick->VAL
+    //ITM->LAR = 0xC5ACCE55; //this should be required but isn't
+    CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk;
+    DWT->CTRL |= DWT_CTRL_CYCCNTENA_Msk;
+    DWT->CYCCNT = 0;
+
+    for(;;) {
+        start = DWT->CYCCNT;
+        LL_GPIO_SetOutputPin(p_port, p_mask);
+        cyc = (pix & mask) ? t1 : t0;
+        while(DWT->CYCCNT - start < cyc);
+        LL_GPIO_ResetOutputPin(p_port, p_mask);
+        if(!(mask >>= 1)) {
+            if(p >= end) break;
+            pix       = *p++;
+            mask = 0x80;
+        }
+        while(DWT->CYCCNT - start < interval); //wait for interval to finish
+    }
+
+    // Enable interrupts again
+    __enable_irq();
+
+    // Update the next start.
+    current_tick(&next_start_tick_ms, &next_start_tick_us);
+    if (next_start_tick_us < 100) {
+        next_start_tick_ms += 1;
+        next_start_tick_us = 100 - next_start_tick_us;
+    } else {
+        next_start_tick_us -= 100;
+    }
+}

ports/stm32f4/mpconfigport.mk

@@ -26,6 +26,7 @@ CIRCUITPY_STORAGE = 1
 CIRCUITPY_RANDOM = 1
 CIRCUITPY_USB_HID = 1
 CIRCUITPY_USB_MIDI = 1
+CIRCUITPY_NEOPIXEL_WRITE = 1
 
 #ifeq ($(MCU_SUB_VARIANT), stm32f412zx)
 #endif