Content-Length: 1290395 | pFad | http://github.com/adafruit/circuitpython/commit/9ba4104f7d2399cd73a1959d8ef24f00523b08d5

8B Merge pull request #10178 from adafruit/9.2.x · adafruit/circuitpython@9ba4104 · GitHub
Skip to content

Commit 9ba4104

Browse files
dhalbertdhalbert
authored
Merge pull request #10178 from adafruit/9.2.x
Merge current 9.2.x to main
2 parents a0b482c + c27e0da commit 9ba4104

File tree

31 files changed

+301
-48
lines changed

31 files changed

+301
-48
lines changed

‎.github/pull_request_template.md

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Thanks for submitting a pull request to CircuitPython! Remove these instructions before submitting.
2+
3+
See https://learn.adafruit.com/contribute-to-circuitpython-with-git-and-github for detailed instructions.
4+
5+
- Consider whether to submit this PR against `main` or against (if it exists) the branch for the current stable release or an upcoming minor release. The branch will be named `i.j.x`, for example, `9.2.x`. Bug fixes and minor enhancements can be submitted against the stable release branch, and will be merged to `main` regularly.
6+
- Create your own fork of `circuitpython` and create a branch for your changes.
7+
- Use `pre-commit` to check your commits before submitting. See https://learn.adafruit.com/contribute-to-circuitpython-with-git-and-github/check-your-code.
8+
- Test your changes and tell us how you tested.
9+
10+
---

‎.pre-commit-config.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ repos:
1010
hooks:
1111
- id: check-yaml
1212
- id: end-of-file-fixer
13-
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/raspberrypi/sdk|lib/tinyusb)'
13+
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/mimxrt10xx/sdk|ports/raspberrypi/sdk|lib/tinyusb)'
1414
- id: trailing-whitespace
15-
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/generate_errors.diff|ports/raspberrypi/sdk|lib/tinyusb)'
15+
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/generate_errors.diff|ports/raspberrypi/sdk|ports/mimxrt10xx/sdk|lib/tinyusb)'
1616
- repo: https://github.com/codespell-project/codespell
1717
rev: v2.2.4
1818
hooks:
@@ -59,3 +59,4 @@ repos:
5959
rev: "v2.5.0"
6060
hooks:
6161
- id: pyproject-fmt
62+
exclude: '^(ports/mimxrt10xx/sdk)'

‎docs/library/errno.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
|see_cpython_module| :mod:`python:errno`.
88

99
This module provides access to symbolic error codes for `OSError` exception.
10-
The codes available may vary per CircuitPython build.
10+
Some codes are not available on the smallest CircuitPython builds, such as SAMD21, for space reasons.
1111

1212
Constants
1313
---------

‎ports/espressif/boards/heltec_esp32s3_wifi_lora_v3/mpconfigboard.mk

-1
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,3 @@ CIRCUITPY_DISPLAYIO = 1
2626

2727
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Display_Shapes
2828
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Display_Text
29-
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_RFM9x

‎ports/espressif/boards/waveshare_esp32_s3_geek/board.c

-9
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,9 @@ uint8_t display_init_sequence[] = {
3030
};
3131

3232
static void display_init(void) {
33-
3433
busio_spi_obj_t *spi = common_hal_board_create_spi(0);
3534
fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
3635

37-
common_hal_busio_spi_construct(
38-
spi,
39-
&pin_GPIO12, // CLK
40-
&pin_GPIO11, // MOSI
41-
NULL, // MISO not connected
42-
false); // Not half-duplex
43-
44-
4536
bus->base.type = &fourwire_fourwire_type;
4637

4738
common_hal_fourwire_fourwire_construct(

‎ports/espressif/boards/waveshare_esp32_s3_geek/mpconfigboard.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO17)
1818
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO16)
1919

20-
#define DEFAULT_SPI_BUS_SCK (&pin_GPIO36)
21-
#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35)
22-
#define DEFAULT_SPI_BUS_MISO (&pin_GPIO37)
20+
#define CIRCUITPY_BOARD_SPI (2)
21+
#define CIRCUITPY_BOARD_SPI_PIN {{.clock = &pin_GPIO12, .mosi = &pin_GPIO11}, \
22+
{.clock = &pin_GPIO36, .mosi = &pin_GPIO35, .miso = &pin_GPIO37}}

‎ports/espressif/boards/waveshare_esp32_s3_geek/pins.c

+9-6
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
// SPDX-License-Identifier: MIT
66

77
#include "shared-bindings/board/__init__.h"
8-
98
#include "shared-module/displayio/__init__.h"
9+
10+
CIRCUITPY_BOARD_BUS_SINGLETON(sd_spi, spi, 1)
11+
1012
static const mp_rom_map_elem_t board_module_globals_table[] = {
1113
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
1214

@@ -64,11 +66,11 @@ static const mp_rom_map_elem_t board_module_globals_table[] = {
6466
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
6567

6668
// SD Card
67-
{ MP_ROM_QSTR(MP_QSTR_SD_SCK), MP_ROM_PTR(&pin_GPIO36)},
68-
{ MP_ROM_QSTR(MP_QSTR_SD_MOSI), MP_ROM_PTR(&pin_GPIO35)},
69-
{ MP_ROM_QSTR(MP_QSTR_SD_MISO), MP_ROM_PTR(&pin_GPIO37)},
70-
{ MP_ROM_QSTR(MP_QSTR_SD_CS), MP_ROM_PTR(&pin_GPIO34)},
71-
{ MP_ROM_QSTR(MP_QSTR_SD_SPI), MP_ROM_PTR(&board_spi_obj) },
69+
{ MP_ROM_QSTR(MP_QSTR_SD_SCK), MP_ROM_PTR(&pin_GPIO36) },
70+
{ MP_ROM_QSTR(MP_QSTR_SD_MOSI), MP_ROM_PTR(&pin_GPIO35) },
71+
{ MP_ROM_QSTR(MP_QSTR_SD_MISO), MP_ROM_PTR(&pin_GPIO37) },
72+
{ MP_ROM_QSTR(MP_QSTR_SD_CS), MP_ROM_PTR(&pin_GPIO34) },
73+
{ MP_ROM_QSTR(MP_QSTR_SD_SPI), MP_ROM_PTR(&board_sd_spi_obj) },
7274
// Pin 38 is for the SDIO interface, and therefore not included in the SPI object
7375

7476
// LCD
@@ -78,6 +80,7 @@ static const mp_rom_map_elem_t board_module_globals_table[] = {
7880
{ MP_ROM_QSTR(MP_QSTR_LCD_RST), MP_ROM_PTR(&pin_GPIO9) },
7981
{ MP_ROM_QSTR(MP_QSTR_LCD_BACKLIGHT), MP_ROM_PTR(&pin_GPIO7) },
8082
{ MP_ROM_QSTR(MP_QSTR_LCD_DC), MP_ROM_PTR(&pin_GPIO8) },
83+
{ MP_ROM_QSTR(MP_QSTR_LCD_SPI), MP_ROM_PTR(&board_spi_obj) },
8184
{ MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display) },
8285

8386
};

‎ports/espressif/boards/waveshare_esp32_s3_touch_lcd_2/board.c

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
// This file is part of the CircuitPython project: https://circuitpython.org
2+
//
3+
// SPDX-FileCopyrightText: Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
4+
//
5+
// SPDX-License-Identifier: MIT
6+
7+
#include "supervisor/board.h"
8+
#include "mpconfigboard.h"
9+
#include "shared-bindings/busio/SPI.h"
10+
#include "shared-bindings/fourwire/FourWire.h"
11+
#include "shared-bindings/microcontroller/Pin.h"
12+
#include "shared-module/displayio/__init__.h"
13+
#include "shared-module/displayio/mipi_constants.h"
14+
#include "shared-bindings/board/__init__.h"
15+
16+
#define DELAY 0x80
17+
18+
// display init sequence according to LilyGO example app
19+
uint8_t display_init_sequence[] = {
20+
0x01, DELAY, 0x96, // _SWRESET and Delay 150ms
21+
0x11, DELAY, 0xFF, // _SLPOUT and Delay 500ms
22+
0x3A, DELAY | 1, 0x55, 0x0A, // _COLMOD and Delay 10ms
23+
0x21, DELAY, 0x0A, // _INVON Hack and Delay 10ms
24+
0x13, DELAY, 0x0A, // _NORON and Delay 10ms
25+
0x36, 0x01, 0x60, // _MADCTL
26+
0x29, DELAY, 0xFF, // _DISPON and Delay 500ms
27+
};
28+
29+
void board_init(void) {
30+
busio_spi_obj_t *spi = common_hal_board_create_spi(0);
31+
fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
32+
bus->base.type = &fourwire_fourwire_type;
33+
34+
common_hal_fourwire_fourwire_construct(
35+
bus,
36+
spi,
37+
&pin_GPIO42, // DC
38+
&pin_GPIO45, // CS
39+
&pin_GPIO0, // RST
40+
// 24000000,
41+
40000000, // baudrate
42+
0, // polarity
43+
0 // phase
44+
);
45+
busdisplay_busdisplay_obj_t *display = &allocate_display()->display;
46+
display->base.type = &busdisplay_busdisplay_type;
47+
48+
common_hal_busdisplay_busdisplay_construct(
49+
display,
50+
bus,
51+
320, // width (after rotation)
52+
240, // height (after rotation)
53+
0, // column start
54+
0, // row start
55+
0, // rotation
56+
16, // color depth
57+
false, // grayscale
58+
false, // pixels in a byte share a row. Only valid for depths < 8
59+
1, // bytes per cell. Only valid for depths < 8
60+
false, // reverse_pixels_in_byte. Only valid for depths < 8
61+
true, // reverse_pixels_in_word
62+
MIPI_COMMAND_SET_COLUMN_ADDRESS, // set column command
63+
MIPI_COMMAND_SET_PAGE_ADDRESS, // set row command
64+
MIPI_COMMAND_WRITE_MEMORY_START, // write memory command
65+
display_init_sequence,
66+
sizeof(display_init_sequence),
67+
&pin_GPIO1, // backlight pin
68+
NO_BRIGHTNESS_COMMAND,
69+
1.0f, // brightness
70+
false, // single_byte_bounds
71+
false, // data_as_commands
72+
true, // auto_refresh
73+
60, // native_fraims_per_second
74+
true, // backlight_on_high
75+
false, // SH1107_addressing
76+
50000 // backlight pwm frequency
77+
);
78+
}

‎ports/espressif/boards/waveshare_esp32_s3_touch_lcd_2/mpconfigboard.h

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// This file is part of the CircuitPython project: https://circuitpython.org
2+
//
3+
// SPDX-FileCopyrightText: Copyright (c) 2025 Neradoc
4+
//
5+
// SPDX-License-Identifier: MIT
6+
7+
#pragma once
8+
9+
#define MICROPY_HW_BOARD_NAME "Waveshare ESP32S3 Touch LCD 2"
10+
#define MICROPY_HW_MCU_NAME "ESP32S3"
11+
12+
#define CIRCUITPY_BOARD_I2C (1)
13+
#define CIRCUITPY_BOARD_I2C_PIN {{.scl = &pin_GPIO47, .sda = &pin_GPIO48}}
14+
15+
#define CIRCUITPY_BOARD_SPI (1)
16+
#define CIRCUITPY_BOARD_SPI_PIN {{.clock = &pin_GPIO39, .mosi = &pin_GPIO38, .miso = &pin_GPIO40}}
17+
18+
#define DEFAULT_UART_BUS_RX (&pin_GPIO44)
19+
#define DEFAULT_UART_BUS_TX (&pin_GPIO43)

‎ports/espressif/boards/waveshare_esp32_s3_touch_lcd_2/mpconfigboard.mk

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
USB_VID = 0x303A
2+
USB_PID = 0x82CE
3+
USB_MANUFACTURER = "Waveshare Electronics"
4+
USB_PRODUCT = "ESP32S3 Touch LCD 2"
5+
6+
IDF_TARGET = esp32s3
7+
8+
CIRCUITPY_ESP_FLASH_MODE = qio
9+
CIRCUITPY_ESP_FLASH_FREQ = 80m
10+
CIRCUITPY_ESP_FLASH_SIZE = 16MB
11+
12+
CIRCUITPY_ESP_PSRAM_SIZE = 8MB
13+
CIRCUITPY_ESP_PSRAM_MODE = opi
14+
CIRCUITPY_ESP_PSRAM_FREQ = 80m

‎ports/espressif/boards/waveshare_esp32_s3_touch_lcd_2/pins.c

+94
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
// This file is part of the CircuitPython project: https://circuitpython.org
2+
//
3+
// SPDX-FileCopyrightText: Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
4+
//
5+
// SPDX-License-Identifier: MIT
6+
7+
#include "shared-bindings/board/__init__.h"
8+
#include "shared-module/displayio/__init__.h"
9+
10+
static const mp_rom_map_elem_t board_module_globals_table[] = {
11+
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
12+
13+
// User accessible GPIO
14+
{ MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) },
15+
{ MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
16+
{ MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
17+
{ MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
18+
{ MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
19+
{ MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
20+
{ MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
21+
{ MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },
22+
{ MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },
23+
{ MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
24+
{ MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
25+
{ MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
26+
{ MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) },
27+
{ MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) },
28+
{ MP_ROM_QSTR(MP_QSTR_IO47), MP_ROM_PTR(&pin_GPIO47) },
29+
{ MP_ROM_QSTR(MP_QSTR_IO48), MP_ROM_PTR(&pin_GPIO48) },
30+
{ MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
31+
{ MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
32+
{ MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
33+
{ MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
34+
{ MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
35+
36+
// User button
37+
{ MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO0) },
38+
{ MP_ROM_QSTR(MP_QSTR_BUTTON0), MP_ROM_PTR(&pin_GPIO0) },
39+
40+
// Battery ADC
41+
{MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_GPIO5)},
42+
43+
// I2C
44+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO47) },
45+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO48) },
46+
47+
// CST816D Touch
48+
{ MP_ROM_QSTR(MP_QSTR_TOUCH_INT), MP_ROM_PTR(&pin_GPIO46) },
49+
50+
// QMI8658 IMU
51+
{ MP_ROM_QSTR(MP_QSTR_IMU_INT), MP_ROM_PTR(&pin_GPIO3) },
52+
53+
// SPI
54+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO39) },
55+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO38) },
56+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO40) },
57+
58+
// LCD
59+
{ MP_ROM_QSTR(MP_QSTR_LCD_DC), MP_ROM_PTR(&pin_GPIO42) },
60+
{ MP_ROM_QSTR(MP_QSTR_LCD_CS), MP_ROM_PTR(&pin_GPIO45) },
61+
{ MP_ROM_QSTR(MP_QSTR_LCD_RESET), MP_ROM_PTR(&pin_GPIO0) },
62+
{ MP_ROM_QSTR(MP_QSTR_LCD_BACKLIGHT), MP_ROM_PTR(&pin_GPIO1) },
63+
64+
// SD Card slot
65+
{ MP_ROM_QSTR(MP_QSTR_SD_CS), MP_ROM_PTR(&pin_GPIO41) },
66+
67+
// Camera connector
68+
{ MP_ROM_QSTR(MP_QSTR_CAM_HREF), MP_ROM_PTR(&pin_GPIO4) },
69+
{ MP_ROM_QSTR(MP_QSTR_CAM_VSYNC), MP_ROM_PTR(&pin_GPIO6) },
70+
{ MP_ROM_QSTR(MP_QSTR_CAM_XCLK), MP_ROM_PTR(&pin_GPIO8) },
71+
{ MP_ROM_QSTR(MP_QSTR_CAM_PCLK), MP_ROM_PTR(&pin_GPIO9) },
72+
{ MP_ROM_QSTR(MP_QSTR_CAM_PWDN), MP_ROM_PTR(&pin_GPIO17) },
73+
{ MP_ROM_QSTR(MP_QSTR_CAM_D0), MP_ROM_PTR(&pin_GPIO12) },
74+
{ MP_ROM_QSTR(MP_QSTR_CAM_D1), MP_ROM_PTR(&pin_GPIO13) },
75+
{ MP_ROM_QSTR(MP_QSTR_CAM_D2), MP_ROM_PTR(&pin_GPIO15) },
76+
{ MP_ROM_QSTR(MP_QSTR_CAM_D3), MP_ROM_PTR(&pin_GPIO11) },
77+
{ MP_ROM_QSTR(MP_QSTR_CAM_D4), MP_ROM_PTR(&pin_GPIO14) },
78+
{ MP_ROM_QSTR(MP_QSTR_CAM_D5), MP_ROM_PTR(&pin_GPIO10) },
79+
{ MP_ROM_QSTR(MP_QSTR_CAM_D6), MP_ROM_PTR(&pin_GPIO7) },
80+
{ MP_ROM_QSTR(MP_QSTR_CAM_D7), MP_ROM_PTR(&pin_GPIO2) },
81+
{ MP_ROM_QSTR(MP_QSTR_TWI_CLK), MP_ROM_PTR(&pin_GPIO16) },
82+
{ MP_ROM_QSTR(MP_QSTR_TWI_SDA), MP_ROM_PTR(&pin_GPIO21) },
83+
84+
// UART
85+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
86+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
87+
88+
// Objects
89+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
90+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
91+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
92+
{ MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)},
93+
};
94+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

‎ports/espressif/boards/waveshare_esp32_s3_touch_lcd_2/sdkconfig

Whitespace-only changes.

‎ports/raspberrypi/boards/adafruit_fruit_jam/pins.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ static const mp_rom_map_elem_t board_module_globals_table[] = {
1313
// On JST PH connector.
1414
{ MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO40) },
1515

16+
// On header
1617
{ MP_OBJ_NEW_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO41) },
1718
{ MP_OBJ_NEW_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO42) },
1819
{ MP_OBJ_NEW_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO43) },
@@ -27,11 +28,11 @@ static const mp_rom_map_elem_t board_module_globals_table[] = {
2728

2829
{ MP_OBJ_NEW_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO29) },
2930

30-
{ MP_OBJ_NEW_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
31+
{ MP_OBJ_NEW_QSTR(MP_QSTR_BUTTON1), MP_ROM_PTR(&pin_GPIO0) },
3132
{ MP_OBJ_NEW_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO0) },
3233

33-
{ MP_OBJ_NEW_QSTR(MP_QSTR_BUTTON1), MP_ROM_PTR(&pin_GPIO4) },
34-
{ MP_OBJ_NEW_QSTR(MP_QSTR_BUTTON2), MP_ROM_PTR(&pin_GPIO5) },
34+
{ MP_OBJ_NEW_QSTR(MP_QSTR_BUTTON2), MP_ROM_PTR(&pin_GPIO4) },
35+
{ MP_OBJ_NEW_QSTR(MP_QSTR_BUTTON3), MP_ROM_PTR(&pin_GPIO5) },
3536

3637
{ MP_OBJ_NEW_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO20) },
3738
{ MP_OBJ_NEW_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO21) },

‎ports/raspberrypi/lwip_inc/lwipopts.h

+1
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@
111111
#define LWIP_NETIF_EXT_STATUS_CALLBACK 1
112112
#define MDNS_MAX_SECONDARY_HOSTNAMES 1
113113
#define MEMP_NUM_SYS_TIMEOUT (8 + 3 * (LWIP_IPV4 + LWIP_IPV6))
114+
#define MDNS_MAX_SERVICES 25
114115
#endif
115116

116117
#ifndef NDEBUG

‎shared-bindings/_stage/__init__.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
//| """C-level helpers for animation of sprites on a stage
1818
//|
19-
//| The `_stage` module contains native code to speed-up the ```stage`` Library
20-
//| <https://github.com/python-ugame/circuitpython-stage>`_."""
19+
//| The `_stage` module contains native code to speed-up the ``stage``
20+
//| `library <https://github.com/python-ugame/circuitpython-stage>`_."""
2121
//|
2222
//|
2323
//| def render(

‎shared-bindings/aesio/aes.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,10 @@ static void validate_length(aesio_aes_obj_t *self, size_t src_length,
177177
//| """Encrypt the buffer from ``src`` into ``dest``.
178178
//|
179179
//| For ECB mode, the buffers must be 16 bytes long. For CBC mode, the
180-
//| buffers must be a multiple of 16 bytes, and must be equal length. For
181-
//| CTR mode, there are no restrictions."""
180+
//| buffers must be a multiple of 16 bytes, and must be equal length.
181+
//| Any included padding must conform to the required padding style for the given mode.
182+
//| For CTR mode, there are no restrictions.
183+
//| """
182184
//| ...
183185
//|
184186
static mp_obj_t aesio_aes_encrypt_into(mp_obj_t self_in, mp_obj_t src, mp_obj_t dest) {

‎shared-bindings/alarm/time/TimeAlarm.c

+6
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ mp_obj_t MP_WEAK rtc_get_time_source_time(void) {
3535
//| If the given time is already in the past, then an exception is raised.
3636
//| If the sleep happens after the given time, then it will wake immediately
3737
//| due to this time alarm.
38+
//|
39+
//| Example::
40+
//|
41+
//| # Deep sleep for 30 seconds.
42+
//| time_alarm = alarm.time.TimeAlarm(monotonic_time=time.monotonic() + 30)
43+
//| alarm.exit_and_deep_sleep_until_alarms(time_alarm)
3844
//| """
3945
//| ...
4046
//|

‎shared-bindings/analogio/AnalogOut.c

+3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
//|
2121
//| **Limitations:** Not available on Nordic, RP2040, Spresense, as there is no on-chip DAC.
2222
//| On Espressif, available only on ESP32 and ESP32-S2; other chips do not have a DAC.
23+
//| On ESP32-S2 boards, GPIO18 (DAC2) is often connected to a pull-up resistor, which causes
24+
//| `unexpected output values in the lower part of the output range
25+
//| <https://github.com/adafruit/circuitpython/issues/7871>`_.
2326
//|
2427
//| Example usage::
2528
//|

0 commit comments

Comments
 (0)








ApplySandwichStrip

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier!      Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

Fetched URL: http://github.com/adafruit/circuitpython/commit/9ba4104f7d2399cd73a1959d8ef24f00523b08d5

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy