From 95e27bb8bf3e0e3ab1f21e252dafe2c974f1ad30 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Tue, 15 Sep 2020 13:43:35 -0700
Subject: Add more PIDs for unique boards

---
 ports/stm/boards/meowbit_v121/mpconfigboard.mk | 2 +-
 ports/stm/boards/thunderpack/mpconfigboard.mk  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'ports/stm')

diff --git a/ports/stm/boards/meowbit_v121/mpconfigboard.mk b/ports/stm/boards/meowbit_v121/mpconfigboard.mk
index cf60c89c2..69a6c65c8 100644
--- a/ports/stm/boards/meowbit_v121/mpconfigboard.mk
+++ b/ports/stm/boards/meowbit_v121/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x239A
-USB_PID = 0x805A
+USB_PID = 0x80CF
 USB_PRODUCT = "Meowbit"
 USB_MANUFACTURER = "Kittenbot"
 USB_DEVICES = "CDC,MSC"
diff --git a/ports/stm/boards/thunderpack/mpconfigboard.mk b/ports/stm/boards/thunderpack/mpconfigboard.mk
index 007b00cdd..02f28775a 100644
--- a/ports/stm/boards/thunderpack/mpconfigboard.mk
+++ b/ports/stm/boards/thunderpack/mpconfigboard.mk
@@ -1,5 +1,5 @@
 USB_VID = 0x239A
-USB_PID = 0x806A
+USB_PID = 0x8069
 USB_PRODUCT = "Thunderpack STM32F411"
 USB_MANUFACTURER = "Jeremy Gillick"
 USB_DEVICES = "CDC,MSC"
-- 
cgit v1.2.3


From 00ee94d24b407768612a5f2a40c4099a7899aa0b Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Wed, 16 Sep 2020 14:05:15 -0400
Subject: Add SPI memset, optional flags

---
 ports/stm/Makefile               |  3 ++-
 ports/stm/common-hal/busio/SPI.c | 13 ++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'ports/stm')

diff --git a/ports/stm/Makefile b/ports/stm/Makefile
index dccc749ed..9e1d10b99 100755
--- a/ports/stm/Makefile
+++ b/ports/stm/Makefile
@@ -102,7 +102,8 @@ CFLAGS += $(INC) -Werror -Wall -std=gnu11 -fshort-enums $(BASE_CFLAGS) $(C_DEFS)
 
 # Undo some warnings.
 # STM32 HAL uses undefined preprocessor variables, shadowed variables, casts that change alignment reqs
-CFLAGS += -Wno-undef -Wno-shadow -Wno-cast-align
+# You can add your own temporary suppression by setting ADD_CFLAGS in the make command
+CFLAGS += -Wno-undef -Wno-shadow -Wno-cast-align $(ADD_CFLAGS)
 
 CFLAGS += -mthumb -mabi=aapcs-linux
 
diff --git a/ports/stm/common-hal/busio/SPI.c b/ports/stm/common-hal/busio/SPI.c
index 0354d64ad..913385e96 100644
--- a/ports/stm/common-hal/busio/SPI.c
+++ b/ports/stm/common-hal/busio/SPI.c
@@ -25,6 +25,7 @@
  * THE SOFTWARE.
  */
 #include <stdbool.h>
+#include <string.h>
 
 #include "shared-bindings/busio/SPI.h"
 #include "py/mperrno.h"
@@ -340,7 +341,7 @@ bool common_hal_busio_spi_write(busio_spi_obj_t *self,
     if (self->mosi == NULL) {
         mp_raise_ValueError(translate("No MOSI Pin"));
     }
-    HAL_StatusTypeDef result = HAL_SPI_Transmit (&self->handle, (uint8_t *)data, (uint16_t)len, HAL_MAX_DELAY);
+    HAL_StatusTypeDef result = HAL_SPI_Transmit(&self->handle, (uint8_t *)data, (uint16_t)len, HAL_MAX_DELAY);
     return result == HAL_OK;
 }
 
@@ -349,7 +350,13 @@ bool common_hal_busio_spi_read(busio_spi_obj_t *self,
     if (self->miso == NULL) {
         mp_raise_ValueError(translate("No MISO Pin"));
     }
-    HAL_StatusTypeDef result = HAL_SPI_Receive (&self->handle, data, (uint16_t)len, HAL_MAX_DELAY);
+    HAL_StatusTypeDef result = HAL_OK;
+    if (self->mosi == NULL) {
+        result = HAL_SPI_Receive(&self->handle, data, (uint16_t)len, HAL_MAX_DELAY);
+    } else {
+        memset(data, write_value, len);
+        result = HAL_SPI_TransmitReceive(&self->handle, data, data, (uint16_t)len, HAL_MAX_DELAY);
+    }
     return result == HAL_OK;
 }
 
@@ -358,7 +365,7 @@ bool common_hal_busio_spi_transfer(busio_spi_obj_t *self,
     if (self->miso == NULL || self->mosi == NULL) {
         mp_raise_ValueError(translate("Missing MISO or MOSI Pin"));
     }
-    HAL_StatusTypeDef result = HAL_SPI_TransmitReceive (&self->handle,
+    HAL_StatusTypeDef result = HAL_SPI_TransmitReceive(&self->handle,
         (uint8_t *) data_out, data_in, (uint16_t)len,HAL_MAX_DELAY);
     return result == HAL_OK;
 }
-- 
cgit v1.2.3


From c58bd4c04782efad04ffc08f77fda3efce83badb Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Fri, 18 Sep 2020 12:38:15 -0400
Subject: Add never_reset reservation to RGBMatrix init

---
 ports/stm/common-hal/rgbmatrix/RGBMatrix.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ports/stm')

diff --git a/ports/stm/common-hal/rgbmatrix/RGBMatrix.c b/ports/stm/common-hal/rgbmatrix/RGBMatrix.c
index 3b42631ad..2826cf53e 100644
--- a/ports/stm/common-hal/rgbmatrix/RGBMatrix.c
+++ b/ports/stm/common-hal/rgbmatrix/RGBMatrix.c
@@ -36,6 +36,7 @@ extern void _PM_IRQ_HANDLER(void);
 void *common_hal_rgbmatrix_timer_allocate() {
     TIM_TypeDef * timer = stm_peripherals_find_timer();
     stm_peripherals_timer_reserve(timer);
+    stm_peripherals_timer_never_reset(timer);
     return timer;
 }
 
-- 
cgit v1.2.3


From 3a59d30e1ae1a4d5159dadb5f34534b186cdf9fd Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Fri, 18 Sep 2020 12:48:15 -0400
Subject: Remove timer debug messages

---
 ports/stm/peripherals/timers.c | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'ports/stm')

diff --git a/ports/stm/peripherals/timers.c b/ports/stm/peripherals/timers.c
index baa81d2b5..7bc5ea495 100644
--- a/ports/stm/peripherals/timers.c
+++ b/ports/stm/peripherals/timers.c
@@ -195,9 +195,7 @@ TIM_TypeDef * stm_peripherals_find_timer(void) {
         // If no results are found, no unclaimed pins with this timer are in this package,
         // and it is safe to pick
         if (timer_in_package == false && mcu_tim_banks[i] != NULL) {
-            // DEBUG: print the timer
             return mcu_tim_banks[i];
-            mp_printf(&mp_plat_print, "Timer: %d\n",i);
         }
     }
     //TODO: secondary search for timers outside the pins in the board profile
@@ -205,8 +203,6 @@ TIM_TypeDef * stm_peripherals_find_timer(void) {
     // Work backwards - higher index timers have fewer pin allocations
     for (size_t i = (MP_ARRAY_SIZE(mcu_tim_banks) - 1); i >= 0; i--) {
         if ((!stm_timer_reserved[i]) && (mcu_tim_banks[i] != NULL)) {
-            // DEBUG: print the timer
-            mp_printf(&mp_plat_print, "Timer: %d\n",i);
             return mcu_tim_banks[i];
         }
     }
-- 
cgit v1.2.3


From 00517b26009d6b721145995e40725625b5152afd Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Wed, 23 Sep 2020 11:39:39 -0400
Subject: Move missing pin warning to shared-bindings

---
 ports/esp32s2/common-hal/busio/SPI.c | 9 ---------
 ports/stm/common-hal/busio/SPI.c     | 9 ---------
 shared-bindings/busio/SPI.c          | 4 ++++
 3 files changed, 4 insertions(+), 18 deletions(-)

(limited to 'ports/stm')

diff --git a/ports/esp32s2/common-hal/busio/SPI.c b/ports/esp32s2/common-hal/busio/SPI.c
index 6e4e34474..eaafa87b7 100644
--- a/ports/esp32s2/common-hal/busio/SPI.c
+++ b/ports/esp32s2/common-hal/busio/SPI.c
@@ -116,15 +116,6 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
         const mcu_pin_obj_t * clock, const mcu_pin_obj_t * mosi,
         const mcu_pin_obj_t * miso) {
 
-    //SCK is not optional. MOSI and MISO are
-    if (!clock) {
-        mp_raise_ValueError(translate("Must provide SCK pin"));
-    }
-
-    if (!miso && !mosi) {
-        mp_raise_ValueError(translate("Must provide MISO or MOSI pin"));
-    }
-
     spi_bus_config_t bus_config;
     bus_config.mosi_io_num = mosi != NULL ? mosi->number : -1;
     bus_config.miso_io_num = miso != NULL ? miso->number : -1;
diff --git a/ports/stm/common-hal/busio/SPI.c b/ports/stm/common-hal/busio/SPI.c
index 913385e96..29fbdee56 100644
--- a/ports/stm/common-hal/busio/SPI.c
+++ b/ports/stm/common-hal/busio/SPI.c
@@ -127,15 +127,6 @@ STATIC int check_pins(busio_spi_obj_t *self,
     uint8_t mosi_len = MP_ARRAY_SIZE(mcu_spi_mosi_list);
     uint8_t miso_len = MP_ARRAY_SIZE(mcu_spi_miso_list);
 
-    //SCK is not optional. MOSI and MISO are
-    if (!sck) {
-        mp_raise_ValueError(translate("Must provide SCK pin"));
-    }
-
-    if (!miso && !mosi) {
-        mp_raise_ValueError(translate("Must provide MISO or MOSI pin"));
-    }
-
     // Loop over each possibility for SCK.  Check whether MISO and/or MOSI can be used on the same peripheral
     for (uint i = 0; i < sck_len; i++) {
         const mcu_periph_obj_t *mcu_spi_sck = &mcu_spi_sck_list[i];
diff --git a/shared-bindings/busio/SPI.c b/shared-bindings/busio/SPI.c
index aefe4f5a7..e47564c8c 100644
--- a/shared-bindings/busio/SPI.c
+++ b/shared-bindings/busio/SPI.c
@@ -96,6 +96,10 @@ STATIC mp_obj_t busio_spi_make_new(const mp_obj_type_t *type, size_t n_args, con
     const mcu_pin_obj_t* mosi = validate_obj_is_free_pin_or_none(args[ARG_MOSI].u_obj);
     const mcu_pin_obj_t* miso = validate_obj_is_free_pin_or_none(args[ARG_MISO].u_obj);
 
+    if (!miso && !mosi) {
+        mp_raise_ValueError(translate("Must provide MISO or MOSI pin"));
+    }
+
     common_hal_busio_spi_construct(self, clock, mosi, miso);
     return MP_OBJ_FROM_PTR(self);
 }
-- 
cgit v1.2.3


From b92154357145f4e7d976306490ef33b5d5fe9c92 Mon Sep 17 00:00:00 2001
From: Mark Roberts <mdroberts1243@gmail.com>
Date: Fri, 25 Sep 2020 21:27:29 -0400
Subject: Requested changes take 1

---
 .../atmel-samd/boards/hallowing_m0_express/board.c |  3 ++-
 .../atmel-samd/boards/hallowing_m4_express/board.c |  3 ++-
 ports/atmel-samd/boards/monster_m4sk/board.c       |  3 ++-
 ports/atmel-samd/boards/pewpew_m4/board.c          |  3 ++-
 ports/atmel-samd/boards/pybadge/board.c            |  3 ++-
 ports/atmel-samd/boards/pybadge_airlift/board.c    |  3 ++-
 ports/atmel-samd/boards/pygamer/board.c            |  3 ++-
 ports/atmel-samd/boards/pygamer_advance/board.c    |  3 ++-
 ports/atmel-samd/boards/pyportal/board.c           |  3 ++-
 ports/atmel-samd/boards/pyportal_titano/board.c    |  3 ++-
 .../boards/seeeduino_wio_terminal/board.c          |  3 ++-
 ports/nrf/boards/clue_nrf52840_express/board.c     |  3 ++-
 ports/nrf/boards/hiibot_bluefi/board.c             |  3 ++-
 .../boards/makerdiary_nrf52840_m2_devkit/board.c   |  3 ++-
 ports/nrf/boards/ohs2020_badge/board.c             |  3 ++-
 ports/stm/boards/meowbit_v121/board.c              |  3 ++-
 shared-module/displayio/Display.c                  | 25 ++++++----------------
 shared-module/displayio/display_core.c             |  4 ++--
 18 files changed, 41 insertions(+), 36 deletions(-)

(limited to 'ports/stm')

diff --git a/ports/atmel-samd/boards/hallowing_m0_express/board.c b/ports/atmel-samd/boards/hallowing_m0_express/board.c
index 4717e6ceb..14a2bdb81 100644
--- a/ports/atmel-samd/boards/hallowing_m0_express/board.c
+++ b/ports/atmel-samd/boards/hallowing_m0_express/board.c
@@ -110,7 +110,8 @@ void board_init(void) {
         false, // data_as_commands
         true, // auto_refresh
         60, // native_frames_per_second
-        true); // backlight_on_high
+        true, // backlight_on_high
+        false); // not SH1107
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/atmel-samd/boards/hallowing_m4_express/board.c b/ports/atmel-samd/boards/hallowing_m4_express/board.c
index 7da1d8128..61e797d65 100644
--- a/ports/atmel-samd/boards/hallowing_m4_express/board.c
+++ b/ports/atmel-samd/boards/hallowing_m4_express/board.c
@@ -91,7 +91,8 @@ void board_init(void) {
         false, // data_as_commands
         true, // auto_refresh
         60, // native_frames_per_second
-        true); // backlight_on_high
+        true, // backlight_on_high
+        false); // not SH1107
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/atmel-samd/boards/monster_m4sk/board.c b/ports/atmel-samd/boards/monster_m4sk/board.c
index 4dd65f8c9..45fea9d52 100644
--- a/ports/atmel-samd/boards/monster_m4sk/board.c
+++ b/ports/atmel-samd/boards/monster_m4sk/board.c
@@ -92,7 +92,8 @@ void board_init(void) {
         false, // data_as_commands
         true, // auto_refresh
         60, // native_frames_per_second
-        true); // backlight_on_high
+        true, // backlight_on_high
+        false); // SH1107_addressing
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/atmel-samd/boards/pewpew_m4/board.c b/ports/atmel-samd/boards/pewpew_m4/board.c
index 52a52b4b7..d02e0dc01 100644
--- a/ports/atmel-samd/boards/pewpew_m4/board.c
+++ b/ports/atmel-samd/boards/pewpew_m4/board.c
@@ -143,7 +143,8 @@ void board_init(void) {
         false, // data_as_commands
         false, // auto_refresh
         20, // native_frames_per_second
-        true); // backlight_on_high
+        true, // backlight_on_high
+        false); // SH1107_addressing
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/atmel-samd/boards/pybadge/board.c b/ports/atmel-samd/boards/pybadge/board.c
index 45298acc2..35f228c75 100644
--- a/ports/atmel-samd/boards/pybadge/board.c
+++ b/ports/atmel-samd/boards/pybadge/board.c
@@ -114,7 +114,8 @@ void board_init(void) {
         false, // data_as_commands
         true, // auto_refresh
         60, // native_frames_per_second
-        true); // backlight_on_high
+        true, // backlight_on_high
+        false); // SH1107_addressing
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/atmel-samd/boards/pybadge_airlift/board.c b/ports/atmel-samd/boards/pybadge_airlift/board.c
index 7495c7d48..fe3e4a017 100644
--- a/ports/atmel-samd/boards/pybadge_airlift/board.c
+++ b/ports/atmel-samd/boards/pybadge_airlift/board.c
@@ -92,7 +92,8 @@ void board_init(void) {
         false, // data_as_commands
         true, // auto_refresh
         60, // native_frames_per_second
-        true); // backlight_on_high
+        true, // backlight_on_high
+        false); // SH1107_addressing
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/atmel-samd/boards/pygamer/board.c b/ports/atmel-samd/boards/pygamer/board.c
index 2e83440ea..b478b5947 100644
--- a/ports/atmel-samd/boards/pygamer/board.c
+++ b/ports/atmel-samd/boards/pygamer/board.c
@@ -114,7 +114,8 @@ void board_init(void) {
         false, // data_as_commands
         true, // auto_refresh
         60, // native_frames_per_second
-        true); // backlight_on_high
+        true, // backlight_on_high
+        false); // SH1107_addressing
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/atmel-samd/boards/pygamer_advance/board.c b/ports/atmel-samd/boards/pygamer_advance/board.c
index 330446b6f..7dfe07c00 100644
--- a/ports/atmel-samd/boards/pygamer_advance/board.c
+++ b/ports/atmel-samd/boards/pygamer_advance/board.c
@@ -92,7 +92,8 @@ void board_init(void) {
         false, // data_as_commands
         true, // auto_refresh
         60, // native_frames_per_second
-        true); // backlight_on_high
+        true, // backlight_on_high
+        false); // SH1107_addressing
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/atmel-samd/boards/pyportal/board.c b/ports/atmel-samd/boards/pyportal/board.c
index d14b6b6a5..cd94f6887 100644
--- a/ports/atmel-samd/boards/pyportal/board.c
+++ b/ports/atmel-samd/boards/pyportal/board.c
@@ -100,7 +100,8 @@ void board_init(void) {
         false, // data_as_commands
         true, // auto_refresh
         60, // native_frames_per_second
-        true); // backlight_on_high
+        true, // backlight_on_high
+        false); // SH1107_addressing
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/atmel-samd/boards/pyportal_titano/board.c b/ports/atmel-samd/boards/pyportal_titano/board.c
index 0ee2e68aa..dc417f5d1 100644
--- a/ports/atmel-samd/boards/pyportal_titano/board.c
+++ b/ports/atmel-samd/boards/pyportal_titano/board.c
@@ -117,7 +117,8 @@ void board_init(void) {
         false, // data_as_commands
         true, // auto_refresh
         60, // native_frames_per_second
-        true); // backlight_on_high
+        true, // backlight_on_high
+        false); // SH1107_addressing
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/atmel-samd/boards/seeeduino_wio_terminal/board.c b/ports/atmel-samd/boards/seeeduino_wio_terminal/board.c
index b7fc736eb..58d0beca8 100644
--- a/ports/atmel-samd/boards/seeeduino_wio_terminal/board.c
+++ b/ports/atmel-samd/boards/seeeduino_wio_terminal/board.c
@@ -105,7 +105,8 @@ void board_init(void) {
         false, // data_as_commands
         true, // auto_refresh
         60, // native_frames_per_second
-        true); // backlight_on_high
+        true, // backlight_on_high
+        false); // SH1107_addressing
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/nrf/boards/clue_nrf52840_express/board.c b/ports/nrf/boards/clue_nrf52840_express/board.c
index 45452a35e..523bd7677 100644
--- a/ports/nrf/boards/clue_nrf52840_express/board.c
+++ b/ports/nrf/boards/clue_nrf52840_express/board.c
@@ -91,7 +91,8 @@ void board_init(void) {
         false, // data_as_commands
         true, // auto_refresh
         60, // native_frames_per_second
-        true); // backlight_on_high
+        true, // backlight_on_high
+        false); // not SH1107
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/nrf/boards/hiibot_bluefi/board.c b/ports/nrf/boards/hiibot_bluefi/board.c
index 6b53cab13..93e31aef0 100644
--- a/ports/nrf/boards/hiibot_bluefi/board.c
+++ b/ports/nrf/boards/hiibot_bluefi/board.c
@@ -92,7 +92,8 @@ void board_init(void) {
         false, // data_as_commands
         true, // auto_refresh
         60, // native_frames_per_second
-        true); // backlight_on_high
+        true, // backlight_on_high
+        false); // SH1107_addressing
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c b/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c
index e7f946f4d..e08d00dac 100644
--- a/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c
+++ b/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c
@@ -92,7 +92,8 @@ void board_init(void) {
         false, // data_as_commands
         true, // auto_refresh
         60, // native_frames_per_second
-        true); // backlight_on_high
+        true, // backlight_on_high
+        false); // SH1107_addressing
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/nrf/boards/ohs2020_badge/board.c b/ports/nrf/boards/ohs2020_badge/board.c
index 9fcf9d2bf..ec52690ce 100644
--- a/ports/nrf/boards/ohs2020_badge/board.c
+++ b/ports/nrf/boards/ohs2020_badge/board.c
@@ -91,7 +91,8 @@ void board_init(void) {
         false, // data_as_commands
         true, // auto_refresh
         60, // native_frames_per_second
-        false); // backlight_on_high
+        false, // backlight_on_high
+        false); // SH1107_addressing
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/stm/boards/meowbit_v121/board.c b/ports/stm/boards/meowbit_v121/board.c
index b74f13516..f67b4a49d 100644
--- a/ports/stm/boards/meowbit_v121/board.c
+++ b/ports/stm/boards/meowbit_v121/board.c
@@ -111,7 +111,8 @@ void board_init(void) {
         false, // data_as_commands
         true, // auto_refresh
         60, // native_frames_per_second
-        true); // backlight_on_high
+        true, // backlight_on_high
+        false); // SH1107_addressing
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c
index afc4b7564..9864e9f9d 100644
--- a/shared-module/displayio/Display.c
+++ b/shared-module/displayio/Display.c
@@ -252,14 +252,8 @@ STATIC bool _refresh_area(displayio_display_obj_t* self, const displayio_area_t*
     //      write one single row at a time
     if (self->SH1107_addressing) {
         subrectangles = rows_per_buffer;  // vertical (column mode) write each separately (height times)
-    }
-
-    // Skip this recalculation of subrectangles if SH1107 (each subrectangle is a single row)
-    // [mdroberts1243] I am worried/confused about the pixels_in_byte_share_row calculation though
-    //       since it makes sense to be on a byte boundary (actually a page boundary too)
-    //       seems to work as is though.
-    if ((displayio_area_size(&clipped) > buffer_size * pixels_per_word)
-                    && (!self->SH1107_addressing)) {
+        rows_per_buffer = 1;
+    } else if (displayio_area_size(&clipped) > buffer_size * pixels_per_word) {
         rows_per_buffer = buffer_size * pixels_per_word / displayio_area_width(&clipped);
         if (rows_per_buffer == 0) {
             rows_per_buffer = 1;
@@ -297,18 +291,13 @@ STATIC bool _refresh_area(displayio_display_obj_t* self, const displayio_area_t*
             .y2 = clipped.y1 + rows_per_buffer * (j + 1)
         };
         if (self->SH1107_addressing) {
-                // one row only for SH1107 in vertical (column) mode
-                subrectangle.y1 = clipped.y1 + j;
-                subrectangle.y2 = clipped.y1 + (j + 1);
-            };
-        if ((remaining_rows < rows_per_buffer) && (!self->SH1107_addressing)) {
+            // one row only for SH1107 in vertical (column) mode
+            subrectangle.y1 = clipped.y1 + j;
+            subrectangle.y2 = clipped.y1 + (j + 1);
+        } else if (remaining_rows < rows_per_buffer) {
             subrectangle.y2 = subrectangle.y1 + remaining_rows;
         }
-        if (self->SH1107_addressing) {
-            remaining_rows -= 1;
-        } else {
-            remaining_rows -= rows_per_buffer;
-        }
+        remaining_rows -= rows_per_buffer;
 
         displayio_display_core_set_region_to_update(&self->core, self->set_column_command, 
               self->set_row_command, NO_COMMAND, NO_COMMAND, self->data_as_commands, false, 
diff --git a/shared-module/displayio/display_core.c b/shared-module/displayio/display_core.c
index 6e05b4757..eb8c8f3b4 100644
--- a/shared-module/displayio/display_core.c
+++ b/shared-module/displayio/display_core.c
@@ -41,7 +41,7 @@
 #include <string.h>
 
 #define DISPLAYIO_CORE_DEBUG(...) (void)0
-//#define DISPLAYIO_CORE_DEBUG(...) mp_printf(&mp_plat_print __VA_OPT__(,) __VA_ARGS__)
+// #define DISPLAYIO_CORE_DEBUG(...) mp_printf(&mp_plat_print __VA_OPT__(,) __VA_ARGS__)
 
 void displayio_display_core_construct(displayio_display_core_t* self,
         mp_obj_t bus, uint16_t width, uint16_t height, uint16_t ram_width, uint16_t ram_height, int16_t colstart, int16_t rowstart, uint16_t rotation,
@@ -322,7 +322,7 @@ void displayio_display_core_start_refresh(displayio_display_core_t* self) {
 
 void displayio_display_core_finish_refresh(displayio_display_core_t* self) {
     if (self->current_group != NULL) {
-//       DISPLAYIO_CORE_DEBUG("displayiocore group_finish_refresh\n");
+        DISPLAYIO_CORE_DEBUG("displayiocore group_finish_refresh\n");
         displayio_group_finish_refresh(self->current_group);
     }
     self->full_refresh = false;
-- 
cgit v1.2.3


From 726dcdb60aa84b5070e5484a19e896abdaffeb93 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Thu, 24 Sep 2020 11:20:32 -0500
Subject: Add some NORETURN attributes

I have a function where it should be impossible to reach the end, so I put in a safe-mode reset at the bottom:
```
int find_unused_slot(void) {
    // precondition: you already verified that a slot was available
    for (int i=0; i<NUM_SLOTS; i++) {
        if( slot_free(i)) {
            return i;
        }
    }
    safe_mode_reset(MICROPY_FATAL_ERROR);
}
```
However, the compiler still gave a diagnostic, because safe_mode_reset was not declared NORETURN.

So I started by teaching the compiler that reset_into_safe_mode never returned.  This leads at least one level deeper due to reset_cpu needing to be a NORETURN function.  Each port is a little different in this area.  I also marked reset_to_bootloader as NORETURN.
Additional notes:

 * stm32's reset_to_bootloader was not implemented, but now does a bare reset.  Most stm32s are not fitted with uf2 bootloaders anyway.
 * ditto cxd56
 * esp32s2 did not implement reset_cpu at all.  I used esp_restart().  (not tested)
 * litex did not implement reset_cpu at all.  I used reboot_ctrl_write.  But notably this is what reset_to_bootloader already did, so one or the other must be incorrect (not tested).  reboot_ctrl_write cannot be declared NORETURN, as it returns unless the special value 0xac is written), so a new unreachable forever-loop is added.
 * cxd56's reset is via a boardctl() call which can't generically be declared NORETURN, so a new unreacahble "for(;;)" forever-loop is added.
 * In several places, NVIC_SystemReset is redeclared with NORETURN applied.  This is accepted just fine by gcc.  I chose this as preferable to editing the multiple copies of CMSIS headers where it is normally declared.
 * the stub safe_mode reset simply aborts.  This is used in mpy-cross.
---
 ports/atmel-samd/reset.c        | 2 ++
 ports/atmel-samd/reset.h        | 6 ++++--
 ports/cxd56/supervisor/port.c   | 5 +++++
 ports/esp32s2/supervisor/port.c | 1 +
 ports/litex/supervisor/port.c   | 8 ++++++++
 ports/mimxrt10xx/reset.h        | 4 ++--
 ports/nrf/supervisor/port.c     | 2 ++
 ports/stm/supervisor/port.c     | 4 +++-
 supervisor/port.h               | 4 ++--
 supervisor/shared/safe_mode.h   | 4 +++-
 supervisor/stub/safe_mode.c     | 5 +++--
 11 files changed, 35 insertions(+), 10 deletions(-)

(limited to 'ports/stm')

diff --git a/ports/atmel-samd/reset.c b/ports/atmel-samd/reset.c
index 735639cc4..066c9897a 100644
--- a/ports/atmel-samd/reset.c
+++ b/ports/atmel-samd/reset.c
@@ -29,6 +29,8 @@
 #include "reset.h"
 #include "supervisor/filesystem.h"
 
+void NVIC_SystemReset(void) NORETURN;
+
 void reset(void) {
     filesystem_flush();
     NVIC_SystemReset();
diff --git a/ports/atmel-samd/reset.h b/ports/atmel-samd/reset.h
index b589d2611..482eb6ee8 100644
--- a/ports/atmel-samd/reset.h
+++ b/ports/atmel-samd/reset.h
@@ -29,14 +29,16 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#include "py/mpconfig.h"
+
 // Copied from inc/uf2.h in https://github.com/Microsoft/uf2-samd21
 #define DBL_TAP_MAGIC 0xf01669ef // Randomly selected, adjusted to have first and last bit set
 #define DBL_TAP_MAGIC_QUICK_BOOT 0xf02669ef
 
 extern uint32_t _bootloader_dbl_tap;
 
-void reset_to_bootloader(void);
-void reset(void);
+void reset_to_bootloader(void) NORETURN;
+void reset(void) NORETURN;
 bool bootloader_available(void);
 
 #endif  // MICROPY_INCLUDED_ATMEL_SAMD_RESET_H
diff --git a/ports/cxd56/supervisor/port.c b/ports/cxd56/supervisor/port.c
index 6164f7411..92d335cd5 100644
--- a/ports/cxd56/supervisor/port.c
+++ b/ports/cxd56/supervisor/port.c
@@ -71,6 +71,8 @@ safe_mode_t port_init(void) {
 
 void reset_cpu(void) {
     boardctl(BOARDIOC_RESET, 0);
+    for (;;) {
+    }
 }
 
 void reset_port(void) {
@@ -91,6 +93,9 @@ void reset_port(void) {
 }
 
 void reset_to_bootloader(void) {
+    boardctl(BOARDIOC_RESET, 0);
+    for (;;) {
+    }
 }
 
 supervisor_allocation* port_fixed_stack(void) {
diff --git a/ports/esp32s2/supervisor/port.c b/ports/esp32s2/supervisor/port.c
index 3de63278d..60331d08e 100644
--- a/ports/esp32s2/supervisor/port.c
+++ b/ports/esp32s2/supervisor/port.c
@@ -121,6 +121,7 @@ void reset_to_bootloader(void) {
 }
 
 void reset_cpu(void) {
+    esp_restart();
 }
 
 uint32_t *port_heap_get_bottom(void) {
diff --git a/ports/litex/supervisor/port.c b/ports/litex/supervisor/port.c
index 3125072e6..e55eb49f0 100644
--- a/ports/litex/supervisor/port.c
+++ b/ports/litex/supervisor/port.c
@@ -85,9 +85,17 @@ void reset_port(void) {
 
 void reset_to_bootloader(void) {
     reboot_ctrl_write(0xac);
+    for(;;) {}
 }
 
 void reset_cpu(void) {
+    // "You can reset Fomu by writing a special value to the CSR_REBOOT_CTRL
+    // register at 0xe0006000L. All writes to this register must start with
+    // 0xac, to ensure random values aren’t written. We can reboot Fomu by
+    // simply writing this value" --
+    //     https://workshop.fomu.im/en/latest/riscv.html
+    reboot_ctrl_write(0xac);
+    for(;;) {}
 }
 
 supervisor_allocation* port_fixed_stack(void) {
diff --git a/ports/mimxrt10xx/reset.h b/ports/mimxrt10xx/reset.h
index dc3106cf0..c7569202c 100644
--- a/ports/mimxrt10xx/reset.h
+++ b/ports/mimxrt10xx/reset.h
@@ -34,8 +34,8 @@
 #define DBL_TAP_MAGIC 0xf01669ef // Randomly selected, adjusted to have first and last bit set
 #define DBL_TAP_MAGIC_QUICK_BOOT 0xf02669ef
 
-void reset_to_bootloader(void);
-void reset(void);
+void reset_to_bootloader(void) NORETURN;
+void reset(void) NORETURN;
 bool bootloader_available(void);
 
 #endif  // MICROPY_INCLUDED_MIMXRT10XX_RESET_H
diff --git a/ports/nrf/supervisor/port.c b/ports/nrf/supervisor/port.c
index 2945f244d..bc8b47be7 100644
--- a/ports/nrf/supervisor/port.c
+++ b/ports/nrf/supervisor/port.c
@@ -234,6 +234,8 @@ void reset_cpu(void) {
     uint32_t ticks = nrfx_rtc_counter_get(&rtc_instance);
     overflow_tracker.overflowed_ticks += ticks / 32;
     NVIC_SystemReset();
+    for (;;) {
+    }
 }
 
 // The uninitialized data section is placed directly after BSS, under the theory
diff --git a/ports/stm/supervisor/port.c b/ports/stm/supervisor/port.c
index e21105001..bb304a317 100644
--- a/ports/stm/supervisor/port.c
+++ b/ports/stm/supervisor/port.c
@@ -56,6 +56,8 @@
 
 #include STM32_HAL_H
 
+void NVIC_SystemReset(void) NORETURN;
+
 #if (CPY_STM32H7) || (CPY_STM32F7)
 
 // Device memories must be accessed in order.
@@ -247,7 +249,7 @@ void reset_port(void) {
 }
 
 void reset_to_bootloader(void) {
-
+    NVIC_SystemReset();
 }
 
 void reset_cpu(void) {
diff --git a/supervisor/port.h b/supervisor/port.h
index ddb96bd52..f5b3c15d1 100644
--- a/supervisor/port.h
+++ b/supervisor/port.h
@@ -44,7 +44,7 @@ extern uint32_t _ebss;
 safe_mode_t port_init(void);
 
 // Reset the microcontroller completely.
-void reset_cpu(void);
+void reset_cpu(void) NORETURN;
 
 // Reset the microcontroller state.
 void reset_port(void);
@@ -53,7 +53,7 @@ void reset_port(void);
 void reset_board(void);
 
 // Reset to the bootloader
-void reset_to_bootloader(void);
+void reset_to_bootloader(void) NORETURN;
 
 // Get stack limit address
 uint32_t *port_stack_get_limit(void);
diff --git a/supervisor/shared/safe_mode.h b/supervisor/shared/safe_mode.h
index 7d3cd63b5..34fc3c8ae 100644
--- a/supervisor/shared/safe_mode.h
+++ b/supervisor/shared/safe_mode.h
@@ -27,6 +27,8 @@
 #ifndef MICROPY_INCLUDED_SUPERVISOR_SAFE_MODE_H
 #define MICROPY_INCLUDED_SUPERVISOR_SAFE_MODE_H
 
+#include "py/mpconfig.h"
+
 typedef enum {
   NO_SAFE_MODE = 0,
   BROWNOUT,
@@ -48,7 +50,7 @@ typedef enum {
 safe_mode_t wait_for_safe_mode_reset(void);
 
 void safe_mode_on_next_reset(safe_mode_t reason);
-void reset_into_safe_mode(safe_mode_t reason);
+void reset_into_safe_mode(safe_mode_t reason) NORETURN;
 
 void print_safe_mode_message(safe_mode_t reason);
 
diff --git a/supervisor/stub/safe_mode.c b/supervisor/stub/safe_mode.c
index 8072be2c6..a70ac6b6d 100644
--- a/supervisor/stub/safe_mode.c
+++ b/supervisor/stub/safe_mode.c
@@ -26,14 +26,15 @@
 
 #include "supervisor/shared/safe_mode.h"
 
+#include <stdlib.h>
+
 safe_mode_t wait_for_safe_mode_reset(void) {
     return NO_SAFE_MODE;
 }
 
 void reset_into_safe_mode(safe_mode_t reason) {
     (void) reason;
-    for (;;) {
-    }
+    abort();
 }
 
 void print_safe_mode_message(safe_mode_t reason) {
-- 
cgit v1.2.3


From 01e9e355cefe53edcbd6662e98d926c248fc5b95 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Thu, 24 Sep 2020 11:19:46 -0500
Subject: canio: implement for stm32f405

The has successfully run my loopback self-test program for CAN,
which tests transmission, reception, and filtering.  The 1M baud rate setting
was also verified on saleae to be accurate.
---
 ports/stm/Makefile                                 |   4 +
 .../feather_stm32f405_express/mpconfigboard.mk     |   2 +
 ports/stm/boards/feather_stm32f405_express/pins.c  |   3 +
 ports/stm/common-hal/canio/CAN.c                   | 279 ++++++++++++++++++
 ports/stm/common-hal/canio/CAN.h                   |  60 ++++
 ports/stm/common-hal/canio/Listener.c              | 314 +++++++++++++++++++++
 ports/stm/common-hal/canio/Listener.h              |  47 +++
 ports/stm/common-hal/canio/__init__.c              |  25 ++
 ports/stm/common-hal/canio/__init__.h              |  27 ++
 ports/stm/hal_conf/stm32_hal_conf.h                |   2 +-
 ports/stm/peripherals/stm32f4/stm32f405xx/periph.c |  23 ++
 ports/stm/peripherals/stm32f4/stm32f405xx/periph.h |   6 +
 12 files changed, 791 insertions(+), 1 deletion(-)
 create mode 100644 ports/stm/common-hal/canio/CAN.c
 create mode 100644 ports/stm/common-hal/canio/CAN.h
 create mode 100644 ports/stm/common-hal/canio/Listener.c
 create mode 100644 ports/stm/common-hal/canio/Listener.h
 create mode 100644 ports/stm/common-hal/canio/__init__.c
 create mode 100644 ports/stm/common-hal/canio/__init__.h

(limited to 'ports/stm')

diff --git a/ports/stm/Makefile b/ports/stm/Makefile
index 9e1d10b99..b9426e07e 100755
--- a/ports/stm/Makefile
+++ b/ports/stm/Makefile
@@ -198,6 +198,10 @@ SRC_STM32 = $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES_LOWER)xx_,\
 	ll_utils.c \
 )
 
+ifeq ($(CIRCUITPY_CANIO),1)
+SRC_STM32 += $(HAL_DIR)/Src/stm32$(MCU_SERIES_LOWER)xx_hal_can.c
+endif
+
 # Need this to avoid UART linker problems. TODO: rewrite to use registered callbacks.
 # Does not exist for F4 and lower
 ifeq ($(MCU_VARIANT),$(filter $(MCU_VARIANT),STM32F765xx STM32F767xx STM32F769xx STM32H743xx))
diff --git a/ports/stm/boards/feather_stm32f405_express/mpconfigboard.mk b/ports/stm/boards/feather_stm32f405_express/mpconfigboard.mk
index 4d0bd4598..086622384 100644
--- a/ports/stm/boards/feather_stm32f405_express/mpconfigboard.mk
+++ b/ports/stm/boards/feather_stm32f405_express/mpconfigboard.mk
@@ -16,3 +16,5 @@ LD_DEFAULT = boards/STM32F405_default.ld
 # UF2 boot option
 LD_BOOT = boards/STM32F405_boot.ld
 UF2_OFFSET = 0x8010000
+
+CIRCUITPY_CANIO = 1
diff --git a/ports/stm/boards/feather_stm32f405_express/pins.c b/ports/stm/boards/feather_stm32f405_express/pins.c
index 571076c33..e20ad5028 100644
--- a/ports/stm/boards/feather_stm32f405_express/pins.c
+++ b/ports/stm/boards/feather_stm32f405_express/pins.c
@@ -47,5 +47,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SDIO_CLOCK), MP_ROM_PTR(&pin_PC12) },
     { MP_ROM_QSTR(MP_QSTR_SDIO_COMMAND), MP_ROM_PTR(&pin_PD02) },
     { MP_ROM_QSTR(MP_QSTR_SDIO_DATA), MP_ROM_PTR(&sdio_data_tuple) },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_CAN_RX),  MP_ROM_PTR(&pin_PB09) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_CAN_TX),  MP_ROM_PTR(&pin_PB08) },
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/stm/common-hal/canio/CAN.c b/ports/stm/common-hal/canio/CAN.c
new file mode 100644
index 000000000..0edf1217e
--- /dev/null
+++ b/ports/stm/common-hal/canio/CAN.c
@@ -0,0 +1,279 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jeff Epler 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 <string.h>
+
+#include "py/runtime.h"
+#include "py/mperrno.h"
+
+#include "common-hal/canio/CAN.h"
+#include "peripherals/periph.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared-bindings/util.h"
+#include "supervisor/port.h"
+
+STATIC bool reserved_can[MP_ARRAY_SIZE(mcu_can_banks)];
+
+STATIC const mcu_periph_obj_t *find_pin_function(const mcu_periph_obj_t *table, size_t sz, const mcu_pin_obj_t *pin, int periph_index) {
+    for(size_t i = 0; i<sz; i++, table++) {
+        if (periph_index != -1 && periph_index != table->periph_index) {
+            continue;
+        }
+        if (pin == table->pin) {
+            return table;
+        }
+    }
+    return NULL;
+}
+
+
+__attribute__((optimize("O0")))
+void common_hal_canio_can_construct(canio_can_obj_t *self, mcu_pin_obj_t *tx, mcu_pin_obj_t *rx, int baudrate, bool loopback, bool silent)
+{
+#define DIV_ROUND(a, b) (((a) + (b)/2) / (b))
+#define DIV_ROUND_UP(a, b) (((a) + (b) - 1) / (b))
+
+    const uint8_t can_tx_len = MP_ARRAY_SIZE(mcu_can_tx_list);
+    const uint8_t can_rx_len = MP_ARRAY_SIZE(mcu_can_rx_list);
+
+    const mcu_periph_obj_t *mcu_tx = find_pin_function(mcu_can_tx_list, can_tx_len, tx, -1);
+    if (!mcu_tx) {
+        mp_raise_ValueError_varg(translate("Invalid %q pin selection"), MP_QSTR_tx);
+    }
+    int periph_index = mcu_tx->periph_index;
+
+    const mcu_periph_obj_t *mcu_rx = find_pin_function(mcu_can_rx_list, can_rx_len, rx, periph_index);
+    if (!mcu_rx) {
+        mp_raise_ValueError_varg(translate("Invalid %q pin selection"), MP_QSTR_rx);
+    }
+
+    if (reserved_can[periph_index]) {
+        mp_raise_ValueError(translate("Hardware busy, try alternative pins"));
+    }
+
+    const uint32_t can_frequency = 42000000;
+    uint32_t clocks_per_bit = DIV_ROUND(can_frequency, baudrate);
+    uint32_t clocks_to_sample = DIV_ROUND(clocks_per_bit * 7, 8);
+    uint32_t clocks_after_sample = clocks_per_bit - clocks_to_sample;
+    uint32_t divisor = MAX(DIV_ROUND_UP(clocks_to_sample, 16), DIV_ROUND_UP(clocks_after_sample, 8));
+    const uint32_t sjw = 3;
+
+    uint32_t tq_per_bit = DIV_ROUND(clocks_per_bit, divisor);
+    uint32_t tq_to_sample = DIV_ROUND(clocks_to_sample, divisor);
+    uint32_t tq_after_sample = tq_per_bit - tq_to_sample;
+
+    if (divisor > 1023) {
+        mp_raise_OSError(MP_EINVAL); // baudrate cannot be attained (16kHz or something is lower bound, should never happen)
+    }
+
+    {
+        GPIO_InitTypeDef GPIO_InitStruct = {
+            .Pin = pin_mask(tx->number),
+            .Speed = GPIO_SPEED_FREQ_VERY_HIGH,
+            .Mode = GPIO_MODE_AF_PP,
+            .Pull = GPIO_PULLUP,
+            .Alternate = mcu_tx->altfn_index,
+        };
+        HAL_GPIO_Init(pin_port(tx->port), &GPIO_InitStruct);
+
+        GPIO_InitStruct.Pin = pin_mask(rx->number);
+        GPIO_InitStruct.Alternate = mcu_rx->altfn_index;
+        HAL_GPIO_Init(pin_port(rx->port), &GPIO_InitStruct);
+    }
+
+    CAN_TypeDef *hw = mcu_can_banks[periph_index - 1];
+
+    // CAN2 shares resources with CAN1.  So we always enable CAN1, then split
+    // the filter banks equally between them.
+
+    __HAL_RCC_CAN1_CLK_ENABLE();
+
+    if(hw == CAN2) {
+        __HAL_RCC_CAN2_CLK_ENABLE();
+        self->start_filter_bank = 14;
+        self->end_filter_bank = 28;
+        self->filter_hw = CAN1;
+    } else {
+        self->start_filter_bank = 0;
+        self->end_filter_bank = 14;
+        self->filter_hw = hw;
+    }
+
+    CAN_InitTypeDef init = {
+        .AutoRetransmission = ENABLE,
+        .AutoBusOff = ENABLE,
+        .Prescaler = divisor,
+        .Mode = (loopback ? CAN_MODE_LOOPBACK : 0) | (silent ? CAN_MODE_SILENT_LOOPBACK : 0),
+        .SyncJumpWidth = (sjw-1) << CAN_BTR_SJW_Pos,
+        .TimeSeg1 = (tq_to_sample-2) << CAN_BTR_TS1_Pos,
+        .TimeSeg2 = (tq_after_sample-1) << CAN_BTR_TS2_Pos,
+    };
+
+    self->periph_index = periph_index;
+    self->silent = silent;
+    self->loopback = loopback;
+    self->baudrate = baudrate;
+
+    self->handle.Instance = hw;
+    self->handle.Init = init;
+    self->handle.State = HAL_CAN_STATE_RESET;
+
+    HAL_CAN_Init(&self->handle);
+
+    // Set the filter split as 14:14
+    // COULDDO(@jepler): Dynamically allocate filter banks between CAN1/2
+    self->filter_hw->FMR |= CAN_FMR_FINIT;
+    self->filter_hw->FMR = CAN_FMR_FINIT | (14 << CAN_FMR_CAN2SB_Pos);
+
+    // Clear every filter enable bit for this can HW
+    uint32_t fa1r = self->filter_hw->FA1R;
+    for (int i = self->start_filter_bank; i<self->end_filter_bank; i++) {
+        fa1r &= ~(1 << i);
+    }
+    self->filter_hw->FA1R = fa1r;
+    CLEAR_BIT(self->filter_hw->FMR, CAN_FMR_FINIT);
+
+    HAL_CAN_Start(&self->handle);
+
+    reserved_can[periph_index] = true;
+}
+
+bool common_hal_canio_can_loopback_get(canio_can_obj_t *self)
+{
+    return self->loopback;
+}
+
+int common_hal_canio_can_baudrate_get(canio_can_obj_t *self)
+{
+    return self->baudrate;
+}
+
+int common_hal_canio_can_transmit_error_count_get(canio_can_obj_t *self)
+{
+    return (self->handle.Instance->ESR & CAN_ESR_TEC) >> CAN_ESR_TEC_Pos;
+}
+
+int common_hal_canio_can_receive_error_count_get(canio_can_obj_t *self)
+{
+    return (self->handle.Instance->ESR & CAN_ESR_REC) >> CAN_ESR_REC_Pos;
+}
+
+int common_hal_canio_can_error_warning_state_count_get(canio_can_obj_t *self)
+{
+    return self->error_warning_state_count;
+}
+
+int common_hal_canio_can_error_passive_state_count_get(canio_can_obj_t *self)
+{
+    return self->error_passive_state_count;
+}
+
+int common_hal_canio_can_bus_off_state_count_get(canio_can_obj_t *self)
+{
+    return self->bus_off_state_count;
+}
+
+canio_bus_state_t common_hal_canio_can_state_get(canio_can_obj_t *self) {
+    uint32_t esr = self->handle.Instance->ESR;
+    if (READ_BIT(esr, CAN_ESR_BOFF)) {
+        return BUS_STATE_OFF;
+    }
+    if (READ_BIT(esr, CAN_ESR_EPVF)) {
+        return BUS_STATE_ERROR_PASSIVE;
+    }
+    if (READ_BIT(esr, CAN_ESR_EWGF)) {
+        return BUS_STATE_ERROR_WARNING;
+    }
+    return BUS_STATE_ERROR_ACTIVE;
+}
+
+void common_hal_canio_can_restart(canio_can_obj_t *self) {
+    if (!common_hal_canio_can_auto_restart_get(self)) {
+        HAL_CAN_Start(&self->handle);
+    }
+}
+
+bool common_hal_canio_can_auto_restart_get(canio_can_obj_t *self) {
+    return READ_BIT(self->handle.Instance->MCR, CAN_MCR_ABOM);
+}
+
+void common_hal_canio_can_auto_restart_set(canio_can_obj_t *self, bool value) {
+    if(value) {
+        SET_BIT(self->handle.Instance->MCR, CAN_MCR_ABOM);
+    } else {
+        CLEAR_BIT(self->handle.Instance->MCR, CAN_MCR_ABOM);
+    }
+}
+
+void common_hal_canio_can_send(canio_can_obj_t *self, mp_obj_t message_in)
+{
+    canio_message_obj_t *message = message_in;
+    uint32_t mailbox;
+    bool rtr = message->base.type == &canio_remote_transmission_request_type;
+    CAN_TxHeaderTypeDef header = {
+        .StdId = message->id,
+        .ExtId = message->id,
+        .IDE = message->extended ? CAN_ID_EXT : CAN_ID_STD,
+        .RTR = rtr ? CAN_RTR_REMOTE : CAN_RTR_DATA,
+        .DLC = message->size,
+    };
+    HAL_StatusTypeDef status = HAL_CAN_AddTxMessage(&self->handle, &header, message->data, &mailbox);
+    if (status != HAL_OK) {
+        mp_raise_OSError(MP_ENOMEM);
+    }
+}
+
+bool common_hal_canio_can_silent_get(canio_can_obj_t *self) {
+    return self->silent;
+}
+
+bool common_hal_canio_can_deinited(canio_can_obj_t *self) {
+    return !self->handle.Instance;
+}
+
+void common_hal_canio_can_check_for_deinit(canio_can_obj_t *self) {
+    if (common_hal_canio_can_deinited(self)) {
+        raise_deinited_error();
+    }
+}
+
+void common_hal_canio_can_deinit(canio_can_obj_t *self)
+{
+    if (self->handle.Instance) {
+        SET_BIT(self->handle.Instance->MCR, CAN_MCR_RESET);
+        while (READ_BIT(self->handle.Instance->MCR, CAN_MCR_RESET)) {
+        }
+        reserved_can[self->periph_index] = 0;
+    }
+    self->handle.Instance = NULL;
+}
+
+void common_hal_canio_reset(void) {
+    for (size_t i=0; i<MP_ARRAY_SIZE(mcu_can_banks); i++) {
+        SET_BIT(mcu_can_banks[i]->MCR, CAN_MCR_RESET);
+        reserved_can[i] = 0;
+    }
+}
diff --git a/ports/stm/common-hal/canio/CAN.h b/ports/stm/common-hal/canio/CAN.h
new file mode 100644
index 000000000..bffc0f65f
--- /dev/null
+++ b/ports/stm/common-hal/canio/CAN.h
@@ -0,0 +1,60 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jeff Epler 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.
+ */
+
+#pragma once
+
+#include "py/obj.h"
+#include "shared-bindings/canio/__init__.h"
+#include "shared-bindings/canio/CAN.h"
+#include "common-hal/microcontroller/Pin.h"
+#include "common-hal/canio/__init__.h"
+#include "shared-module/canio/Message.h"
+
+#include "stm32f4xx_hal.h"
+#include "stm32f4xx_hal_can.h"
+
+#define FILTER_BANK_COUNT (28)
+
+typedef struct canio_can_obj {
+    mp_obj_base_t base;
+    CAN_HandleTypeDef handle;
+    CAN_TypeDef *filter_hw;
+    volatile uint32_t error_warning_state_count;
+    volatile uint32_t error_passive_state_count;
+    volatile uint32_t bus_off_state_count;
+    int baudrate;
+    const mcu_pin_obj_t *rx_pin;
+    const mcu_pin_obj_t *tx_pin;
+    bool loopback:1;
+    bool silent:1;
+    bool auto_restart:1;
+    bool fifo0_in_use:1;
+    bool fifo1_in_use:1;
+    uint8_t periph_index:2;
+    uint8_t start_filter_bank;
+    uint8_t end_filter_bank;
+    long filter_in_use; // bitmask for the 28 filter banks
+} canio_can_obj_t;
diff --git a/ports/stm/common-hal/canio/Listener.c b/ports/stm/common-hal/canio/Listener.c
new file mode 100644
index 000000000..dd968979d
--- /dev/null
+++ b/ports/stm/common-hal/canio/Listener.c
@@ -0,0 +1,314 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jeff Epler 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 <math.h>
+#include <string.h>
+
+#include "py/obj.h"
+#include "py/runtime.h"
+
+#include "common-hal/canio/__init__.h"
+#include "common-hal/canio/Listener.h"
+#include "shared-bindings/util.h"
+#include "supervisor/shared/tick.h"
+#include "supervisor/shared/safe_mode.h"
+
+STATIC void allow_filter_change(canio_can_obj_t *can) {
+    can->filter_hw->FMR |= CAN_FMR_FINIT;
+}
+
+STATIC void prevent_filter_change(canio_can_obj_t *can) {
+    can->filter_hw->FMR &= ~CAN_FMR_FINIT;
+}
+
+STATIC bool filter_in_use(canio_can_obj_t *can, int idx) {
+    return can->filter_hw->FA1R & (1<<idx);
+}
+
+// One filter bank can hold:
+//  * one extended mask
+//  * two extended ids
+//  * two standard masks
+//  * four extended ids
+// However, stm needs two filters to permit RTR and non-RTR messages
+// so we ONLY use mask-type filter banks
+STATIC size_t num_filters_needed(size_t nmatch, canio_match_obj_t **matches) {
+    if (nmatch == 0) {
+        return 1;
+    }
+    size_t num_extended_mask = 0;
+    size_t num_standard_mask = 1;
+    for(size_t i=0; i<nmatch; i++) {
+        if (matches[i]->extended) {
+            num_extended_mask += 1;
+        } else {
+            num_standard_mask += 1;
+        }
+    }
+    return num_extended_mask + num_standard_mask/2;
+}
+
+STATIC size_t num_filters_available(canio_can_obj_t *can) {
+    size_t available = 0;
+    for(size_t i = can->start_filter_bank; i < can->end_filter_bank; i++) {
+        if (!filter_in_use(can, i)) {
+            available++;
+        }
+    }
+    return available;
+}
+
+STATIC void clear_filters(canio_listener_obj_t *self) {
+    canio_can_obj_t *can = self->can;
+
+    allow_filter_change(can);
+    uint32_t fa1r = can->filter_hw->FA1R;
+    for(size_t i = can->start_filter_bank; i < can->end_filter_bank; i++) {
+        if (((can->filter_hw->FFA1R >> i) & 1) == self->fifo_idx) {
+            fa1r &= ~(1<<i);
+        }
+    }
+    can->filter_hw->FA1R = fa1r;
+    prevent_filter_change(can);
+}
+
+STATIC int next_filter(canio_can_obj_t *can) {
+    uint32_t fa1r = can->filter_hw->FA1R;
+    for(size_t i = can->start_filter_bank; i < can->end_filter_bank; i++) {
+        if (!(fa1r & (1<<i))) {
+            return i;
+        }
+    }
+    reset_into_safe_mode(MICROPY_FATAL_ERROR);
+    return -1;
+}
+
+// IDE = "extended ID" flag of packet header.  We always add this bit to the
+// mask because a match is always for just one kind of address length
+#define FILTER16_IDE (1<<3)
+#define FILTER32_IDE (1<<2)
+
+STATIC void install_standard_filter(canio_listener_obj_t *self, canio_match_obj_t *match1, canio_match_obj_t *match2) {
+    int bank = next_filter(self->can);
+
+    // filter is already deactivated, so we skip deactivating it here
+    // CLEAR_BIT(self->can->filter_hw->FA1R, bank);
+
+    self->can->filter_hw->sFilterRegister[bank].FR1 =
+        (((match1->id & 0x7ff) << 5)) |
+        (((match1->mask & 0x7ff) << 5 | FILTER16_IDE)) << 16;
+    self->can->filter_hw->sFilterRegister[bank].FR2 =
+        (((match2->id & 0x7ff) << 5)) |
+        (((match2->mask & 0x7ff) << 5 | FILTER16_IDE)) << 16;
+
+    // filter mode: 0 = mask
+    // (this bit should be clear already, we never set it; but just in case)
+    CLEAR_BIT(self->can->filter_hw->FM1R, 1 << bank);
+    // filter scale: 0 = 16 bits
+    CLEAR_BIT(self->can->filter_hw->FS1R, 1 << bank);
+    // fifo assignment: 1 = FIFO 1
+    if (self->fifo_idx) {
+        SET_BIT(self->can->filter_hw->FFA1R, 1 << bank);
+    } else {
+        CLEAR_BIT(self->can->filter_hw->FFA1R, 1 << bank);
+    }
+
+    // filter activation: 1 = enabled
+    SET_BIT(self->can->filter_hw->FA1R, 1 << bank);
+}
+
+STATIC void install_extended_filter(canio_listener_obj_t *self, canio_match_obj_t *match) {
+    int bank = next_filter(self->can);
+
+    // filter is already deactivated, so we skip deactivating it here
+    // CLEAR_BIT(self->can->filter_hw->FA1R, bank);
+
+    self->can->filter_hw->sFilterRegister[bank].FR1 =
+        ((match->id << 3) | FILTER32_IDE);
+    self->can->filter_hw->sFilterRegister[bank].FR2 =
+        ((match->mask << 3) | FILTER32_IDE);
+
+    // filter mode: 0 = mask
+    // (this bit should be clear already, we never set it; but just in case)
+    CLEAR_BIT(self->can->filter_hw->FM1R, 1 << bank);
+    // filter scale: 1 = 32 bits
+    SET_BIT(self->can->filter_hw->FS1R, 1 << bank);
+    // fifo assignment: 1 = FIFO 1
+    if (self->fifo_idx) {
+        SET_BIT(self->can->filter_hw->FFA1R, 1 << bank);
+    } else {
+        CLEAR_BIT(self->can->filter_hw->FFA1R, 1 << bank);
+    }
+
+    // filter activation: 1 = enabled
+    SET_BIT(self->can->filter_hw->FA1R, 1 << bank);
+}
+
+STATIC void install_all_match_filter(canio_listener_obj_t *self) {
+    int bank = next_filter(self->can);
+
+    // filter is already deactivated, so we skip deactivating it here
+    // CLEAR_BIT(self->can->filter_hw->FA1R, bank);
+
+    self->can->filter_hw->sFilterRegister[bank].FR1 = 0;
+    self->can->filter_hw->sFilterRegister[bank].FR2 = 0;
+
+    // filter mode: 0 = mask
+    // (this bit should be clear already, we never set it; but just in case)
+    CLEAR_BIT(self->can->filter_hw->FM1R, bank);
+    // filter scale: 1 = 32 bits
+    SET_BIT(self->can->filter_hw->FS1R, bank);
+    // fifo assignment: 1 = FIFO 1
+    if (self->fifo_idx) {
+        SET_BIT(self->can->filter_hw->FFA1R, bank);
+    } else {
+        CLEAR_BIT(self->can->filter_hw->FFA1R, bank);
+    }
+
+    // filter activation: 1 = enabled
+    SET_BIT(self->can->filter_hw->FA1R, (1 << bank));
+}
+
+
+#define NO_ADDRESS (-1)
+void set_filters(canio_listener_obj_t *self, size_t nmatch, canio_match_obj_t **matches) {
+    allow_filter_change(self->can);
+    if (!nmatch) {
+        install_all_match_filter(self);
+    } else {
+        canio_match_obj_t *first_match = NULL;
+        for(size_t i = 0; i<nmatch; i++) {
+            if(matches[i]->extended) {
+                install_extended_filter(self, matches[i]);
+            } else {
+                if (first_match) {
+                    install_standard_filter(self, first_match, matches[i]);
+                    first_match = NULL;
+                } else {
+                    first_match = matches[i];
+                }
+            }
+        }
+        if (first_match) {
+            install_standard_filter(self, first_match, first_match);
+        }
+    }
+    prevent_filter_change(self->can);
+}
+
+
+void common_hal_canio_listener_construct(canio_listener_obj_t *self, canio_can_obj_t *can, size_t nmatch, canio_match_obj_t **matches, float timeout) {
+    if (!can->fifo0_in_use) {
+        self->fifo_idx = 0;
+        self->rfr = &can->handle.Instance->RF0R;
+        can->fifo0_in_use = true;
+    } else if (!can->fifo1_in_use) {
+        self->fifo_idx = 1;
+        self->rfr = &can->handle.Instance->RF1R;
+        can->fifo1_in_use = true;
+    } else {
+        mp_raise_ValueError(translate("All RX FIFOs in use"));
+    }
+
+    if (num_filters_needed(nmatch, matches) > num_filters_available(can)) {
+        mp_raise_ValueError(translate("Filters too complex"));
+    }
+
+    // Nothing can fail now so it's safe to assign self->can
+    self->can = can;
+
+    self->mailbox = &can->handle.Instance->sFIFOMailBox[self->fifo_idx];
+    set_filters(self, nmatch, matches);
+    common_hal_canio_listener_set_timeout(self, timeout);
+}
+
+void common_hal_canio_listener_set_timeout(canio_listener_obj_t *self, float timeout) {
+    self->timeout_ms = (int)MICROPY_FLOAT_C_FUN(ceil)(timeout * 1000);
+}
+
+float common_hal_canio_listener_get_timeout(canio_listener_obj_t *self) {
+    return self->timeout_ms / 1000.0f;
+}
+
+void common_hal_canio_listener_check_for_deinit(canio_listener_obj_t *self) {
+    if (!self->can) {
+        raise_deinited_error();
+    }
+    common_hal_canio_can_check_for_deinit(self->can);
+}
+
+int common_hal_canio_listener_in_waiting(canio_listener_obj_t *self) {
+    return *(self->rfr) & CAN_RF0R_FMP0;
+}
+
+mp_obj_t common_hal_canio_listener_receive(canio_listener_obj_t *self) {
+    if (!common_hal_canio_listener_in_waiting(self)) {
+        uint64_t deadline = supervisor_ticks_ms64() + self->timeout_ms;
+        do {
+            if (supervisor_ticks_ms64() > deadline) {
+                return NULL;
+            }
+        } while (!common_hal_canio_listener_in_waiting(self));
+    }
+
+    uint32_t rir = self->mailbox->RIR;
+    uint32_t rdtr = self->mailbox->RDTR;
+
+    bool rtr = rir & CAN_RI0R_RTR;
+    canio_message_obj_t *message = m_new_obj(canio_message_obj_t);
+    message->base.type = rtr ? &canio_remote_transmission_request_type : &canio_message_type;
+    message->extended = rir & CAN_RI0R_IDE;
+    if (message->extended) {
+        message->id = rir >> 3;
+    } else {
+        message->id = rir >> 21;
+    }
+    message->size = rdtr & CAN_RDT0R_DLC;
+    if (!rtr) {
+        uint32_t payload[] = { self->mailbox->RDLR, self->mailbox->RDHR };
+        MP_STATIC_ASSERT(sizeof(payload) == sizeof(message->data));
+        memcpy(message->data, payload, sizeof(payload));
+    }
+    // Release the mailbox
+    SET_BIT(*self->rfr, CAN_RF0R_RFOM0);
+    return message;
+}
+
+void common_hal_canio_listener_deinit(canio_listener_obj_t *self) {
+    if (self->can) {
+        clear_filters(self);
+        if (self->fifo_idx == 0) {
+            self->can->fifo0_in_use = false;
+        }
+        if (self->fifo_idx == 1) {
+            self->can->fifo1_in_use = false;
+        }
+    }
+    self->fifo_idx = -1;
+    self->can = NULL;
+    self->mailbox = NULL;
+    self->rfr = NULL;
+}
diff --git a/ports/stm/common-hal/canio/Listener.h b/ports/stm/common-hal/canio/Listener.h
new file mode 100644
index 000000000..2e1778888
--- /dev/null
+++ b/ports/stm/common-hal/canio/Listener.h
@@ -0,0 +1,47 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jeff Epler 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.
+ */
+
+#pragma once
+
+#include "common-hal/canio/CAN.h"
+#include "shared-module/canio/Match.h"
+
+typedef struct canio_listener_obj {
+    mp_obj_base_t base;
+    canio_can_obj_t *can;
+    CAN_FIFOMailBox_TypeDef *mailbox;
+    __IO uint32_t *rfr;
+    uint32_t timeout_ms;
+    uint8_t fifo_idx;
+} canio_listener_obj_t;
+
+void common_hal_canio_listener_construct(canio_listener_obj_t *self, canio_can_obj_t *can, size_t nmatch, canio_match_obj_t **matches, float timeout);
+void common_hal_canio_listener_check_for_deinit(canio_listener_obj_t *self);
+void common_hal_canio_listener_deinit(canio_listener_obj_t *self);
+bool common_hal_canio_listener_receiveinto(canio_listener_obj_t *self, canio_message_obj_t *message);
+int common_hal_canio_listener_in_waiting(canio_listener_obj_t *self);
+float common_hal_canio_listener_get_timeout(canio_listener_obj_t *self);
+void common_hal_canio_listener_set_timeout(canio_listener_obj_t *self, float timeout);
diff --git a/ports/stm/common-hal/canio/__init__.c b/ports/stm/common-hal/canio/__init__.c
new file mode 100644
index 000000000..7932bfc2d
--- /dev/null
+++ b/ports/stm/common-hal/canio/__init__.c
@@ -0,0 +1,25 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jeff Epler 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.
+ */
diff --git a/ports/stm/common-hal/canio/__init__.h b/ports/stm/common-hal/canio/__init__.h
new file mode 100644
index 000000000..20b6638cd
--- /dev/null
+++ b/ports/stm/common-hal/canio/__init__.h
@@ -0,0 +1,27 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jeff Epler 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.
+ */
+
+#pragma once
diff --git a/ports/stm/hal_conf/stm32_hal_conf.h b/ports/stm/hal_conf/stm32_hal_conf.h
index c91be86fd..8000e7e83 100644
--- a/ports/stm/hal_conf/stm32_hal_conf.h
+++ b/ports/stm/hal_conf/stm32_hal_conf.h
@@ -11,7 +11,7 @@
   */
 #define HAL_MODULE_ENABLED
 #define HAL_ADC_MODULE_ENABLED
-// #define HAL_CAN_MODULE_ENABLED
+#define HAL_CAN_MODULE_ENABLED
 // #define HAL_CEC_MODULE_ENABLED
 // #define HAL_COMP_MODULE_ENABLED
 #define HAL_CORTEX_MODULE_ENABLED
diff --git a/ports/stm/peripherals/stm32f4/stm32f405xx/periph.c b/ports/stm/peripherals/stm32f4/stm32f405xx/periph.c
index c58234671..2f9accbf1 100644
--- a/ports/stm/peripherals/stm32f4/stm32f405xx/periph.c
+++ b/ports/stm/peripherals/stm32f4/stm32f405xx/periph.c
@@ -216,3 +216,26 @@ const mcu_periph_obj_t mcu_sdio_data2_list[1] = {
 const mcu_periph_obj_t mcu_sdio_data3_list[1] = {
     PERIPH(1, 12, &pin_PC11),
 };
+
+//CAN
+CAN_TypeDef * mcu_can_banks[2] = {CAN1, CAN2};
+
+const mcu_periph_obj_t mcu_can_tx_list[6] = {
+    PERIPH(1, 9, &pin_PA11),
+    PERIPH(1, 9, &pin_PB08),
+    PERIPH(1, 9, &pin_PD00),
+    PERIPH(1, 9, &pin_PI09),
+
+    PERIPH(2, 9, &pin_PB12),
+    PERIPH(2, 9, &pin_PB05),
+};
+
+const mcu_periph_obj_t mcu_can_rx_list[6] = {
+    PERIPH(1, 9, &pin_PA12),
+    PERIPH(1, 9, &pin_PB09),
+    PERIPH(1, 9, &pin_PD01),
+    PERIPH(1, 9, &pin_PH13),
+
+    PERIPH(2, 9, &pin_PB13),
+    PERIPH(2, 9, &pin_PB06),
+};
diff --git a/ports/stm/peripherals/stm32f4/stm32f405xx/periph.h b/ports/stm/peripherals/stm32f4/stm32f405xx/periph.h
index 5b64fe10c..03198af55 100644
--- a/ports/stm/peripherals/stm32f4/stm32f405xx/periph.h
+++ b/ports/stm/peripherals/stm32f4/stm32f405xx/periph.h
@@ -71,5 +71,11 @@ extern const mcu_periph_obj_t mcu_sdio_data1_list[1];
 extern const mcu_periph_obj_t mcu_sdio_data2_list[1];
 extern const mcu_periph_obj_t mcu_sdio_data3_list[1];
 
+// CAN
+extern CAN_TypeDef * mcu_can_banks[2];
+
+extern const mcu_periph_obj_t mcu_can_tx_list[6];
+extern const mcu_periph_obj_t mcu_can_rx_list[6];
+
 
 #endif // MICROPY_INCLUDED_STM32_PERIPHERALS_STM32F405XX_PERIPH_H
-- 
cgit v1.2.3


From 7df01d3fbd321855cc65dc185d17933e4c5b388f Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Mon, 5 Oct 2020 12:41:22 -0500
Subject: stm32: canio: enable on all stm32f405 boards

---
 ports/stm/boards/feather_stm32f405_express/mpconfigboard.mk | 2 --
 ports/stm/mpconfigport.mk                                   | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'ports/stm')

diff --git a/ports/stm/boards/feather_stm32f405_express/mpconfigboard.mk b/ports/stm/boards/feather_stm32f405_express/mpconfigboard.mk
index 086622384..4d0bd4598 100644
--- a/ports/stm/boards/feather_stm32f405_express/mpconfigboard.mk
+++ b/ports/stm/boards/feather_stm32f405_express/mpconfigboard.mk
@@ -16,5 +16,3 @@ LD_DEFAULT = boards/STM32F405_default.ld
 # UF2 boot option
 LD_BOOT = boards/STM32F405_boot.ld
 UF2_OFFSET = 0x8010000
-
-CIRCUITPY_CANIO = 1
diff --git a/ports/stm/mpconfigport.mk b/ports/stm/mpconfigport.mk
index b827aa48b..bcecaa517 100644
--- a/ports/stm/mpconfigport.mk
+++ b/ports/stm/mpconfigport.mk
@@ -4,6 +4,7 @@ INTERNAL_LIBM ?= 1
 USB_SERIAL_NUMBER_LENGTH ?= 24
 
 ifeq ($(MCU_VARIANT),STM32F405xx)
+	CIRCUITPY_CANIO = 1
 	CIRCUITPY_FRAMEBUFFERIO ?= 1
 	CIRCUITPY_RGBMATRIX ?= 1
 	CIRCUITPY_SDIOIO ?= 1
-- 
cgit v1.2.3


From 23bd2496de3eb07385f74801df9971f9b63236bb Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Mon, 5 Oct 2020 12:41:31 -0500
Subject: stm32: canio: remove some unneeded declarations

---
 ports/stm/common-hal/canio/Listener.c | 1 +
 ports/stm/common-hal/canio/Listener.h | 8 --------
 2 files changed, 1 insertion(+), 8 deletions(-)

(limited to 'ports/stm')

diff --git a/ports/stm/common-hal/canio/Listener.c b/ports/stm/common-hal/canio/Listener.c
index dd968979d..09456d39d 100644
--- a/ports/stm/common-hal/canio/Listener.c
+++ b/ports/stm/common-hal/canio/Listener.c
@@ -32,6 +32,7 @@
 
 #include "common-hal/canio/__init__.h"
 #include "common-hal/canio/Listener.h"
+#include "shared-bindings/canio/Listener.h"
 #include "shared-bindings/util.h"
 #include "supervisor/shared/tick.h"
 #include "supervisor/shared/safe_mode.h"
diff --git a/ports/stm/common-hal/canio/Listener.h b/ports/stm/common-hal/canio/Listener.h
index 2e1778888..2d0e302e9 100644
--- a/ports/stm/common-hal/canio/Listener.h
+++ b/ports/stm/common-hal/canio/Listener.h
@@ -37,11 +37,3 @@ typedef struct canio_listener_obj {
     uint32_t timeout_ms;
     uint8_t fifo_idx;
 } canio_listener_obj_t;
-
-void common_hal_canio_listener_construct(canio_listener_obj_t *self, canio_can_obj_t *can, size_t nmatch, canio_match_obj_t **matches, float timeout);
-void common_hal_canio_listener_check_for_deinit(canio_listener_obj_t *self);
-void common_hal_canio_listener_deinit(canio_listener_obj_t *self);
-bool common_hal_canio_listener_receiveinto(canio_listener_obj_t *self, canio_message_obj_t *message);
-int common_hal_canio_listener_in_waiting(canio_listener_obj_t *self);
-float common_hal_canio_listener_get_timeout(canio_listener_obj_t *self);
-void common_hal_canio_listener_set_timeout(canio_listener_obj_t *self, float timeout);
-- 
cgit v1.2.3


From a7dccb39a487cdd2e65d9b9b588829818de1d16f Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Mon, 5 Oct 2020 12:41:50 -0500
Subject: stm32: canio: remove unused functions

---
 ports/stm/common-hal/canio/CAN.c | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'ports/stm')

diff --git a/ports/stm/common-hal/canio/CAN.c b/ports/stm/common-hal/canio/CAN.c
index 0edf1217e..244cc037c 100644
--- a/ports/stm/common-hal/canio/CAN.c
+++ b/ports/stm/common-hal/canio/CAN.c
@@ -181,21 +181,6 @@ int common_hal_canio_can_receive_error_count_get(canio_can_obj_t *self)
     return (self->handle.Instance->ESR & CAN_ESR_REC) >> CAN_ESR_REC_Pos;
 }
 
-int common_hal_canio_can_error_warning_state_count_get(canio_can_obj_t *self)
-{
-    return self->error_warning_state_count;
-}
-
-int common_hal_canio_can_error_passive_state_count_get(canio_can_obj_t *self)
-{
-    return self->error_passive_state_count;
-}
-
-int common_hal_canio_can_bus_off_state_count_get(canio_can_obj_t *self)
-{
-    return self->bus_off_state_count;
-}
-
 canio_bus_state_t common_hal_canio_can_state_get(canio_can_obj_t *self) {
     uint32_t esr = self->handle.Instance->ESR;
     if (READ_BIT(esr, CAN_ESR_BOFF)) {
-- 
cgit v1.2.3


From e5a0af9216a6d868fad9105a4eb44e0889f54e29 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 6 Oct 2020 09:18:53 -0500
Subject: stm32: canio: When Tx mailboxes are full, cancel an old message

.. also add the 8ms wait for transmission that the atmel sam port
has
---
 ports/stm/common-hal/canio/CAN.c | 18 ++++++++++++++++++
 ports/stm/common-hal/canio/CAN.h |  1 +
 2 files changed, 19 insertions(+)

(limited to 'ports/stm')

diff --git a/ports/stm/common-hal/canio/CAN.c b/ports/stm/common-hal/canio/CAN.c
index 244cc037c..8ff91aaca 100644
--- a/ports/stm/common-hal/canio/CAN.c
+++ b/ports/stm/common-hal/canio/CAN.c
@@ -225,10 +225,28 @@ void common_hal_canio_can_send(canio_can_obj_t *self, mp_obj_t message_in)
         .RTR = rtr ? CAN_RTR_REMOTE : CAN_RTR_DATA,
         .DLC = message->size,
     };
+    uint32_t free_level = HAL_CAN_GetTxMailboxesFreeLevel(&self->handle);
+    if (free_level == 0) {
+        // There's no free Tx mailbox.  We need to cancel some message without
+        // transmitting it, because once the bus returns to active state it's
+        // preferable to transmit the newest messages instead of older messages.
+        //
+        // We don't strictly guarantee that we abort the oldest Tx request,
+        // rather we just abort a different index each time.  This permits us
+        // to avoid tracking this information altogether.
+        HAL_CAN_AbortTxRequest(&self->handle, 1 << (self->cancel_mailbox));
+        self->cancel_mailbox = (self->cancel_mailbox + 1) % 3;
+    }
     HAL_StatusTypeDef status = HAL_CAN_AddTxMessage(&self->handle, &header, message->data, &mailbox);
     if (status != HAL_OK) {
         mp_raise_OSError(MP_ENOMEM);
     }
+
+    // wait 8ms (hard coded for now) for TX to occur
+    uint64_t deadline = port_get_raw_ticks(NULL) + 8;
+    while (port_get_raw_ticks(NULL) < deadline && HAL_CAN_IsTxMessagePending(&self->handle, 1 << mailbox)) {
+        RUN_BACKGROUND_TASKS;
+    }
 }
 
 bool common_hal_canio_can_silent_get(canio_can_obj_t *self) {
diff --git a/ports/stm/common-hal/canio/CAN.h b/ports/stm/common-hal/canio/CAN.h
index bffc0f65f..94d7e99a8 100644
--- a/ports/stm/common-hal/canio/CAN.h
+++ b/ports/stm/common-hal/canio/CAN.h
@@ -54,6 +54,7 @@ typedef struct canio_can_obj {
     bool fifo0_in_use:1;
     bool fifo1_in_use:1;
     uint8_t periph_index:2;
+    uint8_t cancel_mailbox;
     uint8_t start_filter_bank;
     uint8_t end_filter_bank;
     long filter_in_use; // bitmask for the 28 filter banks
-- 
cgit v1.2.3


From abe0405d6e643614557edd65995b61c04c656c44 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 6 Oct 2020 10:31:01 -0500
Subject: stm32: canio: Fix canio.CAN.restart()

---
 ports/stm/common-hal/canio/CAN.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'ports/stm')

diff --git a/ports/stm/common-hal/canio/CAN.c b/ports/stm/common-hal/canio/CAN.c
index 8ff91aaca..62c4e9935 100644
--- a/ports/stm/common-hal/canio/CAN.c
+++ b/ports/stm/common-hal/canio/CAN.c
@@ -197,7 +197,15 @@ canio_bus_state_t common_hal_canio_can_state_get(canio_can_obj_t *self) {
 
 void common_hal_canio_can_restart(canio_can_obj_t *self) {
     if (!common_hal_canio_can_auto_restart_get(self)) {
-        HAL_CAN_Start(&self->handle);
+        // "If ABOM is cleared, the software must initiate the recovering
+        // sequence by requesting bxCAN to enter and to leave initialization
+        // mode."
+        self->handle.Instance->MCR |= CAN_MCR_INRQ;
+        while ((self->handle.Instance->MSR & CAN_MSR_INAK) == 0) {
+        }
+        self->handle.Instance->MCR &= ~CAN_MCR_INRQ;
+        while ((self->handle.Instance->MSR & CAN_MSR_INAK)) {
+        }
     }
 }
 
-- 
cgit v1.2.3


From eed3387f4e625335a5d2f6582946ec75d1c1ed10 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 6 Oct 2020 10:31:38 -0500
Subject: stm32: canio: Fix message cancellation

.. it's necessary to wait for a cancellation request to actually free
the respective Tx mailbox
---
 ports/stm/common-hal/canio/CAN.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'ports/stm')

diff --git a/ports/stm/common-hal/canio/CAN.c b/ports/stm/common-hal/canio/CAN.c
index 62c4e9935..fe1c3f2b1 100644
--- a/ports/stm/common-hal/canio/CAN.c
+++ b/ports/stm/common-hal/canio/CAN.c
@@ -241,13 +241,21 @@ void common_hal_canio_can_send(canio_can_obj_t *self, mp_obj_t message_in)
         //
         // We don't strictly guarantee that we abort the oldest Tx request,
         // rather we just abort a different index each time.  This permits us
-        // to avoid tracking this information altogether.
+        // to just track a single cancel index
         HAL_CAN_AbortTxRequest(&self->handle, 1 << (self->cancel_mailbox));
         self->cancel_mailbox = (self->cancel_mailbox + 1) % 3;
+        // The abort request may not have completed immediately, so wait for
+        // the Tx mailbox to become free
+        do {
+            free_level = HAL_CAN_GetTxMailboxesFreeLevel(&self->handle);
+        } while (!free_level);
     }
     HAL_StatusTypeDef status = HAL_CAN_AddTxMessage(&self->handle, &header, message->data, &mailbox);
     if (status != HAL_OK) {
-        mp_raise_OSError(MP_ENOMEM);
+        // this is a "shouldn't happen" condition.  we don't throw because the
+        // contract of send() is that it queues the packet to be sent if
+        // possible and does not signal success or failure to actually send.
+        return;
     }
 
     // wait 8ms (hard coded for now) for TX to occur
-- 
cgit v1.2.3


From 81d7ef0256d5450e56809c5fe198693cc6cb9925 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 6 Oct 2020 20:13:23 -0500
Subject: stm: canio: remove stray optimization flag for debugging

---
 ports/stm/common-hal/canio/CAN.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'ports/stm')

diff --git a/ports/stm/common-hal/canio/CAN.c b/ports/stm/common-hal/canio/CAN.c
index fe1c3f2b1..52d5cad1f 100644
--- a/ports/stm/common-hal/canio/CAN.c
+++ b/ports/stm/common-hal/canio/CAN.c
@@ -50,7 +50,6 @@ STATIC const mcu_periph_obj_t *find_pin_function(const mcu_periph_obj_t *table,
 }
 
 
-__attribute__((optimize("O0")))
 void common_hal_canio_can_construct(canio_can_obj_t *self, mcu_pin_obj_t *tx, mcu_pin_obj_t *rx, int baudrate, bool loopback, bool silent)
 {
 #define DIV_ROUND(a, b) (((a) + (b)/2) / (b))
-- 
cgit v1.2.3


From 16ed875f4e88fbf0ecd9f5fa71b1c28d7a5e444b Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 6 Oct 2020 20:14:50 -0500
Subject: canio: remove unused fields

these relate to properties that were removed as well
---
 ports/atmel-samd/common-hal/canio/CAN.h | 3 ---
 ports/stm/common-hal/canio/CAN.h        | 3 ---
 2 files changed, 6 deletions(-)

(limited to 'ports/stm')

diff --git a/ports/atmel-samd/common-hal/canio/CAN.h b/ports/atmel-samd/common-hal/canio/CAN.h
index cdea60e7d..15ac0f4b7 100644
--- a/ports/atmel-samd/common-hal/canio/CAN.h
+++ b/ports/atmel-samd/common-hal/canio/CAN.h
@@ -41,9 +41,6 @@ typedef struct canio_can_obj {
     mp_obj_base_t base;
     Can *hw;
     canio_can_state_t *state;
-    volatile uint32_t error_warning_state_count;
-    volatile uint32_t error_passive_state_count;
-    volatile uint32_t bus_off_state_count;
     int baudrate;
     uint8_t rx_pin_number:8;
     uint8_t tx_pin_number:8;
diff --git a/ports/stm/common-hal/canio/CAN.h b/ports/stm/common-hal/canio/CAN.h
index 94d7e99a8..3157d0a03 100644
--- a/ports/stm/common-hal/canio/CAN.h
+++ b/ports/stm/common-hal/canio/CAN.h
@@ -42,9 +42,6 @@ typedef struct canio_can_obj {
     mp_obj_base_t base;
     CAN_HandleTypeDef handle;
     CAN_TypeDef *filter_hw;
-    volatile uint32_t error_warning_state_count;
-    volatile uint32_t error_passive_state_count;
-    volatile uint32_t bus_off_state_count;
     int baudrate;
     const mcu_pin_obj_t *rx_pin;
     const mcu_pin_obj_t *tx_pin;
-- 
cgit v1.2.3


From a0e5e961c594e26713aa9e255bf6e43214bf42a4 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Mon, 12 Oct 2020 17:43:13 -0700
Subject: Fix STM RTC read so it's atomic.

Fixes #3376
---
 ports/stm/supervisor/port.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'ports/stm')

diff --git a/ports/stm/supervisor/port.c b/ports/stm/supervisor/port.c
index bb304a317..79e4584b0 100644
--- a/ports/stm/supervisor/port.c
+++ b/ports/stm/supervisor/port.c
@@ -190,6 +190,7 @@ safe_mode_t port_init(void) {
     _hrtc.Init.OutPut = RTC_OUTPUT_DISABLE;
 
     HAL_RTC_Init(&_hrtc);
+    HAL_RTCEx_EnableBypassShadow(&_hrtc);
     HAL_NVIC_EnableIRQ(RTC_Alarm_IRQn);
 
     // Turn off SysTick
@@ -328,9 +329,23 @@ volatile uint32_t cached_date = 0;
 volatile uint32_t seconds_to_minute = 0;
 volatile uint32_t cached_hours_minutes = 0;
 uint64_t port_get_raw_ticks(uint8_t* subticks) {
-    uint32_t subseconds = rtc_clock_frequency - (uint32_t)(RTC->SSR);
+    // Disable IRQs to ensure we read all of the RTC registers as close in time as possible. Read
+    // SSR twice to make sure we didn't read across a tick.
+    __disable_irq();
+    uint32_t first_ssr = (uint32_t)(RTC->SSR);
     uint32_t time = (uint32_t)(RTC->TR & RTC_TR_RESERVED_MASK);
     uint32_t date = (uint32_t)(RTC->DR & RTC_DR_RESERVED_MASK);
+    uint32_t ssr = (uint32_t)(RTC->SSR);
+    while (ssr != first_ssr) {
+        first_ssr = ssr;
+        time = (uint32_t)(RTC->TR & RTC_TR_RESERVED_MASK);
+        date = (uint32_t)(RTC->DR & RTC_DR_RESERVED_MASK);
+        ssr = (uint32_t)(RTC->SSR);
+    }
+    __enable_irq();
+
+    uint32_t subseconds = rtc_clock_frequency - 1 - ssr;
+
     if (date != cached_date) {
         uint32_t year = (uint8_t)((date & (RTC_DR_YT | RTC_DR_YU)) >> 16U);
         uint8_t month = (uint8_t)((date & (RTC_DR_MT | RTC_DR_MU)) >> 8U);
@@ -349,6 +364,7 @@ uint64_t port_get_raw_ticks(uint8_t* subticks) {
         hours = (uint8_t)RTC_Bcd2ToByte(hours);
         minutes = (uint8_t)RTC_Bcd2ToByte(minutes);
         seconds_to_minute = 60 * (60 * hours + minutes);
+        cached_hours_minutes = hours_minutes;
     }
     uint8_t seconds = (uint8_t)(time & (RTC_TR_ST | RTC_TR_SU));
     seconds = (uint8_t)RTC_Bcd2ToByte(seconds);
-- 
cgit v1.2.3


From 56427d9abe7d905da7c11a3d935481bea23a78ff Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Tue, 13 Oct 2020 14:02:29 -0700
Subject: Fix stm sleep too long

---
 ports/stm/supervisor/port.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ports/stm')

diff --git a/ports/stm/supervisor/port.c b/ports/stm/supervisor/port.c
index 79e4584b0..a8aab00ff 100644
--- a/ports/stm/supervisor/port.c
+++ b/ports/stm/supervisor/port.c
@@ -423,7 +423,7 @@ void port_interrupt_after_ticks(uint32_t ticks) {
         alarm.AlarmMask = RTC_ALARMMASK_ALL;
     }
 
-    alarm.AlarmTime.SubSeconds = rtc_clock_frequency -
+    alarm.AlarmTime.SubSeconds = rtc_clock_frequency - 1 -
                                  ((raw_ticks % 1024) * 32);
     alarm.AlarmTime.DayLightSaving = RTC_DAYLIGHTSAVING_NONE;
     alarm.AlarmTime.StoreOperation = RTC_STOREOPERATION_SET;
-- 
cgit v1.2.3


From 4270061db491bae1e7cca9ca2cbed5db70f9062e Mon Sep 17 00:00:00 2001
From: gamblor21 <mark.komus@gmail.com>
Date: Tue, 13 Oct 2020 18:52:27 -0500
Subject: Moved ORDEREDDICT define to central location

---
 ports/atmel-samd/mpconfigport.h | 2 --
 ports/litex/mpconfigport.h      | 1 -
 ports/mimxrt10xx/mpconfigport.h | 1 -
 ports/nrf/mpconfigport.h        | 1 -
 ports/stm/mpconfigport.h        | 1 -
 ports/unix/mpconfigport.h       | 1 -
 py/circuitpy_mpconfig.h         | 1 +
 7 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'ports/stm')

diff --git a/ports/atmel-samd/mpconfigport.h b/ports/atmel-samd/mpconfigport.h
index f185142e4..afe1cc4c6 100644
--- a/ports/atmel-samd/mpconfigport.h
+++ b/ports/atmel-samd/mpconfigport.h
@@ -43,7 +43,6 @@
 #define MICROPY_PY_SYS_PLATFORM                     "Atmel SAMD21"
 #define SPI_FLASH_MAX_BAUDRATE 8000000
 #define MICROPY_PY_BUILTINS_NOTIMPLEMENTED          (0)
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT          (0)
 #define MICROPY_PY_FUNCTION_ATTRS                   (0)
 // MICROPY_PY_UJSON depends on MICROPY_PY_IO
 #define MICROPY_PY_IO                               (0)
@@ -81,7 +80,6 @@
 #endif
 #define SPI_FLASH_MAX_BAUDRATE 24000000
 #define MICROPY_PY_BUILTINS_NOTIMPLEMENTED          (1)
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT          (1)
 #define MICROPY_PY_FUNCTION_ATTRS                   (1)
 // MICROPY_PY_UJSON depends on MICROPY_PY_IO
 #define MICROPY_PY_IO                               (1)
diff --git a/ports/litex/mpconfigport.h b/ports/litex/mpconfigport.h
index fcf9d3b73..a7caf8526 100644
--- a/ports/litex/mpconfigport.h
+++ b/ports/litex/mpconfigport.h
@@ -30,7 +30,6 @@
 
 #define CIRCUITPY_INTERNAL_NVM_SIZE         (0)
 #define MICROPY_NLR_THUMB                   (0)
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT  (1)
 #define MICROPY_PY_REVERSE_SPECIAL_METHODS  (1)
 #define MICROPY_PY_UBINASCII                (1)
 #define MICROPY_PY_UJSON                    (1)
diff --git a/ports/mimxrt10xx/mpconfigport.h b/ports/mimxrt10xx/mpconfigport.h
index 7e7df0123..7496256d0 100644
--- a/ports/mimxrt10xx/mpconfigport.h
+++ b/ports/mimxrt10xx/mpconfigport.h
@@ -40,7 +40,6 @@ extern uint8_t _ld_default_stack_size;
 // 20kiB stack
 #define CIRCUITPY_DEFAULT_STACK_SIZE                ((uint32_t) &_ld_default_stack_size)
 #define MICROPY_PY_BUILTINS_NOTIMPLEMENTED          (0)
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT          (0)
 #define MICROPY_PY_FUNCTION_ATTRS                   (0)
 #define MICROPY_PY_IO                               (1)
 #define MICROPY_PY_UJSON                            (1)
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 36a9819dc..4ed42cd82 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -34,7 +34,6 @@
 #include "nrf_sdm.h"  // for SD_FLASH_SIZE
 #include "peripherals/nrf/nvm.h" // for FLASH_PAGE_SIZE
 
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT       (1)
 #define MICROPY_PY_FUNCTION_ATTRS                (1)
 #define MICROPY_PY_IO                            (1)
 #define MICROPY_PY_REVERSE_SPECIAL_METHODS       (1)
diff --git a/ports/stm/mpconfigport.h b/ports/stm/mpconfigport.h
index e054ffbb5..9489b4765 100644
--- a/ports/stm/mpconfigport.h
+++ b/ports/stm/mpconfigport.h
@@ -30,7 +30,6 @@
 
 #include <stdint.h>
 
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT       (1)
 #define MICROPY_PY_FUNCTION_ATTRS                (1)
 #define MICROPY_PY_IO                            (1)
 #define MICROPY_PY_REVERSE_SPECIAL_METHODS       (1)
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 3ae4ff786..d6bbad9ce 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -99,7 +99,6 @@
 #define MICROPY_PY_SYS_STDFILES     (1)
 #define MICROPY_PY_SYS_EXC_INFO     (1)
 #define MICROPY_PY_COLLECTIONS_DEQUE (1)
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (1)
 #ifndef MICROPY_PY_MATH_SPECIAL_FUNCTIONS
 #define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (1)
 #endif
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index 0583ae1c9..a3ffe52f6 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -195,6 +195,7 @@ typedef long mp_off_t;
 #define MICROPY_PY_BUILTINS_STR_PARTITION     (CIRCUITPY_FULL_BUILD)
 #define MICROPY_PY_BUILTINS_STR_SPLITLINES    (CIRCUITPY_FULL_BUILD)
 #define MICROPY_PY_UERRNO                     (CIRCUITPY_FULL_BUILD)
+#define MICROPY_PY_COLLECTIONS_ORDEREDDICT    (CIRCUITPY_FULL_BUILD)
 // Opposite setting is deliberate.
 #define MICROPY_PY_UERRNO_ERRORCODE           (!CIRCUITPY_FULL_BUILD)
 #ifndef MICROPY_PY_URE
-- 
cgit v1.2.3


From 12ed3fc72f6eb81fd193258e757efdcf633c4c1d Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Thu, 15 Oct 2020 18:48:28 -0400
Subject: disable on winterbloom_sol and thunderpack

---
 ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk | 2 +-
 ports/stm/boards/thunderpack/mpconfigboard.mk            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'ports/stm')

diff --git a/ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk b/ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk
index 9217cdf23..fcefaee9b 100644
--- a/ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk
@@ -18,7 +18,7 @@ LONGINT_IMPL = MPZ
 # Disable modules that are unusable on this special-purpose board.
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_AUDIOIO = 0
-CIRCUITPY_BLEIO = 0
+CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
 CIRCUITPY_GAMEPAD = 0
diff --git a/ports/stm/boards/thunderpack/mpconfigboard.mk b/ports/stm/boards/thunderpack/mpconfigboard.mk
index bb50f8710..d303582e0 100644
--- a/ports/stm/boards/thunderpack/mpconfigboard.mk
+++ b/ports/stm/boards/thunderpack/mpconfigboard.mk
@@ -7,6 +7,7 @@ INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 
 CIRCUITPY_NVM = 1
+CIRCUITPY_BLEIO_HCI = 0
 
 MCU_SERIES = F4
 MCU_VARIANT = STM32F411xE
-- 
cgit v1.2.3