diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a29e36f7..7b91fd2f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -98,7 +98,7 @@ jobs: run: | brew tap armmbed/formulae brew install arm-none-eabi-gcc dfu-util - pip install PyYAML + pip3 install PyYAML if: matrix.os == 'macos-latest' - name: Install dependencies (Ubuntu) diff --git a/firmware/blinky/blinky.c b/firmware/blinky/blinky.c index 631ce907..e26d5f83 100644 --- a/firmware/blinky/blinky.c +++ b/firmware/blinky/blinky.c @@ -1,5 +1,5 @@ /* - * Copyright 2010 - 2012 Michael Ossmann + * Copyright 2010-2017 Great Scott Gadgets * * This file is part of HackRF. * @@ -20,12 +20,14 @@ */ #include "hackrf_core.h" +#include "platform_detect.h" int main(void) { + detect_hardware_platform(); pin_setup(); - /* enable all power supplies */ + /* enable 1V8 power supply so that the 1V8 LED lights up */ enable_1v8_power(); /* Blink LED1/2/3 on the board. */ diff --git a/firmware/common/LPC4320_M4_memory.ld b/firmware/common/LPC4320_M4_memory.ld index 536db5eb..976e7855 100644 --- a/firmware/common/LPC4320_M4_memory.ld +++ b/firmware/common/LPC4320_M4_memory.ld @@ -1,5 +1,5 @@ /* - * Copyright 2012 Michael Ossmann + * Copyright 2012-2014 Great Scott Gadgets * Copyright 2012 Jared Boone * * This file is part of HackRF diff --git a/firmware/common/LPC4330_M4_memory.ld b/firmware/common/LPC4330_M4_memory.ld index b2f6b8e2..1e886d3a 100644 --- a/firmware/common/LPC4330_M4_memory.ld +++ b/firmware/common/LPC4330_M4_memory.ld @@ -1,5 +1,5 @@ /* - * Copyright 2012 Michael Ossmann + * Copyright 2012-2017 Great Scott Gadgets * Copyright 2012 Jared Boone * * This file is part of HackRF diff --git a/firmware/common/LPC43xx_M0_memory.ld b/firmware/common/LPC43xx_M0_memory.ld index ec2f646a..cbf04d5e 100644 --- a/firmware/common/LPC43xx_M0_memory.ld +++ b/firmware/common/LPC43xx_M0_memory.ld @@ -1,5 +1,5 @@ /* - * Copyright 2012 Michael Ossmann + * Copyright 2012-2014 Great Scott Gadgets * Copyright 2012 Jared Boone * * This file is part of HackRF diff --git a/firmware/common/LPC43xx_M4_M0_image_from_text.ld b/firmware/common/LPC43xx_M4_M0_image_from_text.ld index 38b5e769..a2dfed68 100644 --- a/firmware/common/LPC43xx_M4_M0_image_from_text.ld +++ b/firmware/common/LPC43xx_M4_M0_image_from_text.ld @@ -1,5 +1,5 @@ /* - * Copyright 2012 Michael Ossmann + * Copyright 2012-2021 Great Scott Gadgets * Copyright 2012 Jared Boone * * This file is part of HackRF diff --git a/firmware/common/LPC43xx_M4_memory.ld b/firmware/common/LPC43xx_M4_memory.ld index 85b9a6c4..b49e8cb9 100644 --- a/firmware/common/LPC43xx_M4_memory.ld +++ b/firmware/common/LPC43xx_M4_memory.ld @@ -1,5 +1,5 @@ /* - * Copyright 2012 Michael Ossmann + * Copyright 2012-2021 Great Scott Gadgets * Copyright 2012 Jared Boone * * This file is part of HackRF diff --git a/firmware/common/bitband.c b/firmware/common/bitband.c index aca7b9fb..fa632021 100644 --- a/firmware/common/bitband.c +++ b/firmware/common/bitband.c @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/bitband.h b/firmware/common/bitband.h index f25c42b5..dcf7aefb 100644 --- a/firmware/common/bitband.h +++ b/firmware/common/bitband.h @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/cpld_jtag.c b/firmware/common/cpld_jtag.c index 3c8f34cb..d80a99d4 100644 --- a/firmware/common/cpld_jtag.c +++ b/firmware/common/cpld_jtag.c @@ -1,5 +1,5 @@ /* - * Copyright 2013 Michael Ossmann + * Copyright 2013-2022 Great Scott Gadgets * * This file is part of HackRF. * diff --git a/firmware/common/cpld_jtag.h b/firmware/common/cpld_jtag.h index 165e8f77..39168ccc 100644 --- a/firmware/common/cpld_jtag.h +++ b/firmware/common/cpld_jtag.h @@ -1,5 +1,5 @@ /* - * Copyright 2013 Michael Ossmann + * Copyright 2013-2022 Great Scott Gadgets * * This file is part of HackRF. * diff --git a/firmware/common/cpld_xc2c.c b/firmware/common/cpld_xc2c.c index def620a6..58a5a6b6 100644 --- a/firmware/common/cpld_xc2c.c +++ b/firmware/common/cpld_xc2c.c @@ -1,4 +1,5 @@ /* + * Copyright 2019-2022 Great Scott Gadgets * Copyright 2019 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/cpld_xc2c.h b/firmware/common/cpld_xc2c.h index 6d6b1004..2e33967b 100644 --- a/firmware/common/cpld_xc2c.h +++ b/firmware/common/cpld_xc2c.h @@ -1,4 +1,5 @@ /* + * Copyright 2019-2022 Great Scott Gadgets * Copyright 2019 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/crc.c b/firmware/common/crc.c index 80b6ec60..9db7370a 100644 --- a/firmware/common/crc.c +++ b/firmware/common/crc.c @@ -1,4 +1,5 @@ /* + * Copyright 2019-2022 Great Scott Gadgets * Copyright 2019 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/crc.h b/firmware/common/crc.h index cf1c2b58..787b29a6 100644 --- a/firmware/common/crc.h +++ b/firmware/common/crc.h @@ -1,4 +1,5 @@ /* + * Copyright 2019-2022 Great Scott Gadgets * Copyright 2019 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/fault_handler.c b/firmware/common/fault_handler.c index 3b12290d..413ce8a8 100644 --- a/firmware/common/fault_handler.c +++ b/firmware/common/fault_handler.c @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux * diff --git a/firmware/common/fault_handler.h b/firmware/common/fault_handler.h index 002359ac..efccea24 100644 --- a/firmware/common/fault_handler.h +++ b/firmware/common/fault_handler.h @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/gpdma.c b/firmware/common/gpdma.c index 68bf07a0..ac51f432 100644 --- a/firmware/common/gpdma.c +++ b/firmware/common/gpdma.c @@ -1,4 +1,5 @@ /* + * Copyright 2013-2022 Great Scott Gadgets * Copyright 2013 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/gpdma.h b/firmware/common/gpdma.h index ac173da5..e14b0c41 100644 --- a/firmware/common/gpdma.h +++ b/firmware/common/gpdma.h @@ -1,4 +1,5 @@ /* + * Copyright 2013-2022 Great Scott Gadgets * Copyright 2013 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/gpio.h b/firmware/common/gpio.h index 5d3ee60f..868fc628 100644 --- a/firmware/common/gpio.h +++ b/firmware/common/gpio.h @@ -1,4 +1,5 @@ /* + * Copyright 2014-2022 Great Scott Gadgets * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc. * * This file is part of HackRF. diff --git a/firmware/common/gpio_lpc.c b/firmware/common/gpio_lpc.c index 303ebe02..d05b7fa8 100644 --- a/firmware/common/gpio_lpc.c +++ b/firmware/common/gpio_lpc.c @@ -1,4 +1,5 @@ /* + * Copyright 2014-2022 Great Scott Gadgets * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc. * * This file is part of HackRF. diff --git a/firmware/common/gpio_lpc.h b/firmware/common/gpio_lpc.h index d9193515..f51ffd2b 100644 --- a/firmware/common/gpio_lpc.h +++ b/firmware/common/gpio_lpc.h @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc. * * This file is part of HackRF. diff --git a/firmware/common/hackrf_core.c b/firmware/common/hackrf_core.c index 54e6a410..6fa850a6 100644 --- a/firmware/common/hackrf_core.c +++ b/firmware/common/hackrf_core.c @@ -1,5 +1,5 @@ /* - * Copyright 2012 Michael Ossmann + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux * @@ -303,11 +303,11 @@ void delay(uint32_t duration) void delay_us_at_mhz(uint32_t us, uint32_t mhz) { - // The loop below takes 4 cycles per iteration. - uint32_t loop_iterations = (us * mhz) / 4; + // The loop below takes 3 cycles per iteration. + uint32_t loop_iterations = (us * mhz) / 3; asm volatile("start%=:\n" " subs %[ITERATIONS], #1\n" // 1 cycle - " bpl start%=\n" // 3 cycles + " bpl start%=\n" // 2 cycles : : [ITERATIONS] "r"(loop_iterations)); } @@ -560,7 +560,7 @@ static void cpu_clock_pll1_max_speed(void) CGU_BASE_M4_CLK = reg_val; /* 9. Wait 50us. */ - delay_us_at_mhz(50, 104); + delay_us_at_mhz(50, 102); /* 10. Set the PLL1 P-divider to direct output mode (DIRECT=1). */ CGU_PLL1_CTRL |= CGU_PLL1_CTRL_DIRECT_MASK; diff --git a/firmware/common/hackrf_core.h b/firmware/common/hackrf_core.h index bff1513c..a32b2c9f 100644 --- a/firmware/common/hackrf_core.h +++ b/firmware/common/hackrf_core.h @@ -1,5 +1,5 @@ /* - * Copyright 2012 Michael Ossmann + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Benjamin Vernoux * Copyright 2012 Jared Boone * @@ -253,6 +253,7 @@ typedef enum { } clock_source_t; void delay(uint32_t duration); +void delay_us_at_mhz(uint32_t us, uint32_t mhz); /* TODO: Hide these configurations */ extern si5351c_driver_t clock_gen; diff --git a/firmware/common/hackrf_ui.c b/firmware/common/hackrf_ui.c index ce411cb8..df6db4fa 100644 --- a/firmware/common/hackrf_ui.c +++ b/firmware/common/hackrf_ui.c @@ -1,4 +1,5 @@ /* + * Copyright 2019-2022 Great Scott Gadgets * Copyright (C) 2019 Jared Boone, ShareBrained Technology, Inc. * * This file is part of HackRF. diff --git a/firmware/common/hackrf_ui.h b/firmware/common/hackrf_ui.h index ded1bb66..cc9a6fa6 100644 --- a/firmware/common/hackrf_ui.h +++ b/firmware/common/hackrf_ui.h @@ -1,4 +1,5 @@ /* + * Copyright 2018-2022 Great Scott Gadgets * Copyright (C) 2018 Jared Boone, ShareBrained Technology, Inc. * * This file is part of HackRF. diff --git a/firmware/common/i2c_bus.c b/firmware/common/i2c_bus.c index 517d8b43..6d8dcd25 100644 --- a/firmware/common/i2c_bus.c +++ b/firmware/common/i2c_bus.c @@ -1,4 +1,5 @@ /* + * Copyright 2014-2022 Great Scott Gadgets * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc. * * This file is part of HackRF. diff --git a/firmware/common/i2c_bus.h b/firmware/common/i2c_bus.h index 0eb936ca..7eb745c7 100644 --- a/firmware/common/i2c_bus.h +++ b/firmware/common/i2c_bus.h @@ -1,4 +1,5 @@ /* + * Copyright 2014-2022 Great Scott Gadgets * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc. * * This file is part of HackRF. diff --git a/firmware/common/i2c_lpc.c b/firmware/common/i2c_lpc.c index 7434417e..05631f05 100644 --- a/firmware/common/i2c_lpc.c +++ b/firmware/common/i2c_lpc.c @@ -1,5 +1,5 @@ /* - * Copyright 2012 Michael Ossmann + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/i2c_lpc.h b/firmware/common/i2c_lpc.h index 29cdce1e..db57282f 100644 --- a/firmware/common/i2c_lpc.h +++ b/firmware/common/i2c_lpc.h @@ -1,4 +1,5 @@ /* + * Copyright 2014-2022 Great Scott Gadgets * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc. * * This file is part of HackRF. diff --git a/firmware/common/m0_sleep.c b/firmware/common/m0_sleep.c index 97f31fa2..722c6f10 100644 --- a/firmware/common/m0_sleep.c +++ b/firmware/common/m0_sleep.c @@ -1,4 +1,5 @@ /* + * Copyright 2013-2022 Great Scott Gadgets * Copyright 2013 Jared Boone * * This file is part of HackRF. @@ -22,4 +23,4 @@ int main() { while (1) {} -} \ No newline at end of file +} diff --git a/firmware/common/max2837.c b/firmware/common/max2837.c index de8c2c8e..5fdc2ea4 100644 --- a/firmware/common/max2837.c +++ b/firmware/common/max2837.c @@ -1,5 +1,6 @@ /* - * Copyright 2012 Will Code? (TODO: Proper attribution) + * Copyright 2012-2022 Great Scott Gadgets + * Copyright 2012 Will Code * Copyright 2014 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/max2837.h b/firmware/common/max2837.h index 5571fd9b..25a78a15 100644 --- a/firmware/common/max2837.h +++ b/firmware/common/max2837.h @@ -1,5 +1,6 @@ /* - * Copyright 2012 Will Code? (TODO: Proper attribution) + * Copyright 2012-2022 Great Scott Gadgets + * Copyright 2012 Will Code * Copyright 2014 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/max2837_target.c b/firmware/common/max2837_target.c index b05edb96..29f692da 100644 --- a/firmware/common/max2837_target.c +++ b/firmware/common/max2837_target.c @@ -1,5 +1,6 @@ /* - * Copyright 2012 Will Code? (TODO: Proper attribution) + * Copyright 2012-2022 Great Scott Gadgets + * Copyright 2012 Will Code * Copyright 2014 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/max2837_target.h b/firmware/common/max2837_target.h index 0fc24ec9..75d87698 100644 --- a/firmware/common/max2837_target.h +++ b/firmware/common/max2837_target.h @@ -1,5 +1,6 @@ /* - * Copyright 2012 Will Code? (TODO: Proper attribution) + * Copyright 2012-2022 Great Scott Gadgets + * Copyright 2012 Will Code * Copyright 2014 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/max2871.c b/firmware/common/max2871.c index 46013568..11a0e0be 100644 --- a/firmware/common/max2871.c +++ b/firmware/common/max2871.c @@ -1,3 +1,24 @@ +/* + * Copyright 2015-2022 Great Scott Gadgets + * + * This file is part of HackRF. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + #include "max2871.h" #include "max2871_regs.h" diff --git a/firmware/common/max2871.h b/firmware/common/max2871.h index f84f5309..a11172bc 100644 --- a/firmware/common/max2871.h +++ b/firmware/common/max2871.h @@ -1,3 +1,24 @@ +/* + * Copyright 2017 Great Scott Gadgets + * + * This file is part of HackRF. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + #ifndef MAX2871_H #define MAX2871_H diff --git a/firmware/common/max2871_regs.c b/firmware/common/max2871_regs.c index d310edc9..9b42aab3 100644 --- a/firmware/common/max2871_regs.c +++ b/firmware/common/max2871_regs.c @@ -1,3 +1,24 @@ +/* + * Copyright 2015-2022 Great Scott Gadgets + * + * This file is part of HackRF. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + #include "max2871_regs.h" #include diff --git a/firmware/common/max2871_regs.h b/firmware/common/max2871_regs.h index ba172a5a..70ce8d99 100644 --- a/firmware/common/max2871_regs.h +++ b/firmware/common/max2871_regs.h @@ -1,3 +1,24 @@ +/* + * Copyright 2015-2022 Great Scott Gadgets + * + * This file is part of HackRF. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + #ifndef MAX2871_REGS_H #define MAX2871_REGS_H #include diff --git a/firmware/common/max5864.c b/firmware/common/max5864.c index 44b74e81..78a84661 100644 --- a/firmware/common/max5864.c +++ b/firmware/common/max5864.c @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/max5864.h b/firmware/common/max5864.h index aba4357d..a0602e50 100644 --- a/firmware/common/max5864.h +++ b/firmware/common/max5864.h @@ -1,4 +1,5 @@ /* + * Copyright 2012-2014 Great Scott Gadgets * Copyright 2012 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/max5864_target.c b/firmware/common/max5864_target.c index f8ba5844..d020ca6e 100644 --- a/firmware/common/max5864_target.c +++ b/firmware/common/max5864_target.c @@ -1,4 +1,5 @@ /* + * Copyright 2014-2022 Great Scott Gadgets * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc. * * This file is part of HackRF. diff --git a/firmware/common/max5864_target.h b/firmware/common/max5864_target.h index b0790b88..2ddd9ed1 100644 --- a/firmware/common/max5864_target.h +++ b/firmware/common/max5864_target.h @@ -1,4 +1,5 @@ /* + * Copyright 2014-2022 Great Scott Gadgets * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc. * * This file is part of HackRF. diff --git a/firmware/common/mixer.c b/firmware/common/mixer.c index 53a18933..9aa556bf 100644 --- a/firmware/common/mixer.c +++ b/firmware/common/mixer.c @@ -1,3 +1,24 @@ +/* + * Copyright 2017-2022 Great Scott Gadgets + * + * This file is part of HackRF. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + #include "mixer.h" #include "rffc5071.h" #include "rffc5071_spi.h" diff --git a/firmware/common/mixer.h b/firmware/common/mixer.h index cd972d79..fd7203c7 100644 --- a/firmware/common/mixer.h +++ b/firmware/common/mixer.h @@ -1,5 +1,5 @@ /* - * Copyright 2012 Michael Ossmann + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2014 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/operacake.c b/firmware/common/operacake.c index bbb70ef3..297f5099 100644 --- a/firmware/common/operacake.c +++ b/firmware/common/operacake.c @@ -1,4 +1,5 @@ /* + * Copyright 2016-2022 Great Scott Gadgets * Copyright 2016 Dominic Spill * * This file is part of HackRF. diff --git a/firmware/common/operacake.h b/firmware/common/operacake.h index afd424f5..8183cf2a 100644 --- a/firmware/common/operacake.h +++ b/firmware/common/operacake.h @@ -1,4 +1,5 @@ /* + * Copyright 2016-2022 Great Scott Gadgets * Copyright 2016 Dominic Spill * * This file is part of HackRF. diff --git a/firmware/common/operacake_sctimer.c b/firmware/common/operacake_sctimer.c index e9c2b02c..7d8af774 100644 --- a/firmware/common/operacake_sctimer.c +++ b/firmware/common/operacake_sctimer.c @@ -1,6 +1,6 @@ /* + * Copyright 2017-2022 Great Scott Gadgets * Copyright 2018 Schuyler St. Leger - * Copyright 2021 Great Scott Gadgets * * This file is part of HackRF. * diff --git a/firmware/common/operacake_sctimer.h b/firmware/common/operacake_sctimer.h index 10e6ba2f..6c5d0f61 100644 --- a/firmware/common/operacake_sctimer.h +++ b/firmware/common/operacake_sctimer.h @@ -1,7 +1,7 @@ /* + * Copyright 2016-2022 Great Scott Gadgets * Copyright 2016 Dominic Spill * Copyright 2018 Schuyler St. Leger - * Copyright 2021 Great Scott Gadgets * * This file is part of HackRF. * diff --git a/firmware/common/platform_detect.c b/firmware/common/platform_detect.c index 05c297b3..78f30d9d 100644 --- a/firmware/common/platform_detect.c +++ b/firmware/common/platform_detect.c @@ -1,5 +1,5 @@ /* - * Copyright 2022 Great Scott Gadgets + * Copyright 2022 Great Scott Gadgets * * This file is part of HackRF. * @@ -120,24 +120,29 @@ void detect_hardware_platform(void) gpio_input(&gpio2_9_on_P5_0); gpio_input(&gpio3_6_on_P6_10); - scu_pinmux(P5_0, SCU_GPIO_PUP | SCU_CONF_FUNCTION0); - scu_pinmux(P6_10, SCU_GPIO_PUP | SCU_CONF_FUNCTION0); - delay(20); - + /* activate internal pull-down */ scu_pinmux(P5_0, SCU_GPIO_PDN | SCU_CONF_FUNCTION0); scu_pinmux(P6_10, SCU_GPIO_PDN | SCU_CONF_FUNCTION0); - delay(20); + delay_us_at_mhz(4, 96); + /* tri-state for a moment before testing input */ + scu_pinmux(P5_0, SCU_GPIO_NOPULL | SCU_CONF_FUNCTION0); + scu_pinmux(P6_10, SCU_GPIO_NOPULL | SCU_CONF_FUNCTION0); + delay_us_at_mhz(4, 96); + /* if input rose quickly, there must be an external pull-up */ detected_resistors |= (gpio_read(&gpio2_9_on_P5_0)) ? P5_0_PUP : 0; detected_resistors |= (gpio_read(&gpio3_6_on_P6_10)) ? P6_10_PUP : 0; + /* activate internal pull-up */ scu_pinmux(P5_0, SCU_GPIO_PUP | SCU_CONF_FUNCTION0); scu_pinmux(P6_10, SCU_GPIO_PUP | SCU_CONF_FUNCTION0); - delay(20); - detected_resistors |= (gpio_read(&gpio2_9_on_P5_0)) ? 0 : P5_0_PDN; - detected_resistors |= (gpio_read(&gpio3_6_on_P6_10)) ? 0 : P6_10_PDN; - + delay_us_at_mhz(4, 96); + /* tri-state for a moment before testing input */ scu_pinmux(P5_0, SCU_GPIO_NOPULL | SCU_CONF_FUNCTION0); scu_pinmux(P6_10, SCU_GPIO_NOPULL | SCU_CONF_FUNCTION0); + delay_us_at_mhz(4, 96); + /* if input fell quickly, there must be an external pull-down */ + detected_resistors |= (gpio_read(&gpio2_9_on_P5_0)) ? 0 : P5_0_PDN; + detected_resistors |= (gpio_read(&gpio3_6_on_P6_10)) ? 0 : P6_10_PDN; switch (detected_resistors) { case JAWBREAKER_RESISTORS: diff --git a/firmware/common/platform_detect.h b/firmware/common/platform_detect.h index fbd4fcea..a24a158f 100644 --- a/firmware/common/platform_detect.h +++ b/firmware/common/platform_detect.h @@ -1,5 +1,5 @@ /* - * Copyright 2022 Great Scott Gadgets + * Copyright 2022-2022 Great Scott Gadgets * * This file is part of HackRF. * diff --git a/firmware/common/portapack.c b/firmware/common/portapack.c index 957056bd..3714f1d8 100644 --- a/firmware/common/portapack.c +++ b/firmware/common/portapack.c @@ -1,4 +1,5 @@ /* + * Copyright 2018-2022 Great Scott Gadgets * Copyright 2018 Jared Boone * * This file is part of HackRF. @@ -635,4 +636,4 @@ void portapack_init(void) } else { portapack_pointer = NULL; } -} \ No newline at end of file +} diff --git a/firmware/common/portapack.h b/firmware/common/portapack.h index 32927835..b24e75f1 100644 --- a/firmware/common/portapack.h +++ b/firmware/common/portapack.h @@ -1,4 +1,5 @@ /* + * Copyright 2018-2022 Great Scott Gadgets * Copyright 2018 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/rf_path.c b/firmware/common/rf_path.c index 4efb0ec7..3ca6fd75 100644 --- a/firmware/common/rf_path.c +++ b/firmware/common/rf_path.c @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux * diff --git a/firmware/common/rf_path.h b/firmware/common/rf_path.h index c9aec3b0..1f88efa3 100644 --- a/firmware/common/rf_path.h +++ b/firmware/common/rf_path.h @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux * diff --git a/firmware/common/rffc5071.c b/firmware/common/rffc5071.c index 5b36206d..ccd17b4b 100644 --- a/firmware/common/rffc5071.c +++ b/firmware/common/rffc5071.c @@ -1,5 +1,5 @@ /* - * Copyright 2012 Michael Ossmann + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2014 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/rffc5071.h b/firmware/common/rffc5071.h index cedb6988..aa30183f 100644 --- a/firmware/common/rffc5071.h +++ b/firmware/common/rffc5071.h @@ -1,5 +1,5 @@ /* - * Copyright 2012 Michael Ossmann + * Copyright 2012-2014 Great Scott Gadgets * Copyright 2014 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/rffc5071_spi.c b/firmware/common/rffc5071_spi.c index ec7e89bf..87871b68 100644 --- a/firmware/common/rffc5071_spi.c +++ b/firmware/common/rffc5071_spi.c @@ -1,5 +1,5 @@ /* - * Copyright 2012 Michael Ossmann + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2014 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/rffc5071_spi.h b/firmware/common/rffc5071_spi.h index 8a3475a0..fddf67d8 100644 --- a/firmware/common/rffc5071_spi.h +++ b/firmware/common/rffc5071_spi.h @@ -1,5 +1,5 @@ /* - * Copyright 2012 Michael Ossmann + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2014 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/rom_iap.c b/firmware/common/rom_iap.c index e72db977..c926359a 100644 --- a/firmware/common/rom_iap.c +++ b/firmware/common/rom_iap.c @@ -1,4 +1,5 @@ /* + * Copyright 2013-2022 Great Scott Gadgets * Copyright 2013 Benjamin Vernoux * * This file is part of HackRF. diff --git a/firmware/common/rom_iap.h b/firmware/common/rom_iap.h index 250d9d2c..171f2678 100644 --- a/firmware/common/rom_iap.h +++ b/firmware/common/rom_iap.h @@ -1,4 +1,5 @@ /* + * Copyright 2013-2022 Great Scott Gadgets * Copyright 2013 Benjamin Vernoux * * This file is part of HackRF. diff --git a/firmware/common/sct.h b/firmware/common/sct.h index 36d722a7..61c43199 100644 --- a/firmware/common/sct.h +++ b/firmware/common/sct.h @@ -1,3 +1,24 @@ +/* + * Copyright 2017-2022 Great Scott Gadgets + * + * This file is part of HackRF. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + #include #include diff --git a/firmware/common/sgpio.c b/firmware/common/sgpio.c index 8bd63e1a..8fd4a8ab 100644 --- a/firmware/common/sgpio.c +++ b/firmware/common/sgpio.c @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux * Copyright 2017 Schuyler St. Leger diff --git a/firmware/common/sgpio.h b/firmware/common/sgpio.h index b2ee0178..a1e10b59 100644 --- a/firmware/common/sgpio.h +++ b/firmware/common/sgpio.h @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/si5351c.c b/firmware/common/si5351c.c index 34d1c0a6..394a6dd5 100644 --- a/firmware/common/si5351c.c +++ b/firmware/common/si5351c.c @@ -1,5 +1,5 @@ /* - * Copyright 2012 Michael Ossmann + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/si5351c.h b/firmware/common/si5351c.h index 68292888..bacf7935 100644 --- a/firmware/common/si5351c.h +++ b/firmware/common/si5351c.h @@ -1,5 +1,5 @@ /* - * Copyright 2012 Michael Ossmann + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/spi_bus.c b/firmware/common/spi_bus.c index ab89b291..a26b4bab 100644 --- a/firmware/common/spi_bus.c +++ b/firmware/common/spi_bus.c @@ -1,4 +1,5 @@ /* + * Copyright 2014-2022 Great Scott Gadgets * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc. * * This file is part of HackRF. diff --git a/firmware/common/spi_bus.h b/firmware/common/spi_bus.h index f966012b..d24e2bbf 100644 --- a/firmware/common/spi_bus.h +++ b/firmware/common/spi_bus.h @@ -1,4 +1,5 @@ /* + * Copyright 2014-2022 Great Scott Gadgets * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc. * * This file is part of HackRF. diff --git a/firmware/common/spi_ssp.c b/firmware/common/spi_ssp.c index 6680e8e9..91e5bcc6 100644 --- a/firmware/common/spi_ssp.c +++ b/firmware/common/spi_ssp.c @@ -1,4 +1,5 @@ /* + * Copyright 2014-2022 Great Scott Gadgets * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc. * * This file is part of HackRF. diff --git a/firmware/common/spi_ssp.h b/firmware/common/spi_ssp.h index d9ca6719..02286317 100644 --- a/firmware/common/spi_ssp.h +++ b/firmware/common/spi_ssp.h @@ -1,4 +1,5 @@ /* + * Copyright 2014-2022 Great Scott Gadgets * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc. * * This file is part of HackRF. diff --git a/firmware/common/streaming.c b/firmware/common/streaming.c index 836df893..d984fe25 100644 --- a/firmware/common/streaming.c +++ b/firmware/common/streaming.c @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux * diff --git a/firmware/common/streaming.h b/firmware/common/streaming.h index 182e7abb..47f466c1 100644 --- a/firmware/common/streaming.h +++ b/firmware/common/streaming.h @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux * diff --git a/firmware/common/tuning.c b/firmware/common/tuning.c index 1a5c97a2..2739872f 100644 --- a/firmware/common/tuning.c +++ b/firmware/common/tuning.c @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux * diff --git a/firmware/common/tuning.h b/firmware/common/tuning.h index 6ae980f4..d199bb8e 100644 --- a/firmware/common/tuning.h +++ b/firmware/common/tuning.h @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux * diff --git a/firmware/common/ui_portapack.c b/firmware/common/ui_portapack.c index f9d6f7ff..9918157c 100644 --- a/firmware/common/ui_portapack.c +++ b/firmware/common/ui_portapack.c @@ -1,4 +1,5 @@ /* + * Copyright 2018-2022 Great Scott Gadgets * Copyright 2018 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/ui_portapack.h b/firmware/common/ui_portapack.h index dbb113c5..d712c895 100644 --- a/firmware/common/ui_portapack.h +++ b/firmware/common/ui_portapack.h @@ -1,4 +1,5 @@ /* + * Copyright 2018-2022 Great Scott Gadgets * Copyright 2018 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/ui_rad1o.c b/firmware/common/ui_rad1o.c index b4621837..3fc10d3d 100644 --- a/firmware/common/ui_rad1o.c +++ b/firmware/common/ui_rad1o.c @@ -1,4 +1,5 @@ /* + * Copyright 2019-2022 Great Scott Gadgets * Copyright 2019 Dominic Spill * * This file is part of HackRF. diff --git a/firmware/common/ui_rad1o.h b/firmware/common/ui_rad1o.h index d3c853f3..5b3e7421 100644 --- a/firmware/common/ui_rad1o.h +++ b/firmware/common/ui_rad1o.h @@ -1,4 +1,5 @@ /* + * Copyright 2019-2022 Great Scott Gadgets * Copyright 2019 Dominic Spill * * This file is part of HackRF. diff --git a/firmware/common/usb.c b/firmware/common/usb.c index 833f8538..60a2982a 100644 --- a/firmware/common/usb.c +++ b/firmware/common/usb.c @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/usb.h b/firmware/common/usb.h index 1a520973..96116453 100644 --- a/firmware/common/usb.h +++ b/firmware/common/usb.h @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/usb_queue.c b/firmware/common/usb_queue.c index a518eaef..5d19089e 100644 --- a/firmware/common/usb_queue.c +++ b/firmware/common/usb_queue.c @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Ben Gamari * diff --git a/firmware/common/usb_queue.h b/firmware/common/usb_queue.h index e96a4565..793db5e0 100644 --- a/firmware/common/usb_queue.h +++ b/firmware/common/usb_queue.h @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Ben Gamari * diff --git a/firmware/common/usb_request.c b/firmware/common/usb_request.c index fe86133d..9aa2f595 100644 --- a/firmware/common/usb_request.c +++ b/firmware/common/usb_request.c @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/usb_request.h b/firmware/common/usb_request.h index e6de9328..40d5013d 100644 --- a/firmware/common/usb_request.h +++ b/firmware/common/usb_request.h @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/usb_standard_request.c b/firmware/common/usb_standard_request.c index 6dbf74ef..9671f5bf 100644 --- a/firmware/common/usb_standard_request.c +++ b/firmware/common/usb_standard_request.c @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/usb_standard_request.h b/firmware/common/usb_standard_request.h index f79a06ac..f27d4292 100644 --- a/firmware/common/usb_standard_request.h +++ b/firmware/common/usb_standard_request.h @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/usb_type.h b/firmware/common/usb_type.h index 9dcdaa2a..77e0b4bc 100644 --- a/firmware/common/usb_type.h +++ b/firmware/common/usb_type.h @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * * This file is part of HackRF. diff --git a/firmware/common/w25q80bv.c b/firmware/common/w25q80bv.c index d6c236da..b29fa84a 100644 --- a/firmware/common/w25q80bv.c +++ b/firmware/common/w25q80bv.c @@ -1,5 +1,5 @@ /* - * Copyright 2013 Michael Ossmann + * Copyright 2013-2022 Great Scott Gadgets * Copyright 2013 Benjamin Vernoux * Copyright 2014 Jared Boone, ShareBrained Technology * diff --git a/firmware/common/w25q80bv.h b/firmware/common/w25q80bv.h index b3570685..c0d7cf10 100644 --- a/firmware/common/w25q80bv.h +++ b/firmware/common/w25q80bv.h @@ -1,5 +1,5 @@ /* - * Copyright 2013 Michael Ossmann + * Copyright 2013-2022 Great Scott Gadgets * Copyright 2013 Benjamin Vernoux * Copyright 2014 Jared Boone, ShareBrained Technology * diff --git a/firmware/common/w25q80bv_target.c b/firmware/common/w25q80bv_target.c index c9aef3fa..a83f5d98 100644 --- a/firmware/common/w25q80bv_target.c +++ b/firmware/common/w25q80bv_target.c @@ -1,4 +1,5 @@ /* + * Copyright 2014-2022 Great Scott Gadgets * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc. * * This file is part of HackRF. diff --git a/firmware/common/w25q80bv_target.h b/firmware/common/w25q80bv_target.h index c2889268..2fad7aa3 100644 --- a/firmware/common/w25q80bv_target.h +++ b/firmware/common/w25q80bv_target.h @@ -1,4 +1,5 @@ /* + * Copyright 2014-2022 Great Scott Gadgets * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc. * * This file is part of HackRF. diff --git a/firmware/hackrf-common.cmake b/firmware/hackrf-common.cmake index 7d6b2c7a..6d7b0b58 100644 --- a/firmware/hackrf-common.cmake +++ b/firmware/hackrf-common.cmake @@ -231,7 +231,7 @@ macro(DeclareTargets) COMMAND rm -f _tmp.dfu _header.bin COMMAND cp ${PROJECT_NAME}_dfu.bin _tmp.dfu COMMAND dfu-suffix --vid=0x1fc9 --pid=0x000c --did=0x0 -a _tmp.dfu - COMMAND python ${PATH_DFU_PY} ${PROJECT_NAME} + COMMAND python3 ${PATH_DFU_PY} ${PROJECT_NAME} COMMAND cat _header.bin _tmp.dfu >${PROJECT_NAME}.dfu COMMAND rm -f _tmp.dfu _header.bin ) diff --git a/firmware/hackrf_usb/hackrf_usb.c b/firmware/hackrf_usb/hackrf_usb.c index 38138f2c..acd8ba5d 100644 --- a/firmware/hackrf_usb/hackrf_usb.c +++ b/firmware/hackrf_usb/hackrf_usb.c @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux * diff --git a/firmware/hackrf_usb/sgpio_m0.s b/firmware/hackrf_usb/sgpio_m0.s index 960c9d6f..22d5b52f 100644 --- a/firmware/hackrf_usb/sgpio_m0.s +++ b/firmware/hackrf_usb/sgpio_m0.s @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 Great Scott Gadgets + * Copyright 2019-2022 Great Scott Gadgets * * This file is part of HackRF. * diff --git a/firmware/hackrf_usb/usb_api_board_info.c b/firmware/hackrf_usb/usb_api_board_info.c index 041fd370..5a8f1162 100644 --- a/firmware/hackrf_usb/usb_api_board_info.c +++ b/firmware/hackrf_usb/usb_api_board_info.c @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux * diff --git a/firmware/hackrf_usb/usb_api_board_info.h b/firmware/hackrf_usb/usb_api_board_info.h index ce52e599..663d25d8 100644 --- a/firmware/hackrf_usb/usb_api_board_info.h +++ b/firmware/hackrf_usb/usb_api_board_info.h @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux * diff --git a/firmware/hackrf_usb/usb_api_cpld.c b/firmware/hackrf_usb/usb_api_cpld.c index 611fe9c9..19748a24 100644 --- a/firmware/hackrf_usb/usb_api_cpld.c +++ b/firmware/hackrf_usb/usb_api_cpld.c @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux * diff --git a/firmware/hackrf_usb/usb_api_cpld.h b/firmware/hackrf_usb/usb_api_cpld.h index 7532a38e..dfbdcfe6 100644 --- a/firmware/hackrf_usb/usb_api_cpld.h +++ b/firmware/hackrf_usb/usb_api_cpld.h @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux * diff --git a/firmware/hackrf_usb/usb_api_m0_state.c b/firmware/hackrf_usb/usb_api_m0_state.c index 62aa6464..8c77bb73 100644 --- a/firmware/hackrf_usb/usb_api_m0_state.c +++ b/firmware/hackrf_usb/usb_api_m0_state.c @@ -1,5 +1,5 @@ /* - * Copyright 2022 Great Scott Gadgets + * Copyright 2022 Great Scott Gadgets * * This file is part of HackRF. * diff --git a/firmware/hackrf_usb/usb_api_m0_state.h b/firmware/hackrf_usb/usb_api_m0_state.h index 68a51d72..021ac65b 100644 --- a/firmware/hackrf_usb/usb_api_m0_state.h +++ b/firmware/hackrf_usb/usb_api_m0_state.h @@ -1,5 +1,5 @@ /* - * Copyright 2022 Great Scott Gadgets + * Copyright 2022 Great Scott Gadgets * * This file is part of HackRF. * diff --git a/firmware/hackrf_usb/usb_api_operacake.c b/firmware/hackrf_usb/usb_api_operacake.c index d01c70ed..81644ce1 100644 --- a/firmware/hackrf_usb/usb_api_operacake.c +++ b/firmware/hackrf_usb/usb_api_operacake.c @@ -1,4 +1,5 @@ /* + * Copyright 2016-2022 Great Scott Gadgets * Copyright 2016 Dominic Spill * * This file is part of HackRF. diff --git a/firmware/hackrf_usb/usb_api_operacake.h b/firmware/hackrf_usb/usb_api_operacake.h index f9524433..cc511bda 100644 --- a/firmware/hackrf_usb/usb_api_operacake.h +++ b/firmware/hackrf_usb/usb_api_operacake.h @@ -1,4 +1,5 @@ /* + * Copyright 2016-2022 Great Scott Gadgets * Copyright 2016 Dominic Spill * * This file is part of HackRF. diff --git a/firmware/hackrf_usb/usb_api_register.c b/firmware/hackrf_usb/usb_api_register.c index 728fef72..1a7484e9 100644 --- a/firmware/hackrf_usb/usb_api_register.c +++ b/firmware/hackrf_usb/usb_api_register.c @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux * diff --git a/firmware/hackrf_usb/usb_api_register.h b/firmware/hackrf_usb/usb_api_register.h index 61b1f54e..2ab6525e 100644 --- a/firmware/hackrf_usb/usb_api_register.h +++ b/firmware/hackrf_usb/usb_api_register.h @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux * diff --git a/firmware/hackrf_usb/usb_api_spiflash.c b/firmware/hackrf_usb/usb_api_spiflash.c index 80773660..5133fa0c 100644 --- a/firmware/hackrf_usb/usb_api_spiflash.c +++ b/firmware/hackrf_usb/usb_api_spiflash.c @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux * diff --git a/firmware/hackrf_usb/usb_api_spiflash.h b/firmware/hackrf_usb/usb_api_spiflash.h index c8976be4..cd46b4aa 100644 --- a/firmware/hackrf_usb/usb_api_spiflash.h +++ b/firmware/hackrf_usb/usb_api_spiflash.h @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux * diff --git a/firmware/hackrf_usb/usb_api_sweep.c b/firmware/hackrf_usb/usb_api_sweep.c index 12775d64..af58a85e 100644 --- a/firmware/hackrf_usb/usb_api_sweep.c +++ b/firmware/hackrf_usb/usb_api_sweep.c @@ -1,4 +1,5 @@ /* + * Copyright 2016-2022 Great Scott Gadgets * Copyright 2016 Mike Walters, Dominic Spill * * This file is part of HackRF. diff --git a/firmware/hackrf_usb/usb_api_sweep.h b/firmware/hackrf_usb/usb_api_sweep.h index 09e3a90b..afae5f72 100644 --- a/firmware/hackrf_usb/usb_api_sweep.h +++ b/firmware/hackrf_usb/usb_api_sweep.h @@ -1,4 +1,5 @@ /* + * Copyright 2016-2022 Great Scott Gadgets * Copyright 2016 Mike Walters, Dominic Spill * * This file is part of HackRF. diff --git a/firmware/hackrf_usb/usb_api_transceiver.c b/firmware/hackrf_usb/usb_api_transceiver.c index e1a63ca0..28958001 100644 --- a/firmware/hackrf_usb/usb_api_transceiver.c +++ b/firmware/hackrf_usb/usb_api_transceiver.c @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux * diff --git a/firmware/hackrf_usb/usb_api_transceiver.h b/firmware/hackrf_usb/usb_api_transceiver.h index 242e1ceb..3c9db650 100644 --- a/firmware/hackrf_usb/usb_api_transceiver.h +++ b/firmware/hackrf_usb/usb_api_transceiver.h @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux * diff --git a/firmware/hackrf_usb/usb_api_ui.c b/firmware/hackrf_usb/usb_api_ui.c index 5cb5ac81..5fe1becb 100644 --- a/firmware/hackrf_usb/usb_api_ui.c +++ b/firmware/hackrf_usb/usb_api_ui.c @@ -1,4 +1,5 @@ /* + * Copyright 2020-2022 Great Scott Gadgets * Copyright 2020 Mike Walters * * This file is part of HackRF. diff --git a/firmware/hackrf_usb/usb_api_ui.h b/firmware/hackrf_usb/usb_api_ui.h index c313cb83..f7f6996b 100644 --- a/firmware/hackrf_usb/usb_api_ui.h +++ b/firmware/hackrf_usb/usb_api_ui.h @@ -1,4 +1,5 @@ /* + * Copyright 2020-2022 Great Scott Gadgets * Copyright 2020 Mike Walters * * This file is part of HackRF. diff --git a/firmware/hackrf_usb/usb_bulk_buffer.h b/firmware/hackrf_usb/usb_bulk_buffer.h index f87ce9c3..3e284143 100644 --- a/firmware/hackrf_usb/usb_bulk_buffer.h +++ b/firmware/hackrf_usb/usb_bulk_buffer.h @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux * diff --git a/firmware/hackrf_usb/usb_descriptor.c b/firmware/hackrf_usb/usb_descriptor.c index 4aabeaeb..7d18e4f6 100644 --- a/firmware/hackrf_usb/usb_descriptor.c +++ b/firmware/hackrf_usb/usb_descriptor.c @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * * This file is part of HackRF. diff --git a/firmware/hackrf_usb/usb_descriptor.h b/firmware/hackrf_usb/usb_descriptor.h index 4a63a640..2c2990e0 100644 --- a/firmware/hackrf_usb/usb_descriptor.h +++ b/firmware/hackrf_usb/usb_descriptor.h @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * * This file is part of HackRF. diff --git a/firmware/hackrf_usb/usb_device.c b/firmware/hackrf_usb/usb_device.c index 798f8d9a..b689ce9f 100644 --- a/firmware/hackrf_usb/usb_device.c +++ b/firmware/hackrf_usb/usb_device.c @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux * diff --git a/firmware/hackrf_usb/usb_device.h b/firmware/hackrf_usb/usb_device.h index 8efada7d..05008dca 100644 --- a/firmware/hackrf_usb/usb_device.h +++ b/firmware/hackrf_usb/usb_device.h @@ -1,4 +1,5 @@ /* + * Copyright 2012-2013 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux * diff --git a/firmware/hackrf_usb/usb_endpoint.c b/firmware/hackrf_usb/usb_endpoint.c index 8094aefc..02832708 100644 --- a/firmware/hackrf_usb/usb_endpoint.c +++ b/firmware/hackrf_usb/usb_endpoint.c @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux * diff --git a/firmware/hackrf_usb/usb_endpoint.h b/firmware/hackrf_usb/usb_endpoint.h index bed1d3ce..7a594cd5 100644 --- a/firmware/hackrf_usb/usb_endpoint.h +++ b/firmware/hackrf_usb/usb_endpoint.h @@ -1,4 +1,5 @@ /* + * Copyright 2012-2013 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux * diff --git a/firmware/libopencm3 b/firmware/libopencm3 index 6cc98dcd..55021bff 160000 --- a/firmware/libopencm3 +++ b/firmware/libopencm3 @@ -1 +1 @@ -Subproject commit 6cc98dcd36653cd528c55a593c4989b8530b6b50 +Subproject commit 55021bff2bc94755059091177f2976e77b1dd7a1 diff --git a/host/hackrf-tools/src/hackrf_clock.c b/host/hackrf-tools/src/hackrf_clock.c index bf996890..5e070d13 100644 --- a/host/hackrf-tools/src/hackrf_clock.c +++ b/host/hackrf-tools/src/hackrf_clock.c @@ -1,4 +1,5 @@ /* + * Copyright 2017-2022 Great Scott Gadgets * Copyright 2017 Dominic Spill * * This file is part of HackRF. diff --git a/host/hackrf-tools/src/hackrf_cpldjtag.c b/host/hackrf-tools/src/hackrf_cpldjtag.c index 414fdbb9..69293e26 100644 --- a/host/hackrf-tools/src/hackrf_cpldjtag.c +++ b/host/hackrf-tools/src/hackrf_cpldjtag.c @@ -1,7 +1,7 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux - * Copyright 2013 Michael Ossmann * * This file is part of HackRF. * diff --git a/host/hackrf-tools/src/hackrf_debug.c b/host/hackrf-tools/src/hackrf_debug.c index bf3177cc..dc25d4e5 100644 --- a/host/hackrf-tools/src/hackrf_debug.c +++ b/host/hackrf-tools/src/hackrf_debug.c @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux * Copyright 2017 Dominic Spill diff --git a/host/hackrf-tools/src/hackrf_info.c b/host/hackrf-tools/src/hackrf_info.c index 278e8885..68c95938 100644 --- a/host/hackrf-tools/src/hackrf_info.c +++ b/host/hackrf-tools/src/hackrf_info.c @@ -1,7 +1,7 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux - * Copyright 2013 Michael Ossmann * * This file is part of HackRF. * diff --git a/host/hackrf-tools/src/hackrf_operacake.c b/host/hackrf-tools/src/hackrf_operacake.c index 2c668121..46525468 100644 --- a/host/hackrf-tools/src/hackrf_operacake.c +++ b/host/hackrf-tools/src/hackrf_operacake.c @@ -1,4 +1,5 @@ /* + * Copyright 2016-2022 Great Scott Gadgets * Copyright 2016 Dominic Spill * * This file is part of HackRF. @@ -46,15 +47,15 @@ static void usage() printf("\nUsage:\n"); printf("\t-h, --help: this help\n"); printf("\t-d, --device : specify a particular device by serial number\n"); - printf("\t-o, --address : specify a particular operacake by address [default: 0]\n"); + printf("\t-o, --address : specify a particular Opera Cake by address [default: 0]\n"); printf("\t-m, --mode : specify switching mode [options: manual, frequency, time]\n"); - printf("\t-a : set port A connection\n"); - printf("\t-b : set port B connection\n"); - printf("\t-f : automatically assign for range in MHz\n"); - printf("\t-t : in time-switching mode, dwell on for samples. Specify only to use the default dwell time (with -w). This argument can be repeated to specify a list of ports.\n"); - printf("\t-w : set default dwell time for time-switching mode\n"); - printf("\t-l, --list: list available operacake boards\n"); - printf("\t-g, --gpio_test: test GPIO functionality of an opera cake\n"); + printf("\t-a : set port connected to port A0\n"); + printf("\t-b : set port connected to port B0\n"); + printf("\t-f : automatically assign for range in MHz. This argument can be repeated to specify a list of ports.\n"); + printf("\t-t : in time mode, dwell on for samples. Specify only to use the default dwell time (with -w). This argument can be repeated to specify a list of ports.\n"); + printf("\t-w : set default dwell time in samples for time mode\n"); + printf("\t-l, --list: list available Opera Cake boards\n"); + printf("\t-g, --gpio_test: test GPIO functionality of an Opera Cake\n"); } static struct option long_options[] = { @@ -412,8 +413,8 @@ int main(int argc, char** argv) } if (test_result == GPIO_TEST_DISABLED) { - fprintf(stderr, "GPIO mode diabled.\n"); - fprintf(stderr, "Remove additional addon boards and retry.\n"); + fprintf(stderr, "GPIO mode disabled.\n"); + fprintf(stderr, "Remove additional add-on boards and retry.\n"); } else if (test_result) { fprintf(stderr, "GPIO test failed\n"); fprintf(stderr, "Pin\tHigh\tShorts\tLow\n"); diff --git a/host/hackrf-tools/src/hackrf_spiflash.c b/host/hackrf-tools/src/hackrf_spiflash.c index 7a20edeb..00f85b60 100644 --- a/host/hackrf-tools/src/hackrf_spiflash.c +++ b/host/hackrf-tools/src/hackrf_spiflash.c @@ -1,7 +1,7 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013 Benjamin Vernoux - * Copyright 2013 Michael Ossmann * * This file is part of HackRF. * diff --git a/host/hackrf-tools/src/hackrf_sweep.c b/host/hackrf-tools/src/hackrf_sweep.c index eb688cb2..a38675a1 100644 --- a/host/hackrf-tools/src/hackrf_sweep.c +++ b/host/hackrf-tools/src/hackrf_sweep.c @@ -1,7 +1,7 @@ /* + * Copyright 2016-2022 Great Scott Gadgets * Copyright 2016 Dominic Spill * Copyright 2016 Mike Walters - * Copyright 2017 Michael Ossmann * * This file is part of HackRF. * diff --git a/host/hackrf-tools/src/hackrf_transfer.c b/host/hackrf-tools/src/hackrf_transfer.c index ec4e67a2..a2ad9ccc 100644 --- a/host/hackrf-tools/src/hackrf_transfer.c +++ b/host/hackrf-tools/src/hackrf_transfer.c @@ -1,4 +1,5 @@ /* + * Copyright 2012-2022 Great Scott Gadgets * Copyright 2012 Jared Boone * Copyright 2013-2014 Benjamin Vernoux * @@ -1198,7 +1199,7 @@ int main(int argc, char** argv) if (baseband_filter_bw) { fprintf(stderr, - "call hackrf_baseband_filter_bandwidth_set(%d Hz/%.03f MHz)\n", + "call hackrf_set_baseband_filter_bandwidth(%d Hz/%.03f MHz)\n", baseband_filter_bw_hz, ((float) baseband_filter_bw_hz / (float) FREQ_ONE_MHZ)); result = hackrf_set_baseband_filter_bandwidth( @@ -1206,7 +1207,7 @@ int main(int argc, char** argv) baseband_filter_bw_hz); if (result != HACKRF_SUCCESS) { fprintf(stderr, - "hackrf_baseband_filter_bandwidth_set() failed: %s (%d)\n", + "hackrf_set_baseband_filter_bandwidth() failed: %s (%d)\n", hackrf_error_name(result), result); usage(); diff --git a/host/libhackrf/src/hackrf.c b/host/libhackrf/src/hackrf.c index 46385ebf..f9394914 100644 --- a/host/libhackrf/src/hackrf.c +++ b/host/libhackrf/src/hackrf.c @@ -1,7 +1,7 @@ /* +Copyright (c) 2012-2022 Great Scott Gadgets Copyright (c) 2012, Jared Boone Copyright (c) 2013, Benjamin Vernoux -Copyright (c) 2013, Michael Ossmann All rights reserved. diff --git a/host/libhackrf/src/hackrf.h b/host/libhackrf/src/hackrf.h index 79f140f7..3bfc128f 100644 --- a/host/libhackrf/src/hackrf.h +++ b/host/libhackrf/src/hackrf.h @@ -1,7 +1,7 @@ /* +Copyright (c) 2012-2022 Great Scott Gadgets Copyright (c) 2012, Jared Boone Copyright (c) 2013, Benjamin Vernoux -Copyright (c) 2013, Michael Ossmann All rights reserved.