diff --git a/Arduino/CanGrow/CanGrow.ino b/Arduino/CanGrow/CanGrow.ino index 807841d..854b61b 100644 --- a/Arduino/CanGrow/CanGrow.ino +++ b/Arduino/CanGrow/CanGrow.ino @@ -20,6 +20,8 @@ #include // https://github.com/esp8266/Arduino/tree/master/libraries/ESP8266WebServer #include +// OTA update +#include // https://github.com/adafruit/Adafruit-GFX-Library #include // https://github.com/adafruit/Adafruit_SSD1306 @@ -46,12 +48,12 @@ #include "CanGrow_Logo.h" #include "CanGrow_Sensors.h" +#include "CanGrow_Version.h" #include "CanGrow_HTML.h" #include "CanGrow_SysFunctions.h" #include "CanGrow_WebFunctions.h" - /* * Setup * @@ -89,7 +91,11 @@ void setup() { // Write a line before doing serious output, because before there is some garbage in serial // whats get the cursor somewhere over the place Serial.println("420"); - Serial.println(".:: CanGrow Start ::."); + Serial.print(".:: CanGrow v"); + Serial.print(CanGrowVer); + Serial.print(" build "); + Serial.print(CanGrowBuild); + Serial.println(" starting ::."); Serial.println(":: initialise I2C ::"); // initialise Wire for I2C @@ -232,6 +238,9 @@ void loop() { } else { controlLED(); } + + + displayScreens(); // current time gets previous time for new interval diff --git a/Arduino/CanGrow/CanGrow_HTML.h b/Arduino/CanGrow/CanGrow_HTML.h index 3cbec47..5568809 100644 --- a/Arduino/CanGrow/CanGrow_HTML.h +++ b/Arduino/CanGrow/CanGrow_HTML.h @@ -146,7 +146,7 @@ input[type=text], input[type=date], input[type=number], input[type=password], se border-radius: 3px; } - @media only screen and (min-width: 1280px) { + @media only screen and (min-width: 1856px) { .center, .nav { width: 60%; min-width: 420px; } @@ -470,3 +470,14 @@ const char HTMLgauge[] PROGMEM = R"EOF( )EOF"; + + +const char HTMLupdate[] PROGMEM = R"EOF( +

You find the latest CanGrow firmware version on the release page of the git repository.

+
+ Select .bin file:
+ + +
+