added LoraUartCommand Interpreter

added Pinout for LoRa-UART
first Draft of UART for external LoRa-Module
2023-05-25 19:59:34 +02:00 · 2023-05-25 14:00:18 +02:00 · 2023-05-25 14:00:06 +02:00 · 2023-05-25 10:58:50 +02:00 · 2023-04-30 10:08:34 +02:00 · 2023-04-30 10:05:41 +02:00
16 changed files with 285 additions and 74 deletions
--- a/Documentation/Pinout_UART_LoRa.png
+++ b/Documentation/Pinout_UART_LoRa.png
--- a/Software/data_src/index.htm
+++ b/Software/data_src/index.htm
@@ -77,31 +77,28 @@
        <hr />
        <p>
        <h4>aktueller Punktestand</h4>
-        <div class="table-responsive">
-          <table class="table table-borderless table-dark">
-            <thead>
-              <tr>
-                <th class="text-center" scope="col">%NAME_FAC_1%</th>
-                <th class="text-center" scope="col">%NAME_FAC_2%</th>
-                <th class="text-center" scope="col">%NAME_FAC_3%</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td class="mx-auto"><img src="static/img/logo_fac1.png" class="rounded mx-auto img-fluid d-block"
-                    alt="..."></td>
-                <td class="mx-auto"><img src="static/img/logo_fac2.png" class="rounded mx-auto img-fluid d-block"
-                    alt="..."></td>
-                <td class="mx-auto"><img src="static/img/logo_fac3.png" class="rounded mx-auto img-fluid d-block"
-                    alt="..."></td>
-              </tr>
-              <tr>
-                <td class="text-center">%POINTS_FAC_1%</td>
-                <td class="text-center">%POINTS_FAC_2%</td>
-                <td class="text-center">%POINTS_FAC_3%</td>
-              </tr>
-            </tbody>
-          </table>
+        <div class="container-fluid">
+          <div class="row">
+            <div class="col text-center %FACTION_1_ACTIVE% text-white p-3">%NAME_FAC_1%</div>
+            <div class="col text-center %FACTION_2_ACTIVE% text-white p-3">%NAME_FAC_2%</div>
+            <div class="col text-center %FACTION_3_ACTIVE% text-white p-3">%NAME_FAC_3%</div>
+          </div>
+          <div class="row">
+            <div class="col bg-dark text-white p-3"><img src="static/img/logo_fac1.png"
+                class="rounded mx-auto img-fluid d-block" alt="...">
+            </div>
+            <div class="col bg-dark text-white p-3"><img src="static/img/logo_fac2.png"
+                class="rounded mx-auto img-fluid d-block" alt="...">
+            </div>
+            <div class="col bg-dark text-white p-3"><img src="static/img/logo_fac3.png"
+                class="rounded mx-auto img-fluid d-block" alt="...">
+            </div>
+          </div>
+          <div class="row">
+            <div class="col text-center bg-secondary text-white p-3">%POINTS_FAC_1%</div>
+            <div class="col text-center bg-secondary text-white p-3">%POINTS_FAC_2%</div>
+            <div class="col text-center bg-secondary text-white p-3">%POINTS_FAC_3%</div>
+          </div>
        </div>
        </p>
        <!-- Div GroupFaction Points -->
@@ -219,13 +216,55 @@
            <label for="factionreboot_cont" class="control-label col-4">active Faction Recovery</label>
            <div class="col-8">
              <div class="form-check">
-                <input class="form-check-input" type="checkbox" name="factionreboot_cont" id="factionreboot_cont" %FACTIONREBOOT_CHECKED%>
+                <input class="form-check-input" type="checkbox" name="factionreboot_cont" id="factionreboot_cont"
+                  %FACTIONREBOOT_CHECKED%>
                <label class="form-check-label" for="factionreboot_cont">
                  aktive Faktion beim booten wiederherstellen ?
                </label>
              </div>
            </div>
          </div>
+          <h4>Faktionsbezeichnungen</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>
+            Faktionsbezeichnungen können nur aus ASCII-Zeichen bestehen, also A-Z, a-z und 0-9
+          </div>
+          <div class="form-group row">
+            <label for="faction_1_name" class="control-label col-4">Faktion 1</label>
+            <div class="col-8">
+              <div class="input-group">
+                <input id="faction_1_name" name="faction_1_name" value="%NAME_FAC_1%" type="text" class="form-control" pattern="[A-Za-z0-9 _-]{1,32}">
+                <div class="input-group-append">
+                  <span class="input-group-text">max 32 Zeichen</span>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="form-group row">
+            <label for="faction_2_name" class="control-label col-4">Faktion 2</label>
+            <div class="col-8">
+              <div class="input-group">
+                <input id="faction_2_name" name="faction_2_name" value="%NAME_FAC_2%" type="text" class="form-control" pattern="[A-Za-z0-9 _-]{1,32}">
+                <div class="input-group-append">
+                  <span class="input-group-text">max 32 Zeichen</span>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="form-group row">
+            <label for="faction_3_name" class="control-label col-4">Faktion 3</label>
+            <div class="col-8">
+              <div class="input-group">
+                <input id="faction_3_name" name="faction_3_name" value="%NAME_FAC_3%" type="text" class="form-control" pattern="[A-Za-z0-9 _-]{1,32}">
+                <div class="input-group-append">
+                  <span class="input-group-text">max 32 Zeichen</span>
+                </div>
+              </div>
+            </div>
+          </div>
          <div class="form-group row">
            <div class="col text-center">
              <button name="settingssave" type="submit" class="btn btn-outline-primary">&Uuml;bernehmen</button>
--- a/Software/data_src/static/img/logo_fac1.png
+++ b/Software/data_src/static/img/logo_fac1.png
--- a/Software/data_src/static/img/logo_fac2.png
+++ b/Software/data_src/static/img/logo_fac2.png
--- a/Software/data_src/version
+++ b/Software/data_src/version
@@ -1 +1 @@
-1.02
+1.03
--- a/Software/include/eeprom.h
+++ b/Software/include/eeprom.h
@@ -10,6 +10,7 @@
 #include "common.h"
 #include "debugger.h"

+#define I2C_EE_ADDRESS 0x50
 #define EEPROM_SIZE_BYTES I2C_DEVICESIZE_24LC64
 #define EEPROM_ENDURANCE 1000000

@@ -51,9 +52,9 @@ typedef struct
  uint8_t EEPROM_Version;
  batteryType_t batteryType;
  bool active_faction_on_reboot;
-  char Faction_1_Name[32];
-  char Faction_2_Name[32];
-  char Faction_3_Name[32];
+  char Faction_1_Name[33];
+  char Faction_2_Name[33];
+  char Faction_3_Name[33];
  uint32_t checksum;
 } configData_t;

--- a/Software/include/globals.h
+++ b/Software/include/globals.h
@@ -45,6 +45,7 @@ typedef struct Globals_s
  bool hasDTC;
  int loadvoltage_mV = 0;
  int battery_level = 0;
+  bool timer_disabled = false;
 } Globals_t;

 extern Globals_t globals;
@@ -58,8 +59,8 @@ typedef struct Constants_s
 } Constants_t;

 const Constants_t constants PROGMEM = {
- 1,2,     // Firmware_Version
- 1,2,     // Required Flash Version
+ 1,3,     // Firmware_Version
+ 1,3,     // Required Flash Version
 GIT_REV  // Git-Hash-String
 };

--- a/Software/include/lora_net.h
+++ b/Software/include/lora_net.h
@@ -2,10 +2,16 @@
 #define _LORA_NET_H_

 #include <Arduino.h>
+
+#ifdef LORA_FEATURE_ENABLED
 #include <LoRa_E220.h>
+#elif defined(FEATURE_ENABLE_UARTLORA)
+#include <SoftwareSerial.h>
+#endif

 // local includes
 #include "lora_messages.h"
+#include "debugger.h"
 #include "defaults.h"
 #include "config.h"
 #include "globals.h"
--- a/Software/include/sanitycheck.h
+++ b/Software/include/sanitycheck.h
@@ -14,6 +14,9 @@
    #error "You must define an WIFI_AP_PASSWORD for Standalone AP-Mode"
 #endif

+#if defined(FEATURE_ENABLE_UARTLORA) && defined(FEATURE_ENABLE_LORA)
+    #error "You cannot enable LoRa and UART-Protocol at the same time!"
+#endif

 #ifdef FEATURE_ENABLE_WIFI_CLIENT
    #ifndef WIFI_CLIENT_PASSWORD
--- a/Software/platformio.ini
+++ b/Software/platformio.ini
@@ -22,24 +22,22 @@ upload_speed = 921600
 ;upload_port = 10.0.1.48
 ;upload_protocol = espota
 ;upload_flags =  
-;   --auth=${wifi_cred.admin_password}
+;   --auth=${wifi_cred.ota_password}

 build_flags=
  !python git_rev_macro.py
  -DATOMIC_FS_UPDATE
-  -DFEATURE_ENABLE_WIFI_CLIENT
-  -DFEATURE_ENABLE_LORA
+  ;-DFEATURE_ENABLE_WIFI_CLIENT
+  ;-DFEATURE_ENABLE_LORA
  ;-DCAPTIVE
+  -DFEATURE_ENABLE_UARTLORA
  -DWIFI_AP_IP_GW=10,0,0,1
-  -DADMIN_PASSWORD=${wifi_cred.admin_password}
+  -DADMIN_PASSWORD=${wifi_cred.ota_password}
  -DWIFI_CLIENT_SSID=${wifi_cred.wifi_client_ssid}
  -DWIFI_CLIENT_PASSWORD=${wifi_cred.wifi_client_password}
  -DWIFI_AP_SSID=${wifi_cred.wifi_ap_ssid}
  -DWIFI_AP_PASSWORD=${wifi_cred.wifi_ap_password}
  -DDEVICE_NAME='"Dark Emergency Timer"'
-  -DFACTION_1_NAME='"GOF"'
-  -DFACTION_2_NAME='"KGG"'
-  -DFACTION_3_NAME='"MILIZ"'

 ;build_type = debug

--- a/Software/src/eeprom.cpp
+++ b/Software/src/eeprom.cpp
@@ -1,6 +1,6 @@
 #include "eeprom.h"

-I2C_eeprom ee(0x50, EEPROM_SIZE_BYTES);
+I2C_eeprom ee(I2C_EE_ADDRESS, EEPROM_SIZE_BYTES);

 configData_t ConfigData;
 persistenceData_t PersistenceData;
@@ -15,6 +15,7 @@ void InitEEPROM()
  ee.begin();
  eeAvailable = checkEEPROMavailable();
  eeAvailable = ValidateEEPROM_Version();
+	Serial.printf("Initialized EEPROM at Address 0x%02X\n", I2C_EE_ADDRESS);
 }

 void EEPROM_Process()
--- a/Software/src/lora_net.cpp
+++ b/Software/src/lora_net.cpp
@@ -1,13 +1,19 @@
 #include "lora_net.h"

+#ifdef FEATURE_ENABLE_LORA
 LoRa_E220 e220ttl(GPIO_LORA_TX, GPIO_LORA_RX, GPIO_LORA_AUX, 3, 4); // Arduino RX <-- e220 TX, Arduino TX --> e220 RX AUX M0 M1
-
 void printParameters(struct Configuration configuration);
 void printModuleInformation(struct ModuleInformation moduleInformation);
+#elif defined(FEATURE_ENABLE_UARTLORA)
+SoftwareSerial SerialLoRa(GPIO_LORA_RX, GPIO_LORA_TX); // RX, TX
+void Parse_LoRa_UartCommand(char input[], int size);
+#endif

 bool InitLoRa(void (*MPinHelper)(int, int))
 {
-    bool returnval;
+    bool returnval = false;
+
+#ifdef FEATURE_ENABLE_LORA

    e220ttl.setMPins = MPinHelper;
    returnval = e220ttl.begin();
@@ -60,11 +66,15 @@ bool InitLoRa(void (*MPinHelper)(int, int))
    {
        MaintainDTC(DTC_NO_LORA_FOUND, DTC_WARN, true);
    }
+#elif defined(FEATURE_ENABLE_UARTLORA)
+    SerialLoRa.begin(9600);
+#endif
    return returnval;
 }

 void LoRa_Process()
 {
+#ifdef FEATURE_ENABLE_LORA
    if (e220ttl.available() > 1)
    {
        ResponseContainer rc = e220ttl.receiveMessageRSSI();
@@ -82,10 +92,50 @@ void LoRa_Process()
            Serial.println(rc.rssi, DEC);
        }
    }
+#elif defined(FEATURE_ENABLE_UARTLORA)
+
+    char packageInput[16];
+    bool packageRecieved = false;
+    unsigned int bufferPtr = 0;
+
+    if (SerialLoRa.available() && packageRecieved == false)
+    {
+        while (bufferPtr < sizeof(packageInput))
+        {
+            packageInput[bufferPtr] = SerialLoRa.read();
+            if (packageInput[bufferPtr] == '\n')
+            {
+                packageInput[bufferPtr] = 0; // terminate String
+                packageRecieved = true;
+                Debug_pushMessage("Got LoRa UART: %s\n", packageInput);
+                break;
+            }
+            else if ((packageInput[bufferPtr] >= 0x30) || (packageInput[bufferPtr] <= 0x5A)) // only accept Numbers, UpperCase-Letters and some special chars
+            {
+                if (bufferPtr < sizeof(packageInput) - 1)
+                {
+                    bufferPtr++;
+                }
+                else
+                {
+                    packageInput[bufferPtr] = 0; // terminate String, bc Buffer is full (package to long)
+                    packageRecieved = true;      // send it anyway to the parser
+                    Debug_pushMessage("Got LoRa UART: %s\n", packageInput);
+                    break;
+                }
+            }
+        }
+    }
+
+    if (packageRecieved)
+        Parse_LoRa_UartCommand(packageInput, bufferPtr);
+
+#endif
 }

 void sendStatus_LoRa()
 {
+#ifdef FEATURE_ENABLE_LORA
    struct
    {
        MessageType_t type = "STATUS";
@@ -101,8 +151,25 @@ void sendStatus_LoRa()

    ResponseStatus rs = e220ttl.sendFixedMessage(0xFF, 0xFF, 23, (byte *)&sendStatus, sizeof(sendStatus));
    Serial.println(rs.getResponseDescription());
+
+#elif defined(FEATURE_ENABLE_UARTLORA)
+
+    SerialLoRa.print(PersistenceData.faction_1_timer);
+    SerialLoRa.write(";");
+    SerialLoRa.print(PersistenceData.faction_2_timer);
+    SerialLoRa.write(";");
+    SerialLoRa.print(PersistenceData.faction_3_timer);
+    SerialLoRa.write(";");
+    SerialLoRa.print(PersistenceData.activeFaction);
+    SerialLoRa.write(";");
+    SerialLoRa.print(globals.battery_level);
+    SerialLoRa.write('\n');
+
+#endif
 }

+#ifdef FEATURE_ENABLE_LORA
+
 void printParameters(struct Configuration configuration)
 {
    Serial.println("----------------------------------------");
@@ -168,4 +235,71 @@ void printParameters(struct Configuration configuration)
    Serial.println(configuration.TRANSMISSION_MODE.getFixedTransmissionDescription());

    Serial.println("----------------------------------------");
-}
+}
+#endif
+
+#ifdef FEATURE_ENABLE_UARTLORA
+void Parse_LoRa_UartCommand(char input[], int size)
+{
+
+    char delimiter[] = ";";
+    char *ptr;
+    char command[8];
+    char value[8];
+
+    ptr = strtok(input, delimiter);
+
+    while (ptr != NULL)
+    {
+        strncpy(command, ptr, sizeof(command));
+        ptr = strtok(NULL, delimiter);
+        strncpy(value, ptr, sizeof(value));
+    }
+
+    Debug_pushMessage("Parsed LoRa UART Command:  %s Value: %s\n", command, value);
+
+    if (!strcmp(command, "ENABLE"))
+    {
+        globals.timer_disabled = false;
+    }
+    else if (!strcmp(command, "DISABLE"))
+    {
+        globals.timer_disabled = false;
+    }
+    else if (!strcmp(command, "RESET"))
+    {
+        PersistenceData.activeFaction = NONE;
+        PersistenceData.faction_1_timer = 0;
+        PersistenceData.faction_2_timer = 0;
+        PersistenceData.faction_3_timer = 0;
+    }
+    else if (!strcmp(command, "TMRSTP"))
+    {
+        PersistenceData.activeFaction = NONE;
+    }
+    else if (!strcmp(command, "TMR1"))
+    {
+        PersistenceData.faction_1_timer = atol(value);
+    }
+    else if (!strcmp(command, "TMR2"))
+    {
+        PersistenceData.faction_2_timer = atol(value);
+    }
+    else if (!strcmp(command, "TMR3"))
+    {
+        PersistenceData.faction_3_timer = atol(value);
+    }
+    else if (!strcmp(command, "EFAC1"))
+    {
+        PersistenceData.activeFaction = FACTION_1;
+    }
+    else if (!strcmp(command, "EFAC2"))
+    {
+        PersistenceData.activeFaction = FACTION_2;
+    }
+    else if (!strcmp(command, "EFAC3"))
+    {
+        PersistenceData.activeFaction = FACTION_3;
+    }
+}
+#endif
--- a/Software/src/main.cpp
+++ b/Software/src/main.cpp
@@ -19,7 +19,7 @@
 #include "globals.h"
 #include "dtc.h"
 #include "debugger.h"
-#ifdef FEATURE_ENABLE_LORA
+#if defined(FEATURE_ENABLE_LORA) || defined(FEATURE_ENABLE_UARTLORA)
 #include "lora_net.h"
 #endif

@@ -49,7 +49,7 @@ void OverrideDisplay(uint32_t time, const char *message1, const char *message2,
 void initGlobals();
 void maintainSysStat();

-#ifdef FEATURE_ENABLE_LORA
+#if defined(FEATURE_ENABLE_UARTLORA) || defined(FEATURE_ENABLE_LORA)
 void setMPins_Helper(int pin, int status);
 void tmrCallback_StatusSender();
 Ticker tmrStatusSender(tmrCallback_StatusSender, 30000, 0, MILLIS);
@@ -72,7 +72,7 @@ Ticker tmrWiFiMaintainConnection(tmrCallback_WiFiMaintainConnection, 1000, 0, MI
 uint32_t DisplayOverrideFlag = 0;
 char DisplayOverrideValue[3][5] = {0};

-#ifdef FEATURE_ENABLE_LORA
+#if defined(FEATURE_ENABLE_UARTLORA) || defined(FEATURE_ENABLE_LORA)
 void setMPins_Helper(int pin, int status)
 {
 	i2c_io.write(pin, status);
@@ -99,7 +99,6 @@ void setup()
 	InitEEPROM();
 	GetConfig_EEPROM();
 	GetPersistence_EEPROM();
-	Serial.print("EE-Init done\n");

 	if (i2c_io.begin())
 	{
@@ -120,7 +119,7 @@ void setup()
 		Serial.print("INA219 not Initialized\n");
 	}

-#ifdef FEATURE_ENABLE_LORA
+#if defined(FEATURE_ENABLE_UARTLORA) || defined(FEATURE_ENABLE_LORA)
 	if (InitLoRa(&setMPins_Helper))
 	{
 		Serial.print("Initialized LoRa_Transceiver\n");
@@ -230,9 +229,9 @@ void loop()
 	DTC_Process();
 	Debug_Process();

-#ifdef FEATURE_ENABLE_LORA
-	tmrStatusSender.update();
+#if defined(FEATURE_ENABLE_LORA) || defined(FEATURE_ENABLE_UARTLORA)
 	LoRa_Process();
+	tmrStatusSender.update();
 #endif

 #ifdef CAPTIVE
@@ -290,25 +289,28 @@ void SevenSeg_Output()
 			disp_FAC_1.refresh();
 			snprintf(sevenSegBuff, sizeof(sevenSegBuff), "%4d", PersistenceData.faction_1_timer / 60);
 			disp_FAC_1.display(String(sevenSegBuff), false, false);
-			disp_FAC_1.setDp((PersistenceData.activeFaction == FACTION_1) && (millis() % 1000 > 500));
+			disp_FAC_1.setDp((PersistenceData.activeFaction == FACTION_1) && (millis() % 1000 > 500) ? 0x08 : 0x00);

 			disp_FAC_2.setBrightness(PersistenceData.activeFaction == FACTION_2 ? 5 : 1);
 			disp_FAC_2.refresh();
 			snprintf(sevenSegBuff, sizeof(sevenSegBuff), "%4d", PersistenceData.faction_2_timer / 60);
 			disp_FAC_2.display(String(sevenSegBuff), false, false);
-			disp_FAC_2.setDp((PersistenceData.activeFaction == FACTION_2) && (millis() % 1000 > 500));
+			disp_FAC_2.setDp((PersistenceData.activeFaction == FACTION_2) && (millis() % 1000 > 500) ? 0x08 : 0x00);

 			disp_FAC_3.setBrightness(PersistenceData.activeFaction == FACTION_3 ? 5 : 1);
 			disp_FAC_3.refresh();
 			snprintf(sevenSegBuff, sizeof(sevenSegBuff), "%4d", PersistenceData.faction_3_timer / 60);
 			disp_FAC_3.display(String(sevenSegBuff), false, false);
-			disp_FAC_3.setDp((PersistenceData.activeFaction == FACTION_3) && (millis() % 1000 > 500));
+			disp_FAC_3.setDp((PersistenceData.activeFaction == FACTION_3) && (millis() % 1000 > 500) ? 0x08 : 0x00);
 		}
 	}
 }

 void tmrCallback_FactionTicker()
 {
+	if (globals.timer_disabled == true)
+		PersistenceData.activeFaction = NONE;
+
 	switch (PersistenceData.activeFaction)
 	{
 	case FACTION_1:
@@ -345,43 +347,43 @@ void tmrCallback_InputGetter()

 	if (keysPressed > 1)
 	{
-		Serial.println("ERROR: More than one Flag active - setting no Faction active");
+		Debug_pushMessage("ERROR: More than one Flag active - setting no Faction active");
 		PersistenceData.activeFaction = NONE;
 		return;
 	}

-	if (btnState[0] == FAC_1_TRG_PRESSED)
+	if (btnState[0] == FAC_1_TRG_PRESSED && globals.timer_disabled == false)
 	{
 		if (PersistenceData.activeFaction != FACTION_1)
 		{
-			Serial.println("Faction 1 captured !");
+			Debug_pushMessage("Faction 1 captured !");
 			globals.requestEEAction = EE_PDS_SAVE;
 		}
 		PersistenceData.activeFaction = FACTION_1;
 	}

-	if (btnState[1] == FAC_2_TRG_PRESSED)
+	if (btnState[1] == FAC_2_TRG_PRESSED && globals.timer_disabled == false)
 	{
 		if (PersistenceData.activeFaction != FACTION_2)
 		{
-			Serial.println("Faction 2 captured !");
+			Debug_pushMessage("Faction 2 captured !");
 			globals.requestEEAction = EE_PDS_SAVE;
 		}
 		PersistenceData.activeFaction = FACTION_2;
 	}

-	if (btnState[2] == FAC_3_TRG_PRESSED)
+	if (btnState[2] == FAC_3_TRG_PRESSED && globals.timer_disabled == false)
 	{
 		if (PersistenceData.activeFaction != FACTION_3)
 		{
-			Serial.println("Faction 3 captured !");
+			Debug_pushMessage("Faction 3 captured !");
 			globals.requestEEAction = EE_PDS_SAVE;
 		}
 		PersistenceData.activeFaction = FACTION_3;
 	}
 }

-#ifdef FEATURE_ENABLE_LORA
+#if defined(FEATURE_ENABLE_LORA) || defined(FEATURE_ENABLE_UARTLORA)
 void tmrCallback_StatusSender()
 {
 	sendStatus_LoRa();
@@ -565,17 +567,17 @@ void ProcessKeyCombos(bool *btnState)
 	if (btnState[0] != FAC_1_TRG_PRESSED && keyStatus_Fac1 == KEY_PRESSED)
 	{
 		if (keyCount_Fac2 > 0 || keyCount_Fac3 > 0)
-			Serial.printf("KeyCombo 2: %d | 3: %d\n", keyCount_Fac2, keyCount_Fac3);
+			Debug_pushMessage("KeyCombo 2: %d | 3: %d\n", keyCount_Fac2, keyCount_Fac3);

 		if (keyCount_Fac2 == 2 && keyCount_Fac3 == 0)
 		{
-			Serial.println("KeyCombo: WiFi AP ON");
+			Debug_pushMessage("KeyCombo: WiFi AP ON");
 			OverrideDisplay(5000, "NET ", "    ", "    ");
 			toggleWiFiAP(false);
 		}
 		else if (keyCount_Fac2 == 4 && keyCount_Fac3 == 0)
 		{
-			Serial.printf("KeyCombo: Reset Timer\n");
+			Debug_pushMessage("KeyCombo: Reset Timer\n");
 			if (globals.systemStatus == sysStat_Startup)
 			{
 				OverrideDisplay(5000, "RST ", "    ", "    ");
@@ -588,7 +590,7 @@ void ProcessKeyCombos(bool *btnState)
 			else
 			{
 				OverrideDisplay(5000, "ERR ", "    ", "    ");
-				Serial.printf("ERROR: only %d seconds after Startup!\n", STARTUP_DELAY_MS / 1000);
+				Debug_pushMessage("ERROR: only %d seconds after Startup!\n", STARTUP_DELAY_MS / 1000);
 			}
 		}

--- a/Software/src/oled_display.cpp
+++ b/Software/src/oled_display.cpp
@@ -33,10 +33,10 @@ void OLED_Process()
    display.setCursor(0, 0);
    display.printf("LiPo: %d%%\n", globals.battery_level);
    display.print(PersistenceData.activeFaction == FACTION_1 ? "> " : "  ");
-    display.printf("%-5s: %02d:%02d:%02d\n", FACTION_1_NAME, PersistenceData.faction_1_timer / 3600, (PersistenceData.faction_1_timer / 60) % 60, PersistenceData.faction_1_timer % 60);
+    display.printf("%-5s: %02d:%02d:%02d\n", PersistenceData.faction_1_timer, PersistenceData.faction_1_timer / 3600, (PersistenceData.faction_1_timer / 60) % 60, PersistenceData.faction_1_timer % 60);
    display.print(PersistenceData.activeFaction == FACTION_2 ? "> " : "  ");
-    display.printf("%-5s: %02d:%02d:%02d\n", FACTION_2_NAME, PersistenceData.faction_2_timer / 3600, (PersistenceData.faction_2_timer / 60) % 60, PersistenceData.faction_2_timer % 60);
+    display.printf("%-5s: %02d:%02d:%02d\n", PersistenceData.faction_2_timer, PersistenceData.faction_2_timer / 3600, (PersistenceData.faction_2_timer / 60) % 60, PersistenceData.faction_2_timer % 60);
    display.print(PersistenceData.activeFaction == FACTION_3 ? "> " : "  ");
-    display.printf("%-5s: %02d:%02d:%02d\n", FACTION_3_NAME, PersistenceData.faction_3_timer / 3600, (PersistenceData.faction_3_timer / 60) % 60, PersistenceData.faction_3_timer % 60);
+    display.printf("%-5s: %02d:%02d:%02d\n", PersistenceData.faction_3_timer, PersistenceData.faction_3_timer / 3600, (PersistenceData.faction_3_timer / 60) % 60, PersistenceData.faction_3_timer % 60);
    display.display();
 }
--- a/Software/src/webui.cpp
+++ b/Software/src/webui.cpp
@@ -182,14 +182,21 @@ String processor(const String &var)
  if (var == "ACTIVE_FACTION")
    return String(PersistenceData.activeFaction);

+  if (var == "FACTION_1_ACTIVE")
+    return String(PersistenceData.activeFaction == FACTION_1 ? "bg-primary" : "bg-secondary");
+  if (var == "FACTION_2_ACTIVE")
+    return String(PersistenceData.activeFaction == FACTION_2 ? "bg-primary" : "bg-secondary");
+  if (var == "FACTION_3_ACTIVE")
+    return String(PersistenceData.activeFaction == FACTION_3 ? "bg-primary" : "bg-secondary");
+
  if (var == "NAME_FAC_1")
-    return FACTION_1_NAME;
+    return String(ConfigData.Faction_1_Name);

  if (var == "NAME_FAC_2")
-    return FACTION_2_NAME;
+    return String(ConfigData.Faction_2_Name);

  if (var == "NAME_FAC_3")
-    return FACTION_3_NAME;
+    return String(ConfigData.Faction_3_Name);

  if (var == "BATTERY_SELECT_OPTIONS")
  {
@@ -275,6 +282,19 @@ void WebserverPOST_Callback(AsyncWebServerRequest *request)
      ConfigData.active_faction_on_reboot = false;
    }

+    if (p->name() == "faction_1_name")
+    {
+      strncpy(ConfigData.Faction_1_Name, p->value().c_str(), sizeof(ConfigData.Faction_1_Name));
+    }
+    if (p->name() == "faction_2_name")
+    {
+      strncpy(ConfigData.Faction_2_Name, p->value().c_str(), sizeof(ConfigData.Faction_2_Name));
+    }
+    if (p->name() == "faction_3_name")
+    {
+      strncpy(ConfigData.Faction_3_Name, p->value().c_str(), sizeof(ConfigData.Faction_3_Name));
+    }
+
    if (p->name() == "settingssave")
      globals.requestEEAction = EE_CFG_SAVE;
    // end: POST Form Settings
@@ -387,6 +407,9 @@ void WebserverEERestore_Callback(AsyncWebServerRequest *request, const String &f

        ConfigData.batteryType = (batteryType_t)doc["config"]["batteryType"].as<uint32_t>();
        ConfigData.EEPROM_Version = doc["config"]["EEPROM_Version"].as<uint32_t>();
+        strncpy(ConfigData.Faction_1_Name, doc["config"]["Faction_1_Name"].as<String>().c_str(), sizeof(ConfigData.Faction_1_Name));
+        strncpy(ConfigData.Faction_2_Name, doc["config"]["Faction_2_Name"].as<String>().c_str(), sizeof(ConfigData.Faction_2_Name));
+        strncpy(ConfigData.Faction_3_Name, doc["config"]["Faction_3_Name"].as<String>().c_str(), sizeof(ConfigData.Faction_3_Name));

        PersistenceData.writeCycleCounter = doc["persis"]["writeCycleCounter"].as<uint16_t>();
        PersistenceData.activeFaction = (factions_t)doc["persis"]["activeFaction"].as<uint32_t>();
@@ -436,6 +459,9 @@ void WebServerEEJSON_Callback(AsyncWebServerRequest *request)

  config["EEPROM_Version"] = ConfigData.EEPROM_Version;
  config["batteryType"] = ConfigData.batteryType;
+  config["Faction_1_Name"] = ConfigData.Faction_1_Name;
+  config["Faction_2_Name"] = ConfigData.Faction_2_Name;
+  config["Faction_3_Name"] = ConfigData.Faction_3_Name;
  sprintf(buffer, "0x%08X", ConfigData.checksum);
  config["checksum"] = buffer;

--- a/Software/wifi_credentials.example.ini
+++ b/Software/wifi_credentials.example.ini
@@ -1,6 +1,6 @@
 [wifi_cred]
 wifi_ap_ssid = wifi-ap-ssid
 wifi_ap_password = wifiappass
-wifi_ssid = wifi-ssid
-wifi_password = wifi-pass
-admin_password = ota-password
+wifi_client_ssid = wifi-ssid
+wifi_client_password = wifi-pass
+ota_password = ota-password
Author	SHA1	Message	Date
Marcel Peterkau	268c204957	added LoraUartCommand Interpreter	2023-05-25 19:59:34 +02:00
Marcel Peterkau	65d51f13aa	added Pinout for LoRa-UART	2023-05-25 14:00:18 +02:00
Marcel Peterkau	f727bb3247	first Draft of UART for external LoRa-Module	2023-05-25 14:00:06 +02:00
Marcel Peterkau	cd1379f90c	updated project-config	2023-05-25 10:58:50 +02:00
Marcel Peterkau	0363b1eebc	increase Version after Release	2023-04-30 10:08:34 +02:00
Marcel Peterkau	e6f1283aae	final fixes before Release for DE XI	2023-04-30 10:05:41 +02:00
Marcel Peterkau	a92b1edfd9	reformated points-table on WebUI	2023-04-18 20:07:52 +02:00
Marcel Peterkau	4cce7c1c86	fixed show setting in WebUI	2023-04-18 20:07:38 +02:00
Marcel Peterkau	0a1625e9b8	made Faction-Names configurable	2023-04-18 20:06:57 +02:00
@@ -1 +1 @@
 .02
 .03