More refactoring
Lots of things removed but compiles again
This commit is contained in:
@@ -29,7 +29,7 @@
|
||||
#include "bootloader.h"
|
||||
#include "eeprom.h"
|
||||
#include "System/system.h"
|
||||
#include "frq.h"
|
||||
//#include "frq.h"
|
||||
#include "hwFixes.h"
|
||||
|
||||
#include "usbComms.h"
|
||||
@@ -278,8 +278,8 @@ void USB_ProcessSystemCommand(void)
|
||||
{
|
||||
//Save settings data
|
||||
EE_SaveData();
|
||||
frq_update_flag = false;
|
||||
Change_To_Next_BC_Freq();
|
||||
//frq_update_flag = false;
|
||||
//Change_To_Next_BC_Freq();
|
||||
USB_SendString(ACK);
|
||||
|
||||
}
|
||||
@@ -346,16 +346,17 @@ void USB_ProcessFrequencyCommand(void)
|
||||
p = strtok(null, ","); //inMenu
|
||||
uint32_t inMenu = atoi(p);
|
||||
|
||||
FREQ_AddFrequency(frequency, enabled, inMenu, type);
|
||||
fgen_addFrequency(frequency, enabled, inMenu, type);
|
||||
|
||||
|
||||
USB_SendString(ACK);
|
||||
}
|
||||
else if (USB_CommandCompare("fClear"))
|
||||
{
|
||||
//Clear the frequency list
|
||||
frq_update_flag = true;
|
||||
//frq_update_flag = true;
|
||||
|
||||
FREQ_ClearFrequencies();
|
||||
fgen_clearFrequencies();
|
||||
USB_SendString(ACK);
|
||||
}
|
||||
else if (USB_CommandCompare("fSave"))
|
||||
@@ -366,7 +367,7 @@ void USB_ProcessFrequencyCommand(void)
|
||||
}
|
||||
else if (USB_CommandCompare("fGetNum")) //Get number of frequencies in the receiver
|
||||
{
|
||||
sprintf(usbTempString, "%d", FREQ_GetNumFrequencies());
|
||||
sprintf(usbTempString, "%d", fgen_getNumFrequencies());
|
||||
USB_SendString(usbTempString);
|
||||
}
|
||||
else if (USB_CommandPrefixCompare("fGet,")) //Get string representing a single frequency
|
||||
@@ -376,8 +377,8 @@ void USB_ProcessFrequencyCommand(void)
|
||||
p = strtok(null, ","); //index
|
||||
uint32_t index = atoi(p);
|
||||
|
||||
FREQUENCY_t frq = FREQ_GetFreqByIndex(index);
|
||||
sprintf(usbTempString, "%d,%d,%d,%d", frq.frequency1, 0, frq.enabled, 1); //FREQ_TYPE-t always 0, inMenu always 1
|
||||
//FREQUENCY_t frq = FREQ_GetFreqByIndex(index);
|
||||
//sprintf(usbTempString, "%d,%d,%d,%d", frq.frequency1, 0, frq.enabled, 1); //FREQ_TYPE-t always 0, inMenu always 1
|
||||
USB_SendString(usbTempString);
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user