diff --git a/firmware/common/hackrf_core.c b/firmware/common/hackrf_core.c index f42cb2a4..1c05e221 100644 --- a/firmware/common/hackrf_core.c +++ b/firmware/common/hackrf_core.c @@ -99,7 +99,7 @@ static struct gpio_t gpio_rx_amp = GPIO(1, 11); static struct gpio_t gpio_no_rx_amp_pwr = GPIO(1, 12); #endif #ifdef RAD1O -static struct gpio_t gpio_tx_rx_n = GPIO(0, 11); +static struct gpio_t gpio_tx_rx_n = GPIO(1, 11); static struct gpio_t gpio_tx_rx = GPIO(0, 14); static struct gpio_t gpio_by_mix = GPIO(1, 12); static struct gpio_t gpio_by_mix_n = GPIO(2, 10); @@ -648,12 +648,6 @@ void cpu_clock_init(void) // CCU2_CLK_APLL_CFG = 0; // CCU2_CLK_SDIO_CFG = 0; #endif - -#ifdef RAD1O - /* Disable unused clock outputs. They generate noise. */ - scu_pinmux(CLK0, SCU_CLK_IN | SCU_CONF_FUNCTION7); - scu_pinmux(CLK2, SCU_CLK_IN | SCU_CONF_FUNCTION7); -#endif } @@ -816,6 +810,10 @@ void pin_setup(void) { /* Safe state: start with VAA turned off: */ disable_rf_power(); + /* Disable unused clock outputs. They generate noise. */ + scu_pinmux(CLK0, SCU_CLK_IN | SCU_CONF_FUNCTION7); + scu_pinmux(CLK2, SCU_CLK_IN | SCU_CONF_FUNCTION7); + scu_pinmux(SCU_PINMUX_GPIO3_10, SCU_GPIO_PDN | SCU_CONF_FUNCTION0); scu_pinmux(SCU_PINMUX_GPIO3_11, SCU_GPIO_PDN | SCU_CONF_FUNCTION0); diff --git a/firmware/common/mixer.c b/firmware/common/mixer.c index 93467327..5db296bf 100644 --- a/firmware/common/mixer.c +++ b/firmware/common/mixer.c @@ -118,7 +118,7 @@ void mixer_enable(mixer_driver_t* const mixer) rffc5071_enable(mixer); #endif #ifdef RAD1O - (void) mixer; + max2871_enable(mixer); #endif } @@ -128,7 +128,7 @@ void mixer_disable(mixer_driver_t* const mixer) rffc5071_disable(mixer); #endif #ifdef RAD1O - (void) mixer; + max2871_disable(mixer); #endif }