From 03d3119e5aa754b925d69e6d9caa0beafc7ef209 Mon Sep 17 00:00:00 2001 From: Chrome Legion Date: Wed, 20 Mar 2019 08:30:35 -0700 Subject: [PATCH] Qrome - added web ui configuration for LED flashing --- printermonitor/Settings.h | 3 +- printermonitor/printermonitor.ino | 56 +++++++++++++++++++++---------- 2 files changed, 41 insertions(+), 18 deletions(-) diff --git a/printermonitor/Settings.h b/printermonitor/Settings.h index d478fec..6906eea 100644 --- a/printermonitor/Settings.h +++ b/printermonitor/Settings.h @@ -95,7 +95,8 @@ boolean INVERT_DISPLAY = false; // true = pins at top | false = pins at the bott //#define DISPLAY_SH1106 // Uncomment this line to use the SH1106 display -- SSD1306 is used by default and is most common // LED Settings -const int externalLight = LED_BUILTIN; // Set to unused pin, like D1, to disable use of built-in LED (LED_BUILTIN) +const int externalLight = LED_BUILTIN; // LED will always flash on bootup or Wifi Errors +boolean USE_FLASH = true; // true = System LED will Flash on Service Calls; false = disabled LED flashing // PSU Control boolean HAS_PSU = false; // Set to true if https://github.com/kantlivelong/OctoPrint-PSUControl/ in use diff --git a/printermonitor/printermonitor.ino b/printermonitor/printermonitor.ino index d404aea..bda71e5 100644 --- a/printermonitor/printermonitor.ino +++ b/printermonitor/printermonitor.ino @@ -116,6 +116,7 @@ String CHANGE_FORM = "
Use 24 Hour Clock (military time)

" "

Flip display orientation

" + "

Flash System LED on Service Calls

" "

Use OctoPrint PSU control plugin for clock/blank

" "

Clock Sync / Weather Refresh (minutes)

"; @@ -368,19 +369,19 @@ void loop() { if (lastMinute != timeClient.getMinutes() && !printerClient.isPrinting()) { // Check status every 60 seconds - digitalWrite(externalLight, LOW); + ledOnOff(true); lastMinute = timeClient.getMinutes(); // reset the check value printerClient.getPrinterJobResults(); printerClient.getPrinterPsuState(); - digitalWrite(externalLight, HIGH); + ledOnOff(false); } else if (printerClient.isPrinting()) { if (lastSecond != timeClient.getSeconds() && timeClient.getSeconds().endsWith("0")) { lastSecond = timeClient.getSeconds(); // every 10 seconds while printing get an update - digitalWrite(externalLight, LOW); + ledOnOff(true); printerClient.getPrinterJobResults(); printerClient.getPrinterPsuState(); - digitalWrite(externalLight, HIGH); + ledOnOff(false); } } @@ -397,7 +398,7 @@ void loop() { } void getUpdateTime() { - digitalWrite(externalLight, LOW); // turn on the LED + ledOnOff(true); // turn on the LED Serial.println(); if (displayOn && DISPLAYWEATHER) { @@ -411,7 +412,7 @@ void getUpdateTime() { lastEpoch = timeClient.getCurrentEpoch(); Serial.println("Local time: " + timeClient.getAmPmFormattedTime()); - digitalWrite(externalLight, HIGH); // turn off the LED + ledOnOff(false); // turn off the LED } boolean authentication() { @@ -462,6 +463,7 @@ void handleUpdateConfig() { DISPLAYCLOCK = server.hasArg("isClockEnabled"); IS_24HOUR = server.hasArg("is24hour"); INVERT_DISPLAY = server.hasArg("invDisp"); + USE_FLASH = server.hasArg("useFlash"); HAS_PSU = server.hasArg("hasPSU"); minutesBetweenDataRefresh = server.arg("refresh").toInt(); themeColor = server.arg("theme"); @@ -501,7 +503,7 @@ void handleWeatherConfigure() { if (!authentication()) { return server.requestAuthentication(); } - digitalWrite(externalLight, LOW); + ledOnOff(true); String html = ""; server.sendHeader("Cache-Control", "no-cache, no-store"); @@ -536,14 +538,14 @@ void handleWeatherConfigure() { server.sendContent(html); server.sendContent(""); server.client().stop(); - digitalWrite(externalLight, HIGH); + ledOnOff(false); } void handleConfigure() { if (!authentication()) { return server.requestAuthentication(); } - digitalWrite(externalLight, LOW); + ledOnOff(true); String html = ""; server.sendHeader("Cache-Control", "no-cache, no-store"); @@ -578,6 +580,11 @@ void handleConfigure() { isInvDisp = "checked='checked'"; } form.replace("%IS_INVDISP_CHECKED%", isInvDisp); + String isFlashLED = ""; + if (USE_FLASH) { + isFlashLED = "checked='checked'"; + } + form.replace("%USEFLASH%", isFlashLED); String hasPSUchecked = ""; if (HAS_PSU) { hasPSUchecked = "checked='checked'"; @@ -610,11 +617,11 @@ void handleConfigure() { server.sendContent(html); server.sendContent(""); server.client().stop(); - digitalWrite(externalLight, HIGH); + ledOnOff(false); } void displayMessage(String message) { - digitalWrite(externalLight, LOW); + ledOnOff(true); server.sendHeader("Cache-Control", "no-cache, no-store"); server.sendHeader("Pragma", "no-cache"); @@ -629,7 +636,7 @@ void displayMessage(String message) { server.sendContent(""); server.client().stop(); - digitalWrite(externalLight, HIGH); + ledOnOff(false); } void redirectHome() { @@ -695,7 +702,7 @@ String getFooter() { } void displayPrinterStatus() { - digitalWrite(externalLight, LOW); + ledOnOff(true); String html = ""; server.sendHeader("Cache-Control", "no-cache, no-store"); @@ -791,7 +798,7 @@ void displayPrinterStatus() { server.sendContent(String(getFooter())); server.sendContent(""); server.client().stop(); - digitalWrite(externalLight, HIGH); + ledOnOff(false); } void configModeCallback (WiFiManager *myWiFiManager) { @@ -816,12 +823,22 @@ void configModeCallback (WiFiManager *myWiFiManager) { flashLED(20, 50); } +void ledOnOff(boolean value) { + if (USE_FLASH) { + if (value) { + digitalWrite(externalLight, LOW); // LED ON + } else { + digitalWrite(externalLight, HIGH); // LED OFF + } + } +} + void flashLED(int number, int delayTime) { - for (int inx = 0; inx < number; inx++) { + for (int inx = 0; inx <= number; inx++) { delay(delayTime); - digitalWrite(externalLight, LOW); + digitalWrite(externalLight, LOW); // ON delay(delayTime); - digitalWrite(externalLight, HIGH); + digitalWrite(externalLight, HIGH); // OFF delay(delayTime); } } @@ -1044,6 +1061,7 @@ void writeSettings() { f.println("DISPLAYCLOCK=" + String(DISPLAYCLOCK)); f.println("is24hour=" + String(IS_24HOUR)); f.println("invertDisp=" + String(INVERT_DISPLAY)); + f.println("USE_FLASH=" + String(USE_FLASH)); f.println("isWeather=" + String(DISPLAYWEATHER)); f.println("weatherKey=" + WeatherApiKey); f.println("CityID=" + String(CityIDs[0])); @@ -1137,6 +1155,10 @@ void readSettings() { INVERT_DISPLAY = line.substring(line.lastIndexOf("invertDisp=") + 11).toInt(); Serial.println("INVERT_DISPLAY=" + String(INVERT_DISPLAY)); } + if(line.indexOf("USE_FLASH=") >= 0) { + USE_FLASH = line.substring(line.lastIndexOf("USE_FLASH=") + 10).toInt(); + Serial.println("USE_FLASH=" + String(USE_FLASH)); + } if (line.indexOf("hasPSU=") >= 0) { HAS_PSU = line.substring(line.lastIndexOf("hasPSU=") + 7).toInt(); Serial.println("HAS_PSU=" + String(HAS_PSU));