From 342ed85895ad6ed4abaae0507770bf457794a4ae Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sat, 6 Mar 2021 23:51:49 +0100 Subject: [PATCH] convert to tabs --- data/tracker.json | 14 +++++++------- src/configuration.cpp | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/data/tracker.json b/data/tracker.json index a81fa8c..4c3ef24 100644 --- a/data/tracker.json +++ b/data/tracker.json @@ -1,17 +1,17 @@ { - "callsign":"NOCALL-10", + "callsign":"NOCALL-10", "debug": false, - "beacon": + "beacon": { "message":"LoRa Tracker, Info: github.com/lora-aprs/LoRa_APRS_Tracker", - "timeout": 1, - "symbol": "[", - "overlay": "/" + "timeout": 1, + "symbol": "[", + "overlay": "/" }, "smart_beacon": { "active":false, - "turn_min":25, + "turn_min":25, "slow_rate":300, "slow_speed":10, "fast_rate":60, @@ -19,7 +19,7 @@ "min_tx_dist":100, "min_bcn":5 }, - "lora": + "lora": { "frequency_rx":433775000, "frequency_tx":433775000, diff --git a/src/configuration.cpp b/src/configuration.cpp index 4f7fc2f..edc5d8d 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -41,17 +41,17 @@ Configuration ConfigurationManagement::readConfiguration() if(data.containsKey("beacon") && data["beacon"].containsKey("message")) conf.beacon.message = data["beacon"]["message"].as(); - conf.beacon.timeout = data["beacon"]["timeout"] | 1; + conf.beacon.timeout = data["beacon"]["timeout"] | 1; if(data.containsKey("beacon") && data["beacon"].containsKey("symbol")) - conf.beacon.symbol = data["beacon"]["symbol"].as(); + conf.beacon.symbol = data["beacon"]["symbol"].as(); if(data.containsKey("beacon") && data["beacon"].containsKey("overlay")) - conf.beacon.overlay = data["beacon"]["overlay"].as() ; - - conf.smart_beacon.active = data["smart_beacon"]["active"] | false; - conf.smart_beacon.turn_min = data["smart_beacon"]["turn_min"] | 25; + conf.beacon.overlay = data["beacon"]["overlay"].as() ; + + conf.smart_beacon.active = data["smart_beacon"]["active"] | false; + conf.smart_beacon.turn_min = data["smart_beacon"]["turn_min"] | 25; conf.smart_beacon.slow_rate = data["smart_beacon"]["slow_rate"] | 300; conf.smart_beacon.slow_speed = data["smart_beacon"]["slow_speed"] | 10; - conf.smart_beacon.fast_rate = data["smart_beacon"]["fast_rate"] | 60; + conf.smart_beacon.fast_rate = data["smart_beacon"]["fast_rate"] | 60; conf.smart_beacon.fast_speed = data["smart_beacon"]["fast_speed"] | 100; conf.smart_beacon.min_tx_dist = data["smart_beacon"]["min_tx_dist"] | 100; conf.smart_beacon.min_bcn = data["smart_beacon"]["min_bcn"] | 5; @@ -91,7 +91,7 @@ void ConfigurationManagement::writeConfiguration(Configuration conf) data["smart_beacon"]["fast_speed"] = conf.smart_beacon.fast_speed; data["smart_beacon"]["min_tx_dist"] = conf.smart_beacon.min_tx_dist; data["smart_beacon"]["min_bcn"] = conf.smart_beacon.min_bcn ; - + data["lora"]["frequency_rx"] = conf.lora.frequencyRx; data["lora"]["frequency_tx"] = conf.lora.frequencyTx; data["lora"]["power"] = conf.lora.power;