- Minor bugfix for ARISS mode
master
lightaprs 2022-02-14 14:38:13 +03:00
rodzic 1d1afb7a37
commit bf23816181
1 zmienionych plików z 8 dodań i 6 usunięć

Wyświetl plik

@ -156,7 +156,8 @@ int16_t GpsResetTime=1800; // timeout for reset if GPS is not fixed
// GEOFENCE // GEOFENCE
uint32_t GEOFENCE_APRS_frequency = 144390000; //default frequency before geofencing. This variable will be updated based on GPS location. uint32_t GEOFENCE_APRS_frequency = 144390000; //default frequency before geofencing. This variable will be updated based on GPS location.
uint32_t GEOFENCE_no_tx = 0; uint32_t GEOFENCE_no_tx = 0;
boolean arissModEnabled = false; //do not change this, temp value.
boolean GpsFirstFix=false; //do not change this boolean GpsFirstFix=false; //do not change this
boolean ublox_high_alt_mode_enabled = false; //do not change this boolean ublox_high_alt_mode_enabled = false; //do not change this
@ -287,11 +288,11 @@ void loop() {
configureFreqbyLocation(); configureFreqbyLocation();
} }
if(autoPathSizeHighAlt && gps.altitude.feet()>3000){ if(!arissModEnabled && autoPathSizeHighAlt && gps.altitude.feet()>3000){
//force to use high altitude settings (WIDE2-n) //force to use high altitude settings (WIDE2-n)
APRS_setPathSize(1); APRS_setPathSize(1);
} else { } else {
//use defualt settings //use default settings
APRS_setPathSize(pathSize); APRS_setPathSize(pathSize);
} }
@ -390,7 +391,8 @@ void configureFreqbyLocation() {
APRS_setPath1("ARISS", Wide1); APRS_setPath1("ARISS", Wide1);
APRS_setPath2("WIDE2", Wide2); APRS_setPath2("WIDE2", Wide2);
APRS_setPathSize(2); APRS_setPathSize(2);
configDra818("145.8250"); configDra818("145.8250");
arissModEnabled = true;
} else { } else {
GEOFENCE_position(tempLat,tempLong); GEOFENCE_position(tempLat,tempLong);
@ -398,7 +400,7 @@ void configureFreqbyLocation() {
char aprsFreq_buff[9]; char aprsFreq_buff[9];
dtostrf(dividedFreq, 8, 4, aprsFreq_buff); dtostrf(dividedFreq, 8, 4, aprsFreq_buff);
configDra818(aprsFreq_buff); configDra818(aprsFreq_buff);
arissModEnabled = false;
} }
radioSetup = true; radioSetup = true;