Merge branch 'adafruit:main' into usb-interposer-1

locale/tr.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2024-07-02 03:21+0000\n"
-"Last-Translator: Zoda <ustunsoykerem23@gmail.com>\n"
+"PO-Revision-Date: 2024-07-03 19:09+0000\n"
+"Last-Translator: Hacı <qwehacim3542qwe@gmail.com>\n"
 "Language-Team: none\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
@@ -55,6 +55,8 @@ msgid ""
 "\n"
 "You are in safe mode because:\n"
 msgstr ""
+"\n"
+"Güvenli moddasın çünkü:\n"
 
 #: py/obj.c
 msgid "  File \"%q\""
@@ -103,7 +105,7 @@ msgstr ""
 
 #: ports/nordic/common-hal/watchdog/WatchDogTimer.c
 msgid "%q cannot be changed once mode is set to %q"
-msgstr ""
+msgstr "Mod %q olarak ayarlandıktan sonra %q değiştirilemez"
 
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q contains duplicate pins"

ports/espressif/boards/ttgo_t8_v1_7/board.c

@@ -0,0 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Scott Shawcroft 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 "supervisor/board.h"
+
+// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

ports/espressif/boards/ttgo_t8_v1_7/mpconfigboard.h

@@ -0,0 +1,49 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Dan Halbert 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.
+ */
+
+// Micropython setup
+
+#define MICROPY_HW_BOARD_NAME       "Espressif ESP32 TTGO T8 v1.7"
+#define MICROPY_HW_MCU_NAME         "ESP32"
+
+#define MICROPY_HW_LED_STATUS (&pin_GPIO21)
+
+#define CIRCUITPY_BOARD_I2C         (1)
+#define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO22, .sda = &pin_GPIO21}}
+#define CIRCUITPY_I2C_ALLOW_INTERNAL_PULL_UP 1
+
+#define CIRCUITPY_BOARD_SPI         (1)
+#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO18, .mosi = &pin_GPIO23, .miso = &pin_GPIO19}}
+
+#define CIRCUITPY_BOARD_UART        (1)
+#define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO17, .rx = &pin_GPIO16}}
+
+
+#define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO0)
+
+// UART pins attached to the USB-serial converter chip
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)

ports/espressif/boards/ttgo_t8_v1_7/mpconfigboard.mk

@@ -0,0 +1,10 @@
+CIRCUITPY_CREATOR_ID =  0x000C303A
+CIRCUITPY_CREATION_ID = 0x00320005
+
+IDF_TARGET = esp32
+
+CIRCUITPY_ESP_FLASH_MODE = qio
+CIRCUITPY_ESP_FLASH_FREQ = 80m
+CIRCUITPY_ESP_FLASH_SIZE = 4MB
+
+CIRCUITPY_ESPCAMERA = 0

ports/espressif/boards/ttgo_t8_v1_7/pins.c

@@ -0,0 +1,66 @@
+#include "shared-bindings/board/__init__.h"
+
+STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+    CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
+
+    // External pins are in silkscreen order, from top to bottom, left side, then right side
+    // Left Side
+
+    // Input-only pins, VP/VN on silkscreen
+    { MP_ROM_QSTR(MP_QSTR_I36), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_VP), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_I39), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_VN), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_I34), MP_ROM_PTR(&pin_GPIO34) },
+    { MP_ROM_QSTR(MP_QSTR_I35), MP_ROM_PTR(&pin_GPIO35) },
+
+
+    { MP_ROM_QSTR(MP_QSTR_IO32), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_IO33), MP_ROM_PTR(&pin_GPIO33) },
+
+    // Normal pins
+    { MP_ROM_QSTR(MP_QSTR_IO25), MP_ROM_PTR(&pin_GPIO25) },
+    { MP_ROM_QSTR(MP_QSTR_IO26), MP_ROM_PTR(&pin_GPIO26) },
+    { MP_ROM_QSTR(MP_QSTR_IO27), MP_ROM_PTR(&pin_GPIO27) },
+    { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_SD_SCK), MP_ROM_PTR(&pin_GPIO14) },
+    { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
+    { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_SD_CS), MP_ROM_PTR(&pin_GPIO13) },
+    { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
+    { MP_ROM_QSTR(MP_QSTR_SD_MOSI), MP_ROM_PTR(&pin_GPIO15) },
+
+    // Right Side
+
+    { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO21) },
+    { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO1) },
+    { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO3) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO22), MP_ROM_PTR(&pin_GPIO22) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO22) },
+
+    // Normal pins
+    { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) },
+    { MP_ROM_QSTR(MP_QSTR_IO23), MP_ROM_PTR(&pin_GPIO23) },
+    { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
+    { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
+    { MP_ROM_QSTR(MP_QSTR_SD_MISO), MP_ROM_PTR(&pin_GPIO2) },
+    { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) },
+
+    { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
+
+    {MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj)},
+    {MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj)},
+    {MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj)}
+
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

ports/raspberrypi/common-hal/pwmio/PWMOut.c

@@ -176,6 +176,10 @@ extern void common_hal_pwmio_pwmout_set_duty_cycle(pwmio_pwmout_obj_t *self, uin
     } else {
         compare_count = ((uint32_t)duty * self->top + MAX_TOP / 2) / MAX_TOP;
     }
+    // do not allow count to be 0 (due to rounding) unless duty 0 was requested
+    if (compare_count == 0 && duty != 0) {
+        compare_count = 1;
+    }
     // compare_count is the CC register value, which should be TOP+1 for 100% duty cycle.
     pwm_set_chan_level(self->slice, self->ab_channel, compare_count);
 }
@@ -218,8 +222,8 @@ void common_hal_pwmio_pwmout_set_frequency(pwmio_pwmout_obj_t *self, uint32_t fr
         pwm_set_clkdiv_int_frac(self->slice, div16 / 16, div16 % 16);
         pwm_set_wrap(self->slice, self->top);
     } else {
-        uint32_t top = common_hal_mcu_processor_get_frequency() / frequency;
-        self->actual_frequency = common_hal_mcu_processor_get_frequency() / top;
+        uint32_t top = common_hal_mcu_processor_get_frequency() / frequency - 1;
+        self->actual_frequency = common_hal_mcu_processor_get_frequency() / (top + 1);
         self->top = MIN(MAX_TOP, top);
         pwm_set_clkdiv_int_frac(self->slice, 1, 0);
         // Set TOP register. For 100% duty cycle, CC must be set to TOP+1.

supervisor/shared/serial.c

@@ -309,10 +309,6 @@ uint32_t serial_bytes_available(void) {
     }
     #endif
 
-    #if CIRCUITPY_USB_DEVICE
-    count += tud_cdc_available();
-    #endif
-
     // Board-specific serial input.
     count += board_serial_bytes_available();
 

tests/circuitpython-manual/pwmio/README.md

@@ -2,7 +2,7 @@
 
 This directory contains tools for testing CircuitPython's PWM API.  Running the tests involves three steps:
 
-1.  [CircuitPython PWM test code `code.py`](code.py) is run on the board to be tested.
+1.  [CircuitPython PWM test code `code_ramps.py`](code_ramps.py) is run on the board to be tested.
 2.  As the code runs, the state of the PWM signal is logged by a logic analyzer (I used a Saleae Logic Pro 8).
 3.  Data collected by the logic analyzer is analyzed and plotted into a PNG image by [CPython code `duty.py`](duty.py).
 
@@ -37,3 +37,9 @@ These tests can be used to assess how well the PWM API delivers expected behavio
 The plot at the top of this page depicts data PWM gathered from a device with an API that displays all of the expected behavior listed above.  The plots below show how the tools reveal flaws in the behavior of PWM APIs that are not as complete.
 
 <img src="pwm_flaw_explainer.png">
+
+## Testing always-off and always-on PWM extremes
+
+The procedure described above does not test item 2 above, i.e. the ability of the API to support duty cycles of 0% and 100%.  A different code file, (code_extremes.py) provides for this.  This code cycles through PWM duty cycles of 32767, 65535, 1, 65534, and 0, repeating the sequence at six frequencies from 100 Hz to 10MHz.  When viewed on a logic analyzer, the PWM output should look like the figure below.  100% and 0% PWM result from duty cycle settings of 65535 and 0, (and only from those settings, in accordance with item 3 above.)
+
+<img src="pwm_extremes_explainer.png">

tests/circuitpython-manual/pwmio/code_extremes.py

@@ -0,0 +1,87 @@
+import board
+import pwmio
+import random
+import time
+import microcontroller
+import os
+import sys
+import random
+
+exponents = [
+    2,
+    3,
+    4,
+    5,
+    6,
+    7,
+]
+
+freqs = [int(10**f) for f in exponents]
+
+top = 65536
+den = 10
+duties = [32767, 65535, 1, 65534, 0, 0]
+freq_duration = 1.2
+duty_duration = 0.2
+
+print("\n\n")
+board_name = sys.implementation[2]
+
+pins = {
+    "Feather RP2040": (("D4", ""),),
+    "RP2040-Zero": (("GP15", ""),),
+    "Grand Central": (("D51", "TCC"), ("A15", "TC")),
+    "Metro M0": (("A2", "TC"), ("A3", "TCC")),
+    "ESP32-S3-DevKit": (("IO6", ""),),  # marked D5 on board for XIAO-ESP32-s3
+    "Feather ESP32-S2": (("D9", ""),),
+    "XIAO nRF52840": (("D9", ""),),
+}
+
+for board_key in pins:
+    if board_key in board_name:
+        pins_to_use = pins[board_key]
+        break
+
+while True:
+    for pin_name, pin_type in pins_to_use:
+        pin = getattr(board, pin_name)
+        print('title="', end="")
+        print(f"{board_name} at {microcontroller.cpu.frequency} Hz, pin {pin_name}", end="")
+        if len(pin_type) > 0:
+            print(f" ({pin_type})", end="")
+        print('",')
+        print(f'subtitle="{freq_duration:0.1f}s per frequency",')
+        print(f'version="{sys.version}",')
+        print("freq_calls=", end="")
+        pwm = pwmio.PWMOut(pin, variable_frequency=True)
+        t0 = time.monotonic()
+        duty_time = t0 + duty_duration
+        print("(", end="")
+        offset = 0
+        increment = 1
+        for freq in freqs:
+            i = 0
+            try:
+                pwm.frequency = freq
+            except ValueError:
+                break
+            freq_time = t0 + freq_duration
+            duty_time = t0 + duty_duration
+            j = 0
+            while time.monotonic() < freq_time:
+                duty = duties[j]
+                pwm.duty_cycle = duty
+                while time.monotonic() < duty_time and time.monotonic() < freq_time:
+                    pass
+                j += 1
+                j = min(j, len(duties) - 1)
+                duty_time += duty_duration
+                i += 1
+                if time.monotonic() > freq_time:
+                    break
+            t0 = freq_time
+            print(f"({freq}, {i/freq_duration:.0f}), ", end="")
+        print(")")
+        print("done.")
+        pwm.deinit()
+        time.sleep(5)

tests/circuitpython-manual/pwmio/code.py → tests/circuitpython-manual/pwmio/code_ramps.py

@@ -39,6 +39,7 @@
 board_name = sys.implementation[2]
 
 pins = {
+    "Feather RP2040": (("D4", ""),),
     "RP2040-Zero": (("GP15", ""),),
     "Grand Central": (("D51", "TCC"), ("A15", "TC")),
     "Metro M0": (("A2", "TC"), ("A3", "TCC")),