From 4654f9c304a598ee24a22a32a9395ebf6cd37009 Mon Sep 17 00:00:00 2001 From: Jacques Supcik Date: Mon, 13 Nov 2023 22:22:28 +0100 Subject: [PATCH 1/5] add expressif cards --- .../espressif/boards/oxocard_artwork/board.c | 29 +++++ .../boards/oxocard_artwork/mpconfigboard.h | 49 ++++++++ .../boards/oxocard_artwork/mpconfigboard.mk | 14 +++ ports/espressif/boards/oxocard_artwork/pins.c | 39 ++++++ .../boards/oxocard_artwork/sdkconfig | 0 .../espressif/boards/oxocard_connect/board.c | 115 ++++++++++++++++++ .../boards/oxocard_connect/mpconfigboard.h | 49 ++++++++ .../boards/oxocard_connect/mpconfigboard.mk | 14 +++ ports/espressif/boards/oxocard_connect/pins.c | 41 +++++++ .../boards/oxocard_connect/sdkconfig | 0 ports/espressif/boards/oxocard_galaxy/board.c | 29 +++++ .../boards/oxocard_galaxy/mpconfigboard.h | 49 ++++++++ .../boards/oxocard_galaxy/mpconfigboard.mk | 14 +++ ports/espressif/boards/oxocard_galaxy/pins.c | 39 ++++++ .../espressif/boards/oxocard_galaxy/sdkconfig | 0 .../espressif/boards/oxocard_science/board.c | 114 +++++++++++++++++ .../boards/oxocard_science/mpconfigboard.h | 49 ++++++++ .../boards/oxocard_science/mpconfigboard.mk | 14 +++ ports/espressif/boards/oxocard_science/pins.c | 39 ++++++ .../boards/oxocard_science/sdkconfig | 0 20 files changed, 697 insertions(+) create mode 100644 ports/espressif/boards/oxocard_artwork/board.c create mode 100644 ports/espressif/boards/oxocard_artwork/mpconfigboard.h create mode 100644 ports/espressif/boards/oxocard_artwork/mpconfigboard.mk create mode 100644 ports/espressif/boards/oxocard_artwork/pins.c create mode 100644 ports/espressif/boards/oxocard_artwork/sdkconfig create mode 100644 ports/espressif/boards/oxocard_connect/board.c create mode 100644 ports/espressif/boards/oxocard_connect/mpconfigboard.h create mode 100644 ports/espressif/boards/oxocard_connect/mpconfigboard.mk create mode 100644 ports/espressif/boards/oxocard_connect/pins.c create mode 100644 ports/espressif/boards/oxocard_connect/sdkconfig create mode 100644 ports/espressif/boards/oxocard_galaxy/board.c create mode 100644 ports/espressif/boards/oxocard_galaxy/mpconfigboard.h create mode 100644 ports/espressif/boards/oxocard_galaxy/mpconfigboard.mk create mode 100644 ports/espressif/boards/oxocard_galaxy/pins.c create mode 100644 ports/espressif/boards/oxocard_galaxy/sdkconfig create mode 100644 ports/espressif/boards/oxocard_science/board.c create mode 100644 ports/espressif/boards/oxocard_science/mpconfigboard.h create mode 100644 ports/espressif/boards/oxocard_science/mpconfigboard.mk create mode 100644 ports/espressif/boards/oxocard_science/pins.c create mode 100644 ports/espressif/boards/oxocard_science/sdkconfig diff --git a/ports/espressif/boards/oxocard_artwork/board.c b/ports/espressif/boards/oxocard_artwork/board.c new file mode 100644 index 0000000000..164430c88c --- /dev/null +++ b/ports/espressif/boards/oxocard_artwork/board.c @@ -0,0 +1,29 @@ +/* + * 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" + +// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here. diff --git a/ports/espressif/boards/oxocard_artwork/mpconfigboard.h b/ports/espressif/boards/oxocard_artwork/mpconfigboard.h new file mode 100644 index 0000000000..4eb9bbf918 --- /dev/null +++ b/ports/espressif/boards/oxocard_artwork/mpconfigboard.h @@ -0,0 +1,49 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 Dan Halbert 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 "Oxocard Artwork" +#define MICROPY_HW_MCU_NAME "ESP32" + +#define MICROPY_HW_LED_STATUS (&pin_GPIO2) + +// clang-format off +#define CIRCUITPY_BOARD_I2C (1) +#define CIRCUITPY_BOARD_I2C_PIN { \ + { .scl = &pin_GPIO22, .sda = &pin_GPIO21 }} +// clang-format on + +// clang-format off +#define CIRCUITPY_BOARD_SPI (2) +#define CIRCUITPY_BOARD_SPI_PIN { \ + { .clock = &pin_GPIO14, .mosi = &pin_GPIO13, .miso = &pin_GPIO12 }, \ + { .clock = &pin_GPIO7, .mosi = &pin_GPIO5, .miso = &pin_GPIO8 }} +// clang-format on + +// UART pins attached to the USB-serial converter chip +#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1) +#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3) diff --git a/ports/espressif/boards/oxocard_artwork/mpconfigboard.mk b/ports/espressif/boards/oxocard_artwork/mpconfigboard.mk new file mode 100644 index 0000000000..a7dfe8b8e3 --- /dev/null +++ b/ports/espressif/boards/oxocard_artwork/mpconfigboard.mk @@ -0,0 +1,14 @@ +CIRCUITPY_CREATOR_ID = 0x4F583097 +CIRCUITPY_CREATION_ID = 0x3A030001 + +IDF_TARGET = esp32 + +CIRCUITPY_ESP_FLASH_SIZE = 8MB +CIRCUITPY_ESP_FLASH_MODE = qio +CIRCUITPY_ESP_FLASH_FREQ = 80m + +CIRCUITPY_ESP_PSRAM_SIZE = 2MB +CIRCUITPY_ESP_PSRAM_MODE = qio +CIRCUITPY_ESP_PSRAM_FREQ = 80m + +CIRCUITPY_ESPCAMERA = 0 diff --git a/ports/espressif/boards/oxocard_artwork/pins.c b/ports/espressif/boards/oxocard_artwork/pins.c new file mode 100644 index 0000000000..a42aa6b1eb --- /dev/null +++ b/ports/espressif/boards/oxocard_artwork/pins.c @@ -0,0 +1,39 @@ +#include "shared-bindings/board/__init__.h" +#include "shared-module/displayio/__init__.h" + +CIRCUITPY_BOARD_BUS_SINGLETON(stemma_i2c, i2c, 1) + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_BTN5), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) }, + + { MP_ROM_QSTR(MP_QSTR_AUDIO_N), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_AUDIO_P), MP_ROM_PTR(&pin_GPIO25) }, + { MP_ROM_QSTR(MP_QSTR_AUDIO_SD), MP_ROM_PTR(&pin_GPIO20) }, + + { MP_ROM_QSTR(MP_QSTR_LCD_LED), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_LCD_DC), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_LCD_CS), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_LCD_RST), MP_ROM_PTR(&pin_GPIO4) }, + + { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO7) }, + + { MP_ROM_QSTR(MP_QSTR_BTN4), MP_ROM_PTR(&pin_GPIO39) }, + { MP_ROM_QSTR(MP_QSTR_BTN3), MP_ROM_PTR(&pin_GPIO38) }, + { MP_ROM_QSTR(MP_QSTR_BTN2), MP_ROM_PTR(&pin_GPIO37) }, + { MP_ROM_QSTR(MP_QSTR_BTN1), MP_ROM_PTR(&pin_GPIO36) }, + + { MP_ROM_QSTR(MP_QSTR_ACC_INT1), MP_ROM_PTR(&pin_GPIO34) }, + { MP_ROM_QSTR(MP_QSTR_ACC_INT2), MP_ROM_PTR(&pin_GPIO35) }, + + { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display) }, + { 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_UART), MP_ROM_PTR(&board_uart_obj) }, +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); diff --git a/ports/espressif/boards/oxocard_artwork/sdkconfig b/ports/espressif/boards/oxocard_artwork/sdkconfig new file mode 100644 index 0000000000..e69de29bb2 diff --git a/ports/espressif/boards/oxocard_connect/board.c b/ports/espressif/boards/oxocard_connect/board.c new file mode 100644 index 0000000000..c19229e01c --- /dev/null +++ b/ports/espressif/boards/oxocard_connect/board.c @@ -0,0 +1,115 @@ +/* + * 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/microcontroller/Pin.h" +#include "shared-module/displayio/__init__.h" +#include "shared-module/displayio/mipi_constants.h" + +#define DELAY 0x80 + +// display init sequence +uint8_t display_init_sequence[] = { + 0x01, DELAY, 0x96, // _SWRESET and Delay 150ms + 0x11, DELAY, 0xFF, // _SLPOUT and Delay 500ms + 0x3A, DELAY | 1, 0x55, 0x0A, // _COLMOD (65K of RGB, 16 bits/pixel) and Delay 10ms + 0x36, 0x01, 0x00, // _MADCTL + 0x2A, 0x04, 0x00, 0x00, 0x00, 0xF0, // _CASET (0..240) + 0x2B, 0x04, 0x00, 0x00, 0x00, 0xF0, // _RASET (0..240) + 0x21, DELAY, 0x0A, // _INVON Hack and Delay 10ms + 0x13, DELAY, 0x0A, // _NORON and Delay 10ms + 0x36, 0x01, 0x60, // _MADCTL (MX=1, MY=1) + 0x29, DELAY, 0xFF, // _DISPON and Delay 500ms +}; + +static void display_init(void) { + fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus; + busio_spi_obj_t *spi = &bus->inline_bus; + + common_hal_busio_spi_construct( + spi, + &pin_GPIO14, // CLK + &pin_GPIO13, // MOSI + &pin_GPIO12, // MISO + false); // Not half-duplex + + common_hal_busio_spi_never_reset(spi); + + bus->base.type = &fourwire_fourwire_type; + + common_hal_fourwire_fourwire_construct( + bus, + spi, + &pin_GPIO27, // DC + &pin_GPIO15, // CS + &pin_GPIO4, // RST + 24000000, // baudrate + 0, // polarity + 0 // phase + ); + + busdisplay_busdisplay_obj_t *display = &allocate_display()->display; + display->base.type = &busdisplay_busdisplay_type; + + common_hal_busdisplay_busdisplay_construct( + display, + bus, + 240, // width (after rotation) + 240, // height (after rotation) + 0, // column start + 0, // row start + 0, // rotation + 16, // color depth + false, // grayscale + false, // pixels in a byte share a row. Only valid for depths < 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_GPIO19, // 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, // SH1107_addressing + 50000 // backlight pwm frequency + ); +} + +void board_init(void) { + // Display + display_init(); +} + +// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here. diff --git a/ports/espressif/boards/oxocard_connect/mpconfigboard.h b/ports/espressif/boards/oxocard_connect/mpconfigboard.h new file mode 100644 index 0000000000..6310d3a406 --- /dev/null +++ b/ports/espressif/boards/oxocard_connect/mpconfigboard.h @@ -0,0 +1,49 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 Dan Halbert 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 "Oxocard Connnect" +#define MICROPY_HW_MCU_NAME "ESP32" + +#define MICROPY_HW_LED_STATUS (&pin_GPIO2) + +// clang-format off +#define CIRCUITPY_BOARD_I2C (1) +#define CIRCUITPY_BOARD_I2C_PIN { \ + { .scl = &pin_GPIO22, .sda = &pin_GPIO21 }} +// clang-format on + +// clang-format off +#define CIRCUITPY_BOARD_SPI (2) +#define CIRCUITPY_BOARD_SPI_PIN { \ + { .clock = &pin_GPIO14, .mosi = &pin_GPIO13, .miso = &pin_GPIO12 }, \ + { .clock = &pin_GPIO7, .mosi = &pin_GPIO5, .miso = &pin_GPIO8 }} +// clang-format on + +// UART pins attached to the USB-serial converter chip +#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1) +#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3) diff --git a/ports/espressif/boards/oxocard_connect/mpconfigboard.mk b/ports/espressif/boards/oxocard_connect/mpconfigboard.mk new file mode 100644 index 0000000000..49b8a4f4c8 --- /dev/null +++ b/ports/espressif/boards/oxocard_connect/mpconfigboard.mk @@ -0,0 +1,14 @@ +CIRCUITPY_CREATOR_ID = 0x4F583097 +CIRCUITPY_CREATION_ID = 0x3A080001 + +IDF_TARGET = esp32 + +CIRCUITPY_ESP_FLASH_SIZE = 8MB +CIRCUITPY_ESP_FLASH_MODE = qio +CIRCUITPY_ESP_FLASH_FREQ = 80m + +CIRCUITPY_ESP_PSRAM_SIZE = 2MB +CIRCUITPY_ESP_PSRAM_MODE = qio +CIRCUITPY_ESP_PSRAM_FREQ = 80m + +CIRCUITPY_ESPCAMERA = 0 diff --git a/ports/espressif/boards/oxocard_connect/pins.c b/ports/espressif/boards/oxocard_connect/pins.c new file mode 100644 index 0000000000..4fbd00d45e --- /dev/null +++ b/ports/espressif/boards/oxocard_connect/pins.c @@ -0,0 +1,41 @@ +#include "shared-bindings/board/__init__.h" +#include "shared-module/displayio/__init__.h" + +CIRCUITPY_BOARD_BUS_SINGLETON(stemma_i2c, i2c, 1) + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_BTN5), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) }, + + { MP_ROM_QSTR(MP_QSTR_LCD_LED), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_LCD_DC), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_LCD_CS), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_LCD_RST), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display) }, + + { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO7) }, + + { MP_ROM_QSTR(MP_QSTR_BTN4), MP_ROM_PTR(&pin_GPIO39) }, + { MP_ROM_QSTR(MP_QSTR_BTN3), MP_ROM_PTR(&pin_GPIO38) }, + { MP_ROM_QSTR(MP_QSTR_BTN2), MP_ROM_PTR(&pin_GPIO37) }, + { MP_ROM_QSTR(MP_QSTR_BTN1), MP_ROM_PTR(&pin_GPIO36) }, + + { MP_ROM_QSTR(MP_QSTR_IO01), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_IO02), MP_ROM_PTR(&pin_GPIO25) }, + { MP_ROM_QSTR(MP_QSTR_IO03), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_IO04), MP_ROM_PTR(&pin_GPIO32) }, + { MP_ROM_QSTR(MP_QSTR_IO05), MP_ROM_PTR(&pin_GPIO33) }, + { MP_ROM_QSTR(MP_QSTR_IN06), MP_ROM_PTR(&pin_GPIO34) }, + { MP_ROM_QSTR(MP_QSTR_IN07), MP_ROM_PTR(&pin_GPIO35) }, + + + { 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_UART), MP_ROM_PTR(&board_uart_obj) }, +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); diff --git a/ports/espressif/boards/oxocard_connect/sdkconfig b/ports/espressif/boards/oxocard_connect/sdkconfig new file mode 100644 index 0000000000..e69de29bb2 diff --git a/ports/espressif/boards/oxocard_galaxy/board.c b/ports/espressif/boards/oxocard_galaxy/board.c new file mode 100644 index 0000000000..164430c88c --- /dev/null +++ b/ports/espressif/boards/oxocard_galaxy/board.c @@ -0,0 +1,29 @@ +/* + * 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" + +// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here. diff --git a/ports/espressif/boards/oxocard_galaxy/mpconfigboard.h b/ports/espressif/boards/oxocard_galaxy/mpconfigboard.h new file mode 100644 index 0000000000..7d6f89a951 --- /dev/null +++ b/ports/espressif/boards/oxocard_galaxy/mpconfigboard.h @@ -0,0 +1,49 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 Dan Halbert 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 "Oxocard Galaxy" +#define MICROPY_HW_MCU_NAME "ESP32" + +#define MICROPY_HW_LED_STATUS (&pin_GPIO2) + +// clang-format off +#define CIRCUITPY_BOARD_I2C (1) +#define CIRCUITPY_BOARD_I2C_PIN { \ + { .scl = &pin_GPIO22, .sda = &pin_GPIO21 }} +// clang-format on + +// clang-format off +#define CIRCUITPY_BOARD_SPI (2) +#define CIRCUITPY_BOARD_SPI_PIN { \ + { .clock = &pin_GPIO14, .mosi = &pin_GPIO13, .miso = &pin_GPIO12 }, \ + { .clock = &pin_GPIO7, .mosi = &pin_GPIO5, .miso = &pin_GPIO8 }} +// clang-format on + +// UART pins attached to the USB-serial converter chip +#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1) +#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3) diff --git a/ports/espressif/boards/oxocard_galaxy/mpconfigboard.mk b/ports/espressif/boards/oxocard_galaxy/mpconfigboard.mk new file mode 100644 index 0000000000..915d7cc586 --- /dev/null +++ b/ports/espressif/boards/oxocard_galaxy/mpconfigboard.mk @@ -0,0 +1,14 @@ +CIRCUITPY_CREATOR_ID = 0x4F583097 +CIRCUITPY_CREATION_ID = 0x3A030002 + +IDF_TARGET = esp32 + +CIRCUITPY_ESP_FLASH_SIZE = 8MB +CIRCUITPY_ESP_FLASH_MODE = qio +CIRCUITPY_ESP_FLASH_FREQ = 80m + +CIRCUITPY_ESP_PSRAM_SIZE = 2MB +CIRCUITPY_ESP_PSRAM_MODE = qio +CIRCUITPY_ESP_PSRAM_FREQ = 80m + +CIRCUITPY_ESPCAMERA = 0 diff --git a/ports/espressif/boards/oxocard_galaxy/pins.c b/ports/espressif/boards/oxocard_galaxy/pins.c new file mode 100644 index 0000000000..445d907adf --- /dev/null +++ b/ports/espressif/boards/oxocard_galaxy/pins.c @@ -0,0 +1,39 @@ +#include "shared-bindings/board/__init__.h" +#include "shared-module/displayio/__init__.h" + +CIRCUITPY_BOARD_BUS_SINGLETON(stemma_i2c, i2c, 1) + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_BTN5), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) }, + + { MP_ROM_QSTR(MP_QSTR_AUDIO_N), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_AUDIO_P), MP_ROM_PTR(&pin_GPIO25) }, + { MP_ROM_QSTR(MP_QSTR_AUDIO_SD), MP_ROM_PTR(&pin_GPIO20) }, + + { MP_ROM_QSTR(MP_QSTR_LCD_LED), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_LCD_DC), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_LCD_CS), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_LCD_RST), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display) }, + + { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO7) }, + + { MP_ROM_QSTR(MP_QSTR_BTN4), MP_ROM_PTR(&pin_GPIO39) }, + { MP_ROM_QSTR(MP_QSTR_BTN3), MP_ROM_PTR(&pin_GPIO38) }, + { MP_ROM_QSTR(MP_QSTR_BTN2), MP_ROM_PTR(&pin_GPIO37) }, + { MP_ROM_QSTR(MP_QSTR_BTN1), MP_ROM_PTR(&pin_GPIO36) }, + + { MP_ROM_QSTR(MP_QSTR_ACC_INT1), MP_ROM_PTR(&pin_GPIO34) }, + { MP_ROM_QSTR(MP_QSTR_ACC_INT2), MP_ROM_PTR(&pin_GPIO35) }, + + { 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_UART), MP_ROM_PTR(&board_uart_obj) }, +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); diff --git a/ports/espressif/boards/oxocard_galaxy/sdkconfig b/ports/espressif/boards/oxocard_galaxy/sdkconfig new file mode 100644 index 0000000000..e69de29bb2 diff --git a/ports/espressif/boards/oxocard_science/board.c b/ports/espressif/boards/oxocard_science/board.c new file mode 100644 index 0000000000..ceddaddf95 --- /dev/null +++ b/ports/espressif/boards/oxocard_science/board.c @@ -0,0 +1,114 @@ +/* + * 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/microcontroller/Pin.h" +#include "shared-module/displayio/__init__.h" +#include "shared-module/displayio/mipi_constants.h" + +#define DELAY 0x80 + +// display init sequence +uint8_t display_init_sequence[] = { + 0x01, DELAY, 0x96, // _SWRESET and Delay 150ms + 0x11, DELAY, 0xFF, // _SLPOUT and Delay 500ms + 0x3A, DELAY | 1, 0x55, 0x0A, // _COLMOD (65K of RGB, 16 bits/pixel) and Delay 10ms + 0x36, 0x01, 0x00, // _MADCTL + 0x2A, 0x04, 0x00, 0x00, 0x00, 0xF0, // _CASET (0..240) + 0x2B, 0x04, 0x00, 0x00, 0x00, 0xF0, // _RASET (0..240) + 0x21, DELAY, 0x0A, // _INVON Hack and Delay 10ms + 0x13, DELAY, 0x0A, // _NORON and Delay 10ms + 0x29, DELAY, 0xFF, // _DISPON and Delay 500ms +}; + +static void display_init(void) { + fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus; + busio_spi_obj_t *spi = &bus->inline_bus; + + common_hal_busio_spi_construct( + spi, + &pin_GPIO14, // CLK + &pin_GPIO13, // MOSI + &pin_GPIO12, // MISO + false); // Not half-duplex + + common_hal_busio_spi_never_reset(spi); + + bus->base.type = &fourwire_fourwire_type; + + common_hal_fourwire_fourwire_construct( + bus, + spi, + &pin_GPIO27, // DC + &pin_GPIO15, // CS + &pin_GPIO4, // RST + 24000000, // baudrate + 0, // polarity + 0 // phase + ); + + busdisplay_busdisplay_obj_t *display = &allocate_display()->display; + display->base.type = &busdisplay_busdisplay_type; + + common_hal_busdisplay_busdisplay_construct( + display, + bus, + 240, // width (after rotation) + 240, // height (after rotation) + 0, // column start + 80, // row start + 0, // rotation + 16, // color depth + false, // grayscale + false, // pixels in a byte share a row. Only valid for depths < 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_GPIO19, // 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, // SH1107_addressing + 50000 // backlight pwm frequency + ); +} + +void board_init(void) { + // Display + display_init(); +} + +// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here. diff --git a/ports/espressif/boards/oxocard_science/mpconfigboard.h b/ports/espressif/boards/oxocard_science/mpconfigboard.h new file mode 100644 index 0000000000..fa3e64d57e --- /dev/null +++ b/ports/espressif/boards/oxocard_science/mpconfigboard.h @@ -0,0 +1,49 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2022 Dan Halbert 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 "Oxocard Science" +#define MICROPY_HW_MCU_NAME "ESP32" + +#define MICROPY_HW_LED_STATUS (&pin_GPIO2) + +// clang-format off +#define CIRCUITPY_BOARD_I2C (1) +#define CIRCUITPY_BOARD_I2C_PIN { \ + { .scl = &pin_GPIO22, .sda = &pin_GPIO21 }} +// clang-format on + +// clang-format off +#define CIRCUITPY_BOARD_SPI (2) +#define CIRCUITPY_BOARD_SPI_PIN { \ + { .clock = &pin_GPIO14, .mosi = &pin_GPIO13, .miso = &pin_GPIO12 }, \ + { .clock = &pin_GPIO7, .mosi = &pin_GPIO5, .miso = &pin_GPIO8 }} +// clang-format on + +// UART pins attached to the USB-serial converter chip +#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1) +#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3) diff --git a/ports/espressif/boards/oxocard_science/mpconfigboard.mk b/ports/espressif/boards/oxocard_science/mpconfigboard.mk new file mode 100644 index 0000000000..d31be7d799 --- /dev/null +++ b/ports/espressif/boards/oxocard_science/mpconfigboard.mk @@ -0,0 +1,14 @@ +CIRCUITPY_CREATOR_ID = 0x4F583097 +CIRCUITPY_CREATION_ID = 0x3A030003 + +IDF_TARGET = esp32 + +CIRCUITPY_ESP_FLASH_SIZE = 8MB +CIRCUITPY_ESP_FLASH_MODE = qio +CIRCUITPY_ESP_FLASH_FREQ = 80m + +CIRCUITPY_ESP_PSRAM_SIZE = 2MB +CIRCUITPY_ESP_PSRAM_MODE = qio +CIRCUITPY_ESP_PSRAM_FREQ = 80m + +CIRCUITPY_ESPCAMERA = 0 diff --git a/ports/espressif/boards/oxocard_science/pins.c b/ports/espressif/boards/oxocard_science/pins.c new file mode 100644 index 0000000000..e7b44a5ece --- /dev/null +++ b/ports/espressif/boards/oxocard_science/pins.c @@ -0,0 +1,39 @@ +#include "shared-bindings/board/__init__.h" +#include "shared-module/displayio/__init__.h" + +CIRCUITPY_BOARD_BUS_SINGLETON(stemma_i2c, i2c, 1) + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { MP_ROM_QSTR(MP_QSTR_BTN5), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) }, + + { MP_ROM_QSTR(MP_QSTR_MIC_DATA), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_MIC_CLK), MP_ROM_PTR(&pin_GPIO25) }, + + { MP_ROM_QSTR(MP_QSTR_LCD_LED), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_LCD_DC), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_LCD_CS), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_LCD_RST), MP_ROM_PTR(&pin_GPIO4) }, + + { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO7) }, + + { MP_ROM_QSTR(MP_QSTR_BTN4), MP_ROM_PTR(&pin_GPIO39) }, + { MP_ROM_QSTR(MP_QSTR_BTN3), MP_ROM_PTR(&pin_GPIO38) }, + { MP_ROM_QSTR(MP_QSTR_BTN2), MP_ROM_PTR(&pin_GPIO37) }, + { MP_ROM_QSTR(MP_QSTR_BTN1), MP_ROM_PTR(&pin_GPIO36) }, + + { MP_ROM_QSTR(MP_QSTR_ACC_INT), MP_ROM_PTR(&pin_GPIO34) }, + { MP_ROM_QSTR(MP_QSTR_AMB_INT), MP_ROM_PTR(&pin_GPIO35) }, + { MP_ROM_QSTR(MP_QSTR_VOC_RST), MP_ROM_PTR(&pin_GPIO20) }, + + { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display) }, + { 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_UART), MP_ROM_PTR(&board_uart_obj) }, +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); diff --git a/ports/espressif/boards/oxocard_science/sdkconfig b/ports/espressif/boards/oxocard_science/sdkconfig new file mode 100644 index 0000000000..e69de29bb2 From 471ee6f8c9b6df6217e378cae74dedc4d5d72ca5 Mon Sep 17 00:00:00 2001 From: Jacques Supcik Date: Mon, 13 Nov 2023 22:26:00 +0100 Subject: [PATCH 2/5] add: display initialisation --- .../espressif/boards/oxocard_artwork/board.c | 85 +++++++++++++++++++ ports/espressif/boards/oxocard_galaxy/board.c | 85 +++++++++++++++++++ 2 files changed, 170 insertions(+) diff --git a/ports/espressif/boards/oxocard_artwork/board.c b/ports/espressif/boards/oxocard_artwork/board.c index 164430c88c..ceddaddf95 100644 --- a/ports/espressif/boards/oxocard_artwork/board.c +++ b/ports/espressif/boards/oxocard_artwork/board.c @@ -25,5 +25,90 @@ */ #include "supervisor/board.h" +#include "mpconfigboard.h" +#include "shared-bindings/microcontroller/Pin.h" +#include "shared-module/displayio/__init__.h" +#include "shared-module/displayio/mipi_constants.h" + +#define DELAY 0x80 + +// display init sequence +uint8_t display_init_sequence[] = { + 0x01, DELAY, 0x96, // _SWRESET and Delay 150ms + 0x11, DELAY, 0xFF, // _SLPOUT and Delay 500ms + 0x3A, DELAY | 1, 0x55, 0x0A, // _COLMOD (65K of RGB, 16 bits/pixel) and Delay 10ms + 0x36, 0x01, 0x00, // _MADCTL + 0x2A, 0x04, 0x00, 0x00, 0x00, 0xF0, // _CASET (0..240) + 0x2B, 0x04, 0x00, 0x00, 0x00, 0xF0, // _RASET (0..240) + 0x21, DELAY, 0x0A, // _INVON Hack and Delay 10ms + 0x13, DELAY, 0x0A, // _NORON and Delay 10ms + 0x29, DELAY, 0xFF, // _DISPON and Delay 500ms +}; + +static void display_init(void) { + fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus; + busio_spi_obj_t *spi = &bus->inline_bus; + + common_hal_busio_spi_construct( + spi, + &pin_GPIO14, // CLK + &pin_GPIO13, // MOSI + &pin_GPIO12, // MISO + false); // Not half-duplex + + common_hal_busio_spi_never_reset(spi); + + bus->base.type = &fourwire_fourwire_type; + + common_hal_fourwire_fourwire_construct( + bus, + spi, + &pin_GPIO27, // DC + &pin_GPIO15, // CS + &pin_GPIO4, // RST + 24000000, // baudrate + 0, // polarity + 0 // phase + ); + + busdisplay_busdisplay_obj_t *display = &allocate_display()->display; + display->base.type = &busdisplay_busdisplay_type; + + common_hal_busdisplay_busdisplay_construct( + display, + bus, + 240, // width (after rotation) + 240, // height (after rotation) + 0, // column start + 80, // row start + 0, // rotation + 16, // color depth + false, // grayscale + false, // pixels in a byte share a row. Only valid for depths < 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_GPIO19, // 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, // SH1107_addressing + 50000 // backlight pwm frequency + ); +} + +void board_init(void) { + // Display + display_init(); +} // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here. diff --git a/ports/espressif/boards/oxocard_galaxy/board.c b/ports/espressif/boards/oxocard_galaxy/board.c index 164430c88c..ceddaddf95 100644 --- a/ports/espressif/boards/oxocard_galaxy/board.c +++ b/ports/espressif/boards/oxocard_galaxy/board.c @@ -25,5 +25,90 @@ */ #include "supervisor/board.h" +#include "mpconfigboard.h" +#include "shared-bindings/microcontroller/Pin.h" +#include "shared-module/displayio/__init__.h" +#include "shared-module/displayio/mipi_constants.h" + +#define DELAY 0x80 + +// display init sequence +uint8_t display_init_sequence[] = { + 0x01, DELAY, 0x96, // _SWRESET and Delay 150ms + 0x11, DELAY, 0xFF, // _SLPOUT and Delay 500ms + 0x3A, DELAY | 1, 0x55, 0x0A, // _COLMOD (65K of RGB, 16 bits/pixel) and Delay 10ms + 0x36, 0x01, 0x00, // _MADCTL + 0x2A, 0x04, 0x00, 0x00, 0x00, 0xF0, // _CASET (0..240) + 0x2B, 0x04, 0x00, 0x00, 0x00, 0xF0, // _RASET (0..240) + 0x21, DELAY, 0x0A, // _INVON Hack and Delay 10ms + 0x13, DELAY, 0x0A, // _NORON and Delay 10ms + 0x29, DELAY, 0xFF, // _DISPON and Delay 500ms +}; + +static void display_init(void) { + fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus; + busio_spi_obj_t *spi = &bus->inline_bus; + + common_hal_busio_spi_construct( + spi, + &pin_GPIO14, // CLK + &pin_GPIO13, // MOSI + &pin_GPIO12, // MISO + false); // Not half-duplex + + common_hal_busio_spi_never_reset(spi); + + bus->base.type = &fourwire_fourwire_type; + + common_hal_fourwire_fourwire_construct( + bus, + spi, + &pin_GPIO27, // DC + &pin_GPIO15, // CS + &pin_GPIO4, // RST + 24000000, // baudrate + 0, // polarity + 0 // phase + ); + + busdisplay_busdisplay_obj_t *display = &allocate_display()->display; + display->base.type = &busdisplay_busdisplay_type; + + common_hal_busdisplay_busdisplay_construct( + display, + bus, + 240, // width (after rotation) + 240, // height (after rotation) + 0, // column start + 80, // row start + 0, // rotation + 16, // color depth + false, // grayscale + false, // pixels in a byte share a row. Only valid for depths < 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_GPIO19, // 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, // SH1107_addressing + 50000 // backlight pwm frequency + ); +} + +void board_init(void) { + // Display + display_init(); +} // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here. From 388807e7253bc4cd223e73e23378fecae08c7095 Mon Sep 17 00:00:00 2001 From: Jacques Supcik Date: Mon, 13 Nov 2023 22:46:39 +0100 Subject: [PATCH 3/5] fix typo --- ports/espressif/boards/oxocard_connect/mpconfigboard.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/espressif/boards/oxocard_connect/mpconfigboard.h b/ports/espressif/boards/oxocard_connect/mpconfigboard.h index 6310d3a406..45a4824580 100644 --- a/ports/espressif/boards/oxocard_connect/mpconfigboard.h +++ b/ports/espressif/boards/oxocard_connect/mpconfigboard.h @@ -26,7 +26,7 @@ // Micropython setup -#define MICROPY_HW_BOARD_NAME "Oxocard Connnect" +#define MICROPY_HW_BOARD_NAME "Oxocard Connect" #define MICROPY_HW_MCU_NAME "ESP32" #define MICROPY_HW_LED_STATUS (&pin_GPIO2) From 9b7f7d0d05a2d89c53da9eb06b9800f507327499 Mon Sep 17 00:00:00 2001 From: Jacques Supcik Date: Tue, 14 Nov 2023 08:39:08 +0100 Subject: [PATCH 4/5] fix style to pass pre-commit checks --- ports/espressif/boards/oxocard_artwork/mpconfigboard.h | 6 +++--- ports/espressif/boards/oxocard_connect/mpconfigboard.h | 6 +++--- ports/espressif/boards/oxocard_galaxy/mpconfigboard.h | 6 +++--- ports/espressif/boards/oxocard_science/mpconfigboard.h | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ports/espressif/boards/oxocard_artwork/mpconfigboard.h b/ports/espressif/boards/oxocard_artwork/mpconfigboard.h index 4eb9bbf918..3c117dbe10 100644 --- a/ports/espressif/boards/oxocard_artwork/mpconfigboard.h +++ b/ports/espressif/boards/oxocard_artwork/mpconfigboard.h @@ -34,14 +34,14 @@ // clang-format off #define CIRCUITPY_BOARD_I2C (1) #define CIRCUITPY_BOARD_I2C_PIN { \ - { .scl = &pin_GPIO22, .sda = &pin_GPIO21 }} + { .scl = &pin_GPIO22, .sda = &pin_GPIO21 }} // clang-format on // clang-format off #define CIRCUITPY_BOARD_SPI (2) #define CIRCUITPY_BOARD_SPI_PIN { \ - { .clock = &pin_GPIO14, .mosi = &pin_GPIO13, .miso = &pin_GPIO12 }, \ - { .clock = &pin_GPIO7, .mosi = &pin_GPIO5, .miso = &pin_GPIO8 }} + { .clock = &pin_GPIO14, .mosi = &pin_GPIO13, .miso = &pin_GPIO12 }, \ + { .clock = &pin_GPIO7, .mosi = &pin_GPIO5, .miso = &pin_GPIO8 }} // clang-format on // UART pins attached to the USB-serial converter chip diff --git a/ports/espressif/boards/oxocard_connect/mpconfigboard.h b/ports/espressif/boards/oxocard_connect/mpconfigboard.h index 45a4824580..468d9609fe 100644 --- a/ports/espressif/boards/oxocard_connect/mpconfigboard.h +++ b/ports/espressif/boards/oxocard_connect/mpconfigboard.h @@ -34,14 +34,14 @@ // clang-format off #define CIRCUITPY_BOARD_I2C (1) #define CIRCUITPY_BOARD_I2C_PIN { \ - { .scl = &pin_GPIO22, .sda = &pin_GPIO21 }} + { .scl = &pin_GPIO22, .sda = &pin_GPIO21 }} // clang-format on // clang-format off #define CIRCUITPY_BOARD_SPI (2) #define CIRCUITPY_BOARD_SPI_PIN { \ - { .clock = &pin_GPIO14, .mosi = &pin_GPIO13, .miso = &pin_GPIO12 }, \ - { .clock = &pin_GPIO7, .mosi = &pin_GPIO5, .miso = &pin_GPIO8 }} + { .clock = &pin_GPIO14, .mosi = &pin_GPIO13, .miso = &pin_GPIO12 }, \ + { .clock = &pin_GPIO7, .mosi = &pin_GPIO5, .miso = &pin_GPIO8 }} // clang-format on // UART pins attached to the USB-serial converter chip diff --git a/ports/espressif/boards/oxocard_galaxy/mpconfigboard.h b/ports/espressif/boards/oxocard_galaxy/mpconfigboard.h index 7d6f89a951..3b8279902e 100644 --- a/ports/espressif/boards/oxocard_galaxy/mpconfigboard.h +++ b/ports/espressif/boards/oxocard_galaxy/mpconfigboard.h @@ -34,14 +34,14 @@ // clang-format off #define CIRCUITPY_BOARD_I2C (1) #define CIRCUITPY_BOARD_I2C_PIN { \ - { .scl = &pin_GPIO22, .sda = &pin_GPIO21 }} + { .scl = &pin_GPIO22, .sda = &pin_GPIO21 }} // clang-format on // clang-format off #define CIRCUITPY_BOARD_SPI (2) #define CIRCUITPY_BOARD_SPI_PIN { \ - { .clock = &pin_GPIO14, .mosi = &pin_GPIO13, .miso = &pin_GPIO12 }, \ - { .clock = &pin_GPIO7, .mosi = &pin_GPIO5, .miso = &pin_GPIO8 }} + { .clock = &pin_GPIO14, .mosi = &pin_GPIO13, .miso = &pin_GPIO12 }, \ + { .clock = &pin_GPIO7, .mosi = &pin_GPIO5, .miso = &pin_GPIO8 }} // clang-format on // UART pins attached to the USB-serial converter chip diff --git a/ports/espressif/boards/oxocard_science/mpconfigboard.h b/ports/espressif/boards/oxocard_science/mpconfigboard.h index fa3e64d57e..2dc61fcc66 100644 --- a/ports/espressif/boards/oxocard_science/mpconfigboard.h +++ b/ports/espressif/boards/oxocard_science/mpconfigboard.h @@ -34,14 +34,14 @@ // clang-format off #define CIRCUITPY_BOARD_I2C (1) #define CIRCUITPY_BOARD_I2C_PIN { \ - { .scl = &pin_GPIO22, .sda = &pin_GPIO21 }} + { .scl = &pin_GPIO22, .sda = &pin_GPIO21 }} // clang-format on // clang-format off #define CIRCUITPY_BOARD_SPI (2) #define CIRCUITPY_BOARD_SPI_PIN { \ - { .clock = &pin_GPIO14, .mosi = &pin_GPIO13, .miso = &pin_GPIO12 }, \ - { .clock = &pin_GPIO7, .mosi = &pin_GPIO5, .miso = &pin_GPIO8 }} + { .clock = &pin_GPIO14, .mosi = &pin_GPIO13, .miso = &pin_GPIO12 }, \ + { .clock = &pin_GPIO7, .mosi = &pin_GPIO5, .miso = &pin_GPIO8 }} // clang-format on // UART pins attached to the USB-serial converter chip From e8e1a1db9ebfcfe8853bd60058fce5624c789989 Mon Sep 17 00:00:00 2001 From: Jacques Supcik Date: Tue, 14 Nov 2023 13:35:21 +0100 Subject: [PATCH 5/5] fix formating using uncrustify 0.72 I was using uncrustify version 0.77.1 and it does not work like the version 0.72 used by Ununtu 22.04. --- ports/espressif/boards/oxocard_artwork/mpconfigboard.h | 6 +++--- ports/espressif/boards/oxocard_connect/mpconfigboard.h | 6 +++--- ports/espressif/boards/oxocard_galaxy/mpconfigboard.h | 6 +++--- ports/espressif/boards/oxocard_science/mpconfigboard.h | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ports/espressif/boards/oxocard_artwork/mpconfigboard.h b/ports/espressif/boards/oxocard_artwork/mpconfigboard.h index 3c117dbe10..c7f4dc4a20 100644 --- a/ports/espressif/boards/oxocard_artwork/mpconfigboard.h +++ b/ports/espressif/boards/oxocard_artwork/mpconfigboard.h @@ -34,14 +34,14 @@ // clang-format off #define CIRCUITPY_BOARD_I2C (1) #define CIRCUITPY_BOARD_I2C_PIN { \ - { .scl = &pin_GPIO22, .sda = &pin_GPIO21 }} + { .scl = &pin_GPIO22, .sda = &pin_GPIO21 }} // clang-format on // clang-format off #define CIRCUITPY_BOARD_SPI (2) #define CIRCUITPY_BOARD_SPI_PIN { \ - { .clock = &pin_GPIO14, .mosi = &pin_GPIO13, .miso = &pin_GPIO12 }, \ - { .clock = &pin_GPIO7, .mosi = &pin_GPIO5, .miso = &pin_GPIO8 }} + { .clock = &pin_GPIO14, .mosi = &pin_GPIO13, .miso = &pin_GPIO12 }, \ + { .clock = &pin_GPIO7, .mosi = &pin_GPIO5, .miso = &pin_GPIO8 }} // clang-format on // UART pins attached to the USB-serial converter chip diff --git a/ports/espressif/boards/oxocard_connect/mpconfigboard.h b/ports/espressif/boards/oxocard_connect/mpconfigboard.h index 468d9609fe..136eaad71c 100644 --- a/ports/espressif/boards/oxocard_connect/mpconfigboard.h +++ b/ports/espressif/boards/oxocard_connect/mpconfigboard.h @@ -34,14 +34,14 @@ // clang-format off #define CIRCUITPY_BOARD_I2C (1) #define CIRCUITPY_BOARD_I2C_PIN { \ - { .scl = &pin_GPIO22, .sda = &pin_GPIO21 }} + { .scl = &pin_GPIO22, .sda = &pin_GPIO21 }} // clang-format on // clang-format off #define CIRCUITPY_BOARD_SPI (2) #define CIRCUITPY_BOARD_SPI_PIN { \ - { .clock = &pin_GPIO14, .mosi = &pin_GPIO13, .miso = &pin_GPIO12 }, \ - { .clock = &pin_GPIO7, .mosi = &pin_GPIO5, .miso = &pin_GPIO8 }} + { .clock = &pin_GPIO14, .mosi = &pin_GPIO13, .miso = &pin_GPIO12 }, \ + { .clock = &pin_GPIO7, .mosi = &pin_GPIO5, .miso = &pin_GPIO8 }} // clang-format on // UART pins attached to the USB-serial converter chip diff --git a/ports/espressif/boards/oxocard_galaxy/mpconfigboard.h b/ports/espressif/boards/oxocard_galaxy/mpconfigboard.h index 3b8279902e..b41d0a6621 100644 --- a/ports/espressif/boards/oxocard_galaxy/mpconfigboard.h +++ b/ports/espressif/boards/oxocard_galaxy/mpconfigboard.h @@ -34,14 +34,14 @@ // clang-format off #define CIRCUITPY_BOARD_I2C (1) #define CIRCUITPY_BOARD_I2C_PIN { \ - { .scl = &pin_GPIO22, .sda = &pin_GPIO21 }} + { .scl = &pin_GPIO22, .sda = &pin_GPIO21 }} // clang-format on // clang-format off #define CIRCUITPY_BOARD_SPI (2) #define CIRCUITPY_BOARD_SPI_PIN { \ - { .clock = &pin_GPIO14, .mosi = &pin_GPIO13, .miso = &pin_GPIO12 }, \ - { .clock = &pin_GPIO7, .mosi = &pin_GPIO5, .miso = &pin_GPIO8 }} + { .clock = &pin_GPIO14, .mosi = &pin_GPIO13, .miso = &pin_GPIO12 }, \ + { .clock = &pin_GPIO7, .mosi = &pin_GPIO5, .miso = &pin_GPIO8 }} // clang-format on // UART pins attached to the USB-serial converter chip diff --git a/ports/espressif/boards/oxocard_science/mpconfigboard.h b/ports/espressif/boards/oxocard_science/mpconfigboard.h index 2dc61fcc66..e572a7f61f 100644 --- a/ports/espressif/boards/oxocard_science/mpconfigboard.h +++ b/ports/espressif/boards/oxocard_science/mpconfigboard.h @@ -34,14 +34,14 @@ // clang-format off #define CIRCUITPY_BOARD_I2C (1) #define CIRCUITPY_BOARD_I2C_PIN { \ - { .scl = &pin_GPIO22, .sda = &pin_GPIO21 }} + { .scl = &pin_GPIO22, .sda = &pin_GPIO21 }} // clang-format on // clang-format off #define CIRCUITPY_BOARD_SPI (2) #define CIRCUITPY_BOARD_SPI_PIN { \ - { .clock = &pin_GPIO14, .mosi = &pin_GPIO13, .miso = &pin_GPIO12 }, \ - { .clock = &pin_GPIO7, .mosi = &pin_GPIO5, .miso = &pin_GPIO8 }} + { .clock = &pin_GPIO14, .mosi = &pin_GPIO13, .miso = &pin_GPIO12 }, \ + { .clock = &pin_GPIO7, .mosi = &pin_GPIO5, .miso = &pin_GPIO8 }} // clang-format on // UART pins attached to the USB-serial converter chip