From 257c47e428d20d41a1071c7fced9bdb65b423ef6 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Fri, 19 Mar 2021 21:06:07 +0100 Subject: [PATCH 1/3] use correct destination --- src/LoRa_APRS_Tracker.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LoRa_APRS_Tracker.cpp b/src/LoRa_APRS_Tracker.cpp index 356e7d5..ac9f2b8 100644 --- a/src/LoRa_APRS_Tracker.cpp +++ b/src/LoRa_APRS_Tracker.cpp @@ -156,7 +156,7 @@ void loop() APRSMessage msg; msg.setSource(Config.callsign); - msg.setDestination("APLT0"); + msg.setDestination("APLT00"); String lat = create_lat_aprs(gps.location.rawLat()); String lng = create_long_aprs(gps.location.rawLng()); From d76b3a0b057f3c7db0cb8ce9481450a07190fbc5 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Fri, 19 Mar 2021 22:13:01 +0100 Subject: [PATCH 2/3] add altitude, speed and course to aprs message --- src/LoRa_APRS_Tracker.cpp | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/src/LoRa_APRS_Tracker.cpp b/src/LoRa_APRS_Tracker.cpp index ac9f2b8..81bcd72 100644 --- a/src/LoRa_APRS_Tracker.cpp +++ b/src/LoRa_APRS_Tracker.cpp @@ -27,12 +27,13 @@ String create_long_aprs(RawDegrees lng); String createDateString(time_t t); String createTimeString(time_t t); String getSmartBeaconState(); +String padding(unsigned int number, unsigned int width); // cppcheck-suppress unusedFunction void setup() { Serial.begin(115200); - + #ifdef TTGO_T_Beam_V1_0 Wire.begin(SDA, SCL); if (!powerManagement.begin(Wire)) @@ -159,13 +160,16 @@ void loop() msg.setDestination("APLT00"); String lat = create_lat_aprs(gps.location.rawLat()); String lng = create_long_aprs(gps.location.rawLng()); + String alt = padding((int)gps.altitude.feet(), 6); + String course = padding((int)gps.course.deg(), 3); + String speed = padding((int)gps.speed.knots(), 3); #ifdef TTGO_T_Beam_V1_0 String batteryVoltage(powerManagement.getBatteryVoltage(), 2); String batteryChargeCurrent(powerManagement.getBatteryChargeDischargeCurrent(), 0); - msg.getAPRSBody()->setData(String("=") + lat + Config.beacon.overlay + lng + Config.beacon.symbol + Config.beacon.message + " - Bat.: " + batteryVoltage + "V - Cur.: " + batteryChargeCurrent + "mA"); + msg.getAPRSBody()->setData(String("=") + lat + Config.beacon.overlay + lng + Config.beacon.symbol + course + "/" + speed + "/A=" + alt + Config.beacon.message + " - Bat.: " + batteryVoltage + "V - Cur.: " + batteryChargeCurrent + "mA"); #else - msg.getAPRSBody()->setData(String("=") + lat + Config.beacon.overlay + lng + Config.beacon.symbol + Config.beacon.message); + msg.getAPRSBody()->setData(String("=") + lat + Config.beacon.overlay + lng + Config.beacon.symbol + course + "/" + speed + "/A=" + alt + Config.beacon.message); #endif String data = msg.encode(); logPrintlnD(data); @@ -307,9 +311,7 @@ String create_long_aprs(RawDegrees lng) String createDateString(time_t t) { - char line[30]; - sprintf(line, "%02d.%02d.%04d", day(t), month(t), year(t)); - return String(line); + return String(padding(day(t), 2) + "." + padding(month(t), 2) + "." + padding(year(t), 4)); } String createTimeString(time_t t) @@ -318,9 +320,7 @@ String createTimeString(time_t t) { return String("00:00:00"); } - char line[30]; - sprintf(line, "%02d:%02d:%02d", hour(t), minute(t), second(t)); - return String(line); + return String(padding(hour(t), 2) + "." + padding(minute(t), 2) + "." + padding(second(t), 2)); } String getSmartBeaconState() @@ -331,3 +331,19 @@ String getSmartBeaconState() } return "Off"; } + +String padding(unsigned int number, unsigned int width) +{ + String result; + String num(number); + if(num.length() > width) + { + width = num.length(); + } + for(unsigned int i = 0; i < width - num.length(); i++) + { + result.concat('0'); + } + result.concat(num); + return result; +} From 5be1b720635e43e892885310ceee4bbdef9f3d99 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Fri, 19 Mar 2021 22:13:48 +0100 Subject: [PATCH 3/3] change suffix of callsign --- data/tracker.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/tracker.json b/data/tracker.json index 4c3ef24..0d8a28a 100644 --- a/data/tracker.json +++ b/data/tracker.json @@ -1,5 +1,5 @@ { - "callsign":"NOCALL-10", + "callsign":"NOCALL-7", "debug": false, "beacon": { @@ -10,7 +10,7 @@ }, "smart_beacon": { - "active":false, + "active":true, "turn_min":25, "slow_rate":300, "slow_speed":10,