Skip to content

Commit edbbed0

Browse files
authored
Merge pull request #8953 from BlitzCityDIY/main
adding itsybitsy esp32
2 parents 8b8b659 + 61b0ed3 commit edbbed0

File tree

6 files changed

+161
-28
lines changed

6 files changed

+161
-28
lines changed

locale/circuitpython.pot

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -670,10 +670,6 @@ msgstr ""
670670
msgid "Buffer too small"
671671
msgstr ""
672672

673-
#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c
674-
msgid "Buffers must be same size"
675-
msgstr ""
676-
677673
#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c
678674
#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c
679675
#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c
@@ -766,10 +762,6 @@ msgstr ""
766762
msgid "Cannot remount '/' when visible via USB."
767763
msgstr ""
768764

769-
#: ports/espressif/common-hal/socketpool/Socket.c
770-
msgid "Cannot set socket options"
771-
msgstr ""
772-
773765
#: shared-bindings/digitalio/DigitalInOut.c
774766
msgid "Cannot set value when direction is input."
775767
msgstr ""
@@ -920,7 +912,7 @@ msgstr ""
920912
msgid "Error in safemode.py."
921913
msgstr ""
922914

923-
#: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
915+
#: shared-bindings/ssl/SSLSocket.c
924916
msgid "Error: Failure to bind"
925917
msgstr ""
926918

@@ -941,10 +933,6 @@ msgstr ""
941933
msgid "FFT is implemented for linear arrays only"
942934
msgstr ""
943935

944-
#: ports/espressif/common-hal/ssl/SSLSocket.c
945-
msgid "Failed SSL handshake"
946-
msgstr ""
947-
948936
#: shared-bindings/ps2io/Ps2.c
949937
msgid "Failed sending command."
950938
msgstr ""
@@ -1152,7 +1140,6 @@ msgstr ""
11521140
msgid "Internal define error"
11531141
msgstr ""
11541142

1155-
#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c
11561143
#: shared-bindings/pwmio/PWMOut.c shared-module/os/getenv.c
11571144
msgid "Internal error"
11581145
msgstr ""
@@ -1255,8 +1242,7 @@ msgstr ""
12551242
msgid "Invalid size"
12561243
msgstr ""
12571244

1258-
#: ports/espressif/common-hal/ssl/SSLContext.c
1259-
#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
1245+
#: shared-module/ssl/SSLSocket.c
12601246
msgid "Invalid socket for TLS"
12611247
msgstr ""
12621248

@@ -1431,10 +1417,6 @@ msgstr ""
14311417
msgid "No bootloader present"
14321418
msgstr ""
14331419

1434-
#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c
1435-
msgid "No capture in progress"
1436-
msgstr ""
1437-
14381420
#: shared-module/usb/core/Device.c
14391421
msgid "No configuration set"
14401422
msgstr ""
@@ -1801,7 +1783,7 @@ msgstr ""
18011783
#: shared-bindings/_bleio/__init__.c
18021784
#: shared-bindings/memorymonitor/AllocationSize.c
18031785
#: shared-bindings/pulseio/PulseIn.c shared-module/bitmaptools/__init__.c
1804-
#: shared-module/displayio/Bitmap.c
1786+
#: shared-module/displayio/Bitmap.c shared-module/displayio/Group.c
18051787
msgid "Read-only"
18061788
msgstr ""
18071789

@@ -2143,11 +2125,6 @@ msgstr ""
21432125
msgid "Unexpected nrfx uuid type"
21442126
msgstr ""
21452127

2146-
#: ports/espressif/common-hal/ssl/SSLSocket.c
2147-
#, c-format
2148-
msgid "Unhandled ESP TLS error %d %d %x %d"
2149-
msgstr ""
2150-
21512128
#: ports/espressif/common-hal/_bleio/__init__.c
21522129
#, c-format
21532130
msgid "Unknown BLE error at %s:%d: %d"
@@ -2325,6 +2302,10 @@ msgstr ""
23252302
msgid "You pressed the VOLUME button at start up."
23262303
msgstr ""
23272304

2305+
#: ports/espressif/boards/adafruit_itsybitsy_esp32/mpconfigboard.h
2306+
msgid "You pressed the boot button at start up."
2307+
msgstr ""
2308+
23282309
#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
23292310
#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
23302311
#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
@@ -3271,7 +3252,7 @@ msgstr ""
32713252
msgid "invalid bits_per_pixel %d, must be, 1, 2, 4, 8, 16, 24, or 32"
32723253
msgstr ""
32733254

3274-
#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
3255+
#: shared-module/ssl/SSLSocket.c
32753256
msgid "invalid cert"
32763257
msgstr ""
32773258

@@ -3297,7 +3278,7 @@ msgstr ""
32973278
msgid "invalid hostname"
32983279
msgstr ""
32993280

3300-
#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
3281+
#: shared-module/ssl/SSLSocket.c
33013282
msgid "invalid key"
33023283
msgstr ""
33033284

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2020 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+
#include "mpconfigboard.h"
29+
#include "shared-bindings/microcontroller/Pin.h"
30+
#include "components/driver/gpio/include/driver/gpio.h"
31+
#include "components/hal/include/hal/gpio_hal.h"
32+
#include "common-hal/microcontroller/Pin.h"
33+
34+
bool espressif_board_reset_pin_number(gpio_num_t pin_number) {
35+
if (pin_number == 2) {
36+
// Turn on NeoPixel and I2C power by default.
37+
gpio_set_direction(pin_number, GPIO_MODE_DEF_OUTPUT);
38+
gpio_set_level(pin_number, true);
39+
return true;
40+
}
41+
42+
return false;
43+
}
44+
45+
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2022 Dan Halbert 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+
// Micropython setup
28+
29+
#define MICROPY_HW_BOARD_NAME "Adafruit ItsyBitsy ESP32"
30+
#define MICROPY_HW_MCU_NAME "ESP32"
31+
32+
#define MICROPY_HW_NEOPIXEL (&pin_GPIO0)
33+
#define CIRCUITPY_STATUS_LED_POWER (&pin_GPIO2)
34+
35+
#define MICROPY_HW_LED_STATUS (&pin_GPIO13)
36+
37+
#define CIRCUITPY_BOARD_I2C (1)
38+
#define CIRCUITPY_BOARD_I2C_PIN {{.scl = &pin_GPIO27, .sda = &pin_GPIO15}}
39+
40+
#define CIRCUITPY_BOARD_SPI (1)
41+
#define CIRCUITPY_BOARD_SPI_PIN {{.clock = &pin_GPIO19, .mosi = &pin_GPIO21, .miso = &pin_GPIO22}}
42+
43+
#define CIRCUITPY_BOARD_UART (1)
44+
#define CIRCUITPY_BOARD_UART_PIN {{.tx = &pin_GPIO20, .rx = &pin_GPIO8}}
45+
46+
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO35)
47+
48+
// Explanation of how a user got into safe mode
49+
#define BOARD_USER_SAFE_MODE_ACTION MP_ERROR_TEXT("You pressed the boot button at start up.")
50+
51+
// UART pins attached to the USB-serial converter chip
52+
#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
53+
#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
CIRCUITPY_CREATOR_ID = 0x0000239A
2+
CIRCUITPY_CREATION_ID = 0x00320005
3+
4+
IDF_TARGET = esp32
5+
6+
CIRCUITPY_ESP_FLASH_MODE = qio
7+
CIRCUITPY_ESP_FLASH_FREQ = 80m
8+
CIRCUITPY_ESP_FLASH_SIZE = 8MB
9+
10+
CIRCUITPY_ESP_PSRAM_SIZE = 2MB
11+
CIRCUITPY_ESP_PSRAM_MODE = qio
12+
CIRCUITPY_ESP_PSRAM_FREQ = 40m
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
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+
// External pins are in silkscreen order, from top to bottom, left side, then right side
7+
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO25) },
8+
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO26) },
9+
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO4) },
10+
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO38) },
11+
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO37) },
12+
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO36) },
13+
14+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO19) },
15+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO21) },
16+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO22) },
17+
18+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO8) },
19+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO20) },
20+
21+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO15) },
22+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO27) },
23+
24+
{ MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
25+
{ MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14) },
26+
{ MP_ROM_QSTR(MP_QSTR_D33), MP_ROM_PTR(&pin_GPIO33) },
27+
{ MP_ROM_QSTR(MP_QSTR_D32), MP_ROM_PTR(&pin_GPIO32) },
28+
{ MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
29+
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
30+
31+
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
32+
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
33+
34+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO17) },
35+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_GPIO16) },
36+
{ MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO35) },
37+
38+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
39+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
40+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
41+
};
42+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

ports/espressif/boards/adafruit_itsybitsy_esp32/sdkconfig

Whitespace-only changes.

0 commit comments

Comments
 (0)