Skip to content

Commit

Permalink
bugfix saving is not possible / enable freq hopping on gps fix and og…
Browse files Browse the repository at this point in the history 
…n/leg prot
  • Loading branch information
@roema
roema committed Jul 31, 2021
1 parent f2c450e commit ac7d9b0
Show file tree
Hide file tree
Showing 14 changed files with 406 additions and 1,517 deletions.
15 changes: 8 additions & 7 deletions libraries/OGN/freqplan.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class FreqPlan
break;
case RF_BAND_UK:
#if !defined(TEST_PAW_ON_NICERF_SV610_FW466)
{ BaseFreq=869525000; ChanSepar=200000; Channels= 1; MaxTxPower = 27; } // PilotAware (UK)0
{ BaseFreq=869525000; ChanSepar=200000; Channels= 1; MaxTxPower = 27; } // PilotAware (UK)
#else
{ BaseFreq=869920000; ChanSepar=200000; Channels= 1; MaxTxPower = 27; } // Test PAW on NiceRF SV6X0
#endif
Expand Down Expand Up @@ -85,14 +85,14 @@ class FreqPlan
if(Plan>RF_BAND_KR) return 0;
return Name[Plan]; }

uint8_t getChannel (uint32_t Time, uint8_t Slot=0, uint8_t OGN=1) const // OGN-tracker or legacy, UTC time, slot: 0 or 1
uint8_t getChannel (uint32_t Time, uint8_t Slot=0, uint8_t OGN=1) const // OGN-tracker or FLARM, UTC time, slot: 0 or 1
{ if(Channels<=1) return 0; // if single channel (New Zealand) return channel #0
if(Plan>=2) // if USA/Canada or Australia/South America
{ uint8_t Channel = FreqHopHash((Time<<1)+Slot) % Channels; // legacy hopping channel
if(OGN) // for OGN tracker
{ if(Slot)
{ uint8_t Channel2 = FreqHopHash((Time<<1)) % Channels; // use same as legacy in the 1st slot
if(Channel2==Channel) { Channel++; if(Channel>=Channels) Channel-=2; } // but if same then legacy in the 2nd slot
{ uint8_t Channel = FreqHopHash((Time<<1)+Slot) % Channels; // Flarm hopping channel
if(OGN) // OGN Tracker
{ if(Slot) // for 2nd slot
{ uint8_t Channel2 = FreqHopHash((Time<<1)) % Channels; // use same as Flarm in the 1st slot
if(Channel2==Channel) { Channel++; if(Channel>=Channels) Channel-=2; } // but if same then Flarm in the 2nd slot
else Channel=Channel2;
}
else { Channel++; if(Channel>=Channels) Channel-=2; } // for 1st slot choose a higher channel (unless already highest, then choose a lower one)
Expand Down Expand Up @@ -124,3 +124,4 @@ class FreqPlan
} ;

#endif // __FREQPLAN_H__

254 changes: 115 additions & 139 deletions ognbase/EEPROM.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,139 +1,115 @@
/*
* EEPROM.cpp
* Copyright (C) 2019-2020 Linar Yusupov
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "SoC.h"

#if defined(EXCLUDE_EEPROM)
void EEPROM_setup()
{}
void EEPROM_store()
{}
#else

#include "EEPROM.h"
#include "RF.h"


#include "Bluetooth.h"
#include "Traffic.h"
#include "NMEA.h"
#include "GDL90.h"
#include "D1090.h"
#include "JSON.h"
#include "Battery.h"

// start reading from the first byte (address 0) of the EEPROM

eeprom_t eeprom_block;
settings_t* settings;

void EEPROM_setup()
{
if (!SoC->EEPROM_begin(sizeof(eeprom_t)))
{
Serial.print(F("ERROR: Failed to initialize "));
Serial.print(sizeof(eeprom_t));
Serial.println(F(" bytes of EEPROM!"));
Serial.flush();
delay(1000000);
}

for (int i=0; i < sizeof(eeprom_t); i++)
eeprom_block.raw[i] = EEPROM.read(i);

if (eeprom_block.field.magic != SOFTRF_EEPROM_MAGIC)
{
Serial.println(F("WARNING! User defined settings are not initialized yet. Loading defaults..."));

EEPROM_defaults();
}
else
{
Serial.print(F("EEPROM version: "));
Serial.println(eeprom_block.field.version);

if (eeprom_block.field.version != SOFTRF_EEPROM_VERSION)
{
Serial.println(F("WARNING! Version mismatch of user defined settings. Loading defaults..."));

EEPROM_defaults();
}
}
settings = &eeprom_block.field.settings;
}

void EEPROM_defaults()
{
eeprom_block.field.magic = SOFTRF_EEPROM_MAGIC;
eeprom_block.field.version = SOFTRF_EEPROM_VERSION;
eeprom_block.field.settings.mode = SOFTRF_MODE_GROUND;
//eeprom_block.field.settings.rf_protocol = RF_PROTOCOL_OGNTP;
//eeprom_block.field.settings.rf_protocol2 = RF_PROTOCOL_LEGACY;
//eeprom_block.field.settings.band = RF_BAND_EU;
eeprom_block.field.settings.aircraft_type = AIRCRAFT_TYPE_GLIDER;
eeprom_block.field.settings.txpower = RF_TX_POWER_FULL;
eeprom_block.field.settings.bluetooth = BLUETOOTH_OFF;
eeprom_block.field.settings.alarm = TRAFFIC_ALARM_DISTANCE;

/* This will speed up 'factory' boot sequence on Editions other than Standalone */
/*if (hw_info.model == SOFTRF_MODEL_STANDALONE) {
eeprom_block.field.settings.volume = BUZZER_VOLUME_FULL;
eeprom_block.field.settings.pointer = DIRECTION_NORTH_UP;
} else {
eeprom_block.field.settings.volume = BUZZER_OFF;
eeprom_block.field.settings.pointer = LED_OFF;
}*/

eeprom_block.field.settings.nmea_g = false;
eeprom_block.field.settings.nmea_p = false;
eeprom_block.field.settings.nmea_l = false;
eeprom_block.field.settings.nmea_s = false;

#if defined(USBD_USE_CDC) && !defined(DISABLE_GENERIC_SERIALUSB)
eeprom_block.field.settings.nmea_out = NMEA_BLUETOOTH; /* STM32 USB */
#else
eeprom_block.field.settings.nmea_out = NMEA_OFF;
#endif

eeprom_block.field.settings.gdl90 = GDL90_OFF;
eeprom_block.field.settings.d1090 = D1090_OFF;
eeprom_block.field.settings.json = JSON_OFF;
eeprom_block.field.settings.stealth = false;
eeprom_block.field.settings.no_track = false;
eeprom_block.field.settings.power_save = POWER_SAVE_NONE;
eeprom_block.field.settings.freq_corr = 0;
//eeprom_block.field.settings.range = 10;
//eeprom_block.field.settings.sxlna = true;
//eeprom_block.field.settings.ogndebug = false;
//eeprom_block.field.settings.ogndebugp = 12000;
//eeprom_block.field.settings.ignore_stealth = false;
//eeprom_block.field.settings.ignore_no_track = false;
//eeprom_block.field.settings.sleep_mode = 0;
//eeprom_block.field.settings.sleep_after_rx_idle = 3600;
//eeprom_block.field.settings.wake_up_timer = 3600;
}

void EEPROM_store()
{
for (int i=0; i < sizeof(eeprom_t); i++)
EEPROM.write(i, eeprom_block.raw[i]);

EEPROM_commit();
}

#endif /* EXCLUDE_EEPROM */
/*
* EEPROM.cpp
* Copyright (C) 2019-2020 Linar Yusupov
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "SoC.h"

#if defined(EXCLUDE_EEPROM)
void EEPROM_setup()
{}
void EEPROM_store()
{}
#else

#include "EEPROM.h"
#include "RF.h"


#include "Bluetooth.h"
#include "Traffic.h"
#include "NMEA.h"
#include "GDL90.h"
#include "D1090.h"
#include "Battery.h"

// start reading from the first byte (address 0) of the EEPROM

eeprom_t eeprom_block;
settings_t* settings;

void EEPROM_setup()
{
if (!SoC->EEPROM_begin(sizeof(eeprom_t)))
{
Serial.print(F("ERROR: Failed to initialize "));
Serial.print(sizeof(eeprom_t));
Serial.println(F(" bytes of EEPROM!"));
Serial.flush();
delay(1000000);
}

for (int i=0; i < sizeof(eeprom_t); i++)
eeprom_block.raw[i] = EEPROM.read(i);

if (eeprom_block.field.magic != SOFTRF_EEPROM_MAGIC)
{
Serial.println(F("WARNING! User defined settings are not initialized yet. Loading defaults..."));

EEPROM_defaults();
}
else
{
Serial.print(F("EEPROM version: "));
Serial.println(eeprom_block.field.version);

if (eeprom_block.field.version != SOFTRF_EEPROM_VERSION)
{
Serial.println(F("WARNING! Version mismatch of user defined settings. Loading defaults..."));

EEPROM_defaults();
}
}
settings = &eeprom_block.field.settings;
}

void EEPROM_defaults()
{
eeprom_block.field.magic = SOFTRF_EEPROM_MAGIC;
eeprom_block.field.version = SOFTRF_EEPROM_VERSION;
eeprom_block.field.settings.mode = SOFTRF_MODE_GROUND;
eeprom_block.field.settings.aircraft_type = AIRCRAFT_TYPE_GLIDER;
eeprom_block.field.settings.txpower = RF_TX_POWER_FULL;
eeprom_block.field.settings.bluetooth = BLUETOOTH_OFF;
eeprom_block.field.settings.alarm = TRAFFIC_ALARM_DISTANCE;
eeprom_block.field.settings.nmea_g = false;
eeprom_block.field.settings.nmea_p = false;
eeprom_block.field.settings.nmea_l = false;
eeprom_block.field.settings.nmea_s = false;

#if defined(USBD_USE_CDC) && !defined(DISABLE_GENERIC_SERIALUSB)
eeprom_block.field.settings.nmea_out = NMEA_BLUETOOTH; /* STM32 USB */
#else
eeprom_block.field.settings.nmea_out = NMEA_OFF;
#endif

eeprom_block.field.settings.gdl90 = GDL90_OFF;
eeprom_block.field.settings.d1090 = D1090_OFF;
eeprom_block.field.settings.stealth = false;
eeprom_block.field.settings.no_track = false;
eeprom_block.field.settings.power_save = POWER_SAVE_NONE;
eeprom_block.field.settings.freq_corr = 0;
}

void EEPROM_store()
{
for (int i=0; i < sizeof(eeprom_t); i++)
EEPROM.write(i, eeprom_block.raw[i]);

EEPROM_commit();
}

#endif /* EXCLUDE_EEPROM */
Loading

0 comments on commit ac7d9b0

Please sign in to comment.