Skip to content

Commit bfdaa6e

Browse files
tannewttannewt
authored
Merge pull request #3959 from ladyada/main
try adding new feather def
2 parents 679b465 + c87e1a6 commit bfdaa6e

File tree

11 files changed

+445
-0
lines changed

11 files changed

+445
-0
lines changed

‎.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,8 @@ jobs:
431431
fail-fast: false
432432
matrix:
433433
board:
434+
- "adafruit_feather_esp32s2_nopsram"
435+
- "adafruit_feather_esp32s2_tftback_nopsram"
434436
- "adafruit_magtag_2.9_grayscale"
435437
- "adafruit_metro_esp32s2"
436438
- "electroniccats_bastwifi"

‎ports/esp32s2/boards/adafruit_feather_esp32s2_nopsram/board.c

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
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+
31+
void board_init(void) {
32+
// USB
33+
common_hal_never_reset_pin(&pin_GPIO19);
34+
common_hal_never_reset_pin(&pin_GPIO20);
35+
36+
// Debug UART
37+
#ifdef DEBUG
38+
common_hal_never_reset_pin(&pin_GPIO43);
39+
common_hal_never_reset_pin(&pin_GPIO44);
40+
#endif /* DEBUG */
41+
}
42+
43+
bool board_requests_safe_mode(void) {
44+
return false;
45+
}
46+
47+
void reset_board(void) {
48+
49+
}
50+
51+
void board_deinit(void) {
52+
}

‎ports/esp32s2/boards/adafruit_feather_esp32s2_nopsram/mpconfigboard.h

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) 2019 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+
//Micropython setup
28+
29+
#define MICROPY_HW_BOARD_NAME "Feather ESP32S2 without PSRAM"
30+
#define MICROPY_HW_MCU_NAME "ESP32S2"
31+
32+
#define MICROPY_HW_NEOPIXEL (&pin_GPIO33)
33+
34+
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
35+
36+
#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
37+
38+
#define AUTORESET_DELAY_MS 500
39+
40+
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO4)
41+
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO3)
42+
43+
#define DEFAULT_SPI_BUS_SCK (&pin_GPIO36)
44+
#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35)
45+
#define DEFAULT_SPI_BUS_MISO (&pin_GPIO37)

‎ports/esp32s2/boards/adafruit_feather_esp32s2_nopsram/mpconfigboard.mk

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
USB_VID = 0x239A
2+
USB_PID = 0x80EC
3+
USB_PRODUCT = "Feather ESP32S2 no PSRAM"
4+
USB_MANUFACTURER = "Adafruit"
5+
6+
INTERNAL_FLASH_FILESYSTEM = 1
7+
LONGINT_IMPL = MPZ
8+
9+
# The default queue depth of 16 overflows on release builds,
10+
# so increase it to 32.
11+
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
12+
13+
CIRCUITPY_ESP_FLASH_MODE=dio
14+
CIRCUITPY_ESP_FLASH_FREQ=40m
15+
CIRCUITPY_ESP_FLASH_SIZE=4MB
16+
17+
CIRCUITPY_MODULE=wroom
18+
19+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
20+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
21+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
22+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register

‎ports/esp32s2/boards/adafruit_feather_esp32s2_nopsram/pins.c

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
#include "shared-bindings/board/__init__.h"
2+
3+
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
4+
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) },
5+
6+
{ MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO3) },
7+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO3) },
8+
9+
{ MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO4) },
10+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO4) },
11+
12+
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
13+
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
14+
15+
{ MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) },
16+
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO8) },
17+
18+
{ MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) },
19+
{ MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
20+
{ MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) },
21+
{ MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
22+
23+
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
24+
{ MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_GPIO13) },
25+
26+
{ MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_GPIO14) },
27+
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO14) },
28+
29+
{ MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15) },
30+
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO15) },
31+
32+
{ MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) },
33+
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO16) },
34+
35+
{ MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17) },
36+
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO17) },
37+
38+
{ MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18) },
39+
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO18) },
40+
41+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_GPIO21) },
42+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO33) },
43+
44+
{ MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35) },
45+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO35) },
46+
47+
{ MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO36) },
48+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) },
49+
50+
{ MP_ROM_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO37) },
51+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO37) },
52+
53+
54+
{ MP_ROM_QSTR(MP_QSTR_D38), MP_ROM_PTR(&pin_GPIO38) },
55+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO38) },
56+
57+
{ MP_ROM_QSTR(MP_QSTR_D39), MP_ROM_PTR(&pin_GPIO39) },
58+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO39) },
59+
60+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
61+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
62+
};
63+
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

‎ports/esp32s2/boards/adafruit_feather_esp32s2_nopsram/sdkconfig

Whitespace-only changes.

‎ports/esp32s2/boards/adafruit_feather_esp32s2_tftback_nopsram/board.c

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
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/busio/SPI.h"
30+
#include "shared-bindings/displayio/FourWire.h"
31+
#include "shared-bindings/microcontroller/Pin.h"
32+
#include "shared-module/displayio/__init__.h"
33+
#include "shared-module/displayio/mipi_constants.h"
34+
35+
/*
36+
displayio_fourwire_obj_t board_display_obj;
37+
38+
#define DELAY 0x80
39+
40+
uint8_t display_init_sequence[] = {
41+
0x01, 0 | DELAY, 150, // SWRESET
42+
0x11, 0 | DELAY, 255, // SLPOUT
43+
0x36, 1, 0x00, // _MADCTL bottom to top refresh in vsync aligned order.
44+
0x3a, 1, 0x55, // COLMOD - 16bit color
45+
0x21, 0 | DELAY, 10, // _INVON
46+
0x13, 0 | DELAY, 10, // _NORON
47+
0x29, 0 | DELAY, 255, // _DISPON
48+
};
49+
50+
*/
51+
52+
void board_init(void) {
53+
// USB
54+
common_hal_never_reset_pin(&pin_GPIO19);
55+
common_hal_never_reset_pin(&pin_GPIO20);
56+
57+
// Debug UART
58+
#ifdef DEBUG
59+
common_hal_never_reset_pin(&pin_GPIO43);
60+
common_hal_never_reset_pin(&pin_GPIO44);
61+
#endif /* DEBUG */
62+
63+
/*
64+
busio_spi_obj_t* spi = &displays[0].fourwire_bus.inline_bus;
65+
common_hal_busio_spi_construct(spi, &pin_GPIO36, &pin_GPIO35, NULL);
66+
common_hal_busio_spi_never_reset(spi);
67+
68+
displayio_fourwire_obj_t* bus = &displays[0].fourwire_bus;
69+
bus->base.type = &displayio_fourwire_type;
70+
common_hal_displayio_fourwire_construct(bus,
71+
spi,
72+
&pin_GPIO40, // TFT_DC Command or data
73+
&pin_GPIO42, // TFT_CS Chip select
74+
&pin_GPIO41, // TFT_RST Reset
75+
4000000, // Baudrate
76+
0, // Polarity
77+
0); // Phase
78+
79+
displayio_display_obj_t* display = &displays[0].display;
80+
display->base.type = &displayio_display_type;
81+
common_hal_displayio_display_construct(display,
82+
bus,
83+
240, // Width (after rotation)
84+
135, // Height (after rotation)
85+
0, // column start
86+
0, // row start
87+
0, // rotation
88+
16, // Color depth
89+
false, // Grayscale
90+
false, // Pixels in a byte share a row. Only used for depth < 8
91+
1, // bytes per cell. Only valid for depths < 8
92+
false, // reverse_pixels_in_byte. Only valid for depths < 8
93+
true, // reverse_pixels_in_word
94+
MIPI_COMMAND_SET_COLUMN_ADDRESS, // Set column command
95+
MIPI_COMMAND_SET_PAGE_ADDRESS, // Set row command
96+
MIPI_COMMAND_WRITE_MEMORY_START, // Write memory command
97+
0x37, // set vertical scroll command
98+
display_init_sequence,
99+
sizeof(display_init_sequence),
100+
&pin_GPIO7, // backlight pin
101+
NO_BRIGHTNESS_COMMAND,
102+
1.0f, // brightness (ignored)
103+
true, // auto_brightness
104+
false, // single_byte_bounds
105+
false, // data_as_commands
106+
true, // auto_refresh
107+
60, // native_frames_per_second
108+
true, // backlight_on_high
109+
false); // not SH1107
110+
*/
111+
}
112+
113+
bool board_requests_safe_mode(void) {
114+
return false;
115+
}
116+
117+
void reset_board(void) {
118+
119+
}
120+
121+
void board_deinit(void) {
122+
}

‎ports/esp32s2/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h

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) 2019 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+
//Micropython setup
28+
29+
#define MICROPY_HW_BOARD_NAME "Feather ESP32S2 without PSRAM"
30+
#define MICROPY_HW_MCU_NAME "ESP32S2"
31+
32+
#define MICROPY_HW_NEOPIXEL (&pin_GPIO33)
33+
34+
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
35+
36+
#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
37+
38+
#define AUTORESET_DELAY_MS 500
39+
40+
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO4)
41+
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO3)
42+
43+
#define DEFAULT_SPI_BUS_SCK (&pin_GPIO36)
44+
#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35)
45+
#define DEFAULT_SPI_BUS_MISO (&pin_GPIO37)

‎ports/esp32s2/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.mk

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
USB_VID = 0x239A
2+
USB_PID = 0x80EE
3+
USB_PRODUCT = "Feather ESP32S2 TFT no PSRAM"
4+
USB_MANUFACTURER = "Adafruit"
5+
6+
INTERNAL_FLASH_FILESYSTEM = 1
7+
LONGINT_IMPL = MPZ
8+
9+
# The default queue depth of 16 overflows on release builds,
10+
# so increase it to 32.
11+
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
12+
13+
CIRCUITPY_ESP_FLASH_MODE=dio
14+
CIRCUITPY_ESP_FLASH_FREQ=40m
15+
CIRCUITPY_ESP_FLASH_SIZE=4MB
16+
17+
CIRCUITPY_MODULE=wroom
18+
19+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
20+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
21+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
22+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register

0 commit comments

Comments
 (0)