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(); +} }