diff --git a/ARM_Tag_FW/OpenEPaperLink_esp32_C6_AP/main/Kconfig.projbuild b/ARM_Tag_FW/OpenEPaperLink_esp32_C6_AP/main/Kconfig.projbuild index d6c7c89d..25b79b83 100644 --- a/ARM_Tag_FW/OpenEPaperLink_esp32_C6_AP/main/Kconfig.projbuild +++ b/ARM_Tag_FW/OpenEPaperLink_esp32_C6_AP/main/Kconfig.projbuild @@ -16,6 +16,9 @@ menu "OEPL Hardware config" config OEPL_HARDWARE_PROFILE_LILYGO bool "LILYGO-AP" + config OEPL_HARDWARE_PROFILE_4inch + bool "4inchAP" + endchoice config OEPL_HARDWARE_UART_TX @@ -28,6 +31,16 @@ menu "OEPL Hardware config" int "GPIO - UART RX" default 2 + config OEPL_HARDWARE_UART_TX + depends on OEPL_HARDWARE_PROFILE_4inch + int "GPIO - UART TX" + default 16 + + config OEPL_HARDWARE_UART_RX + depends on OEPL_HARDWARE_PROFILE_4inch + int "GPIO - UART RX" + default 17 + config OEPL_SUBGIG_SUPPORT bool "Enable SubGhz Support" default "n" diff --git a/ESP32_AP-Flasher/platformio.ini b/ESP32_AP-Flasher/platformio.ini index 98981b17..cca638d6 100644 --- a/ESP32_AP-Flasher/platformio.ini +++ b/ESP32_AP-Flasher/platformio.ini @@ -256,12 +256,18 @@ build_flags = -D FLASHER_AP_RESET=1 -D FLASHER_AP_POWER={-1} -D FLASHER_AP_TEST=-1 +; NB: FLASHER_DEBUG_TXD and FLASHER_DEBUG_RXD use the same pins as +; FLASHER_AP_TXD and FLASHER_AP_RXD but the naming convention is different + -D FLASHER_DEBUG_SHARED + -D FLASHER_DEBUG_PORT=1 -D FLASHER_AP_TXD=40 -D FLASHER_AP_RXD=44 - -D FLASHER_DEBUG_TXD=42 - -D FLASHER_DEBUG_RXD=42 + -D FLASHER_DEBUG_TXD=44 + -D FLASHER_DEBUG_RXD=40 -D FLASHER_DEBUG_PROG=2 -D FLASHER_LED=-1 +; In this case we only got one TX Pin and no RX so lets only use that. + -D UART_LOGGING_TX_ONLY_PIN=43 -D TFT_HEIGHT=480 -D USE_HSPI_PORT -D LOAD_FONT2 diff --git a/ESP32_AP-Flasher/src/main.cpp b/ESP32_AP-Flasher/src/main.cpp index e123f13d..763fd285 100644 --- a/ESP32_AP-Flasher/src/main.cpp +++ b/ESP32_AP-Flasher/src/main.cpp @@ -48,7 +48,12 @@ void delayedStart(void* parameter) { } void setup() { +#ifdef UART_LOGGING_TX_ONLY_PIN + Serial.begin(115200, SERIAL_8N1, -1, UART_LOGGING_TX_ONLY_PIN); + gpio_set_drive_capability((gpio_num_t)FLASHER_AP_RXD, GPIO_DRIVE_CAP_0); +#else Serial.begin(115200); +#endif #if ARDUINO_USB_CDC_ON_BOOT == 1 Serial.setTxTimeoutMs(0); // workaround bug in USB CDC that slows down serial output when no usb connected #endif diff --git a/binaries/ESP32-C6/OpenEPaperLink_esp32_C6_Uart0.bin b/binaries/ESP32-C6/OpenEPaperLink_esp32_C6_Uart0.bin new file mode 100644 index 00000000..423f1541 Binary files /dev/null and b/binaries/ESP32-C6/OpenEPaperLink_esp32_C6_Uart0.bin differ