Skip to content

Merge 8.2.x to main #8395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 28 commits into from
Sep 13, 2023
Merged

Merge 8.2.x to main #8395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
c1144e6
Add files via upload
BrainBoardz Aug 28, 2023
9bdb576
Add files via upload
BrainBoardz Aug 28, 2023
524d7a0
Merge pull request #8343 from BrainBoardzProject/8.2.x
tannewt Aug 28, 2023
9daccc0
Forbidden pins are now correctly "in use" on ESP
tannewt Aug 28, 2023
06ccd41
Remove frozen libs from Funhouse
makermelissa Aug 29, 2023
e34e1da
Merge pull request #8356 from jepler/remove-funhouse-frozen-82x
makermelissa Sep 1, 2023
442f84d
Merge pull request #8345 from tannewt/s3_watchdog
tannewt Sep 5, 2023
0c0b927
added waveshare_esp32_s3_pico for circuitpython version 8.2.x
tirtharajsinha Sep 6, 2023
1eb8822
added SCL and SDA
tirtharajsinha Sep 6, 2023
896be9e
added precommit
tirtharajsinha Sep 6, 2023
d7edec6
8.2.x backport Added Arduino Nano ESP32-S3
tannewt Sep 5, 2023
d871bc3
remove lib/certificates/nina-fw submodule
dhalbert Sep 6, 2023
58a2132
Update to new certificates submodule.
dhalbert Sep 6, 2023
e71c397
Added UM FeatherS3 second I2C STEMMAQT
UnexpectedMaker Sep 7, 2023
7dac8fc
Merge pull request #8373 from makermelissa/8.2.x
dhalbert Sep 7, 2023
bc44571
Merge pull request #8375 from UnexpectedCircuitPython/fs3_changes
dhalbert Sep 7, 2023
c5bc59e
update protomatter to 1.6.1 (used for RGBMatrix)
dhalbert Sep 7, 2023
aaa23df
Merge pull request #8372 from tirtharajsinha/8.2.x
dhalbert Sep 7, 2023
6f5a5a5
Merge pull request #8376 from dhalbert/protomatter-1.6.1
dhalbert Sep 7, 2023
4dd45b6
Merge pull request #8374 from dhalbert/new-certificates-submodule
dhalbert Sep 7, 2023
722d64b
Add root cert DST Root CA X3 for Let's Encrypt
dhalbert Sep 11, 2023
7071202
Merge pull request #8386 from dhalbert/lets-encrypt-cert
dhalbert Sep 11, 2023
0526794
Revert "formatting" (from #8089)
dhalbert Sep 12, 2023
46bcd10
Revert "Reset UART on deinit, reduces power consumption" (from #8089)
dhalbert Sep 12, 2023
d8aeceb
SSLContext.load_verify_locations - no kw-only args
dhalbert Sep 12, 2023
74f17b1
Merge pull request #8392 from dhalbert/8.2.x-sslcontext-args
dhalbert Sep 12, 2023
09329fe
Merge pull request #8391 from dhalbert/8.2.x-revert-8089-nrf-uart-pow…
tannewt Sep 12, 2023
9f1d526
merge from 8.2.x
dhalbert Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,6 @@
path = ports/espressif/esp-idf
url = https://github.com/adafruit/esp-idf.git
branch = release/v4.4-circuitpython
[submodule "ports/espressif/certificates/nina-fw"]
path = lib/certificates/nina-fw
url = https://github.com/adafruit/nina-fw.git
[submodule "frozen/Adafruit_CircuitPython_ST7789"]
path = frozen/Adafruit_CircuitPython_ST7789
url = https://github.com/adafruit/Adafruit_CircuitPython_ST7789
Expand Down Expand Up @@ -345,3 +342,6 @@
path = ports/raspberrypi/lib/Pico-PIO-USB
url = https://github.com/sekigon-gonnoc/Pico-PIO-USB.git
branch = main
[submodule "lib/certificates"]
path = lib/certificates
url = https://github.com/adafruit/certificates
1 change: 1 addition & 0 deletions lib/certificates
Open in desktop
Submodule certificates added at cbb33c
3 changes: 0 additions & 3 deletions lib/certificates/README.md
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion lib/certificates/nina-fw
Open in desktop
Submodule nina-fw deleted from 21205e
2 changes: 1 addition & 1 deletion lib/protomatter
Open in desktop
Submodule protomatter updated 7 files
+1 −1 library.properties
+10 −0 src/Adafruit_Protomatter.h
+8 −0 src/arch/arch.h
+37 −19 src/arch/esp32-s3.h
+177 −23 src/arch/samd51.h
+14 −10 src/core.c
+10 −0 src/core.h
6 changes: 0 additions & 6 deletions ports/espressif/boards/adafruit_funhouse/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,6 @@ uint8_t display_init_sequence[] = {
};

void board_init(void) {
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO37);
common_hal_never_reset_pin(&pin_GPIO38);
#endif /* DEBUG */

displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
busio_spi_obj_t *spi = &bus->inline_bus;
common_hal_busio_spi_construct(spi, &pin_GPIO36, &pin_GPIO35, NULL, false);
Expand Down
4 changes: 0 additions & 4 deletions ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,4 @@ CIRCUITPY_ESP_FLASH_SIZE = 4MB
CIRCUITPY_ESPCAMERA = 0

# Include these Python libraries in firmware.
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_PortalBase
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_FakeRequests
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Display_Text
4 changes: 2 additions & 2 deletions ports/espressif/boards/adafruit_funhouse/pins.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO33) },
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO34) },

{ MP_OBJ_NEW_QSTR(MP_QSTR_DEBUG_TX), MP_ROM_PTR(&pin_GPIO37) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_DEBUG_RX), MP_ROM_PTR(&pin_GPIO38) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_DEBUG_TX), MP_ROM_PTR(&pin_GPIO43) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_DEBUG_RX), MP_ROM_PTR(&pin_GPIO44) },

{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
{ MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) },
Expand Down
6 changes: 0 additions & 6 deletions ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,6 @@ const uint8_t refresh_sequence[] = {
};

void board_init(void) {
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */

displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
busio_spi_obj_t *spi = &bus->inline_bus;
common_hal_busio_spi_construct(spi, &pin_GPIO36, &pin_GPIO35, NULL, false);
Expand Down
10 changes: 0 additions & 10 deletions ports/espressif/boards/adafruit_qtpy_esp32s3_4mbflash_2mbpsram/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,5 @@
*/

#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"

void board_init(void) {
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif
}

// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
10 changes: 0 additions & 10 deletions ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,5 @@
*/

#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"

void board_init(void) {
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif
}

// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
6 changes: 0 additions & 6 deletions ports/espressif/boards/ai_thinker_esp32-c3s-2m/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,6 @@
#include "soc/usb_serial_jtag_struct.h"

void board_init(void) {
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO20);
common_hal_never_reset_pin(&pin_GPIO21);
#endif

// This board has LEDs connected to the USB pins
USB_SERIAL_JTAG.conf0.usb_pad_enable = 0;
USB_SERIAL_JTAG.conf0.dp_pullup = 0;
Expand Down
6 changes: 0 additions & 6 deletions ports/espressif/boards/ai_thinker_esp32-c3s/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,6 @@
#include "soc/usb_serial_jtag_struct.h"

void board_init(void) {
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO20);
common_hal_never_reset_pin(&pin_GPIO21);
#endif

// This board has LEDs connected to the USB pins
USB_SERIAL_JTAG.conf0.usb_pad_enable = 0;
USB_SERIAL_JTAG.conf0.dp_pullup = 0;
Expand Down
10 changes: 0 additions & 10 deletions ports/espressif/boards/ai_thinker_esp_12k_nodemcu/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,5 @@
*/

#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"

void board_init(void) {
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */
}

// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
6 changes: 0 additions & 6 deletions ports/espressif/boards/artisense_rd00/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,6 @@
#include "shared-bindings/microcontroller/Pin.h"

void board_init(void) {
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */

// Crystal
common_hal_never_reset_pin(&pin_GPIO15);
common_hal_never_reset_pin(&pin_GPIO16);
Expand Down
10 changes: 0 additions & 10 deletions ports/espressif/boards/atmegazero_esp32s2/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,5 @@
*/

#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"

void board_init(void) {
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */
}

// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
9 changes: 0 additions & 9 deletions ports/espressif/boards/bpi_bit_s2/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,5 @@
*/

#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"

void board_init(void) {
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */
}
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
10 changes: 0 additions & 10 deletions ports/espressif/boards/bpi_leaf_s3/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,5 @@
*/

#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"

void board_init(void) {
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif
}

// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
10 changes: 0 additions & 10 deletions ports/espressif/boards/bpi_picow_s3/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,5 @@
*/

#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"

void board_init(void) {
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */
}

// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
10 changes: 0 additions & 10 deletions ports/espressif/boards/brainboardz_neuron/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,5 @@
*/

#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"

void board_init(void) {
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif
}

// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
10 changes: 0 additions & 10 deletions ports/espressif/boards/crumpspace_crumps2/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,5 @@
*/

#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"

void board_init(void) {
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */
}

// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
10 changes: 0 additions & 10 deletions ports/espressif/boards/electroniccats_bastwifi/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,5 @@
*/

#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"

void board_init(void) {
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */
}

// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
9 changes: 0 additions & 9 deletions ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,6 @@
* THE SOFTWARE.
*/

#include "shared-bindings/microcontroller/Pin.h"
#include "supervisor/board.h"

void board_init(void) {
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO20);
common_hal_never_reset_pin(&pin_GPIO21);
#endif
}

// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
10 changes: 0 additions & 10 deletions ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,5 @@
*/

#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"

void board_init(void) {
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */
}

// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
10 changes: 0 additions & 10 deletions ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,5 @@
*/

#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"

void board_init(void) {
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */
}

// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
10 changes: 0 additions & 10 deletions ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,5 @@
*/

#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"

void board_init(void) {
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */
}

// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
6 changes: 0 additions & 6 deletions ports/espressif/boards/espressif_esp32s3_box/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,6 @@ void board_init(void) {
true, // backlight_on_high
false, // SH1107_addressing
50000); // backlight pwm frequency

// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif
}

// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
6 changes: 0 additions & 6 deletions ports/espressif/boards/espressif_esp32s3_box_lite/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,6 @@ void board_init(void) {
false, // backlight_on_high
false, // SH1107_addressing
50000); // backlight pwm frequency

// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif
}

// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
21 changes: 1 addition & 20 deletions ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,5 @@
*/

#include "supervisor/board.h"
#include "mpconfigboard.h"
#include "shared-bindings/microcontroller/Pin.h"

void board_init(void) {
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif
}

bool board_requests_safe_mode(void) {
return false;
}

void reset_board(void) {

}

void board_deinit(void) {
}
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
Loading