From 63db12053dc06936139837ac4a1efe0788cc04b9 Mon Sep 17 00:00:00 2001 From: Dominic Spill Date: Fri, 27 Jan 2017 12:11:55 -0700 Subject: [PATCH 1/3] Jawbreaker firmware builds --- .travis.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 790f33f3..8476bf27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,13 +34,17 @@ script: - cd host/build - cmake .. - make - - cd ../../firmware/libopencm3 + - cd ../.. + - mkdir firmware/build-hackrf-one + - mkdir firmware/build-jawbreaker + - cd firmware/libopencm3 - make - - cd .. - - mkdir build - - cd build + - cd ../build-hackrf-one - cmake .. - make + - cd ../build-jawbreaker + - cmake -DBOARD=JAWBREAKER .. + - make addons: apt: From cb06ce965636ec1612c1e655da98a367f87f0065 Mon Sep 17 00:00:00 2001 From: Dominic Spill Date: Fri, 27 Jan 2017 12:24:19 -0700 Subject: [PATCH 2/3] ifdef out HackRF One rf path pins for jawbreaker build --- firmware/common/hackrf_core.c | 8 +++++--- firmware/common/rf_path.c | 3 +++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/firmware/common/hackrf_core.c b/firmware/common/hackrf_core.c index 6212c974..d71b9f53 100644 --- a/firmware/common/hackrf_core.c +++ b/firmware/common/hackrf_core.c @@ -99,9 +99,9 @@ static struct gpio_t gpio_sync_out_b = GPIO(3, 9); #endif /* RF LDO control */ -#ifdef JAWBREAKER -static struct gpio_t gpio_rf_ldo_enable = GPIO(2, 9); -#endif +// #ifdef JAWBREAKER +// static struct gpio_t gpio_rf_ldo_enable = GPIO(2, 9); +// #endif /* RF supply (VAA) control */ #ifdef HACKRF_ONE @@ -297,6 +297,7 @@ sgpio_config_t sgpio_config = { rf_path_t rf_path = { .switchctrl = 0, +#ifdef HACKRF_ONE .gpio_hp = &gpio_hp, .gpio_lp = &gpio_lp, .gpio_tx_mix_bp = &gpio_tx_mix_bp, @@ -310,6 +311,7 @@ rf_path_t rf_path = { .gpio_amp_bypass = &gpio_amp_bypass, .gpio_rx_amp = &gpio_rx_amp, .gpio_no_rx_amp_pwr = &gpio_no_rx_amp_pwr, +#endif }; jtag_gpio_t jtag_gpio_cpld = { diff --git a/firmware/common/rf_path.c b/firmware/common/rf_path.c index 7db1101a..78860936 100644 --- a/firmware/common/rf_path.c +++ b/firmware/common/rf_path.c @@ -157,6 +157,7 @@ static void switchctrl_set_hackrf_one(rf_path_t* const rf_path, uint8_t ctrl) { static void switchctrl_set(rf_path_t* const rf_path, const uint8_t gpo) { #ifdef JAWBREAKER + (void) rf_path; /* silence unused param warning */ rffc5071_set_gpo(&rffc5072, gpo); #elif HACKRF_ONE switchctrl_set_hackrf_one(rf_path, gpo); @@ -205,6 +206,8 @@ void rf_path_pin_setup(rf_path_t* const rf_path) { * power and enable both amp bypass and mixer bypass. */ switchctrl_set(rf_path, SWITCHCTRL_AMP_BYPASS | SWITCHCTRL_MIX_BYPASS); +#else + (void) rf_path; /* silence unused param warning */ #endif } From 7584fd211e18b2f9c04cb87d6a81ee4c77d6e592 Mon Sep 17 00:00:00 2001 From: Dominic Spill Date: Fri, 27 Jan 2017 15:26:37 -0700 Subject: [PATCH 3/3] Update submodule to include watchdog reset changes --- firmware/libopencm3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/libopencm3 b/firmware/libopencm3 index 0ca89139..d3d6f3e7 160000 --- a/firmware/libopencm3 +++ b/firmware/libopencm3 @@ -1 +1 @@ -Subproject commit 0ca89139446586e743b842fb1074db0f2173f6dd +Subproject commit d3d6f3e74b34593d1b56175abe5b4cb72da4ec9d