Merge pull request #8671 from dhalbert/8.2.x-remove-adafruit_esp32s2_camera
8.2.x: remove adafruit_esp32s2_camera
This commit is contained in:
Melissa LeBlanc-Williams
GitHub
commit
64599de4e0
@ -1,103 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the MicroPython project, http://micropython.org/
|
|
||||||
*
|
|
||||||
* The MIT License (MIT)
|
|
||||||
*
|
|
||||||
* Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
|
|
||||||
*
|
|
||||||
* 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/busio/SPI.h"
|
|
||||||
#include "shared-bindings/displayio/FourWire.h"
|
|
||||||
#include "shared-bindings/microcontroller/Pin.h"
|
|
||||||
#include "shared-module/displayio/__init__.h"
|
|
||||||
#include "shared-module/displayio/mipi_constants.h"
|
|
||||||
#include "shared-bindings/board/__init__.h"
|
|
||||||
|
|
||||||
#include "esp_log.h"
|
|
||||||
|
|
||||||
displayio_fourwire_obj_t board_display_obj;
|
|
||||||
|
|
||||||
#define DELAY 0x80
|
|
||||||
|
|
||||||
uint8_t display_init_sequence[] = {
|
|
||||||
0x01, 0 | DELAY, 120, // SWRESET
|
|
||||||
0x11, 0 | DELAY, 5, // SLPOUT
|
|
||||||
0x36, 1, 0b10100000, // _MADCTL for rotation 0
|
|
||||||
0x3a, 1, 0x55, // COLMOD - 16bit color
|
|
||||||
0x21, 0, // _INVON
|
|
||||||
0x13, 0, // _NORON
|
|
||||||
0x29, 0 | DELAY, 5, // _DISPON
|
|
||||||
};
|
|
||||||
|
|
||||||
void board_init(void) {
|
|
||||||
busio_spi_obj_t *spi = common_hal_board_create_spi(0);
|
|
||||||
displayio_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
|
|
||||||
bus->base.type = &displayio_fourwire_type;
|
|
||||||
common_hal_displayio_fourwire_construct(bus,
|
|
||||||
spi,
|
|
||||||
&pin_GPIO40, // TFT_DC Command or data
|
|
||||||
&pin_GPIO39, // TFT_CS Chip select
|
|
||||||
&pin_GPIO38, // TFT_RESET Reset
|
|
||||||
40000000, // Baudrate
|
|
||||||
0, // Polarity
|
|
||||||
0); // Phase
|
|
||||||
|
|
||||||
displayio_display_obj_t *display = &allocate_display()->display;
|
|
||||||
display->base.type = &displayio_display_type;
|
|
||||||
common_hal_displayio_display_construct(
|
|
||||||
display,
|
|
||||||
bus,
|
|
||||||
240, // Width (after rotation)
|
|
||||||
240, // Height (after rotation)
|
|
||||||
80, // column start
|
|
||||||
0, // row start
|
|
||||||
0, // rotation
|
|
||||||
16, // Color depth
|
|
||||||
false, // Grayscale
|
|
||||||
false, // Pixels in a byte share a row. Only used for depth < 8
|
|
||||||
1, // bytes per cell. Only valid for depths < 8
|
|
||||||
false, // reverse_pixels_in_byte. Only valid for depths < 8
|
|
||||||
true, // reverse_pixels_in_word
|
|
||||||
MIPI_COMMAND_SET_COLUMN_ADDRESS, // Set column command
|
|
||||||
MIPI_COMMAND_SET_PAGE_ADDRESS, // Set row command
|
|
||||||
MIPI_COMMAND_WRITE_MEMORY_START, // Write memory command
|
|
||||||
display_init_sequence,
|
|
||||||
sizeof(display_init_sequence),
|
|
||||||
&pin_GPIO41, // backlight pin
|
|
||||||
NO_BRIGHTNESS_COMMAND,
|
|
||||||
1.0f, // brightness
|
|
||||||
false, // single_byte_bounds
|
|
||||||
false, // data_as_commands
|
|
||||||
true, // auto_refresh
|
|
||||||
60, // native_frames_per_second
|
|
||||||
true, // backlight_on_high
|
|
||||||
false, // not SH1107
|
|
||||||
50000); // backlight pwm frequency
|
|
||||||
}
|
|
||||||
|
|
||||||
void board_deinit(void) {
|
|
||||||
common_hal_displayio_release_displays();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
|
|
||||||
@ -1,44 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the MicroPython project, http://micropython.org/
|
|
||||||
*
|
|
||||||
* The MIT License (MIT)
|
|
||||||
*
|
|
||||||
* Copyright (c) 2019 Scott Shawcroft for Adafruit Industries
|
|
||||||
*
|
|
||||||
* 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.
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Micropython setup
|
|
||||||
|
|
||||||
#define MICROPY_HW_BOARD_NAME "Adafruit Camera"
|
|
||||||
#define MICROPY_HW_MCU_NAME "ESP32S2"
|
|
||||||
|
|
||||||
#define MICROPY_HW_NEOPIXEL (&pin_GPIO21)
|
|
||||||
#define MICROPY_HW_NEOPIXEL_COUNT (1)
|
|
||||||
|
|
||||||
#define MICROPY_HW_LED_STATUS (&pin_GPIO1)
|
|
||||||
|
|
||||||
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO33)
|
|
||||||
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO34)
|
|
||||||
|
|
||||||
#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35)
|
|
||||||
#define DEFAULT_SPI_BUS_SCK (&pin_GPIO36)
|
|
||||||
#define DEFAULT_SPI_BUS_MISO (&pin_GPIO37)
|
|
||||||
|
|
||||||
#define DOUBLE_TAP_PIN (&pin_GPIO42)
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
USB_VID = 0x239A
|
|
||||||
USB_PID = 0x8118
|
|
||||||
USB_PRODUCT = "Camera"
|
|
||||||
USB_MANUFACTURER = "Adafruit"
|
|
||||||
|
|
||||||
IDF_TARGET = esp32s2
|
|
||||||
|
|
||||||
CIRCUITPY_ESP_FLASH_MODE = dio
|
|
||||||
CIRCUITPY_ESP_FLASH_FREQ = 40m
|
|
||||||
CIRCUITPY_ESP_FLASH_SIZE = 4MB
|
|
||||||
@ -1,68 +0,0 @@
|
|||||||
#include "py/objtuple.h"
|
|
||||||
#include "shared-bindings/board/__init__.h"
|
|
||||||
#include "shared-module/displayio/__init__.h"
|
|
||||||
|
|
||||||
STATIC const mp_rom_obj_tuple_t camera_data_tuple = {
|
|
||||||
{&mp_type_tuple},
|
|
||||||
8,
|
|
||||||
{
|
|
||||||
MP_ROM_PTR(&pin_GPIO13),
|
|
||||||
MP_ROM_PTR(&pin_GPIO15),
|
|
||||||
MP_ROM_PTR(&pin_GPIO16),
|
|
||||||
MP_ROM_PTR(&pin_GPIO14),
|
|
||||||
MP_ROM_PTR(&pin_GPIO12),
|
|
||||||
MP_ROM_PTR(&pin_GPIO10),
|
|
||||||
MP_ROM_PTR(&pin_GPIO9),
|
|
||||||
MP_ROM_PTR(&pin_GPIO7),
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
|
|
||||||
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
|
|
||||||
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO35) },
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) },
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO37) },
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_TFT_BACKLIGHT), MP_ROM_PTR(&pin_GPIO41) },
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_TFT_DC), MP_ROM_PTR(&pin_GPIO40) },
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_GPIO39) },
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_TFT_RESET), MP_ROM_PTR(&pin_GPIO38) },
|
|
||||||
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_CARD_CS), MP_ROM_PTR(&pin_GPIO2) },
|
|
||||||
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_IRQ), MP_ROM_PTR(&pin_GPIO3) },
|
|
||||||
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO21) },
|
|
||||||
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_GPIO45) },
|
|
||||||
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO1) },
|
|
||||||
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO17) },
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO18) },
|
|
||||||
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO33) },
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO34) },
|
|
||||||
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_CAMERA_DATA), MP_ROM_PTR(&camera_data_tuple) },
|
|
||||||
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_CAMERA_VSYNC), MP_ROM_PTR(&pin_GPIO5) },
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_CAMERA_HREF), MP_ROM_PTR(&pin_GPIO6) },
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_CAMERA_DATA9), MP_ROM_PTR(&pin_GPIO7) },
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_CAMERA_XCLK), MP_ROM_PTR(&pin_GPIO8) },
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_CAMERA_DATA8), MP_ROM_PTR(&pin_GPIO9) },
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_CAMERA_DATA7), MP_ROM_PTR(&pin_GPIO10) },
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_CAMERA_PCLK), MP_ROM_PTR(&pin_GPIO11) },
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_CAMERA_DATA6), MP_ROM_PTR(&pin_GPIO12) },
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_CAMERA_DATA2), MP_ROM_PTR(&pin_GPIO13) },
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_CAMERA_DATA5), MP_ROM_PTR(&pin_GPIO14) },
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_CAMERA_DATA3), MP_ROM_PTR(&pin_GPIO15) },
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_CAMERA_DATA4), MP_ROM_PTR(&pin_GPIO16) },
|
|
||||||
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
|
|
||||||
{ MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)},
|
|
||||||
};
|
|
||||||
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
CONFIG_ESP32S2_SPIRAM_SUPPORT=y
|
|
||||||
|
|
||||||
#
|
|
||||||
# SPI RAM config
|
|
||||||
#
|
|
||||||
# CONFIG_SPIRAM_TYPE_AUTO is not set
|
|
||||||
CONFIG_SPIRAM_TYPE_ESPPSRAM16=y
|
|
||||||
# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
|
|
||||||
# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
|
|
||||||
CONFIG_SPIRAM_SIZE=2097152
|
|
||||||
|
|
||||||
#
|
|
||||||
# PSRAM clock and cs IO for ESP32S2
|
|
||||||
#
|
|
||||||
CONFIG_DEFAULT_PSRAM_CLK_IO=30
|
|
||||||
CONFIG_DEFAULT_PSRAM_CS_IO=26
|
|
||||||
# end of PSRAM clock and cs IO for ESP32S2
|
|
||||||
|
|
||||||
# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
|
|
||||||
# CONFIG_SPIRAM_RODATA is not set
|
|
||||||
# CONFIG_SPIRAM_SPEED_80M is not set
|
|
||||||
CONFIG_SPIRAM_SPEED_40M=y
|
|
||||||
# CONFIG_SPIRAM_SPEED_26M is not set
|
|
||||||
# CONFIG_SPIRAM_SPEED_20M is not set
|
|
||||||
CONFIG_SPIRAM=y
|
|
||||||
CONFIG_SPIRAM_BOOT_INIT=y
|
|
||||||
# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
|
|
||||||
CONFIG_SPIRAM_USE_MEMMAP=y
|
|
||||||
# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
|
|
||||||
# CONFIG_SPIRAM_USE_MALLOC is not set
|
|
||||||
CONFIG_SPIRAM_MEMTEST=y
|
|
||||||
# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
|
|
||||||
# end of SPI RAM config
|
|
||||||
Loading…
Reference in New Issue
Block a user