From fcee9d6d47f1cbb1e3a33136e08237e2b8d9f091 Mon Sep 17 00:00:00 2001
From: Eric Duminil <eric.duminil@gmail.com>
Date: Tue, 15 Feb 2022 12:17:45 +0100
Subject: [PATCH] Starting to parse Lora config
---
ampel-firmware/web_config.cpp | 7 +++++--
ampel-firmware/web_config.h | 3 +++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ampel-firmware/web_config.cpp b/ampel-firmware/web_config.cpp
index 78a894e..3e1cd1c 100644
--- a/ampel-firmware/web_config.cpp
+++ b/ampel-firmware/web_config.cpp
@@ -154,8 +154,8 @@ namespace web_config {
"70B3D5...").build();
TextTParameter<17> appEUIParam =
Builder<TextTParameter<17>>("app_eui").label("App EUI").defaultValue("00EA07...").build();
- TextTParameter<32> appKeyParam =
- Builder<TextTParameter<32>>("app_key").label("App key").defaultValue("81CCFE...").build();
+ TextTParameter<33> appKeyParam =
+ Builder<TextTParameter<33>>("app_key").label("App key").defaultValue("81CCFE...").build();
//TODO: Save LoRa session to hidden parameter after first OTAA successful login
#endif
@@ -345,5 +345,8 @@ namespace config {
bool is_lorawan_active() {
return web_config::loraParams.isActive();
}
+ char *lorawan_device_eui = web_config::deviceEUIParam.value();
+ char *lorawan_app_key = web_config::appKeyParam.value();
+ char *lorawan_app_eui = web_config::appEUIParam.value();
#endif
}
diff --git a/ampel-firmware/web_config.h b/ampel-firmware/web_config.h
index 2c598b9..b952941 100644
--- a/ampel-firmware/web_config.h
+++ b/ampel-firmware/web_config.h
@@ -54,6 +54,9 @@ namespace config {
// LORAWAN
#if defined(ESP32)
bool is_lorawan_active(); // also defined for ESP8266, and set to false
+ extern char *lorawan_device_eui;
+ extern char *lorawan_app_key;
+ extern char *lorawan_app_eui;
#endif
// Transmission rate
--
GitLab