From 6aece95e9854d9d6669ab4976bdb234934c0ef78 Mon Sep 17 00:00:00 2001 From: Silvano Seva Date: Sat, 27 Nov 2021 08:23:59 +0100 Subject: [PATCH] Fixed license header --- platform/drivers/audio/audio_Mod17.c | 16 ++------- platform/drivers/baseband/radio_Mod17.cpp | 21 +++--------- platform/targets/Module17/hwconfig.h | 40 +++++++++-------------- 3 files changed, 23 insertions(+), 54 deletions(-) diff --git a/platform/drivers/audio/audio_Mod17.c b/platform/drivers/audio/audio_Mod17.c index fff59869..38ad4056 100644 --- a/platform/drivers/audio/audio_Mod17.c +++ b/platform/drivers/audio/audio_Mod17.c @@ -14,16 +14,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * - * As a special exception, if other files instantiate templates or use * - * macros or inline functions from this file, or you compile this file * - * and link it with other works to produce a work based on this file, * - * this file does not by itself cause the resulting work to be covered * - * by the GNU General Public License. However the source code for this * - * file must still be made available in accordance with the GNU General * - * Public License. This exception does not invalidate any other reasons * - * why a work based on this file might be covered by the GNU General * - * Public License. * - * * * You should have received a copy of the GNU General Public License * * along with this program; if not, see * ***************************************************************************/ @@ -39,9 +29,9 @@ void audio_init() gpio_setMode(MIC_MUTE, OUTPUT); gpio_setMode(MIC_GAIN, OUTPUT); - gpio_setPin(SPK_MUTE); //Off = logic high - gpio_clearPin(MIC_MUTE); //Off = logic low - gpio_setPin(MIC_GAIN); // gain = 40 dB + gpio_setPin(SPK_MUTE); // Off = logic high + gpio_clearPin(MIC_MUTE); // Off = logic low + gpio_setPin(MIC_GAIN); // gain = 40 dB } void audio_terminate() diff --git a/platform/drivers/baseband/radio_Mod17.cpp b/platform/drivers/baseband/radio_Mod17.cpp index edeb91e7..4b68471a 100644 --- a/platform/drivers/baseband/radio_Mod17.cpp +++ b/platform/drivers/baseband/radio_Mod17.cpp @@ -14,16 +14,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * - * As a special exception, if other files instantiate templates or use * - * macros or inline functions from this file, or you compile this file * - * and link it with other works to produce a work based on this file, * - * this file does not by itself cause the resulting work to be covered * - * by the GNU General Public License. However the source code for this * - * file must still be made available in accordance with the GNU General * - * Public License. This exception does not invalidate any other reasons * - * why a work based on this file might be covered by the GNU General * - * Public License. * - * * * You should have received a copy of the GNU General Public License * * along with this program; if not, see * ***************************************************************************/ @@ -64,14 +54,14 @@ bool radio_checkRxDigitalSquelch() void radio_enableRx() { - radioStatus = RX; - gpio_clearPin(PTT_OUT); + radioStatus = RX; + gpio_clearPin(PTT_OUT); } void radio_enableTx() { - radioStatus = TX; - gpio_setPin(PTT_OUT); + radioStatus = TX; + gpio_setPin(PTT_OUT); } void radio_disableRtx() @@ -81,8 +71,7 @@ void radio_disableRtx() void radio_updateConfiguration() { - if(radioStatus == RX) radio_enableRx(); - if(radioStatus == TX) radio_enableTx(); + } float radio_getRssi() diff --git a/platform/targets/Module17/hwconfig.h b/platform/targets/Module17/hwconfig.h index 203224ea..ec65f34a 100644 --- a/platform/targets/Module17/hwconfig.h +++ b/platform/targets/Module17/hwconfig.h @@ -15,16 +15,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * - * As a special exception, if other files instantiate templates or use * - * macros or inline functions from this file, or you compile this file * - * and link it with other works to produce a work based on this file, * - * this file does not by itself cause the resulting work to be covered * - * by the GNU General Public License. However the source code for this * - * file must still be made available in accordance with the GNU General * - * Public License. This exception does not invalidate any other reasons * - * why a work based on this file might be covered by the GNU General * - * Public License. * - * * * You should have received a copy of the GNU General Public License * * along with this program; if not, see * ***************************************************************************/ @@ -60,29 +50,29 @@ #define LCD_RST GPIOC,7 #define LCD_RS GPIOC,6 #define LCD_CS GPIOB,14 -//#define LCD_BKLIGHT GPIOE,15 #define SPI2_CLK GPIOB,13 -#define SPI2_SDO GPIOB,9 //UNUSED +#define SPI2_SDO GPIOB,9 // UNUSED #define SPI2_SDI GPIOB,15 +//#define LCD_BKLIGHT GPIOE,15 /* Keyboard */ -#define ESC_SW GPIOB,8 -#define RIGHT_SW GPIOB,11 -#define UP_SW GPIOB,10 -#define DOWN_SW GPIOC,2 -#define LEFT_SW GPIOC,3 -#define ENTER_SW GPIOB,12 +#define ESC_SW GPIOB,8 +#define RIGHT_SW GPIOB,11 +#define UP_SW GPIOB,10 +#define DOWN_SW GPIOC,2 +#define LEFT_SW GPIOC,3 +#define ENTER_SW GPIOB,12 -#define PTT_SW GPIOC,13 -#define PTT_OUT GPIOD,2 +#define PTT_SW GPIOC,13 +#define PTT_OUT GPIOD,2 /* Audio */ -#define AUDIO_MIC GPIOA,2 -#define AUDIO_SPK GPIOA,5 +#define AUDIO_MIC GPIOA,2 +#define AUDIO_SPK GPIOA,5 #define BASEBAND_RX GPIOA,1 #define BASEBAND_TX GPIOA,4 -#define SPK_MUTE GPIOB,1 -#define MIC_MUTE GPIOC,4 -#define MIC_GAIN GPIOC,5 +#define SPK_MUTE GPIOB,1 +#define MIC_MUTE GPIOC,4 +#define MIC_GAIN GPIOC,5 #endif