diff --git a/Firmware/FLORA_FIRMWARE/FLORA_FIRMWARE.ino b/Firmware/FLORA_FIRMWARE/FLORA_FIRMWARE.ino index f846fa6..78ddf3a 100644 --- a/Firmware/FLORA_FIRMWARE/FLORA_FIRMWARE.ino +++ b/Firmware/FLORA_FIRMWARE/FLORA_FIRMWARE.ino @@ -34,7 +34,7 @@ #define AP_NAME "FLORA_" #define FW_NAME "FLORA" -#define FW_VERSION "4.0" +#define FW_VERSION "4.1" #define CONFIG_TIMEOUT 300000 // 300000 = 5 minutes // ONLY CHANGE DEFINES BELOW IF YOU KNOW WHAT YOU'RE DOING! @@ -176,7 +176,7 @@ const uint8_t bri_vals[3] = { // These need to be multiples of 8 to enable cross const uint8_t bri_vals_separate[3][6] = { {8, 8, 8, 8, 8, 8}, // Low brightness {24, 24, 24, 24, 24, 24}, // Medium brightness - {32, 32, 32, 48, 48, 32}, // High brightness + {48, 48, 48, 48, 48, 48}, // High brightness }; diff --git a/Firmware/FLORA_FIRMWARE/config_portal.ino b/Firmware/FLORA_FIRMWARE/config_portal.ino index 1ae09e1..8e60c52 100644 --- a/Firmware/FLORA_FIRMWARE/config_portal.ino +++ b/Firmware/FLORA_FIRMWARE/config_portal.ino @@ -173,7 +173,7 @@ void handleNotFound() { html += "
"; } html += htmlFooter(); - + server.sendHeader("Cache-Control", "no-cache, no-store, must-revalidate"); server.sendHeader("Pragma", "no-cache"); server.sendHeader("Expires", "-1"); @@ -360,9 +360,12 @@ void handleRoot() { html += ""; +#if !defined(CLOCK_VERSION_IV22) + // gradient doesn't make sense on IV-22 colon html += ""; + html += ">Always ON (gradient)"; +#endif html += ""; diff --git a/Firmware/FLORA_FIRMWARE/neopixel_fns.ino b/Firmware/FLORA_FIRMWARE/neopixel_fns.ino index 3241d17..636945d 100644 --- a/Firmware/FLORA_FIRMWARE/neopixel_fns.ino +++ b/Firmware/FLORA_FIRMWARE/neopixel_fns.ino @@ -42,19 +42,16 @@ void updateColonColor(RgbColor color) { RgbColor colorMed = color; RgbColor colorLow = color; -#if defined(CLOCK_VERSION_IV6) || defined(CLOCK_VERSION_IV12) - if (json["colon"].as