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

Added thermo/fixed toggle to detailed menu. Fixed reversed direction in timer menu. HTML fixes.

Browse source
This commit is contained in:
rljonesau 2019-01-24 06:03:29 +11:00
parent 0a1226a03c
commit e4773a081b
4 changed files with 58 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Arduino/BTCDieselHeater/data/index.html
View file

@ -2,9 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8"/>
<!-- <link rel="icon" href="favicon.ico" type="image/x-icon" /> -->
<title>Chinese Diesel Heater Web Controller Interface</title>
<!-- <link rel="icon" href="data;,"> -->
<script>
var Socket;
@ -417,8 +415,8 @@ display: none
</style>
<title>Chinese Diesel Heater Web Controller Interface</title>
</head>
<body onload="javascript:init()">
<div class="mobile-container">
@ -430,7 +428,9 @@ display: none
<a href="javascript:void(0);" onclick="funcdispSettings()">Settings</a>
<a href="javascript:void(0);" onclick="funcdispAdvanced()">Advanced Settings</a>
</div>
<a href="javascript:void(0);" class="icon" onclick="funcNavLinks()">=</a>
<a href="javascript:void(0);" class="icon" onclick="funcNavLinks()">
</i>=
</a>
</div>
<div style="padding-left:16px">
<span class="MaingPage" id="Home">

35
Arduino/BTCDieselHeater/src/OLED/DetailedScreen.cpp
View file

@ -178,18 +178,6 @@ CDetailedScreen::keyHandler(uint8_t event)
if(event & key_Right) {
_ScreenManager.nextScreen();
}
if(event & key_Up) {
if(reqTempDelta(+1))
_showTarget = millis() + 3500;
else
_reqOEMWarning();
}
if(event & key_Down) {
if(reqTempDelta(-1))
_showTarget = millis() + 3500;
else
_reqOEMWarning();
}
}
// require hold to turn ON or OFF
if(event & keyRepeat) {
@ -204,17 +192,38 @@ CDetailedScreen::keyHandler(uint8_t event)
}
else {
if(_keyRepeatCount > 3) {
_keyRepeatCount = -1;
_keyRepeatCount = -1; // prevent double handling
requestOn();
}
}
}
if(event & key_Down) {
if(_keyRepeatCount > 1) { // held Down - togle thermo/fixed mode
_keyRepeatCount = -1; // prevent double handling
if(reqThermoToggle()) _showTarget = millis() + 3500;
else _reqOEMWarning();
}
}
}
}
// release event
if(event & keyReleased) {
if(_keyRepeatCount == 0) { // short Up press - lower target
if(event & key_Up) {
if(reqTempDelta(+1)) _showTarget = millis() + 3500;
else _reqOEMWarning();
}
if(event & key_Down) { // short Down press - lower target
if(reqTempDelta(-1)) _showTarget = millis() + 3500;
else _reqOEMWarning();
}
if(event & key_Centre) { // short Centre press - show target
_showTarget = millis() + 3500;
}
}
_keyRepeatCount = -1;
}
return true;
}

46
Arduino/BTCDieselHeater/src/OLED/SetTimerScreen.cpp
View file

@ -136,6 +136,7 @@ CSetTimerScreen::keyHandler(uint8_t event)
}
else if(_rowSel == 2) { // exit from per day settings
_rowSel = 1;
_colSel = 4;
}
else { // in config fields, save new settings
_SaveTime = millis() + 1500;
@ -175,16 +176,28 @@ CSetTimerScreen::keyHandler(uint8_t event)
}
// press UP
if(event & key_Up) {
if(_rowSel == 1) {
_colSel++;
ROLLUPPERLIMIT(_colSel, 5, 0);
switch(_rowSel) {
case 0:
_rowSel = 1;
_colSel = 5;
break;
case 1:
_colSel--;
ROLLLOWERLIMIT(_colSel, 0, 5);
break;
}
}
// press DOWN
if(event & key_Down) {
if(_rowSel == 1) {
_colSel--;
ROLLLOWERLIMIT(_colSel, 0, 5);
switch(_rowSel) {
case 0:
_rowSel = 1;
_colSel = 0;
break;
case 1:
_colSel++;
ROLLUPPERLIMIT(_colSel, 5, 0);
break;
}
}
}
@ -206,10 +219,10 @@ CSetTimerScreen::keyHandler(uint8_t event)
}
}
if(_rowSel==2) {
if(event & key_Down) {
/* if(event & key_Right) {
_rowSel = 1;
_colSel = 4;
}
}*/
}
}
@ -229,9 +242,10 @@ CSetTimerScreen::keyHandler(uint8_t event)
if(event & key_Down) {
// adjust selected item
switch(_rowSel) {
// case 1:
// adjust(-1);
// break;
/* case 0:
_rowSel = 1;
_colSel = 0;
break;*/
case 2:
// adjust selected item
_timer.enabled ^= maskDOW;
@ -250,15 +264,11 @@ CSetTimerScreen::keyHandler(uint8_t event)
// released UP
if(event & key_Up) {
switch(_rowSel) {
case 0:
/* case 0:
// move from screen navigation to field select & adjust
_rowSel = 1;
_colSel = 0;
break;
// case 1:
// // adjust selected item
// adjust(+1);
// break;
_colSel = 5;
break;*/
case 2:
// adjust selected item
_timer.enabled ^= maskDOW;

5
Arduino/BTCDieselHeater/src/WiFi/BTCWebServer.cpp
View file

@ -139,9 +139,10 @@ void initWebServer(void) {
server.on("/wmconfig", handleWMConfig);
server.on("/resetwifi",handleReset);
#if USE_SPIFFS == 1
// NOTE: this serves the default home page, and favicon.ico
server.onNotFound([]()
{ // If the client requests any URI
if (!handleFileRead(server.uri())) // send it if it exists
{ // If the client requests any URI
if (!handleFileRead(server.uri())) // send it if it exists
server.send(404, "text/plain", "404: Not Found"); // otherwise, respond with a 404 (Not Found) error
}
);