From 4df85d1047f9afb122964a286507f2b937d338ea Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 1 Aug 2016 18:50:42 +0200 Subject: [PATCH] Cosmetics --- radio/src/gui/128x64/menu_radio.cpp | 2 +- radio/src/gui/128x64/menus.cpp | 2 +- radio/src/gui/128x64/model_curves.cpp | 2 +- radio/src/gui/128x64/model_flightmodes.cpp | 2 +- radio/src/gui/128x64/model_inputs_mixes.cpp | 2 +- .../src/gui/128x64/model_logical_switches.cpp | 2 +- radio/src/gui/128x64/model_outputs.cpp | 2 +- radio/src/gui/128x64/model_select.cpp | 2 +- radio/src/gui/128x64/model_templates.cpp | 2 +- radio/src/gui/128x64/radio_diaganas.cpp | 2 +- radio/src/gui/128x64/radio_diagkeys.cpp | 2 +- radio/src/gui/128x64/radio_hardware.cpp | 2 +- radio/src/gui/128x64/radio_sdmanager.cpp | 2 +- radio/src/gui/128x64/radio_version.cpp | 2 +- radio/src/gui/128x64/view_telemetry.cpp | 2 +- radio/src/gui/128x64/view_text.cpp | 2 +- radio/src/gui/128x64/widgets.cpp | 2 +- radio/src/gui/212x64/splash.cpp | 2 +- radio/src/gui/480x272/curves.cpp | 2 +- radio/src/gui/480x272/model_gvars.cpp | 2 +- radio/src/gui/480x272/model_heli.cpp | 2 +- radio/src/gui/480x272/radio_trainer.cpp | 2 +- radio/src/gui/480x272/view_about.cpp | 2 +- radio/src/pulses/pulses_avr.cpp | 2 +- radio/src/storage/storage_common.cpp | 2 +- radio/src/targets/common/avr/adc_driver.cpp | 2 +- radio/src/targets/gruvin9x/rtc_driver.cpp | 44 +++++++++---------- radio/src/targets/gruvin9x/voice.cpp | 2 +- radio/src/targets/horus/audio_driver.cpp | 2 +- radio/src/targets/horus/haptic_driver.cpp | 2 +- radio/src/targets/mega2560/voice.cpp | 2 +- radio/src/targets/sky9x/audio_driver.cpp | 2 +- radio/src/targets/sky9x/bluetooth.cpp | 2 +- radio/src/targets/sky9x/buzzer_driver.cpp | 42 +++++++++--------- radio/src/targets/sky9x/coproc_driver.cpp | 42 +++++++++--------- radio/src/targets/sky9x/diskio.cpp | 2 +- radio/src/targets/sky9x/eeprom_driver.cpp | 42 +++++++++--------- radio/src/targets/sky9x/flash_driver.cpp | 2 +- radio/src/targets/sky9x/haptic_driver.cpp | 42 +++++++++--------- radio/src/targets/sky9x/keys_driver.cpp | 42 +++++++++--------- radio/src/targets/sky9x/rotenc_driver.cpp | 42 +++++++++--------- radio/src/targets/sky9x/rtc_driver.cpp | 42 +++++++++--------- radio/src/targets/sky9x/sdcard_driver.cpp | 44 +++++++++---------- radio/src/targets/sky9x/serial2_driver.cpp | 42 +++++++++--------- radio/src/targets/sky9x/telemetry_driver.cpp | 2 +- .../src/targets/taranis/bluetooth_driver.cpp | 2 +- radio/src/targets/taranis/flash_driver.cpp | 2 +- radio/src/targets/taranis/top_lcd_driver.cpp | 2 +- radio/src/telemetry/frsky_d_arm.cpp | 2 +- radio/src/translations/tts_cz.cpp | 2 +- radio/src/translations/tts_de.cpp | 2 +- radio/src/translations/tts_en.cpp | 2 +- radio/src/translations/tts_es.cpp | 2 +- radio/src/translations/tts_hu.cpp | 2 +- radio/src/translations/tts_it.cpp | 2 +- radio/src/translations/tts_nl.cpp | 2 +- radio/src/translations/tts_pl.cpp | 2 +- radio/src/translations/tts_pt.cpp | 2 +- radio/src/translations/tts_se.cpp | 2 +- radio/src/translations/tts_sk.cpp | 2 +- 60 files changed, 262 insertions(+), 262 deletions(-) diff --git a/radio/src/gui/128x64/menu_radio.cpp b/radio/src/gui/128x64/menu_radio.cpp index 7e52f98d7..c817c8a3f 100644 --- a/radio/src/gui/128x64/menu_radio.cpp +++ b/radio/src/gui/128x64/menu_radio.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" #if defined(CPUARM) void menuGeneralCustomFunctions(uint8_t event) diff --git a/radio/src/gui/128x64/menus.cpp b/radio/src/gui/128x64/menus.cpp index 4fdf3b339..6c4ac2765 100644 --- a/radio/src/gui/128x64/menus.cpp +++ b/radio/src/gui/128x64/menus.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" MenuHandlerFunc menuHandlers[5]; uint8_t menuEvent = 0; diff --git a/radio/src/gui/128x64/model_curves.cpp b/radio/src/gui/128x64/model_curves.cpp index 321a646f0..3d0f5c541 100644 --- a/radio/src/gui/128x64/model_curves.cpp +++ b/radio/src/gui/128x64/model_curves.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" uint8_t s_curveChan; diff --git a/radio/src/gui/128x64/model_flightmodes.cpp b/radio/src/gui/128x64/model_flightmodes.cpp index 3dcf9b135..99d72dc47 100644 --- a/radio/src/gui/128x64/model_flightmodes.cpp +++ b/radio/src/gui/128x64/model_flightmodes.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" void displayFlightModes(coord_t x, coord_t y, FlightModesType value) { diff --git a/radio/src/gui/128x64/model_inputs_mixes.cpp b/radio/src/gui/128x64/model_inputs_mixes.cpp index ba747176b..0d243d45e 100644 --- a/radio/src/gui/128x64/model_inputs_mixes.cpp +++ b/radio/src/gui/128x64/model_inputs_mixes.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" #define EXPO_ONE_2ND_COLUMN (7*FW+3*FW+2) #define EXPO_ONE_FM_WIDTH (5*FW) diff --git a/radio/src/gui/128x64/model_logical_switches.cpp b/radio/src/gui/128x64/model_logical_switches.cpp index 5ad86310e..a628057de 100644 --- a/radio/src/gui/128x64/model_logical_switches.cpp +++ b/radio/src/gui/128x64/model_logical_switches.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" enum LogicalSwitchFields { LS_FIELD_FUNCTION, diff --git a/radio/src/gui/128x64/model_outputs.cpp b/radio/src/gui/128x64/model_outputs.cpp index 0964871b6..b49e29e32 100644 --- a/radio/src/gui/128x64/model_outputs.cpp +++ b/radio/src/gui/128x64/model_outputs.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" bool isThrottleOutput(uint8_t ch) { diff --git a/radio/src/gui/128x64/model_select.cpp b/radio/src/gui/128x64/model_select.cpp index 5a53c03cc..8a7d075a8 100644 --- a/radio/src/gui/128x64/model_select.cpp +++ b/radio/src/gui/128x64/model_select.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" #define MODELSIZE_POS_X 170 #define MODELSEL_W LCD_W diff --git a/radio/src/gui/128x64/model_templates.cpp b/radio/src/gui/128x64/model_templates.cpp index b0df2b2d4..e43e475af 100644 --- a/radio/src/gui/128x64/model_templates.cpp +++ b/radio/src/gui/128x64/model_templates.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" void menuModelTemplates(uint8_t event) { diff --git a/radio/src/gui/128x64/radio_diaganas.cpp b/radio/src/gui/128x64/radio_diaganas.cpp index 38191f641..639c200a6 100644 --- a/radio/src/gui/128x64/radio_diaganas.cpp +++ b/radio/src/gui/128x64/radio_diaganas.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" void menuGeneralDiagAna(uint8_t event) { diff --git a/radio/src/gui/128x64/radio_diagkeys.cpp b/radio/src/gui/128x64/radio_diagkeys.cpp index 8ae1ac9a3..340d264ce 100644 --- a/radio/src/gui/128x64/radio_diagkeys.cpp +++ b/radio/src/gui/128x64/radio_diagkeys.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" void displayKeyState(uint8_t x, uint8_t y, EnumKeys key) { diff --git a/radio/src/gui/128x64/radio_hardware.cpp b/radio/src/gui/128x64/radio_hardware.cpp index 2731febf3..e4de99c6c 100644 --- a/radio/src/gui/128x64/radio_hardware.cpp +++ b/radio/src/gui/128x64/radio_hardware.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" enum menuGeneralHwItems { ITEM_SETUP_HW_OPTREX_DISPLAY, diff --git a/radio/src/gui/128x64/radio_sdmanager.cpp b/radio/src/gui/128x64/radio_sdmanager.cpp index 89f219516..7dcf7fd48 100644 --- a/radio/src/gui/128x64/radio_sdmanager.cpp +++ b/radio/src/gui/128x64/radio_sdmanager.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" void menuGeneralSdManagerInfo(uint8_t event) { diff --git a/radio/src/gui/128x64/radio_version.cpp b/radio/src/gui/128x64/radio_version.cpp index 81401c054..243ea3481 100644 --- a/radio/src/gui/128x64/radio_version.cpp +++ b/radio/src/gui/128x64/radio_version.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" void menuGeneralVersion(uint8_t event) { diff --git a/radio/src/gui/128x64/view_telemetry.cpp b/radio/src/gui/128x64/view_telemetry.cpp index 816bc6d90..bbeadb858 100644 --- a/radio/src/gui/128x64/view_telemetry.cpp +++ b/radio/src/gui/128x64/view_telemetry.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" #define STATUS_BAR_Y (7*FH+1) #define TELEM_2ND_COLUMN (10*FW) diff --git a/radio/src/gui/128x64/view_text.cpp b/radio/src/gui/128x64/view_text.cpp index 8b0406d8e..b0a3c8cec 100644 --- a/radio/src/gui/128x64/view_text.cpp +++ b/radio/src/gui/128x64/view_text.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" #define TEXT_FILENAME_MAXLEN 40 #define TEXT_FILE_MAXSIZE 2048 diff --git a/radio/src/gui/128x64/widgets.cpp b/radio/src/gui/128x64/widgets.cpp index 8caa85de6..49f70831c 100644 --- a/radio/src/gui/128x64/widgets.cpp +++ b/radio/src/gui/128x64/widgets.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" void drawStick(coord_t centrex, int16_t xval, int16_t yval) { diff --git a/radio/src/gui/212x64/splash.cpp b/radio/src/gui/212x64/splash.cpp index 00d9cf7e9..8fbdea114 100644 --- a/radio/src/gui/212x64/splash.cpp +++ b/radio/src/gui/212x64/splash.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" #if defined(SPLASH) const pm_uchar splashdata[] PROGMEM = { diff --git a/radio/src/gui/480x272/curves.cpp b/radio/src/gui/480x272/curves.cpp index 7e77fde34..b18d15d4a 100644 --- a/radio/src/gui/480x272/curves.cpp +++ b/radio/src/gui/480x272/curves.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" coord_t getCurveYCoord(FnFuncP fn, int x, int width) { diff --git a/radio/src/gui/480x272/model_gvars.cpp b/radio/src/gui/480x272/model_gvars.cpp index 3f203748f..ed5400230 100644 --- a/radio/src/gui/480x272/model_gvars.cpp +++ b/radio/src/gui/480x272/model_gvars.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" void onGVARSMenu(const char *result) { diff --git a/radio/src/gui/480x272/model_heli.cpp b/radio/src/gui/480x272/model_heli.cpp index e36e0f132..aa1a897af 100644 --- a/radio/src/gui/480x272/model_heli.cpp +++ b/radio/src/gui/480x272/model_heli.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" enum menuModelHeliItems { ITEM_HELI_SWASHTYPE, diff --git a/radio/src/gui/480x272/radio_trainer.cpp b/radio/src/gui/480x272/radio_trainer.cpp index d9d8e2614..8d9a15a61 100644 --- a/radio/src/gui/480x272/radio_trainer.cpp +++ b/radio/src/gui/480x272/radio_trainer.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" #define TRAINER_COLUMN_WIDTH 60 #define TRAINER_COLUMN_1 MENUS_MARGIN_LEFT+80 diff --git a/radio/src/gui/480x272/view_about.cpp b/radio/src/gui/480x272/view_about.cpp index 66af00898..890af0e69 100644 --- a/radio/src/gui/480x272/view_about.cpp +++ b/radio/src/gui/480x272/view_about.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" enum AboutScreens { ABOUT_OPENTX, diff --git a/radio/src/pulses/pulses_avr.cpp b/radio/src/pulses/pulses_avr.cpp index 69380efef..7fe6b5786 100644 --- a/radio/src/pulses/pulses_avr.cpp +++ b/radio/src/pulses/pulses_avr.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../opentx.h" +#include "opentx.h" uint16_t nextMixerEndTime = 0; #define SCHEDULE_MIXER_END(delay) nextMixerEndTime = getTmr16KHz() + (delay) - 2*16/*2ms*/ diff --git a/radio/src/storage/storage_common.cpp b/radio/src/storage/storage_common.cpp index c9ecb2ddf..b5513f956 100644 --- a/radio/src/storage/storage_common.cpp +++ b/radio/src/storage/storage_common.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../opentx.h" +#include "opentx.h" uint8_t storageDirtyMsk; tmr10ms_t storageDirtyTime10ms; diff --git a/radio/src/targets/common/avr/adc_driver.cpp b/radio/src/targets/common/avr/adc_driver.cpp index 68fd2d057..d8091bec4 100644 --- a/radio/src/targets/common/avr/adc_driver.cpp +++ b/radio/src/targets/common/avr/adc_driver.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" #define ADC_VREF_TYPE (1 << REFS0) // AVCC with external capacitor at AREF pin diff --git a/radio/src/targets/gruvin9x/rtc_driver.cpp b/radio/src/targets/gruvin9x/rtc_driver.cpp index 5dc19ae8b..c1a2f6fee 100644 --- a/radio/src/targets/gruvin9x/rtc_driver.cpp +++ b/radio/src/targets/gruvin9x/rtc_driver.cpp @@ -1,28 +1,28 @@ -/* - * Copyright (C) OpenTX - * - * Based on code named - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * 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. - */ - +/* + * Copyright (C) OpenTX + * + * Based on code named + * th9x - http://code.google.com/p/th9x + * er9x - http://code.google.com/p/er9x + * gruvin9x - http://code.google.com/p/gruvin9x + * + * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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. + */ + /*--------------------------------------------------------------------------*/ /* RTC controls */ -#include "../opentx.h" -#include "../FatFs/integer.h" +#include "opentx.h" +#include "FatFs/integer.h" typedef struct { WORD year; /* 2000..2099 */ diff --git a/radio/src/targets/gruvin9x/voice.cpp b/radio/src/targets/gruvin9x/voice.cpp index 0f96dc0ae..f2b370178 100644 --- a/radio/src/targets/gruvin9x/voice.cpp +++ b/radio/src/targets/gruvin9x/voice.cpp @@ -27,7 +27,7 @@ old DSM2 code) which seemed to much for the interrupt. */ -#include "../../opentx.h" +#include "opentx.h" // Start and stop bits need to be 2ms in duration. Start bit is low, stop bit is high #define SOMOSSBIT 5 //The 2ms of a stop/start bit diff --git a/radio/src/targets/horus/audio_driver.cpp b/radio/src/targets/horus/audio_driver.cpp index e157d79bf..c2a0aefcd 100644 --- a/radio/src/targets/horus/audio_driver.cpp +++ b/radio/src/targets/horus/audio_driver.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" #if !defined(SIMU) diff --git a/radio/src/targets/horus/haptic_driver.cpp b/radio/src/targets/horus/haptic_driver.cpp index f989834ae..c325e3919 100644 --- a/radio/src/targets/horus/haptic_driver.cpp +++ b/radio/src/targets/horus/haptic_driver.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" void hapticOff(void) { diff --git a/radio/src/targets/mega2560/voice.cpp b/radio/src/targets/mega2560/voice.cpp index 80392664a..cfa299712 100644 --- a/radio/src/targets/mega2560/voice.cpp +++ b/radio/src/targets/mega2560/voice.cpp @@ -20,7 +20,7 @@ // driver adapted from somo14d driver for gruvin9x board for driving WTV20SDMini module -#include "../../opentx.h" +#include "opentx.h" // Start and stop bits need to be 2ms in duration. Start bit is low, stop bit is high #define WTV20SD_STOP_TIME 68 // This is the needed 2ms (4) + 30ms (60) to allow for the diff --git a/radio/src/targets/sky9x/audio_driver.cpp b/radio/src/targets/sky9x/audio_driver.cpp index 5b2685b9d..a7d0f74e4 100644 --- a/radio/src/targets/sky9x/audio_driver.cpp +++ b/radio/src/targets/sky9x/audio_driver.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" const int8_t volumeScale[VOLUME_LEVEL_MAX+1] = { diff --git a/radio/src/targets/sky9x/bluetooth.cpp b/radio/src/targets/sky9x/bluetooth.cpp index dbf07c688..bda831af8 100644 --- a/radio/src/targets/sky9x/bluetooth.cpp +++ b/radio/src/targets/sky9x/bluetooth.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../opentx.h" +#include "opentx.h" void btSetBaudrate(uint32_t index) { diff --git a/radio/src/targets/sky9x/buzzer_driver.cpp b/radio/src/targets/sky9x/buzzer_driver.cpp index f086e6c94..eb96067be 100644 --- a/radio/src/targets/sky9x/buzzer_driver.cpp +++ b/radio/src/targets/sky9x/buzzer_driver.cpp @@ -1,24 +1,24 @@ -/* - * Copyright (C) OpenTX - * - * Based on code named - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * 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. - */ - -#include "../opentx.h" +/* + * Copyright (C) OpenTX + * + * Based on code named + * th9x - http://code.google.com/p/th9x + * er9x - http://code.google.com/p/er9x + * gruvin9x - http://code.google.com/p/gruvin9x + * + * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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. + */ + +#include "opentx.h" volatile uint8_t buzzerCount ; diff --git a/radio/src/targets/sky9x/coproc_driver.cpp b/radio/src/targets/sky9x/coproc_driver.cpp index 8d03cbb9d..e6dc9a40d 100644 --- a/radio/src/targets/sky9x/coproc_driver.cpp +++ b/radio/src/targets/sky9x/coproc_driver.cpp @@ -1,24 +1,24 @@ -/* - * Copyright (C) OpenTX - * - * Based on code named - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * 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. - */ - -#include "../../opentx.h" +/* + * Copyright (C) OpenTX + * + * Based on code named + * th9x - http://code.google.com/p/th9x + * er9x - http://code.google.com/p/er9x + * gruvin9x - http://code.google.com/p/gruvin9x + * + * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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. + */ + +#include "opentx.h" int8_t volumeRequired ; uint8_t coprocReadDataPending ; diff --git a/radio/src/targets/sky9x/diskio.cpp b/radio/src/targets/sky9x/diskio.cpp index ecc52bdbe..59c135b92 100644 --- a/radio/src/targets/sky9x/diskio.cpp +++ b/radio/src/targets/sky9x/diskio.cpp @@ -25,7 +25,7 @@ /* are platform dependent. */ /*-----------------------------------------------------------------------*/ -#include "../../opentx.h" +#include "opentx.h" #include "diskio.h" #define CARD_TYPE_bmHC (1 << 0) /**< Bit for High-Capacity(Density) */ diff --git a/radio/src/targets/sky9x/eeprom_driver.cpp b/radio/src/targets/sky9x/eeprom_driver.cpp index 2a281e2f1..1a14ae591 100644 --- a/radio/src/targets/sky9x/eeprom_driver.cpp +++ b/radio/src/targets/sky9x/eeprom_driver.cpp @@ -1,24 +1,24 @@ -/* - * Copyright (C) OpenTX - * - * Based on code named - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * 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. - */ - -#include "../../opentx.h" +/* + * Copyright (C) OpenTX + * + * Based on code named + * th9x - http://code.google.com/p/th9x + * er9x - http://code.google.com/p/er9x + * gruvin9x - http://code.google.com/p/gruvin9x + * + * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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. + */ + +#include "opentx.h" volatile uint32_t Spi_complete; uint8_t Spi_tx_buf[24] ; diff --git a/radio/src/targets/sky9x/flash_driver.cpp b/radio/src/targets/sky9x/flash_driver.cpp index 512dddfbf..c4367fb69 100644 --- a/radio/src/targets/sky9x/flash_driver.cpp +++ b/radio/src/targets/sky9x/flash_driver.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" uint32_t (*IAP_Function)(uint32_t, uint32_t); diff --git a/radio/src/targets/sky9x/haptic_driver.cpp b/radio/src/targets/sky9x/haptic_driver.cpp index 699977727..7e1ce448a 100644 --- a/radio/src/targets/sky9x/haptic_driver.cpp +++ b/radio/src/targets/sky9x/haptic_driver.cpp @@ -1,24 +1,24 @@ -/* - * Copyright (C) OpenTX - * - * Based on code named - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * 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. - */ - -#include "../../opentx.h" +/* + * Copyright (C) OpenTX + * + * Based on code named + * th9x - http://code.google.com/p/th9x + * er9x - http://code.google.com/p/er9x + * gruvin9x - http://code.google.com/p/gruvin9x + * + * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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. + */ + +#include "opentx.h" void hapticOff() { diff --git a/radio/src/targets/sky9x/keys_driver.cpp b/radio/src/targets/sky9x/keys_driver.cpp index d395320e3..d75b4d374 100644 --- a/radio/src/targets/sky9x/keys_driver.cpp +++ b/radio/src/targets/sky9x/keys_driver.cpp @@ -1,24 +1,24 @@ -/* - * Copyright (C) OpenTX - * - * Based on code named - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * 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. - */ - -#include "../../opentx.h" +/* + * Copyright (C) OpenTX + * + * Based on code named + * th9x - http://code.google.com/p/th9x + * er9x - http://code.google.com/p/er9x + * gruvin9x - http://code.google.com/p/gruvin9x + * + * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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. + */ + +#include "opentx.h" // keys: diff --git a/radio/src/targets/sky9x/rotenc_driver.cpp b/radio/src/targets/sky9x/rotenc_driver.cpp index 5e39417d9..9b5048f51 100644 --- a/radio/src/targets/sky9x/rotenc_driver.cpp +++ b/radio/src/targets/sky9x/rotenc_driver.cpp @@ -1,24 +1,24 @@ -/* - * Copyright (C) OpenTX - * - * Based on code named - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * 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. - */ - -#include "../opentx.h" +/* + * Copyright (C) OpenTX + * + * Based on code named + * th9x - http://code.google.com/p/th9x + * er9x - http://code.google.com/p/er9x + * gruvin9x - http://code.google.com/p/gruvin9x + * + * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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. + */ + +#include "opentx.h" void rotencInit() { diff --git a/radio/src/targets/sky9x/rtc_driver.cpp b/radio/src/targets/sky9x/rtc_driver.cpp index cd427bf19..bd1c6c79f 100644 --- a/radio/src/targets/sky9x/rtc_driver.cpp +++ b/radio/src/targets/sky9x/rtc_driver.cpp @@ -1,24 +1,24 @@ -/* - * Copyright (C) OpenTX - * - * Based on code named - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * 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. - */ - -#include "../../opentx.h" +/* + * Copyright (C) OpenTX + * + * Based on code named + * th9x - http://code.google.com/p/th9x + * er9x - http://code.google.com/p/er9x + * gruvin9x - http://code.google.com/p/gruvin9x + * + * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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. + */ + +#include "opentx.h" #if defined(REVX) // TODO change this, not the right place diff --git a/radio/src/targets/sky9x/sdcard_driver.cpp b/radio/src/targets/sky9x/sdcard_driver.cpp index 66f7d9749..ea821800c 100644 --- a/radio/src/targets/sky9x/sdcard_driver.cpp +++ b/radio/src/targets/sky9x/sdcard_driver.cpp @@ -1,25 +1,25 @@ -/* - * Copyright (C) OpenTX - * - * Based on code named - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * 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. - */ - -#include "../../opentx.h" - +/* + * Copyright (C) OpenTX + * + * Based on code named + * th9x - http://code.google.com/p/th9x + * er9x - http://code.google.com/p/er9x + * gruvin9x - http://code.google.com/p/gruvin9x + * + * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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. + */ + +#include "opentx.h" + #define MCI_INITIAL_SPEED 400000 void init_SDcard() diff --git a/radio/src/targets/sky9x/serial2_driver.cpp b/radio/src/targets/sky9x/serial2_driver.cpp index c351d803e..b1ecd2aa9 100644 --- a/radio/src/targets/sky9x/serial2_driver.cpp +++ b/radio/src/targets/sky9x/serial2_driver.cpp @@ -1,24 +1,24 @@ -/* - * Copyright (C) OpenTX - * - * Based on code named - * th9x - http://code.google.com/p/th9x - * er9x - http://code.google.com/p/er9x - * gruvin9x - http://code.google.com/p/gruvin9x - * - * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * 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. - */ - -#include "../../opentx.h" +/* + * Copyright (C) OpenTX + * + * Based on code named + * th9x - http://code.google.com/p/th9x + * er9x - http://code.google.com/p/er9x + * gruvin9x - http://code.google.com/p/gruvin9x + * + * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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. + */ + +#include "opentx.h" #include /** Usart Hw interface used by the console (UART0). */ diff --git a/radio/src/targets/sky9x/telemetry_driver.cpp b/radio/src/targets/sky9x/telemetry_driver.cpp index a33d421f1..b96a52405 100644 --- a/radio/src/targets/sky9x/telemetry_driver.cpp +++ b/radio/src/targets/sky9x/telemetry_driver.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" #define RX_UART_BUFFER_SIZE 128 diff --git a/radio/src/targets/taranis/bluetooth_driver.cpp b/radio/src/targets/taranis/bluetooth_driver.cpp index 49f9a4993..45be84373 100644 --- a/radio/src/targets/taranis/bluetooth_driver.cpp +++ b/radio/src/targets/taranis/bluetooth_driver.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" Fifo btTxFifo; Fifo btRxFifo; diff --git a/radio/src/targets/taranis/flash_driver.cpp b/radio/src/targets/taranis/flash_driver.cpp index a3e7416fd..85a51e42f 100644 --- a/radio/src/targets/taranis/flash_driver.cpp +++ b/radio/src/targets/taranis/flash_driver.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" //After reset, write is not allowed in the Flash control register (FLASH_CR) to protect the //Flash memory against possible unwanted operations due, for example, to electric diff --git a/radio/src/targets/taranis/top_lcd_driver.cpp b/radio/src/targets/taranis/top_lcd_driver.cpp index 52904aa5f..179f6b106 100644 --- a/radio/src/targets/taranis/top_lcd_driver.cpp +++ b/radio/src/targets/taranis/top_lcd_driver.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" #define CS1_HIGH() TOPLCD_GPIO->BSRRL = TOPLCD_GPIO_PIN_CS1 #define CS1_LOW() TOPLCD_GPIO->BSRRH = TOPLCD_GPIO_PIN_CS1 diff --git a/radio/src/telemetry/frsky_d_arm.cpp b/radio/src/telemetry/frsky_d_arm.cpp index 6b4b450f4..5781c10e0 100644 --- a/radio/src/telemetry/frsky_d_arm.cpp +++ b/radio/src/telemetry/frsky_d_arm.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../opentx.h" +#include "opentx.h" #if defined(FRSKY_HUB) void parseTelemHubByte(uint8_t byte) diff --git a/radio/src/translations/tts_cz.cpp b/radio/src/translations/tts_cz.cpp index f99df2d9d..1babd3d28 100644 --- a/radio/src/translations/tts_cz.cpp +++ b/radio/src/translations/tts_cz.cpp @@ -20,7 +20,7 @@ * */ -#include "../opentx.h" +#include "opentx.h" enum CzechPrompts { CZ_PROMPT_NUMBERS_BASE = 0, diff --git a/radio/src/translations/tts_de.cpp b/radio/src/translations/tts_de.cpp index 62c7a8aae..fb45e59a0 100644 --- a/radio/src/translations/tts_de.cpp +++ b/radio/src/translations/tts_de.cpp @@ -22,7 +22,7 @@ * */ -#include "../opentx.h" +#include "opentx.h" enum GermanPrompts { DE_PROMPT_NUMBERS_BASE = 0, diff --git a/radio/src/translations/tts_en.cpp b/radio/src/translations/tts_en.cpp index f0f043c40..7957467e2 100644 --- a/radio/src/translations/tts_en.cpp +++ b/radio/src/translations/tts_en.cpp @@ -34,7 +34,7 @@ * */ -#include "../opentx.h" +#include "opentx.h" enum EnglishPrompts { EN_PROMPT_NUMBERS_BASE = 0, diff --git a/radio/src/translations/tts_es.cpp b/radio/src/translations/tts_es.cpp index 851c03f5c..9305b21e4 100644 --- a/radio/src/translations/tts_es.cpp +++ b/radio/src/translations/tts_es.cpp @@ -34,7 +34,7 @@ * */ -#include "../opentx.h" +#include "opentx.h" enum SpanishPrompts { ES_PROMPT_NUMBERS_BASE = 0, diff --git a/radio/src/translations/tts_hu.cpp b/radio/src/translations/tts_hu.cpp index 082d89288..e775300ae 100644 --- a/radio/src/translations/tts_hu.cpp +++ b/radio/src/translations/tts_hu.cpp @@ -34,7 +34,7 @@ * */ -#include "../opentx.h" +#include "opentx.h" enum HungarianPrompts { HU_PROMPT_NUMBERS_BASE = 0, diff --git a/radio/src/translations/tts_it.cpp b/radio/src/translations/tts_it.cpp index c8d6b1b14..84c823cdb 100644 --- a/radio/src/translations/tts_it.cpp +++ b/radio/src/translations/tts_it.cpp @@ -20,7 +20,7 @@ * */ -#include "../opentx.h" +#include "opentx.h" enum ItalianPrompts { IT_PROMPT_NUMBERS_BASE = 0, diff --git a/radio/src/translations/tts_nl.cpp b/radio/src/translations/tts_nl.cpp index 3fdf70a8f..532807dab 100644 --- a/radio/src/translations/tts_nl.cpp +++ b/radio/src/translations/tts_nl.cpp @@ -21,7 +21,7 @@ * */ -#include "../opentx.h" +#include "opentx.h" enum DutchPrompts { NL_PROMPT_NUMBERS_BASE = 0, diff --git a/radio/src/translations/tts_pl.cpp b/radio/src/translations/tts_pl.cpp index 24743d0ac..49c4e439c 100644 --- a/radio/src/translations/tts_pl.cpp +++ b/radio/src/translations/tts_pl.cpp @@ -20,7 +20,7 @@ * */ -#include "../opentx.h" +#include "opentx.h" enum PolishPrompts { PL_PROMPT_NUMBERS_BASE = 0, diff --git a/radio/src/translations/tts_pt.cpp b/radio/src/translations/tts_pt.cpp index 3926d306a..90db9508f 100644 --- a/radio/src/translations/tts_pt.cpp +++ b/radio/src/translations/tts_pt.cpp @@ -34,7 +34,7 @@ * */ -#include "../opentx.h" +#include "opentx.h" enum PortuguesePrompts { PT_PROMPT_NUMBERS_BASE = 0, diff --git a/radio/src/translations/tts_se.cpp b/radio/src/translations/tts_se.cpp index 222b3bf4e..8e91c2dff 100644 --- a/radio/src/translations/tts_se.cpp +++ b/radio/src/translations/tts_se.cpp @@ -35,7 +35,7 @@ * */ -#include "../opentx.h" +#include "opentx.h" enum SwedishPrompts { SE_PROMPT_NUMBERS_BASE = 0, diff --git a/radio/src/translations/tts_sk.cpp b/radio/src/translations/tts_sk.cpp index 17b212d0c..1f48c2df3 100644 --- a/radio/src/translations/tts_sk.cpp +++ b/radio/src/translations/tts_sk.cpp @@ -35,7 +35,7 @@ * */ -#include "../opentx.h" +#include "opentx.h" enum SlovakPrompts { SK_PROMPT_NUMBERS_BASE = 0,