Merge pull request #312 from dominicgs/travis-ci

Jawbreaker firmware builds with travis-ci
This commit is contained in:
Michael Ossmann
2017-01-27 15:34:37 -07:00
committed by GitHub
4 changed files with 17 additions and 8 deletions

View File

@ -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:

View File

@ -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 = {

View File

@ -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
}