Skip to content

Commit 99350f3

Browse files
dhalbertdhalbert
committed
merge from 8.2.9
1 parent 12d820d commit 99350f3

File tree

18 files changed

+239
-16
lines changed

18 files changed

+239
-16
lines changed

‎data/nvm.toml

‎ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.mk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ CHIP_VARIANT = SAMD21G18A
77
CHIP_FAMILY = samd21
88

99
SPI_FLASH_FILESYSTEM = 1
10-
EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ, GD25Q64C"
10+
EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ, GD25Q64C, W25Q16JVxQ"
1111
LONGINT_IMPL = NONE
1212

1313
# To keep the build small
1414
CIRCUITPY_AUDIOBUSIO = 0
15-
CIRCUITPY_BUSDEVICE = 1 # lis3dh needs it
15+
# lis3dh needs adafruit_bus_device
16+
CIRCUITPY_BUSDEVICE = 1
1617
CIRCUITPY_KEYPAD = 0
1718

1819
# Include these Python libraries in firmware.

‎ports/atmel-samd/boards/seeeduino_xiao_kb/mpconfigboard.mk

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,19 @@ CIRCUITPY_FULL_BUILD = 0
1515
# Many I/O functions are not available or not used in a keyboard
1616
# CIRCUITPY_ANALOGIO = 1 # Needed for potentiometer input (mouse)
1717
CIRCUITPY_AUDIOCORE = 0
18-
CIRCUITPY_BUSIO = 0 # Needed for I2C, SPI and UART - removed that for keyboards...
18+
# Needed for I2C, SPI and UART - removed that for keyboards...
19+
CIRCUITPY_BUSIO = 0
1920
CIRCUITPY_PULSEIO = 0
20-
# CIRCUITPY_PWMIO = 1 # only needed for speaker or LED PWM functions. Takes 2314 bytes.
21+
# only needed for speaker or LED PWM functions. Takes 2314 bytes.
22+
# CIRCUITPY_PWMIO = 1
2123
CIRCUITPY_RTC = 0
2224
CIRCUITPY_MATH = 0
2325
#CIRCUITPY_RANDOM = 0
2426
CIRCUITPY_ONEWIREIO = 0
25-
CIRCUITPY_NEOPIXEL_WRITE = 1 # Needed for RGB LEDs
26-
CIRCUITPY_RAINBOWIO = 1 # Needed for RGB LEDs
27+
# Needed for RGB LEDs
28+
CIRCUITPY_NEOPIXEL_WRITE = 1
29+
# Needed for RGB LEDs
30+
CIRCUITPY_RAINBOWIO = 1
2731
# These are used in a keyboard or computer input device.
2832
CIRCUITPY_ROTARYIO = 1
2933
CIRCUITPY_KEYPAD = 1

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* The MIT License (MIT)
55
*
6-
* Copyright (c) 2019 Scott Shawcroft for Adafruit Industries
6+
* Copyright (c) 2023 Scott Shawcroft for Adafruit Industries
77
*
88
* Permission is hereby granted, free of charge, to any person obtaining a copy
99
* of this software and associated documentation files (the "Software"), to deal
@@ -24,8 +24,6 @@
2424
* THE SOFTWARE.
2525
*/
2626

27-
// Micropython setup
28-
2927
#define MICROPY_HW_BOARD_NAME "Adafruit Camera"
3028
#define MICROPY_HW_MCU_NAME "ESP32S3"
3129

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
USB_VID = 0x2341
2-
USB_PID = 0x0070
2+
USB_PID = 0x056B
33

44
USB_PRODUCT = "Arduino Nano ESP32"
55
USB_MANUFACTURER = "Arduino"

‎ports/raspberrypi/boards/wisdpi_ardu2040m/board.c

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2021 Scott Shawcroft for Adafruit Industries
7+
*
8+
* Permission is hereby granted, free of charge, to any person obtaining a copy
9+
* of this software and associated documentation files (the "Software"), to deal
10+
* in the Software without restriction, including without limitation the rights
11+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
* copies of the Software, and to permit persons to whom the Software is
13+
* furnished to do so, subject to the following conditions:
14+
*
15+
* The above copyright notice and this permission notice shall be included in
16+
* all copies or substantial portions of the Software.
17+
*
18+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24+
* THE SOFTWARE.
25+
*/
26+
27+
#include "supervisor/board.h"
28+
29+
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

‎ports/raspberrypi/boards/wisdpi_ardu2040m/mpconfigboard.h

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#define MICROPY_HW_BOARD_NAME "WisdPi Ardu2040M"
2+
#define MICROPY_HW_MCU_NAME "rp2040"
3+
4+
#define MICROPY_HW_LED_STATUS (&pin_GPIO25)
5+
6+
7+
#define DEFAULT_UART_BUS_TX (&pin_GPIO0)
8+
#define DEFAULT_UART_BUS_RX (&pin_GPIO1)
9+
10+
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO5)
11+
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO4)
12+
13+
#define DEFAULT_SPI_BUS_SCK (&pin_GPIO18)
14+
#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO19)
15+
#define DEFAULT_SPI_BUS_MISO (&pin_GPIO16)
16+
17+
#define MICROPY_HW_NEOPIXEL (&pin_GPIO13)

‎ports/raspberrypi/boards/wisdpi_ardu2040m/mpconfigboard.mk

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
USB_VID = 0x2E8A
2+
USB_PID = 0x1067
3+
USB_PRODUCT = "Ardu2040M"
4+
USB_MANUFACTURER = "WisdPi"
5+
6+
CHIP_VARIANT = RP2040
7+
CHIP_FAMILY = rp2
8+
9+
EXTERNAL_FLASH_DEVICES = "ZD25Q16C"
10+
11+
CIRCUITPY__EVE = 1

‎ports/raspberrypi/boards/wisdpi_ardu2040m/pico-sdk-configboard.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// Put board-specific pico-sdk definitions here. This file must exist.

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

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
#include "shared-bindings/board/__init__.h"
2+
3+
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
4+
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
5+
6+
{ MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) },
7+
{ MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) },
8+
{ MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) },
9+
{ MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) },
10+
{ MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) },
11+
{ MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) },
12+
{ MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) },
13+
{ MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) },
14+
15+
{ MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) },
16+
{ MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) },
17+
18+
{ MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) },
19+
{ MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) },
20+
{ MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) },
21+
{ MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) },
22+
{ MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) },
23+
{ MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) },
24+
{ MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) },
25+
{ MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) },
26+
{ MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO18) },
27+
{ MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) },
28+
{ MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) },
29+
{ MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) },
30+
{ MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) },
31+
32+
{ MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_GPIO24) },
33+
{ MP_ROM_QSTR(MP_QSTR_GP24), MP_ROM_PTR(&pin_GPIO24) },
34+
35+
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO25) },
36+
{ MP_ROM_QSTR(MP_QSTR_GP25), MP_ROM_PTR(&pin_GPIO25) },
37+
38+
{ MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) },
39+
{ MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) },
40+
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
41+
42+
{ MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27) },
43+
{ MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) },
44+
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) },
45+
46+
{ MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) },
47+
{ MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) },
48+
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
49+
50+
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) },
51+
{ MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO29) },
52+
53+
{ MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) },
54+
55+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO13) },
56+
57+
};
58+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

0 commit comments

Comments
 (0)