From 36d73552ff5c55b048d296b10739886fc263196a Mon Sep 17 00:00:00 2001 From: Jochen Date: Sun, 7 Nov 2021 10:48:10 +0100 Subject: [PATCH] fixed is-cfg.json and project_configuration.h --- data/is-cfg.json | 4 ++-- src/project_configuration.h | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/data/is-cfg.json b/data/is-cfg.json index 93808e2..db2b2ba 100644 --- a/data/is-cfg.json +++ b/data/is-cfg.json @@ -9,9 +9,9 @@ "dns2": "192.0.2.2" }, "wifi": { + "active": true, "AP": [ { - "active": false, "SSID": "YOURSSID", "password": "YOURPASSWORD" } @@ -37,7 +37,7 @@ }, "lora": { "frequency_rx": 433775000, - "gain_rx": 6; + "gain_rx": 6, "frequency_tx": 433775000, "power": 20, "spreading_factor": 12, diff --git a/src/project_configuration.h b/src/project_configuration.h index e013fe1..c9d9ea9 100644 --- a/src/project_configuration.h +++ b/src/project_configuration.h @@ -21,6 +21,9 @@ public: class Wifi { public: + Wifi() : active(true) { + } + bool active; class AP { public: @@ -28,9 +31,6 @@ public: String password; }; - Wifi() : active(true) { - } - std::list APs; }; @@ -70,13 +70,13 @@ public: LoRa() : frequencyRx(433775000), frequencyTx(433775000), power(20), spreadingFactor(12), signalBandwidth(125000), codingRate4(5) { } - long frequencyRx; + long frequencyRx; uint8_t gainRx; - long frequencyTx; - int power; - int spreadingFactor; - long signalBandwidth; - int codingRate4; + long frequencyTx; + int power; + int spreadingFactor; + long signalBandwidth; + int codingRate4; }; class Display {