UL/TX
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

More refactoring

Browse Source 
Lots of things removed but compiles again
This commit is contained in:
Brent Perteet
2025-06-25 11:18:44 -05:00
parent 0556b06cab
commit 2ff7291c63
31 changed files with 1247 additions and 2569 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
source/eeprom.c
View File

@@ -17,8 +17,9 @@
#include "timer.h"
#include "System/system.h"
#include "bootloader.h"
#include "frq.h"
//#include "frq.h"
#include "eeprom.h"
#include "fgen.h"
#include "Fonts/translate.h"
/*******************************************************************************
@@ -56,6 +57,37 @@ static bool EE_Busy(void)
* Public Functions
******************************************************************************/
/*
* Pack frequency data and return
* Packed data is used for saving to FLASH
*/
uint32_t EE_GetPackedFrequency(uint32_t index)
{
FREQUENCY_t *freq = fgen_getByIndex(index);
uint32_t packed = freq->frequency;
//packed |= freqArray[index].type << FREQ_PACK_SHIFT_TYPE;
packed |= (uint32_t)freq->enabled << FREQ_PACK_SHIFT_ENABLED;
//packed |= (uint32_t)freqArray[index].inMenu << FREQ_PACK_SHIFT_INMENU;
return packed;
}
/*
* Add a frequency to the list from packed data
* Packed data is used for saving to FLASH
*/
void EE_AddPackedFrequency(uint32_t packedFreq)
{
uint32_t frequency = packedFreq & FREQ_PACK_MASK_FREQ;
//FREQ_TYPE_t type = (packedFreq & FREQ_PACK_MASK_TYPE) >> FREQ_PACK_SHIFT_TYPE;
bool enabled = packedFreq & FREQ_PACK_MASK_ENABLED;
//bool inMenu = packedFreq & FREQ_PACK_MASK_INMENU;
fgen_addFrequency(frequency, enabled, 1, FT_ACTIVE); //inMenu always 1, all FT_ACTIVE
}
/*
* Load data from EEPROM
*/
@@ -109,7 +141,7 @@ bool EE_LoadFrequencies(void)
for(uint32_t i = 0; i < tempNumFreqs; i++)
{
uint32_t packedFreq = EE_ReadUINT32(EE_FREQ_START + EE_BYTES_PER_WORD * i);
FREQ_AddPackedFrequency(packedFreq);
EE_AddPackedFrequency(packedFreq);
}
}
@@ -134,11 +166,12 @@ void EE_SaveData(void)
EE_WriteBytes(EE_DATA_TIMER, &tmr.autoShutdown, 1); // Save Power down timer status
//Save Frequencies
uint32_t numFreqs = FREQ_GetNumFrequencies();
uint32_t numFreqs = fgen_getNumFrequencies();
EE_WriteUINT32(EE_FREQ_NUM, numFreqs);
for(uint32_t i = 0; i < numFreqs; i++)
{
EE_WriteUINT32(EE_FREQ_START + EE_BYTES_PER_WORD * i, FREQ_GetPackedFrequency(i));
EE_WriteUINT32(EE_FREQ_START + EE_BYTES_PER_WORD * i, EE_GetPackedFrequency(i));
}
}