Crash_Override/ESP32_ChinaDieselHeater_Control
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Tidy of animation counts in screen header - was delaying appearance of battery icon

Browse source
This commit is contained in:
Ray Jones 2019-08-03 19:52:37 +10:00
parent 08d0307fc8
commit e5e0f87e0b
5 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Bootload/COM.bat
View file

@ -1,5 +1,5 @@
REM Firmware
esptool.exe --chip esp32 --port COM16 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size detect 0xe000 boot_app0.bin 0x1000 bootloader_qio_80m.bin 0x10000 AfterburnerV3.0.1.bin 0x8000 Afterburner.partitions.bin
esptool.exe --chip esp32 --port COM16 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size detect 0xe000 boot_app0.bin 0x1000 bootloader_qio_80m.bin 0x10000 AfterburnerV3.0.2.bin 0x8000 Afterburner.partitions.bin
REM SPIFFS
esptool.exe --chip esp32 --port COM16 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_size detect 0x3d0000 spiffs.bin

8
platformio.ini
View file

@ -16,10 +16,10 @@ board = esp32dev
framework = arduino
board_build.partitions = min_spiffs.csv
upload_speed = 921600
upload_port = 192.168.20.40
upload_protocol = espota
;upload_port = COM16
;upload_protocol = esptool
;upload_port = 192.168.20.40
;upload_protocol = espota
upload_port = COM16
upload_protocol = esptool
upload_flags =
--port=3232
monitor_speed = 115200

10
src/OLED/ScreenHeader.cpp
View file

@ -76,6 +76,16 @@ CScreenHeader::CScreenHeader(C128x64_OLED& disp, CScreenManager& mgr) : CScreen(
_hdrDetail = false;
}
void
CScreenHeader::onSelect()
{
CScreen::onSelect();
_batteryCount = 255;
_animateCount = 255;
}
bool
CScreenHeader::show(bool erase)
{

1
src/OLED/ScreenHeader.h
View file

@ -59,6 +59,7 @@ public:
CScreenHeader(C128x64_OLED& disp, CScreenManager& mgr);
bool show(bool erase);
bool animate();
void onSelect();
};
#endif // __SCREEN_HEADER_H__

8
src/OLED/VersionInfoScreen.cpp
View file

@ -99,12 +99,12 @@ CVersionInfoScreen::show()
sprintf(msg, "V%.1f", float(PCB)*0.1f);
_printMenuText(41, 38, msg);
if(PCB == 20) {
_printMenuText(108, 38, "Analog", false, eCentreJustify);
_display.drawLine(88, 42, 127, 42, WHITE);
_display.fillRect(70, 36, 57, 11, WHITE);
_printInverted(99, 38, "No Analog", true, eCentreJustify);
}
if(PCB == 22) {
_printMenuText(114, 38, "GPIO", false, eCentreJustify);
_display.drawLine(94, 42, 121, 42, WHITE);
_display.fillRect(82, 36, 45, 11, WHITE);
_printInverted(105, 38, "No GPIO", true, eCentreJustify);
}
if(_rowSel == 1 && newVer) {