smartPOC/smartPOC-tx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

extending config, static stirngs

Browse source
This commit is contained in:
cheetah 2025-04-05 01:41:00 +02:00
parent 4f4bc0129a
commit ed4d0868e5
2 changed files with 45 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/config.h
View file

@ -42,6 +42,10 @@ static String cfgKeyDWDEnable = "dwd_enable";
static String cfgKeyDWDRegion = "dwd_region";
static String cfgKeyDWDFunction = "dwd_fun";
//
static String cfgKeyIdleInterval = "idle_interval";
static String cfgKeyIdleEnable = "idle_enable";
static String cfgKeyIdleMode = "idle_mode";
//
static String cfgKeyMoWaSInterval = "mowas_interval";
static String cfgKeyMoWaSEnable = "mowas_enable";
static String cfgKeyMoWaSRegion = "mowas_region";

83
src/config.cpp
View file

@ -100,8 +100,8 @@ void read_config(cfg_t *out) {
//
if (doc[cfgKeyDWDWXEnable].is<bool>()) out->dwdwx_enable = doc[cfgKeyDWDWXEnable].as<bool>();;
if (doc[cfgKeyDWDWXFunction].is<int>()) out->dwdwx_fun = doc[cfgKeyDWDWXFunction].as<int>();
if (doc[cfgKeyDWDWXLatitude].is<int>()) out->dwdwx_lat = doc[cfgKeyDWDWXLatitude].as<int>();
if (doc[cfgKeyDWDWXLongitude].is<int>()) out->dwdwx_lng = doc[cfgKeyDWDWXLongitude].as<int>();
if (doc[cfgKeyDWDWXLatitude].is<float>()) out->dwdwx_lat = doc[cfgKeyDWDWXLatitude].as<float>();
if (doc[cfgKeyDWDWXLongitude].is<float>()) out->dwdwx_lng = doc[cfgKeyDWDWXLongitude].as<float>();
//
//
if (doc[cfgKeyTimeInterval].is<int>()) {
@ -115,14 +115,11 @@ void read_config(cfg_t *out) {
time_zone.toCharArray(out->time_zone, sizeof(out->time_zone));
}
}
if (doc["idle_interval"].is<int>()) {
int idle_interval = doc["idle_interval"].as<int>();
bool idle_enable = doc["idle_enable"].as<bool>();
int idle_mode = doc["idle_mode"].as<int>();
out->idle_enable = idle_enable;
out->idle_interval = idle_interval;
out->idle_mode = idle_mode;
}
//
if (doc[cfgKeyIdleInterval].is<int>()) out->idle_interval = doc[cfgKeyIdleInterval].as<int>();
if (doc[cfgKeyIdleEnable].is<bool>()) out->idle_enable = doc[cfgKeyIdleEnable].as<bool>();
if (doc[cfgKeyIdleMode].is<int>()) out->idle_mode = doc[cfgKeyIdleMode].as<int>();
//
if (doc[cfgKeyFlagPOCSAG_German].is<bool>()) out->pocsag_german = doc[cfgKeyFlagPOCSAG_German].as<bool>();
if (doc[cfgKeyDeviceName].is<String>()) {
String device_name = doc[cfgKeyDeviceName].as<String>();
@ -132,8 +129,6 @@ void read_config(cfg_t *out) {
//
if (doc[cfgKeyFlagWebserverProtect].is<bool>()) out->webserver_protect = doc[cfgKeyFlagWebserverProtect].as<bool>();
// Serial.println("Loaded Configuration:");
// Serial.printf("AP SSID: %s\n", out->ap_ssid);
// Serial.printf("AP Password: %s\n", out->ap_pass);
@ -172,14 +167,14 @@ void create_default_config() {
doc[cfgKeyWiFi1Pass] = cfgValEmpty;
doc[cfgKeyWiFi2SSID] = cfgValEmpty;
doc[cfgKeyWiFi2Pass] = cfgValEmpty;
doc["ap_ssid"] = "POCSAG";
doc["ap_pass"] = "Motorola";
doc[cfgKeyWiFiAPSSID] = "POCSAG";
doc[cfgKeyWiFiAPPass] = "Motorola";
// modem
doc["tx_freq"] = 434.230f;
doc["tx_baud"] = 1200;
doc["tx_dev"] = 4.5;
doc["tx_power"] = 13;
doc["tx_empty_queue"] = false;
doc[cfgKeyTXFreq] = 434.230f;
doc[cfgKeyTXBaud] = 1200;
doc[cfgKeyTXDeviation] = 4.5;
doc[cfgKeyTXPower] = 13;
doc[cfgKeyTXFlagEmptyQueue] = false;
// mqtt
doc[cfgKeyMQTTHost] = cfgValEmpty;
doc[cfgKeyMQTTUser] = cfgValEmpty;
@ -187,33 +182,37 @@ void create_default_config() {
doc[cfgKeyMQTTTopic] = cfgValEmpty;
doc[cfgKeyMQTTPort] = 1883;
//
doc["broadcast_ric"] = 9999;
doc["broadcast_fun"] = 3;
doc[cfgKeyBroadcastRIC] = 9999;
//
doc["dwd_fun"] = 3;
doc["dwd_interval"] = 5;
doc["dwd_enable"] = false;
doc["dwd_region"] = "";
doc["mowas_fun"] = 3;
doc["mowas_interval"] = 5;
doc["mowas_enable"] = false;
doc["mowas_region"] = "";
doc[cfgKeyDWDFunction] = 3;
doc[cfgKeyDWDInterval] = 5;
doc[cfgKeyDWDEnable] = false;
doc[cfgKeyDWDRegion] = "";
doc[cfgKeyMoWaSFunction] = 3;
doc[cfgKeyMoWaSInterval] = 5;
doc[cfgKeyMoWaSEnable] = false;
doc[cfgKeyMoWaSRegion] = "";
doc["time_enable"] = false;
doc["time_interval"] = 720;
doc["time_ric"] = 0;
doc["time_fun"] = 3;
doc["time_mode"] = 0;
doc["time_zone"] = "Europe/Berlin";
doc[cfgKeyTimeEnable] = false;
doc[cfgKeyTimeInterval] = 720;
doc[cfgKeyTimeRIC] = 0;
doc[cfgKeyTimeFunction] = 3;
doc[cfgKeyTimeMode] = 0;
doc[cfgKeyTimeZone] = "Europe/Berlin";
doc["idle_enable"] = false;
doc["idle_interval"] = 1;
doc["idle_mode"] = 0;
doc[cfgKeyDWDWXEnable] = false;
doc[cfgKeyDWDWXFunction] = 3;
doc[cfgKeyDWDWXLatitude] = 0.0;
doc[cfgKeyDWDWXLongitude] = 0.0;
doc["pocsag_german"] = false;
doc["oled_timeout"] = 2;
doc["device_name"] = "smartPOC";
doc["webserver_protect"] = false;
doc[cfgKeyIdleEnable] = false;
doc[cfgKeyIdleInterval] = 1;
doc[cfgKeyIdleMode] = 0;
doc[cfgKeyFlagPOCSAG_German] = false;
doc[cfgKeyOLEDTimeout] = 2;
doc[cfgKeyDeviceName] = "smartPOC";
doc[cfgKeyFlagWebserverProtect] = false;
File file = SPIFFS.open(ConfigFilePath, "w");
if (!file) {
Serial.println("Failed to open config file for writing");