Changed DTC for CAN-Signal timeout (Startup-delay)

.gitignore

@@ -0,0 +1 @@
+Bestellung.xlsx

Hardware/oiler SMD.kicad_pro

@@ -45,7 +45,7 @@
         "silk_text_upright": false,
         "zones": {
           "45_degree_only": false,
-          "min_clearance": 0.254
+          "min_clearance": 0.19999999999999998
         }
       },
       "diff_pair_dimensions": [],

Software/.gitignore

@@ -1,3 +1,4 @@
+data/
 .pio
 .vscode/.browse.c_cpp.db*
 .vscode/c_cpp_properties.json

Software/.vscode/extensions.json

@@ -3,5 +3,8 @@
     // for the documentation about the extensions.json format
     "recommendations": [
         "platformio.platformio-ide"
+    ],
+    "unwantedRecommendations": [
+        "ms-vscode.cpptools-extension-pack"
     ]
 }

Software/ChainLube/src/common.h

@@ -1,33 +0,0 @@
-#ifndef _COMMON_H_
-#define _COMMON_H_
-
-#define Q(x) #x
-#define QUOTE(x) Q(x)
-
-#define GPIO_BUTTON D5
-#define GPIO_LED D6
-#define GPIO_TRIGGER D4
-#define GPIO_PUMP D3
-
-#ifndef HOST_NAME
-#define HOST_NAME "ChainLube_%06X"      // Use printf-Formatting - Chip-ID (uin32_t) will be added
-#endif
-
-#ifndef OTA_DELAY
-#define OTA_DELAY 50  // ticks -> 10ms / tick
-#endif
-
-#ifndef ADMIN_PASSWORD
-#error "You need to define ADMIN_PASSWORD for OTA-Update"
-#endif
-#ifndef WIFI_PASSWORD
-#error "You must define an WIFI_PASSWORD for OTA-Update"
-#endif
-#ifndef WIFI_SSID 
-#error "You must define an WIFI_SSID for OTA-Update"
-#endif
-#ifndef WIFI_AP_PASSWORD
-#error "You must define an WIFI_AP_PASSWORD for Standalone AP-Mode"
-#endif
-
-#endif

Software/ChainLube/src/config.cpp

@@ -1,44 +0,0 @@
-#include <Arduino.h>
-#include "config.h"
-
-LubeConfig_t LubeConfig;
-
-void StoreConfig_EEPROM()
-{
-  LubeConfig.checksum = 0;
-  LubeConfig.checksum = Checksum_EEPROM((uint8_t *)&LubeConfig, sizeof(LubeConfig));
-
-  EEPROM.begin(512);
-  EEPROM.put(0, LubeConfig);
-  EEPROM.commit();
-  EEPROM.end();
-}
-
-void GetConfig_EEPROM()
-{
-  EEPROM.begin(512);
-  EEPROM.get(0, LubeConfig);
-  EEPROM.end();
-
-  uint32_t checksum = LubeConfig.checksum;
-  LubeConfig.checksum = 0;
-
-  if (Checksum_EEPROM((uint8_t *)&LubeConfig, sizeof(LubeConfig)) == checksum)
-    Serial.printf("Checksum OK");
-  else
-    Serial.printf("Checksum BAD");
-}
-
-uint32_t Checksum_EEPROM(uint8_t const *data, size_t len)
-{
-  if (data == NULL)
-    return 0;
-  uint32_t crc = 0;
-  while (len--)
-  {
-    crc ^= *data++;
-    for (uint8_t k = 0; k < 8; k++)
-      crc = crc & 1 ? (crc >> 1) ^ 0xb2 : crc >> 1;
-  }
-  return crc ^ 0xff;
-}

Software/ChainLube/src/config.h

@@ -1,30 +0,0 @@
-#ifndef _CONFIG_H_
-#define _CONFIG_H_
-
-#include <Arduino.h>
-#include <EEPROM.h>
-
-typedef struct
-{
-  uint32_t DistancePerLube_Default = 0;
-  uint32_t DistancePerLube_Rain = 0;
-  uint32_t tankCapacity_ml = 320;
-  uint32_t amountPerDose_µl = 0;
-  uint32_t tankRemain_µl = 0;
-  uint8_t TankRemindAtPercentage = 30;
-  uint8_t PulsePerRevolution = 1;
-  uint32_t TireWidth_mm = 150;
-  uint32_t TireWidthHeight_Ratio = 70;
-  uint32_t RimDiameter_Inch = 18;
-  uint32_t DistancePerRevolution_mm = 2000;
-  uint8_t BleedingPulses = 25;
-  uint32_t checksum = 0;
-} LubeConfig_t;
-
-void StoreConfig_EEPROM();
-void GetConfig_EEPROM();
-uint32_t Checksum_EEPROM(uint8_t const *data, size_t len);
-
-extern LubeConfig_t LubeConfig;
-
-#endif // _CONFIG_H_

Software/ChainLube/src/globals.h

@@ -1,27 +0,0 @@
-#ifndef _GLOBALS_H_
-#define _GLOBALS_H_
-
-#include <Arduino.h>
-
-typedef enum eSystem_Status
-{
-  sysStat_NOP,
-  sysStat_Startup,
-  sysStat_Normal,
-  sysStat_Rain,
-  sysStat_Purge,
-  sysStat_Error
-} tSystem_Status;
-
-
-typedef struct Globals_s {
-  tSystem_Status systemStatus = sysStat_Startup;
-  uint8_t purgePulses= 0;
-  tSystem_Status resumeStatus = sysStat_Startup;
-  char systemStatustxt[16] = "";
-}Globals_t;
-
-extern Globals_t globals;
-extern uint32_t TravelDistance_highRes;
-
-#endif

Software/ChainLube/src/lubeapp.cpp

@@ -1,83 +0,0 @@
-#include "lubeapp.h"
-
-uint32_t lubePulseTimestamp = 0;
-
-void RunLubeApp(volatile uint32_t *wheelPulseCounter)
-{
-    // Calculate traveled Distance in mm
-    TravelDistance_highRes += (*wheelPulseCounter * (LubeConfig.DistancePerRevolution_mm / LubeConfig.PulsePerRevolution));
-    *wheelPulseCounter = 0;
-
-    // check if we have to Lube!
-    switch (globals.systemStatus)
-    {
-    case sysStat_Startup:
-        if (millis() > STARTUP_DELAY)
-        {
-            globals.systemStatus = sysStat_Normal;
-            globals.resumeStatus = sysStat_Normal;
-        }
-        break;
-
-    case sysStat_Normal:
-        if (TravelDistance_highRes / 1000 > LubeConfig.DistancePerLube_Default)
-        {
-            LubePulse();
-            TravelDistance_highRes = 0;
-        }
-        break;
-
-    case sysStat_Rain:
-        if (TravelDistance_highRes / 1000 > LubeConfig.DistancePerLube_Rain)
-        {
-            LubePulse();
-            TravelDistance_highRes = 0;
-        }
-        break;
-    case sysStat_Purge:
-        if (globals.purgePulses > 0)
-        {
-            if (lubePulseTimestamp + LUBE_PULSE_PAUSE_MS < millis())
-            {
-                LubePulse();
-                globals.purgePulses--;
-            }
-        }
-        else
-        {
-            globals.systemStatus = globals.resumeStatus;
-        }
-        break;
-    case sysStat_Error:
-    default:
-        break;
-    }
-
-    switch (globals.systemStatus)
-    {
-    case sysStat_Normal:
-        strcpy(globals.systemStatustxt, "Normal");
-        break;
-    case sysStat_Purge:
-        strcpy(globals.systemStatustxt, "Purge");
-        break;
-    case sysStat_Rain:
-        strcpy(globals.systemStatustxt, "Rain");
-        break;
-    case sysStat_Startup:
-        strcpy(globals.systemStatustxt, "Startup");
-        break;
-    }
-
-    // maintain Pin-State of Lube-Pump
-    if (lubePulseTimestamp > millis())
-        digitalWrite(GPIO_PUMP, HIGH);
-    else
-        digitalWrite(GPIO_PUMP, LOW);
-}
-
-void LubePulse()
-{
-    lubePulseTimestamp = millis() + LUBE_PULSE_LENGHT_MS;
-    LubeConfig.tankRemain_µl = LubeConfig.tankRemain_µl - LubeConfig.amountPerDose_µl;
-}

Software/ChainLube/src/main.cpp

@@ -1,496 +0,0 @@
-#include <Arduino.h>
-#include <Wire.h>
-#include <U8g2lib.h>
-#include <ESP8266WiFi.h>
-#include <ESP8266WiFiMulti.h>
-#include <ESP8266mDNS.h>
-#include <ArduinoOTA.h>
-#include <RemoteDebug.h>
-#include <FastLED.h>
-#include <Ticker.h>
-
-#include "common.h"
-#include "rmtdbghelp.h"
-#include "lubeapp.h"
-#include "webui.h"
-#include "config.h"
-#include "globals.h"
-
-const char *ssid = QUOTE(WIFI_SSID);
-const char *password = QUOTE(WIFI_PASSWORD);
-
-const uint32_t connectTimeoutMs = 5000;
-
-#ifdef DEBUG
-const bool debug_flag = true;
-#else
-const bool debug_flag = false;
-#endif
-
-bool startSetupMode = false;
-char DeviceName[33];
-
-Globals_t globals;
-uint32_t TravelDistance_highRes;
-volatile uint32_t wheel_pulse = 0;
-
-U8X8_SSD1306_128X64_NONAME_HW_I2C u8x8(-1);
-RemoteDebug Debug;
-ESP8266WiFiMulti wifiMulti;
-CRGB leds[1];
-
-// Function-Prototypes
-String IpAddress2String(const IPAddress &ipAddress);
-void processCmdRemoteDebug();
-void RemotDebug_printSystemInfo();
-void RemoteDebug_printWifiInfo();
-void wifiMaintainConnectionTicker_callback();
-void updateWebUITicker_callback();
-void IRAM_ATTR trigger_ISR();
-void LED_Process(uint8_t override = false, CRGB setColor = CRGB::White);
-void Display_Process();
-void Button_Process();
-void startWiFiAP();
-
-Ticker WiFiMaintainConnectionTicker(wifiMaintainConnectionTicker_callback, 1000, 0, MILLIS);
-Ticker UpdateWebUITicker(updateWebUITicker_callback, 5000, 0, MILLIS);
-
-void setup()
-{
-  system_update_cpu_freq(SYS_CPU_80MHZ);
-
-  snprintf(DeviceName, 32, HOST_NAME, ESP.getChipId());
-
-  WiFi.mode(WIFI_OFF);
-  WiFi.persistent(false);
-
-  Serial.begin(115200);
-  Serial.setDebugOutput(true);
-
-  Serial.println("Souko's ChainLube Mk1");
-  Serial.println(DeviceName);
-
-  GetConfig_EEPROM();
-
-  u8x8.begin();
-  u8x8.setFont(u8x8_font_chroma48medium8_r);
-
-  FastLED.addLeds<WS2811, GPIO_LED, GRB>(leds, 1); // GRB ordering is assumed
-
-  pinMode(GPIO_TRIGGER, INPUT_PULLUP);
-  pinMode(GPIO_BUTTON, INPUT_PULLUP);
-  pinMode(GPIO_PUMP, OUTPUT);
-
-  attachInterrupt(digitalPinToInterrupt(GPIO_TRIGGER), trigger_ISR, FALLING);
-
-  WiFi.mode(WIFI_STA);
-  WiFi.setHostname(DeviceName);
-  wifiMulti.addAP(QUOTE(WIFI_SSID), QUOTE(WIFI_PASSWORD));
-
-  WiFiMaintainConnectionTicker.start();
-
-  if (MDNS.begin(DeviceName))
-    MDNS.addService("telnet", "tcp", 23);
-
-  Debug.begin(DeviceName);        // Initialize the WiFi server
-  Debug.setResetCmdEnabled(true); // Enable the reset command
-  Debug.showProfiler(true);       // Profiler (Good to measure times, to optimize codes)
-  Debug.showColors(true);         // Colors
-  Debug.setPassword(QUOTE(ADMIN_PASSWORD));
-
-  Debug.setHelpProjectsCmds(helpCmd);
-  Debug.setCallBackProjectCmds(&processCmdRemoteDebug);
-
-  ArduinoOTA.setPort(8266);
-  ArduinoOTA.setHostname(DeviceName);
-  ArduinoOTA.setPassword(QUOTE(ADMIN_PASSWORD));
-
-  ArduinoOTA.onStart([]()
-                     {
-                       u8x8.clearDisplay();
-                       u8x8.drawString(0, 0, "OTA-Update");
-                       u8x8.refreshDisplay(); });
-
-  ArduinoOTA.onProgress([](unsigned int progress, unsigned int total)
-                        {
-                          static bool refreshed = false;
-                          if (!refreshed)
-                          {
-                            u8x8.clearDisplay();
-                            refreshed = true;
-                            u8x8.drawString(0, 0, "OTA Upload");
-                          }
-                          uint32_t percent = progress / (total / 100);
-                          u8x8.setCursor(0, 1);
-                          u8x8.printf("%d %%", percent);
-                          u8x8.refreshDisplay(); });
-
-  ArduinoOTA.onEnd([]()
-                   {
-                     u8x8.clearDisplay();
-                     u8x8.drawString(0, 0, "OTA-Restart");
-                     u8x8.refreshDisplay(); });
-
-  ArduinoOTA.begin();
-
-  u8x8.clearDisplay();
-  u8x8.drawString(4, 0, "Souko's");
-  u8x8.drawString(1, 1, "ChainLube Mk1");
-  u8x8.refreshDisplay();
-
-  initWebUI();
-  UpdateWebUITicker.start();
-}
-
-void loop()
-{
-  RunLubeApp(&wheel_pulse);
-
-  WiFiMaintainConnectionTicker.update();
-  UpdateWebUITicker.update();
-
-  Display_Process();
-  Button_Process();
-  LED_Process();
-
-  ArduinoOTA.handle();
-  Debug.handle();
-  yield();
-}
-
-String IpAddress2String(const IPAddress &ipAddress)
-{
-  return String(ipAddress[0]) + String(".") +
-         String(ipAddress[1]) + String(".") +
-         String(ipAddress[2]) + String(".") +
-         String(ipAddress[3]);
-}
-
-void processCmdRemoteDebug()
-{
-  String lastCmd = Debug.getLastCommand();
-
-  if (lastCmd == "sysinfo")
-    RemotDebug_printSystemInfo();
-  else if (lastCmd == "netinfo")
-    RemoteDebug_printWifiInfo();
-}
-
-void RemotDebug_printSystemInfo()
-{
-  debugA("Souko's ChainOiler Mk1");
-  debugA("Hostname: %s", DeviceName);
-
-  FlashMode_t ideMode = ESP.getFlashChipMode();
-  debugA("Sdk version: %s", ESP.getSdkVersion());
-  debugA("Core Version: %s", ESP.getCoreVersion().c_str());
-  debugA("Boot Version: %u", ESP.getBootVersion());
-  debugA("Boot Mode: %u", ESP.getBootMode());
-  debugA("CPU Frequency: %u MHz", ESP.getCpuFreqMHz());
-  debugA("Reset reason: %s", ESP.getResetReason().c_str());
-  debugA("Flash Size: %d", ESP.getFlashChipRealSize());
-  debugA("Flash Size IDE: %d", ESP.getFlashChipSize());
-  debugA("Flash ide mode:  %s", (ideMode == FM_QIO ? "QIO" : ideMode == FM_QOUT ? "QOUT"
-                                                         : ideMode == FM_DIO    ? "DIO"
-                                                         : ideMode == FM_DOUT   ? "DOUT"
-                                                                                : "UNKNOWN"));
-  debugA("OTA-Pass: %s", QUOTE(ADMIN_PASSWORD));
-}
-
-void RemoteDebug_printWifiInfo()
-{
-}
-
-void wifiMaintainConnectionTicker_callback()
-{
-  static uint32_t WiFiFailCount = 0;
-  const uint32_t WiFiFailMax = 20;
-
-  if (wifiMulti.run(connectTimeoutMs) == WL_CONNECTED)
-  {
-    return;
-  }
-  else
-  {
-    if (WiFiFailCount < WiFiFailMax)
-    {
-      WiFiFailCount++;
-    }
-    else
-    {
-      Serial.println("WiFi not connected! - Start AP");
-      startWiFiAP();
-    }
-  }
-}
-
-void updateWebUITicker_callback()
-{
-  UpdateWebUI();
-}
-
-void trigger_ISR()
-{
-  wheel_pulse++;
-}
-
-void LED_Process(uint8_t override, CRGB SetColor)
-{
-
-  typedef enum
-  {
-    LED_Startup,
-    LED_Normal,
-    LED_Confirm_Normal,
-    LED_Rain,
-    LED_Confirm_Rain,
-    LED_Purge,
-    LED_Error,
-    LED_Override
-  } tLED_Status;
-
-  static tSystem_Status oldSysStatus = sysStat_NOP;
-  static tLED_Status LED_Status = LED_Startup;
-  static CRGB LED_override_color = 0;
-  static tLED_Status LED_ResumeOverrideStatus = LED_Startup;
-
-  uint8_t color = 0;
-  uint32_t timer = 0;
-  static uint32_t timestamp = 0;
-  timer = millis();
-
-  if (override == 1)
-  {
-    if (LED_Status != LED_Override)
-    {
-      LED_ResumeOverrideStatus = LED_Status;
-      debugA("Override LED_Status");
-    }
-    LED_Status = LED_Override;
-    LED_override_color = SetColor;
-  }
-
-  if (override == 2)
-  {
-    if (LED_Status == LED_Override)
-    {
-      LED_Status = LED_ResumeOverrideStatus;
-      debugA("Resume LED_Status");
-    }
-  }
-
-  if (oldSysStatus != globals.systemStatus)
-  {
-    switch (globals.systemStatus)
-    {
-    case sysStat_Startup:
-      LED_Status = LED_Startup;
-      debugA("sysStat: Startup");
-      break;
-    case sysStat_Normal:
-      timestamp = timer + 3500;
-      LED_Status = LED_Confirm_Normal;
-      debugA("sysStat: Normal");
-      break;
-    case sysStat_Rain:
-      timestamp = timer + 3500;
-      LED_Status = LED_Confirm_Rain;
-      debugA("sysStat: Rain");
-      break;
-    case sysStat_Purge:
-      LED_Status = LED_Purge;
-      debugA("sysStat: Purge");
-      break;
-    case sysStat_Error:
-      LED_Status = LED_Error;
-      debugA("sysStat: Error");
-      break;
-    case sysStat_NOP:
-    default:
-      break;
-    }
-    oldSysStatus = globals.systemStatus;
-  }
-
-  uint32_t percentage = LubeConfig.tankRemain_µl / (LubeConfig.tankCapacity_ml * 10);
-
-  switch (LED_Status)
-  {
-  case LED_Startup:
-    FastLED.setBrightness(255);
-
-    if (percentage < LubeConfig.TankRemindAtPercentage)
-      leds[0] = CRGB::OrangeRed;
-    else
-      leds[0] = CRGB::White;
-    break;
-
-  case LED_Confirm_Normal:
-    FastLED.setBrightness(255);
-    leds[0] = timer % 250 > 125 ? CRGB(0, 255, 0) : CRGB(0, 4, 0);
-    if (timestamp < timer)
-    {
-      LED_Status = LED_Normal;
-      FastLED.setBrightness(64);
-      debugA("LED_Status: Confirm -> Normal");
-    }
-    break;
-
-  case LED_Normal:
-    leds[0] = timer % 2000 > 1950 ? CRGB(0, 255, 0) : CRGB(0, 4, 0);
-    break;
-
-  case LED_Confirm_Rain:
-    FastLED.setBrightness(255);
-    leds[0] = timer % 250 > 125 ? CRGB(0, 0, 255) : CRGB(0, 0, 4);
-    if (timestamp < timer)
-    {
-      LED_Status = LED_Rain;
-      FastLED.setBrightness(64);
-      debugA("LED_Status: Confirm -> Rain");
-    }
-    break;
-
-  case LED_Rain:
-    leds[0] = timer % 2000 > 1950 ? CRGB(0, 0, 255) : CRGB(0, 0, 4);
-    break;
-
-  case LED_Purge:
-    timer = timer % 500;
-    color = timer / 2;
-    leds[0] = CRGB::DeepPink;
-    if (timer < 250)
-      FastLED.setBrightness(color);
-    else
-      FastLED.setBrightness(250 - color);
-    break;
-
-  case LED_Error:
-    leds[0] = timer % 500 > 250 ? CRGB::Red : CRGB::Black;
-    break;
-
-  case LED_Override:
-    leds[0] = LED_override_color;
-    break;
-
-  default:
-    break;
-  }
-  FastLED.show();
-}
-
-void Display_Process()
-{
-  u8x8.setCursor(0, 3);
-  uint32_t DistRemain = globals.systemStatus == sysStat_Normal ? LubeConfig.DistancePerLube_Default : LubeConfig.DistancePerLube_Rain;
-  DistRemain -= TravelDistance_highRes / 1000;
-  u8x8.printf("Mode: %10s\n\n", globals.systemStatustxt);
-  u8x8.printf("next Lube: %4dm\n\n", DistRemain);
-  u8x8.printf("Tank: %8dml\n\n", LubeConfig.tankRemain_µl / 1000);
-  u8x8.refreshDisplay();
-}
-
-void Button_Process()
-{
-
-#define BUTTON_ACTION_DELAY_TOGGLEMODE 500
-#define BUTTON_ACTION_DELAY_PURGE 3500
-#define BUTTON_ACTION_DELAY_WIFI 6500
-#define BUTTON_ACTION_DELAY_NOTHING 9500
-
-  typedef enum buttonAction_e
-  {
-    BTN_INACTIVE,
-    BTN_NOTHING,
-    BTN_TOGGLEMODE,
-    BTN_TOGGLEWIFI,
-    BTN_STARTPURGE
-  } buttonAction_t;
-
-  static uint32_t buttonTimestamp = 0;
-  static buttonAction_t buttonAction = BTN_INACTIVE;
-
-  if (digitalRead(GPIO_BUTTON) == LOW)
-  {
-
-    if (buttonTimestamp == 0)
-      buttonTimestamp = millis();
-
-    if (buttonTimestamp + BUTTON_ACTION_DELAY_NOTHING < millis())
-    {
-      LED_Process(1, CRGB::White);
-      buttonAction = BTN_NOTHING;
-    }
-    else if (buttonTimestamp + BUTTON_ACTION_DELAY_WIFI < millis())
-    {
-      LED_Process(1, CRGB::Yellow);
-      buttonAction = BTN_TOGGLEWIFI;
-    }
-    else if (buttonTimestamp + BUTTON_ACTION_DELAY_PURGE < millis())
-    {
-      LED_Process(1, CRGB::DeepPink);
-      buttonAction = BTN_STARTPURGE;
-    }
-    else if (buttonTimestamp + BUTTON_ACTION_DELAY_TOGGLEMODE < millis())
-    {
-      CRGB color = globals.systemStatus == sysStat_Normal ? CRGB::Blue : CRGB::Green;
-      LED_Process(1, color);
-      buttonAction = BTN_TOGGLEMODE;
-    }
-  }
-  else
-  {
-    if (buttonAction != BTN_INACTIVE)
-    {
-      switch (buttonAction)
-      {
-      case BTN_TOGGLEWIFI:
-        startWiFiAP();
-        debugA("Starting WiFi AP");
-        break;
-
-      case BTN_STARTPURGE:
-        globals.systemStatus = sysStat_Purge;
-        globals.purgePulses = LubeConfig.BleedingPulses;
-        debugA("Starting Purge");
-        break;
-
-      case BTN_TOGGLEMODE:
-        switch (globals.systemStatus)
-        {
-        case sysStat_Normal:
-          globals.systemStatus = sysStat_Rain;
-          globals.resumeStatus = sysStat_Rain;
-          break;
-
-        case sysStat_Rain:
-          globals.systemStatus = sysStat_Normal;
-          globals.resumeStatus = sysStat_Normal;
-          break;
-        default:
-          break;
-        }
-        debugA("Toggling Mode");
-        break;
-
-      case BTN_NOTHING:
-      default:
-        debugA("Nothing or invalid");
-        break;
-      }
-      LED_Process(2);
-    }
-    buttonAction = BTN_INACTIVE;
-    buttonTimestamp = 0;
-  }
-}
-
-void startWiFiAP()
-{
-  WiFi.mode(WIFI_OFF);
-  WiFi.mode(WIFI_AP);
-  WiFi.softAPConfig(IPAddress(WIFI_AP_IP_GW), IPAddress(WIFI_AP_IP_GW), IPAddress(255, 255, 255, 0));
-  WiFi.softAP(DeviceName, QUOTE(WIFI_AP_PASSWORD));
-  WiFiMaintainConnectionTicker.stop();
-  Serial.println("WiFi AP started, stopped Maintain-Timer");
-}

Software/ChainLube/src/rmtdbghelp.h

@@ -1,2 +0,0 @@
-const char helpCmd[] = "sysinfo    - System Info\r\n"
-                       "netinfo    - WiFi Info\r\n";

Software/ChainLube/src/webui.cpp

@@ -1,137 +0,0 @@
-#include "webui.h"
-
-uint16_t tab_lube;
-uint16_t tab_wheel;
-uint16_t tab_tank;
-uint16_t tab_maintenance;
-uint16_t tab_store;
-
-uint16_t num_lubedist_normal;
-uint16_t num_lubedist_rain;
-uint16_t button_lubedist;
-
-uint16_t num_wheel_width;
-uint16_t num_wheel_ratio;
-uint16_t num_wheel_rim;
-uint16_t button_wheelcalc;
-uint16_t num_wheel_ppr;
-uint16_t num_wheel_dist;
-
-uint16_t num_tank_capacity;
-uint16_t num_tank_notify;
-uint16_t num_dose_per_pulse;
-
-uint16_t label_tankRemain;
-uint16_t button_reset_tank;
-uint16_t num_purge_pulses;
-uint16_t button_purge;
-
-uint16_t button_store;
-uint16_t button_reload;
-uint16_t label_storeStatus;
-
-void SettingChanged_Callback(Control *sender, int type)
-{
-  if (sender->id == num_lubedist_normal)
-    LubeConfig.DistancePerLube_Default = ESPUI.getControl(num_lubedist_normal)->value.toInt();
-  else if (sender->id == num_lubedist_rain)
-    LubeConfig.DistancePerLube_Rain = ESPUI.getControl(num_lubedist_rain)->value.toInt();
-  else if (sender->id == num_wheel_width)
-    LubeConfig.TireWidth_mm = ESPUI.getControl(num_wheel_width)->value.toInt();
-  else if (sender->id == num_wheel_ratio)
-    LubeConfig.TireWidthHeight_Ratio = ESPUI.getControl(num_wheel_ratio)->value.toInt();
-  else if (sender->id == num_wheel_rim)
-    LubeConfig.RimDiameter_Inch = ESPUI.getControl(num_wheel_rim)->value.toInt();
-  else if (sender->id == num_wheel_ppr)
-    LubeConfig.PulsePerRevolution = ESPUI.getControl(num_wheel_ppr)->value.toInt();
-  else if (sender->id == num_wheel_dist)
-    LubeConfig.DistancePerRevolution_mm = ESPUI.getControl(num_wheel_dist)->value.toInt();
-  else if (sender->id == num_tank_capacity)
-    LubeConfig.tankCapacity_ml = ESPUI.getControl(num_tank_capacity)->value.toInt();
-  else if (sender->id == num_tank_notify)
-    LubeConfig.TankRemindAtPercentage = ESPUI.getControl(num_tank_notify)->value.toInt();
-  else if (sender->id == num_dose_per_pulse)
-    LubeConfig.amountPerDose_µl = ESPUI.getControl(num_dose_per_pulse)->value.toInt();
-  else if (sender->id == num_purge_pulses)
-    LubeConfig.BleedingPulses = ESPUI.getControl(num_purge_pulses)->value.toInt();
-}
-
-void buttons_Callback(Control *sender, int type)
-{
-  if (type != B_UP)
-    return;
-
-  if (sender->id == button_wheelcalc)
-  {
-    LubeConfig.TireWidth_mm = ESPUI.getControl(num_wheel_width)->value.toInt();
-    LubeConfig.RimDiameter_Inch = ESPUI.getControl(num_wheel_rim)->value.toInt();
-    LubeConfig.TireWidthHeight_Ratio = ESPUI.getControl(num_wheel_ratio)->value.toInt();
-    LubeConfig.DistancePerRevolution_mm = (uint32_t)((((((float)LubeConfig.TireWidthHeight_Ratio / 100.0) * (float)LubeConfig.TireWidth_mm) * 2.0) + ((float)LubeConfig.RimDiameter_Inch * 25.4)) * 3.1416);
-    ESPUI.updateControlValue(num_wheel_dist, String(LubeConfig.DistancePerRevolution_mm));
-  }
-
-  if (sender->id == button_reset_tank)
-  {
-    LubeConfig.tankRemain_µl = LubeConfig.tankCapacity_ml * 1000;
-    ESPUI.print(label_tankRemain, String(LubeConfig.tankRemain_µl / 1000));
-  }
-
-  if (sender->id == button_purge)
-  {
-    Serial.printf("Starting to Purge with %d pulses", LubeConfig.BleedingPulses);
-    globals.purgePulses = LubeConfig.BleedingPulses;
-    globals.resumeStatus = globals.systemStatus;
-    globals.systemStatus = sysStat_Purge;
-  }
-
-  if (sender->id == button_store)
-  {
-    StoreConfig_EEPROM();
-    ESPUI.print(label_storeStatus, "Successfully Stored Settings");
-  }
-
-  if (sender->id == button_reload)
-  {
-    GetConfig_EEPROM();
-    ESPUI.print(label_storeStatus, "Successfully Reloaded Settings");
-  }
-}
-
-void initWebUI()
-{
-  tab_lube = ESPUI.addControl(ControlType::Tab, "Dosierung", "Dosierung");
-  tab_wheel = ESPUI.addControl(ControlType::Tab, "Erfassung", "Erfassung");
-  tab_tank = ESPUI.addControl(ControlType::Tab, "Tank", "Tank");
-  tab_maintenance = ESPUI.addControl(ControlType::Tab, "Wartung", "Wartung");
-  tab_store = ESPUI.addControl(ControlType::Tab, "Speichern", "Speichern");
-
-  num_lubedist_normal = ESPUI.addControl(ControlType::Number, "Öl-Impuls alle x Meter (Normal)", String(LubeConfig.DistancePerLube_Default), ControlColor::Emerald, tab_lube, &SettingChanged_Callback);
-  num_lubedist_rain = ESPUI.addControl(ControlType::Number, "Öl-Impuls alle x Meter (Regen)", String(LubeConfig.DistancePerLube_Rain), ControlColor::Emerald, tab_lube, &SettingChanged_Callback);
-
-  num_wheel_width = ESPUI.addControl(ControlType::Number, "Reifenbreite (mm)", String(LubeConfig.TireWidth_mm), ControlColor::Peterriver, tab_wheel, &SettingChanged_Callback);
-  num_wheel_ratio = ESPUI.addControl(ControlType::Number, "Höhe/Breite-Verhältniss", String(LubeConfig.TireWidthHeight_Ratio), ControlColor::Peterriver, tab_wheel, &SettingChanged_Callback);
-  num_wheel_rim = ESPUI.addControl(ControlType::Number, "Felgendurchmesser (Zoll)", String(LubeConfig.RimDiameter_Inch), ControlColor::Peterriver, tab_wheel, &SettingChanged_Callback);
-  button_wheelcalc = ESPUI.addControl(ControlType::Button, "Abrollumfang aus Reifendaten berechnen", "Berechnen", ControlColor::Peterriver, tab_wheel, &buttons_Callback);
-  num_wheel_dist = ESPUI.addControl(ControlType::Number, "Wegstrecke pro Radumdrehung (mm)", String(LubeConfig.DistancePerRevolution_mm), ControlColor::Wetasphalt, tab_wheel, &SettingChanged_Callback);
-  num_wheel_ppr = ESPUI.addControl(ControlType::Number, "Sensorimpulse pro Umdrehung", String(LubeConfig.PulsePerRevolution), ControlColor::Wetasphalt, tab_wheel, &SettingChanged_Callback);
-
-  num_tank_capacity = ESPUI.addControl(ControlType::Number, "Tankinhalt maximal (ml)", String(LubeConfig.tankCapacity_ml), ControlColor::Carrot, tab_tank, &SettingChanged_Callback);
-  num_tank_notify = ESPUI.addControl(ControlType::Number, "Tankinhalt Warnung (%)", String(LubeConfig.TankRemindAtPercentage), ControlColor::Carrot, tab_tank, &SettingChanged_Callback);
-  num_dose_per_pulse = ESPUI.addControl(ControlType::Number, "Menge pro Pumpenimpuls (µl)", String(LubeConfig.amountPerDose_µl), ControlColor::Carrot, tab_tank, &SettingChanged_Callback);
-
-  label_tankRemain = ESPUI.addControl(ControlType::Label, "Tankinhalt verbleibend (ml, geschätzt)", String(LubeConfig.tankRemain_µl / 1000), ControlColor::Alizarin, tab_maintenance);
-  button_reset_tank = ESPUI.addControl(ControlType::Button, "Tankinhalt zurücksetzen", "Reset", ControlColor::Alizarin, tab_maintenance, &buttons_Callback);
-  num_purge_pulses = ESPUI.addControl(ControlType::Number, "Entlüftung Impulse", String(LubeConfig.BleedingPulses), ControlColor::Alizarin, tab_maintenance, &SettingChanged_Callback);
-  button_purge = ESPUI.addControl(ControlType::Button, "Leitung Entlüften", "Start", ControlColor::Alizarin, tab_maintenance, &buttons_Callback);
-
-  button_store = ESPUI.addControl(ControlType::Button, "Einstellungen permanent speichern", "Speichern", ControlColor::Turquoise, tab_store, &buttons_Callback);
-  button_reload = ESPUI.addControl(ControlType::Button, "Einstellungen neu laden", "Laden", ControlColor::Turquoise, tab_store, &buttons_Callback);
-  label_storeStatus = ESPUI.addControl(ControlType::Label, "Status", "", ControlColor::Turquoise, tab_store);
-
-  ESPUI.begin("Souko's ChainLube Mk1");
-}
-
-void UpdateWebUI()
-{
-     ESPUI.print(label_tankRemain, String(LubeConfig.tankRemain_µl / 1000) + " ml" );
-}

Software/ChainLube/src/webui.h

@@ -1,13 +0,0 @@
-#ifndef _WEBUI_H_
-#define _WEBUI_H_
-
-#include <Arduino.h>
-#include <ESPUI.h>
-#include "config.h"
-#include "globals.h"
-
-void initWebUI();
-void UpdateWebUI();
-
-
-#endif

Software/data_src/index.htm

@@ -0,0 +1,820 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+  <title>KTM CAN Chain Oiler</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="stylesheet" href="static/css/bootstrap.min.css">
+  <link rel="stylesheet" href="static/css/custom.css">
+  <link rel="stylesheet" href="static/css/tweaks.css">
+  <script src="static/js/jquery.min.js"></script>
+  <script src="static/js/bootstrap.min.js"></script>
+  <script src="static/js/websocket.js"></script>
+  <link rel="apple-touch-icon" sizes="180x180" href="static/img/apple-touch-icon.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="static/img/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="static/img/favicon-16x16.png">
+  <link rel="manifest" href="static/img/site.webmanifest">
+</head>
+
+<body>
+
+  <nav class="navbar fixed-top navbar-dark bg-primary" id="navbar1">
+    <a class="navbar-brand" href="#">
+      <img src="static/img/logo.png" width="30" height="30" class="d-inline-block align-top mr-1" alt="">
+      KTM CAN ChainLube
+    </a>
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsingNavbar"
+      aria-controls="collapsingNavbar" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="collapsingNavbar">
+      <ul class="navbar-nav nav mr-auto mt-2 mt-lg-0">
+
+        <li class="nav-item"><a class="nav-link active" role="tab" data-toggle="tab" href="#tab_home">Home</a></li>
+        <li class="nav-item"><a class="nav-link" role="tab" data-toggle="tab" href="#tab_maintenance">Wartung</a></li>
+        <li class="nav-item"><a class="nav-link" role="tab" data-toggle="tab" href="#tab_source">Einstellungen</a></li>
+        <li class="nav-item"><a class="nav-link" role="tab" data-toggle="tab" href="#tab_sysinfo">Systeminfo</a></li>
+        <li class="nav-item"><a class="nav-link" role="tab" data-toggle="tab" href="#tab_fwupdate">Update</a></li>
+
+      </ul>
+    </div>
+  </nav>
+
+  <main class="container">
+
+    <!-- Tabs Content -->
+    <div class="tab-content">
+      <!-- Div Tab Home-->
+      <div id="tab_home" class="tab-pane fade show active" role="tabpanel">
+        <div class="col text-center">
+          <div class="jumbotron">
+            <img src="static/img/logo.png" width="120" height="120" class="img-fluid" alt="">
+            <h3 class="pt-3">KTM CAN Chain Lube</h3>
+          </div>
+        </div>
+        <!-- Div Group Tank remain -->
+        <hr />
+        <p>
+        <h4>Tankinhalt verbleibend</h4>
+        <div class="progress">
+          <div class="progress-bar text-light" role="progressbar" aria-valuenow="%TANK_REMAIN_CAPACITY%"
+            aria-valuemin="0" aria-valuemax="100" style="width: %TANK_REMAIN_CAPACITY%&#37;">
+            %TANK_REMAIN_CAPACITY%&#37;
+          </div>
+        </div>
+        </p>
+        <!-- Div Group Tank remain -->
+        <!-- Div Group current Mode -->
+        <hr />
+        <p>
+        <h4>aktueller Modus</h4>
+        <input class="form-control" type="text" placeholder="%SYSTEM_STATUS%" readonly>
+        </p>
+        <!-- Div Group current Mode -->
+        <!-- Div Group DTC Table -->
+        <div %SHOW_DTC_TABLE%>
+          <hr />
+          <p>
+          <h4>Fehlercodes</h4>
+          <table class="table">
+            <tbody>
+              <tr>
+                <th class="col-6" scope="col">Zeitstempel</th>
+                <th class="col-2" scope="col">Fehlercode</th>
+                <th class="col-2" scope="col">Schwere</th>
+                <th class="col-2" scope="col">Aktiv</th>
+              </tr>
+              %DTC_TABLE%
+            </tbody>
+          </table>
+          </p>
+        </div>
+        <!-- Div Group DTC Table -->
+      </div>
+      <!-- Div Tab Home-->
+
+      <!-- Div Tab Maintenance -->
+      <div id="tab_maintenance" class="tab-pane fade" role="tabpanel">
+        <h3>Wartung</h3>
+        <!-- Div Group Tank remain -->
+        <hr />
+        <p>
+        <h4>&Ouml;lvorrat</h4>
+        <form action="post.htm" method="POST" class="form-horizontal">
+          <div class="form-group row">
+            <label for="tankremain_maint" class="control-label col-4">Tankinhalt verbleibend</label>
+            <div class="col-8">
+              <div class="progress">
+                <div id="tankremain_maint" class="progress-bar text-light" role="progressbar"
+                  aria-valuenow="%TANK_REMAIN_CAPACITY%" aria-valuemin="0" aria-valuemax="100"
+                  style="width: %TANK_REMAIN_CAPACITY%&#37;">
+                  %TANK_REMAIN_CAPACITY%&#37;
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="form-group row">
+            <div class="col text-center">
+              <button name="resettank" type="submit" class="btn btn-outline-primary ml-2">Tank zurücksetzen</button>
+            </div>
+          </div>
+        </form>
+        </p>
+        <!-- Div Group Tank remain -->
+        <!-- Div Group Purging -->
+        <hr />
+        <p>
+        <h4>Entl&uuml;ftung</h4>
+        <form action="post.htm" method="POST" class="form-horizontal">
+          <div class="form-group row">
+            <label for="purgepulse" class="control-label col-4">Entl&uuml;ftung Dosierung</label>
+            <div class="col-8">
+              <div class="input-group">
+                <input id="purgepulse" name="purgepulse" value="%BLEEDING_PULSES%" type="text" class="form-control">
+                <div class="input-group-append">
+                  <span class="input-group-text">Pulse</span>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="form-group row">
+            <div class="col text-center">
+              <button name="maintsave" type="submit" class="btn btn-outline-primary">Speichern</button>
+              <button name="purgenow" type="submit" class="btn btn-outline-primary ml-2">Entlüftung starten</button>
+            </div>
+          </div>
+        </form>
+        </p>
+        <!-- Div Group Purging -->
+        <!-- Div Group Measure -->
+        <div %SHOW_IMPULSE_SETTINGS%>
+          <hr />
+          <p>
+          <h4>Einmessen</h4>
+          <form action="post.htm" method="POST" class="form-horizontal">
+            <div class="form-group row">
+              <label for="measuredpulses" class="control-label col-4">erfasste Pulse</label>
+              <div class="col-8">
+                <div class="input-group">
+                  <input id="measuredpulses" name="measuredpulses" value="%MEASURED_PULSES%" type="text" readonly
+                    class="form-control">
+                  <div class="input-group-append">
+                    <span class="input-group-text">Pulse</span>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="form-group row">
+              <div class="col text-center">
+                <button name="measurestartstop" type="submit" class="btn btn-outline-primary">%MEASURE_BTN%</button>
+                <button name="measurereset" type="submit" class="btn btn-outline-primary ml-2">Reset</button>
+              </div>
+            </div>
+          </form>
+          </p>
+        </div>
+        <!-- Div Group Purging -->
+        <!-- Div Group EEPROM formatting -->
+        <hr />
+        <p>
+        <h4>EEPROM formatieren</h4>
+        <div class="alert alert-primary alert-dismissable show fade" role="alert">
+          <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+            <span aria-hidden="true">×</span>
+          </button>
+          <strong>Achtung!</strong><br>
+          Das Formatieren der EEPROM-Bereiche sollte nur ausgeführt werden wenn es unbedingt erforderlich ist!
+          Hierdurch werden alle Einstellungen zurück gesetzt bzw. alle Betriebsdaten gehen verloren.
+          Folgende Situationen erfordern unter anderem eine Formatierung:
+          - Erstinitialisierung (bei neu aufgebautem Gerät)
+          - Firmware-Update (nur wenn es die Release-Notes fordern)
+        </div>
+        <form action="post.htm" method="POST" class="form-horizontal">
+          <div class="form-group row">
+            <div class="offset-4 col-8">
+              <div class="form-check">
+                <input class="form-check-input" type="checkbox" name="reset_ee_cfg" id="reset_ee_cfg">
+                <label class="form-check-label" for="reset_ee_cfg">
+                  Bereich "CFG"
+                </label>
+              </div>
+              <div class="form-check">
+                <input class="form-check-input" type="checkbox" name="reset_ee_pds" id="reset_ee_pds">
+                <label class="form-check-label" for="reset_ee_pds">
+                  Bereich "PDS"
+                </label>
+              </div>
+            </div>
+          </div>
+          <div class="form-group row">
+            <div class="col text-center">
+              <button name="reset_ee_btn" type="submit" class="btn btn-outline-primary">EEPROM formatieren</button>
+            </div>
+          </div>
+        </form>
+        </p>
+        <!-- Div Group EEPROM formatting -->
+        <!-- Div Group Device Reboot -->
+        <hr />
+        <p>
+        <h4>Ger&auml;t neustarten</h4>
+        <form action="post.htm" method="POST" class="form-horizontal">
+          <div class="form-group row">
+            <div class="col text-center">
+              <button name="reboot" type="submit" class="btn btn-outline-primary">Reboot</button>
+            </div>
+          </div>
+        </form>
+        </p>
+        <!-- Div Group Device Reboot -->
+      </div>
+      <!-- Div Tab Maintenance -->
+
+      <!-- Div Tab Settings-->
+      <div id="tab_source" class="tab-pane fade" role="tabpanel">
+        <h3>Einstellungen</h3>
+        <!-- Div Group Signal Source -->
+        <hr />
+        <p>
+        <h4>Signalquelle</h4>
+        <form action="post.htm" method="POST" class="form-horizontal">
+          <div class="form-group row">
+            <label for="sourceselect" class="control-label col-4">Schnittstelle</label>
+            <div class="col-8">
+              <select id="sourceselect" name="sourceselect" class="select form-control">
+                %SOURCE_SELECT_OPTIONS%
+              </select>
+            </div>
+          </div>
+          <div class="alert alert-primary alert-dismissable show fade" role="alert">
+            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+              <span aria-hidden="true">×</span>
+            </button>
+            <strong>Achtung!</strong><br>
+            Bei Änderung der Signalquelle wird der CAN-Oiler neu gestartet.
+            Dadurch wird die WiFi-Verbindung getrennt und muss neu aufgebaut werden.
+          </div>
+          <div class="form-group row">
+            <div class="col text-center">
+              <button name="sourcesave" type="submit" class="btn btn-outline-primary">&Uuml;bernehmen</button>
+            </div>
+          </div>
+        </form>
+        </p>
+        <!-- Div Group Signal Source -->
+        <!-- Div Group Source:Impulse Settings-->
+        <div %SHOW_IMPULSE_SETTINGS%>
+          <hr />
+          <p>
+          <h4>Einstellungen Impulseingang</h4>
+          <form action="post.htm" method="POST" class="form-horizontal">
+
+            <div class="form-group row">
+              <label for="tirewidth" class="control-label col-4">Reifenbreite</label>
+              <div class="col-8">
+                <div class="input-group">
+                  <input id="tirewidth" name="tirewidth" type="text" required="required" class="form-control"
+                    value="%TIRE_WIDTH_MM%">
+                  <div class="input-group-append">
+                    <span class="input-group-text">mm</span>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+            <div class="form-group row">
+              <label for="tireratio" class="control-label col-4">Höhe/Breite-Verhältniss</label>
+              <div class="col-8">
+                <div class="input-group">
+                  <input id="tireratio" name="tireratio" type="text" required="required" class="form-control"
+                    value="%TIRE_RATIO%">
+                  <div class="input-group-append">
+                    <span class="input-group-text">mm</span>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="form-group row">
+              <label for="tiredia" class="control-label col-4">Felgendurchmesser</label>
+              <div class="col-8">
+                <div class="input-group">
+                  <input id="tiredia" name="tiredia" type="text" required="required" class="form-control"
+                    value="%RIM_DIAMETER%">
+                  <div class="input-group-append">
+                    <span class="input-group-text">"</span>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="form-group row">
+              <label for="pulserev" class="control-label col-4">Pulse pro Umdrehung</label>
+              <div class="col-8">
+                <div class="input-group">
+                  <input id="pulserev" name="pulserev" type="text" required="required" class="form-control"
+                    value="%PULSE_PER_REV%">
+                  <div class="input-group-addon"></div>
+                </div>
+              </div>
+            </div>
+            <div class="form-group row">
+              <div class="col text-center">
+                <button name="pulsesave" type="submit" class="btn btn-outline-primary">Speichern</button>
+              </div>
+            </div>
+          </form>
+          </p>
+        </div>
+        <!-- Div Group Source:Impulse Settings-->
+        <!-- Div Group Source:CAN Settings-->
+        <div %SHOW_CAN_SETTINGS%>
+          <hr />
+          <p>
+          <h4>Einstellungen CAN-Bus</h4>
+          <form action="post.htm" method="POST" class="form-horizontal">
+            <div class="form-group row">
+              <label for="cansource" class="control-label col-4">Model</label>
+              <div class="col-8">
+                <select id="cansource" name="cansource" class="select form-control">
+                  %CANSOURCE_SELECT_OPTIONS%
+                </select>
+              </div>
+            </div>
+            <div class="form-group row">
+              <div class="col text-center">
+                <button name="cansave" type="submit" class="btn btn-outline-primary">Speichern</button>
+              </div>
+            </div>
+          </form>
+          </p>
+        </div>
+        <!-- Div Group Source:CAN Settings-->
+        <!-- Div Group Source:GPS Settings-->
+        <div %SHOW_GPS_SETTINGS%>
+          <hr />
+          <p>
+          <h4>Einstellungen GPS</h4>
+          <form action="post.htm" method="POST" class="form-horizontal">
+            <div class="form-group row">
+              <label for="gpsbaud" class="control-label col-4">Baudrate</label>
+              <div class="col-8">
+                <select id="gpsbaud" name="gpsbaud" class="select form-control">
+                  %GPSBAUD_SELECT_OPTIONS%
+                </select>
+              </div>
+            </div>
+            <div class="form-group row">
+              <div class="col text-center">
+                <button name="gpssave" type="submit" class="btn btn-outline-primary">Speichern</button>
+              </div>
+            </div>
+          </form>
+          </p>
+        </div>
+        <!-- Div Group Source:GPS Settings-->
+        <!-- Div Group Lube Settings-->
+        <hr />
+        <p>
+        <h4>Dosierung</h4>
+        <form action="post.htm" method="POST" class="form-horizontal">
+          <div class="form-group row">
+            <label for="lubedistancenormal" class="control-label col-4">Normal (gr&uuml;n)</label>
+            <div class="col-8">
+              <div class="input-group">
+                <input id="lubedistancenormal" name="lubedistancenormal" value="%LUBE_DISTANCE_NORMAL%" type="text"
+                  class="form-control" required="required">
+                <div class="input-group-append">
+                  <span class="input-group-text">m</span>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="form-group row">
+            <label for="lubedistancerain" class="control-label col-4">Regen (blau)</label>
+            <div class="col-8">
+              <div class="input-group">
+                <input id="lubedistancerain" name="lubedistancerain" value="%LUBE_DISTANCE_RAIN%" type="text"
+                  class="form-control" required="required">
+                <div class="input-group-append">
+                  <span class="input-group-text">m</span>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="form-group row">
+            <div class="col text-center">
+              <button name="oilsave" type="submit" class="btn btn-outline-primary">Speichern</button>
+            </div>
+          </div>
+        </form>
+        </p>
+        <!-- Div Group Lube Settings-->
+        <!-- Div Group Oiltank Settings -->
+        <hr />
+        <p>
+        <h4>&Ouml;ltank</h4>
+        <form action="post.htm" method="POST" class="form-horizontal">
+          <div class="form-group row">
+            <label for="tankcap" class="control-label col-4">Tankkapazität</label>
+            <div class="col-8">
+              <div class="input-group">
+                <input id="tankcap" name="tankcap" value="%TANK_CAPACITY%" type="text" class="form-control"
+                  required="required">
+                <div class="input-group-append">
+                  <span class="input-group-text">ml</span>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="form-group row">
+            <label for="tankwarn" class="control-label col-4">Leer-Warnung</label>
+            <div class="col-8">
+              <div class="input-group">
+                <input id="tankwarn" name="tankwarn" value="%TANK_REMIND%" type="text" class="form-control"
+                  required="required">
+                <div class="input-group-append">
+                  <span class="input-group-text">&#37;</span>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="form-group row">
+            <label for="pumppulse" class="control-label col-4">Menge pro Puls</label>
+            <div class="col-8">
+              <div class="input-group">
+                <input id="pumppulse" name="pumppulse" value="%AMOUNT_PER_DOSE%" type="text" class="form-control"
+                  required="required">
+                <div class="input-group-append">
+                  <span class="input-group-text">µl</span>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="form-group row">
+            <div class="col text-center">
+              <button name="oilsave" type="submit" class="btn btn-outline-primary">Speichern</button>
+            </div>
+          </div>
+        </form>
+        </p>
+        <!-- Div Group Oiltank Settings -->
+        <!-- Div Group LED Settings-->
+        <hr />
+        <p>
+        <h4>LED Einstellungen</h4>
+        <form action="post.htm" method="POST" class="form-horizontal">
+          <div class="form-group row">
+            <label for="ledmodeflash" class="control-label col-4">LED Modus blinken</label>
+            <div class="col-8">
+              <div class="form-check">
+                <input class="form-check-input" type="checkbox" name="ledmodeflash" id="ledmodeflash" %LEDFLASHCHECKED%>
+                <label class="form-check-label" for="ledmodeflash">
+                  LED blinken
+                </label>
+              </div>
+            </div>
+          </div>
+          <div class="form-group row">
+            <label for="ledmaxbrightness" class="control-label col-4">Max Helligkeit</label>
+            <div class="col-8">
+              <div class="input-group">
+                <input id="ledmaxbrightness" name="ledmaxbrightness" value="%LED_MAX_BRIGHTNESS%" type="text"
+                  class="form-control" required="required">
+              </div>
+            </div>
+          </div>
+          <div class="form-group row">
+            <label for="ledminbrightness" class="control-label col-4">Min Helligkeit</label>
+            <div class="col-8">
+              <div class="input-group">
+                <input id="ledminbrightness" name="ledminbrightness" value="%LED_MIN_BRIGHTNESS%" type="text"
+                  class="form-control" required="required">
+              </div>
+            </div>
+          </div>
+          <div class="form-group row">
+            <div class="col text-center">
+              <button name="ledsave" type="submit" class="btn btn-outline-primary">Speichern</button>
+            </div>
+          </div>
+        </form>
+        </p>
+        <!-- Div Group Lube Settings-->
+      </div>
+      <!-- Div Tab Settings -->
+
+      <!-- Div Tab SystemInfo -->
+      <div id="tab_sysinfo" class="tab-pane fade" role="tabpanel">
+        <h3>Systeminfo</h3>
+        <!-- Div Group Sysinfo:Settings -->
+        <hr />
+        <p>
+        <h4>Einstellungen</h4>
+        <table class="table">
+          <tbody>
+            <tr>
+              <th class="col-7" scope="col">Parameter</td>
+              <th class="col-5" scope="col">Value</td>
+            </tr>
+            <tr>
+              <td>DistancePerLube_Default</td>
+              <td>%LUBE_DISTANCE_NORMAL%</td>
+            </tr>
+            <tr>
+              <td>DistancePerLube_Rain</td>
+              <td>%LUBE_DISTANCE_RAIN%</td>
+            </tr>
+            <tr>
+              <td>tankCapacity_ml</td>
+              <td>%TANK_CAPACITY%</td>
+            </tr>
+            <tr>
+              <td>amountPerDose_&micro;l</td>
+              <td>%AMOUNT_PER_DOSE%</td>
+            </tr>
+            <tr>
+              <td>TankRemindAtPercentage</td>
+              <td>%TANK_REMIND%</td>
+            </tr>
+            <tr>
+              <td>PulsePerRevolution</td>
+              <td>%PULSE_PER_REV%</td>
+            </tr>
+            <tr>
+              <td>TireWidth_mm</td>
+              <td>%TIRE_WIDTH_MM%</td>
+            </tr>
+            <tr>
+              <td>TireWidthHeight_Ratio</td>
+              <td>%TIRE_RATIO%</td>
+            </tr>
+            <tr>
+              <td>RimDiameter_Inch</td>
+              <td>%RIM_DIAMETER%</td>
+            </tr>
+            <tr>
+              <td>DistancePerRevolution_mm</td>
+              <td>%DISTANCE_PER_REV%</td>
+            </tr>
+            <tr>
+              <td>BleedingPulses</td>
+              <td>%BLEEDING_PULSES%</td>
+            </tr>
+            <tr>
+              <td>SpeedSource</td>
+              <td>%SPEED_SOURCE%</td>
+            </tr>
+            <tr>
+              <td>GPSBaudRate</td>
+              <td>%GPS_BAUD%</td>
+            </tr>
+            <tr>
+              <td>CANSource</td>
+              <td>%CAN_SOURCE%</td>
+            </tr>
+            <tr>
+              <td>LED Mode Flash</td>
+              <td>%LED_MODE_FLASH%</td>
+            </tr>
+            <tr>
+              <td>LED Max Brightness</td>
+              <td>%LED_MAX_BRIGHTNESS%</td>
+            </tr>
+            <tr>
+              <td>LED Min Brightness</td>
+              <td>%LED_MIN_BRIGHTNESS%</td>
+            </tr>
+            <tr>
+              <td>EEPROM Version</td>
+              <td>%EEPROM_VERSION%</td>
+            </tr>
+            <tr>
+              <td>Checksum</td>
+              <td>%CONFIG_CHECKSUM%</td>
+            </tr>
+          </tbody>
+        </table>
+        </p>
+        <!-- Div Group Sysinfo:Settings -->
+        <!-- Div Group Sysinfo:Persistance -->
+        <hr />
+        <p>
+        <h4>Betriebsdaten</h4>
+        <table class="table">
+          <tbody>
+            <tr>
+              <th class="col-7" scope="col">Parameter</td>
+              <th class="col-5" scope="col">Value</td>
+            </tr>
+            <tr>
+              <td>writeCycleCounter</td>
+              <td>%WRITE_CYCLE_COUNT%</td>
+            </tr>
+            <tr>
+              <td>PersistenceMarker</td>
+              <td>%PERSISTENCE_MARKER%</td>
+            </tr>
+            <tr>
+              <td>tankRemain_µl</td>
+              <td>%TANK_REMAIN_UL%</td>
+            </tr>
+            <tr>
+              <td>TravelDistance_highRes</td>
+              <td>%TRAVEL_DISTANCE_HIGHRES%</td>
+            </tr>
+            <tr>
+              <td>Odometer</td>
+              <td>%ODOMETER%,%ODOMETER_M%</td>
+            </tr>
+            <tr>
+              <td>checksum</td>
+              <td>%PERSISTANCE_CHECKSUM%</td>
+            </tr>
+        </table>
+        </p>
+        <!-- Div Group Sysinfo:Persistance -->
+        <!-- Div Group LiveDebug -->
+        <hr />
+        <p>
+        <h4>Live Debug</h4>
+        <div class="form-group row">
+          <textarea class="form-control" spellcheck="false" id="livedebug-out" rows="3" readonly></textarea>
+        </div>
+        <div class="form-group row">
+          <div class="col text-center">
+            <button id="btn-ws-start" class="btn btn-outline-primary">Start</button>
+            <button id="btn-ws-stop" class="btn btn-outline-primary ml-2">Stop</button>
+          </div>
+        </div>
+        </p>
+        <!-- Div Group LiveDebug -->
+      </div>
+      <!-- Div Tab SystemInfo -->
+
+      <!-- Div Tab Firmware Update-->
+      <div id="tab_fwupdate" class="tab-pane fade" role="tabpanel">
+        <h3>Firmware</h3>
+        <!-- Div Group VersionInfo -->
+        <hr />
+        <p>
+        <h4>Version-Info</h4>
+        <table class="table">
+          <tbody>
+            <tr>
+              <th class="col-7" scope="col">Parameter</td>
+              <th class="col-5" scope="col">Value</td>
+            </tr>
+            <tr>
+              <td>Firmware Version</td>
+              <td>%SW_VERSION%</td>
+            </tr>
+            <tr>
+              <td>Flash Version</td>
+              <td>%FS_VERSION%</td>
+            </tr>
+            <tr>
+              <td>Git Revision</td>
+              <td>%GIT_REV%</td>
+            </tr>
+        </table>
+        </p>
+        <!-- Div Group VersionInfo -->
+        <!-- Div Group EEPROM Backup -->
+        <hr />
+        <p>
+        <h4>EEPROM-Backup</h4>
+        <div class="form-group row">
+          <div class="col text-center">
+            <a class="btn btn-outline-primary" href="eejson" role="button" id="ee-backup-download">Download</a>
+          </div>
+        </div>
+        </p>
+        <!-- Div Group EEPROM Backup -->
+        <!-- Div Group EEPROM Restore -->
+        <hr />
+        <p>
+        <h4>EEPROM-Restore</h4>
+        <form method='POST' action='eeRestore' enctype='multipart/form-data'>
+          <div class="form-group row">
+            <div class="custom-file">
+              <input type="file" name="ee-restore-file" class="custom-file-input" id="ee-restore-file" accept=".ee.json"
+                required />
+              <label class="custom-file-label" for="ee-restore-file">EEPROM-Backup ausw&auml;hlen</label>
+            </div>
+          </div>
+          <div class="form-group row">
+            <div class="col text-center">
+              <button name="submit" type="submit" class="btn btn-outline-primary">Restore starten</button>
+            </div>
+          </div>
+        </form>
+        </p>
+        <!-- Div Group EEPROM Restore -->
+        <!-- Div Group Firmware Update -->
+        <hr />
+        <p>
+        <h4>Firmware-Update</h4>
+        <form method='POST' action='doUpdate' enctype='multipart/form-data'>
+          <div class="form-group row">
+            <div class="custom-file">
+              <input type="file" name="fw-update-file" class="custom-file-input" id="fw-update-file"
+                accept=".fw.bin,.fs.gz" required />
+              <label class="custom-file-label" for="fw-update-file">Firmware-Update ausw&auml;hlen</label>
+            </div>
+          </div>
+          <div class="form-group row">
+            <div class="col text-center">
+              <button name="submit" type="submit" class="btn btn-outline-primary">Update starten</button>
+            </div>
+          </div>
+        </form>
+        </p>
+        <!-- Div Group Firmware Update -->
+      </div>
+      <!-- Div Tab Firmware Update-->
+    </div>
+    <!-- Tabs Content -->
+  </main>
+
+  <!-- Footer -->
+
+  <footer class="page-footer navbar-dark bg-primary font-small fixed-bottom">
+    <div class="container-fluid text-center">
+      <div class="footer-copyright text-center py-3">
+        <span class="text-muted">© 2022 -
+          <a class="text-reset fw-bold" href="https://eventronics.de/">Marcel Peterkau</a></span>
+      </div>
+    </div>
+  </footer>
+
+  <!-- Footer -->
+
+  <!-- Modal Dialog -->
+
+  <div class="modal fade" id="dtcModal" tabindex="-1" role="dialog" aria-labelledby="dtcModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered" role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h5 class="modal-title" id="dtcModalLabel">DTC-Description</h5>
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+          </button>
+        </div>
+        <div class="modal-body">
+          <p class="dtc-desc">DTC Description</p>
+          <p class="dtc-debugval">DTC DebugVal</p>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Close</button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Modal Dialog -->
+
+  <script>
+    $('.navbar-nav>li>a').on('click', function () {
+      $('.navbar-collapse').collapse('hide');
+    });
+
+    document.querySelector('.custom-file-input').addEventListener('change', function (e) {
+      var fileName = document.getElementById("fw-update-file").files[0].name;
+      var nextSibling = e.target.nextElementSibling
+      nextSibling.innerText = fileName
+    });
+
+    $(document).ready(function () {
+      $("tr[data-dtc]").each(function (i) {
+        $(this).attr('data-toggle', "modal");
+        $(this).attr('data-target', "#dtcModal");
+      });
+    });
+
+    $('#dtcModal').on('show.bs.modal', function (event) {
+      var dtctr = $(event.relatedTarget)
+      var dtc = dtctr.data('dtc')
+      var debugval = dtctr.data('debugval')
+      var modal = $(this)
+      $.getJSON('static/tt_dtc/dtc_' + dtc + '.json', function (data) {
+        modal.find('.modal-title').text(data.title)
+        modal.find('.dtc-desc').text(data.description)
+        if (debugval > 0) {
+          modal.find('.dtc-debugval').text("Debugvalue: " + debugval)
+        }
+        else {
+          modal.find('.dtc-debugval').remove()
+        }
+      }).fail(function () {
+        console.log("An error has occurred.");
+        modal.find('.modal-title').text("Fehler")
+        modal.find('.dtc-desc').text("DTC-Beschreibung konnte nicht geladen werden")
+      });
+    });
+
+  </script>
+
+</body>
+
+</html>

Software/data_src/post.htm

@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+  <title>KTM CAN Chain Oiler</title>
+  <meta http-equiv="content-type" content="text/html;charset=UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="stylesheet" href="static/css/bootstrap.min.css">
+  <link rel="stylesheet" href="static/css/custom.css">
+  <script src="static/js/jquery.min.js"></script>
+  <script src="static/js/bootstrap.min.js"></script>
+  <link rel="apple-touch-icon" sizes="180x180" href="static/img/apple-touch-icon.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="static/img/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="static/img/favicon-16x16.png">
+  <link rel="manifest" href="static/img/site.webmanifest">
+  <meta http-equiv="refresh" content="3; url='index.htm'" />
+</head>
+
+<body>
+  <div class="container" style="display: flex; justify-content: center; align-items: center; height: 100vh">
+    <div class="alert alert-success">
+      <strong>Bitte warten!</strong> Änderungen werden übernommen.
+    </div>
+  </div>
+</body>
+
+</html>

Software/data_src/static/css/tweaks.css

@@ -0,0 +1,27 @@
+@font-face {
+    font-family: 'Comfortaa';
+    font-style: normal;
+    font-weight: 300;
+    src: url(../fonts/comfortaa.woff2) format('woff2');
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+  }
+
+body {
+    padding-top: 70px;
+    margin-bottom: 70px;
+}
+
+hr {
+    height: 2px;
+    border-width: 0;
+    color: gray;
+    background-color: gray
+}
+
+.dtc-debugval {
+    color: #F2771A;
+    font: 0.8rem Inconsolata, monospace;
+    background-color: black;
+    padding: 10px;
+}
+

Software/data_src/static/img/site.webmanifest

@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/static/img/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/static/img/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}

Software/data_src/static/js/websocket.js

@@ -0,0 +1,68 @@
+var gateway = `ws://${window.location.hostname}/ws`;
+var websocket;
+
+window.addEventListener("load", onLoad);
+
+function initWebSocket() {
+  console.log("Trying to open a WebSocket connection...");
+  websocket = new WebSocket(gateway);
+  websocket.onopen = onOpen;
+  websocket.onclose = onClose;
+  websocket.onmessage = onMessage; // <-- add this line
+}
+
+function initButtons() {
+  document
+    .getElementById("btn-ws-stop")
+    .addEventListener("click", livedebug_stop);
+  document
+    .getElementById("btn-ws-start")
+    .addEventListener("click", livedebug_start);
+}
+
+function onOpen(event) {
+  console.log("Connection opened");
+}
+
+function onClose(event) {
+  console.log("Connection closed");
+  setTimeout(initWebSocket, 2000);
+}
+
+function onMessage(event) {
+  var livedebug_out = document.getElementById("livedebug-out");
+  var textarea_heigth = livedebug_out.scrollHeight;
+  livedebug_out.value += event.data;
+  livedebug_out.scrollTop = livedebug_out.scrollHeight;
+  do_resize(livedebug_out);
+}
+
+function onLoad(event) {
+  initWebSocket();
+  initButtons();
+}
+
+function livedebug_start() {
+  websocket.send("start");
+}
+
+function livedebug_stop() {
+  websocket.send("stop");
+}
+
+function do_resize(textbox) {
+  var maxrows = 15;
+  var minrows = 3;
+  var txt = textbox.value;
+  var cols = textbox.cols;
+
+  var arraytxt = txt.split("\n");
+  var rows = arraytxt.length;
+
+  for (i = 0; i < arraytxt.length; i++)
+    rows += parseInt(arraytxt[i].length / cols);
+
+  if (rows > maxrows) textbox.rows = maxrows;
+  else if (rows < minrows) textbox.rows = minrows;
+  else textbox.rows = rows;
+}

Software/data_src/static/tt_dtc/dtc_1.json

@@ -0,0 +1,4 @@
+{
+    "title": "Ölvorrat leer",
+    "description": "Ölvorrat ist komplett leer. Den Ölvorrat auffüllen und im Menu 'Wartung' zurück setzen"
+}

Software/data_src/static/tt_dtc/dtc_10.json

@@ -0,0 +1,4 @@
+{
+    "title": "Keine GPS-Verbindung",
+    "description": "Es wurde kein GPS-Signal über die serielle Schnittstelle empfangen, Prüfen sie die Verbindung und das GPS-Modul"
+}

Software/data_src/static/tt_dtc/dtc_11.json

@@ -0,0 +1,4 @@
+{
+    "title": "CAN-Transceiver Error",
+    "description": "Es konnte keine Verbindung zum CAN-Transceiver hergestellt werden. Prüfen Sie die Hardware auf Defekte"
+}

Software/data_src/static/tt_dtc/dtc_12.json

@@ -0,0 +1,4 @@
+{
+    "title": "Keine CAN-Verbindung",
+    "description": "Es konnte kein CAN-Signal empfangen werden. Prüfen sie die Verbindung und die Einstellungen"
+}

Software/data_src/static/tt_dtc/dtc_13.json

@@ -0,0 +1,4 @@
+{
+    "title": "Config-Validierung",
+    "description": "Ein oder mehrer Einstellungswerte sind ausserhalb plausibler Werte. Prüfen Sie Ihre Einstellungen"
+}

Software/data_src/static/tt_dtc/dtc_2.json

@@ -0,0 +1,4 @@
+{
+    "title": "Ölvorrat niedrig",
+    "description": "Ölvorrat ist unter der Warnschwelle. Den Ölvorrat demnächst auffüllen und im Menu 'Wartung' zurück setzen"
+}

Software/data_src/static/tt_dtc/dtc_3.json

@@ -0,0 +1,4 @@
+{
+    "title": "kein EEPROM gefunden",
+    "description": "Es wurde kein EEPROM gefunden. Dies lässt einen Hardware-Defekt vermuten."
+}

Software/data_src/static/tt_dtc/dtc_4.json

@@ -0,0 +1,4 @@
+{
+    "title": "EEPROM CFG Checksumme",
+    "description": "Die Checksumme der Config-Partition des EEPROM ist ungültig. Setzen sie den EEPROM-Bereich 'CFG' im Menu 'Wartung' zurück"
+}

Software/data_src/static/tt_dtc/dtc_5.json

@@ -0,0 +1,4 @@
+{
+    "title": "EEPROM PDS Checksumme",
+    "description": "Die Checksumme der Betriebsdaten-Partition des EEPROM ist ungültig. Setzen sie den EEPROM-Bereich 'PDS' im Menu 'Wartung' zurück"
+}

Software/data_src/static/tt_dtc/dtc_6.json

@@ -0,0 +1,4 @@
+{
+    "title": "EEPROM PDS Adresse",
+    "description": "Die Adresse der Betriebsdaten-Partition im EEPROM ist ungültig. Setzen sie den EEPROM-Bereich 'PDS' im Menu 'Wartung' zurück"
+}

Software/data_src/static/tt_dtc/dtc_7.json

@@ -0,0 +1,4 @@
+{
+    "title": "EEPROM Version falsch",
+    "description": "Die Layout-Version des EEPROM stimmt nicht mit der Firmware-Version überein. Setzen sie den EEPROM-Bereich 'CFG' im Menu 'Wartung' zurück"
+}

Software/data_src/static/tt_dtc/dtc_8.json

@@ -0,0 +1,4 @@
+{
+    "title": "Flashstorage Fehler",
+    "description": "Der Flashstorage konnte nicht initialisiert werden. Aktualisieren sie Flash & Firmware"
+}

Software/data_src/static/tt_dtc/dtc_9.json

@@ -0,0 +1,4 @@
+{
+    "title": "Flashstorage Version falsch",
+    "description": "Die Version des Flashstorage stimmt nicht mit der Firmware-Version überein. Aktualisieren sie den Flash mit der passenden Update-Datei"
+}

Software/data_src/version

@@ -0,0 +1 @@
+1.04

Software/platformio.ini

@@ -26,22 +26,37 @@ upload_speed = 921600
 
 build_flags =
   !python git_rev_macro.py
-  -DWIFI_SSID=${wifi_cred.wifi_ssid}
-  -DWIFI_PASSWORD=${wifi_cred.wifi_password}
+  -DWIFI_SSID_CLIENT=${wifi_cred.wifi_ssid_client}
+  -DWIFI_PASSWORD_CLIENT=${wifi_cred.wifi_password_client}
   -DADMIN_PASSWORD=${wifi_cred.admin_password}
   -DWIFI_AP_PASSWORD=${wifi_cred.wifi_ap_password}
   -DWIFI_AP_IP_GW=10,0,0,1
+  -DATOMIC_FS_UPDATE
+  ;-DFEATURE_ENABLE_WIFI_CLIENT
+  -DFEATURE_ENABLE_OLED
+  ;-DFEATURE_ENABLE_TIMER
+  -DFEATURE_ENABLE_CAN
+  ;-DFEATURE_ENABLE_GPS
+  -DFEATURE_ENABLE_WEBSOCKETS
+  -DPCB_REV=3
+
+;build_type = debug
 
 board_build.filesystem = littlefs
+extra_scripts = post:prepare_littlefs.py
 
 monitor_filters = esp8266_exception_decoder
 monitor_speed = 115200
 
-board_build.ldscript = eagle.flash.4m.ld
+board_build.ldscript = eagle.flash.4m1m.ld
 lib_ldf_mode = deep
 lib_deps = 
     olikraus/U8g2 @ ^2.28.8
-    joaolopesf/RemoteDebug @ ^2.1.2
-    fastled/FastLED @ ^3.5.0
+    adafruit/Adafruit NeoPixel @ ^1.11.0
+    ;https://github.com/FastLED/FastLED.git#3d2ab78 ;fastled/FastLED @ ^3.5.0
     sstaub/Ticker @ ^4.2.0
-    s00500/ESPUI @ ^2.0.0
+    coryjfowler/mcp_can @ ^1.5.0
+    robtillaart/I2C_EEPROM @ ^1.5.2
+    mikalhart/TinyGPSPlus @ ^1.0.3
+    me-no-dev/ESP Async WebServer @ ^1.2.3
+    bblanchon/ArduinoJson @ ^6.19.4

Software/prepare_littlefs.py

@@ -0,0 +1,116 @@
+# SCRIPT TO GZIP CRITICAL FILES FOR ACCELERATED WEBSERVING
+# see also https://community.platformio.org/t/question-esp32-compress-files-in-data-to-gzip-before-upload-possible-to-spiffs/6274/10
+
+
+import glob
+import shutil
+import gzip
+import os
+Import("env")
+Import("projenv")
+
+
+def gzip_file(src_path, dst_path):
+
+    with open(src_path, 'rb') as src, gzip.open(dst_path, 'wb') as dst:
+        for chunk in iter(lambda: src.read(4096), b""):
+            dst.write(chunk)
+
+
+def getListOfFiles(dirName):
+    # create a list of file and sub directories
+    # names in the given directory
+    listOfFile = os.listdir(dirName)
+    allFiles = list()
+    # Iterate over all the entries
+    for entry in listOfFile:
+        # Create full path
+        fullPath = os.path.join(dirName, entry)
+        # If entry is a directory then get the list of files in this directory
+        if os.path.isdir(fullPath):
+            allFiles = allFiles + getListOfFiles(fullPath)
+        else:
+            allFiles.append(fullPath)
+
+    return allFiles
+
+def remove_prefix(text, prefix):
+    if text.startswith(prefix):
+        return text[len(prefix):]
+    return text  # or whatever
+
+# Compress files from 'data_src/' to 'data/'
+
+
+def gzip_webfiles(source, target, env):
+    # Filetypes to compress
+    filetypes_to_gzip = ['.css', '.png', '.js', '.ico', '.woff2', '.json']
+    print('\nGZIP: Starting gzip-Process for LittleFS-Image...\n')
+    data_src_dir_path = os.path.join(env.get('PROJECT_DIR'), 'data_src')
+    data_dir_path = env.get('PROJECT_DATA_DIR')
+    # check if data and datasrc exist. If the first exists and not the second, it renames it
+    if(os.path.exists(data_dir_path) and not os.path.exists(data_src_dir_path)):
+        print('GZIP: Directory "'+data_dir_path +
+              '" exists, "'+data_src_dir_path+'" is not found.')
+        print('GZIP: Renaming "' + data_dir_path +
+              '" to "' + data_src_dir_path + '"')
+        os.rename(data_dir_path, data_src_dir_path)
+    # Delete the 'data' directory
+    if(os.path.exists(data_dir_path)):
+        print('GZIP: Deleting the "data" directory ' + data_dir_path)
+        shutil.rmtree(data_dir_path)
+    # Recreate empty 'data' directory
+    print('GZIP: Re-creating an empty data directory ' + data_dir_path)
+    os.mkdir(data_dir_path)
+    # Determine the files to compress
+
+    files_to_copy = []
+    files_to_gzip = []
+
+    all_data_src = getListOfFiles(data_src_dir_path)
+    for file in all_data_src:
+        file_name, file_extension = os.path.splitext(file)
+        print(file_name + " has filetype " + file_extension)
+        if file_extension in filetypes_to_gzip:
+            files_to_gzip.append(file)
+        else:
+            filename_subdir = remove_prefix(file, data_src_dir_path)
+            files_to_copy.append(filename_subdir)
+
+    for file in files_to_copy:
+        print('GZIP: Copying file from: ' + data_src_dir_path + file + ' to: ' + data_dir_path + file)
+        os.makedirs(os.path.dirname(data_dir_path + file), exist_ok=True)
+        shutil.copy(data_src_dir_path + file, data_dir_path + file)
+    # Compress and move files
+    
+    was_error = False
+    try:
+        for source_file_path in files_to_gzip:
+            print('GZIP: compressing... ' + source_file_path)
+            filename_subdir = remove_prefix(source_file_path, data_src_dir_path)
+            target_file_path = data_dir_path + filename_subdir
+            os.makedirs(os.path.dirname(target_file_path), exist_ok=True)
+            print('GZIP: Compressed... ' + target_file_path)
+            gzip_file(source_file_path, target_file_path + ".gz")
+    except IOError as e:
+        was_error = True
+        print('GZIP: Failed to compress file: ' + source_file_path)
+        # print( 'GZIP: EXCEPTION... {}'.format( e ) )
+    if was_error:
+        print('GZIP: Failure/Incomplete.\n')
+    else:
+        print('GZIP: Compressed correctly.\n')
+
+    return
+ 
+def gzip_binffiles(source, target, env):
+    littlefsbin = target[0].get_abspath()
+    targetbin = os.path.join(os.path.dirname(littlefsbin), 'filesystem.fs')
+    shutil.copyfile(littlefsbin, targetbin)
+    gzip_file(targetbin, os.path.join(str(targetbin) + '.gz'))
+    os.remove(targetbin)
+    return
+
+# IMPORTANT, this needs to be added to call the routine
+env.AddPreAction('$BUILD_DIR/littlefs.bin', gzip_webfiles)
+env.AddPostAction('$BUILD_DIR/littlefs.bin', gzip_binffiles)

Software/src/can.cpp

@@ -0,0 +1,49 @@
+#ifdef FEATURE_ENABLE_CAN
+#include "can.h"
+
+MCP_CAN CAN0(GPIO_CS_CAN);
+
+void Init_CAN()
+{
+
+    if (CAN0.begin(MCP_STDEXT, CAN_500KBPS, MCP_16MHZ) != CAN_OK)
+        MaintainDTC(DTC_CAN_TRANSCEIVER_FAILED, DTC_CRITICAL, true);
+
+    CAN0.init_Mask(0, 0, 0x07FF0000); // Init first mask...
+    CAN0.init_Mask(1, 0, 0x07FF0000); // Init second mask...
+    CAN0.init_Filt(0, 0, 0x012D0000); // Init first filter...
+
+    CAN0.setMode(MCP_NORMAL);
+}
+
+uint32_t Process_CAN_WheelSpeed()
+{
+#define FACTOR_RWP_KMH_890ADV 18 // Divider to convert Raw Data to km/h
+
+    can_frame canMsg;
+    static uint32_t lastRecTimestamp = 0;
+    uint16_t RearWheelSpeed_raw;
+    uint32_t milimeters_to_add = 0;
+
+    if (CAN0.readMsgBuf(&canMsg.can_id, &canMsg.can_dlc, canMsg.data) == CAN_OK)
+    {
+
+        RearWheelSpeed_raw = (uint16_t)canMsg.data[5] << 8 | canMsg.data[6];
+        // raw / FACTOR_RWP_KMH_890ADV -> km/h * 100000 -> cm/h / 3600 -> cm/s
+        // raw * 500 -> cm/s
+        uint32_t RWP_millimeter_per_second = (((uint32_t)RearWheelSpeed_raw * 1000000) / FACTOR_RWP_KMH_890ADV) / 3600;
+
+        uint32_t timesincelast = millis() - lastRecTimestamp;
+        lastRecTimestamp = millis();
+
+        milimeters_to_add = (RWP_millimeter_per_second * timesincelast) / 1000;
+    }
+
+    if (lastRecTimestamp > 1000)
+    {
+        MaintainDTC(DTC_NO_CAN_SIGNAL, DTC_CRITICAL, (millis() > lastRecTimestamp + 10000 ? true : false));
+    }
+
+    return milimeters_to_add;
+}
+#endif

Software/src/can.h

@@ -0,0 +1,21 @@
+#ifndef _CAN_H_
+#define _CAN_H_
+
+#include <Arduino.h>
+#include <mcp_can.h>
+#include <SPI.h>
+#include "common.h"
+#include "globals.h"
+#include "dtc.h"
+
+struct can_frame
+{
+    unsigned long can_id;
+    uint8_t can_dlc;
+    uint8_t data[8] __attribute__((aligned(8)));
+};
+
+void Init_CAN();
+uint32_t Process_CAN_WheelSpeed();
+
+#endif

Software/src/common.h

@@ -0,0 +1,55 @@
+#ifndef _COMMON_H_
+#define _COMMON_H_
+
+#define Q(x) #x
+#define QUOTE(x) Q(x)
+
+#if PCB_REV == 1
+    #define GPIO_BUTTON D7
+    #define GPIO_LED D8
+    #define GPIO_TRIGGER D6
+    #define GPIO_PUMP D5
+#elif PCB_REV == 2
+    #define GPIO_BUTTON D7
+    #define GPIO_LED D8
+    #define GPIO_TRIGGER D6
+    #define GPIO_PUMP D5
+#elif PCB_REV == 3
+    #define GPIO_BUTTON D4
+    #define GPIO_LED D3
+    #define GPIO_TRIGGER D6
+    #define GPIO_PUMP D0
+    #define GPIO_CS_CAN D8
+#elif PCB_REV == 4
+    #define GPIO_BUTTON D4
+    #define GPIO_LED D3
+    #define GPIO_TRIGGER D6
+    #define GPIO_PUMP D0
+    #define GPIO_CS_CAN D8
+#endif
+
+#ifndef HOST_NAME
+#define HOST_NAME "ChainLube_%06X" // Use printf-Formatting - Chip-ID (uin32_t) will be added
+#endif
+
+#ifndef OTA_DELAY
+#define OTA_DELAY 50 // ticks -> 10ms / tick
+#endif
+
+#define LUBE_PULSE_LENGHT_MS 160
+#define LUBE_PULSE_PAUSE_MS 340
+
+// -> 2Hz PumpPulse
+// -> 49,7cc  / h @ 2Hz
+// -> 49,7 ml / h @ 2Hz
+// -> 828,4µl / min @ 2Hz
+// -> 828,3µl / 60s 
+// -> 13,81µl / 1s
+// ->  6,90µl / Pulse
+
+#define DEFAULT_PUMP_DOSE 7
+
+#define STARTUP_DELAY 5000
+#define SHUTDOWN_DELAY_MS 5000
+
+#endif

Software/src/config.cpp

@@ -0,0 +1,361 @@
+#include "config.h"
+#include "debugger.h"
+
+I2C_eeprom ee(0x50, EEPROM_SIZE_BYTES);
+
+LubeConfig_t LubeConfig;
+persistenceData_t PersistenceData;
+const uint16_t eeVersion = 2; // inc
+boolean eeAvailable = false;
+
+const uint16_t startofLubeConfig = 16;
+const uint16_t startofPersistence = 16 + sizeof(LubeConfig) + (sizeof(LubeConfig) % 16);
+
+boolean checkEEPROMavailable();
+
+void InitEEPROM()
+{
+  ee.begin();
+  checkEEPROMavailable();
+}
+
+void EEPROM_Process()
+{
+  switch (globals.requestEEAction)
+  {
+  case EE_CFG_SAVE:
+    StoreConfig_EEPROM();
+    globals.requestEEAction = EE_IDLE;
+    Debug_pushMessage("Stored EEPROM CFG\n");
+    break;
+  case EE_CFG_LOAD:
+    GetConfig_EEPROM();
+    globals.requestEEAction = EE_IDLE;
+    Debug_pushMessage("Loaded EEPROM CFG\n");
+    break;
+  case EE_CFG_FORMAT:
+    FormatConfig_EEPROM();
+    globals.requestEEAction = EE_IDLE;
+    GetConfig_EEPROM();
+    Debug_pushMessage("Formated EEPROM CFG\n");
+    break;
+  case EE_PDS_SAVE:
+    StorePersistence_EEPROM();
+    globals.requestEEAction = EE_IDLE;
+    Debug_pushMessage("Stored EEPROM PDS\n");
+    break;
+  case EE_PDS_LOAD:
+    GetPersistence_EEPROM();
+    globals.requestEEAction = EE_IDLE;
+    Debug_pushMessage("Loaded EEPROM PDS\n");
+    break;
+  case EE_PDS_FORMAT:
+    FormatPersistence_EEPROM();
+    globals.requestEEAction = EE_IDLE;
+    GetPersistence_EEPROM();
+    Debug_pushMessage("Formated EEPROM PDS\n");
+    break;
+  case EE_FORMAT_ALL:
+    FormatConfig_EEPROM();
+    FormatPersistence_EEPROM();
+    GetConfig_EEPROM();
+    GetPersistence_EEPROM();
+    globals.requestEEAction = EE_IDLE;
+    Debug_pushMessage("Formated EEPROM ALL\n");
+    break;
+  case EE_ALL_SAVE:
+    StorePersistence_EEPROM();
+    StoreConfig_EEPROM();
+    globals.requestEEAction = EE_IDLE;
+    Debug_pushMessage("Stored EEPROM ALL\n");
+    break;
+  case EE_IDLE:
+  default:
+    globals.requestEEAction = EE_IDLE;
+  }
+}
+
+void StoreConfig_EEPROM()
+{
+  LubeConfig.checksum = 0;
+  LubeConfig.checksum = Checksum_EEPROM((uint8_t *)&LubeConfig, sizeof(LubeConfig));
+  if (!checkEEPROMavailable())
+    return;
+
+  ee.updateBlock(startofLubeConfig, (uint8_t *)&LubeConfig, sizeof(LubeConfig));
+}
+
+void GetConfig_EEPROM()
+{
+  if (!checkEEPROMavailable())
+    return;
+
+  ee.readBlock(startofLubeConfig, (uint8_t *)&LubeConfig, sizeof(LubeConfig));
+
+  uint32_t checksum = LubeConfig.checksum;
+  LubeConfig.checksum = 0;
+
+  if (Checksum_EEPROM((uint8_t *)&LubeConfig, sizeof(LubeConfig)) != checksum)
+  {
+    MaintainDTC(DTC_EEPROM_CFG_BAD, DTC_CRITICAL, true);
+  }
+  LubeConfig.checksum = checksum;
+
+  uint32_t ConfigSanityCheckResult = ConfigSanityCheck(false);
+
+  if (ConfigSanityCheckResult > 0)
+  {
+    MaintainDTC(DTC_EEPROM_CFG_SANITY, DTC_WARN, true, ConfigSanityCheckResult);
+    globals.requestEEAction = EE_CFG_SAVE;
+  }
+}
+
+void StorePersistence_EEPROM()
+{
+  if (PersistenceData.writeCycleCounter >= 0xFFF0)
+    MovePersistencePage_EEPROM(false);
+  else
+    PersistenceData.writeCycleCounter++;
+
+  PersistenceData.checksum = 0;
+  PersistenceData.checksum = Checksum_EEPROM((uint8_t *)&PersistenceData, sizeof(PersistenceData));
+
+  if (!checkEEPROMavailable())
+    return;
+
+  ee.updateBlock(globals.eePersistanceAdress, (uint8_t *)&PersistenceData, sizeof(PersistenceData));
+}
+
+void GetPersistence_EEPROM()
+{
+  if (!checkEEPROMavailable())
+    return;
+
+  ee.readBlock(0, (uint8_t *)&globals.eePersistanceAdress, sizeof(globals.eePersistanceAdress));
+  // if we got the StartAdress of Persistance and it's out of Range - we Reset it and store defaults
+  // otherwise we Read from eeprom and check if everything is correct
+  if (globals.eePersistanceAdress < startofPersistence || globals.eePersistanceAdress > ee.getDeviceSize())
+  {
+    MovePersistencePage_EEPROM(true);
+    FormatPersistence_EEPROM();
+    MaintainDTC(DTC_EEPROM_PDSADRESS_BAD, DTC_CRITICAL, true);
+  }
+  else
+  {
+    ee.readBlock(globals.eePersistanceAdress, (uint8_t *)&PersistenceData, sizeof(PersistenceData));
+
+    uint32_t checksum = PersistenceData.checksum;
+    PersistenceData.checksum = 0;
+
+    if (Checksum_EEPROM((uint8_t *)&PersistenceData, sizeof(PersistenceData)) != checksum)
+    {
+      MaintainDTC(DTC_EEPROM_PDS_BAD, DTC_CRITICAL, true);
+    }
+    PersistenceData.checksum = checksum;
+  }
+}
+
+void FormatConfig_EEPROM()
+{
+  Debug_pushMessage("Formatting Config-Partition\n");
+  LubeConfig = LubeConfig_defaults;
+  LubeConfig.EEPROM_Version = eeVersion;
+  StoreConfig_EEPROM();
+}
+
+void FormatPersistence_EEPROM()
+{
+  Debug_pushMessage("Formatting Persistance-Partition\n");
+  PersistenceData = {0};
+  // memset(&PersistenceData, 0, sizeof(PersistenceData));
+  StorePersistence_EEPROM();
+}
+
+void MovePersistencePage_EEPROM(boolean reset)
+{
+  if (!checkEEPROMavailable())
+    return;
+
+  globals.eePersistanceAdress = +sizeof(PersistenceData);
+  PersistenceData.writeCycleCounter = 0;
+
+  // check if we reached the End of the EEPROM and Startover at the beginning
+  if ((globals.eePersistanceAdress + sizeof(PersistenceData)) > ee.getDeviceSize() || reset)
+  {
+    globals.eePersistanceAdress = startofPersistence;
+  }
+
+  ee.updateBlock(0, (uint8_t *)&globals.eePersistanceAdress, sizeof(globals.eePersistanceAdress));
+}
+
+uint32_t Checksum_EEPROM(uint8_t const *data, size_t len)
+{
+  if (data == NULL)
+    return 0;
+  uint32_t crc, mask;
+  crc = 0xFFFFFFFF;
+
+  while (len--)
+  {
+    crc ^= *data++;
+    for (uint8_t k = 0; k < 8; k++)
+    {
+      mask = -(crc & 1);
+      crc = (crc >> 1) ^ (0xEDB88320 & mask);
+    }
+  }
+  return ~crc;
+}
+
+void dumpEEPROM(uint16_t memoryAddress, uint16_t length)
+{
+#define BLOCK_TO_LENGTH 16
+
+  if (!checkEEPROMavailable())
+    return;
+
+  char ascii_buf[BLOCK_TO_LENGTH + 1];
+  sprintf(ascii_buf, "%*s", BLOCK_TO_LENGTH, "ASCII");
+  Debug_pushMessage(PSTR("\nAddress "));
+  for (int x = 0; x < BLOCK_TO_LENGTH; x++)
+    Debug_pushMessage("%3d", x);
+
+  memoryAddress = memoryAddress / BLOCK_TO_LENGTH * BLOCK_TO_LENGTH;
+  length = (length + BLOCK_TO_LENGTH - 1) / BLOCK_TO_LENGTH * BLOCK_TO_LENGTH;
+
+  for (unsigned int i = 0; i < length; i++)
+  {
+    int blockpoint = memoryAddress % BLOCK_TO_LENGTH;
+    if (blockpoint == 0)
+    {
+      ascii_buf[BLOCK_TO_LENGTH] = 0;
+      Debug_pushMessage("  %s", ascii_buf);
+      Debug_pushMessage("\n0x%05X:", memoryAddress);
+    }
+    ascii_buf[blockpoint] = ee.readByte(memoryAddress);
+    Debug_pushMessage(" %02X", ascii_buf[blockpoint]);
+    if (ascii_buf[blockpoint] < 0x20 || ascii_buf[blockpoint] > 0x7E)
+      ascii_buf[blockpoint] = '.';
+    memoryAddress++;
+  }
+  Debug_pushMessage("\n");
+}
+
+boolean checkEEPROMavailable()
+{
+  if (!ee.isConnected())
+  {
+    MaintainDTC(DTC_NO_EEPROM_FOUND, DTC_CRITICAL, true);
+    return false;
+  }
+  MaintainDTC(DTC_NO_EEPROM_FOUND, DTC_CRITICAL, false);
+  return true;
+}
+
+uint32_t ConfigSanityCheck(bool autocorrect)
+{
+  uint32_t setting_reset_bits = 0;
+
+  if (!(LubeConfig.DistancePerLube_Default > 0) || !(LubeConfig.DistancePerLube_Default < 50000))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 0);
+    if (autocorrect)
+      LubeConfig.DistancePerLube_Default = LubeConfig_defaults.DistancePerLube_Default;
+  }
+
+  if (!(LubeConfig.DistancePerLube_Rain > 0) || !(LubeConfig.DistancePerLube_Rain < 50000))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 1);
+    if (autocorrect)
+      LubeConfig.DistancePerLube_Rain = LubeConfig_defaults.DistancePerLube_Rain;
+  }
+
+  if (!(LubeConfig.tankCapacity_ml > 0) || !(LubeConfig.tankCapacity_ml < 5000))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 2);
+    if (autocorrect)
+      LubeConfig.tankCapacity_ml = LubeConfig_defaults.tankCapacity_ml;
+  }
+
+  if (!(LubeConfig.amountPerDose_microL > 0) || !(LubeConfig.amountPerDose_microL < 100))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 3);
+    if (autocorrect)
+      LubeConfig.amountPerDose_microL = LubeConfig_defaults.amountPerDose_microL;
+  }
+
+  if (!(LubeConfig.TankRemindAtPercentage >= 0) || !(LubeConfig.TankRemindAtPercentage <= 100))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 4);
+    if (autocorrect)
+      LubeConfig.TankRemindAtPercentage = LubeConfig_defaults.TankRemindAtPercentage;
+  }
+
+  if (!(LubeConfig.PulsePerRevolution > 0) || !(LubeConfig.PulsePerRevolution < 1000))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 5);
+    if (autocorrect)
+      LubeConfig.PulsePerRevolution = LubeConfig_defaults.PulsePerRevolution;
+  }
+
+  if (!(LubeConfig.TireWidth_mm > 0) || !(LubeConfig.TireWidth_mm < 500))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 6);
+    if (autocorrect)
+      LubeConfig.TireWidth_mm = LubeConfig_defaults.TireWidth_mm;
+  }
+
+  if (!(LubeConfig.TireWidthHeight_Ratio > 0) || !(LubeConfig.TireWidthHeight_Ratio < 150))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 7);
+    if (autocorrect)
+      LubeConfig.TireWidthHeight_Ratio = LubeConfig_defaults.TireWidthHeight_Ratio;
+  }
+
+  if (!(LubeConfig.RimDiameter_Inch > 0) || !(LubeConfig.RimDiameter_Inch < 30))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 8);
+    if (autocorrect)
+      LubeConfig.RimDiameter_Inch = LubeConfig_defaults.RimDiameter_Inch;
+  }
+
+  if (!(LubeConfig.DistancePerRevolution_mm > 0) || !(LubeConfig.DistancePerRevolution_mm < 10000))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 9);
+    if (autocorrect)
+      LubeConfig.DistancePerRevolution_mm = LubeConfig_defaults.DistancePerRevolution_mm;
+  }
+
+  if (!(LubeConfig.BleedingPulses > 0) || !(LubeConfig.BleedingPulses < 1001))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 10);
+    if (autocorrect)
+      LubeConfig.BleedingPulses = LubeConfig_defaults.BleedingPulses;
+  }
+
+  if (!(LubeConfig.SpeedSource >= 0) || !(LubeConfig.SpeedSource < SpeedSourceString_Elements))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 11);
+    if (autocorrect)
+      LubeConfig.SpeedSource = LubeConfig_defaults.SpeedSource;
+  }
+
+#ifdef FEATURE_ENABLE_GPS
+  if (!(LubeConfig.GPSBaudRate >= 0) || !(LubeConfig.GPSBaudRate < GPSBaudRateString_Elements))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 12);
+    if (autocorrect)
+      LubeConfig.GPSBaudRate = LubeConfig_defaults.GPSBaudRate;
+  }
+#endif
+
+#ifdef FEATURE_ENABLE_CAN
+  if (!(LubeConfig.CANSource >= 0) || !(LubeConfig.CANSource < CANSourceString_Elements))
+  {
+    setting_reset_bits = setting_reset_bits | (1 << 13);
+    if (autocorrect)
+      LubeConfig.CANSource = LubeConfig_defaults.CANSource;
+  }
+#endif
+  return setting_reset_bits;
+}

Software/src/config.h

@@ -0,0 +1,138 @@
+#ifndef _CONFIG_H_
+#define _CONFIG_H_
+
+#include <Arduino.h>
+#include <Wire.h>
+#include <I2C_eeprom.h>
+#include "globals.h"
+#include "dtc.h"
+#include "common.h"
+
+#if PCB_REV == 1 || PCB_REV == 2 || PCB_REV == 3
+#define EEPROM_SIZE_BYTES I2C_DEVICESIZE_24LC64
+#elif PCB_REV == 4
+#define EEPROM_SIZE_BYTES I2C_DEVICESIZE_24LC256
+#endif
+
+typedef enum SpeedSource_e
+{
+#ifdef FEATURE_ENABLE_TIMER
+  SOURCE_TIME,
+#endif
+  SOURCE_IMPULSE,
+#ifdef FEATURE_ENABLE_GPS
+  SOURCE_GPS,
+#endif
+#if FEATURE_ENABLE_CAN
+  SOURCE_CAN
+#endif
+} SpeedSource_t;
+
+const char SpeedSourceString[][8] = {
+#ifdef FEATURE_ENABLE_TIMER
+    "Timer",
+#endif
+    "Impuls",
+#ifdef FEATURE_ENABLE_GPS
+    "GPS",
+#endif
+#if FEATURE_ENABLE_CAN
+    "CAN-Bus"
+#endif
+};
+
+#ifdef FEATURE_ENABLE_GPS
+typedef enum GPSBaudRate_e
+{
+  BAUD_9600,
+  BAUD_115200
+} GPSBaudRate_t;
+
+const char GPSBaudRateString[][7] = {
+    "9600",
+    "115200"};
+
+const size_t GPSBaudRateString_Elements = sizeof(GPSBaudRateString) / sizeof(GPSBaudRateString[0]);
+#endif
+
+#ifdef FEATURE_ENABLE_CAN
+typedef enum CANSource_e
+{
+  KTM_890_ADV_R_2021
+} CANSource_t;
+
+const char CANSourceString[][28] = {
+    "KTM 890 Adventure R (2021)"};
+
+const char CANSourceString_Elements = sizeof(CANSourceString) / sizeof(CANSourceString[0]);
+#endif
+
+const size_t SpeedSourceString_Elements = sizeof(SpeedSourceString) / sizeof(SpeedSourceString[0]);
+
+typedef struct
+{
+  uint16_t writeCycleCounter = 0;
+  uint32_t tankRemain_microL = 0;
+  uint32_t TravelDistance_highRes_mm = 0;
+  uint32_t odometer_mm = 0;
+  uint32_t odometer = 0;
+  uint32_t checksum = 0;
+} persistenceData_t;
+
+typedef struct
+{
+  uint8_t EEPROM_Version = 0;
+  uint32_t DistancePerLube_Default = 8000;
+  uint32_t DistancePerLube_Rain = 4000;
+  uint32_t tankCapacity_ml = 320;
+  uint32_t amountPerDose_microL = DEFAULT_PUMP_DOSE;
+  uint8_t TankRemindAtPercentage = 30;
+  uint8_t PulsePerRevolution = 1;
+  uint32_t TireWidth_mm = 150;
+  uint32_t TireWidthHeight_Ratio = 70;
+  uint32_t RimDiameter_Inch = 18;
+  uint32_t DistancePerRevolution_mm = 2000;
+  uint16_t BleedingPulses = 25;
+  SpeedSource_t SpeedSource = SOURCE_IMPULSE;
+#ifdef FEATURE_ENABLE_GPS
+  GPSBaudRate_t GPSBaudRate = BAUD_115200;
+#endif
+#ifdef FEATURE_ENABLE_CAN
+  CANSource_t CANSource = KTM_890_ADV_R_2021;
+#endif
+  bool LED_Mode_Flash = false;
+  uint8_t LED_Max_Brightness = 255;
+  uint8_t LED_Min_Brightness = 5;
+  uint32_t checksum = 0;
+} LubeConfig_t;
+
+const LubeConfig_t LubeConfig_defaults = {
+    0, 8000, 4000, 320, DEFAULT_PUMP_DOSE, 30, 1, 150, 70, 18, 2000, 25, SOURCE_IMPULSE,
+#ifdef FEATURE_ENABLE_GPS
+    BAUD_115200,
+#endif
+#ifdef FEATURE_ENABLE_CAN
+    KTM_890_ADV_R_2021,
+#endif
+    false,
+    255,
+    5,
+    0};
+
+void InitEEPROM();
+void EEPROM_Process();
+void StoreConfig_EEPROM();
+void GetConfig_EEPROM();
+void StorePersistence_EEPROM();
+void GetPersistence_EEPROM();
+void FormatConfig_EEPROM();
+void FormatPersistence_EEPROM();
+uint32_t Checksum_EEPROM(uint8_t const *data, size_t len);
+void dumpEEPROM(uint16_t memoryAddress, uint16_t length);
+void MovePersistencePage_EEPROM(boolean reset);
+uint32_t ConfigSanityCheck(bool autocorrect = false);
+
+extern LubeConfig_t LubeConfig;
+extern persistenceData_t PersistenceData;
+extern uint16_t eePersistenceMarker;
+#endif // _CONFIG_H_

Software/src/debugger.cpp

@@ -0,0 +1,343 @@
+#include "debugger.h"
+
+DebugStatus_t DebuggerStatus[dbg_cntElements];
+
+String IpAddress2String(const IPAddress &ipAddress);
+void processCmdDebug(String command);
+void Debug_formatCFG();
+void Debug_formatPersistence();
+void Debug_printSystemInfo();
+void Debug_printWifiInfo();
+void Debug_CheckEEPOM();
+void Debug_dumpConfig();
+void Debug_dumpPersistance();
+void Debug_ShowDTCs();
+void Debug_dumpGlobals();
+void Debug_printHelp();
+
+void initDebugger()
+{
+    DebuggerStatus[dbg_Serial] = disabled;
+    DebuggerStatus[dbg_Webui] = disabled;
+
+    Serial.setDebugOutput(false);
+}
+
+void Debug_Process()
+{
+    typedef enum InputProcessed_e
+    {
+        IDLE,
+        CMD_COMPLETE,
+        CMD_ABORT,
+        CMD_OVERFLOW
+    } InputProcessed_t;
+
+    static int inputCnt = 0;
+    static char inputBuffer[32];
+    InputProcessed_t InputProcessed = IDLE;
+
+    if (Serial.available())
+    {
+        char inputChar = Serial.read();
+
+        switch (inputChar)
+        {
+        case '\n':
+            inputBuffer[inputCnt] = 0; // terminate the String
+            inputCnt = 0;
+            InputProcessed = CMD_COMPLETE;
+            break;
+
+        case 0x1B: // Esc
+            inputBuffer[0] = 0;
+            inputCnt = 0;
+            InputProcessed = CMD_ABORT;
+            break;
+
+        case 0x21 ... 0x7E: // its a real letter or sign and not some control-chars
+            inputBuffer[inputCnt] = inputChar;
+            inputCnt++;
+            break;
+
+        default:
+            break;
+        }
+
+        if (inputCnt > sizeof(inputBuffer))
+        {
+            inputCnt = 0;
+            inputBuffer[sizeof(inputBuffer) - 1] = 0; // terminate the String
+            InputProcessed = CMD_OVERFLOW;
+        }
+    }
+
+    switch (InputProcessed)
+    {
+    case CMD_ABORT:
+        Debug_pushMessage("Abort\n");
+        break;
+
+    case CMD_COMPLETE:
+        processCmdDebug(String(inputBuffer));
+        break;
+
+    case CMD_OVERFLOW:
+        Debug_pushMessage("input Buffer overflow\n");
+        break;
+
+    default:
+        break;
+    }
+    InputProcessed = IDLE;
+}
+
+void SetDebugportStatus(DebugPorts_t port, DebugStatus_t status)
+{
+    if (status == disabled)
+        Debug_pushMessage("disable DebugPort %s\n", sDebugPorts[port]);
+
+    DebuggerStatus[port] = status;
+
+    if (status == enabled)
+        Debug_pushMessage("enabled DebugPort %s\n", sDebugPorts[port]);
+}
+
+void Debug_pushMessage(const char *format, ...)
+{
+    if ((DebuggerStatus[dbg_Serial] == enabled) || (DebuggerStatus[dbg_Webui] == enabled))
+    {
+        char buff[64];
+        va_list arg;
+        va_start(arg, format);
+        vsnprintf(buff, sizeof(buff), format, arg);
+        va_end(arg);
+
+        if (DebuggerStatus[dbg_Serial] == enabled)
+        {
+            Serial.print(buff);
+        }
+        if (DebuggerStatus[dbg_Webui] == enabled)
+        {
+            Websocket_PushLiveDebug(String(buff));
+        }
+    }
+}
+
+void pushCANDebug(uint32_t id, uint8_t dlc, uint8_t *data)
+{
+    if ((DebuggerStatus[dbg_Serial] == enabled) || (DebuggerStatus[dbg_Webui] == enabled))
+    {
+        char buff[100];
+        char *p = buff;
+        p += snprintf(p, sizeof(buff), "CAN: 0x%08X | %d | ", id, dlc);
+        for (int i = 0; i < dlc; i++)
+        {
+            p += snprintf(p, sizeof(buff) - (p - buff), "%02X ", data[i]);
+        }
+        *(p++) = '\n';
+        *p = '\0';
+
+        if (DebuggerStatus[dbg_Serial] == enabled)
+        {
+            Serial.print(buff);
+        }
+        if (DebuggerStatus[dbg_Webui] == enabled)
+        {
+            Websocket_PushLiveDebug(String(buff));
+        }
+    }
+}
+
+void processCmdDebug(String command)
+{
+    if (command == "help")
+        Debug_printHelp();
+    else if (command == "sysinfo")
+        Debug_printSystemInfo();
+    else if (command == "netinfo")
+        Debug_printWifiInfo();
+    else if (command == "formatCFG")
+        Debug_formatCFG();
+    else if (command == "formatPDS")
+        Debug_formatPersistence();
+    else if (command == "checkEE")
+        Debug_CheckEEPOM();
+    else if (command == "dumpEE1k")
+        dumpEEPROM(0, 1024);
+    else if (command == "dumpEE")
+        dumpEEPROM(0, EEPROM_SIZE_BYTES);
+    else if (command == "resetPageEE")
+        MovePersistencePage_EEPROM(true);
+    else if (command == "dumpCFG")
+        Debug_dumpConfig();
+    else if (command == "dumpPDS")
+        Debug_dumpPersistance();
+    else if (command == "saveEE")
+        globals.requestEEAction = EE_ALL_SAVE;
+    else if (command == "showdtc")
+        Debug_ShowDTCs();
+    else if (command == "dumpGlobals")
+        Debug_dumpGlobals();
+    else if (command == "sdbg")
+        SetDebugportStatus(dbg_Serial, enabled);
+    else
+        Debug_pushMessage("unknown Command\n");
+}
+
+void Debug_formatCFG()
+{
+    Debug_pushMessage("Formatting Config-EEPROM and reseting to default\n");
+    FormatConfig_EEPROM();
+}
+
+void Debug_formatPersistence()
+{
+    Debug_pushMessage("Formatting Persistence-EEPROM and reseting to default\n");
+    FormatPersistence_EEPROM();
+}
+
+void Debug_printSystemInfo()
+{
+    Debug_pushMessage("Souko's ChainOiler Mk1\n");
+    Debug_pushMessage("Hostname: %s\n", globals.DeviceName);
+
+    FlashMode_t ideMode = ESP.getFlashChipMode();
+    Debug_pushMessage("Sdk version: %s\n", ESP.getSdkVersion());
+    Debug_pushMessage("Core Version: %s\n", ESP.getCoreVersion().c_str());
+    Debug_pushMessage("Boot Version: %u\n", ESP.getBootVersion());
+    Debug_pushMessage("Boot Mode: %u\n", ESP.getBootMode());
+    Debug_pushMessage("CPU Frequency: %u MHz\n", ESP.getCpuFreqMHz());
+    Debug_pushMessage("Reset reason: %s\n", ESP.getResetReason().c_str());
+    Debug_pushMessage("Flash Size: %d\n", ESP.getFlashChipRealSize());
+    Debug_pushMessage("Flash Size IDE: %d\n", ESP.getFlashChipSize());
+    Debug_pushMessage("Flash ide mode:  %s\n", (ideMode == FM_QIO ? "QIO" : ideMode == FM_QOUT ? "QOUT"
+                                                                      : ideMode == FM_DIO    ? "DIO"
+                                                                      : ideMode == FM_DOUT   ? "DOUT"
+                                                                                             : "UNKNOWN"));
+    Debug_pushMessage("OTA-Pass: %s\n", QUOTE(ADMIN_PASSWORD));
+    Debug_pushMessage("Git-Revison: %s\n", constants.GitHash);
+    Debug_pushMessage("Sw-Version: %d.%02d\n", constants.FW_Version_major, constants.FW_Version_minor);
+}
+
+void Debug_dumpConfig()
+{
+    Debug_pushMessage("DistancePerLube_Default: %d\n", LubeConfig.DistancePerLube_Default);
+    Debug_pushMessage("DistancePerLube_Rain: %d\n", LubeConfig.DistancePerLube_Rain);
+    Debug_pushMessage("tankCapacity_ml: %d\n", LubeConfig.tankCapacity_ml);
+    Debug_pushMessage("amountPerDose_microL: %d\n", LubeConfig.amountPerDose_microL);
+    Debug_pushMessage("TankRemindAtPercentage: %d\n", LubeConfig.TankRemindAtPercentage);
+    Debug_pushMessage("PulsePerRevolution: %d\n", LubeConfig.PulsePerRevolution);
+    Debug_pushMessage("TireWidth_mm: %d\n", LubeConfig.TireWidth_mm);
+    Debug_pushMessage("TireWidthHeight_Ratio: %d\n", LubeConfig.TireWidth_mm);
+    Debug_pushMessage("RimDiameter_Inch: %d\n", LubeConfig.RimDiameter_Inch);
+    Debug_pushMessage("DistancePerRevolution_mm: %d\n", LubeConfig.DistancePerRevolution_mm);
+    Debug_pushMessage("BleedingPulses: %d\n", LubeConfig.BleedingPulses);
+    Debug_pushMessage("SpeedSource: %d\n", LubeConfig.SpeedSource);
+#ifdef FEATURE_ENABLE_GPS
+    Debug_pushMessage("GPSBaudRate: %d\n", LubeConfig.GPSBaudRate);
+#endif
+#ifdef FEATURE_ENABLE_CAN
+    Debug_pushMessage("CANSource: %d\n", LubeConfig.CANSource);
+#endif
+    Debug_pushMessage("checksum: 0x%08X\n", LubeConfig.checksum);
+}
+
+void Debug_dumpGlobals()
+{
+    Debug_pushMessage("systemStatus: %d\n", globals.systemStatus);
+    Debug_pushMessage("resumeStatus: %d\n", globals.resumeStatus);
+    Debug_pushMessage("systemStatustxt: %s\n", globals.systemStatustxt);
+    Debug_pushMessage("purgePulses: %d\n", globals.purgePulses);
+    Debug_pushMessage("requestEEAction: %d\n", globals.requestEEAction);
+    Debug_pushMessage("DeviceName: %s\n", globals.DeviceName);
+    Debug_pushMessage("FlashVersion: %s\n", globals.FlashVersion);
+    Debug_pushMessage("eePersistanceAdress: %d\n", globals.eePersistanceAdress);
+    Debug_pushMessage("TankPercentage: %d\n", globals.TankPercentage);
+    Debug_pushMessage("hasDTC: %d\n", globals.hasDTC);
+}
+
+void Debug_dumpPersistance()
+{
+    Debug_pushMessage("writeCycleCounter: %d\n", PersistenceData.writeCycleCounter);
+    Debug_pushMessage("tankRemain_microL: %d\n", PersistenceData.tankRemain_microL);
+    Debug_pushMessage("TravelDistance_highRes_mm: %d\n", PersistenceData.TravelDistance_highRes_mm);
+    Debug_pushMessage("checksum: %d\n", PersistenceData.checksum);
+    Debug_pushMessage("PSD Adress: 0x%04X\n", globals.eePersistanceAdress);
+}
+
+void Debug_printWifiInfo()
+{
+}
+
+void Debug_CheckEEPOM()
+{
+    uint32_t checksum = PersistenceData.checksum;
+    PersistenceData.checksum = 0;
+
+    if (Checksum_EEPROM((uint8_t *)&PersistenceData, sizeof(PersistenceData)) == checksum)
+    {
+        Debug_pushMessage("PersistenceData EEPROM Checksum OK\n");
+    }
+    else
+    {
+        Debug_pushMessage("PersistenceData EEPROM Checksum BAD\n");
+    }
+
+    PersistenceData.checksum = checksum;
+
+    checksum = LubeConfig.checksum;
+    LubeConfig.checksum = 0;
+
+    if (Checksum_EEPROM((uint8_t *)&LubeConfig, sizeof(LubeConfig)) == checksum)
+    {
+        Debug_pushMessage("LubeConfig EEPROM Checksum OK\n");
+    }
+    else
+    {
+        Debug_pushMessage("LubeConfig EEPROM Checksum BAD\n");
+    }
+    LubeConfig.checksum = checksum;
+}
+
+void Debug_ShowDTCs()
+{
+    char buff_timestamp[16]; // Format: DD-hh:mm:ss:xxx
+    char buff_active[9];
+
+    Debug_pushMessage("\n      timestamp | DTC-Nr. |   status | severity\n");
+
+    for (uint32_t i = 0; i < MAX_DTC_STORAGE; i++)
+    {
+        if (DTCStorage[i].Number < DTC_LAST_DTC)
+        {
+            sprintf(buff_timestamp, "%02d-%02d:%02d:%02d:%03d",
+                    DTCStorage[i].timestamp / 86400000,    // Days
+                    DTCStorage[i].timestamp / 360000 % 24, // Hours
+                    DTCStorage[i].timestamp / 60000 % 60,  // Minutes
+                    DTCStorage[i].timestamp / 1000 % 60,   // Seconds
+                    DTCStorage[i].timestamp % 1000);       // milliseconds
+
+            if (DTCStorage[i].active == DTC_ACTIVE)
+                strcpy(buff_active, "active");
+            else if (DTCStorage[i].active == DTC_PREVIOUS)
+                strcpy(buff_active, "previous");
+            else
+                strcpy(buff_active, "none");
+
+            Debug_pushMessage("%s   %7d   %8s   %8d\n", buff_timestamp, DTCStorage[i].Number, buff_active, DTCStorage[i].severity);
+        }
+    }
+}
+
+void Debug_printHelp()
+{
+    char buff[64];
+
+    for (int i = sizeof(helpCmd) / 63; i < sizeof(helpCmd) / 63; i++)
+    {
+        memcpy_P(buff, (helpCmd + (i * 63)), 63);
+        buff[63] = 0;
+        Debug_pushMessage(buff);
+    }
+}

Software/src/debugger.h

@@ -0,0 +1,46 @@
+#ifndef _DEBUGGER_H_
+#define _DEBUGGER_H_
+
+#include <Arduino.h>
+#include "webui.h"
+
+const char PROGMEM helpCmd[] = "sysinfo     - System Info\n"
+                               "netinfo     - WiFi Info\n"
+                               "formatPDS   - Format Persistence EEPROM Data\n"
+                               "formatCFG   - Format Configuration EEPROM Data\n"
+                               "checkEE     - Check EEPROM with checksum\n"
+                               "dumpEE1k    - dump the first 1kb of EEPROM to Serial\n"
+                               "dumpEE      - dump the whole EPPROM to Serial\n"
+                               "resetPageEE - Reset the PersistenceData Page\n"
+                               "dumpCFG     - print Config struct\n"
+                               "dumpPDS     - print PersistanceStruct\n"
+                               "saveEE      - save EE-Data\n"
+                               "showdtc     - Show all DTCs\n"
+                               "dumpGlobals - print globals\n";
+
+typedef enum DebugStatus_e
+{
+    disabled,
+    enabled
+} DebugStatus_t;
+
+typedef enum DebugPorts_e
+{
+    dbg_Serial,
+    dbg_Webui,
+    dbg_cntElements
+} DebugPorts_t;
+
+const char sDebugPorts[dbg_cntElements][7] = {
+    "Serial",
+    "WebUI"};
+
+extern DebugStatus_t DebuggerStatus[dbg_cntElements];
+
+void initDebugger();
+void pushCANDebug(uint32_t id, uint8_t dlc, uint8_t *data);
+void Debug_pushMessage(const char *format, ...);
+void SetDebugportStatus(DebugPorts_t port, DebugStatus_t status);
+void Debug_Process();
+
+#endif

Software/src/dtc.cpp

@@ -0,0 +1,139 @@
+#include "dtc.h"
+#include "debugger.h"
+
+DTCEntry_s DTCStorage[MAX_DTC_STORAGE];
+
+void MaintainDTC(DTCNums_t DTC_no, DTCSeverity_t DTC_severity, boolean active, uint32_t DebugValue)
+{
+    for (int i = 0; i < MAX_DTC_STORAGE; i++)
+    {
+        if (DTCStorage[i].Number == DTC_no)
+        {
+            if (active && DTCStorage[i].active != DTC_ACTIVE)
+            {
+                Debug_pushMessage("DTC gone active: %d, DebugVal: %d\n", DTC_no, DebugValue);
+                DTCStorage[i].timestamp = millis();
+                DTCStorage[i].active = DTC_ACTIVE;
+                DTCStorage[i].severity = DTC_severity;
+                DTCStorage[i].debugVal = DebugValue;
+            }
+            if (!active && DTCStorage[i].active == DTC_ACTIVE)
+            {
+                Debug_pushMessage("DTC gone previous: %d\n", DTC_no);
+                DTCStorage[i].active = DTC_PREVIOUS;
+            }
+            return;
+        }
+    }
+
+    // DTC was not found with upper iteration, but is active
+    // so we need to look for free space to store DTC
+    if (active == true)
+    {
+        for (int i = 0; i < MAX_DTC_STORAGE; i++)
+        {
+            if (DTCStorage[i].Number == DTC_LAST_DTC)
+            {
+                Debug_pushMessage("new DTC registered: %d, DebugVal: %d\n", DTC_no, DebugValue);
+                DTCStorage[i].Number = DTC_no;
+                DTCStorage[i].timestamp = millis();
+                DTCStorage[i].active = DTC_ACTIVE;
+                DTCStorage[i].debugVal = DebugValue;
+                DTCStorage[i].severity = DTC_severity;
+                return;
+            }
+        }
+    }
+}
+
+void ClearDTC(DTCNums_t DTC_no)
+{
+    for (int i = 0; i < MAX_DTC_STORAGE; i++)
+    {
+        if (DTCStorage[i].Number == DTC_no)
+        {
+            DTCStorage[i].Number = DTC_LAST_DTC;
+            DTCStorage[i].active = DTC_NONE;
+            DTCStorage[i].timestamp = 0;
+        }
+    }
+}
+
+void ClearAllDTC()
+{
+    for (int i = 0; i < MAX_DTC_STORAGE; i++)
+    {
+        DTCStorage[i].Number = DTC_LAST_DTC;
+        DTCStorage[i].active = DTC_NONE;
+        DTCStorage[i].timestamp = 0;
+    }
+}
+
+DTCNums_t getlastDTC(boolean only_active)
+{
+    int8_t pointer = -1;
+    uint32_t lasttimestamp = 0;
+
+    for (int i = 0; i < MAX_DTC_STORAGE; i++)
+    {
+        if (DTCStorage[i].Number > 0 && DTCStorage[i].timestamp > lasttimestamp)
+        {
+            if (only_active == false || DTCStorage[i].active == DTC_ACTIVE)
+            {
+                pointer = i;
+                lasttimestamp = DTCStorage[i].timestamp;
+            }
+        }
+    }
+
+    return pointer >= 0 ? DTCStorage[pointer].Number : DTC_LAST_DTC;
+}
+
+DTCNums_t getlastDTC_Severity(boolean only_active, DTCSeverity_t severity)
+{
+    int8_t pointer = -1;
+    uint32_t lasttimestamp = 0;
+
+    for (int i = 0; i < MAX_DTC_STORAGE; i++)
+    {
+        if (DTCStorage[i].Number > 0 && DTCStorage[i].timestamp > lasttimestamp)
+        {
+            if ((only_active == false || DTCStorage[i].active == DTC_ACTIVE) && DTCStorage[i].severity == severity)
+            {
+                pointer = i;
+                lasttimestamp = DTCStorage[i].timestamp;
+            }
+        }
+    }
+
+    return pointer >= 0 ? DTCStorage[pointer].Number : DTC_LAST_DTC;
+}
+
+void DTC_Process()
+{
+    static tSystem_Status preserverSysStatusError;
+
+    if (getlastDTC(false) < DTC_LAST_DTC)
+    {
+        globals.hasDTC = true;
+        if (getlastDTC_Severity(true, DTC_CRITICAL) < DTC_LAST_DTC && globals.systemStatus != sysStat_Shutdown)
+        {
+            if (globals.systemStatus != sysStat_Error)
+            {
+                preserverSysStatusError = globals.systemStatus;
+            }
+            globals.systemStatus = sysStat_Error;
+        }
+        else
+        {
+            if (globals.systemStatus == sysStat_Error)
+            {
+                globals.systemStatus = preserverSysStatusError;
+            }
+        }
+    }
+    else
+    {
+        globals.hasDTC = false;
+    }
+}

Software/src/dtc.h

@@ -0,0 +1,61 @@
+#ifndef _DTC_H_
+#define _DTC_H_
+
+#include <Arduino.h>
+
+#define MAX_DTC_STORAGE 6
+
+typedef enum DTCNums_e
+{
+  DTC_TANK_EMPTY = 1,
+  DTC_TANK_LOW,
+  DTC_NO_EEPROM_FOUND,
+  DTC_EEPROM_CFG_BAD,
+  DTC_EEPROM_PDS_BAD,
+  DTC_EEPROM_PDSADRESS_BAD,
+  DTC_EEPROM_VERSION_BAD,
+  DTC_FLASHFS_ERROR,
+  DTC_FLASHFS_VERSION_ERROR,
+#ifdef FEATURE_ENABLE_GPS
+  DTC_NO_GPS_SERIAL,
+#endif
+#ifdef FEATURE_ENABLE_CAN
+  DTC_CAN_TRANSCEIVER_FAILED,
+  DTC_NO_CAN_SIGNAL,
+#endif
+  DTC_EEPROM_CFG_SANITY,
+  DTC_LAST_DTC
+} DTCNums_t;
+
+typedef enum DTCActive_e
+{
+  DTC_NONE,
+  DTC_ACTIVE,
+  DTC_PREVIOUS
+} DTCActive_t;
+
+typedef enum DTCSeverity_e
+{
+  DTC_INFO,
+  DTC_WARN,
+  DTC_CRITICAL
+} DTCSeverity_t;
+
+typedef struct DTCEntry_s
+{
+  DTCNums_t Number;
+  uint32_t timestamp;
+  DTCActive_t active;
+  DTCSeverity_t severity;
+  uint32_t debugVal;
+} DTCEntry_t;
+
+void MaintainDTC(DTCNums_t DTC_no, DTCSeverity_t DTC_severity, boolean active, uint32_t DebugValue = 0);
+void ClearDTC(DTCNums_t DTC_no);
+void ClearAllDTC();
+DTCNums_t getlastDTC(boolean only_active);
+DTCNums_t getlastDTC_Severity(boolean only_active, DTCSeverity_t severity);
+void DTC_Process();
+
+extern DTCEntry_s DTCStorage[MAX_DTC_STORAGE];
+#endif

Software/src/globals.cpp

@@ -0,0 +1,13 @@
+#include "globals.h"
+
+Globals_t globals;
+
+void initGlobals()
+{
+  globals.purgePulses = 0;
+  globals.requestEEAction = EE_IDLE;
+  globals.resumeStatus = sysStat_Normal;
+  globals.systemStatus = sysStat_Startup;
+  globals.measurementActive = false;
+  globals.measuredPulses = 0;
+}

Software/src/globals.h

@@ -0,0 +1,65 @@
+#ifndef _GLOBALS_H_
+#define _GLOBALS_H_
+
+#include <Arduino.h>
+
+typedef enum eSystem_Status
+{
+  sysStat_Startup,
+  sysStat_Normal,
+  sysStat_Rain,
+  sysStat_Purge,
+  sysStat_Error,
+  sysStat_Shutdown
+} tSystem_Status;
+
+typedef enum eEERequest
+{
+  EE_IDLE,
+  EE_CFG_SAVE,
+  EE_CFG_LOAD,
+  EE_CFG_FORMAT,
+  EE_PDS_SAVE,
+  EE_PDS_LOAD,
+  EE_PDS_FORMAT,
+  EE_FORMAT_ALL,
+  EE_ALL_SAVE
+
+} tEERequest;
+
+typedef struct Globals_s
+{
+  tSystem_Status systemStatus = sysStat_Startup;
+  tSystem_Status resumeStatus = sysStat_Startup;
+  char systemStatustxt[16] = "";
+  uint16_t purgePulses = 0;
+  eEERequest requestEEAction = EE_IDLE;
+  char DeviceName[33];
+  char FlashVersion[10];
+  uint16_t eePersistanceAdress;
+  uint8_t TankPercentage;
+  bool hasDTC;
+  bool measurementActive;
+  uint32_t measuredPulses;
+} Globals_t;
+
+extern Globals_t globals;
+
+typedef struct Constants_s
+{
+  uint8_t FW_Version_major;
+  uint8_t FW_Version_minor;
+  uint8_t Required_Flash_Version_major;
+  uint8_t Required_Flash_Version_minor;
+  char GitHash[11];
+} Constants_t;
+
+const Constants_t constants PROGMEM = {
+ 1,4,     // Firmware_Version
+ 1,4,     // Required Flash Version
+ GIT_REV  // Git-Hash-String
+};
+
+void initGlobals();
+
+#endif

Software/src/gps.cpp

@@ -0,0 +1,59 @@
+#ifdef FEATURE_ENABLE_GPS
+#include "gps.h"
+
+TinyGPSPlus gps;
+
+void Init_GPS()
+{
+    uint32_t baudrate;
+    switch (LubeConfig.GPSBaudRate)
+    {
+    case BAUD_9600:
+        baudrate = 9600;
+        break;
+    case BAUD_115200:
+        baudrate = 115200;
+        break;
+    default:
+        baudrate = 4800;
+        break;
+    }
+
+    Debug_pushMessage(PSTR("Init GPS with Baud %d\n"), baudrate);
+    Serial.begin(baudrate);
+}
+
+uint32_t Process_GPS_WheelSpeed()
+{
+    static uint32_t lastRecTimestamp;
+    static uint32_t lastValidSpeedTimestamp;
+    uint16_t RearWheelSpeed_kmh;
+
+    while (Serial.available() > 0)
+    {
+        uint8_t incoming = Serial.read();
+        if (gps.encode(incoming))
+        {
+            RearWheelSpeed_kmh = gps.speed.isValid() ? gps.speed.kmph() : 0;
+
+            if (RearWheelSpeed_kmh > 0)
+            {
+                uint32_t RWP_millimeter_per_second = ((uint32_t)RearWheelSpeed_kmh * 1000000) / 3600;
+
+                uint32_t timesincelast = millis() - lastValidSpeedTimestamp;
+                lastValidSpeedTimestamp = millis();
+
+                uint32_t milimeters_to_add = (RWP_millimeter_per_second * timesincelast) / 1000;
+
+                return milimeters_to_add;
+            }
+            lastRecTimestamp = millis();
+        }
+    }
+
+    MaintainDTC(DTC_NO_GPS_SERIAL,DTC_CRITICAL, (millis() > lastRecTimestamp + 10000));
+
+    return 0;
+}
+
+#endif

Software/src/gps.h

@@ -0,0 +1,12 @@
+#ifndef _GPS_H_
+#define _GPS_H_
+
+#include <TinyGPSPlus.h>
+#include "config.h"
+#include "common.h"
+#include "dtc.h"
+
+void Init_GPS();
+uint32_t Process_GPS_WheelSpeed();
+
+#endif

Software/src/led_colors.h

@@ -0,0 +1,35 @@
+#ifndef _LED_COLORS_H_
+#define _LED_COLORS_H_
+
+#define COLOR_RED           0xFF0000
+#define COLOR_GREEN         0x00FF00
+#define COLOR_BLUE          0x0000FF
+#define COLOR_YELLOW        0xFF9600
+#define COLOR_ORANGE        0xFF2800
+#define COLOR_TEAL          0x00FF78
+#define COLOR_CYAN          0x00FFFF
+#define COLOR_PURPLE        0xB400FF
+#define COLOR_MAGENTA       0xFF0014
+#define COLOR_WHITE         0xFFFFFF
+#define COLOR_BLACK         0x000000
+#define COLOR_GOLD          0xFFDE1E
+#define COLOR_PINK          0xF25AFF
+#define COLOR_AQUA          0x32FFFF
+#define COLOR_JADE          0x00FF28
+#define COLOR_AMBER         0xFF6400
+#define COLOR_WARM_WHITE    0xFDF5E6
+
+
+#define LED_DEFAULT_COLOR       COLOR_WARM_WHITE
+#define LED_STARTUP_NORMAL      COLOR_WARM_WHITE
+#define LED_STARTUP_TANKWARN    COLOR_AMBER
+#define LED_NORMAL_COLOR        COLOR_GREEN 
+#define LED_RAIN_COLOR          COLOR_BLUE 
+#define LED_WIFI_BLINK          COLOR_YELLOW
+#define LED_PURGE_COLOR         COLOR_MAGENTA
+#define LED_ERROR_BLINK         COLOR_RED
+#define LED_SHUTDOWN_BLINK      COLOR_CYAN
+
+
+
+#endif /* _LED_COLORS_H_ */

Software/src/lubeapp.cpp

@@ -0,0 +1,107 @@
+#include "lubeapp.h"
+
+uint32_t lubePulseTimestamp = 0;
+
+void RunLubeApp(uint32_t add_milimeters)
+{
+
+    globals.TankPercentage = PersistenceData.tankRemain_microL / (LubeConfig.tankCapacity_ml * 10);
+
+    MaintainDTC(DTC_TANK_EMPTY, DTC_CRITICAL, (PersistenceData.tankRemain_microL < LubeConfig.amountPerDose_microL));
+    MaintainDTC(DTC_TANK_LOW, DTC_WARN, (globals.TankPercentage < LubeConfig.TankRemindAtPercentage));
+
+    // Add traveled Distance in mm
+    PersistenceData.TravelDistance_highRes_mm += add_milimeters;
+    PersistenceData.odometer_mm += add_milimeters;
+    if (PersistenceData.odometer_mm >= 1000000)
+    {
+        PersistenceData.odometer++;
+        PersistenceData.odometer_mm = 0;
+    }
+
+    switch (globals.systemStatus)
+    {
+    case sysStat_Startup:
+        if (millis() > STARTUP_DELAY)
+        {
+            globals.systemStatus = sysStat_Normal;
+            globals.resumeStatus = sysStat_Normal;
+        }
+        break;
+
+    case sysStat_Normal:
+        if (PersistenceData.TravelDistance_highRes_mm / 1000 > LubeConfig.DistancePerLube_Default)
+        {
+            LubePulse();
+            PersistenceData.TravelDistance_highRes_mm = 0;
+        }
+        break;
+
+    case sysStat_Rain:
+        if (PersistenceData.TravelDistance_highRes_mm / 1000 > LubeConfig.DistancePerLube_Rain)
+        {
+            LubePulse();
+            PersistenceData.TravelDistance_highRes_mm = 0;
+        }
+        break;
+    case sysStat_Purge:
+        if (globals.purgePulses > 0)
+        {
+            if (lubePulseTimestamp + LUBE_PULSE_PAUSE_MS < millis())
+            {
+                LubePulse();
+                globals.purgePulses--;
+            }
+        }
+        else
+        {
+            globals.systemStatus = globals.resumeStatus;
+        }
+        break;
+    case sysStat_Error:
+    case sysStat_Shutdown:
+    default:
+        break;
+    }
+
+    switch (globals.systemStatus)
+    {
+    case sysStat_Normal:
+        strcpy_P(globals.systemStatustxt, PSTR("Normal"));
+        break;
+    case sysStat_Purge:
+        strcpy_P(globals.systemStatustxt, PSTR("Purge"));
+        break;
+    case sysStat_Rain:
+        strcpy_P(globals.systemStatustxt, PSTR("Rain"));
+        break;
+    case sysStat_Startup:
+        strcpy_P(globals.systemStatustxt, PSTR("Startup"));
+        break;
+    case sysStat_Error:
+        strcpy_P(globals.systemStatustxt, PSTR("Error"));
+        break;
+    case sysStat_Shutdown:
+        strcpy_P(globals.systemStatustxt, PSTR("Shutdown"));
+        break;
+    }
+
+    // maintain Pin-State of Lube-Pump
+    if (lubePulseTimestamp > millis())
+        digitalWrite(GPIO_PUMP, HIGH);
+    else
+        digitalWrite(GPIO_PUMP, LOW);
+}
+
+void LubePulse()
+{
+    if (PersistenceData.tankRemain_microL > 0) // Only Lube if theres Oil remaining!
+    {
+        lubePulseTimestamp = millis() + LUBE_PULSE_LENGHT_MS;
+
+        if (PersistenceData.tankRemain_microL < LubeConfig.amountPerDose_microL) // Prevent underrun and shiftover
+            PersistenceData.tankRemain_microL = 0;
+        else
+            PersistenceData.tankRemain_microL = PersistenceData.tankRemain_microL - LubeConfig.amountPerDose_microL;
+    }
+}

Software/src/lubeapp.h

@@ -6,12 +6,9 @@
 #include "config.h"
 #include "common.h"
 #include "globals.h"
+#include "dtc.h"
 
-#define LUBE_PULSE_LENGHT_MS 160
-#define LUBE_PULSE_PAUSE_MS 100
-#define STARTUP_DELAY 5000
-
-void RunLubeApp(volatile uint32_t * wheelPulseCounter);
+void RunLubeApp(uint32_t add_milimeters);
 void LubePulse();
 
 #endif

Software/src/main.cpp

@@ -0,0 +1,624 @@
+#include <Arduino.h>
+#include <Wire.h>
+#ifdef FEATURE_ENABLE_OLED
+#include <U8g2lib.h>
+#endif
+#include <ESP8266WiFi.h>
+#include <ArduinoOTA.h>
+
+#include <Adafruit_NeoPixel.h>
+#include <Ticker.h>
+
+#include "common.h"
+
+#include "sanitycheck.h"
+
+#include "lubeapp.h"
+#include "webui.h"
+#include "config.h"
+#include "globals.h"
+#include "debugger.h"
+#ifdef FEATURE_ENABLE_CAN
+#include "can.h"
+#endif
+#ifdef FEATURE_ENABLE_GPS
+#include "gps.h"
+#endif
+#include "dtc.h"
+#include "led_colors.h"
+
+#ifdef FEATURE_ENABLE_WIFI_CLIENT
+#include <ESP8266WiFiMulti.h>
+
+const char *ssid = QUOTE(WIFI_SSID_CLIENT);
+const char *password = QUOTE(WIFI_PASSWORD_CLIENT);
+const uint32_t connectTimeoutMs = 5000;
+
+ESP8266WiFiMulti wifiMulti;
+#endif
+
+bool startSetupMode = false;
+volatile uint32_t wheel_pulse = 0;
+
+Adafruit_NeoPixel leds(1, GPIO_LED, NEO_RGB + NEO_KHZ800);
+
+// Function-Prototypes
+void IRAM_ATTR trigger_ISR();
+void LED_Process(uint8_t override = false, uint32_t setColor = LED_DEFAULT_COLOR);
+#ifdef FEATURE_ENABLE_OLED
+U8X8_SSD1306_128X64_NONAME_HW_I2C u8x8(-1);
+void Display_Process();
+#endif
+void Button_Process();
+void toggleWiFiAP(boolean shutdown = false);
+void SystemShutdown();
+uint32_t Process_Impulse_WheelSpeed();
+void EEPROMCyclicPDS_callback();
+
+#ifdef FEATURE_ENABLE_WIFI_CLIENT
+void wifiMaintainConnectionTicker_callback();
+Ticker WiFiMaintainConnectionTicker(wifiMaintainConnectionTicker_callback, 1000, 0, MILLIS);
+#endif
+Ticker EEPROMCyclicPDSTicker(EEPROMCyclicPDS_callback, 60000, 0, MILLIS);
+
+void setup()
+{
+  system_update_cpu_freq(SYS_CPU_80MHZ);
+  snprintf(globals.DeviceName, 32, HOST_NAME, ESP.getChipId());
+  WiFi.persistent(false);
+
+  ClearAllDTC(); // Init DTC-Storage
+
+#ifdef FEATURE_ENABLE_WIFI_CLIENT
+  WiFi.mode(WIFI_STA);
+  WiFi.setHostname(globals.DeviceName);
+  wifiMulti.addAP(QUOTE(WIFI_SSID_CLIENT), QUOTE(WIFI_PASSWORD_CLIENT));
+  WiFiMaintainConnectionTicker.start();
+#else
+  WiFi.mode(WIFI_OFF);
+#endif
+
+  Serial.begin(115200);
+  Serial.println("\n\nSouko's ChainLube Mk1");
+  Serial.println(globals.DeviceName);
+
+  InitEEPROM();
+  GetConfig_EEPROM();
+  GetPersistence_EEPROM();
+#ifdef FEATURE_ENABLE_OLED
+  u8x8.begin();
+  u8x8.setFont(u8x8_font_chroma48medium8_r);
+#endif
+  leds.begin();
+
+  switch (LubeConfig.SpeedSource)
+  {
+  case SOURCE_IMPULSE:
+    pinMode(GPIO_TRIGGER, INPUT_PULLUP);
+    attachInterrupt(digitalPinToInterrupt(GPIO_TRIGGER), trigger_ISR, FALLING);
+    break;
+#ifdef FEATURE_ENABLE_GPS
+  case SOURCE_GPS:
+    Init_GPS();
+    break;
+#endif
+#ifdef FEATURE_ENABLE_TIMER
+  case SOURCE_TIME:
+
+    break;
+#endif
+#ifdef FEATURE_ENABLE_CAN
+  case SOURCE_CAN:
+    Init_CAN();
+    break;
+#endif
+  default:
+    Debug_pushMessage("Source Setting N/A");
+    break;
+  }
+
+  pinMode(GPIO_BUTTON, INPUT_PULLUP);
+  pinMode(GPIO_PUMP, OUTPUT);
+
+  ArduinoOTA.setPort(8266);
+  ArduinoOTA.setHostname(globals.DeviceName);
+  ArduinoOTA.setPassword(QUOTE(ADMIN_PASSWORD));
+#ifdef FEATURE_ENABLE_OLED
+  ArduinoOTA.onStart([]()
+                     {
+                       u8x8.clearDisplay();
+                       u8x8.drawString(0, 0, "OTA-Update");
+                       u8x8.refreshDisplay(); });
+
+  ArduinoOTA.onProgress([](unsigned int progress, unsigned int total)
+                        {
+                          static bool refreshed = false;
+                          if (!refreshed)
+                          {
+                            u8x8.clearDisplay();
+                            refreshed = true;
+                            u8x8.drawString(0, 0, "OTA Upload");
+                          }
+                          uint32_t percent = progress / (total / 100);
+                          u8x8.setCursor(0, 1);
+                          u8x8.printf("%d %%", percent);
+                          u8x8.refreshDisplay(); });
+
+  ArduinoOTA.onEnd([]()
+                   {
+                     u8x8.clearDisplay();
+                     u8x8.drawString(0, 0, "OTA-Restart");
+                     u8x8.refreshDisplay(); });
+#endif
+  ArduinoOTA.begin();
+
+#ifdef FEATURE_ENABLE_OLED
+  u8x8.clearDisplay();
+  u8x8.drawString(0, 0, "KTM ChainLube V1");
+  u8x8.refreshDisplay();
+#endif
+
+  initWebUI();
+  initGlobals();
+  EEPROMCyclicPDSTicker.start();
+  Serial.println("Setup Done");
+}
+
+void loop()
+{
+  uint32_t wheelDistance = 0;
+
+  switch (LubeConfig.SpeedSource)
+  {
+  case SOURCE_IMPULSE:
+    wheelDistance = Process_Impulse_WheelSpeed();
+    break;
+#ifdef FEATURE_ENABLE_CAN
+  case SOURCE_CAN:
+    wheelDistance = Process_CAN_WheelSpeed();
+    break;
+#endif
+#ifdef FEATURE_ENABLE_TIMER
+  case SOURCE_TIME:
+    break;
+#endif
+#ifdef FEATURE_ENABLE_GPS
+  case SOURCE_GPS:
+    wheelDistance = Process_GPS_WheelSpeed();
+    break;
+#endif
+  }
+
+  RunLubeApp(wheelDistance);
+#ifdef FEATURE_ENABLE_OLED
+  Display_Process();
+#endif
+  Button_Process();
+  LED_Process();
+  EEPROM_Process();
+  Webserver_Process();
+  DTC_Process();
+  Debug_Process();
+
+  ArduinoOTA.handle();
+  EEPROMCyclicPDSTicker.update();
+#ifdef FEATURE_ENABLE_WIFI_CLIENT
+  WiFiMaintainConnectionTicker.update();
+#endif
+  if (globals.systemStatus == sysStat_Shutdown)
+    SystemShutdown();
+  yield();
+}
+
+String IpAddress2String(const IPAddress &ipAddress)
+{
+  return String(ipAddress[0]) + String(".") +
+         String(ipAddress[1]) + String(".") +
+         String(ipAddress[2]) + String(".") +
+         String(ipAddress[3]);
+}
+
+#ifdef FEATURE_ENABLE_WIFI_CLIENT
+void wifiMaintainConnectionTicker_callback()
+{
+  static uint32_t WiFiFailCount = 0;
+  const uint32_t WiFiFailMax = 20;
+
+  if (wifiMulti.run(connectTimeoutMs) == WL_CONNECTED)
+  {
+    return;
+  }
+  else
+  {
+    if (WiFiFailCount < WiFiFailMax)
+    {
+      WiFiFailCount++;
+    }
+    else
+    {
+      Debug_pushMessage("WiFi not connected! - Start AP");
+      toggleWiFiAP();
+    }
+  }
+}
+#endif
+
+void EEPROMCyclicPDS_callback()
+{
+  StorePersistence_EEPROM();
+}
+
+void trigger_ISR()
+{
+  wheel_pulse++;
+}
+
+void LED_Process(uint8_t override, uint32_t SetColor)
+{
+  typedef enum
+  {
+    LED_Startup,
+    LED_Normal,
+    LED_Confirm_Normal,
+    LED_Rain,
+    LED_Confirm_Rain,
+    LED_Purge,
+    LED_Error,
+    LED_Shutdown,
+    LED_Override
+  } tLED_Status;
+
+  static tSystem_Status oldSysStatus = sysStat_Startup;
+  static tLED_Status LED_Status = LED_Startup;
+  static uint32_t LED_override_color = 0;
+  static tLED_Status LED_ResumeOverrideStatus = LED_Startup;
+
+  uint8_t color = 0;
+  uint32_t timer = 0;
+  uint32_t animtimer = 0;
+  static uint32_t timestamp = 0;
+  timer = millis();
+
+  if (override == 1)
+  {
+    if (LED_Status != LED_Override)
+    {
+      LED_ResumeOverrideStatus = LED_Status;
+      Debug_pushMessage("Override LED_Status");
+    }
+    LED_Status = LED_Override;
+    LED_override_color = SetColor;
+  }
+
+  if (override == 2)
+  {
+    if (LED_Status == LED_Override)
+    {
+      LED_Status = LED_ResumeOverrideStatus;
+      Debug_pushMessage("Resume LED_Status");
+    }
+  }
+
+  if (oldSysStatus != globals.systemStatus)
+  {
+    switch (globals.systemStatus)
+    {
+    case sysStat_Startup:
+      LED_Status = LED_Startup;
+      Debug_pushMessage("sysStat: Startup");
+      break;
+    case sysStat_Normal:
+      timestamp = timer + 3500;
+      LED_Status = LED_Confirm_Normal;
+      Debug_pushMessage("sysStat: Normal");
+      break;
+    case sysStat_Rain:
+      timestamp = timer + 3500;
+      LED_Status = LED_Confirm_Rain;
+      Debug_pushMessage("sysStat: Rain");
+      break;
+    case sysStat_Purge:
+      LED_Status = LED_Purge;
+      Debug_pushMessage("sysStat: Purge");
+      break;
+    case sysStat_Error:
+      LED_Status = LED_Error;
+      Debug_pushMessage("sysStat: Error");
+      break;
+    case sysStat_Shutdown:
+      LED_Status = LED_Shutdown;
+      Debug_pushMessage("sysStat: Shutdown");
+      break;
+    default:
+      break;
+    }
+    oldSysStatus = globals.systemStatus;
+  }
+
+  switch (LED_Status)
+  {
+  case LED_Startup:
+    leds.setBrightness(LubeConfig.LED_Max_Brightness);
+
+    if (globals.TankPercentage < LubeConfig.TankRemindAtPercentage)
+      leds.setPixelColor(0, LED_STARTUP_TANKWARN);
+    else
+      leds.setPixelColor(0, LED_STARTUP_NORMAL);
+    break;
+
+  case LED_Confirm_Normal:
+    animtimer = timer % 500;
+    color = map(animtimer / 2, 0, 250, 0, LubeConfig.LED_Max_Brightness);
+    leds.setPixelColor(0, LED_NORMAL_COLOR);
+    if (animtimer < 250)
+      leds.setBrightness(color);
+    else
+      leds.setBrightness(LubeConfig.LED_Max_Brightness - color);
+
+    if (timestamp < timer)
+    {
+      LED_Status = LED_Normal;
+      Debug_pushMessage("LED_Status: Confirm -> Normal");
+    }
+    break;
+
+  case LED_Normal:
+    leds.setBrightness(LubeConfig.LED_Min_Brightness);
+    leds.setPixelColor(0, LED_NORMAL_COLOR);
+
+    if (timer % 2000 > 1950 && LubeConfig.LED_Mode_Flash == true)
+      leds.setBrightness(LubeConfig.LED_Max_Brightness);
+    else if (timer % 2000 > 1500 && WiFi.getMode() != WIFI_OFF)
+      leds.setPixelColor(0, LED_WIFI_BLINK);
+
+    break;
+
+  case LED_Confirm_Rain:
+    animtimer = timer % 500;
+    color = map(animtimer / 2, 0, 250, 0, LubeConfig.LED_Max_Brightness);
+    leds.setPixelColor(0, LED_RAIN_COLOR);
+    if (animtimer < 250)
+      leds.setBrightness(color);
+    else
+      leds.setBrightness(LubeConfig.LED_Max_Brightness - color);
+    if (timestamp < timer)
+    {
+      LED_Status = LED_Rain;
+      Debug_pushMessage("LED_Status: Confirm -> Rain");
+    }
+    break;
+
+  case LED_Rain:
+    leds.setBrightness(LubeConfig.LED_Min_Brightness);
+    leds.setPixelColor(0, LED_RAIN_COLOR);
+
+    if (timer % 2000 > 1950 && LubeConfig.LED_Mode_Flash == true)
+      leds.setBrightness(LubeConfig.LED_Max_Brightness);
+    else if (timer % 2000 > 1500 && WiFi.getMode() != WIFI_OFF)
+      leds.setPixelColor(0, LED_WIFI_BLINK);
+
+    break;
+
+  case LED_Purge:
+    timer = timer % 500;
+    color = map(timer / 2, 0, 250, LubeConfig.LED_Min_Brightness, LubeConfig.LED_Max_Brightness);
+    leds.setPixelColor(0, LED_PURGE_COLOR);
+    if (timer < 250)
+      leds.setBrightness(color);
+    else
+      leds.setBrightness(LubeConfig.LED_Max_Brightness - color);
+    break;
+
+  case LED_Error:
+    leds.setBrightness(LubeConfig.LED_Max_Brightness);
+    leds.setPixelColor(0, timer % 500 > 250 ? LED_ERROR_BLINK : 0);
+    break;
+
+  case LED_Shutdown:
+    timer = timer % 600;
+    leds.setPixelColor(0, LED_SHUTDOWN_BLINK);
+    if (timer < 500)
+    {
+      color = map(timer, 0, 500, LubeConfig.LED_Max_Brightness, LubeConfig.LED_Min_Brightness);
+      leds.setBrightness(color);
+    }
+    else
+    {
+      leds.setBrightness(LubeConfig.LED_Min_Brightness);
+    }
+    break;
+
+  case LED_Override:
+    leds.setBrightness(LubeConfig.LED_Max_Brightness);
+    leds.setPixelColor(0, LED_override_color);
+    break;
+
+  default:
+    break;
+  }
+  leds.show();
+}
+#ifdef FEATURE_ENABLE_OLED
+void Display_Process()
+{
+  static tSystem_Status oldSysStatus = sysStat_Startup;
+
+  if (oldSysStatus != globals.systemStatus)
+  {
+    u8x8.clearDisplay();
+    u8x8.drawString(0, 0, "KTM ChainLube V1");
+    oldSysStatus = globals.systemStatus;
+  }
+
+  u8x8.setCursor(0, 1);
+  uint32_t DistRemain = globals.systemStatus == sysStat_Normal ? LubeConfig.DistancePerLube_Default : LubeConfig.DistancePerLube_Rain;
+  DistRemain = DistRemain - (PersistenceData.TravelDistance_highRes_mm / 1000);
+  u8x8.printf(PSTR("Mode: %10s\n"), globals.systemStatustxt);
+  if (globals.systemStatus == sysStat_Error)
+  {
+    u8x8.printf(PSTR("last DTC: %6d\n"), getlastDTC(false));
+  }
+  else
+  {
+    u8x8.printf(PSTR("next Lube: %4dm\n"), DistRemain);
+    u8x8.printf(PSTR("Tank: %8dml\n"), PersistenceData.tankRemain_microL / 1000);
+    u8x8.printf(PSTR("WiFi: %10s\n"), (WiFi.getMode() == WIFI_AP ? "AP" : WiFi.getMode() == WIFI_OFF ? "OFF"
+                                                                      : WiFi.getMode() == WIFI_STA   ? "CLIENT"
+                                                                                                     : "UNKNOWN"));
+    u8x8.printf(PSTR("Source: %8s\n"), SpeedSourceString[LubeConfig.SpeedSource]);
+    u8x8.printf("%s\n", WiFi.localIP().toString().c_str());
+  }
+  u8x8.refreshDisplay();
+}
+#endif
+
+void Button_Process()
+{
+
+#define BUTTON_ACTION_DELAY_TOGGLEMODE 500
+#define BUTTON_ACTION_DELAY_PURGE 3500
+#define BUTTON_ACTION_DELAY_WIFI 6500
+#define BUTTON_ACTION_DELAY_NOTHING 9500
+
+  typedef enum buttonAction_e
+  {
+    BTN_INACTIVE,
+    BTN_NOTHING,
+    BTN_TOGGLEMODE,
+    BTN_TOGGLEWIFI,
+    BTN_STARTPURGE
+  } buttonAction_t;
+
+  static uint32_t buttonTimestamp = 0;
+  static buttonAction_t buttonAction = BTN_INACTIVE;
+
+  if (digitalRead(GPIO_BUTTON) == LOW)
+  {
+
+    if (buttonTimestamp == 0)
+      buttonTimestamp = millis();
+
+    if (buttonTimestamp + BUTTON_ACTION_DELAY_NOTHING < millis())
+    {
+      LED_Process(1, COLOR_WARM_WHITE);
+      buttonAction = BTN_NOTHING;
+    }
+    else if (buttonTimestamp + BUTTON_ACTION_DELAY_WIFI < millis())
+    {
+      LED_Process(1, LED_WIFI_BLINK);
+      buttonAction = BTN_TOGGLEWIFI;
+    }
+    else if (buttonTimestamp + BUTTON_ACTION_DELAY_PURGE < millis())
+    {
+      LED_Process(1, LED_PURGE_COLOR);
+      buttonAction = BTN_STARTPURGE;
+    }
+    else if (buttonTimestamp + BUTTON_ACTION_DELAY_TOGGLEMODE < millis())
+    {
+      uint32_t color = globals.systemStatus == sysStat_Normal ? LED_RAIN_COLOR : LED_NORMAL_COLOR;
+      LED_Process(1, color);
+      buttonAction = BTN_TOGGLEMODE;
+    }
+  }
+  else
+  {
+    if (buttonAction != BTN_INACTIVE)
+    {
+      switch (buttonAction)
+      {
+      case BTN_TOGGLEWIFI:
+        toggleWiFiAP();
+        Debug_pushMessage("Starting WiFi AP");
+        break;
+
+      case BTN_STARTPURGE:
+        globals.systemStatus = sysStat_Purge;
+        globals.purgePulses = LubeConfig.BleedingPulses;
+        Debug_pushMessage("Starting Purge");
+        break;
+
+      case BTN_TOGGLEMODE:
+        switch (globals.systemStatus)
+        {
+        case sysStat_Normal:
+          globals.systemStatus = sysStat_Rain;
+          globals.resumeStatus = sysStat_Rain;
+          break;
+
+        case sysStat_Rain:
+          globals.systemStatus = sysStat_Normal;
+          globals.resumeStatus = sysStat_Normal;
+          break;
+        default:
+          break;
+        }
+        Debug_pushMessage("Toggling Mode");
+        break;
+
+      case BTN_NOTHING:
+      default:
+        Debug_pushMessage("Nothing or invalid");
+        break;
+      }
+      LED_Process(2);
+    }
+    buttonAction = BTN_INACTIVE;
+    buttonTimestamp = 0;
+  }
+}
+
+void toggleWiFiAP(boolean shutdown)
+{
+  if (WiFi.getMode() != WIFI_OFF)
+  {
+    WiFi.mode(WIFI_OFF);
+    Debug_pushMessage("WiFi turned off");
+#ifdef FEATURE_ENABLE_WIFI_CLIENT
+    WiFiMaintainConnectionTicker.stop();
+#endif
+  }
+  else
+  {
+    WiFi.mode(WIFI_AP);
+    WiFi.softAPConfig(IPAddress(WIFI_AP_IP_GW), IPAddress(WIFI_AP_IP_GW), IPAddress(255, 255, 255, 0));
+    WiFi.softAP(globals.DeviceName, QUOTE(WIFI_AP_PASSWORD));
+#ifdef FEATURE_ENABLE_WIFI_CLIENT
+    WiFiMaintainConnectionTicker.stop();
+    Debug_pushMessage("WiFi AP started, stopped Maintain-Timer");
+#else
+    Debug_pushMessage("WiFi AP started");
+#endif
+  }
+}
+
+void SystemShutdown()
+{
+  static uint32_t shutdown_delay = 0;
+
+  if (shutdown_delay == 0)
+  {
+    shutdown_delay = millis() + SHUTDOWN_DELAY_MS;
+    Serial.printf("Shutdown requested - Restarting in %d seconds\n", SHUTDOWN_DELAY_MS / 1000);
+  }
+  if (shutdown_delay < millis())
+  {
+    StoreConfig_EEPROM();
+    StorePersistence_EEPROM();
+    ESP.restart();
+  }
+}
+
+uint32_t Process_Impulse_WheelSpeed()
+{
+  uint32_t add_milimeters = 0;
+  // Calculate traveled Distance in mm
+  if (LubeConfig.PulsePerRevolution != 0)
+    add_milimeters = (wheel_pulse * (LubeConfig.DistancePerRevolution_mm / LubeConfig.PulsePerRevolution));
+
+  if (globals.measurementActive == true)
+    globals.measuredPulses = globals.measuredPulses + wheel_pulse;
+
+  wheel_pulse = 0;
+
+  return add_milimeters;
+}

Software/src/sanitycheck.h

@@ -0,0 +1,37 @@
+#ifndef _SANITYCHECK_H_
+#define _SANITYCHECK_H_
+
+#ifndef PCB_REV
+    #error "You must define PCB_REV"
+#else
+    #if PCB_REV < 1 || PCB_REV > 4
+        #error "Unsupported PCB-Revision"
+    #endif
+
+    #if PCB_REV < 3 && defined(FEATURE_ENABLE_CAN)
+        #error "CAN-Feature unsupported with this PCB-Rev"
+    #endif
+    #if PCB_REV < 4 && defined(DFEATURE_ENABLE_GPS)
+        #error "GPS-Feature unsupported with this PCB-Rev"
+    #endif
+#endif
+
+#ifndef ADMIN_PASSWORD
+    #error "You need to define ADMIN_PASSWORD for OTA-Update"
+#endif
+
+#ifdef FEATURE_ENABLE_WIFI_CLIENT
+    #ifndef WIFI_PASSWORD_CLIENT
+        #error "You must define an WIFI_PASSWORD for Client-Mode"
+    #endif
+
+    #ifndef WIFI_SSID_CLIENT
+        #error "You must define an WIFI_SSID for Client-Mode"
+    #endif
+#endif
+
+#ifndef WIFI_AP_PASSWORD
+#error "You must define an WIFI_AP_PASSWORD for Standalone AP-Mode"
+#endif
+
+#endif //_SANITYCHECK_H_

Software/src/webui.cpp

@@ -0,0 +1,684 @@
+#include "webui.h"
+
+AsyncWebServer webServer(80);
+
+const char *PARAM_MESSAGE = "message";
+
+String processor(const String &var);
+void WebserverPOST_Callback(AsyncWebServerRequest *request);
+void WebserverNotFound_Callback(AsyncWebServerRequest *request);
+void Webserver_Callback(AsyncWebServerRequest *request);
+void WebserverFirmwareUpdate_Callback(AsyncWebServerRequest *request, const String &filename, size_t index, uint8_t *data, size_t len, bool final);
+void WebserverEERestore_Callback(AsyncWebServerRequest *request, const String &filename, size_t index, uint8_t *data, size_t len, bool final);
+void WebServerEEJSON_Callback(AsyncWebServerRequest *request);
+void GetFlashVersion(char *buff, size_t buff_size);
+
+#ifdef FEATURE_ENABLE_WEBSOCKETS
+
+AsyncWebSocket webSocket("/ws");
+
+void WebsocketEvent_Callback(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len);
+void Websocket_HandleMessage(void *arg, uint8_t *data, size_t len);
+
+#endif
+
+void initWebUI()
+{
+  if (!LittleFS.begin())
+  {
+    Debug_pushMessage("An Error has occurred while mounting LittleFS\n");
+    MaintainDTC(DTC_FLASHFS_ERROR, DTC_CRITICAL, true);
+    return;
+  }
+
+  GetFlashVersion(globals.FlashVersion, sizeof(globals.FlashVersion));
+
+  char buffer[6];
+  snprintf(buffer, sizeof(buffer), "%d.%02d", constants.Required_Flash_Version_major, constants.Required_Flash_Version_minor);
+  if (strcmp(globals.FlashVersion, buffer))
+  {
+    MaintainDTC(DTC_FLASHFS_VERSION_ERROR, DTC_WARN, true);
+  }
+
+  MDNS.begin(globals.DeviceName);
+  MDNS.addService("http", "tcp", 80);
+
+#ifdef FEATURE_ENABLE_WEBSOCKETS
+  webSocket.onEvent(WebsocketEvent_Callback);
+  webServer.addHandler(&webSocket);
+#endif
+
+  webServer.serveStatic("/static/", LittleFS, "/static/").setCacheControl("max-age=360000");
+  webServer.on("/", HTTP_GET, [](AsyncWebServerRequest *request)
+               { request->redirect("/index.htm"); });
+  webServer.onNotFound(WebserverNotFound_Callback);
+  webServer.on("/index.htm", HTTP_GET, Webserver_Callback);
+  webServer.on("/post.htm", HTTP_POST, WebserverPOST_Callback);
+  webServer.on("/eejson", HTTP_GET, WebServerEEJSON_Callback);
+  webServer.on(
+      "/doUpdate", HTTP_POST, [](AsyncWebServerRequest *request) {}, WebserverFirmwareUpdate_Callback);
+  webServer.on(
+      "/eeRestore", HTTP_POST, [](AsyncWebServerRequest *request) {}, WebserverEERestore_Callback);
+
+  webServer.begin();
+}
+
+void Webserver_Process()
+{
+#ifdef FEATURE_ENABLE_WEBSOCKETS
+  webSocket.cleanupClients();
+#endif
+}
+
+String processor(const String &var)
+{
+  if (var == "TANK_REMAIN_CAPACITY")
+    return String((PersistenceData.tankRemain_microL / 10) / LubeConfig.tankCapacity_ml);
+  if (var == "LUBE_DISTANCE_NORMAL")
+    return String(LubeConfig.DistancePerLube_Default);
+  if (var == "LUBE_DISTANCE_RAIN")
+    return String(LubeConfig.DistancePerLube_Rain);
+  if (var == "TANK_CAPACITY")
+    return String(LubeConfig.tankCapacity_ml);
+  if (var == "AMOUNT_PER_DOSE")
+    return String(LubeConfig.amountPerDose_microL);
+  if (var == "TANK_REMIND")
+    return String(LubeConfig.TankRemindAtPercentage);
+  if (var == "PULSE_PER_REV")
+    return String(LubeConfig.PulsePerRevolution);
+  if (var == "TIRE_WIDTH_MM")
+    return String(LubeConfig.TireWidth_mm);
+  if (var == "TIRE_RATIO")
+    return String(LubeConfig.TireWidthHeight_Ratio);
+  if (var == "RIM_DIAMETER")
+    return String(LubeConfig.RimDiameter_Inch);
+  if (var == "DISTANCE_PER_REV")
+    return String(LubeConfig.DistancePerRevolution_mm);
+  if (var == "BLEEDING_PULSES")
+    return String(LubeConfig.BleedingPulses);
+  if (var == "SPEED_SOURCE")
+    return String(SpeedSourceString[LubeConfig.SpeedSource]);
+  if (var == "GPS_BAUD")
+#ifdef FEATURE_ENABLE_GPS
+    return String(GPSBaudRateString[LubeConfig.GPSBaudRate]);
+#else
+    return "Feature N/A";
+#endif
+  if (var == "CAN_SOURCE")
+#ifdef FEATURE_ENABLE_CAN
+    return String(CANSourceString[LubeConfig.CANSource]);
+#else
+    return "Feature N/A";
+#endif
+  if (var == "LED_MODE_FLASH")
+    return String(LubeConfig.LED_Mode_Flash);
+  if (var == "LEDFLASHCHECKED")
+    return String(LubeConfig.LED_Mode_Flash == true ? "checked" : "");
+  if (var == "LED_MAX_BRIGHTNESS")
+    return String(LubeConfig.LED_Max_Brightness);
+  if (var == "LED_MIN_BRIGHTNESS")
+    return String(LubeConfig.LED_Min_Brightness);
+  if (var == "EEPROM_VERSION")
+    return String(LubeConfig.EEPROM_Version);
+  if (var == "CONFIG_CHECKSUM")
+  {
+    char buffer[7];
+    sprintf(buffer, "0x%04X", LubeConfig.checksum);
+    return String(buffer);
+  }
+  if (var == "WRITE_CYCLE_COUNT")
+    return String(PersistenceData.writeCycleCounter);
+  if (var == "PERSISTENCE_MARKER")
+    return String(globals.eePersistanceAdress);
+  if (var == "TANK_REMAIN_UL")
+    return String(PersistenceData.tankRemain_microL);
+  if (var == "TRAVEL_DISTANCE_HIGHRES")
+    return String(PersistenceData.TravelDistance_highRes_mm);
+  if (var == "ODOMETER")
+    return String(PersistenceData.odometer);
+  if (var == "ODOMETER_M")
+    return String(PersistenceData.odometer_mm / 1000);
+  if (var == "PERSISTANCE_CHECKSUM")
+  {
+    char buffer[7];
+    sprintf(buffer, "0x%04X", PersistenceData.checksum);
+    return String(buffer);
+  }
+  if (var == "SHOW_IMPULSE_SETTINGS")
+    return LubeConfig.SpeedSource == SOURCE_IMPULSE ? "" : "hidden";
+  if (var == "SHOW_CAN_SETTINGS")
+#ifdef FEATURE_ENABLE_CAN
+    return LubeConfig.SpeedSource == SOURCE_CAN ? "" : "hidden";
+#else
+    return "hidden";
+#endif
+  if (var == "SHOW_GPS_SETTINGS")
+#ifdef FEATURE_ENABLE_GPS
+    return LubeConfig.SpeedSource == SOURCE_GPS ? "" : "hidden";
+#else
+    return "hidden";
+#endif
+  if (var == "SHOW_DTC_TABLE")
+    return globals.hasDTC ? "" : "hidden";
+
+  if (var == "DTC_TABLE")
+  {
+    String temp = "";
+    char buff_timestamp[16]; // Format: DD-hh:mm:ss:xxx
+
+    for (uint32_t i = 0; i < MAX_DTC_STORAGE; i++)
+    {
+      if (DTCStorage[i].Number < DTC_LAST_DTC)
+      {
+        sprintf(buff_timestamp, "%02d-%02d:%02d:%02d:%03d",
+                DTCStorage[i].timestamp / 86400000,    // Days
+                DTCStorage[i].timestamp / 360000 % 24, // Hours
+                DTCStorage[i].timestamp / 60000 % 60,  // Minutes
+                DTCStorage[i].timestamp / 1000 % 60,   // Seconds
+                DTCStorage[i].timestamp % 1000);       // milliseconds
+
+        temp = temp + "<tr data-dtc=" + String(DTCStorage[i].Number);
+        temp = temp + " data-debugval=" + String(DTCStorage[i].debugVal) + "><td>" + String(buff_timestamp);
+        temp = temp + "</td><td>" + String(DTCStorage[i].Number) + "</td><td>";
+        temp = temp + "<img src=static/img/";
+        switch (DTCStorage[i].severity)
+        {
+        case DTC_CRITICAL:
+          temp = temp + "critical";
+          break;
+        case DTC_WARN:
+          temp = temp + "warn";
+          break;
+        case DTC_INFO:
+          temp = temp + "info";
+          break;
+        }
+        temp = temp + ".png></td><td>";
+
+        if (DTCStorage[i].active == DTC_ACTIVE)
+          temp = temp + "active";
+        else if (DTCStorage[i].active == DTC_PREVIOUS)
+          temp = temp + "previous";
+        else
+          temp = temp + "none";
+
+        temp = temp + "</td></tr>";
+      }
+    }
+    return temp;
+  }
+
+  if (var == "SOURCE_SELECT_OPTIONS")
+  {
+    String temp;
+    for (uint32_t i = 0; i < SpeedSourceString_Elements; i++)
+    {
+      String selected = LubeConfig.SpeedSource == i ? " selected " : "";
+      temp = temp + "<option value=\"" + i + "\"" + selected + ">" + SpeedSourceString[i] + "</option>";
+    }
+    return temp;
+  }
+
+#ifdef FEATURE_ENABLE_CAN
+  if (var == "CANSOURCE_SELECT_OPTIONS")
+  {
+    String temp;
+    for (uint32_t i = 0; i < CANSourceString_Elements; i++)
+    {
+      String selected = LubeConfig.CANSource == i ? " selected " : "";
+      temp = temp + "<option value=\"" + i + "\"" + selected + ">" + CANSourceString[i] + "</option>";
+    }
+    return temp;
+  }
+#endif
+#ifdef FEATURE_EABLE_GPS
+  if (var == "GPSBAUD_SELECT_OPTIONS")
+  {
+    String temp;
+    for (uint32_t i = 0; i < GPSBaudRateString_Elements; i++)
+    {
+      String selected = LubeConfig.GPSBaudRate == i ? " selected " : "";
+      temp = temp + "<option value=\"" + i + "\"" + selected + ">" + GPSBaudRateString[i] + "</option>";
+    }
+    return temp;
+  }
+#endif
+
+  if (var == "SYSTEM_STATUS")
+    return String(globals.systemStatustxt);
+
+  if (var == "SW_VERSION")
+  {
+    char buffer[6];
+    snprintf(buffer, sizeof(buffer), "%d.%02d", constants.FW_Version_major, constants.FW_Version_minor);
+    return String(buffer);
+  }
+
+  if (var == "FS_VERSION")
+    return String(globals.FlashVersion);
+
+  if (var == "GIT_REV")
+    return String(constants.GitHash);
+
+  if (var == "MEASURED_PULSES")
+    return String(globals.measuredPulses);
+
+  if (var == "MEASURE_BTN")
+    return String(globals.measurementActive == true ? "Stop" : "Start");
+
+  if (var == "PLACEHOLDER")
+    return "placeholder";
+
+  return String();
+}
+
+void Webserver_Callback(AsyncWebServerRequest *request)
+{
+  request->send(LittleFS, "/index.htm", "text/html", false, processor);
+}
+
+void WebserverPOST_Callback(AsyncWebServerRequest *request)
+{
+  request->send(LittleFS, "/post.htm", "text/html", false, processor);
+
+  Debug_pushMessage("POST:\n");
+  int paramsNr = request->params();
+  for (int i = 0; i < paramsNr; i++)
+  {
+    AsyncWebParameter *p = request->getParam(i);
+    Debug_pushMessage("%s : %s\n", p->name().c_str(), p->value().c_str());
+
+    // begin: POST Form Source Changed
+    if (p->name() == "sourceselect")
+    {
+      SpeedSource_t temp = (SpeedSource_t)p->value().toInt();
+      Debug_pushMessage("temp: %d", temp);
+      Debug_pushMessage("SpeedSource: %d", LubeConfig.SpeedSource);
+      if (LubeConfig.SpeedSource != temp)
+      {
+        LubeConfig.SpeedSource = temp;
+        globals.systemStatus = sysStat_Shutdown;
+      }
+    }
+    // end: POST Form Source Changed
+    // begin: POST Form Source Pulse Settings
+    if (p->name() == "tirewidth")
+      LubeConfig.TireWidth_mm = p->value().toInt();
+    if (p->name() == "tireratio")
+      LubeConfig.TireWidthHeight_Ratio = p->value().toInt();
+    if (p->name() == "tiredia")
+      LubeConfig.RimDiameter_Inch = p->value().toInt();
+    if (p->name() == "pulserev")
+      LubeConfig.PulsePerRevolution = p->value().toInt();
+    if (p->name() == "pulsesave")
+      globals.requestEEAction = EE_CFG_SAVE;
+      // end: POST Form Source Pulse Settings
+#ifdef FEATURE_EABLE_GPS
+    // begin: POST Form Source GPS Settings
+    if (p->name() == "gpsbaud")
+      LubeConfig.GPSBaudRate = (GPSBaudRate_t)p->value().toInt();
+    if (p->name() == "gpssave")
+      globals.requestEEAction = EE_CFG_SAVE;
+// end: POST Form Source GPS Settings
+#endif
+#ifdef FEATURE_EABLE_CAN
+    // begin: POST Form Source CAN Settings
+    if (p->name() == "cansource")
+      LubeConfig.CANSource = (CANSource_t)p->value().toInt();
+    if (p->name() == "cansave")
+      globals.requestEEAction = EE_CFG_SAVE;
+// end: POST Form Source CAN Settings
+#endif
+    // begin: POST Form Lubrication
+    if (p->name() == "lubedistancenormal")
+      LubeConfig.DistancePerLube_Default = p->value().toInt();
+    if (p->name() == "lubedistancerain")
+      LubeConfig.DistancePerLube_Rain = p->value().toInt();
+    if (p->name() == "lubesave")
+      globals.requestEEAction = EE_CFG_SAVE;
+    // end: POST Form Lubrication
+    // begin: POST Form Oiltank
+    if (p->name() == "tankcap")
+      LubeConfig.tankCapacity_ml = p->value().toInt();
+    if (p->name() == "tankwarn")
+      LubeConfig.TankRemindAtPercentage = p->value().toInt();
+    if (p->name() == "pumppulse")
+      LubeConfig.amountPerDose_microL = p->value().toInt();
+    if (p->name() == "oilsave")
+      globals.requestEEAction = EE_CFG_SAVE;
+    // end: POST Form Oiltank
+    // begin: POST Form Maintenance
+    if (p->name() == "purgepulse")
+      LubeConfig.BleedingPulses = p->value().toInt();
+    if (p->name() == "maintsave")
+      globals.requestEEAction = EE_CFG_SAVE;
+    if (p->name() == "resettank")
+    {
+      PersistenceData.tankRemain_microL = LubeConfig.tankCapacity_ml * 1000;
+      globals.requestEEAction = EE_PDS_SAVE;
+    }
+    if (p->name() == "reset_ee_btn")
+    {
+      if (request->hasParam("reset_ee_pds", true))
+      {
+        AsyncWebParameter *param = request->getParam("reset_ee_pds", true);
+        if (param->value() == "on")
+          globals.requestEEAction = globals.requestEEAction == EE_CFG_FORMAT ? EE_FORMAT_ALL : EE_PDS_FORMAT;
+      }
+      if (request->hasParam("reset_ee_cfg", true))
+      {
+        AsyncWebParameter *param = request->getParam("reset_ee_cfg", true);
+        if (param->value() == "on")
+          globals.requestEEAction = globals.requestEEAction == EE_PDS_FORMAT ? EE_FORMAT_ALL : EE_CFG_FORMAT;
+      }
+    }
+    if (p->name() == "purgenow")
+    {
+      globals.systemStatus = sysStat_Purge;
+      globals.purgePulses = LubeConfig.BleedingPulses;
+    }
+    if (p->name() == "reboot")
+    {
+      globals.systemStatus = sysStat_Shutdown;
+    }
+    // end: POST Form Maintenance
+    // begin: POST Form LED Settings
+    if (p->name() == "ledmaxbrightness")
+      LubeConfig.LED_Max_Brightness = p->value().toInt();
+    if (p->name() == "ledminbrightness")
+      LubeConfig.LED_Min_Brightness = p->value().toInt();
+    if (p->name() == "ledsave")
+    {
+      if (request->hasParam("ledmodeflash", true))
+      {
+        AsyncWebParameter *param = request->getParam("ledmodeflash", true);
+        if (param->value() == "on")
+          LubeConfig.LED_Mode_Flash = true;
+      }
+      else
+      {
+        LubeConfig.LED_Mode_Flash = false;
+      }
+      globals.requestEEAction = EE_CFG_SAVE;
+    }
+    // end: POST Form LED SEttings
+    // begin: POST Form Measure Pulses
+    if (p->name() == "measurereset")
+      globals.measuredPulses = 0;
+    if (p->name() == "measurestartstop")
+      globals.measurementActive = !globals.measurementActive;
+    // end: POST Form Measure Pulses
+  }
+}
+
+void WebserverNotFound_Callback(AsyncWebServerRequest *request)
+{
+  request->send(404, "text/html", "Not found");
+}
+
+void GetFlashVersion(char *buff, size_t buff_size)
+{
+  File this_file = LittleFS.open("version", "r");
+  if (!this_file)
+  { // failed to open the file, retrn empty result
+    buff[0] = '\0';
+    return;
+  }
+  if (this_file.available())
+  {
+    int bytes_read;
+    bytes_read = this_file.readBytesUntil('\r', buff, buff_size - 1);
+    buff[bytes_read] = '\0';
+  }
+  this_file.close();
+}
+
+void WebserverFirmwareUpdate_Callback(AsyncWebServerRequest *request, const String &filename, size_t index, uint8_t *data, size_t len, bool final)
+{
+
+  if (!index)
+  {
+    Debug_pushMessage("Update");
+    size_t content_len = request->contentLength();
+    int cmd = (filename.indexOf(".fs") > -1) ? U_FS : U_FLASH;
+    Update.runAsync(true);
+    if (!Update.begin(content_len, cmd))
+    {
+      Update.printError(Serial);
+    }
+  }
+
+  if (Update.write(data, len) != len)
+  {
+    Update.printError(Serial);
+  }
+  else
+  {
+    Debug_pushMessage("Progress: %d%%\n", (Update.progress() * 100) / Update.size());
+  }
+
+  if (final)
+  {
+    AsyncWebServerResponse *response = request->beginResponse(302, "text/plain", "Please wait while the device reboots");
+    response->addHeader("Refresh", "20");
+    response->addHeader("Location", "/");
+    request->send(response);
+    if (!Update.end(true))
+    {
+      Update.printError(Serial);
+    }
+    else
+    {
+      Debug_pushMessage("Update complete\n");
+      globals.systemStatus = sysStat_Shutdown;
+    }
+  }
+}
+
+void WebserverEERestore_Callback(AsyncWebServerRequest *request, const String &filename, size_t index, uint8_t *data, size_t len, bool final)
+{
+  bool ee_done = false;
+  static bool validext = false;
+  static char *buffer = NULL;
+  static uint32_t read_ptr = 0;
+  DeserializationError error;
+
+  if (!index)
+  {
+    validext = (filename.indexOf(".ee.json") > -1);
+    if (validext)
+    {
+      buffer = (char *)malloc(1536);
+      read_ptr = 0;
+      if (buffer == NULL)
+        Debug_pushMessage("malloc() failed for EEPROM-Restore");
+    }
+  }
+
+  if (buffer != NULL)
+  {
+    memcpy(buffer + read_ptr, data, len);
+    read_ptr = read_ptr + len;
+  }
+
+  if (final)
+  {
+    if (buffer != NULL)
+    {
+      Serial.print(buffer);
+      StaticJsonDocument<1536> doc;
+      error = deserializeJson(doc, buffer);
+      if (error)
+      {
+        Debug_pushMessage("deserializeJson() failed: %s\n", error.f_str());
+      }
+      else
+      {
+
+        LubeConfig.DistancePerLube_Default = doc["config"]["DistancePerLube_Default"].as<uint32_t>();
+        LubeConfig.DistancePerLube_Rain = doc["config"]["DistancePerLube_Rain"].as<uint32_t>();
+        LubeConfig.tankCapacity_ml = doc["config"]["tankCapacity_ml"].as<uint32_t>();
+        LubeConfig.amountPerDose_microL = doc["config"]["amountPerDose_microL"].as<uint32_t>();
+        LubeConfig.TankRemindAtPercentage = doc["config"]["TankRemindAtPercentage"].as<uint8_t>();
+        LubeConfig.PulsePerRevolution = doc["config"]["PulsePerRevolution"].as<uint8_t>();
+        LubeConfig.TireWidth_mm = doc["config"]["TireWidth_mm"].as<uint32_t>();
+        LubeConfig.TireWidthHeight_Ratio = doc["config"]["TireWidthHeight_Ratio"].as<uint32_t>();
+        LubeConfig.RimDiameter_Inch = doc["config"]["RimDiameter_Inch"].as<uint32_t>();
+        LubeConfig.DistancePerRevolution_mm = doc["config"]["DistancePerRevolution_mm"].as<uint32_t>();
+        LubeConfig.BleedingPulses = doc["config"]["BleedingPulses"].as<uint16_t>();
+        LubeConfig.SpeedSource = (SpeedSource_t)doc["config"]["SpeedSource"].as<int>();
+#ifdef FEATURE_ENABLE_GPS
+        LubeConfig.GPSBaudRate = (GPSBaudRate_t)doc["config"]["GPSBaudRate"].as<int>();
+#endif
+#ifdef FEATURE_ENABLE_CAN
+        LubeConfig.CANSource = (CANSource_t)doc["config"]["CANSource"].as<int>();
+#endif
+        LubeConfig.LED_Mode_Flash = doc["config"]["LED_Mode_Flash"].as<bool>();
+        LubeConfig.LED_Max_Brightness = doc["config"]["LED_Max_Brightness"].as<uint8_t>();
+        LubeConfig.LED_Min_Brightness = doc["config"]["LED_Min_Brightness"].as<uint8_t>();
+
+        PersistenceData.writeCycleCounter = doc["persis"]["writeCycleCounter"].as<uint16_t>();
+        PersistenceData.tankRemain_microL = doc["persis"]["tankRemain_microL"].as<uint32_t>();
+        PersistenceData.TravelDistance_highRes_mm = doc["persis"]["TravelDistance_highRes_mm"].as<uint32_t>();
+        PersistenceData.odometer_mm = doc["persis"]["odometer_mm"].as<uint32_t>();
+        PersistenceData.odometer = doc["persis"]["odometer"].as<uint32_t>();
+        PersistenceData.checksum = doc["persis"]["checksum"].as<uint32_t>();
+
+        ee_done = true;
+      }
+    }
+
+    free(buffer);
+
+    AsyncWebServerResponse *response = request->beginResponse(302, "text/plain", "Please wait while the device reboots");
+    response->addHeader("Refresh", "20");
+    response->addHeader("Location", "/");
+    request->send(response);
+
+    if (ee_done)
+    {
+      Debug_pushMessage("Update complete");
+      globals.systemStatus = sysStat_Shutdown;
+    }
+    else
+    {
+    }
+  }
+}
+
+void WebServerEEJSON_Callback(AsyncWebServerRequest *request)
+{
+  AsyncResponseStream *response = request->beginResponseStream("application/json");
+  DynamicJsonDocument json(1024);
+  JsonObject fwinfo = json.createNestedObject("info");
+
+  char buffer[16];
+
+  fwinfo["DeviceName"] = globals.DeviceName;
+  sprintf(buffer, "%d.%02d", constants.Required_Flash_Version_major, constants.Required_Flash_Version_minor);
+  fwinfo["FW-Version"] = buffer;
+  fwinfo["FS-Version"] = globals.FlashVersion;
+  snprintf_P(buffer, sizeof(buffer), "%s", constants.GitHash);
+  fwinfo["Git-Hash"] = buffer;
+
+  JsonObject config = json.createNestedObject("config");
+
+  config["EEPROM_Version"] = LubeConfig.EEPROM_Version;
+  config["DistancePerLube_Default"] = LubeConfig.DistancePerLube_Default;
+  config["DistancePerLube_Rain"] = LubeConfig.DistancePerLube_Rain;
+  config["tankCapacity_ml"] = LubeConfig.tankCapacity_ml;
+  config["amountPerDose_microL"] = LubeConfig.amountPerDose_microL;
+  config["TankRemindAtPercentage"] = LubeConfig.TankRemindAtPercentage;
+  config["PulsePerRevolution"] = LubeConfig.PulsePerRevolution;
+  config["TireWidth_mm"] = LubeConfig.TireWidth_mm;
+  config["TireWidthHeight_Ratio"] = LubeConfig.TireWidthHeight_Ratio;
+  config["RimDiameter_Inch"] = LubeConfig.RimDiameter_Inch;
+  config["DistancePerRevolution_mm"] = LubeConfig.DistancePerRevolution_mm;
+  config["BleedingPulses"] = LubeConfig.BleedingPulses;
+  config["SpeedSource"] = LubeConfig.SpeedSource;
+  config["SpeedSource_Str"] = SpeedSourceString[LubeConfig.SpeedSource];
+#ifdef FEATURE_ENABLE_GPS
+  config["GPSBaudRate"] = LubeConfig.GPSBaudRate;
+  config["GPSBaudRate_Str"] = GPSBaudRateString[LubeConfig.GPSBaudRate];
+#endif
+#ifdef FEATURE_ENABLE_CAN
+  config["CANSource"] = LubeConfig.CANSource;
+  config["CANSource_Str"] = CANSourceString[LubeConfig.CANSource];
+#endif
+  config["LED_Mode_Flash"] = LubeConfig.LED_Mode_Flash;
+  config["LED_Max_Brightness"] = LubeConfig.LED_Max_Brightness;
+  config["LED_Min_Brightness"] = LubeConfig.LED_Min_Brightness;
+  sprintf(buffer, "0x%08X", LubeConfig.checksum);
+  config["checksum"] = buffer;
+
+  JsonObject eepart = json.createNestedObject("eepart");
+
+  sprintf(buffer, "0x%04X", globals.eePersistanceAdress);
+  eepart["PersistanceAddress"] = buffer;
+
+  JsonObject persis = json.createNestedObject("persis");
+
+  persis["writeCycleCounter"] = PersistenceData.writeCycleCounter;
+  persis["tankRemain_microL"] = PersistenceData.tankRemain_microL;
+  persis["TravelDistance_highRes_mm"] = PersistenceData.TravelDistance_highRes_mm;
+  persis["odometer_mm"] = PersistenceData.odometer_mm;
+  persis["odometer"] = PersistenceData.odometer;
+  sprintf(buffer, "0x%08X", PersistenceData.checksum);
+  persis["checksum"] = buffer;
+
+  serializeJsonPretty(json, *response);
+
+  response->addHeader("Content-disposition", "attachment; filename=backup.ee.json");
+
+  request->send(response);
+}
+
+#ifdef FEATURE_ENABLE_WEBSOCKETS
+void WebsocketEvent_Callback(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len)
+{
+  switch (type)
+  {
+  case WS_EVT_CONNECT:
+    Debug_pushMessage("WebSocket client #%u connected from %s\n", client->id(), client->remoteIP().toString().c_str());
+    break;
+  case WS_EVT_DISCONNECT:
+    Debug_pushMessage("WebSocket client #%u disconnected\n", client->id());
+    break;
+  case WS_EVT_DATA:
+    Websocket_HandleMessage(arg, data, len);
+    break;
+  case WS_EVT_PONG:
+  case WS_EVT_ERROR:
+    break;
+  }
+}
+
+void Websocket_HandleMessage(void *arg, uint8_t *data, size_t len)
+{
+  AwsFrameInfo *info = (AwsFrameInfo *)arg;
+  if (info->final && info->index == 0 && info->len == len && info->opcode == WS_TEXT)
+  {
+    data[len] = 0;
+
+    Debug_pushMessage("Got WebSocket Message: %s \n", (char *)data);
+
+    if (strcmp((char *)data, "start") == 0)
+    {
+      SetDebugportStatus(dbg_Webui, enabled);
+    }
+    else if (strcmp((char *)data, "stop") == 0)
+    {
+      SetDebugportStatus(dbg_Webui, disabled);
+    }
+    else if (strcmp((char *)data, "foo") == 0)
+    {
+      Debug_pushMessage("Got WebSocket Message 'foo' from client\n");
+    }
+  }
+}
+
+void Websocket_PushLiveDebug(String Message)
+{
+  webSocket.textAll(Message + "\n");
+}
+#endif

Software/src/webui.h

@@ -0,0 +1,27 @@
+#ifndef _WEBUI_H_
+#define _WEBUI_H_
+
+#include <Arduino.h>
+#include <FS.h>
+#include <LittleFS.h>
+#include <ESPAsyncTCP.h>
+#include <ESPAsyncWebServer.h>
+#include <Updater.h>
+#include <ESP8266mDNS.h>
+#include <AsyncJson.h>
+#include <ArduinoJson.h>
+
+#include "config.h"
+#include "globals.h"
+#include "dtc.h"
+#include "common.h"
+#include "debugger.h"
+
+void initWebUI();
+void Webserver_Process();
+
+#ifdef FEATURE_ENABLE_WEBSOCKETS
+void Websocket_PushLiveDebug(String Message);
+#endif
+
+#endif

Software/wifi_credentials.example.ini

@@ -1,5 +1,5 @@
 [wifi_cred]
 admin_password = adminpass
 wifi_ap_password = wifiappass
-wifi_ssid = wifi-ssid
-wifi_password = wifi-pass
+wifi_ssid_client = wifi-ssid
+wifi_password_client = wifi-pass