AM-fix cleanup
This commit is contained in:
4
am_fix.c
4
am_fix.c
@@ -303,12 +303,12 @@ void AM_fix_reset(const unsigned vfo)
|
|||||||
// won't/don't do it for itself, we're left to bodging it ourself by
|
// won't/don't do it for itself, we're left to bodging it ourself by
|
||||||
// playing with the RF front end gain setting
|
// playing with the RF front end gain setting
|
||||||
//
|
//
|
||||||
void AM_fix_10ms(const unsigned vfo, bool force)
|
void AM_fix_10ms(const unsigned vfo)
|
||||||
{
|
{
|
||||||
if(!gSetting_AM_fix || !enabled || vfo > 1 )
|
if(!gSetting_AM_fix || !enabled || vfo > 1 )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if(!force) switch (gCurrentFunction)
|
switch (gCurrentFunction)
|
||||||
{
|
{
|
||||||
case FUNCTION_TRANSMIT:
|
case FUNCTION_TRANSMIT:
|
||||||
case FUNCTION_BAND_SCOPE:
|
case FUNCTION_BAND_SCOPE:
|
||||||
|
2
am_fix.h
2
am_fix.h
@@ -23,7 +23,7 @@
|
|||||||
#ifdef ENABLE_AM_FIX
|
#ifdef ENABLE_AM_FIX
|
||||||
void AM_fix_init(void);
|
void AM_fix_init(void);
|
||||||
void AM_fix_reset(const unsigned vfo);
|
void AM_fix_reset(const unsigned vfo);
|
||||||
void AM_fix_10ms(const unsigned vfo, bool force);
|
void AM_fix_10ms(const unsigned vfo);
|
||||||
#ifdef ENABLE_AM_FIX_SHOW_DATA
|
#ifdef ENABLE_AM_FIX_SHOW_DATA
|
||||||
void AM_fix_print_data(const unsigned vfo, char *s);
|
void AM_fix_print_data(const unsigned vfo, char *s);
|
||||||
#endif
|
#endif
|
||||||
|
@@ -1128,7 +1128,7 @@ void APP_TimeSlice10ms(void)
|
|||||||
|
|
||||||
#ifdef ENABLE_AM_FIX
|
#ifdef ENABLE_AM_FIX
|
||||||
if (gRxVfo->Modulation == MODULATION_AM)
|
if (gRxVfo->Modulation == MODULATION_AM)
|
||||||
AM_fix_10ms(gEeprom.RX_VFO, false);
|
AM_fix_10ms(gEeprom.RX_VFO);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (UART_IsCommandAvailable())
|
if (UART_IsCommandAvailable())
|
||||||
|
@@ -1128,8 +1128,8 @@ static void Tick() {
|
|||||||
#ifdef ENABLE_AM_FIX
|
#ifdef ENABLE_AM_FIX
|
||||||
if (gNextTimeslice) {
|
if (gNextTimeslice) {
|
||||||
gNextTimeslice = false;
|
gNextTimeslice = false;
|
||||||
if(settings.modulationType == MODULATION_AM) {
|
if(settings.modulationType == MODULATION_AM && !lockAGC) {
|
||||||
AM_fix_10ms(vfo, !lockAGC); //allow AM_Fix to apply its AGC action
|
AM_fix_10ms(vfo); //allow AM_Fix to apply its AGC action
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user