forked from adafruit/circuitpython
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main'
- Loading branch information
Showing
5 changed files
with
219 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
/* | ||
* This file is part of the MicroPython project, http://micropython.org/ | ||
* | ||
* The MIT License (MIT) | ||
* | ||
* Copyright (c) 2023 Bill Sideris, independently providing these changes. | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||
* of this software and associated documentation files (the "Software"), to deal | ||
* in the Software without restriction, including without limitation the rights | ||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
* copies of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included in | ||
* all copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
* THE SOFTWARE. | ||
*/ | ||
|
||
#include "supervisor/board.h" | ||
#include "mpconfigboard.h" | ||
#include "shared-bindings/microcontroller/Pin.h" | ||
#include "components/driver/include/driver/gpio.h" | ||
#include "components/hal/include/hal/gpio_hal.h" | ||
#include "common-hal/microcontroller/Pin.h" | ||
|
||
bool espressif_board_reset_pin_number(gpio_num_t pin_number) { | ||
if (pin_number == 33) { | ||
/* | ||
* Turn on BAT_HOLD by default, | ||
* so that the board does not power off | ||
* when usb is disconnected or | ||
* the power button is released. | ||
*/ | ||
gpio_set_direction(pin_number, GPIO_MODE_DEF_OUTPUT); | ||
gpio_set_level(pin_number, true); | ||
return true; | ||
} | ||
return false; | ||
} | ||
|
||
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here. |
48 changes: 48 additions & 0 deletions
48
ports/espressif/boards/m5stack_timer_camera_x/mpconfigboard.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
/* | ||
* This file is part of the MicroPython project, http://micropython.org/ | ||
* | ||
* The MIT License (MIT) | ||
* | ||
* Copyright (c) 2023 Bill Sideris, independently providing these changes. | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||
* of this software and associated documentation files (the "Software"), to deal | ||
* in the Software without restriction, including without limitation the rights | ||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
* copies of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included in | ||
* all copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
* THE SOFTWARE. | ||
*/ | ||
|
||
#define MICROPY_HW_BOARD_NAME "M5Stack Timer Camera X" | ||
#define MICROPY_HW_MCU_NAME "ESP32" | ||
|
||
#define MICROPY_HW_LED_STATUS (&pin_GPIO2) | ||
|
||
#define CIRCUITPY_BOARD_I2C (3) | ||
#define CIRCUITPY_BOARD_I2C_PIN {{.scl = &pin_GPIO13, .sda = &pin_GPIO4}, \ | ||
{.scl = &pin_GPIO14, .sda = &pin_GPIO12}, \ | ||
{.scl = &pin_GPIO23, .sda = &pin_GPIO25}} | ||
|
||
// Ext. Port | ||
// BM8563 | ||
// Camera sensor | ||
|
||
// UART pins attached to the USB-serial converter chip | ||
#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1) | ||
#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3) | ||
|
||
#define CIRCUITPY_I2C_ALLOW_INTERNAL_PULL_UP (1) | ||
|
||
// espcamera.FrameSize.QXGA, half a megabyte result image.jpeg | ||
#define DEFAULT_RESERVED_PSRAM (1572864) |
8 changes: 8 additions & 0 deletions
8
ports/espressif/boards/m5stack_timer_camera_x/mpconfigboard.mk
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
CIRCUITPY_CREATOR_ID = 0x10151015 | ||
CIRCUITPY_CREATION_ID = 0x00320009 | ||
|
||
IDF_TARGET = esp32 | ||
|
||
CIRCUITPY_ESP_FLASH_MODE = qio | ||
CIRCUITPY_ESP_FLASH_FREQ = 80m | ||
CIRCUITPY_ESP_FLASH_SIZE = 4MB |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,87 @@ | ||
#include "py/objtuple.h" | ||
#include "shared-bindings/board/__init__.h" | ||
#include "shared-module/displayio/__init__.h" | ||
|
||
CIRCUITPY_BOARD_BUS_SINGLETON(bm8563_i2c, i2c, 1) // RTC | ||
CIRCUITPY_BOARD_BUS_SINGLETON(sscb_i2c, i2c, 2) // Camera sensor | ||
|
||
STATIC const mp_rom_obj_tuple_t camera_data_tuple = { | ||
// The order matters. | ||
// They must be ordered from low to high (Y2, Y3 .. Y9). | ||
|
||
// Do not include any of the control pins in here. | ||
{&mp_type_tuple}, | ||
8, | ||
{ | ||
MP_ROM_PTR(&pin_GPIO32), // Y2 | ||
MP_ROM_PTR(&pin_GPIO35), // Y3 | ||
MP_ROM_PTR(&pin_GPIO34), // Y4 | ||
MP_ROM_PTR(&pin_GPIO5), // Y5 | ||
MP_ROM_PTR(&pin_GPIO39), // Y6 | ||
MP_ROM_PTR(&pin_GPIO18), // Y7 | ||
MP_ROM_PTR(&pin_GPIO36), // Y8 | ||
MP_ROM_PTR(&pin_GPIO19) // Y9 | ||
} | ||
}; | ||
|
||
STATIC const mp_rom_map_elem_t board_module_globals_table[] = { | ||
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS | ||
|
||
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO2) }, | ||
|
||
// "Ext. Port", the label says [G, V, SDA/G4, SCL/G13] | ||
{ MP_ROM_QSTR(MP_QSTR_G4), MP_ROM_PTR(&pin_GPIO4) }, | ||
{ MP_ROM_QSTR(MP_QSTR_G13), MP_ROM_PTR(&pin_GPIO13) }, | ||
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO4) }, | ||
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO13) }, | ||
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, | ||
|
||
/* Battery | ||
* | ||
* No alternative names as they are not broken out | ||
* and cannot be used for anything else. | ||
*/ | ||
{ MP_ROM_QSTR(MP_QSTR_BAT_HOLD), MP_ROM_PTR(&pin_GPIO33) }, | ||
{ MP_ROM_QSTR(MP_QSTR_BAT_ADC), MP_ROM_PTR(&pin_GPIO38) }, | ||
|
||
/* BM8563 I2C bus | ||
* | ||
* No alternative names as they are not broken out | ||
* and cannot be used for anything else. | ||
*/ | ||
{ MP_ROM_QSTR(MP_QSTR_BM8563_SCL), MP_ROM_PTR(&pin_GPIO14) }, | ||
{ MP_ROM_QSTR(MP_QSTR_BM8563_SDA), MP_ROM_PTR(&pin_GPIO12) }, | ||
{ MP_ROM_QSTR(MP_QSTR_BM8563_I2C), MP_ROM_PTR(&board_bm8563_i2c_obj) }, | ||
|
||
// Camera control | ||
{ MP_ROM_QSTR(MP_QSTR_VSYNC), MP_ROM_PTR(&pin_GPIO22) }, | ||
{ MP_ROM_QSTR(MP_QSTR_HREF), MP_ROM_PTR(&pin_GPIO26) }, | ||
{ MP_ROM_QSTR(MP_QSTR_PCLK), MP_ROM_PTR(&pin_GPIO21) }, | ||
{ MP_ROM_QSTR(MP_QSTR_XCLK), MP_ROM_PTR(&pin_GPIO27) }, // xclk_freq_hz = 20000000 | ||
{ MP_ROM_QSTR(MP_QSTR_RESET), MP_ROM_PTR(&pin_GPIO15) }, | ||
|
||
// Camera sensor I2C bus | ||
{ MP_ROM_QSTR(MP_QSTR_SSCB_SDA), MP_ROM_PTR(&pin_GPIO25) }, | ||
{ MP_ROM_QSTR(MP_QSTR_SSCB_SCL), MP_ROM_PTR(&pin_GPIO23) }, | ||
{ MP_ROM_QSTR(MP_QSTR_SSCB_I2C), MP_ROM_PTR(&board_sscb_i2c_obj) }, | ||
|
||
/* | ||
* Camera data | ||
* | ||
* We don't really need to individually name each one, | ||
* but they look cool in the tuple listing if we do. | ||
* | ||
* These are also not broken out. | ||
*/ | ||
{ MP_ROM_QSTR(MP_QSTR_D), MP_ROM_PTR(&camera_data_tuple) }, | ||
|
||
{ MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO19) }, | ||
{ MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO36) }, | ||
{ MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO18) }, | ||
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO39) }, | ||
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) }, | ||
{ MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_GPIO34) }, | ||
{ MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_GPIO35) }, | ||
{ MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO32) } | ||
}; | ||
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
# ESP32-D0WDQ6-V3 (revision 3) | ||
CONFIG_ESP32_SPIRAM_SUPPORT=y | ||
CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y | ||
CONFIG_ESP32_REV_MIN_3=y | ||
|
||
# PSRAM | ||
CONFIG_D0WD_PSRAM_CLK_IO=17 | ||
CONFIG_D0WD_PSRAM_CS_IO=16 | ||
|
||
CONFIG_SPIRAM_MODE_OCT=y | ||
CONFIG_SPIRAM_TYPE_ESPPSRAM64=y | ||
CONFIG_SPIRAM_SIZE=8388608 | ||
CONFIG_SPIRAM_SPEED_80M=y | ||
|
||
CONFIG_SPIRAM=y | ||
CONFIG_SPIRAM_BOOT_INIT=y | ||
CONFIG_SPIRAM_USE_MEMMAP=y | ||
CONFIG_SPIRAM_MEMTEST=y | ||
|
||
# Hostname | ||
CONFIG_LWIP_LOCAL_HOSTNAME="M5StackTimerX" | ||
|
||
# Camera | ||
CONFIG_OV3660_SUPPORT=y | ||
CONFIG_GC_SENSOR_SUBSAMPLE_MODE=y | ||
CONFIG_CAMERA_CORE0=y | ||
CONFIG_CAMERA_DMA_BUFFER_SIZE_MAX=32768 |