From 03e472e45880059835a1f961314dd582ff75985c Mon Sep 17 00:00:00 2001 From: schneider Date: Sat, 5 Aug 2017 06:01:07 +0200 Subject: [PATCH 1/3] fix(rad1o): Disable the VCO if the mixer is not in use --- firmware/common/mixer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 } From 4b0bb0ea5557cef92961be0756716fd2078e4f14 Mon Sep 17 00:00:00 2001 From: schneider Date: Sat, 5 Aug 2017 06:04:08 +0200 Subject: [PATCH 2/3] refact(rad1o): Disable the CPU clock outputs in pin_setup() --- firmware/common/hackrf_core.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/firmware/common/hackrf_core.c b/firmware/common/hackrf_core.c index f42cb2a4..3e9dc57e 100644 --- a/firmware/common/hackrf_core.c +++ b/firmware/common/hackrf_core.c @@ -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); From 1acd7ccf7ca39b00d4134a40ab2598cfb43903b1 Mon Sep 17 00:00:00 2001 From: schneider Date: Sat, 5 Aug 2017 06:05:31 +0200 Subject: [PATCH 3/3] fix(rad1o): TX_RX_N is on GPIO1_11 --- firmware/common/hackrf_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/common/hackrf_core.c b/firmware/common/hackrf_core.c index 3e9dc57e..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);