From 4db7e8d38a6bb02b6c720aa119c5c9c9b70a6f54 Mon Sep 17 00:00:00 2001 From: Michael Ossmann Date: Mon, 19 Sep 2022 11:54:07 -0400 Subject: [PATCH] h1r9: more bring-up fixes --- firmware/common/max2839.c | 4 ++-- firmware/common/rf_path.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/firmware/common/max2839.c b/firmware/common/max2839.c index 10f5461c..26fef0f7 100644 --- a/firmware/common/max2839.c +++ b/firmware/common/max2839.c @@ -324,7 +324,7 @@ bool max2839_set_lna_gain(max2839_driver_t* const drv, const uint32_t gain_db) { return false; } set_MAX2839_LNA2gain(drv, val); - max2839_reg_commit(drv, 5); + max2839_reg_commit(drv, 6); return true; } @@ -334,7 +334,7 @@ bool max2839_set_vga_gain(max2839_driver_t* const drv, const uint32_t gain_db) { } set_MAX2839_Rx2_VGAgain(drv, (63-gain_db)); - max2839_reg_commit(drv, 5); + max2839_reg_commit(drv, 6); return true; } diff --git a/firmware/common/rf_path.c b/firmware/common/rf_path.c index 44ab6947..fc04569e 100644 --- a/firmware/common/rf_path.c +++ b/firmware/common/rf_path.c @@ -97,7 +97,7 @@ */ #ifdef HACKRF_ONE -static struct gpio_t gpio_h1r9_no_ant_pwr = GPIO(2, 4); //FIXME max2837_tx_enable conflict +static struct gpio_t gpio_h1r9_no_ant_pwr = GPIO(2, 4); #endif #ifdef HACKRF_ONE @@ -282,7 +282,6 @@ void rf_path_pin_setup(rf_path_t* const rf_path) scu_pinmux(SCU_NO_MIX_BYPASS, SCU_GPIO_FAST | SCU_CONF_FUNCTION0); scu_pinmux(SCU_RX_MIX_BP, SCU_GPIO_FAST | SCU_CONF_FUNCTION0); scu_pinmux(SCU_TX_AMP, SCU_GPIO_FAST | SCU_CONF_FUNCTION0); - scu_pinmux(SCU_TX, SCU_GPIO_FAST | SCU_CONF_FUNCTION4); scu_pinmux(SCU_MIX_BYPASS, SCU_GPIO_FAST | SCU_CONF_FUNCTION4); scu_pinmux(SCU_NO_TX_AMP_PWR, SCU_GPIO_FAST | SCU_CONF_FUNCTION0); scu_pinmux(SCU_AMP_BYPASS, SCU_GPIO_FAST | SCU_CONF_FUNCTION0); @@ -295,8 +294,10 @@ void rf_path_pin_setup(rf_path_t* const rf_path) gpio_clear(&gpio_h1r9_no_ant_pwr); gpio_output(&gpio_h1r9_no_ant_pwr); } else { + scu_pinmux(SCU_TX, SCU_GPIO_FAST | SCU_CONF_FUNCTION4); scu_pinmux(SCU_RX, SCU_GPIO_FAST | SCU_CONF_FUNCTION4); scu_pinmux(SCU_NO_RX_AMP_PWR, SCU_GPIO_FAST | SCU_CONF_FUNCTION0); + gpio_output(rf_path->gpio_tx); } /* Configure RF power supply (VAA) switch */ @@ -319,7 +320,6 @@ void rf_path_pin_setup(rf_path_t* const rf_path) gpio_output(rf_path->gpio_rx_mix_bp); gpio_output(rf_path->gpio_tx_amp); gpio_output(rf_path->gpio_no_tx_amp_pwr); - gpio_output(rf_path->gpio_tx); gpio_output(rf_path->gpio_mix_bypass); gpio_output(rf_path->gpio_rx); #elif RAD1O