Minor Fix

dj1an · Feb 11, 2022 · b1ed147 · b1ed147
1 parent acbd566
commit b1ed147
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/LoRa_APRS_Tracker.cpp b/src/LoRa_APRS_Tracker.cpp
@@ -33,7 +33,7 @@ String createTimeString(time_t t);
 String getSmartBeaconState();
 String padding(unsigned int number, unsigned int width);
 int TEMP,PRESS,HUMID,WIND_S,WIND_DIR,RAIN;
-static bool STATIC_BEACON ;
+static bool STATIC_BEACON,WEATHER_DATA ;
 static bool   BatteryIsConnected   = false;
 static String batteryVoltage       = "";
 static bool DSB_ACTIVE = SB_ACTIVE; // initial Smartbeacon State can be changed via menu
@@ -358,11 +358,9 @@ void loop() {
     String WIND_DIRECTION = "...";
     String RAINX = "...";
     String aprsmsg;
+    if (WEATHER_DATA == true){
 
-
-
-
-    if (WEATHER_DATA){
+    Serial.print("Weather data enabled");
     aprsmsg = "!" + lat + DBEACON_OVERLAY + lng + DBEACON_SYMBOL +WIND_DIRECTION+ "/"+ WIND_SPEED +"g" 
     + RAINX +"t"+ TEMPERATURE+"h"+ HUMIDITY+"b"+ PRESSURE;
 
@@ -371,7 +369,7 @@ void loop() {
     //h = humidity
     //b = pressure
     }
-    if(STATIC_BEACON == true){
+    else if(STATIC_BEACON == true){
        aprsmsg = "!" + DBEACON_LATITUDE + DBEACON_OVERLAY + DBEACON_LONGITUDE + DBEACON_SYMBOL + DBEACON_MESSAGE ;
      }
     else{
@@ -1046,6 +1044,7 @@ void activateProfile(int profileNr){
       DBEACON_OVERLAY = P3_BEACON_OVERLAY;
       DBEACON_SYMBOL = P3_BEACON_SYMBOL;
       DCALLSIGN = P3_CALLSIGN;
+      WEATHER_DATA = true;
     break;
     case 4:
       DSB_ACTIVE = P4_SB_ACTIVE;

diff --git a/src/config.h b/src/config.h
@@ -5,7 +5,7 @@
 // Symbol Lookup Table:
 // https://blog.thelifeofkenneth.com/2017/01/aprs-symbol-look-up-table.html
 
-#define DEFAULT_PROFILE 0 // Profile to use after Reboot
+#define DEFAULT_PROFILE 3 // Profile to use after Reboot
 
 // Profile 0 - Car Symbol
 #define BEACON_SYMBOL ">"
@@ -99,5 +99,5 @@
 
 #define BEACON_BUTTON_TX    true // Push Button >2s to Tx Position
 #define ENHANCE_PRECISION   true // APRS DAO Extension. Adds two Digits of Precision to Lat and Lon
-#define WEATHER_DATA        false // Weather Data via APRS
+