kopia lustrzana https://github.com/UU5JPP/Wolf-LITE
AUTOGAIN
rodzic
3c90e0a05e
commit
0bdcee8844
|
@ -810,7 +810,7 @@ void FRONTPANEL_BUTTONHANDLER_BAND_P(void)
|
|||
TRX.ATT_DB = TRX.BANDS_SAVED_SETTINGS[band].ATT_DB;
|
||||
TRX.ADC_Driver = TRX.BANDS_SAVED_SETTINGS[band].ADC_Driver;
|
||||
TRX.FM_SQL_threshold = TRX.BANDS_SAVED_SETTINGS[band].FM_SQL_threshold;
|
||||
TRX_AutoGain_Stage = TRX.BANDS_SAVED_SETTINGS[band].AutoGain_Stage;
|
||||
// TRX_AutoGain_Stage = TRX.BANDS_SAVED_SETTINGS[band].AutoGain_Stage;
|
||||
CurrentVFO()->AGC = TRX.BANDS_SAVED_SETTINGS[band].AGC;
|
||||
TRX_Temporary_Stop_BandMap = false;
|
||||
|
||||
|
@ -837,7 +837,7 @@ void FRONTPANEL_BUTTONHANDLER_BAND_N(void)
|
|||
TRX.ATT_DB = TRX.BANDS_SAVED_SETTINGS[band].ATT_DB;
|
||||
TRX.ADC_Driver = TRX.BANDS_SAVED_SETTINGS[band].ADC_Driver;
|
||||
TRX.FM_SQL_threshold = TRX.BANDS_SAVED_SETTINGS[band].FM_SQL_threshold;
|
||||
TRX_AutoGain_Stage = TRX.BANDS_SAVED_SETTINGS[band].AutoGain_Stage;
|
||||
// TRX_AutoGain_Stage = TRX.BANDS_SAVED_SETTINGS[band].AutoGain_Stage;
|
||||
CurrentVFO()->AGC = TRX.BANDS_SAVED_SETTINGS[band].AGC;
|
||||
TRX_Temporary_Stop_BandMap = false;
|
||||
|
||||
|
|
|
@ -158,7 +158,7 @@ void LoadSettings(bool clear)
|
|||
TRX.BANDS_SAVED_SETTINGS[i].ADC_Driver = TRX.ADC_Driver;
|
||||
TRX.BANDS_SAVED_SETTINGS[i].FM_SQL_threshold = TRX.FM_SQL_threshold;
|
||||
TRX.BANDS_SAVED_SETTINGS[i].AGC = true;
|
||||
TRX.BANDS_SAVED_SETTINGS[i].AutoGain_Stage = 6;
|
||||
// TRX.BANDS_SAVED_SETTINGS[i].AutoGain_Stage = 6;
|
||||
}
|
||||
TRX.AutoGain = false; // auto-control preamp and attenuator
|
||||
TRX.InputType_MIC = true; // type of input to transfer
|
||||
|
|
|
@ -80,8 +80,8 @@
|
|||
#define ADC_INPUT_IMPEDANCE 200.0f //50ohm -> 1:4 trans
|
||||
#define ADC_RANGE 1.0f
|
||||
#define ADC_DRIVER_GAIN_DB 20.0f //on 14mhz
|
||||
#define AUTOGAINER_TAGET (ADC_FULL_SCALE / 10)
|
||||
#define AUTOGAINER_HYSTERESIS 200 //(ADC_FULL_SCALE / 10)
|
||||
#define AUTOGAINER_TAGET (ADC_FULL_SCALE / 100)
|
||||
#define AUTOGAINER_HYSTERESIS 5 //(ADC_FULL_SCALE / 10)
|
||||
|
||||
#define MAX_CALLSIGN_LENGTH 16
|
||||
|
||||
|
@ -124,7 +124,7 @@ typedef struct
|
|||
bool ADC_Driver;
|
||||
uint8_t FM_SQL_threshold;
|
||||
bool AGC;
|
||||
uint8_t AutoGain_Stage;
|
||||
// uint8_t AutoGain_Stage;
|
||||
} BAND_SAVED_SETTINGS_TYPE;
|
||||
|
||||
extern struct TRX_SETTINGS
|
||||
|
|
|
@ -308,7 +308,7 @@ void TRX_DoAutoGain(void)
|
|||
int32_t max_amplitude = abs(TRX_ADC_MAXAMPLITUDE);
|
||||
if (abs(TRX_ADC_MINAMPLITUDE) > max_amplitude)
|
||||
max_amplitude = abs(TRX_ADC_MINAMPLITUDE);
|
||||
//sendToDebug_int32(max_amplitude,false);
|
||||
sendToDebug_int32(max_amplitude,false);
|
||||
float32_t new_att_val = TRX.ATT_DB;
|
||||
if (max_amplitude > (AUTOGAINER_TAGET + AUTOGAINER_HYSTERESIS) && new_att_val < 31.5f)
|
||||
new_att_val += 0.5f;
|
||||
|
@ -331,6 +331,7 @@ void TRX_DoAutoGain(void)
|
|||
TRX.BANDS_SAVED_SETTINGS[band].ATT_DB = TRX.ATT_DB;
|
||||
TRX.BANDS_SAVED_SETTINGS[band].ADC_Driver = TRX.ADC_Driver;
|
||||
}
|
||||
sendToDebug_int32(new_att_val,false);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@ volatile extern bool TRX_Mute;
|
|||
volatile extern float32_t TRX_IQ_phase_error;
|
||||
volatile extern bool TRX_NeedGoToBootloader;
|
||||
volatile extern bool TRX_Temporary_Stop_BandMap;
|
||||
volatile extern uint8_t TRX_AutoGain_Stage;
|
||||
//volatile extern uint8_t TRX_AutoGain_Stage;
|
||||
extern const char *MODE_DESCR[];
|
||||
extern uint32_t TRX_freq_phrase;
|
||||
extern uint32_t TRX_freq_phrase_tx;
|
||||
|
|
|
@ -75,7 +75,7 @@
|
|||
<OPTFL>
|
||||
<tvExp>1</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<IsCurrentTarget>1</IsCurrentTarget>
|
||||
<IsCurrentTarget>0</IsCurrentTarget>
|
||||
</OPTFL>
|
||||
<CpuCode>18</CpuCode>
|
||||
<DebugOpt>
|
||||
|
@ -6073,7 +6073,7 @@
|
|||
<OPTFL>
|
||||
<tvExp>1</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<IsCurrentTarget>0</IsCurrentTarget>
|
||||
<IsCurrentTarget>1</IsCurrentTarget>
|
||||
</OPTFL>
|
||||
<CpuCode>18</CpuCode>
|
||||
<DebugOpt>
|
||||
|
|
Ładowanie…
Reference in New Issue