From c54bf09845b6fa66145fec64cd91c6c718efb0ba Mon Sep 17 00:00:00 2001 From: Xylopyrographer Date: Sat, 24 Aug 2024 11:49:27 -0600 Subject: [PATCH 1/4] Add ESP32-2432S028R dev board Add support for the ESP32-2432S028R, aka Cheap Yellow Display (CYD) dev board. --- boards.txt | 166 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 166 insertions(+) diff --git a/boards.txt b/boards.txt index 7ea34347dfe..4b79c861bd6 100644 --- a/boards.txt +++ b/boards.txt @@ -40398,3 +40398,169 @@ codecell.menu.EraseFlash.all=Enabled codecell.menu.EraseFlash.all.upload.erase_cmd=-e ############################################################## + +jczn_2432s028r.name=ESP32-2432S028R CYD + +jczn_2432s028r.bootloader.tool=esptool_py +jczn_2432s028r.bootloader.tool.default=esptool_py + +jczn_2432s028r.upload.tool=esptool_py +jczn_2432s028r.upload.tool.default=esptool_py +jczn_2432s028r.upload.tool.network=esp_ota + +jczn_2432s028r.upload.maximum_size=1310720 +jczn_2432s028r.upload.maximum_data_size=327680 +jczn_2432s028r.upload.flags= +jczn_2432s028r.upload.extra_flags= + +jczn_2432s028r.serial.disableDTR=true +jczn_2432s028r.serial.disableRTS=true + +jczn_2432s028r.build.tarch=xtensa +jczn_2432s028r.build.bootloader_addr=0x1000 +jczn_2432s028r.build.target=esp32 +jczn_2432s028r.build.mcu=esp32 +jczn_2432s028r.build.core=esp32 +jczn_2432s028r.build.variant=jczn_2432s028r +jczn_2432s028r.build.board=ESP32_2432S028R + +jczn_2432s028r.build.f_cpu=240000000L +jczn_2432s028r.build.flash_size=4MB +jczn_2432s028r.build.flash_freq=40m +jczn_2432s028r.build.flash_mode=dio +jczn_2432s028r.build.boot=dio +jczn_2432s028r.build.partitions=default +jczn_2432s028r.build.defines= +jczn_2432s028r.build.loop_core= +jczn_2432s028r.build.event_core= + +## IDE 2.0 Seems to not update the value +jczn_2432s028r.menu.JTAGAdapter.default=Disabled +jczn_2432s028r.menu.JTAGAdapter.default.build.copy_jtag_files=0 +jczn_2432s028r.menu.JTAGAdapter.external=FTDI Adapter +jczn_2432s028r.menu.JTAGAdapter.external.build.openocdscript=esp32-wrover-kit-3.3v.cfg +jczn_2432s028r.menu.JTAGAdapter.external.build.copy_jtag_files=1 +jczn_2432s028r.menu.JTAGAdapter.bridge=ESP USB Bridge +jczn_2432s028r.menu.JTAGAdapter.bridge.build.openocdscript=esp32-bridge.cfg +jczn_2432s028r.menu.JTAGAdapter.bridge.build.copy_jtag_files=1 + +jczn_2432s028r.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS) +jczn_2432s028r.menu.PartitionScheme.default.build.partitions=default +jczn_2432s028r.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS) +jczn_2432s028r.menu.PartitionScheme.defaultffat.build.partitions=default_ffat +jczn_2432s028r.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS) +jczn_2432s028r.menu.PartitionScheme.no_ota.build.partitions=no_ota +jczn_2432s028r.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 +jczn_2432s028r.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS) +jczn_2432s028r.menu.PartitionScheme.noota_3g.build.partitions=noota_3g +jczn_2432s028r.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576 +jczn_2432s028r.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS) +jczn_2432s028r.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat +jczn_2432s028r.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152 +jczn_2432s028r.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS) +jczn_2432s028r.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat +jczn_2432s028r.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576 +jczn_2432s028r.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS) +jczn_2432s028r.menu.PartitionScheme.huge_app.build.partitions=huge_app +jczn_2432s028r.menu.PartitionScheme.huge_app.upload.maximum_size=3145728 +jczn_2432s028r.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS) +jczn_2432s028r.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs +jczn_2432s028r.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 +jczn_2432s028r.menu.PartitionScheme.rainmaker=RainMaker 4MB +jczn_2432s028r.menu.PartitionScheme.rainmaker.build.partitions=rainmaker +jczn_2432s028r.menu.PartitionScheme.rainmaker.upload.maximum_size=1966080 +jczn_2432s028r.menu.PartitionScheme.rainmaker_4MB=RainMaker 4MB No OTA +jczn_2432s028r.menu.PartitionScheme.rainmaker_4MB.build.partitions=rainmaker_4MB_no_ota +jczn_2432s028r.menu.PartitionScheme.rainmaker_4MB.upload.maximum_size=4038656 +jczn_2432s028r.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs +jczn_2432s028r.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr +jczn_2432s028r.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720 + +jczn_2432s028r.menu.PartitionScheme.otanofs=OTA no FS (2MB APP with OTA) +jczn_2432s028r.menu.PartitionScheme.otanofs.build.custom_partitions=partitions_otanofs_4MB +jczn_2432s028r.menu.PartitionScheme.otanofs.upload.maximum_size=2031616 +jczn_2432s028r.menu.PartitionScheme.all_app=Max APP (4MB APP no OTA) +jczn_2432s028r.menu.PartitionScheme.all_app.build.custom_partitions=partitions_all_app_4MB +jczn_2432s028r.menu.PartitionScheme.all_app.upload.maximum_size=4128768 + +jczn_2432s028r.menu.PartitionScheme.custom=Custom +jczn_2432s028r.menu.PartitionScheme.custom.build.partitions= +jczn_2432s028r.menu.PartitionScheme.custom.upload.maximum_size=4128768 + +jczn_2432s028r.menu.CPUFreq.240=240MHz (WiFi/BT) +jczn_2432s028r.menu.CPUFreq.240.build.f_cpu=240000000L +jczn_2432s028r.menu.CPUFreq.160=160MHz (WiFi/BT) +jczn_2432s028r.menu.CPUFreq.160.build.f_cpu=160000000L +jczn_2432s028r.menu.CPUFreq.80=80MHz (WiFi/BT) +jczn_2432s028r.menu.CPUFreq.80.build.f_cpu=80000000L +jczn_2432s028r.menu.CPUFreq.40=40MHz +jczn_2432s028r.menu.CPUFreq.40.build.f_cpu=40000000L +jczn_2432s028r.menu.CPUFreq.20=20MHz +jczn_2432s028r.menu.CPUFreq.20.build.f_cpu=20000000L +jczn_2432s028r.menu.CPUFreq.10=10MHz +jczn_2432s028r.menu.CPUFreq.10.build.f_cpu=10000000L + +jczn_2432s028r.menu.FlashMode.qio=QIO +jczn_2432s028r.menu.FlashMode.qio.build.flash_mode=dio +jczn_2432s028r.menu.FlashMode.qio.build.boot=qio + +jczn_2432s028r.menu.FlashFreq.80=80MHz +jczn_2432s028r.menu.FlashFreq.80.build.flash_freq=80m +jczn_2432s028r.menu.FlashFreq.40=40MHz +jczn_2432s028r.menu.FlashFreq.40.build.flash_freq=40m + +jczn_2432s028r.menu.FlashSize.4M=4MB +jczn_2432s028r.menu.FlashSize.4M.build.flash_size=4MB + +jczn_2432s028r.menu.UploadSpeed.921600=921600 +jczn_2432s028r.menu.UploadSpeed.921600.upload.speed=921600 +jczn_2432s028r.menu.UploadSpeed.115200=115200 +jczn_2432s028r.menu.UploadSpeed.115200.upload.speed=115200 +jczn_2432s028r.menu.UploadSpeed.256000.windows=256000 +jczn_2432s028r.menu.UploadSpeed.256000.upload.speed=256000 +jczn_2432s028r.menu.UploadSpeed.230400.windows.upload.speed=256000 +jczn_2432s028r.menu.UploadSpeed.230400=230400 +jczn_2432s028r.menu.UploadSpeed.230400.upload.speed=230400 +jczn_2432s028r.menu.UploadSpeed.460800.linux=460800 +jczn_2432s028r.menu.UploadSpeed.460800.macosx=460800 +jczn_2432s028r.menu.UploadSpeed.460800.upload.speed=460800 +jczn_2432s028r.menu.UploadSpeed.512000.windows=512000 +jczn_2432s028r.menu.UploadSpeed.512000.upload.speed=512000 + +jczn_2432s028r.menu.LoopCore.1=Core 1 +jczn_2432s028r.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1 +jczn_2432s028r.menu.LoopCore.0=Core 0 +jczn_2432s028r.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0 + +jczn_2432s028r.menu.EventsCore.1=Core 1 +jczn_2432s028r.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1 +jczn_2432s028r.menu.EventsCore.0=Core 0 +jczn_2432s028r.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0 + +jczn_2432s028r.menu.DebugLevel.none=None +jczn_2432s028r.menu.DebugLevel.none.build.code_debug=0 +jczn_2432s028r.menu.DebugLevel.error=Error +jczn_2432s028r.menu.DebugLevel.error.build.code_debug=1 +jczn_2432s028r.menu.DebugLevel.warn=Warn +jczn_2432s028r.menu.DebugLevel.warn.build.code_debug=2 +jczn_2432s028r.menu.DebugLevel.info=Info +jczn_2432s028r.menu.DebugLevel.info.build.code_debug=3 +jczn_2432s028r.menu.DebugLevel.debug=Debug +jczn_2432s028r.menu.DebugLevel.debug.build.code_debug=4 +jczn_2432s028r.menu.DebugLevel.verbose=Verbose +jczn_2432s028r.menu.DebugLevel.verbose.build.code_debug=5 + +jczn_2432s028r.menu.EraseFlash.none=Disabled +jczn_2432s028r.menu.EraseFlash.none.upload.erase_cmd= +jczn_2432s028r.menu.EraseFlash.all=Enabled +jczn_2432s028r.menu.EraseFlash.all.upload.erase_cmd=-e + +jczn_2432s028r.menu.ZigbeeMode.default=Disabled +jczn_2432s028r.menu.ZigbeeMode.default.build.zigbee_mode= +jczn_2432s028r.menu.ZigbeeMode.default.build.zigbee_libs= +jczn_2432s028r.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator) +jczn_2432s028r.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR +jczn_2432s028r.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr -lzboss_port + +############################################################## + From 44b35d55e6403551d8ad7fa684830c2ce605e2b9 Mon Sep 17 00:00:00 2001 From: Xylopyrographer Date: Sat, 24 Aug 2024 11:51:53 -0600 Subject: [PATCH 2/4] Add ESP32-2432S028R variant Add ESP32-2432S028R, aka Cheap Yellow Display (CYD) variant --- .../jczn_2432s028r/partitions_all_app_4MB.csv | 4 + .../jczn_2432s028r/partitions_otanofs_4MB.csv | 6 ++ variants/jczn_2432s028r/pins_arduino.h | 85 +++++++++++++++++++ variants/jczn_2432s028r/variant.cpp | 13 +++ 4 files changed, 108 insertions(+) create mode 100644 variants/jczn_2432s028r/partitions_all_app_4MB.csv create mode 100644 variants/jczn_2432s028r/partitions_otanofs_4MB.csv create mode 100644 variants/jczn_2432s028r/pins_arduino.h create mode 100644 variants/jczn_2432s028r/variant.cpp diff --git a/variants/jczn_2432s028r/partitions_all_app_4MB.csv b/variants/jczn_2432s028r/partitions_all_app_4MB.csv new file mode 100644 index 00000000000..33b811aa7b2 --- /dev/null +++ b/variants/jczn_2432s028r/partitions_all_app_4MB.csv @@ -0,0 +1,4 @@ +# Name, Type, SubType, Offset, Size, Flags +nvs, data, nvs, 0x9000, 0x5000, +factory, app, factory, 0x10000, 0x3F0000, + diff --git a/variants/jczn_2432s028r/partitions_otanofs_4MB.csv b/variants/jczn_2432s028r/partitions_otanofs_4MB.csv new file mode 100644 index 00000000000..04240badb49 --- /dev/null +++ b/variants/jczn_2432s028r/partitions_otanofs_4MB.csv @@ -0,0 +1,6 @@ +# Name, Type, SubType, Offset, Size, Flags + nvs, data, nvs, 0x9000, 0x5000, + otadata, data, ota, 0xE000, 0x2000, + app0, app, ota_0, 0x10000, 0x1F0000, + app1, app, ota_1, 0x200000, 0x1F0000, +coredump, data, coredump, 0x3F0000, 0x10000, diff --git a/variants/jczn_2432s028r/pins_arduino.h b/variants/jczn_2432s028r/pins_arduino.h new file mode 100644 index 00000000000..35b816efa34 --- /dev/null +++ b/variants/jczn_2432s028r/pins_arduino.h @@ -0,0 +1,85 @@ + +#ifndef Pins_Arduino_h +#define Pins_Arduino_h + +#include +#include "soc/soc_caps.h" + +static const uint8_t TX = 1; +static const uint8_t RX = 3; + +static const uint8_t D35 = 35; +static const uint8_t D22 = 22; +static const uint8_t D27 = 27; +static const uint8_t D21 = 21; + +static const uint8_t A6 = 34; +static const uint8_t A17 = 27; + +static const uint8_t T7 = 27; + +static const uint8_t SDA = 21; +static const uint8_t SCL = 22; + +static const uint8_t SS = 5; +static const uint8_t MOSI = 23; +static const uint8_t MISO = 19; +static const uint8_t SCK = 18; + +#define CYD_TP_IRQ 36 +#define CYD_TP_MOSI 32 +#define CYD_TP_MISO 39 +#define CYD_TP_CLK 25 +#define CYD_TP_CS 33 +#define CYD_TP_DIN CYD_TP_MOSI +#define CYD_TP_OUT CYD_TP_MOSI +#define CYD_TP_SPI_BUS VSPI + +#define CYD_TFT_DC 2 +#define CYD_TFT_MISO 12 +#define CYD_TFT_MOSI 13 +#define CYD_TFT_SCK 14 +#define CYD_TFT_CS 15 +#define CYD_TFT_RS CYD_TFT_DC +#define CYD_TFT_SDO CYD_TFT_MISO +#define CYD_TFT_SDI CYD_TFT_MOSI +#define CYD_TFT_SPI_BUS HSPI + +#define CYD_TFT_WIDTH 320 +#define CYD_TFT_HEIGHT 240 +#define CYD_SCREEN_WIDTH CYD_TFT_WIDTH +#define CYD_SCREEN_HEIGHT CYD_TFT_HEIGHT + +#define CYD_TFT_BL 21 +#define CYD_TFT_BL_ENABLE ( ( pinMode( CYD_TFT_BL, OUTPUT ) ) ) +#define CYD_TFT_BL_OFF ( digitalWrite( CYD_TFT_BL, 0 ) ) +#define CYD_TFT_BL_ON ( digitalWrite( CYD_TFT_BL, 1 ) ) + +#define CYD_LED_RED 4 +#define CYD_LED_GREEN 16 +#define CYD_LED_BLUE 17 + +#define CYD_AUDIO_OUT 26 + +#define CYD_USER_BUTTON 0 + +#define CYD_SD_SS 5 +#define CYD_SD_MOSI 23 +#define CYD_SD_MISO 19 +#define CYD_SD_SCK 18 +#define CYD_SD_SPI_BUS VSPI + +#define CYD_LDR 34 + +#define CYD_LED_RED_OFF ( digitalWrite( CYD_LED_RED, 1 ) ) +#define CYD_LED_RED_ON ( digitalWrite( CYD_LED_RED, 0 ) ) +#define CYD_LED_GREEN_OFF ( digitalWrite( CYD_LED_GREEN, 1 ) ) +#define CYD_LED_GREEN_ON ( digitalWrite( CYD_LED_GREEN, 0 ) ) +#define CYD_LED_BLUE_OFF ( digitalWrite( CYD_LED_BLUE, 1 ) ) +#define CYD_LED_BLUE_ON ( digitalWrite( CYD_LED_BLUE, 0 ) ) +#define CYD_LED_RGB_OFF CYD_LED_RED_OFF; CYD_LED_GREEN_OFF; CYD_LED_BLUE_OFF +#define CYD_LED_RGB_ON CYD_LED_RED_ON; CYD_LED_GREEN_ON; CYD_LED_BLUE_ON +#define CYD_LED_WHITE_OFF CYD_LED_RGB_OFF +#define CYD_LED_WHITE_ON CYD_LED_RGB_ON + +#endif /* Pins_Arduino_h */ diff --git a/variants/jczn_2432s028r/variant.cpp b/variants/jczn_2432s028r/variant.cpp new file mode 100644 index 00000000000..21a979d44cf --- /dev/null +++ b/variants/jczn_2432s028r/variant.cpp @@ -0,0 +1,13 @@ + +#include "esp32-hal-gpio.h" +#include "pins_arduino.h" + +extern "C" { + // Initialize variant/board, called before setup() + void initVariant( void ) { + pinMode( CYD_LED_RED, OUTPUT ); + pinMode( CYD_LED_GREEN, OUTPUT ); + pinMode( CYD_LED_BLUE, OUTPUT ); + CYD_LED_RGB_OFF; + } +} From 4a8871821aa4e640e59058b722e850b28a74aba0 Mon Sep 17 00:00:00 2001 From: Xylopyrographer Date: Sun, 25 Aug 2024 14:15:26 -0600 Subject: [PATCH 3/4] Revise macro defined function names Append brackets to all macro defined function names --- variants/jczn_2432s028r/pins_arduino.h | 28 +++++++++++++------------- variants/jczn_2432s028r/variant.cpp | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/variants/jczn_2432s028r/pins_arduino.h b/variants/jczn_2432s028r/pins_arduino.h index 35b816efa34..2a98957212c 100644 --- a/variants/jczn_2432s028r/pins_arduino.h +++ b/variants/jczn_2432s028r/pins_arduino.h @@ -50,10 +50,10 @@ static const uint8_t SCK = 18; #define CYD_SCREEN_WIDTH CYD_TFT_WIDTH #define CYD_SCREEN_HEIGHT CYD_TFT_HEIGHT -#define CYD_TFT_BL 21 -#define CYD_TFT_BL_ENABLE ( ( pinMode( CYD_TFT_BL, OUTPUT ) ) ) -#define CYD_TFT_BL_OFF ( digitalWrite( CYD_TFT_BL, 0 ) ) -#define CYD_TFT_BL_ON ( digitalWrite( CYD_TFT_BL, 1 ) ) +#define CYD_TFT_BL 21 +#define CYD_TFT_BL_ENABLE() ( ( pinMode( CYD_TFT_BL, OUTPUT ) ) ) +#define CYD_TFT_BL_OFF() ( digitalWrite( CYD_TFT_BL, 0 ) ) +#define CYD_TFT_BL_ON() ( digitalWrite( CYD_TFT_BL, 1 ) ) #define CYD_LED_RED 4 #define CYD_LED_GREEN 16 @@ -71,15 +71,15 @@ static const uint8_t SCK = 18; #define CYD_LDR 34 -#define CYD_LED_RED_OFF ( digitalWrite( CYD_LED_RED, 1 ) ) -#define CYD_LED_RED_ON ( digitalWrite( CYD_LED_RED, 0 ) ) -#define CYD_LED_GREEN_OFF ( digitalWrite( CYD_LED_GREEN, 1 ) ) -#define CYD_LED_GREEN_ON ( digitalWrite( CYD_LED_GREEN, 0 ) ) -#define CYD_LED_BLUE_OFF ( digitalWrite( CYD_LED_BLUE, 1 ) ) -#define CYD_LED_BLUE_ON ( digitalWrite( CYD_LED_BLUE, 0 ) ) -#define CYD_LED_RGB_OFF CYD_LED_RED_OFF; CYD_LED_GREEN_OFF; CYD_LED_BLUE_OFF -#define CYD_LED_RGB_ON CYD_LED_RED_ON; CYD_LED_GREEN_ON; CYD_LED_BLUE_ON -#define CYD_LED_WHITE_OFF CYD_LED_RGB_OFF -#define CYD_LED_WHITE_ON CYD_LED_RGB_ON +#define CYD_LED_RED_OFF() ( digitalWrite( CYD_LED_RED, 1 ) ) +#define CYD_LED_RED_ON() ( digitalWrite( CYD_LED_RED, 0 ) ) +#define CYD_LED_GREEN_OFF() ( digitalWrite( CYD_LED_GREEN, 1 ) ) +#define CYD_LED_GREEN_ON() ( digitalWrite( CYD_LED_GREEN, 0 ) ) +#define CYD_LED_BLUE_OFF() ( digitalWrite( CYD_LED_BLUE, 1 ) ) +#define CYD_LED_BLUE_ON() ( digitalWrite( CYD_LED_BLUE, 0 ) ) +#define CYD_LED_RGB_OFF() CYD_LED_RED_OFF(); CYD_LED_GREEN_OFF(); CYD_LED_BLUE_OFF() +#define CYD_LED_RGB_ON() CYD_LED_RED_ON(); CYD_LED_GREEN_ON(); CYD_LED_BLUE_ON() +#define CYD_LED_WHITE_OFF() CYD_LED_RGB_OFF() +#define CYD_LED_WHITE_ON() CYD_LED_RGB_ON() #endif /* Pins_Arduino_h */ diff --git a/variants/jczn_2432s028r/variant.cpp b/variants/jczn_2432s028r/variant.cpp index 21a979d44cf..ae000340564 100644 --- a/variants/jczn_2432s028r/variant.cpp +++ b/variants/jczn_2432s028r/variant.cpp @@ -8,6 +8,6 @@ extern "C" { pinMode( CYD_LED_RED, OUTPUT ); pinMode( CYD_LED_GREEN, OUTPUT ); pinMode( CYD_LED_BLUE, OUTPUT ); - CYD_LED_RGB_OFF; + CYD_LED_RGB_OFF(); } } From 039bae3e0c6df739021b6c43aecd6977ed85d68e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci-lite[bot]" <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 06:39:56 +0000 Subject: [PATCH 4/4] ci(pre-commit): Apply automatic fixes --- boards.txt | 1 - .../jczn_2432s028r/partitions_all_app_4MB.csv | 1 - variants/jczn_2432s028r/pins_arduino.h | 104 +++++++++--------- variants/jczn_2432s028r/variant.cpp | 14 +-- 4 files changed, 62 insertions(+), 58 deletions(-) diff --git a/boards.txt b/boards.txt index 4b79c861bd6..1fccb35d206 100644 --- a/boards.txt +++ b/boards.txt @@ -40563,4 +40563,3 @@ jczn_2432s028r.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR jczn_2432s028r.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr -lzboss_port ############################################################## - diff --git a/variants/jczn_2432s028r/partitions_all_app_4MB.csv b/variants/jczn_2432s028r/partitions_all_app_4MB.csv index 33b811aa7b2..25eeb8c7d47 100644 --- a/variants/jczn_2432s028r/partitions_all_app_4MB.csv +++ b/variants/jczn_2432s028r/partitions_all_app_4MB.csv @@ -1,4 +1,3 @@ # Name, Type, SubType, Offset, Size, Flags nvs, data, nvs, 0x9000, 0x5000, factory, app, factory, 0x10000, 0x3F0000, - diff --git a/variants/jczn_2432s028r/pins_arduino.h b/variants/jczn_2432s028r/pins_arduino.h index 2a98957212c..ba10d0f1fd4 100644 --- a/variants/jczn_2432s028r/pins_arduino.h +++ b/variants/jczn_2432s028r/pins_arduino.h @@ -13,7 +13,7 @@ static const uint8_t D22 = 22; static const uint8_t D27 = 27; static const uint8_t D21 = 21; -static const uint8_t A6 = 34; +static const uint8_t A6 = 34; static const uint8_t A17 = 27; static const uint8_t T7 = 27; @@ -21,65 +21,71 @@ static const uint8_t T7 = 27; static const uint8_t SDA = 21; static const uint8_t SCL = 22; -static const uint8_t SS = 5; +static const uint8_t SS = 5; static const uint8_t MOSI = 23; static const uint8_t MISO = 19; -static const uint8_t SCK = 18; - -#define CYD_TP_IRQ 36 -#define CYD_TP_MOSI 32 -#define CYD_TP_MISO 39 -#define CYD_TP_CLK 25 -#define CYD_TP_CS 33 -#define CYD_TP_DIN CYD_TP_MOSI -#define CYD_TP_OUT CYD_TP_MOSI -#define CYD_TP_SPI_BUS VSPI - -#define CYD_TFT_DC 2 -#define CYD_TFT_MISO 12 -#define CYD_TFT_MOSI 13 -#define CYD_TFT_SCK 14 -#define CYD_TFT_CS 15 -#define CYD_TFT_RS CYD_TFT_DC -#define CYD_TFT_SDO CYD_TFT_MISO -#define CYD_TFT_SDI CYD_TFT_MOSI -#define CYD_TFT_SPI_BUS HSPI +static const uint8_t SCK = 18; + +#define CYD_TP_IRQ 36 +#define CYD_TP_MOSI 32 +#define CYD_TP_MISO 39 +#define CYD_TP_CLK 25 +#define CYD_TP_CS 33 +#define CYD_TP_DIN CYD_TP_MOSI +#define CYD_TP_OUT CYD_TP_MOSI +#define CYD_TP_SPI_BUS VSPI + +#define CYD_TFT_DC 2 +#define CYD_TFT_MISO 12 +#define CYD_TFT_MOSI 13 +#define CYD_TFT_SCK 14 +#define CYD_TFT_CS 15 +#define CYD_TFT_RS CYD_TFT_DC +#define CYD_TFT_SDO CYD_TFT_MISO +#define CYD_TFT_SDI CYD_TFT_MOSI +#define CYD_TFT_SPI_BUS HSPI #define CYD_TFT_WIDTH 320 #define CYD_TFT_HEIGHT 240 #define CYD_SCREEN_WIDTH CYD_TFT_WIDTH #define CYD_SCREEN_HEIGHT CYD_TFT_HEIGHT -#define CYD_TFT_BL 21 -#define CYD_TFT_BL_ENABLE() ( ( pinMode( CYD_TFT_BL, OUTPUT ) ) ) -#define CYD_TFT_BL_OFF() ( digitalWrite( CYD_TFT_BL, 0 ) ) -#define CYD_TFT_BL_ON() ( digitalWrite( CYD_TFT_BL, 1 ) ) +#define CYD_TFT_BL 21 +#define CYD_TFT_BL_ENABLE() ((pinMode(CYD_TFT_BL, OUTPUT))) +#define CYD_TFT_BL_OFF() (digitalWrite(CYD_TFT_BL, 0)) +#define CYD_TFT_BL_ON() (digitalWrite(CYD_TFT_BL, 1)) -#define CYD_LED_RED 4 +#define CYD_LED_RED 4 #define CYD_LED_GREEN 16 #define CYD_LED_BLUE 17 -#define CYD_AUDIO_OUT 26 - -#define CYD_USER_BUTTON 0 - -#define CYD_SD_SS 5 -#define CYD_SD_MOSI 23 -#define CYD_SD_MISO 19 -#define CYD_SD_SCK 18 -#define CYD_SD_SPI_BUS VSPI - -#define CYD_LDR 34 - -#define CYD_LED_RED_OFF() ( digitalWrite( CYD_LED_RED, 1 ) ) -#define CYD_LED_RED_ON() ( digitalWrite( CYD_LED_RED, 0 ) ) -#define CYD_LED_GREEN_OFF() ( digitalWrite( CYD_LED_GREEN, 1 ) ) -#define CYD_LED_GREEN_ON() ( digitalWrite( CYD_LED_GREEN, 0 ) ) -#define CYD_LED_BLUE_OFF() ( digitalWrite( CYD_LED_BLUE, 1 ) ) -#define CYD_LED_BLUE_ON() ( digitalWrite( CYD_LED_BLUE, 0 ) ) -#define CYD_LED_RGB_OFF() CYD_LED_RED_OFF(); CYD_LED_GREEN_OFF(); CYD_LED_BLUE_OFF() -#define CYD_LED_RGB_ON() CYD_LED_RED_ON(); CYD_LED_GREEN_ON(); CYD_LED_BLUE_ON() -#define CYD_LED_WHITE_OFF() CYD_LED_RGB_OFF() -#define CYD_LED_WHITE_ON() CYD_LED_RGB_ON() +#define CYD_AUDIO_OUT 26 + +#define CYD_USER_BUTTON 0 + +#define CYD_SD_SS 5 +#define CYD_SD_MOSI 23 +#define CYD_SD_MISO 19 +#define CYD_SD_SCK 18 +#define CYD_SD_SPI_BUS VSPI + +#define CYD_LDR 34 + +#define CYD_LED_RED_OFF() (digitalWrite(CYD_LED_RED, 1)) +#define CYD_LED_RED_ON() (digitalWrite(CYD_LED_RED, 0)) +#define CYD_LED_GREEN_OFF() (digitalWrite(CYD_LED_GREEN, 1)) +#define CYD_LED_GREEN_ON() (digitalWrite(CYD_LED_GREEN, 0)) +#define CYD_LED_BLUE_OFF() (digitalWrite(CYD_LED_BLUE, 1)) +#define CYD_LED_BLUE_ON() (digitalWrite(CYD_LED_BLUE, 0)) +#define CYD_LED_RGB_OFF() \ + CYD_LED_RED_OFF(); \ + CYD_LED_GREEN_OFF(); \ + CYD_LED_BLUE_OFF() +#define CYD_LED_RGB_ON() \ + CYD_LED_RED_ON(); \ + CYD_LED_GREEN_ON(); \ + CYD_LED_BLUE_ON() +#define CYD_LED_WHITE_OFF() CYD_LED_RGB_OFF() +#define CYD_LED_WHITE_ON() CYD_LED_RGB_ON() #endif /* Pins_Arduino_h */ diff --git a/variants/jczn_2432s028r/variant.cpp b/variants/jczn_2432s028r/variant.cpp index ae000340564..a56fc4c190e 100644 --- a/variants/jczn_2432s028r/variant.cpp +++ b/variants/jczn_2432s028r/variant.cpp @@ -3,11 +3,11 @@ #include "pins_arduino.h" extern "C" { - // Initialize variant/board, called before setup() - void initVariant( void ) { - pinMode( CYD_LED_RED, OUTPUT ); - pinMode( CYD_LED_GREEN, OUTPUT ); - pinMode( CYD_LED_BLUE, OUTPUT ); - CYD_LED_RGB_OFF(); - } +// Initialize variant/board, called before setup() +void initVariant(void) { + pinMode(CYD_LED_RED, OUTPUT); + pinMode(CYD_LED_GREEN, OUTPUT); + pinMode(CYD_LED_BLUE, OUTPUT); + CYD_LED_RGB_OFF(); +} }