Skip to content

Commit 42fbebe

Browse files
tannewttannewt
authored
Merge pull request #5832 from ladyada/main
ESP32S2 camera board draft
2 parents 2a09c37 + f13ea93 commit 42fbebe

File tree

11 files changed

+487
-0
lines changed

11 files changed

+487
-0
lines changed

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

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

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

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
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 "Adafruit Camera"
30+
#define MICROPY_HW_MCU_NAME "ESP32S2"
31+
32+
#define MICROPY_HW_NEOPIXEL (&pin_GPIO21)
33+
#define MICROPY_HW_NEOPIXEL_COUNT (6)
34+
35+
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
36+
37+
#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
38+
39+
#define AUTORESET_DELAY_MS 500
40+
41+
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO33)
42+
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO34)
43+
44+
#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35)
45+
#define DEFAULT_SPI_BUS_SCK (&pin_GPIO36)
46+
#define DEFAULT_SPI_BUS_MISO (&pin_GPIO37)

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
USB_VID = 0x239A
2+
USB_PID = 0x8118
3+
USB_PRODUCT = "Camera"
4+
USB_MANUFACTURER = "Adafruit"
5+
6+
IDF_TARGET = esp32s2
7+
8+
INTERNAL_FLASH_FILESYSTEM = 1
9+
LONGINT_IMPL = MPZ
10+
11+
# The default queue depth of 16 overflows on release builds,
12+
# so increase it to 32.
13+
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
14+
15+
CIRCUITPY_ESP_FLASH_MODE=dio
16+
CIRCUITPY_ESP_FLASH_FREQ=40m
17+
CIRCUITPY_ESP_FLASH_SIZE=4MB
18+
19+
CIRCUITPY_MODULE=wrover

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

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
#include "py/objtuple.h"
2+
#include "shared-bindings/board/__init__.h"
3+
#include "shared-module/displayio/__init__.h"
4+
5+
STATIC const mp_rom_obj_tuple_t camera_data_tuple = {
6+
{&mp_type_tuple},
7+
8,
8+
{
9+
MP_ROM_PTR(&pin_GPIO13),
10+
MP_ROM_PTR(&pin_GPIO15),
11+
MP_ROM_PTR(&pin_GPIO16),
12+
MP_ROM_PTR(&pin_GPIO14),
13+
MP_ROM_PTR(&pin_GPIO12),
14+
MP_ROM_PTR(&pin_GPIO10),
15+
MP_ROM_PTR(&pin_GPIO9),
16+
MP_ROM_PTR(&pin_GPIO7),
17+
}
18+
};
19+
20+
21+
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
22+
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
23+
24+
{ MP_ROM_QSTR(MP_QSTR_TFT_MOSI), MP_ROM_PTR(&pin_GPIO35) },
25+
{ MP_ROM_QSTR(MP_QSTR_TFT_SCK), MP_ROM_PTR(&pin_GPIO36) },
26+
{ MP_ROM_QSTR(MP_QSTR_TFT_BACKLIGHT), MP_ROM_PTR(&pin_GPIO38) },
27+
{ MP_ROM_QSTR(MP_QSTR_TFT_DC), MP_ROM_PTR(&pin_GPIO39) },
28+
{ MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_GPIO40) },
29+
{ MP_ROM_QSTR(MP_QSTR_TFT_RESET), MP_ROM_PTR(&pin_GPIO41) },
30+
31+
{ MP_ROM_QSTR(MP_QSTR_CARD_CS), MP_ROM_PTR(&pin_GPIO4) },
32+
33+
{ MP_ROM_QSTR(MP_QSTR_IRQ), MP_ROM_PTR(&pin_GPIO3) },
34+
35+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO21) },
36+
37+
{ MP_ROM_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_GPIO45) },
38+
39+
{ MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
40+
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO2) },
41+
42+
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO17) },
43+
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO18) },
44+
45+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO33) },
46+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO34) },
47+
48+
{ MP_ROM_QSTR(MP_QSTR_CAMERA_DATA), MP_ROM_PTR(&camera_data_tuple) },
49+
50+
{ MP_ROM_QSTR(MP_QSTR_CAMERA_VSYNC), MP_ROM_PTR(&pin_GPIO5) },
51+
{ MP_ROM_QSTR(MP_QSTR_CAMERA_HREF), MP_ROM_PTR(&pin_GPIO6) },
52+
{ MP_ROM_QSTR(MP_QSTR_CAMERA_DATA9), MP_ROM_PTR(&pin_GPIO7) },
53+
{ MP_ROM_QSTR(MP_QSTR_CAMERA_XCLK), MP_ROM_PTR(&pin_GPIO8) },
54+
{ MP_ROM_QSTR(MP_QSTR_CAMERA_DATA8), MP_ROM_PTR(&pin_GPIO9) },
55+
{ MP_ROM_QSTR(MP_QSTR_CAMERA_DATA7), MP_ROM_PTR(&pin_GPIO10) },
56+
{ MP_ROM_QSTR(MP_QSTR_CAMERA_PCLK), MP_ROM_PTR(&pin_GPIO11) },
57+
{ MP_ROM_QSTR(MP_QSTR_CAMERA_DATA6), MP_ROM_PTR(&pin_GPIO12) },
58+
{ MP_ROM_QSTR(MP_QSTR_CAMERA_DATA2), MP_ROM_PTR(&pin_GPIO13) },
59+
{ MP_ROM_QSTR(MP_QSTR_CAMERA_DATA5), MP_ROM_PTR(&pin_GPIO14) },
60+
{ MP_ROM_QSTR(MP_QSTR_CAMERA_DATA3), MP_ROM_PTR(&pin_GPIO15) },
61+
{ MP_ROM_QSTR(MP_QSTR_CAMERA_DATA4), MP_ROM_PTR(&pin_GPIO16) },
62+
63+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
64+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
65+
{ MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)},
66+
};
67+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

‎ports/espressif/boards/adafruit_esp32s2_camera/sdkconfig

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
CONFIG_ESP32S2_SPIRAM_SUPPORT=y
2+
3+
#
4+
# SPI RAM config
5+
#
6+
# CONFIG_SPIRAM_TYPE_AUTO is not set
7+
CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
8+
# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
9+
# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
10+
CONFIG_SPIRAM_SIZE=2097152
11+
12+
#
13+
# PSRAM clock and cs IO for ESP32S2
14+
#
15+
CONFIG_DEFAULT_PSRAM_CLK_IO=30
16+
CONFIG_DEFAULT_PSRAM_CS_IO=26
17+
# end of PSRAM clock and cs IO for ESP32S2
18+
19+
# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
20+
# CONFIG_SPIRAM_RODATA is not set
21+
# CONFIG_SPIRAM_SPEED_80M is not set
22+
CONFIG_SPIRAM_SPEED_40M=y
23+
# CONFIG_SPIRAM_SPEED_26M is not set
24+
# CONFIG_SPIRAM_SPEED_20M is not set
25+
CONFIG_SPIRAM=y
26+
CONFIG_SPIRAM_BOOT_INIT=y
27+
# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
28+
CONFIG_SPIRAM_USE_MEMMAP=y
29+
# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
30+
# CONFIG_SPIRAM_USE_MALLOC is not set
31+
CONFIG_SPIRAM_MEMTEST=y
32+
# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
33+
# end of SPI RAM config

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,18 @@
2828
#include "mpconfigboard.h"
2929
#include "shared-bindings/microcontroller/Pin.h"
3030
#include "components/driver/include/driver/gpio.h"
31+
#include "components/hal/include/hal/gpio_hal.h"
32+
#include "common-hal/microcontroller/Pin.h"
3133

3234
void board_init(void) {
3335
// USB
3436
common_hal_never_reset_pin(&pin_GPIO19);
3537
common_hal_never_reset_pin(&pin_GPIO20);
38+
39+
// Turn on I2C
40+
common_hal_never_reset_pin(&pin_GPIO7);
41+
gpio_set_direction(7, GPIO_MODE_DEF_OUTPUT);
42+
gpio_set_level(7, false);
3643
}
3744

3845
bool board_requests_safe_mode(void) {

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

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
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
41+
42+
// SPI Flash and RAM
43+
common_hal_never_reset_pin(&pin_GPIO26);
44+
common_hal_never_reset_pin(&pin_GPIO27);
45+
common_hal_never_reset_pin(&pin_GPIO28);
46+
common_hal_never_reset_pin(&pin_GPIO29);
47+
common_hal_never_reset_pin(&pin_GPIO30);
48+
common_hal_never_reset_pin(&pin_GPIO31);
49+
common_hal_never_reset_pin(&pin_GPIO32);
50+
}
51+
52+
bool board_requests_safe_mode(void) {
53+
return false;
54+
}
55+
56+
void reset_board(void) {
57+
58+
}
59+
60+
void board_deinit(void) {
61+
}

0 commit comments

Comments
 (0)