- Move SysTick init from board_init to port_init. - Fix RTC issue with interrupt_after_ticks. - Move LED inidcator to STATUS_LED code.

Author: Brandon-Hurst

ports/analog/Makefile

@@ -259,7 +259,7 @@ SRC_QSTR_PREPROCESSOR +=
 # Default build target
 all: $(BUILD)/firmware.elf $(BUILD)/firmware.hex $(BUILD)/firmware.bin
 
-clean-max32:
+clean-all:
 	rm -rf build-*
 
 # Optional flash option when running within an installed MSDK to use OpenOCD

ports/analog/boards/apard32690/README.md

@@ -18,7 +18,7 @@ For more info about AD-APARD32690-SL, visit our product webpages for datasheets,
 To build for this board, ensure you are in the `ports/analog` directory and run the following command. Note that passing in the `-jN` flag, where N is the # of cores on your machine, can speed up compile times.
 
 ```
-make BOARD=APARD
+make BOARD=apard32690
 ```
 
 #### Flashing this board

ports/analog/boards/apard32690/board.c

@@ -47,24 +47,6 @@ uint32_t board_millis(void) {
 
 // Initializes board related state once on start up.
 void board_init(void) {
-    // 1ms tick timer
-    SysTick_Config(SystemCoreClock / 1000); \
-
-    // Enable GPIO (enables clocks + common init for ports)
-    for (int i = 0; i < MXC_CFG_GPIO_INSTANCES; i++) {
-        MXC_GPIO_Init(0x1 << i);
-    }
-
-    // Init Board LEDs
-    /* setup GPIO for the LED */
-    for (int i = 0; i < num_leds; i++) {
-        // Set the output value
-        MXC_GPIO_OutClr(led_pin[i].port, led_pin[i].mask);
-        MXC_GPIO_Config(&led_pin[i]);
-    }
-
-    // Turn on one LED to indicate Sign of Life
-    MXC_GPIO_OutSet(led_pin[2].port, led_pin[2].mask);
 }
 
 // Reset the state of off MCU components such as neopixels.

ports/analog/boards/apard32690/mpconfigboard.h

@@ -36,3 +36,5 @@
 // #else
 // #define CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_SIZE (0)
 // #endif
+
+ #define MICROPY_HW_LED_STATUS   (&pin_P2_01)

ports/analog/boards/max32690evkit/board.c

@@ -46,24 +46,6 @@ uint32_t board_millis(void) {
 
 // Initializes board related state once on start up.
 void board_init(void) {
-    // 1ms tick timer
-    SysTick_Config(SystemCoreClock / 1000); \
-
-    // Enable GPIO (enables clocks + common init for ports)
-    for (int i = 0; i < MXC_CFG_GPIO_INSTANCES; i++) {
-        MXC_GPIO_Init(0x1 << i);
-    }
-
-    // Init Board LEDs
-    /* setup GPIO for the LED */
-    for (int i = 0; i < num_leds; i++) {
-        // Set the output value
-        MXC_GPIO_OutClr(led_pin[i].port, led_pin[i].mask);
-        MXC_GPIO_Config(&led_pin[i]);
-    }
-
-    // Turn on one LED to indicate Sign of Life
-    MXC_GPIO_OutSet(led_pin[2].port, led_pin[2].mask);
 }
 
 // Reset the state of off MCU components such as neopixels.

ports/analog/boards/max32690evkit/mpconfigboard.h

@@ -36,3 +36,6 @@
 // #else
 // #define CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_SIZE (0)
 // #endif
+
+#define MICROPY_HW_LED_STATUS           (&pin_P2_12)
+#define MICROPY_HW_LED_STATUS_INVERTED  1

ports/analog/supervisor/port.c

@@ -68,6 +68,9 @@ extern void NVIC_SystemReset(void) NORETURN;
 safe_mode_t port_init(void) {
     int err = E_NO_ERROR;
 
+    // 1ms tick timer
+    SysTick_Config(SystemCoreClock / 1000);
+
     // Enable GPIO (enables clocks + common init for ports)
     for (int i = 0; i < MXC_CFG_GPIO_INSTANCES; i++) {
         err = MXC_GPIO_Init(0x1 << i);
@@ -122,12 +125,18 @@ void RTC_IRQHandler(void) {
     // Read flags to clear
     int flags = MXC_RTC_GetFlags();
 
-    if (flags & MXC_F_RTC_CTRL_SSEC_ALARM) {
-        MXC_RTC_ClearFlags(MXC_F_RTC_CTRL_SSEC_ALARM);
-    }
-
-    if (flags & MXC_F_RTC_CTRL_TOD_ALARM) {
-        MXC_RTC_ClearFlags(MXC_F_RTC_CTRL_TOD_ALARM);
+    switch (flags) {
+        case MXC_F_RTC_CTRL_SSEC_ALARM:
+            MXC_RTC_ClearFlags(MXC_F_RTC_CTRL_SSEC_ALARM);
+            break;
+        case MXC_F_RTC_CTRL_TOD_ALARM:
+            MXC_RTC_ClearFlags(MXC_F_RTC_CTRL_TOD_ALARM);
+            break;
+        case MXC_F_RTC_CTRL_RDY:
+            MXC_RTC_ClearFlags(MXC_F_RTC_CTRL_RDY);
+            break;
+        default:
+            break;
     }
 
     tick_flag = 1;
@@ -145,7 +154,7 @@ void reset_port(void) {
 }
 
 // Reset to the bootloader
-// note: not implemented since max32 requires external stim ignals to
+// note: not implemented since max32 requires external signals to
 //       activate bootloaders
 void reset_to_bootloader(void) {
     NVIC_SystemReset();
@@ -193,7 +202,6 @@ uint32_t port_get_saved_word(void) {
 uint64_t port_get_raw_ticks(uint8_t *subticks) {
     // Ensure we can read from ssec register as soon as we can
     // MXC function does cross-tick / busy checking of RTC controller
-    __disable_irq();
     if (MXC_RTC->ctrl & MXC_F_RTC_CTRL_EN) {
         // NOTE: RTC_GetTime always returns BUSY if RTC is not running
         while ((MXC_RTC_GetTime(&sec, &subsec)) != E_NO_ERROR) {
@@ -203,7 +211,6 @@ uint64_t port_get_raw_ticks(uint8_t *subticks) {
         sec = MXC_RTC->sec;
         subsec = MXC_RTC->ssec;
     }
-    __enable_irq();
 
     // Return ticks given total subseconds
     // ticks = TICKS/s * s + subsec/ subs/tick
@@ -220,41 +227,36 @@ uint64_t port_get_raw_ticks(uint8_t *subticks) {
 
 // Enable 1/1024 second tick.
 void port_enable_tick(void) {
-    MXC_RTC_Start();
+    while ( MXC_RTC_Start() == E_BUSY );
 }
 
 // Disable 1/1024 second tick.
 void port_disable_tick(void) {
-    MXC_RTC_Stop();
+    while( MXC_RTC_Stop() == E_BUSY );
 }
 
 // Wake the CPU after a given # of ticks or sooner
 void port_interrupt_after_ticks(uint32_t ticks) {
     uint32_t ticks_msec = 0;
-    // Stop RTC & store current time & ticks
-    port_disable_tick();
-    port_get_raw_ticks(NULL);
 
-    ticks_msec = 1000 * ticks / TICKS_PER_SEC;
+    ticks_msec = (ticks / TICKS_PER_SEC) * 1000;
 
-    while (MXC_RTC_DisableInt(MXC_F_RTC_CTRL_SSEC_ALARM_IE |
-        MXC_F_RTC_CTRL_TOD_ALARM_IE) == E_BUSY) {
-    }
-    ;
+    // Disable RTC interrupts
+    MXC_RTC_DisableInt(MXC_F_RTC_CTRL_SSEC_ALARM_IE |
+        MXC_F_RTC_CTRL_TOD_ALARM_IE | MXC_F_RTC_CTRL_RDY_IE);
+
+    // Stop RTC & store current time & ticks
+    port_get_raw_ticks(NULL);
 
     // Clear the flag to be set by the RTC Handler
     tick_flag = 0;
 
     // Subsec alarm is the starting/reload value of the SSEC counter.
     // ISR triggered when SSEC rolls over from 0xFFFF_FFFF to 0x0
-    while (MXC_RTC_SetSubsecondAlarm(MSEC_TO_SS_ALARM(ticks_msec)) == E_BUSY) {
-    }
-    while (MXC_RTC_EnableInt(MXC_F_RTC_CTRL_SSEC_ALARM_IE) == E_BUSY) {
-    }
+    while (MXC_RTC_SetSubsecondAlarm(MSEC_TO_SS_ALARM(ticks_msec)) != E_SUCCESS) {}
 
-    NVIC_EnableIRQ(RTC_IRQn);
+    MXC_RTC_EnableInt(MXC_F_RTC_CTRL_SSEC_ALARM_IE);
 
-    port_enable_tick();
 }
 
 void port_idle_until_interrupt(void) {