Merge remote-tracking branch 'adafruit/main' into auto_wifi

tannewt · tannewt · commit 0c418e98b186 · 2022-06-13T15:44:43.000-07:00
diff --git a/locale/cs.po b/locale/cs.po
diff --git a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk
@@ -27,6 +27,8 @@ CIRCUITPY_PS2IO = 0
 CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_TOUCHIO = 0
+CIRCUITPY_USB_HID = 0
+CIRCUITPY_USB_MIDI = 0
 
 CIRCUITPY_ULAB = 0
 
diff --git a/ports/atmel-samd/mpconfigport.h b/ports/atmel-samd/mpconfigport.h
@@ -46,6 +46,7 @@
 #define MICROPY_PY_BUILTINS_NOTIMPLEMENTED          (0)
 #define MICROPY_PY_FUNCTION_ATTRS                   (0)
 #define MICROPY_PY_REVERSE_SPECIAL_METHODS          (0)
+#define MICROPY_PY_COLLECTIONS_DEQUE                (0)
 #define MICROPY_PY_COLLECTIONS_ORDEREDDICT          (0)
 #define MICROPY_PY_UERRNO_LIST \
     X(EPERM) \
diff --git a/ports/espressif/common-hal/busio/UART.c b/ports/espressif/common-hal/busio/UART.c
@@ -108,6 +108,8 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
     bool have_rx = rx != NULL;
     bool have_rts = rts != NULL;
     bool have_cts = cts != NULL;
+
+    uart_config_t uart_config = {0};
     bool have_rs485_dir = rs485_dir != NULL;
     if (!have_tx && !have_rx) {
         mp_raise_ValueError(translate("tx and rx cannot both be None"));
@@ -135,25 +137,26 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
     }
 
     uart_mode_t mode = UART_MODE_UART;
-    uart_hw_flowcontrol_t flow_control = UART_HW_FLOWCTRL_DISABLE;
+    uart_config.flow_ctrl = UART_HW_FLOWCTRL_DISABLE;
     if (have_rs485_dir) {
         mode = UART_MODE_RS485_HALF_DUPLEX;
         if (!rs485_invert) {
+            // This one is not in the set
             uart_set_line_inverse(self->uart_num, UART_SIGNAL_DTR_INV);
         }
     } else if (have_rts && have_cts) {
-        flow_control = UART_HW_FLOWCTRL_CTS_RTS;
+        uart_config.flow_ctrl = UART_HW_FLOWCTRL_CTS_RTS;
     } else if (have_rts) {
-        flow_control = UART_HW_FLOWCTRL_RTS;
+        uart_config.flow_ctrl = UART_HW_FLOWCTRL_RTS;
     } else if (have_rts) {
-        flow_control = UART_HW_FLOWCTRL_CTS;
+        uart_config.flow_ctrl = UART_HW_FLOWCTRL_CTS;
     }
 
     if (receiver_buffer_size <= UART_FIFO_LEN) {
         receiver_buffer_size = UART_FIFO_LEN + 8;
     }
 
-    uint8_t rx_threshold = UART_FIFO_LEN - 8;
+    uart_config.rx_flow_ctrl_thresh = UART_FIFO_LEN - 8;
     // Install the driver before we change the settings.
     if (uart_driver_install(self->uart_num, receiver_buffer_size, 0, 20, &self->event_queue, 0) != ESP_OK ||
         uart_set_mode(self->uart_num, mode) != ESP_OK) {
@@ -175,55 +178,62 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
         CONFIG_PTHREAD_TASK_PRIO_DEFAULT,
         &self->event_task,
         xPortGetCoreID());
-    uart_set_hw_flow_ctrl(self->uart_num, flow_control, rx_threshold);
+    // uart_set_hw_flow_ctrl(self->uart_num, uart_config.flow_control, uart_config.rx_flow_ctrl_thresh);
 
     // Set baud rate
-    common_hal_busio_uart_set_baudrate(self, baudrate);
+    // common_hal_busio_uart_set_baudrate(self, baudrate);
+    uart_config.baud_rate = baudrate;
 
-    uart_word_length_t word_length = UART_DATA_8_BITS;
+    uart_config.data_bits = UART_DATA_8_BITS;
     switch (bits) {
         // Shared bindings prevents data < 7 bits.
         // case 5:
-        //     word_length = UART_DATA_5_BITS;
+        //     uart_config.data_bits = UART_DATA_5_BITS;
         //     break;
         // case 6:
-        //     word_length = UART_DATA_6_BITS;
+        //     uart_config.data_bits = UART_DATA_6_BITS;
         //     break;
         case 7:
-            word_length = UART_DATA_7_BITS;
+            uart_config.data_bits = UART_DATA_7_BITS;
             break;
         case 8:
-            word_length = UART_DATA_8_BITS;
+            uart_config.data_bits = UART_DATA_8_BITS;
             break;
         default:
             // Won't hit this because shared-bindings limits to 7-9 bits. We error on 9 above.
             break;
     }
-    uart_set_word_length(self->uart_num, word_length);
+    // uart_set_word_length(self->uart_num, uart_config.data_bits);
 
-    uart_parity_t parity_mode = UART_PARITY_DISABLE;
+    uart_config.parity = UART_PARITY_DISABLE;
     switch (parity) {
         case BUSIO_UART_PARITY_NONE:
-            parity_mode = UART_PARITY_DISABLE;
+            uart_config.parity = UART_PARITY_DISABLE;
             break;
         case BUSIO_UART_PARITY_EVEN:
-            parity_mode = UART_PARITY_EVEN;
+            uart_config.parity = UART_PARITY_EVEN;
             break;
         case BUSIO_UART_PARITY_ODD:
-            parity_mode = UART_PARITY_ODD;
+            uart_config.parity = UART_PARITY_ODD;
             break;
         default:
             // Won't reach here because the input is an enum that is completely handled.
             break;
     }
-    uart_set_parity(self->uart_num, parity_mode);
+    // uart_set_parity(self->uart_num, uart_config.parity);
 
     // Stop is 1 or 2 always.
-    uart_stop_bits_t stop_bits = UART_STOP_BITS_1;
+    uart_config.stop_bits = UART_STOP_BITS_1;
     if (stop == 2) {
-        stop_bits = UART_STOP_BITS_2;
+        uart_config.stop_bits = UART_STOP_BITS_2;
+    }
+    // uart_set_stop_bits(self->uart_num, stop_bits);
+    uart_config.source_clk = UART_SCLK_APB; // guessing here...
+
+    // config all in one?
+    if (uart_param_config(self->uart_num, &uart_config) != ESP_OK) {
+        mp_raise_RuntimeError(translate("UART init"));
     }
-    uart_set_stop_bits(self->uart_num, stop_bits);
 
     self->tx_pin = NULL;
     self->rx_pin = NULL;
diff --git a/ports/stm/boards/swan_r5/mpconfigboard.mk b/ports/stm/boards/swan_r5/mpconfigboard.mk
@@ -70,3 +70,4 @@ CIRCUITPY_BLEIO = 0
 CIRCUITPY_BUSDEVICE = 0
 CIRCUITPY_KEYPAD = 1
 CIRCUITPY_RGBMATRIX = 0
+CIRCUITPY_RTC = 1
diff --git a/ports/stm/common-hal/rtc/RTC.c b/ports/stm/common-hal/rtc/RTC.c
@@ -0,0 +1,54 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 20212 Matthew McGowan for Blues Wireless Inc
+ *
+ * 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 <stdio.h>
+
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "shared/timeutils/timeutils.h"
+#include "shared-bindings/rtc/__init__.h"
+#include "common-hal/rtc/RTC.h"
+#include "shared-bindings/rtc/RTC.h"
+#include "supervisor/port.h"
+#include "supervisor/shared/translate/translate.h"
+#include "peripherals/rtc.h"
+
+
+void common_hal_rtc_set_time(timeutils_struct_time_t *tm) {
+    stm32_peripherals_rtc_set_time(tm);
+}
+
+void common_hal_rtc_get_time(timeutils_struct_time_t *tm) {
+    stm32_peripherals_rtc_get_time(tm);
+}
+
+int common_hal_rtc_get_calibration(void) {
+    return 0;
+}
+
+void common_hal_rtc_set_calibration(int calibration) {
+    mp_raise_NotImplementedError_varg(translate("%q"), MP_QSTR_calibration);
+}
diff --git a/ports/stm/common-hal/rtc/RTC.h b/ports/stm/common-hal/rtc/RTC.h
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Matthew McGowan for Blues Wireless Inc
+ *
+ * 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.
+ */
+
+#ifndef MICROPY_INCLUDED_STM_COMMON_HAL_RTC_RTC_H
+#define MICROPY_INCLUDED_STM_COMMON_HAL_RTC_RTC_H
+
+extern void rtc_init(void);
+extern void rtc_reset(void);
+
+#endif  // MICROPY_INCLUDED_STM_COMMON_HAL_RTC_RTC_H
diff --git a/ports/stm/common-hal/rtc/__init__.c b/ports/stm/common-hal/rtc/__init__.c
diff --git a/ports/stm/common-hal/rtc/__init__.h b/ports/stm/common-hal/rtc/__init__.h
diff --git a/ports/stm/mpconfigport.mk b/ports/stm/mpconfigport.mk
@@ -24,7 +24,7 @@ ifeq ($(MCU_SERIES),F4)
         CIRCUITPY_I2CPERIPHERAL ?= 0
         CIRCUITPY_NVM ?= 0
         CIRCUITPY_ROTARYIO ?= 0
-        CIRCUITPY_RTC ?= 0
+        CIRCUITPY_RTC ?= 1
         USB_NUM_ENDPOINT_PAIRS = 4
         UF2_FAMILY_ID ?= 0x57755a57
 endif
@@ -42,7 +42,7 @@ ifeq ($(MCU_SERIES),H7)
         CIRCUITPY_PULSEIO ?= 0
         CIRCUITPY_PWMIO ?= 0
         CIRCUITPY_ROTARYIO ?= 0
-        CIRCUITPY_RTC ?= 0
+        CIRCUITPY_RTC ?= 1
 
         USB_NUM_ENDPOINT_PAIRS = 9
         UF2_FAMILY_ID ?= 0x6db66082
@@ -59,7 +59,7 @@ ifeq ($(MCU_SERIES),F7)
         CIRCUITPY_NEOPIXEL_WRITE ?= 0
         CIRCUITPY_NVM ?= 0
         CIRCUITPY_ROTARYIO ?= 0
-        CIRCUITPY_RTC ?= 0
+        CIRCUITPY_RTC ?= 1
 
         USB_NUM_ENDPOINT_PAIRS = 6
         UF2_FAMILY_ID ?= 0x53b80f00
@@ -76,7 +76,7 @@ ifeq ($(MCU_SERIES),L4)
         CIRCUITPY_NEOPIXEL_WRITE ?= 0
         CIRCUITPY_NVM ?= 0
         CIRCUITPY_ROTARYIO ?= 0
-        CIRCUITPY_RTC ?= 0
+        CIRCUITPY_RTC ?= 1
         # todo - this varies between devices in the series
         # This slide deck https://www.st.com/content/ccc/resource/training/technical/product_training/98/89/c8/6c/3e/e9/49/79/STM32L4_Peripheral_USB.pdf/files/STM32L4_Peripheral_USB.pdf/jcr:content/translations/en.STM32L4_Peripheral_USB.pdf
         # cites 16 endpoints, 8 endpoint pairs, while section 3.39 of the L4R5 datasheet states 6 endpoint pairs.
diff --git a/ports/stm/peripherals/rtc.c b/ports/stm/peripherals/rtc.c
@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2021 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2022 Matthew McGowan for Blues Wireless Inc
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -76,6 +77,46 @@ void stm32_peripherals_rtc_init(void) {
     HAL_NVIC_EnableIRQ(RTC_Alarm_IRQn);
 }
 
+#if CIRCUITPY_RTC
+void stm32_peripherals_rtc_get_time(timeutils_struct_time_t *tm) {
+    RTC_DateTypeDef date = {0};
+    RTC_TimeTypeDef time = {0};
+
+    int code;
+    if ((code = HAL_RTC_GetTime(&hrtc, &time, RTC_FORMAT_BIN)) == HAL_OK &&
+        (code = HAL_RTC_GetDate(&hrtc, &date, RTC_FORMAT_BIN)) == HAL_OK) {
+        tm->tm_hour = time.Hours;
+        tm->tm_min = time.Minutes;
+        tm->tm_sec = time.Seconds;
+        tm->tm_wday = date.WeekDay - 1;
+        tm->tm_mday = date.Date;
+        tm->tm_mon = date.Month;
+        tm->tm_year = date.Year + 2000;
+        tm->tm_yday = -1;
+    }
+}
+
+void stm32_peripherals_rtc_set_time(timeutils_struct_time_t *tm) {
+    RTC_DateTypeDef date = {0};
+    RTC_TimeTypeDef time = {0};
+
+    time.Hours = tm->tm_hour;
+    time.Minutes = tm->tm_min;
+    time.Seconds = tm->tm_sec;
+    date.WeekDay = tm->tm_wday + 1;
+    date.Date = tm->tm_mday;
+    date.Month = tm->tm_mon;
+    date.Year = tm->tm_year - 2000;
+    time.DayLightSaving = RTC_DAYLIGHTSAVING_NONE;
+    time.StoreOperation = RTC_STOREOPERATION_RESET;
+
+    if (HAL_RTC_SetTime(&hrtc, &time, RTC_FORMAT_BIN) != HAL_OK ||
+        HAL_RTC_SetDate(&hrtc, &date, RTC_FORMAT_BIN) != HAL_OK) {
+        // todo - throw an exception
+    }
+}
+#endif
+
 // This function is called often for timing so we cache the seconds elapsed computation based on the
 // register value. The STM HAL always does shifts and conversion if we use it directly.
 uint64_t stm32_peripherals_rtc_raw_ticks(uint8_t *subticks) {
diff --git a/ports/stm/peripherals/rtc.h b/ports/stm/peripherals/rtc.h
@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2021 Lucian Copeland for Adafruit Industries
+ * Copyright (c) 2022 Matthew McGowan for Blues Wireless Inc
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -48,4 +49,10 @@ void stm32_peripherals_rtc_assign_alarm_callback(uint8_t alarm_idx, void (*callb
 void stm32_peripherals_rtc_set_alarm(uint8_t alarm_idx, uint32_t ticks);
 bool stm32_peripherals_rtc_alarm_triggered(uint8_t alarm_idx);
 
+#if CIRCUITPY_RTC
+typedef struct _timeutils_struct_time_t timeutils_struct_time_t;
+void stm32_peripherals_rtc_get_time(timeutils_struct_time_t *tm);
+void stm32_peripherals_rtc_set_time(timeutils_struct_time_t *tm);
+#endif
+
 #endif // __MICROPY_INCLUDED_STM32_PERIPHERALS_RTC_H__
diff --git a/ports/stm/supervisor/port.c b/ports/stm/supervisor/port.c
@@ -61,6 +61,9 @@
 #if CIRCUITPY_ALARM
 #include "common-hal/alarm/__init__.h"
 #endif
+#if CIRCUITPY_RTC
+#include "shared-bindings/rtc/__init__.h"
+#endif
 
 #include "peripherals/clocks.h"
 #include "peripherals/gpio.h"
@@ -241,6 +244,10 @@ void SysTick_Handler(void) {
 
 void reset_port(void) {
     reset_all_pins();
+    #if CIRCUITPY_RTC
+    rtc_reset();
+    #endif
+
     #if CIRCUITPY_AUDIOPWMIO
     audiopwmout_reset();
     #endif
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
@@ -226,6 +226,9 @@ typedef long mp_off_t;
 #ifndef MICROPY_PY_COLLECTIONS_ORDEREDDICT
 #define MICROPY_PY_COLLECTIONS_ORDEREDDICT    (CIRCUITPY_FULL_BUILD)
 #endif
+#ifndef MICROPY_PY_COLLECTIONS_DEQUE
+#define MICROPY_PY_COLLECTIONS_DEQUE          (CIRCUITPY_FULL_BUILD)
+#endif
 #define MICROPY_PY_URE_MATCH_GROUPS           (CIRCUITPY_RE)
 #define MICROPY_PY_URE_MATCH_SPAN_START_END   (CIRCUITPY_RE)
 #define MICROPY_PY_URE_SUB                    (CIRCUITPY_RE)
diff --git a/shared-bindings/bitmaptools/__init__.c b/shared-bindings/bitmaptools/__init__.c
