richonguzman/LoRa_APRS_iGate
1
0
Fork 0
mirror of https://github.com/richonguzman/LoRa_APRS_iGate.git synced 2026-04-10 00:45:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

new names ok

Browse source
This commit is contained in:
richonguzman 2024-05-23 22:52:17 -04:00
parent 992641578d
commit bbdcf8ce0d
8 changed files with 37 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/configuration.cpp
View file

@ -33,21 +33,14 @@ void Configuration::writeFile() {
data["wifi"]["autoAP"]["powerOff"] = wifiAutoAP.powerOff;
data["callsign"] = callsign;
// data["stationMode"] = stationMode; // only check for config version
// data["iGateComment"] = iGateComment;
// data["other"]["beaconInterval"] = beaconInterval;
// data["other"]["igateSendsLoRaBeacons"] = igateSendsLoRaBeacons;
// data["other"]["igateRepeatsLoRaPackets"] = igateRepeatsLoRaPackets;
data["other"]["rememberStationTime"] = rememberStationTime;
data["battery"]["sendBatteryVoltage"] = battery.sendBatteryVoltage;
data["battery"]["externalVoltageMeasurement"] = battery.externalVoltageMeasurement;
data["battery"]["externalVoltagePin"] = battery.externalVoltagePin;
data["other"]["rememberStationTime"] = rememberStationTime;
data["battery"]["sendInternalVoltage"] = battery.sendInternalVoltage;
data["battery"]["sendExternalVoltage"] = battery.sendExternalVoltage;
data["battery"]["externalVoltagePin"] = battery.externalVoltagePin;
data["digi"]["mode"] = digi.mode;
// data["digi"]["comment"] = digi.comment;
// data["digi"]["latitude"] = digi.latitude;
// data["digi"]["longitude"] = digi.longitude;
data["tnc"]["enableServer"] = tnc.enableServer;
data["tnc"]["enableSerial"] = tnc.enableSerial;
@ -58,7 +51,6 @@ void Configuration::writeFile() {
data["aprs_is"]["server"] = aprs_is.server;
data["aprs_is"]["port"] = aprs_is.port;
data["aprs_is"]["filter"] = aprs_is.filter;
//data["aprs_is"]["toRF"] = aprs_is.toRF;
data["aprs_is"]["messagesToRF"] = aprs_is.messagesToRF;
data["aprs_is"]["objectsToRF"] = aprs_is.objectsToRF;
@ -145,13 +137,9 @@ bool Configuration::readFile() {
callsign = data["callsign"].as<String>();
rememberStationTime = data["other"]["rememberStationTime"].as<int>();
/*sendBatteryVoltage = data["other"]["sendBatteryVoltage"].as<bool>();
externalVoltageMeasurement = data["other"]["externalVoltageMeasurement"].as<bool>();
externalVoltagePin = data["other"]["externalVoltagePin"].as<int>();*/
battery.sendBatteryVoltage = data["battery"]["sendBatteryVoltage"].as<bool>();
battery.externalVoltageMeasurement = data["battery"]["externalVoltageMeasurement"].as<bool>();
battery.externalVoltagePin = data["battery"]["externalVoltagePin"].as<int>();
battery.sendInternalVoltage = data["battery"]["sendInternalVoltage"].as<bool>();
battery.sendExternalVoltage = data["battery"]["sendExternalVoltage"].as<bool>();
battery.externalVoltagePin = data["battery"]["externalVoltagePin"].as<int>();
aprs_is.passcode = data["aprs_is"]["passcode"].as<String>();
aprs_is.server = data["aprs_is"]["server"].as<String>();
@ -358,16 +346,11 @@ void Configuration::init() {
ota.username = "";
ota.password = "";
// beaconInterval = 15; // deprecated
// igateSendsLoRaBeacons = false; // deprecated
// igateRepeatsLoRaPackets = false; // deprecated
rememberStationTime = 30;
/*sendBatteryVoltage = false;
externalVoltageMeasurement = false;
externalVoltagePin = 34;*/
battery.sendBatteryVoltage = false;
battery.externalVoltageMeasurement = false;
battery.sendInternalVoltage = false;
battery.sendExternalVoltage = false;
battery.externalVoltagePin = 34;
lowPowerMode = false;

4
src/configuration.h
View file

@ -68,8 +68,8 @@ public:
class BATTERY {
public:
bool sendBatteryVoltage;
bool externalVoltageMeasurement;
bool sendInternalVoltage;
bool sendExternalVoltage;
int externalVoltagePin;
};

2
src/power_utils.cpp
View file

@ -128,7 +128,7 @@ namespace POWER_Utils {
pinMode(INTERNAL_LED_PIN, OUTPUT);
#endif
if (Config.battery.externalVoltageMeasurement) {
if (Config.battery.sendExternalVoltage) {
pinMode(Config.battery.externalVoltagePin, INPUT);
}

4
src/utils.cpp
View file

@ -122,7 +122,7 @@ namespace Utils {
secondaryBeaconPacket += Config.beacon.comment;
#ifdef BATTERY_PIN
if (Config.battery.sendBatteryVoltage) {
if (Config.battery.sendInternalVoltage) {
String batteryInfo = "Batt=" + String(BATTERY_Utils::checkBattery(),2) + "V";
beaconPacket += " " + batteryInfo;
secondaryBeaconPacket += " " + batteryInfo;
@ -130,7 +130,7 @@ namespace Utils {
}
#endif
if (Config.battery.externalVoltageMeasurement) {
if (Config.battery.sendExternalVoltage) {
String externalVoltage = String(BATTERY_Utils::checkExternalVoltage(),2) + "V";
beaconPacket += " Ext=" + externalVoltage;
secondaryBeaconPacket += " Ext=" + externalVoltage;

8
src/web_utils.cpp
View file

@ -156,10 +156,10 @@ namespace WEB_Utils {
Config.ota.username = request->getParam("ota.username", true)->value();
Config.ota.password = request->getParam("ota.password", true)->value();
Config.rememberStationTime = request->getParam("other.rememberStationTime", true)->value().toInt();
Config.battery.sendBatteryVoltage = request->hasParam("battery.sendBatteryVoltage", true);
Config.battery.externalVoltageMeasurement = request->hasParam("battery.externalVoltageMeasurement", true);
if (Config.battery.externalVoltageMeasurement) {
Config.rememberStationTime = request->getParam("other.rememberStationTime", true)->value().toInt();
Config.battery.sendInternalVoltage = request->hasParam("battery.sendInternalVoltage", true);
Config.battery.sendExternalVoltage = request->hasParam("battery.sendExternalVoltage", true);
if (Config.battery.sendExternalVoltage) {
Config.battery.externalVoltagePin = request->getParam("battery.externalVoltagePin", true)->value().toInt();
}