Skip to content

Commit 47259d7

Browse files
dhalbertdhalbert
authored
Merge branch 'main' into esp32-s2-no-ota
2 parents 47a5692 + f004816 commit 47259d7

File tree

17 files changed

+1364
-7
lines changed

17 files changed

+1364
-7
lines changed

‎.codespell/exclude-file.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ i1Qb$TE"rl
88
ZEN = "the zen of python beautiful is better than ugly explicit is better than implicit simple is better than complex complex is better than complicated flat is better than nested sparse is better than dense readability counts special cases arent special enough to break the rules although practicality beats purity errors should never pass silently unless explicitly silenced in the face of ambiguity refuse the temptation to guess there should be one and preferably only one obvious way to do it although that way may not be obvious at first unless youre dutch now is better than never although never is often better than right now if the implementation is hard to explain its a bad idea if the implementation is easy to explain it may be a good idea namespaces are one honking great idea lets do more of those"
99
"arent",
1010
"youre",
11+
USB_MANUFACTURER = "Wee Noise Makers"

‎.devcontainer/cortex-m-toolchain.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ wget -qO gcc-arm-none-eabi.tar.xz \
1717
https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi.tar.xz
1818

1919
tar -xJf gcc-arm-none-eabi.tar.xz
20-
ln -s arm-gnu-toolchain-14.2.Rel1-x86_64-arm-none-eabi gcc-arm-none-eabi
20+
ln -s arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi gcc-arm-none-eabi
2121
rm -f gcc-arm-none-eabi.tar.xz
2222

2323
echo -e "[cortex-m-toolchain.sh] update PATH in environment"

‎locale/nl.po

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ msgstr ""
66
"Project-Id-Version: PACKAGE VERSION\n"
77
"Report-Msgid-Bugs-To: \n"
88
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
9-
"PO-Revision-Date: 2025-06-30 16:01+0000\n"
10-
"Last-Translator: MAE <[email protected]>\n"
9+
"PO-Revision-Date: 2025-07-13 16:01+0000\n"
10+
"Last-Translator: Mirthe Winter <[email protected]>\n"
1111
"Language-Team: none\n"
1212
"Language: nl\n"
1313
"MIME-Version: 1.0\n"
@@ -49,7 +49,7 @@ msgstr ""
4949

5050
#: py/obj.c
5151
msgid " File \"%q\""
52-
msgstr " Bestand"
52+
msgstr " Bestand \"%q\""
5353

5454
#: py/obj.c
5555
msgid " File \"%q\", line %d"
@@ -631,8 +631,8 @@ msgid ""
631631
"Auto-reload is on. Simply save files over USB to run them or enter REPL to "
632632
"disable.\n"
633633
msgstr ""
634-
"Auto-herlaad staat aan. Sla bestanden simpelweg op over USB om uit te voeren "
635-
"of start REPL om uit te schakelen.\n"
634+
"Auto-herlaad staat aan. Sla bestanden simpelweg via USB op om ze uit te "
635+
"voeren of start REPL om ze uit te schakelen.\n"
636636

637637
#: ports/espressif/common-hal/canio/CAN.c
638638
msgid "Baudrate not supported by peripheral"
@@ -1845,7 +1845,7 @@ msgstr "Prefix buffer moet op de heap zijn"
18451845
#: main.c
18461846
msgid "Press any key to enter the REPL. Use CTRL-D to reload.\n"
18471847
msgstr ""
1848-
"Druk een willekeurige toets om de REPL te starten. Gebruik CTRL+D om te "
1848+
"Druk op een willekeurige toets om de REPL te starten. Gebruik CTRL+D om te "
18491849
"herstarten.\n"
18501850

18511851
#: main.c

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
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+
9+
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// This file is part of the CircuitPython project: https://circuitpython.org
2+
//
3+
// SPDX-FileCopyrightText: Copyright (c) 2019 Scott Shawcroft for Adafruit
4+
// Industries
5+
//
6+
// SPDX-License-Identifier: MIT
7+
8+
#pragma once
9+
10+
// Micropython setup
11+
12+
#define MICROPY_HW_BOARD_NAME "EDGES3D"
13+
#define MICROPY_HW_MCU_NAME "ESP32S3"
14+
15+
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO9)
16+
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO8)
17+
18+
#define DEFAULT_SPI_BUS_SCK (&pin_GPIO4)
19+
#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO7)
20+
#define DEFAULT_SPI_BUS_MISO (&pin_GPIO5)
21+
22+
#define DEFAULT_UART_BUS_RX (&pin_GPIO44)
23+
#define DEFAULT_UART_BUS_TX (&pin_GPIO43)

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
USB_VID = 0x303A
2+
USB_PID = 0x82DD
3+
USB_PRODUCT = "EDGES3D"
4+
USB_MANUFACTURER = "UnexpectedMaker"
5+
6+
IDF_TARGET = esp32s3
7+
8+
CIRCUITPY_ESP_FLASH_SIZE = 8MB
9+
CIRCUITPY_ESP_FLASH_MODE = qio
10+
CIRCUITPY_ESP_FLASH_FREQ = 80m
11+
12+
CIRCUITPY_ESP_PSRAM_SIZE = 2MB
13+
CIRCUITPY_ESP_PSRAM_MODE = qio
14+
CIRCUITPY_ESP_PSRAM_FREQ = 80m
15+
16+
CIRCUITPY_STAGE = 1

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

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
// This file is part of the CircuitPython project: https://circuitpython.org
2+
//
3+
// SPDX-FileCopyrightText: Copyright (c) 2020 Scott Shawcroft for Adafruit
4+
// Industries
5+
//
6+
// SPDX-License-Identifier: MIT
7+
8+
#include "shared-bindings/board/__init__.h"
9+
10+
static const mp_rom_map_elem_t board_module_globals_table[] = {
11+
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
12+
13+
{MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0)},
14+
{MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0)},
15+
16+
{MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1)},
17+
{MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO1)},
18+
{MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_GPIO1)},
19+
20+
{MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2)},
21+
{MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO2)},
22+
{MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2)},
23+
24+
{MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3)},
25+
{MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO3)},
26+
{MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3)},
27+
28+
{MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4)},
29+
{MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO4)},
30+
{MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4)},
31+
32+
{MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5)},
33+
{MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO5)},
34+
{MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5)},
35+
36+
{MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6)},
37+
{MP_ROM_QSTR(MP_QSTR_FG_INT), MP_ROM_PTR(&pin_GPIO6)},
38+
39+
{MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7)},
40+
{MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO7)},
41+
{MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7)},
42+
43+
{MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO8)},
44+
{MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8)},
45+
{MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO8)},
46+
{MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8)},
47+
48+
{MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO9)},
49+
{MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9)},
50+
{MP_ROM_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_GPIO9)},
51+
{MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9)},
52+
53+
{MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10)},
54+
{MP_ROM_QSTR(MP_QSTR_A9), MP_ROM_PTR(&pin_GPIO10)},
55+
{MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10)},
56+
57+
{MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11)},
58+
{MP_ROM_QSTR(MP_QSTR_A10), MP_ROM_PTR(&pin_GPIO11)},
59+
{MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11)},
60+
61+
{MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12)},
62+
{MP_ROM_QSTR(MP_QSTR_A11), MP_ROM_PTR(&pin_GPIO12)},
63+
{MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12)},
64+
65+
{MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13)},
66+
{MP_ROM_QSTR(MP_QSTR_A12), MP_ROM_PTR(&pin_GPIO13)},
67+
{MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13)},
68+
69+
{MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14)},
70+
{MP_ROM_QSTR(MP_QSTR_A13), MP_ROM_PTR(&pin_GPIO14)},
71+
{MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14)},
72+
73+
{MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15)},
74+
{MP_ROM_QSTR(MP_QSTR_A14), MP_ROM_PTR(&pin_GPIO15)},
75+
{MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15)},
76+
77+
{MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16)},
78+
{MP_ROM_QSTR(MP_QSTR_A15), MP_ROM_PTR(&pin_GPIO16)},
79+
{MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16)},
80+
81+
{MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17)},
82+
{MP_ROM_QSTR(MP_QSTR_A16), MP_ROM_PTR(&pin_GPIO17)},
83+
{MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17)},
84+
85+
{MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18)},
86+
{MP_ROM_QSTR(MP_QSTR_A17), MP_ROM_PTR(&pin_GPIO18)},
87+
{MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18)},
88+
89+
{MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21)},
90+
{MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21)},
91+
92+
{MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39)},
93+
{MP_ROM_QSTR(MP_QSTR_D39), MP_ROM_PTR(&pin_GPIO39)},
94+
{MP_ROM_QSTR(MP_QSTR_MTCK), MP_ROM_PTR(&pin_GPIO39)},
95+
96+
{MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40)},
97+
{MP_ROM_QSTR(MP_QSTR_D40), MP_ROM_PTR(&pin_GPIO40)},
98+
{MP_ROM_QSTR(MP_QSTR_MTDO), MP_ROM_PTR(&pin_GPIO40)},
99+
100+
{MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41)},
101+
{MP_ROM_QSTR(MP_QSTR_D41), MP_ROM_PTR(&pin_GPIO41)},
102+
{MP_ROM_QSTR(MP_QSTR_MTDI), MP_ROM_PTR(&pin_GPIO41)},
103+
104+
{MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42)},
105+
{MP_ROM_QSTR(MP_QSTR_D42), MP_ROM_PTR(&pin_GPIO42)},
106+
{MP_ROM_QSTR(MP_QSTR_MTMS), MP_ROM_PTR(&pin_GPIO42)},
107+
108+
{MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43)},
109+
{MP_ROM_QSTR(MP_QSTR_D43), MP_ROM_PTR(&pin_GPIO43)},
110+
{MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43)},
111+
112+
{MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44)},
113+
{MP_ROM_QSTR(MP_QSTR_D44), MP_ROM_PTR(&pin_GPIO44)},
114+
{MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44)},
115+
116+
{MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45)},
117+
{MP_ROM_QSTR(MP_QSTR_D45), MP_ROM_PTR(&pin_GPIO45)},
118+
119+
{MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46)},
120+
{MP_ROM_QSTR(MP_QSTR_D46), MP_ROM_PTR(&pin_GPIO46)},
121+
122+
{MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj)},
123+
{MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj)},
124+
{MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj)},
125+
};
126+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

‎ports/espressif/boards/unexpectedmaker_edges3d/sdkconfig

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#
2+
# Espressif IoT Development Framework Configuration
3+
#
4+
#
5+
# Component config
6+
#
7+
#
8+
# LWIP
9+
#
10+
# end of LWIP
11+
12+
# end of Component config
13+
14+
# end of Espressif IoT Development Framework Configuration

0 commit comments

Comments
 (0)