Merge remote-tracking branch 'upstream/master'

Author: hierophect

.github/workflows/build.yml

@@ -75,6 +75,7 @@ jobs:
         board:
         - "arduino_mkr1300"
         - "arduino_mkrzero"
+        - "arduino_nano_33_ble"
         - "arduino_zero"
         - "bast_pro_mini_m0"
         - "capablerobot_usbhub"
@@ -109,6 +110,7 @@ jobs:
         - "hallowing_m4_express"
         - "itsybitsy_m0_express"
         - "itsybitsy_m4_express"
+        - "itsybitsy_nrf52840_express"
         - "kicksat-sprite"
         - "makerdiary_nrf52840_mdk"
         - "makerdiary_nrf52840_mdk_usb_dongle"

locale/de_DE.po

@@ -737,7 +737,7 @@ msgstr ""
 
 #: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
 msgid "Frequency captured is above capability. Capture Paused."
-msgstr ""
+msgstr "Die aufgezeichnete Frequenz liegt über der Leistungsgrenze. Aufnahme angehalten."
 
 #: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c
 #: shared-bindings/busio/I2C.c shared-bindings/busio/SPI.c

ports/atmel-samd/boards/pyportal_titano/board.c

@@ -74,24 +74,21 @@ uint8_t display_init_sequence[] = {
       0x11, 0x1d, 0x23, 0x35, 0x41, 0x4b, 0x4b, 0x42, 0x3A,
       0x27, 0x1B, 0x08, 0x09, 0x03, 0x00, 0x01,
     0x3a, 1, 0x55,
-    0x36, 1, 0x00,
+    0x36, 1, 0x60,
     0x11, DELAY, 150/5, // Exit Sleep, then delay 150 ms
     0x29, DELAY, 50/5
 };
 
 void board_init(void) {
-    busio_spi_obj_t* spi = &displays[0].fourwire_bus.inline_bus;
-    common_hal_busio_spi_construct(spi, &pin_PA13, &pin_PA12, &pin_PA14);
-    common_hal_busio_spi_never_reset(spi);
-    
-    displayio_fourwire_obj_t* bus = &displays[0].fourwire_bus;
-    bus->base.type = &displayio_fourwire_type;
-    common_hal_displayio_fourwire_construct(bus,
-        spi,
-        &pin_PB05, // TFT_DC Command or data
-        &pin_PB06, // TFT_CS Chip select
-        &pin_PA00, // TFT_RST Reset
-        24000000);
+    displayio_parallelbus_obj_t* bus = &displays[0].parallel_bus;
+    bus->base.type = &displayio_parallelbus_type;
+    common_hal_displayio_parallelbus_construct(bus,
+        &pin_PA16, // Data0
+        &pin_PB05, // Command or data
+        &pin_PB06, // Chip select
+        &pin_PB09, // Write
+        &pin_PB04, // Read
+        &pin_PA00); // Reset
 
     displayio_display_obj_t* display = &displays[0].display;
     display->base.type = &displayio_display_type;
@@ -101,7 +98,7 @@ void board_init(void) {
         320, // Height
         0, // column start
         0, // row start
-        270, // rotation
+        0, // rotation
         16, // Color depth
         false, // grayscale
         false, // pixels_in_byte_share_row (unused for depths > 8)

ports/atmel-samd/boards/pyportal_titano/mpconfigboard.h

@@ -3,7 +3,6 @@
 
 #define CIRCUITPY_MCU_FAMILY samd51
 
-
 #define MICROPY_HW_LED_STATUS   (&pin_PA27)
 
 #define MICROPY_HW_NEOPIXEL (&pin_PB22)

ports/atmel-samd/boards/pyportal_titano/pins.c

@@ -80,15 +80,6 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
 
-    // TFT control pins
-    {MP_OBJ_NEW_QSTR(MP_QSTR_TFT_LITE), MP_ROM_PTR(&pin_PB31)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_TFT_MOSI), MP_ROM_PTR(&pin_PA12)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_TFT_SCK), MP_ROM_PTR(&pin_PA13)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_TFT_MISO), MP_ROM_PTR(&pin_PA14)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_TFT_RST), MP_ROM_PTR(&pin_PA00)},
-    {MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_PB06)},
-    {MP_ROM_QSTR(MP_QSTR_TFT_DC), MP_ROM_PTR(&pin_PB05)},
-
     { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display) },
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

ports/atmel-samd/common-hal/busio/I2C.c

@@ -116,6 +116,7 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
     if (i2c_m_sync_set_baudrate(&self->i2c_desc, 0, frequency / 1000) != ERR_NONE) {
         reset_pin_number(sda->number);
         reset_pin_number(scl->number);
+        common_hal_busio_i2c_deinit(self);
         mp_raise_ValueError(translate("Unsupported baudrate"));
     }
 

ports/atmel-samd/common-hal/pulseio/PWMOut.c

@@ -135,6 +135,7 @@ pwmout_result_t common_hal_pulseio_pwmout_construct(pulseio_pwmout_obj_t* self,
                                                     bool variable_frequency) {
     self->pin = pin;
     self->variable_frequency = variable_frequency;
+    self->duty_cycle = duty;
 
     if (pin->timer[0].index >= TC_INST_NUM &&
         pin->timer[1].index >= TCC_INST_NUM
@@ -322,6 +323,13 @@ void common_hal_pulseio_pwmout_deinit(pulseio_pwmout_obj_t* self) {
 }
 
 extern void common_hal_pulseio_pwmout_set_duty_cycle(pulseio_pwmout_obj_t* self, uint16_t duty) {
+    // Store the unadjusted duty cycle. It turns out the the process of adjusting and calculating
+    // the duty cycle here and reading it back is lossy - the value will decay over time.
+    // Track it here so that if frequency is changed we can use this value to recalculate the
+    // proper duty cycle.
+    // See https://github.com/adafruit/circuitpython/issues/2086 for more details
+    self->duty_cycle = duty;
+
     const pin_timer_t* t = self->timer;
     if (t->is_tc) {
         uint16_t adjusted_duty = tc_periods[t->index] * duty / 0xffff;
@@ -415,7 +423,6 @@ void common_hal_pulseio_pwmout_set_frequency(pulseio_pwmout_obj_t* self,
             break;
         }
     }
-    uint16_t old_duty = common_hal_pulseio_pwmout_get_duty_cycle(self);
     if (t->is_tc) {
         Tc* tc = tc_insts[t->index];
         uint8_t old_divisor = tc->COUNT16.CTRLA.bit.PRESCALER;
@@ -450,7 +457,7 @@ void common_hal_pulseio_pwmout_set_frequency(pulseio_pwmout_obj_t* self,
         #endif
     }
 
-    common_hal_pulseio_pwmout_set_duty_cycle(self, old_duty);
+    common_hal_pulseio_pwmout_set_duty_cycle(self, self->duty_cycle);
 }
 
 uint32_t common_hal_pulseio_pwmout_get_frequency(pulseio_pwmout_obj_t* self) {

ports/atmel-samd/common-hal/pulseio/PWMOut.h

@@ -36,6 +36,7 @@ typedef struct {
     const mcu_pin_obj_t *pin;
     const pin_timer_t* timer;
     bool variable_frequency;
+    uint16_t duty_cycle;
 } pulseio_pwmout_obj_t;
 
 void pwmout_reset(void);

ports/cxd56/boards/spresense/mpconfigboard.h

@@ -26,7 +26,6 @@
 
 #define MICROPY_HW_BOARD_NAME "SPRESENSE"
 #define MICROPY_HW_MCU_NAME "CXD5602"
-#define MICROPY_PY_SYS_PLATFORM "SPRESENSE"
 
 #define DEFAULT_I2C_BUS_SCL (&pin_I2C0_BCK)
 #define DEFAULT_I2C_BUS_SDA (&pin_I2C0_BDT)

ports/cxd56/mpconfigport.h

@@ -27,6 +27,8 @@
 #ifndef __INCLUDED_MPCONFIGPORT_H
 #define __INCLUDED_MPCONFIGPORT_H
 
+#define MICROPY_PY_SYS_PLATFORM "CXD56"
+
 // 64kiB stack
 #define CIRCUITPY_DEFAULT_STACK_SIZE            0x10000