Merge pull request #99 from Qrome/3.0

Change Screen switching time in Web Interface.

README.md

@@ -1,30 +1,14 @@
-/* The MIT License (MIT)
-
-Copyright (c) 2018 David Payne
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
 # Printer Monitor (OctoPrint 3D Printer Monitor)
 
+## New Easy Monitor Board Kit:
+Now available is the Pre Loaded Monitor Board Kit that comes ready to plug and play on your network.  
+* Kit on Etsy: https://www.etsy.com/listing/823257424  
+* New 3D printed case design for Monitor Board kit: https://www.thingiverse.com/thing:4538747
+* Configuration video: https://www.youtube.com/watch?v=kcBspqWhpIU
+
 ## Features:
-* Displays the print status from OctoPrint Server
+* Displays the print status from OctoPrint or Repetier Server
+* Option to display time and weather when printer is idle
 * Estimated time remaining
 * Time Printing
 * Percentage complete
@@ -42,6 +26,7 @@ SOFTWARE.
 * Basic Authentication to protect your settings
 * Version 2.2 added the ability to update firmware through web interface from a compiled binary
 * Can query the Octoprint [PSU Control plugin](https://plugins.octoprint.org/plugins/psucontrol/) to enter clock or blank mode when PSU is off
+* Repetier support added in version 3.0 -- define in Settings.h
 * Video: https://youtu.be/niRv9SCgAPk
 * Detailed build video by Chris Riley: https://youtu.be/Rm-l1FSuJpI
 
@@ -49,12 +34,13 @@ SOFTWARE.
 * Wemos D1 Mini: https://amzn.to/2ImqD1n
 * 0.96" OLED I2C 128x64 Display (12864) SSD1306:  https://amzn.to/3cyJekU
 * (optional) 1.3" I2C OLED Display: https://amzn.to/2IP0gRU (must uncomment #define DISPLAY_SH1106 in the Settings.h to use the 1.3" SSH1106 display)  
+* (optional) Pre loaded Monitor Board kit: https://www.etsy.com/listing/823257424  
 
 Note: Using the links provided here help to support these types of projects. Thank you for the support.  
 
 ## Wiring for the Wemos D1 Mini to the I2C SSD1306 OLED
 SDA -> D2  
-SCL -> D5  
+SCL -> D5 / D1 -- for Easy Monitor Board
 VCC -> 5V+  
 GND -> GND-  
 
@@ -63,11 +49,16 @@ GND -> GND-
 ## 3D Printed Case by Qrome:  
 https://www.thingiverse.com/thing:2884823 -- for the 0.96" OLED Display  
 https://www.thingiverse.com/thing:2934049 -- for the 1.3" OLED Display  
+https://www.thingiverse.com/thing:4538747 -- for 0.96" With Easy Monitor Board
 
 ## Upgrading from version 2.2 or Higher
 Version 2.2 introduced the ability to upgrade pre-compiled firmware from a binary file.  In version 2.3 and on you should find binary files that can be uploaded to your printer monitor via the web interface.  From the main menu in the web interface select "Firmware Update" and follow the prompts.
 * **printermonitor.ino.d1_mini_SSD1306.bin** - compiled for Wemos D1 Mini for the smaller 0.96" SSD1306 OLED (default)
 * **printermonitor.ino.d1_mini_SH1106.bin** - compiled for Wemos D1 Mini for the larger 1.3" SH1106 OLED
+* **printermonitor.ino.d1_mini_repetier_SSD1306.bin** - Repetier version compiled for Wemos D1 Mini for the smaller 0.96" SSD1306 OLED (default)
+* **printermonitor.ino.d1_mini_repetier_SH1106.bin** - Repetier version compiled for Wemos D1 Mini for the larger 1.3" SH1106 OLED
+* **printermonitor.ino.d1_mini_easyboard.bin** - Version compiled for Easy Monitor Board for the smaller 0.96" SSD1306 OLED (SDA -> D2 and SCL -> D1) 
+* **printermonitor.ino.d1_mini_easyboard_repetier.bin** - Repetier version compiled for Easy Monitor Board for the smaller 0.96" SSD1306 OLED (SDA -> D2 and SCL -> D1)
 
 ## Compiling and Loading to Wemos D1 Mini
 It is recommended to use Arduino IDE.  You will need to configure Arduino IDE to work with the Wemos board and USB port and installed the required USB drivers etc.  
@@ -92,7 +83,9 @@ Note Printer-Monitor version 2.5 and later include ArduinoJson (version 5.13.1).
 
 ## Initial Configuration
 All settings may be managed from the Web Interface, however, you may update the **Settings.h** file manually -- but it is not required.  There is also an option to display current weather when the print is off-line.  
-* Your OctoPrint API Key from your OctoPrint -> User Settings -> Current API Key  
+* If you are using the Easy Monitor Board you must set the const int SCL_PIN = D1 in the Settings.h file.
+* By default OctoPrint client is selected.  If you wish to use Repetier then uncomment //#define USE_REPETIER_CLIENT in the Settings.h file.
+* Your OctoPrint API Key from your OctoPrint -> User Settings -> Current API Key  -- similar for Repetier API Key.
 * Optional OpenWeatherMap API Key -- if you want current weather when not printing.  Get the api key from: https://openweathermap.org/  
 
 NOTE: The settings in the Settings.h are the default settings for the first loading. After loading you will manage changes to the settings via the Web Interface. If you want to change settings again in the settings.h, you will need to erase the file system on the Wemos or use the “Reset Settings” option in the Web Interface.  
@@ -133,3 +126,26 @@ Thanks for your contribution.
 ![Printer Monitor Temps](/images/temperatures.jpg)  
 ![Printer Monitor Time Remaining](/images/time_remaining.jpg)  
 ![Printer Monitor Printing Time](/images/printing_time.jpg)
+
+/* The MIT License (MIT)
+
+Copyright (c) 2018 David Payne
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/

printermonitor/OctoPrintClient.cpp

@@ -27,10 +27,10 @@ SOFTWARE.
 #include "OctoPrintClient.h"
 
 OctoPrintClient::OctoPrintClient(String ApiKey, String server, int port, String user, String pass, boolean psu) {
-  updateOctoPrintClient(ApiKey, server, port, user, pass, psu);
+  updatePrintClient(ApiKey, server, port, user, pass, psu);
 }
 
-void OctoPrintClient::updateOctoPrintClient(String ApiKey, String server, int port, String user, String pass, boolean psu) {
+void OctoPrintClient::updatePrintClient(String ApiKey, String server, int port, String user, String pass, boolean psu) {
   server.toCharArray(myServer, 100);
   myApiKey = ApiKey;
   myPort = port;
@@ -236,6 +236,8 @@ void OctoPrintClient::getPrinterJobResults() {
   String printing = (const char*)root2["state"]["flags"]["printing"];
   if (printing == "true") {
     printerData.isPrinting = true;
+  } else {
+    printerData.isPrinting = false;
   }
   printerData.toolTemp = (const char*)root2["temperature"]["tool0"]["actual"];
   printerData.toolTargetTemp = (const char*)root2["temperature"]["tool0"]["target"];
@@ -394,3 +396,19 @@ String OctoPrintClient::getValueRounded(String value) {
   int rounded = (int)(f+0.5f);
   return String(rounded);
 }
+
+String OctoPrintClient::getPrinterType() {
+  return printerType;
+}
+
+int OctoPrintClient::getPrinterPort() {
+  return myPort;
+}
+
+String OctoPrintClient::getPrinterName() {
+  return printerData.printerName;
+}
+
+void OctoPrintClient::setPrinterName(String printer) {
+  printerData.printerName = printer;
+}

printermonitor/OctoPrintClient.h

@@ -37,6 +37,7 @@ private:
   String myApiKey = "";
   String encodedAuth = "";
   boolean pollPsu;
+  const String printerType = "OctoPrint";
 
   void resetPrintData();
   boolean validate();
@@ -64,6 +65,7 @@ private:
     boolean isPrinting;
     boolean isPSUoff;
     String error;
+    String printerName;
   } PrinterStruct;
 
   PrinterStruct printerData;
@@ -73,7 +75,7 @@ public:
   OctoPrintClient(String ApiKey, String server, int port, String user, String pass, boolean psu);
   void getPrinterJobResults();
   void getPrinterPsuState();
-  void updateOctoPrintClient(String ApiKey, String server, int port, String user, String pass, boolean psu);
+  void updatePrintClient(String ApiKey, String server, int port, String user, String pass, boolean psu);
 
   String getAveragePrintTime();
   String getEstimatedPrintTime();
@@ -95,4 +97,8 @@ public:
   String getFilamentLength();
   String getValueRounded(String value);
   String getError();
+  String getPrinterType();
+  int getPrinterPort();
+  String getPrinterName();
+  void setPrinterName(String printer);
 };

printermonitor/RepetierClient.cpp

@@ -0,0 +1,367 @@
+/** The MIT License (MIT)
+
+Copyright (c) 2018 David Payne
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+// Additional Contributions:
+/* 15 Jan 2019 : Owen Carter : Add psucontrol query via POST api call */
+/* 07 April 2019 : Jon Smith : Redesigned this class for Repetier Server */
+
+#include "RepetierClient.h"
+
+RepetierClient::RepetierClient(String ApiKey, String server, int port, String user, String pass, boolean psu) {
+  updatePrintClient(ApiKey, server, port, user, pass, psu);
+}
+
+void RepetierClient::updatePrintClient(String ApiKey, String server, int port, String user, String pass, boolean psu) {
+  server.toCharArray(myServer, 100);
+  myApiKey = ApiKey;
+  myPort = port;
+  encodedAuth = "";
+  if (user != "") {
+    String userpass = user + ":" + pass;
+    base64 b64;
+    encodedAuth = b64.encode(userpass, true);
+  }
+  pollPsu = psu;
+}
+
+boolean RepetierClient::validate() {
+  boolean rtnValue = false;
+  printerData.error = "";
+  if (String(myServer) == "") {
+    printerData.error += "Server address is required; ";
+  }
+  if (myApiKey == "") {
+    printerData.error += "ApiKey is required; ";
+  }
+  if (printerData.error == "") {
+    rtnValue = true;
+  }
+  return rtnValue;
+}
+
+WiFiClient RepetierClient::getSubmitRequest(String apiGetData) {
+  WiFiClient printClient;
+  printClient.setTimeout(5000);
+
+  Serial.println("Getting Repetier Data via GET");
+  Serial.println(apiGetData);
+  result = "";
+  if (printClient.connect(myServer, myPort)) {  //starts client connection, checks for connection
+    printClient.println(apiGetData);
+    printClient.println("Host: " + String(myServer) + ":" + String(myPort));
+    printClient.println("X-Api-Key: " + myApiKey);
+    if (encodedAuth != "") {
+      printClient.print("Authorization: ");
+      printClient.println("Basic " + encodedAuth);
+    }
+    printClient.println("User-Agent: ArduinoWiFi/1.1");
+    printClient.println("Connection: close");
+    if (printClient.println() == 0) {
+      Serial.println("Connection to " + String(myServer) + ":" + String(myPort) + " failed.");
+      Serial.println();
+      resetPrintData();
+      printerData.error = "Connection to " + String(myServer) + ":" + String(myPort) + " failed.";
+      return printClient;
+    }
+  } 
+  else {
+    Serial.println("Connection to Repetier failed: " + String(myServer) + ":" + String(myPort)); //error message if no client connect
+    Serial.println();
+    resetPrintData();
+    printerData.error = "Connection to Repetier failed: " + String(myServer) + ":" + String(myPort);
+    return printClient;
+  }
+/*
+  // Check HTTP status
+  char status[32] = {0};
+  printClient.readBytesUntil('\r', status, sizeof(status));
+  if (strcmp(status, "HTTP/1.1 200 OK") != 0) {
+    Serial.print(F("Unexpected response: "));
+    Serial.println(status);
+    printerData.state = "";
+    printerData.error = "Response: " + String(status);
+    return printClient;
+  }
+
+  // Skip HTTP headers
+  char endOfHeaders[] = "\r\n\r\n";
+  if (!printClient.find(endOfHeaders)) {
+    Serial.println(F("Invalid response"));
+    printerData.error = "Invalid response from " + String(myServer) + ":" + String(myPort);
+    printerData.state = "";
+  }
+*/
+  return printClient;
+}
+
+
+void RepetierClient::getPrinterJobResults() {
+  if (!validate()) {
+    return;
+  }
+  //**** get the Printer Job status
+  String apiGetData = "GET /printer/api/?a=listPrinter&apikey=" + myApiKey;
+  WiFiClient printClient = getSubmitRequest(apiGetData);
+  if (printerData.error != "") {
+    return;
+  }
+  const size_t bufferSize = JSON_OBJECT_SIZE(1) + JSON_OBJECT_SIZE(2) + JSON_OBJECT_SIZE(3) + 2*JSON_OBJECT_SIZE(5) + JSON_OBJECT_SIZE(6) + 710;
+  DynamicJsonBuffer jsonBuffer(bufferSize);
+
+  // Parse JSON object
+  JsonArray& root = jsonBuffer.parseArray(printClient);
+    
+  if (!root.success()) {
+    printerData.error = "Repetier Data Parsing failed: " + String(myServer) + ":" + String(myPort);
+    Serial.println(printerData.error);
+    printerData.state = "";
+    return;
+  }
+
+  int inx = 0;
+  int count = root.size();
+  Serial.println("Size of root: " + String(count));
+  for (int i = 0; i < count; i++) {
+    Serial.println("Printer: " + String((const char*)root[i]["slug"]));
+    if (String((const char*)root[i]["slug"]) == printerData.printerName) {
+      inx = i;
+      break;
+    }
+  }
+  
+  JsonObject& pr = root[inx];
+  
+  //printerData.averagePrintTime = (const char*)pr[""];
+  printerData.estimatedPrintTime = (const char*)pr["printTime"];
+  printerData.fileName = (const char*) pr["job"];
+  printerData.fileSize = (const char*) pr["totalLines"];
+  //printerData.filamentLength = (const char*) pr[""];
+  printerData.state = (const char*) pr["online"];
+  //printerData.lastPrintTime = (const char*) pr[""];
+  printerData.progressCompletion = (const char*) pr["done"];
+  printerData.progressFilepos = (const char*) pr["linesSend"];
+  printerData.progressPrintTime = (const char*) pr["printedTimeComp"];
+
+//Figure out Time Left
+  long timeTot=0;
+  long timeElap=0;
+  long timeLeft=0;
+  if (printerData.estimatedPrintTime != "" ) {
+    timeTot = atol(pr["printTime"]);
+  }
+  if (printerData.progressPrintTime != "") {
+    timeElap= atol(pr["printedTimeComp"]);
+  }
+  timeLeft = timeTot-timeElap; 
+  printerData.progressPrintTimeLeft = String(timeLeft);
+
+  if (printerData.fileName != "none") {
+    printerData.isPrinting = true;
+  } else {
+    printerData.isPrinting = false;
+  }
+
+  if (printerData.isPrinting) {  
+    Serial.println("Printing: " + printerData.fileName);
+  }
+  
+  if (isOperational()) {
+    Serial.println("Status: " + printerData.state);
+  } else {
+    Serial.println("Printer Not Operational");
+  }
+
+  //**** get the Printer Temps and Stat
+  apiGetData = "GET /printer/api/?a=stateList&apikey=" + myApiKey;
+  printClient = getSubmitRequest(apiGetData);
+  if (printerData.error != "") {
+    return;
+  }
+  const size_t bufferSize2 = 3*JSON_OBJECT_SIZE(2) + 2*JSON_OBJECT_SIZE(3) + JSON_OBJECT_SIZE(9) + 300;
+  DynamicJsonBuffer jsonBuffer2(bufferSize2);
+
+  //Parse JSON object
+  JsonObject& root2 = jsonBuffer2.parseObject(printClient);
+
+  //Select printer
+  JsonObject& pr2 = root2[printerData.printerName];
+
+  if (!root2.success()) {
+    printerData.isPrinting = false;
+    printerData.toolTemp = "";
+    printerData.toolTargetTemp = "";
+    printerData.bedTemp = "";
+    printerData.bedTargetTemp = "";
+    return;
+  }
+
+  printerData.toolTemp = (const char*) pr2["extruder"][0]["tempRead"];
+  printerData.toolTargetTemp = (const char*) pr2["extruder"][0]["tempSet"];
+  printerData.bedTemp = (const char*) pr2["heatedBeds"][0]["tempRead"];
+  printerData.bedTargetTemp = (const char*) pr2["heatedBeds"][0]["tempSet"];
+
+  if (printerData.isPrinting) {
+    Serial.println("Status: " + printerData.state + " " + printerData.fileName + "(" + printerData.progressCompletion + "%)");
+  }
+}
+
+void RepetierClient::getPrinterPsuState() {
+  //**** get the PSU state (if enabled and printer operational)
+  //Not implemented in Repetier Server AFAIK
+}
+
+// Reset all PrinterData
+void RepetierClient::resetPrintData() {
+  printerData.averagePrintTime = "";
+  printerData.estimatedPrintTime = "";
+  printerData.fileName = "";
+  printerData.fileSize = "";
+  printerData.lastPrintTime = "";
+  printerData.progressCompletion = "";
+  printerData.progressFilepos = "";
+  printerData.progressPrintTime = "";
+  printerData.progressPrintTimeLeft = "";
+  printerData.state = "";
+  printerData.toolTemp = "";
+  printerData.toolTargetTemp = "";
+  printerData.filamentLength = "";
+  printerData.bedTemp = "";
+  printerData.bedTargetTemp = "";
+  printerData.isPrinting = false;
+  printerData.isPSUoff = false;
+  printerData.error = "";
+}
+
+String RepetierClient::getAveragePrintTime(){
+  return printerData.averagePrintTime;
+}
+
+String RepetierClient::getEstimatedPrintTime() {
+  return printerData.estimatedPrintTime;
+}
+
+String RepetierClient::getFileName() {
+  return printerData.fileName;
+}
+
+String RepetierClient::getFileSize() {
+  return printerData.fileSize;
+}
+
+String RepetierClient::getLastPrintTime(){
+  return printerData.lastPrintTime;
+}
+
+String RepetierClient::getProgressCompletion() {
+  return String(printerData.progressCompletion.toInt());
+}
+
+String RepetierClient::getProgressFilepos() {
+  return printerData.progressFilepos;  
+}
+
+String RepetierClient::getProgressPrintTime() {
+  return printerData.progressPrintTime;
+}
+
+String RepetierClient::getProgressPrintTimeLeft() {
+  String rtnValue = printerData.progressPrintTimeLeft;
+  if (getProgressCompletion() == "100") {
+    rtnValue = "0"; // Print is done so this should be 0 this is a fix for OctoPrint
+  }
+  return rtnValue;
+}
+
+String RepetierClient::getState() {
+  String rtnValue = "Offline";
+  if (printerData.state == "1") {
+    rtnValue = "Operational";
+  }
+  return rtnValue;
+}
+
+boolean RepetierClient::isPrinting() {
+  return printerData.isPrinting;
+}
+
+boolean RepetierClient::isPSUoff() {
+  return printerData.isPSUoff;
+}
+
+boolean RepetierClient::isOperational() {
+  boolean operational = false;
+  if (printerData.state == "1" || isPrinting()) {
+    operational = true;
+  }
+  return operational;
+}
+
+String RepetierClient::getTempBedActual() {
+  String temp = printerData.bedTemp;
+  temp.remove(temp.indexOf(".") + 3);
+  return temp;
+}
+
+String RepetierClient::getTempBedTarget() {
+  return printerData.bedTargetTemp;
+}
+
+String RepetierClient::getTempToolActual() {
+  String temp = printerData.toolTemp;
+  temp.remove(temp.indexOf(".") + 3);
+  return temp;
+}
+
+String RepetierClient::getTempToolTarget() {
+  return printerData.toolTargetTemp;
+}
+
+String RepetierClient::getFilamentLength() {
+  return printerData.filamentLength;
+}
+
+String RepetierClient::getError() {
+  return printerData.error;
+}
+
+String RepetierClient::getValueRounded(String value) {
+  float f = value.toFloat();
+  int rounded = (int)(f+0.5f);
+  return String(rounded);
+}
+
+String RepetierClient::getPrinterType() {
+  return printerType;
+}
+
+int RepetierClient::getPrinterPort() {
+  return myPort;
+}
+
+String RepetierClient::getPrinterName() {
+  return printerData.printerName;
+}
+
+void RepetierClient::setPrinterName(String printer) {
+  printerData.printerName = printer;
+}

printermonitor/RepetierClient.h

@@ -0,0 +1,104 @@
+/** The MIT License (MIT)
+
+Copyright (c) 2018 David Payne
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+/* 07 April 2019 : Jon Smith : added class for Repetier Server (kg4iae@github)*/
+
+
+#pragma once
+#include <ESP8266WiFi.h>
+#include "libs/ArduinoJson/ArduinoJson.h"
+#include <base64.h>
+
+class RepetierClient {
+
+private:
+  char myServer[100];
+  int myPort = 3344;
+  String myApiKey = "";
+  String encodedAuth = "";
+  boolean pollPsu;
+  const String printerType = "Repetier";
+
+  void resetPrintData();
+  boolean validate();
+  WiFiClient getSubmitRequest(String apiGetData);
+  WiFiClient getPostRequest(String apiPostData, String apiPostBody);
+ 
+  String result;
+
+  typedef struct {
+    String averagePrintTime;
+    String estimatedPrintTime;
+    String fileName;
+    String fileSize;
+    String lastPrintTime;
+    String progressCompletion;
+    String progressFilepos;
+    String progressPrintTime;
+    String progressPrintTimeLeft;
+    String state;
+    String toolTemp;
+    String toolTargetTemp;
+    String filamentLength;
+    String bedTemp;
+    String bedTargetTemp;
+    boolean isPrinting;
+    boolean isPSUoff;
+    String error;
+    String printerName;
+  } PrinterStruct;
+
+  PrinterStruct printerData;
+
+  
+public:
+  RepetierClient(String ApiKey, String server, int port, String user, String pass, boolean psu);
+  void getPrinterJobResults();
+  void getPrinterPsuState();
+  void updatePrintClient(String ApiKey, String server, int port, String user, String pass, boolean psu);
+
+  String getAveragePrintTime();
+  String getEstimatedPrintTime();
+  String getFileName();
+  String getFileSize();
+  String getLastPrintTime();
+  String getProgressCompletion();
+  String getProgressFilepos();
+  String getProgressPrintTime();
+  String getProgressPrintTimeLeft();
+  String getState();
+  boolean isPrinting();
+  boolean isOperational();
+  boolean isPSUoff();
+  String getTempBedActual();
+  String getTempBedTarget();
+  String getTempToolActual();
+  String getTempToolTarget();
+  String getFilamentLength();
+  String getValueRounded(String value);
+  String getError();
+  String getPrinterType();
+  int getPrinterPort();
+  String getPrinterName();
+  void setPrinterName(String printer);
+};

printermonitor/Settings.h

@@ -45,6 +45,7 @@ SOFTWARE.
 #include <ArduinoOTA.h>
 #include <ESP8266HTTPUpdateServer.h>
 #include "TimeClient.h"
+#include "RepetierClient.h"
 #include "OctoPrintClient.h"
 #include "OpenWeatherMapClient.h"
 #include "WeatherStationFonts.h"
@@ -57,13 +58,14 @@ SOFTWARE.
 // Start Settings
 //******************************
 
-// OctoPrint Monitoring -- Monitor your 3D printer OctoPrint Server
+// OctoPrint / Repetier Monitoring -- Monitor your 3D OctoPrint or Repetier Server
-String OctoPrintApiKey = "";   // ApiKey from your User Account on OctoPrint
+//#define USE_REPETIER_CLIENT       // Uncomment this line to use the Repetier Printer Server -- OctoPrint is used by default and is most common
-String OctoPrintHostName = "octopi";// Default 'octopi' -- or hostname if different (optional if your IP changes)
+String PrinterApiKey = "";   // ApiKey from your User Account on OctoPrint / Repetier
-String OctoPrintServer = "";   // IP or Address of your OctoPrint Server (DO NOT include http://)
+String PrinterHostName = "octopi";// Default 'octopi' -- or hostname if different (optional if your IP changes)
-int OctoPrintPort = 80;        // the port you are running your OctoPrint server on (usually 80);
+String PrinterServer = "";   // IP or Address of your OctoPrint / Repetier Server (DO NOT include http://)
-String OctoAuthUser = "";      // only used if you have haproxy or basic athentintication turned on (not default)
+int PrinterPort = 80;        // the port you are running your OctoPrint / Repetier server on (usually 80);
-String OctoAuthPass = "";      // only used with haproxy or basic auth (only needed if you must authenticate)
+String PrinterAuthUser = "";      // only used if you have haproxy or basic athentintication turned on (not default)
+String PrinterAuthPass = "";      // only used with haproxy or basic auth (only needed if you must authenticate)
 
 // Weather Configuration
 boolean DISPLAYWEATHER = true; // true = show weather when not printing / false = no weather
@@ -90,12 +92,13 @@ boolean DISPLAYCLOCK = true;   // true = Show Clock when not printing / false =
 // Display Settings
 const int I2C_DISPLAY_ADDRESS = 0x3c; // I2C Address of your Display (usually 0x3c or 0x3d)
 const int SDA_PIN = D2;
-const int SCL_PIN = D5;
+const int SCL_PIN = D5; // original code D5 -- Monitor Easy Board use D1
 boolean INVERT_DISPLAY = false; // true = pins at top | false = pins at the bottom
 //#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

printermonitor/printermonitor.ino

@@ -30,9 +30,9 @@ SOFTWARE.
 
 #include "Settings.h"
 
-#define VERSION "2.5"
+#define VERSION "3.0"
 
-#define HOSTNAME "OctMon-" 
+#define HOSTNAME "PrintMon-" 
 #define CONFIG "/conf.txt"
 
 /* Useful Constants */
@@ -84,8 +84,12 @@ String lastSecond = "xx";
 String lastReportStatus = "";
 boolean displayOn = true;
 
-// OctoPrint Client
+// Printer Client
-OctoPrintClient printerClient(OctoPrintApiKey, OctoPrintServer, OctoPrintPort, OctoAuthUser, OctoAuthPass, HAS_PSU);
+#if defined(USE_REPETIER_CLIENT)
+  RepetierClient printerClient(PrinterApiKey, PrinterServer, PrinterPort, PrinterAuthUser, PrinterAuthPass, HAS_PSU);
+#else
+  OctoPrintClient printerClient(PrinterApiKey, PrinterServer, PrinterPort, PrinterAuthUser, PrinterAuthPass, HAS_PSU);
+#endif
 int printerCount = 0;
 
 // Weather Client
@@ -98,7 +102,7 @@ int8_t getWifiQuality();
 ESP8266WebServer server(WEBSERVER_PORT);
 ESP8266HTTPUpdateServer serverUpdater;
 
-String WEB_ACTIONS =  "<a class='w3-bar-item w3-button' href='/'><i class='fa fa-home'></i> Home</a>"
+static const char WEB_ACTIONS[] PROGMEM =  "<a class='w3-bar-item w3-button' href='/'><i class='fa fa-home'></i> Home</a>"
                       "<a class='w3-bar-item w3-button' href='/configure'><i class='fa fa-cog'></i> Configure</a>"
                       "<a class='w3-bar-item w3-button' href='/configureweather'><i class='fa fa-cloud'></i> Weather</a>"
                       "<a class='w3-bar-item w3-button' href='/systemreset' onclick='return confirm(\"Do you want to reset to default settings?\")'><i class='fa fa-undo'></i> Reset Settings</a>"
@@ -106,39 +110,34 @@ String WEB_ACTIONS =  "<a class='w3-bar-item w3-button' href='/'><i class='fa fa
                       "<a class='w3-bar-item w3-button' href='/update'><i class='fa fa-wrench'></i> Firmware Update</a>"
                       "<a class='w3-bar-item w3-button' href='https://github.com/Qrome' target='_blank'><i class='fa fa-question-circle'></i> About</a>";
 
-String CHANGE_FORM =  "<form class='w3-container' action='/updateconfig' method='get'><h2>Station Config:</h2>"
+String CHANGE_FORM =  ""; // moved to config to make it dynamic
-                      "<p><label>OctoPrint API Key (get from your server)</label><input class='w3-input w3-border w3-margin-bottom' type='text' name='octoPrintApiKey' value='%OCTOKEY%' maxlength='60'></p>"
+
-                      "<p><label>OctoPrint Host Name (usually octopi)</label><input class='w3-input w3-border w3-margin-bottom' type='text' name='octoPrintHostName' value='%OCTOHOST%' maxlength='60'></p>"
+static const char CLOCK_FORM[] PROGMEM = "<hr><p><input name='isClockEnabled' class='w3-check w3-margin-top' type='checkbox' %IS_CLOCK_CHECKED%> Display Clock when printer is off</p>"
-                      "<p><label>OctoPrint Address (do not include http://)</label><input class='w3-input w3-border w3-margin-bottom' type='text' name='octoPrintAddress' value='%OCTOADDRESS%' maxlength='60'></p>"
-                      "<p><label>OctoPrint Port</label><input class='w3-input w3-border w3-margin-bottom' type='text' name='octoPrintPort' value='%OCTOPORT%' maxlength='5'  onkeypress='return isNumberKey(event)'></p>"
-                      "<p><label>OctoPrint User (only needed if you have haproxy or basic auth turned on)</label><input class='w3-input w3-border w3-margin-bottom' type='text' name='octoUser' value='%OCTOUSER%' maxlength='30'></p>"
-                      "<p><label>OctoPrint Password </label><input class='w3-input w3-border w3-margin-bottom' type='password' name='octoPass' value='%OCTOPASS%'></p><hr>"
-                      "<p><input name='isClockEnabled' class='w3-check w3-margin-top' type='checkbox' %IS_CLOCK_CHECKED%> Display Clock when printer is off</p>"
                       "<p><input name='is24hour' class='w3-check w3-margin-top' type='checkbox' %IS_24HOUR_CHECKED%> Use 24 Hour Clock (military time)</p>"
                       "<p><input name='invDisp' class='w3-check w3-margin-top' type='checkbox' %IS_INVDISP_CHECKED%> Flip display orientation</p>"
+                      "<p><input name='useFlash' class='w3-check w3-margin-top' type='checkbox' %USEFLASH%> Flash System LED on Service Calls</p>"
                       "<p><input name='hasPSU' class='w3-check w3-margin-top' type='checkbox' %HAS_PSU_CHECKED%> Use OctoPrint PSU control plugin for clock/blank</p>"
                       "<p>Clock Sync / Weather Refresh (minutes) <select class='w3-option w3-padding' name='refresh'>%OPTIONS%</select></p>";
                             
-String THEME_FORM =   "<p>Theme Color <select class='w3-option w3-padding' name='theme'>%THEME_OPTIONS%</select></p>"
+static const char THEME_FORM[] PROGMEM =   "<p>Theme Color <select class='w3-option w3-padding' name='theme'>%THEME_OPTIONS%</select></p>"
                       "<p><label>UTC Time Offset</label><input class='w3-input w3-border w3-margin-bottom' type='text' name='utcoffset' value='%UTCOFFSET%' maxlength='12'></p><hr>"
                       "<p><input name='isBasicAuth' class='w3-check w3-margin-top' type='checkbox' %IS_BASICAUTH_CHECKED%> Use Security Credentials for Configuration Changes</p>"
                       "<p><label>User ID (for this interface)</label><input class='w3-input w3-border w3-margin-bottom' type='text' name='userid' value='%USERID%' maxlength='20'></p>"
                       "<p><label>Password </label><input class='w3-input w3-border w3-margin-bottom' type='password' name='stationpassword' value='%STATIONPASSWORD%'></p>"
                       "<button class='w3-button w3-block w3-grey w3-section w3-padding' type='submit'>Save</button></form>";
 
-String WEATHER_FORM = "<form class='w3-container' action='/updateweatherconfig' method='get'><h2>Weather Config:</h2>"
+static const char WEATHER_FORM[] PROGMEM = "<form class='w3-container' action='/updateweatherconfig' method='get'><h2>Weather Config:</h2>"
                       "<p><input name='isWeatherEnabled' class='w3-check w3-margin-top' type='checkbox' %IS_WEATHER_CHECKED%> Display Weather when printer is off</p>"
                       "<label>OpenWeatherMap API Key (get from <a href='https://openweathermap.org/' target='_BLANK'>here</a>)</label>"
                       "<input class='w3-input w3-border w3-margin-bottom' type='text' name='openWeatherMapApiKey' value='%WEATHERKEY%' maxlength='60'>"
                       "<p><label>%CITYNAME1% (<a href='http://openweathermap.org/find' target='_BLANK'><i class='fa fa-search'></i> Search for City ID</a>) "
-                      "or full <a href='http://openweathermap.org/help/city_list.txt' target='_BLANK'>city list</a></label>"
                       "<input class='w3-input w3-border w3-margin-bottom' type='text' name='city1' value='%CITY1%' onkeypress='return isNumberKey(event)'></p>"
                       "<p><input name='metric' class='w3-check w3-margin-top' type='checkbox' %METRIC%> Use Metric (Celsius)</p>"
                       "<p>Weather Language <select class='w3-option w3-padding' name='language'>%LANGUAGEOPTIONS%</select></p>"
                       "<button class='w3-button w3-block w3-grey w3-section w3-padding' type='submit'>Save</button></form>"
                       "<script>function isNumberKey(e){var h=e.which?e.which:event.keyCode;return!(h>31&&(h<48||h>57))}</script>";
 
-String LANG_OPTIONS = "<option>ar</option>"
+static const char LANG_OPTIONS[] PROGMEM = "<option>ar</option>"
                       "<option>bg</option>"
                       "<option>ca</option>"
                       "<option>cz</option>"
@@ -172,7 +171,7 @@ String LANG_OPTIONS = "<option>ar</option>"
                       "<option>zh_cn</option>"
                       "<option>zh_tw</option>";
 
-String COLOR_THEMES = "<option>red</option>"
+static const char COLOR_THEMES[] PROGMEM = "<option>red</option>"
                       "<option>pink</option>"
                       "<option>purple</option>"
                       "<option>deep-purple</option>"
@@ -208,6 +207,9 @@ void setup() {
   // Initialize digital pin for LED (little blue light on the Wemos D1 Mini)
   pinMode(externalLight, OUTPUT);
 
+  //Some Defaults before loading from Config.txt
+  PrinterPort = printerClient.getPrinterPort();
+
   readSettings();
 
   // initialize display
@@ -219,10 +221,16 @@ void setup() {
   display.display();
 
   //display.flipScreenVertically();
-  display.setFont(ArialMT_Plain_16);
+
   display.setTextAlignment(TEXT_ALIGN_CENTER);
   display.setContrast(255); // default is 255
-  display.drawString(64, 5, "Printer Monitor\nBy Qrome\nV" + String(VERSION));
+  display.setFont(ArialMT_Plain_16);
+  display.drawString(64, 1, "Printer Monitor");
+  display.setFont(ArialMT_Plain_10);
+  display.drawString(64, 18, "for " + printerClient.getPrinterType());
+  display.setFont(ArialMT_Plain_16);
+  display.drawString(64, 30, "By Qrome");
+  display.drawString(64, 46, "V" + String(VERSION));
   display.display();
  
   //WiFiManager
@@ -325,40 +333,40 @@ void setup() {
     display.drawString(64, 20, "Enable in Settings.h");
     display.display(); 
   }
-  flashLED(5, 500);
+  flashLED(5, 100);
-  findMDNS();  //go find Octoprint Server by the hostname
+  findMDNS();  //go find Printer Server by the hostname
   Serial.println("*** Leaving setup()");
 }
 
 void findMDNS() {
-  if (OctoPrintHostName == "" || ENABLE_OTA == false) {
+  if (PrinterHostName == "" || ENABLE_OTA == false) {
     return; // nothing to do here
   }
   // We now query our network for 'web servers' service
   // over tcp, and get the number of available devices
   int n = MDNS.queryService("http", "tcp");
   if (n == 0) {
-    Serial.println("no services found - make sure OctoPrint server is turned on");
+    Serial.println("no services found - make sure Printer server is turned on");
     return;
   }
-  Serial.println("*** Looking for " + OctoPrintHostName + " over mDNS");
+  Serial.println("*** Looking for " + PrinterHostName + " over mDNS");
   for (int i = 0; i < n; ++i) {
     // Going through every available service,
     // we're searching for the one whose hostname
     // matches what we want, and then get its IP
     Serial.println("Found: " + MDNS.hostname(i));
-    if (MDNS.hostname(i) == OctoPrintHostName) {
+    if (MDNS.hostname(i) == PrinterHostName) {
       IPAddress serverIp = MDNS.IP(i);
-      OctoPrintServer = serverIp.toString();
+      PrinterServer = serverIp.toString();
-      OctoPrintPort = MDNS.port(i); // save the port
+      PrinterPort = MDNS.port(i); // save the port
-      Serial.println("*** Found OctoPrint Server " + OctoPrintHostName + " http://" + OctoPrintServer + ":" + OctoPrintPort);
+      Serial.println("*** Found Printer Server " + PrinterHostName + " http://" + PrinterServer + ":" + PrinterPort);
       writeSettings(); // update the settings
     }
   }
 }
 
 //************************************************************
-// Main Looop
+// Main Loop
 //************************************************************
 void loop() {
   
@@ -369,19 +377,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);
     }
   }
 
@@ -398,7 +406,7 @@ void loop() {
 }
 
 void getUpdateTime() {
-  digitalWrite(externalLight, LOW); // turn on the LED
+  ledOnOff(true); // turn on the LED
   Serial.println();
 
   if (displayOn && DISPLAYWEATHER) {
@@ -412,7 +420,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() {
@@ -454,15 +462,19 @@ void handleUpdateConfig() {
   if (!authentication()) {
     return server.requestAuthentication();
   }
-  OctoPrintApiKey = server.arg("octoPrintApiKey");
+  if (server.hasArg("printer")) {
-  OctoPrintHostName = server.arg("octoPrintHostName");
+    printerClient.setPrinterName(server.arg("printer"));
-  OctoPrintServer = server.arg("octoPrintAddress");
+  }
-  OctoPrintPort = server.arg("octoPrintPort").toInt();
+  PrinterApiKey = server.arg("PrinterApiKey");
-  OctoAuthUser = server.arg("octoUser");
+  PrinterHostName = server.arg("PrinterHostName");
-  OctoAuthPass = server.arg("octoPass");
+  PrinterServer = server.arg("PrinterAddress");
+  PrinterPort = server.arg("PrinterPort").toInt();
+  PrinterAuthUser = server.arg("octoUser");
+  PrinterAuthPass = server.arg("octoPass");
   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");
@@ -502,7 +514,7 @@ void handleWeatherConfigure() {
   if (!authentication()) {
     return server.requestAuthentication();
   }
-  digitalWrite(externalLight, LOW);
+  ledOnOff(true);
   String html = "";
 
   server.sendHeader("Cache-Control", "no-cache, no-store");
@@ -514,7 +526,7 @@ void handleWeatherConfigure() {
   html = getHeader();
   server.sendContent(html);
   
-  String form = WEATHER_FORM;
+  String form = FPSTR(WEATHER_FORM);
   String isWeatherChecked = "";
   if (DISPLAYWEATHER) {
     isWeatherChecked = "checked='checked'";
@@ -528,7 +540,7 @@ void handleWeatherConfigure() {
     checked = "checked='checked'";
   }
   form.replace("%METRIC%", checked);
-  String options = LANG_OPTIONS;
+  String options = FPSTR(LANG_OPTIONS);
   options.replace(">"+String(WeatherLanguage)+"<", " selected>"+String(WeatherLanguage)+"<");
   form.replace("%LANGUAGEOPTIONS%", options);
   server.sendContent(form);
@@ -537,14 +549,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");
@@ -556,14 +568,61 @@ void handleConfigure() {
   html = getHeader();
   server.sendContent(html);
 
+  CHANGE_FORM =       "<form class='w3-container' action='/updateconfig' method='get'><h2>Station Config:</h2>"
+                      "<p><label>" + printerClient.getPrinterType() + " API Key (get from your server)</label>"
+                      "<input class='w3-input w3-border w3-margin-bottom' type='text' name='PrinterApiKey' id='PrinterApiKey' value='%OCTOKEY%' maxlength='60'></p>";
+  if (printerClient.getPrinterType() == "OctoPrint") {
+    CHANGE_FORM +=      "<p><label>" + printerClient.getPrinterType() + " Host Name (usually octopi)</label><input class='w3-input w3-border w3-margin-bottom' type='text' name='PrinterHostName' value='%OCTOHOST%' maxlength='60'></p>";                        
+  }
+  CHANGE_FORM +=      "<p><label>" + printerClient.getPrinterType() + " Address (do not include http://)</label>"
+                      "<input class='w3-input w3-border w3-margin-bottom' type='text' name='PrinterAddress' id='PrinterAddress' value='%OCTOADDRESS%' maxlength='60'></p>"
+                      "<p><label>" + printerClient.getPrinterType() + " Port</label>"
+                      "<input class='w3-input w3-border w3-margin-bottom' type='text' name='PrinterPort' id='PrinterPort' value='%OCTOPORT%' maxlength='5'  onkeypress='return isNumberKey(event)'></p>";
+  if (printerClient.getPrinterType() == "Repetier") {
+    CHANGE_FORM +=    "<input type='button' value='Test Connection' onclick='testRepetier()'>"
+                      "<input type='hidden' id='selectedPrinter' value='" + printerClient.getPrinterName() + "'><p id='RepetierTest'></p>"
+                      "<script>testRepetier();</script>";                        
+  } else {
+    CHANGE_FORM +=    "<input type='button' value='Test Connection and API JSON Response' onclick='testOctoPrint()'><p id='OctoPrintTest'></p>";
+  }
+  CHANGE_FORM +=      "<p><label>" + printerClient.getPrinterType() + " User (only needed if you have haproxy or basic auth turned on)</label><input class='w3-input w3-border w3-margin-bottom' type='text' name='octoUser' value='%OCTOUSER%' maxlength='30'></p>"
+                      "<p><label>" + printerClient.getPrinterType() + " Password </label><input class='w3-input w3-border w3-margin-bottom' type='password' name='octoPass' value='%OCTOPASS%'></p>";
+
+
+
+  if (printerClient.getPrinterType() == "Repetier") {
+    html = "<script>function testRepetier(){var e=document.getElementById(\"RepetierTest\"),r=document.getElementById(\"PrinterAddress\").value,"
+           "t=document.getElementById(\"PrinterPort\").value;if(\"\"==r||\"\"==t)return e.innerHTML=\"* Address and Port are required\","
+           "void(e.style.background=\"\");var n=\"http://\"+r+\":\"+t;n+=\"/printer/api/?a=listPrinter&apikey=\"+document.getElementById(\"PrinterApiKey\").value,"
+           "console.log(n);var o=new XMLHttpRequest;o.open(\"GET\",n,!0),o.onload=function(){if(200===o.status){var r=JSON.parse(o.responseText);"
+           "if(!r.error&&r.length>0){var t=\"<label>Connected -- Select Printer</label> \";t+=\"<select class='w3-option w3-padding' name='printer'>\";"
+           "var n=document.getElementById(\"selectedPrinter\").value,i=\"\";for(printer in r)i=r[printer].slug==n?\"selected\":\"\","
+           "t+=\"<option value='\"+r[printer].slug+\"' \"+i+\">\"+r[printer].name+\"</option>\";t+=\"</select>\","
+           "e.innerHTML=t,e.style.background=\"lime\"}else e.innerHTML=\"Error invalid API Key: \"+r.error,"
+           "e.style.background=\"red\"}else e.innerHTML=\"Error: \"+o.statusText,e.style.background=\"red\"},"
+           "o.onerror=function(){e.innerHTML=\"Error connecting to server -- check IP and Port\",e.style.background=\"red\"},o.send(null)}</script>";
+
+    server.sendContent(html);
+  } else {
+    html = "<script>function testOctoPrint(){var e=document.getElementById(\"OctoPrintTest\"),t=document.getElementById(\"PrinterAddress\").value,"
+           "n=document.getElementById(\"PrinterPort\").value;if(e.innerHTML=\"\",\"\"==t||\"\"==n)return e.innerHTML=\"* Address and Port are required\","
+           "void(e.style.background=\"\");var r=\"http://\"+t+\":\"+n;r+=\"/api/job?apikey=\"+document.getElementById(\"PrinterApiKey\").value,window.open(r,\"_blank\").focus()}</script>";
+    server.sendContent(html);
+  }
+  
   String form = CHANGE_FORM;
   
-  form.replace("%OCTOKEY%", OctoPrintApiKey);
+  form.replace("%OCTOKEY%", PrinterApiKey);
-  form.replace("%OCTOHOST%", OctoPrintHostName);
+  form.replace("%OCTOHOST%", PrinterHostName);
-  form.replace("%OCTOADDRESS%", OctoPrintServer);
+  form.replace("%OCTOADDRESS%", PrinterServer);
-  form.replace("%OCTOPORT%", String(OctoPrintPort));
+  form.replace("%OCTOPORT%", String(PrinterPort));
-  form.replace("%OCTOUSER%", OctoAuthUser);
+  form.replace("%OCTOUSER%", PrinterAuthUser);
-  form.replace("%OCTOPASS%", OctoAuthPass);
+  form.replace("%OCTOPASS%", PrinterAuthPass);
+
+  server.sendContent(form);
+
+  form = FPSTR(CLOCK_FORM);
+  
   String isClockChecked = "";
   if (DISPLAYCLOCK) {
     isClockChecked = "checked='checked'";
@@ -579,6 +638,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'";
@@ -591,9 +655,9 @@ void handleConfigure() {
 
   server.sendContent(form);
 
-  form = THEME_FORM;
+  form = FPSTR(THEME_FORM);
   
-  String themeOptions = COLOR_THEMES;
+  String themeOptions = FPSTR(COLOR_THEMES);
   themeOptions.replace(">"+String(themeColor)+"<", " selected>"+String(themeColor)+"<");
   form.replace("%THEME_OPTIONS%", themeOptions);
   form.replace("%UTCOFFSET%", String(UtcOffset));
@@ -611,11 +675,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");
@@ -630,7 +694,7 @@ void displayMessage(String message) {
   server.sendContent("");
   server.client().stop();
   
-  digitalWrite(externalLight, HIGH);
+  ledOnOff(false);
 }
 
 void redirectHome() {
@@ -648,7 +712,7 @@ String getHeader() {
 }
 
 String getHeader(boolean refresh) {
-  String menu = WEB_ACTIONS;
+  String menu = FPSTR(WEB_ACTIONS);
 
   String html = "<!DOCTYPE HTML>";
   html += "<html><head><title>Printer Monitor</title><link rel='icon' href='data:;base64,='>";
@@ -696,7 +760,7 @@ String getFooter() {
 }
 
 void displayPrinterStatus() {
-  digitalWrite(externalLight, LOW);
+  ledOnOff(true);
   String html = "";
 
   server.sendHeader("Cache-Control", "no-cache, no-store");
@@ -711,9 +775,14 @@ void displayPrinterStatus() {
     displayTime = timeClient.getHours() + ":" + timeClient.getMinutes() + ":" + timeClient.getSeconds();
   }
   
-  html += "<div class='w3-cell-row' style='width:100%'><h2>Time: " + displayTime + "</h2></div><div class='w3-cell-row'>";
+  html += "<div class='w3-cell-row' style='width:100%'><h2>" + printerClient.getPrinterType() + " Monitor</h2></div><div class='w3-cell-row'>";
   html += "<div class='w3-cell w3-container' style='width:100%'><p>";
-  html += "Host Name: " + OctoPrintHostName + "<br>";
+  if (printerClient.getPrinterType() == "Repetier") {
+    html += "Printer Name: " + printerClient.getPrinterName() + " <a href='/configure' title='Configure'><i class='fa fa-cog'></i></a><br>";
+  } else {
+    html += "Host Name: " + PrinterHostName + " <a href='/configure' title='Configure'><i class='fa fa-cog'></i></a><br>";
+  }
+ 
   if (printerClient.getError() != "") {
     html += "Status: Offline<br>";
     html += "Reason: " + printerClient.getError() + "<br>";
@@ -762,6 +831,8 @@ void displayPrinterStatus() {
 
   html += "</p></div></div>";
 
+  html += "<div class='w3-cell-row' style='width:100%'><h2>Time: " + displayTime + "</h2></div>";
+
   server.sendContent(html); // spit out what we got
   html = "";
   
@@ -792,7 +863,7 @@ void displayPrinterStatus() {
   server.sendContent(String(getFooter()));
   server.sendContent("");
   server.client().stop();
-  digitalWrite(externalLight, HIGH);
+  ledOnOff(false);
 }
 
 void configModeCallback (WiFiManager *myWiFiManager) {
@@ -805,9 +876,9 @@ void configModeCallback (WiFiManager *myWiFiManager) {
   display.drawString(64, 0, "Wifi Manager");
   display.drawString(64, 10, "Please connect to AP");
   display.setFont(ArialMT_Plain_16);
-  display.drawString(64, 23, myWiFiManager->getConfigPortalSSID());
+  display.drawString(64, 26, myWiFiManager->getConfigPortalSSID());
   display.setFont(ArialMT_Plain_10);
-  display.drawString(64, 42, "To setup Wifi connection");
+  display.drawString(64, 46, "To setup Wifi connection");
   display.display();
   
   Serial.println("Wifi Manager");
@@ -817,12 +888,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);
   }
 }
@@ -833,7 +914,8 @@ void drawScreen1(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int
   display->setTextAlignment(TEXT_ALIGN_CENTER);
   display->setFont(ArialMT_Plain_16);
   if (bed != "0") {
-    display->drawString(64 + x, 0 + y, "Bed / Tool Temp");
+    display->drawString(29 + x, 0 + y, "Tool");
+    display->drawString(89 + x, 0 + y, "Bed");
   } else {
     display->drawString(64 + x, 0 + y, "Tool Temp");
   }
@@ -841,8 +923,8 @@ void drawScreen1(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int
   display->setFont(ArialMT_Plain_24);
   if (bed != "0") {
     display->setTextAlignment(TEXT_ALIGN_LEFT);
-    display->drawString(2 + x, 14 + y, bed + "°");
+    display->drawString(12 + x, 14 + y, tool + "°");
-    display->drawString(64 + x, 14 + y, tool + "°");
+    display->drawString(74 + x, 14 + y, bed + "°");
   } else {
     display->setTextAlignment(TEXT_ALIGN_CENTER);
     display->drawString(64 + x, 14 + y, tool + "°");
@@ -888,8 +970,12 @@ void drawClock(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16
   if (IS_24HOUR) {
     displayTime = timeClient.getHours() + ":" + timeClient.getMinutes() + ":" + timeClient.getSeconds(); 
   }
+  String displayName = PrinterHostName;
+  if (printerClient.getPrinterType() == "Repetier") {
+    displayName = printerClient.getPrinterName();
+  }
   display->setFont(ArialMT_Plain_16);
-  display->drawString(64 + x, 0 + y, OctoPrintHostName);
+  display->drawString(64 + x, 0 + y, displayName);
   display->setFont(ArialMT_Plain_24);
   display->drawString(64 + x, 17 + y, displayTime);
 }
@@ -981,12 +1067,16 @@ void drawClockHeaderOverlay(OLEDDisplay *display, OLEDDisplayUiState* state) {
     display->setTextAlignment(TEXT_ALIGN_CENTER);
     if (printerClient.isPSUoff()) {
       display->drawString(64, 47, "psu off");
+    } else if (printerClient.getState() == "Operational") {
+      display->drawString(64, 47, "online");
     } else {
       display->drawString(64, 47, "offline");
     }
   } else {
     if (printerClient.isPSUoff()) {
       display->drawString(0, 47, "psu off");
+    } else if (printerClient.getState() == "Operational") {
+      display->drawString(0, 47, "online");
     } else {
       display->drawString(0, 47, "offline");
     }
@@ -1031,12 +1121,13 @@ void writeSettings() {
   } else {
     Serial.println("Saving settings now...");
     f.println("UtcOffset=" + String(UtcOffset));
-    f.println("octoKey=" + OctoPrintApiKey);
+    f.println("printerApiKey=" + PrinterApiKey);
-    f.println("octoHost=" + OctoPrintHostName);
+    f.println("printerHostName=" + PrinterHostName);
-    f.println("octoServer=" + OctoPrintServer);
+    f.println("printerServer=" + PrinterServer);
-    f.println("octoPort=" + String(OctoPrintPort));
+    f.println("printerPort=" + String(PrinterPort));
-    f.println("octoUser=" + OctoAuthUser);
+    f.println("printerName=" + printerClient.getPrinterName());
-    f.println("octoPass=" + OctoAuthPass);
+    f.println("printerAuthUser=" + PrinterAuthUser);
+    f.println("printerAuthPass=" + PrinterAuthPass);
     f.println("refreshRate=" + String(minutesBetweenDataRefresh));
     f.println("themeColor=" + themeColor);
     f.println("IS_BASIC_AUTH=" + String(IS_BASIC_AUTH));
@@ -1045,6 +1136,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]));
@@ -1072,34 +1164,40 @@ void readSettings() {
       UtcOffset = line.substring(line.lastIndexOf("UtcOffset=") + 10).toFloat();
       Serial.println("UtcOffset=" + String(UtcOffset));
     }
-    if (line.indexOf("octoKey=") >= 0) {
+    if (line.indexOf("printerApiKey=") >= 0) {
-      OctoPrintApiKey = line.substring(line.lastIndexOf("octoKey=") + 8);
+      PrinterApiKey = line.substring(line.lastIndexOf("printerApiKey=") + 14);
-      OctoPrintApiKey.trim();
+      PrinterApiKey.trim();
-      Serial.println("OctoPrintApiKey=" + OctoPrintApiKey);
+      Serial.println("PrinterApiKey=" + PrinterApiKey);
     }
-    if (line.indexOf("octoHost=") >= 0) {
+    if (line.indexOf("printerHostName=") >= 0) {
-      OctoPrintHostName = line.substring(line.lastIndexOf("octoHost=") + 9);
+      PrinterHostName = line.substring(line.lastIndexOf("printerHostName=") + 16);
-      OctoPrintHostName.trim();
+      PrinterHostName.trim();
-      Serial.println("OctoPrintHostName=" + OctoPrintHostName);
+      Serial.println("PrinterHostName=" + PrinterHostName);
     }
-    if (line.indexOf("octoServer=") >= 0) {
+    if (line.indexOf("printerServer=") >= 0) {
-      OctoPrintServer = line.substring(line.lastIndexOf("octoServer=") + 11);
+      PrinterServer = line.substring(line.lastIndexOf("printerServer=") + 14);
-      OctoPrintServer.trim();
+      PrinterServer.trim();
-      Serial.println("OctoPrintServer=" + OctoPrintServer);
+      Serial.println("PrinterServer=" + PrinterServer);
     }
-    if (line.indexOf("octoPort=") >= 0) {
+    if (line.indexOf("printerPort=") >= 0) {
-      OctoPrintPort = line.substring(line.lastIndexOf("octoPort=") + 9).toInt();
+      PrinterPort = line.substring(line.lastIndexOf("printerPort=") + 12).toInt();
-      Serial.println("OctoPrintPort=" + String(OctoPrintPort));
+      Serial.println("PrinterPort=" + String(PrinterPort));
     }
-    if (line.indexOf("octoUser=") >= 0) {
+    if (line.indexOf("printerName=") >= 0) {
-      OctoAuthUser = line.substring(line.lastIndexOf("octoUser=") + 9);
+      String printer = line.substring(line.lastIndexOf("printerName=") + 12);
-      OctoAuthUser.trim();
+      printer.trim();
-      Serial.println("OctoAuthUser=" + OctoAuthUser);
+      printerClient.setPrinterName(printer);
+      Serial.println("PrinterName=" + printerClient.getPrinterName());
     }
-    if (line.indexOf("octoPass=") >= 0) {
+    if (line.indexOf("printerAuthUser=") >= 0) {
-      OctoAuthPass = line.substring(line.lastIndexOf("octoPass=") + 9);
+      PrinterAuthUser = line.substring(line.lastIndexOf("printerAuthUser=") + 16);
-      OctoAuthPass.trim();
+      PrinterAuthUser.trim();
-      Serial.println("OctoAuthPass=" + OctoAuthPass);
+      Serial.println("PrinterAuthUser=" + PrinterAuthUser);
+    }
+    if (line.indexOf("printerAuthPass=") >= 0) {
+      PrinterAuthPass = line.substring(line.lastIndexOf("printerAuthPass=") + 16);
+      PrinterAuthPass.trim();
+      Serial.println("PrinterAuthPass=" + PrinterAuthPass);
     }
     if (line.indexOf("refreshRate=") >= 0) {
       minutesBetweenDataRefresh = line.substring(line.lastIndexOf("refreshRate=") + 12).toInt();
@@ -1138,6 +1236,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));
@@ -1166,7 +1268,7 @@ void readSettings() {
     }
   }
   fr.close();
-  printerClient.updateOctoPrintClient(OctoPrintApiKey, OctoPrintServer, OctoPrintPort, OctoAuthUser, OctoAuthPass, HAS_PSU);
+  printerClient.updatePrintClient(PrinterApiKey, PrinterServer, PrinterPort, PrinterAuthUser, PrinterAuthPass, HAS_PSU);
   weatherClient.updateWeatherApiKey(WeatherApiKey);
   weatherClient.updateLanguage(WeatherLanguage);
   weatherClient.setMetric(IS_METRIC);
@@ -1189,7 +1291,7 @@ void checkDisplay() {
   if (!displayOn && DISPLAYCLOCK) {
     enableDisplay(true);
   }
-  if (displayOn && !(printerClient.isOperational() || printerClient.isPrinting()) && !DISPLAYCLOCK) {
+  if (displayOn && !printerClient.isPrinting() && !DISPLAYCLOCK) {
     // Put Display to sleep
     display.clear();
     display.display();
@@ -1218,7 +1320,7 @@ void checkDisplay() {
       return;
     }
   } else if (DISPLAYCLOCK) {
-    if ((!printerClient.isOperational() || printerClient.isPSUoff()) && !isClockOn) {
+    if ((!printerClient.isPrinting() || printerClient.isPSUoff()) && !isClockOn) {
       Serial.println("Clock Mode is turned on.");
       if (!DISPLAYWEATHER) {
         ui.disableAutoTransition();
@@ -1232,7 +1334,7 @@ void checkDisplay() {
       }
       ui.setOverlays(clockOverlay, numberOfOverlays);
       isClockOn = true;
-    } else if (printerClient.isOperational() && !printerClient.isPSUoff() && isClockOn) {
+    } else if (printerClient.isPrinting() && !printerClient.isPSUoff() && isClockOn) {
       Serial.println("Printer Monitor is active.");
       ui.setFrames(frames, numberOfFrames);
       ui.setOverlays(overlays, numberOfOverlays);