Sojus07/hackrf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initialise RF path GPIOs to safe settings.

Browse Source 
Previously these calls were leaving the amplifiers on, since the
control settings passed were missing SWITCHCTRL_NO_TX_AMP_PWR and
SWITCHCTRL_NO_RX_AMP_PWR. Use the predefined SWITCHCTRL_SAFE here.

Also move these calls before setting the GPIO pins to output mode,
to avoid driving them to the wrong states briefly first.
This commit is contained in:
Martin Ling
2022-09-21 12:05:17 +01:00
parent e623c7aed7
commit eec6963759
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
firmware/common/rf_path.c
View File

@ -267,6 +267,12 @@ void rf_path_pin_setup(rf_path_t* const rf_path)
/* Configure RF power supply (VAA) switch */ /* Configure RF power supply (VAA) switch */
scu_pinmux(SCU_NO_VAA_ENABLE, SCU_GPIO_FAST | SCU_CONF_FUNCTION0); scu_pinmux(SCU_NO_VAA_ENABLE, SCU_GPIO_FAST | SCU_CONF_FUNCTION0);
/*
* Safe (initial) switch settings turn off both amplifiers and antenna port
* power and enable both amp bypass and mixer bypass.
*/
switchctrl_set(rf_path, SWITCHCTRL_SAFE);
/* Configure RF switch control signals as outputs */ /* Configure RF switch control signals as outputs */
gpio_output(rf_path->gpio_amp_bypass); gpio_output(rf_path->gpio_amp_bypass);
gpio_output(rf_path->gpio_no_mix_bypass); gpio_output(rf_path->gpio_no_mix_bypass);
@ -281,12 +287,6 @@ void rf_path_pin_setup(rf_path_t* const rf_path)
gpio_output(rf_path->gpio_tx); gpio_output(rf_path->gpio_tx);
gpio_output(rf_path->gpio_mix_bypass); gpio_output(rf_path->gpio_mix_bypass);
gpio_output(rf_path->gpio_rx); gpio_output(rf_path->gpio_rx);
/*
* Safe (initial) switch settings turn off both amplifiers and antenna port
* power and enable both amp bypass and mixer bypass.
*/
switchctrl_set(rf_path, SWITCHCTRL_AMP_BYPASS | SWITCHCTRL_MIX_BYPASS);
#elif RAD1O #elif RAD1O
/* Configure RF switch control signals */ /* Configure RF switch control signals */
// clang-format off // clang-format off
@ -306,6 +306,12 @@ void rf_path_pin_setup(rf_path_t* const rf_path)
/* Configure RF power supply (VAA) switch */ /* Configure RF power supply (VAA) switch */
scu_pinmux(SCU_VAA_ENABLE, SCU_GPIO_FAST | SCU_CONF_FUNCTION0); scu_pinmux(SCU_VAA_ENABLE, SCU_GPIO_FAST | SCU_CONF_FUNCTION0);
/*
* Safe (initial) switch settings turn off both amplifiers and antenna port
* power and enable both amp bypass and mixer bypass.
*/
switchctrl_set(rf_path, SWITCHCTRL_SAFE);
/* Configure RF switch control signals as outputs */ /* Configure RF switch control signals as outputs */
gpio_output(rf_path->gpio_tx_rx_n); gpio_output(rf_path->gpio_tx_rx_n);
gpio_output(rf_path->gpio_tx_rx); gpio_output(rf_path->gpio_tx_rx);
@ -318,12 +324,6 @@ void rf_path_pin_setup(rf_path_t* const rf_path)
gpio_output(rf_path->gpio_low_high_filt_n); gpio_output(rf_path->gpio_low_high_filt_n);
gpio_output(rf_path->gpio_tx_amp); gpio_output(rf_path->gpio_tx_amp);
gpio_output(rf_path->gpio_rx_lna); gpio_output(rf_path->gpio_rx_lna);
/*
* Safe (initial) switch settings turn off both amplifiers and antenna port
* power and enable both amp bypass and mixer bypass.
*/
switchctrl_set(rf_path, SWITCHCTRL_AMP_BYPASS | SWITCHCTRL_MIX_BYPASS);
#else #else
(void) rf_path; /* silence unused param warning */ (void) rf_path; /* silence unused param warning */
#endif #endif