From 2eca4a53340462995f0abcd1f47e951ab607199c Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Sat, 14 Jan 2023 18:19:38 +0100 Subject: [PATCH] Fixed console mode display rendering on landscape displays --- Display.h | 3 +++ Makefile | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Display.h b/Display.h index 706abe4..392d08d 100644 --- a/Display.h +++ b/Display.h @@ -327,6 +327,9 @@ void update_stat_area() { display.drawBitmap(p_as_x, p_as_y, bm_updating, stat_area.width(), stat_area.height(), SSD1306_BLACK, SSD1306_WHITE); } else if (console_active && device_init_done) { display.drawBitmap(p_as_x, p_as_y, bm_console, stat_area.width(), stat_area.height(), SSD1306_BLACK, SSD1306_WHITE); + if (disp_mode == DISP_MODE_LANDSCAPE) { + display.drawLine(p_as_x, 0, p_as_x, 64, SSD1306_WHITE); + } } } } diff --git a/Makefile b/Makefile index 0f25b12..929a2f4 100644 --- a/Makefile +++ b/Makefile @@ -96,49 +96,49 @@ upload-tbeam: arduino-cli upload -p /dev/ttyUSB1 --fqbn esp32:esp32:t-beam @sleep 1 rnodeconf /dev/ttyUSB1 --firmware-hash $$(./partition_hashes ./build/esp32.esp32.t-beam/RNode_Firmware.ino.bin) - @sleep 1 + @sleep 3 python ./Release/esptool/esptool.py --chip esp32 --port /dev/ttyUSB1 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size 4MB 0x210000 ./Release/console_image.bin upload-lora32_v20: arduino-cli upload -p /dev/ttyUSB1 --fqbn esp32:esp32:ttgo-lora32 @sleep 1 rnodeconf /dev/ttyUSB1 --firmware-hash $$(./partition_hashes ./build/esp32.esp32.ttgo-lora32/RNode_Firmware.ino.bin) - @sleep 1 + @sleep 3 python ./Release/esptool/esptool.py --chip esp32 --port /dev/ttyUSB1 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size 4MB 0x210000 ./Release/console_image.bin upload-lora32_v21: arduino-cli upload -p /dev/ttyACM1 --fqbn esp32:esp32:ttgo-lora32 @sleep 1 rnodeconf /dev/ttyACM1 --firmware-hash $$(./partition_hashes ./build/esp32.esp32.ttgo-lora32/RNode_Firmware.ino.bin) - @sleep 1 + @sleep 3 python ./Release/esptool/esptool.py --chip esp32 --port /dev/ttyACM1 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size 4MB 0x210000 ./Release/console_image.bin upload-heltec32_v2: arduino-cli upload -p /dev/ttyUSB1 --fqbn esp32:esp32:heltec_wifi_lora_32_V2 @sleep 1 rnodeconf /dev/ttyUSB1 --firmware-hash $$(./partition_hashes ./build/esp32.esp32.heltec_wifi_lora_32_V2/RNode_Firmware.ino.bin) - @sleep 1 + @sleep 3 python ./Release/esptool/esptool.py --chip esp32 --port /dev/ttyUSB1 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size 4MB 0x210000 ./Release/console_image.bin upload-rnode_ng_20: arduino-cli upload -p /dev/ttyUSB1 --fqbn esp32:esp32:ttgo-lora32 @sleep 1 rnodeconf /dev/ttyUSB1 --firmware-hash $$(./partition_hashes ./build/esp32.esp32.ttgo-lora32/RNode_Firmware.ino.bin) - @sleep 1 + @sleep 3 python ./Release/esptool/esptool.py --chip esp32 --port /dev/ttyUSB1 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size 4MB 0x210000 ./Release/console_image.bin upload-rnode_ng_21: arduino-cli upload -p /dev/ttyACM1 --fqbn esp32:esp32:ttgo-lora32 @sleep 1 rnodeconf /dev/ttyACM1 --firmware-hash $$(./partition_hashes ./build/esp32.esp32.ttgo-lora32/RNode_Firmware.ino.bin) - @sleep 1 + @sleep 3 python ./Release/esptool/esptool.py --chip esp32 --port /dev/ttyACM1 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size 4MB 0x210000 ./Release/console_image.bin upload-featheresp32: arduino-cli upload -p /dev/ttyUSB1 --fqbn esp32:esp32:featheresp32 @sleep 1 rnodeconf /dev/ttyUSB1 --firmware-hash $$(./partition_hashes ./build/esp32.esp32.featheresp32/RNode_Firmware.ino.bin) - @sleep 1 + @sleep 3 python ./Release/esptool/esptool.py --chip esp32 --port /dev/ttyUSB1 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size 4MB 0x210000 ./Release/console_image.bin