diff --git a/radio/releasenotes.txt b/radio/releasenotes.txt deleted file mode 100644 index b64ba25c3..000000000 --- a/radio/releasenotes.txt +++ /dev/null @@ -1,851 +0,0 @@ -

Version 2.2.1 / 2017-12-17

- -Please see this page for details. - -

Version 2.2.0 / 2017-05-30

- -Major release! Please see this page for details. - -

Version 2.1.9 / 2016-09-14

- -[All] - - - -[Taranis] - - -[9XR-PRO] - - -[Lua] - - -

Version 2.1.8 / 2016-04-14

- -Notice: EDGE Logical Switch operation has changed. Users should check their setups, if they use EDGE with AND switch. -This bug was introduced in version 2.1.2 and has been fixed in 2.1.8. (#2939) - -[Taranis] - - -[ARM (Taranis, Sky9x, 9XR-PRO, AR9X)] - - -[Lua] - - -[Mega2560] - - -[All] - - - -

Version 2.1.7 / 2016-01-04

- -Notice: Lua model wizard was fixed (#3061) -and needs to be installed on the radio SD card. Download from http://lua-21.open-tx.org/wizard.zip - -[Taranis] - - -[Lua] - - -[Sky9x / 9XR-PRO / AR9X] - - -[ARM] - - -[All] - - - -

Version 2.1.6 / 2015-11-11

-[Taranis] - - - -

Version 2.1.5 / 2015-11-05

- -Notice: version 2.1.4 was skipped by the OpenTX team to avoid confusion with FrSky's release of OpenTX 2.1.4 - -[Taranis] - - -[ARM boards] - - -[Sky9x / 9XR-PRO / AR9X] - - -[AVR boards] - - -[Mega2560] - - - - -

Version 2.1.3 / 2015-09-09

- -[ARM boards] - - -[Taranis] - - -[AVR boards] - - - -

Version 2.1.2 / 2015-09-07


- -PLEASE NOTE the following important information: - - -[ARM Boards] - - -[X9E] - - - -[Sky9x / 9XR-PRO / AR9X] - - -[MEGA2560] - - -[All] - - - -

Version 2.1.1 / 2015-08-06

- -[ARM Boards] - - -[Boards with narrow LCD (9X, 9XR, etc)] - - -[All] - - - -

Version 2.1.0 / 2015-07-16

- -[ARM Boards] - - -[Taranis] - - -[Mega2560] - - - -

Version 2.0.17 / 2015-05-04

- -Nothing new (only Companion fixes) - - -

Version 2.0.16 / 2015-05-03

- -[Taranis] - - -[Bootloader] -
  • Fixed USB access problem with SD cards larger than 4GB (#2154)
    • - - -

    Version 2.0.15 / 2015-01-13

    - -Nothing new (only Companion fixes) - - -

    Version 2.0.14 / 2015-01-12

    - -[Taranis] - - -[9XR-PRO] - - -[9XR] - - -[9X2561] - - -[All] - - - -

    Version 2.0.13 / 2014-11-20

    -[Taranis] - - -[9XR-PRO] - - -[Stock] - - -[All] - - - -

    Version 2.0.12 / 2014-09-16

    -[Taranis] - - -

    Version 2.0.11 / 2014-09-10

    -[9XR-PRO] - - -[Taranis] - - -

    Version 2.0.10 / 2014-09-08

    -[All] - - -[Taranis] - - -[9XR-PRO] - - -

    Version 2.0.8 / 2014-07-23

    -[Taranis] - - -

    Version 2.0.7 / 2014-07-15

    -[Taranis] - - -[All] - - -

    Version 2.0.6 / 2014-07-13

    -[Taranis] - - -[9XR-PRO / Sky9x] - - -[Gruvin9x, 9X128, 9XR128] - - -[All] - - -

    Version 2.0.5 / 2014-06-26

    -[Taranis] - - -

    Version 2.0.4 / 2014-06-24

    -[Taranis] - - -[All] - - -

    Version 2.0.3 / 2014-06-17

    - - -

    Version 2.0.2 / 2014-06-12

    - - -

    OpenTX 2.0.1 / 2014-02-05

    -[Taranis] - - -[Stock] - - -[All] - - -

    OpenTX 2.0.0 / 2014-06-02

    -[Taranis] - - -[ARM Boards] - - -[All] - - -

    2940 / 2014-02-02

    -[ARM Boards] - - -[All] - - -

    2923 / 2014-01-08

    -[ARM Boards] - - -

    2834 / 2013-10-29

    -[ARM Boards] - - -[All] - - -

    2768 / 2013-09-20

    -[All] - - -[9X Stock] - - -[Sky9x/Gruvin9x] - - -

    2751 / 2013-09-01

    -[All] - - -

    2746 / 2013-08-30

    -[All] - - -[9X Stock] - - -[Sky9x] - - -

    2688 / 2013-07-28

    -[9X Stock] - - -[Gruvin9x] - - -[Sky9x] - - -

    2647 / 2013-07-21

    -[All] - - -

    2491 / 2013-06-24

    -[All] - - -[9X Stock] - - -[Sky9x] - - -

    2413 / 2013-05-22

    -[All] - - -[9X Stock] - - -[Sky9x] - - -

    2215 / 2013-04-05

    -[All] - - -[9X Stock] - - -[Gruvin9x] - - -[Sky9x] - diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt index 510af985e..e7cdc6c9d 100644 --- a/radio/src/CMakeLists.txt +++ b/radio/src/CMakeLists.txt @@ -397,7 +397,7 @@ endif() set(SRC ${SRC} - opentx.cpp + edgetx.cpp functions.cpp strhelpers.cpp switches.cpp diff --git a/radio/src/analogs.cpp b/radio/src/analogs.cpp index ebe931956..e07e550dc 100644 --- a/radio/src/analogs.cpp +++ b/radio/src/analogs.cpp @@ -21,7 +21,7 @@ #include "analogs.h" #include "dataconstants.h" -#include "opentx_helpers.h" +#include "edgetx_helpers.h" #include "hal/adc_driver.h" diff --git a/radio/src/audio.cpp b/radio/src/audio.cpp index 4b602d42d..ccaa97c01 100644 --- a/radio/src/audio.cpp +++ b/radio/src/audio.cpp @@ -21,7 +21,7 @@ #include -#include "opentx.h" +#include "edgetx.h" #include "strhelpers.h" #include "switches.h" diff --git a/radio/src/audio.h b/radio/src/audio.h index 734ecb912..a78295375 100644 --- a/radio/src/audio.h +++ b/radio/src/audio.h @@ -19,13 +19,12 @@ * GNU General Public License for more details. */ -#ifndef _AUDIO_H_ -#define _AUDIO_H_ +#pragma once #include #include #include "ff.h" -#include "opentx_types.h" +#include "edgetx_types.h" #include "dataconstants.h" /* @@ -697,5 +696,3 @@ void referenceSystemAudioFiles(); void referenceModelAudioFiles(); bool isAudioFileReferenced(uint32_t i, char * filename/*at least AUDIO_FILENAME_MAXLEN+1 long*/); - -#endif // _AUDIO_H_ diff --git a/radio/src/bin_allocator.cpp b/radio/src/bin_allocator.cpp index cff9f898f..4dc63b09a 100644 --- a/radio/src/bin_allocator.cpp +++ b/radio/src/bin_allocator.cpp @@ -21,7 +21,7 @@ #include #include -#include "opentx.h" +#include "edgetx.h" #include "bin_allocator.h" diff --git a/radio/src/bin_allocator.h b/radio/src/bin_allocator.h index 81ab64278..401114c97 100644 --- a/radio/src/bin_allocator.h +++ b/radio/src/bin_allocator.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _BIN_ALLOCATOR_H_ -#define _BIN_ALLOCATOR_H_ +#pragma once #include "debug.h" @@ -95,5 +94,3 @@ extern BinAllocator_slots2 slots2; // wrapper for our BinAllocator for Lua void *bin_l_alloc (void *ud, void *ptr, size_t osize, size_t nsize); #endif //#if defined(USE_BIN_ALLOCATOR) - -#endif // _BIN_ALLOCATOR_H_ diff --git a/radio/src/bluetooth.cpp b/radio/src/bluetooth.cpp index 80da794de..5b77e72a1 100644 --- a/radio/src/bluetooth.cpp +++ b/radio/src/bluetooth.cpp @@ -20,7 +20,7 @@ */ #include -#include "opentx.h" +#include "edgetx.h" #include "io/frsky_firmware_update.h" #include "bluetooth_driver.h" #include "trainer.h" diff --git a/radio/src/boards/generic_stm32/intmodule_heartbeat.cpp b/radio/src/boards/generic_stm32/intmodule_heartbeat.cpp index 9069a97d5..0b37b2b15 100644 --- a/radio/src/boards/generic_stm32/intmodule_heartbeat.cpp +++ b/radio/src/boards/generic_stm32/intmodule_heartbeat.cpp @@ -28,7 +28,7 @@ #include "pulses/pxx.h" #include "trainer.h" -#include "opentx.h" +#include "edgetx.h" #include "pulses/pulses.h" #if defined(PXX1) diff --git a/radio/src/boards/generic_stm32/rgb_leds.cpp b/radio/src/boards/generic_stm32/rgb_leds.cpp index 8615b803d..47996ffe2 100644 --- a/radio/src/boards/generic_stm32/rgb_leds.cpp +++ b/radio/src/boards/generic_stm32/rgb_leds.cpp @@ -22,7 +22,7 @@ #include "stm32_pulse_driver.h" #include "rgb_leds.h" #include "hal.h" -#include "opentx.h" +#include "edgetx.h" #if defined(LED_STRIP_GPIO) diff --git a/radio/src/boards/generic_stm32/sport_update.cpp b/radio/src/boards/generic_stm32/sport_update.cpp index d0e870756..04ba9657d 100644 --- a/radio/src/boards/generic_stm32/sport_update.cpp +++ b/radio/src/boards/generic_stm32/sport_update.cpp @@ -27,7 +27,7 @@ #include "hal.h" -#include "opentx.h" // g_eeGeneral +#include "edgetx.h" // g_eeGeneral void sportUpdateInit() { diff --git a/radio/src/buzzer.cpp b/radio/src/buzzer.cpp index fd3de4cde..f8d0caf9f 100644 --- a/radio/src/buzzer.cpp +++ b/radio/src/buzzer.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" uint8_t g_beepCnt; uint8_t beepAgain = 0; diff --git a/radio/src/buzzer.h b/radio/src/buzzer.h index d3f1861ba..e5e66251f 100644 --- a/radio/src/buzzer.h +++ b/radio/src/buzzer.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _BUZZER_H_ -#define _BUZZER_H_ +#pragma once #if defined(BUZZER) extern uint8_t beepAgainOrig; @@ -118,6 +117,3 @@ inline void beep(uint8_t) { } #define PLAY_MODEL_NAME() #define START_SILENCE_PERIOD() #endif /* !AUDIO */ - - -#endif // _BUZZER_H_ diff --git a/radio/src/chksize.h b/radio/src/chksize.h index 247b90bb4..d776e8e73 100644 --- a/radio/src/chksize.h +++ b/radio/src/chksize.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef CHKSIZE_H -#define CHKSIZE_H +#pragma once #include @@ -28,5 +27,3 @@ template #include -#include "opentx.h" +#include "edgetx.h" #include "timers_driver.h" #include "hal/watchdog_driver.h" diff --git a/radio/src/cli.h b/radio/src/cli.h index d52e4b772..66af0ac50 100644 --- a/radio/src/cli.h +++ b/radio/src/cli.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _CLI_H_ -#define _CLI_H_ +#pragma once #include "hal/serial_driver.h" @@ -29,5 +28,3 @@ void cliStart(); // Connect serial driver to CLI void cliSetSerialDriver(void* ctx, const etx_serial_driver_t* drv); - -#endif // _CLI_H_ diff --git a/radio/src/crc.h b/radio/src/crc.h index ac03dff81..1c6a8eb6a 100644 --- a/radio/src/crc.h +++ b/radio/src/crc.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef __CRC_H__ -#define __CRC_H__ +#pragma once #include @@ -34,5 +33,3 @@ extern const unsigned short * const crc16tab[2]; uint8_t crc8(const uint8_t * ptr, uint32_t len); uint8_t crc8_BA(const uint8_t * ptr, uint32_t len); uint16_t crc16(uint8_t index, const uint8_t * buf, uint32_t len, uint16_t start = 0); - -#endif diff --git a/radio/src/curves.cpp b/radio/src/curves.cpp index dc9670038..b7a355dd2 100644 --- a/radio/src/curves.cpp +++ b/radio/src/curves.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #if defined(LIBOPENUI) #include "libopenui.h" diff --git a/radio/src/curves.h b/radio/src/curves.h index 9ca039851..d26666440 100644 --- a/radio/src/curves.h +++ b/radio/src/curves.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _CURVES_H_ -#define _CURVES_H_ +#pragma once enum BaseCurves { CURVE_NONE, @@ -48,5 +47,3 @@ int applyCurve(int x, CurveRef & curve); int applyCurrentCurve(int x); char *getCurveRefString(char *dest, size_t len, const CurveRef& curve); - -#endif diff --git a/radio/src/datastructs_private.h b/radio/src/datastructs_private.h index 4a22abd82..3fa8a3c54 100644 --- a/radio/src/datastructs_private.h +++ b/radio/src/datastructs_private.h @@ -26,7 +26,7 @@ #include "board.h" #include "dataconstants.h" #include "definitions.h" -#include "opentx_types.h" +#include "edgetx_types.h" #include "globals.h" #include "serial.h" #include "usb_joystick.h" diff --git a/radio/src/debug.cpp b/radio/src/debug.cpp index 94df3b665..d1bf5e201 100644 --- a/radio/src/debug.cpp +++ b/radio/src/debug.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "stamp.h" #include diff --git a/radio/src/debug.h b/radio/src/debug.h index a5f84ddbe..b7c0fa9c2 100644 --- a/radio/src/debug.h +++ b/radio/src/debug.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _DEBUG_H_ -#define _DEBUG_H_ +#pragma once #include #include "definitions.h" @@ -415,6 +414,3 @@ extern const char * const debugTimerNames[DEBUG_TIMERS_COUNT]; #define DEBUG_TIMER_SAMPLE(timer) #endif //#if defined(DEBUG_TIMERS) - -#endif // _DEBUG_H_ - diff --git a/radio/src/definitions.h b/radio/src/definitions.h index 79182a1fb..9165dfcc0 100644 --- a/radio/src/definitions.h +++ b/radio/src/definitions.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _DEFINITIONS_H_ -#define _DEFINITIONS_H_ +#pragma once #include #include @@ -115,5 +114,3 @@ #define EXTERN_C_START #define EXTERN_C_END #endif - -#endif // _DEFINITIONS_H_ diff --git a/radio/src/dump.cpp b/radio/src/dump.cpp index ecb439524..a440fb790 100644 --- a/radio/src/dump.cpp +++ b/radio/src/dump.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #if defined(SIMU) #define dumpPrintf(...) debugPrintf(__VA_ARGS__) diff --git a/radio/src/dump.h b/radio/src/dump.h index 3a1b58745..f1d1a63b5 100644 --- a/radio/src/dump.h +++ b/radio/src/dump.h @@ -19,13 +19,10 @@ * GNU General Public License for more details. */ -#ifndef _DUMP_H_ -#define _DUMP_H_ +#pragma once #if defined(DEBUG) || defined(CLI) void dump(const void * data, unsigned int size); #else #define dump(data, size) #endif - -#endif // _DUMP_H_ diff --git a/radio/src/opentx.cpp b/radio/src/edgetx.cpp similarity index 99% rename from radio/src/opentx.cpp rename to radio/src/edgetx.cpp index 47dbc296e..083f36790 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/edgetx.cpp @@ -26,7 +26,7 @@ #include "stm32_hal_ll.h" #endif -#include "opentx.h" +#include "edgetx.h" #include "io/frsky_firmware_update.h" #include "hal/adc_driver.h" #include "hal/switch_driver.h" diff --git a/radio/src/opentx.h b/radio/src/edgetx.h similarity index 99% rename from radio/src/opentx.h rename to radio/src/edgetx.h index 8680200ea..f138ccd5a 100644 --- a/radio/src/opentx.h +++ b/radio/src/edgetx.h @@ -23,8 +23,8 @@ #include #include "definitions.h" -#include "opentx_types.h" -#include "opentx_helpers.h" +#include "edgetx_types.h" +#include "edgetx_helpers.h" #include "touch.h" #include "switches.h" diff --git a/radio/src/opentx_constants.h b/radio/src/edgetx_constants.h similarity index 100% rename from radio/src/opentx_constants.h rename to radio/src/edgetx_constants.h diff --git a/radio/src/opentx_helpers.h b/radio/src/edgetx_helpers.h similarity index 100% rename from radio/src/opentx_helpers.h rename to radio/src/edgetx_helpers.h diff --git a/radio/src/opentx_types.h b/radio/src/edgetx_types.h similarity index 100% rename from radio/src/opentx_types.h rename to radio/src/edgetx_types.h diff --git a/radio/src/fifo.h b/radio/src/fifo.h index 0e1b93617..b8636343a 100644 --- a/radio/src/fifo.h +++ b/radio/src/fifo.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _FIFO_H_ -#define _FIFO_H_ +#pragma once #include @@ -114,5 +113,3 @@ class Fifo return (idx + 1) & (N - 1); } }; - -#endif // _FIFO_H_ diff --git a/radio/src/functions.cpp b/radio/src/functions.cpp index ca7a1e86a..7c8957412 100644 --- a/radio/src/functions.cpp +++ b/radio/src/functions.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "switches.h" #include "boards/generic_stm32/rgb_leds.h" diff --git a/radio/src/globals.h b/radio/src/globals.h index 5286d3bae..dc0d8a098 100644 --- a/radio/src/globals.h +++ b/radio/src/globals.h @@ -19,12 +19,11 @@ * GNU General Public License for more details. */ -#ifndef _GLOBALS_H_ -#define _GLOBALS_H_ +#pragma once #include "definitions.h" #include "dataconstants.h" -#include "opentx_types.h" +#include "edgetx_types.h" PACK(struct GlobalData { uint8_t externalAntennaEnabled:1; @@ -97,5 +96,3 @@ extern uint8_t beepAgain; extern uint16_t lightOffCounter; extern uint8_t flashCounter; extern uint8_t mixWarning; - -#endif diff --git a/radio/src/gps.cpp b/radio/src/gps.cpp index 62d9bac1e..0e2cf2b46 100644 --- a/radio/src/gps.cpp +++ b/radio/src/gps.cpp @@ -37,7 +37,7 @@ * along with Cleanflight. If not, see . */ -#include "opentx.h" +#include "edgetx.h" #include "gps.h" #include "gps_nmea.h" #include "gps_ubx.h" diff --git a/radio/src/gps.h b/radio/src/gps.h index dfed2ea8f..d409b2b11 100644 --- a/radio/src/gps.h +++ b/radio/src/gps.h @@ -19,10 +19,9 @@ * GNU General Public License for more details. */ -#ifndef _GPS_H_ -#define _GPS_H_ +#pragma once -#include "opentx.h" +#include "edgetx.h" #include struct gpsdata_t @@ -50,14 +49,13 @@ extern uint8_t gpsTraceEnabled; #define GPS_PROTOCOL_UBX 2 // Setup GPS serial port -void gpsSetSerialDriver(void* ctx, const etx_serial_driver_t* drv, int protocol); +void gpsSetSerialDriver(void* ctx, const etx_serial_driver_t* drv, + int protocol); // Periodic processing void gpsWakeup(); // Send a 0-terminated frame -void gpsSendFrame(const char * frame); +void gpsSendFrame(const char* frame); -uint32_t GPS_coord_to_degrees(const char * coordinateString); - -#endif // _GPS_H_ +uint32_t GPS_coord_to_degrees(const char* coordinateString); diff --git a/radio/src/gps_nmea.cpp b/radio/src/gps_nmea.cpp index 9aab3c275..00fa047b2 100644 --- a/radio/src/gps_nmea.cpp +++ b/radio/src/gps_nmea.cpp @@ -37,7 +37,7 @@ * along with Cleanflight. If not, see . */ -#include "opentx.h" +#include "edgetx.h" #include "gps.h" #include diff --git a/radio/src/gps_nmea.h b/radio/src/gps_nmea.h index 7acf7f015..84540ada4 100644 --- a/radio/src/gps_nmea.h +++ b/radio/src/gps_nmea.h @@ -19,13 +19,10 @@ * GNU General Public License for more details. */ -#ifndef _GPS_NMEA_H_ -#define _GPS_NMEA_H_ +#pragma once #include bool gpsNewFrameNMEA(char c); -void gpsSendFrameNMEA(const char * frame); - -#endif // _GPS_NMEA_H_ +void gpsSendFrameNMEA(const char* frame); diff --git a/radio/src/gps_ubx.cpp b/radio/src/gps_ubx.cpp index f59273de0..90ee23c3c 100644 --- a/radio/src/gps_ubx.cpp +++ b/radio/src/gps_ubx.cpp @@ -35,7 +35,7 @@ #include #include "gps.h" -#include "opentx.h" +#include "edgetx.h" extern const etx_serial_driver_t* gpsSerialDrv; extern void* gpsSerialCtx; diff --git a/radio/src/gps_ubx.h b/radio/src/gps_ubx.h index 521365166..621da8495 100644 --- a/radio/src/gps_ubx.h +++ b/radio/src/gps_ubx.h @@ -13,11 +13,8 @@ * GNU General Public License for more details. */ -#ifndef _GPS_UBX_H_ -#define _GPS_UBX_H_ +#pragma once #include bool gpsNewFrameUBX(uint8_t c, bool detect); - -#endif // _GPS_UBX_H_ diff --git a/radio/src/gui/128x64/bmp.cpp b/radio/src/gui/128x64/bmp.cpp index 4e82d1bc3..d0464eb84 100644 --- a/radio/src/gui/128x64/bmp.cpp +++ b/radio/src/gui/128x64/bmp.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" uint8_t * lcdLoadBitmap(uint8_t * bmp, const char * filename, uint8_t width, uint8_t height) { diff --git a/radio/src/gui/128x64/gui.h b/radio/src/gui/128x64/gui.h index 866ab16a7..c5022f050 100644 --- a/radio/src/gui/128x64/gui.h +++ b/radio/src/gui/128x64/gui.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _GUI_H_ -#define _GUI_H_ +#pragma once #include "gui_common.h" #include "menus.h" @@ -209,5 +208,3 @@ FlightModesType editFlightModes(coord_t x, coord_t y, event_t event, FlightModes #else #define displayFlightModes(...) #endif - -#endif // _GUI_H_ diff --git a/radio/src/gui/128x64/lcd.cpp b/radio/src/gui/128x64/lcd.cpp index d3ed2399c..0c74782dd 100644 --- a/radio/src/gui/128x64/lcd.cpp +++ b/radio/src/gui/128x64/lcd.cpp @@ -34,7 +34,7 @@ #endif #if !defined(BOOT) - #include "opentx.h" + #include "edgetx.h" #include "hal/switch_driver.h" #include "hal/adc_driver.h" #include "switches.h" diff --git a/radio/src/gui/128x64/lcd.h b/radio/src/gui/128x64/lcd.h index 021d21e80..5d76e274d 100644 --- a/radio/src/gui/128x64/lcd.h +++ b/radio/src/gui/128x64/lcd.h @@ -23,7 +23,7 @@ #include -#include "opentx_types.h" +#include "edgetx_types.h" #include "board.h" #define BOX_WIDTH 23 diff --git a/radio/src/gui/128x64/menu_model.cpp b/radio/src/gui/128x64/menu_model.cpp index d0cf67151..0cd77c52a 100644 --- a/radio/src/gui/128x64/menu_model.cpp +++ b/radio/src/gui/128x64/menu_model.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" const MenuHandler menuTabModel[MENU_MODEL_PAGES_COUNT] = { { menuModelSelect, nullptr }, diff --git a/radio/src/gui/128x64/menu_radio.cpp b/radio/src/gui/128x64/menu_radio.cpp index 4e1c2826d..640be4824 100644 --- a/radio/src/gui/128x64/menu_radio.cpp +++ b/radio/src/gui/128x64/menu_radio.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" const MenuHandler menuTabGeneral[MENU_RADIO_PAGES_COUNT] = { #if defined(RADIO_TOOLS) diff --git a/radio/src/gui/128x64/model_curve_edit.cpp b/radio/src/gui/128x64/model_curve_edit.cpp index f5cce2df0..b4dd2f15c 100644 --- a/radio/src/gui/128x64/model_curve_edit.cpp +++ b/radio/src/gui/128x64/model_curve_edit.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "hal/rotary_encoder.h" void runPopupCurvePreset(event_t event) diff --git a/radio/src/gui/128x64/model_custom_scripts.cpp b/radio/src/gui/128x64/model_custom_scripts.cpp index 782478919..c9ac6e842 100644 --- a/radio/src/gui/128x64/model_custom_scripts.cpp +++ b/radio/src/gui/128x64/model_custom_scripts.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" void copySelection(char * dst, const char * src, uint8_t size) { diff --git a/radio/src/gui/128x64/model_display.cpp b/radio/src/gui/128x64/model_display.cpp index 16e99edc8..960d29951 100644 --- a/radio/src/gui/128x64/model_display.cpp +++ b/radio/src/gui/128x64/model_display.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" enum MenuModelDisplayItems { ITEM_DISPLAY_SCREEN_LABEL1, diff --git a/radio/src/gui/128x64/model_failsafe.cpp b/radio/src/gui/128x64/model_failsafe.cpp index 2f9bade2c..305472e92 100644 --- a/radio/src/gui/128x64/model_failsafe.cpp +++ b/radio/src/gui/128x64/model_failsafe.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" extern uint8_t g_moduleIdx; diff --git a/radio/src/gui/128x64/model_flightmodes.cpp b/radio/src/gui/128x64/model_flightmodes.cpp index 37c0f0d08..a8e5e7a2e 100644 --- a/radio/src/gui/128x64/model_flightmodes.cpp +++ b/radio/src/gui/128x64/model_flightmodes.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" void displayFlightModes(coord_t x, coord_t y, FlightModesType value) { diff --git a/radio/src/gui/128x64/model_gvars.cpp b/radio/src/gui/128x64/model_gvars.cpp index a856c3686..93f278074 100644 --- a/radio/src/gui/128x64/model_gvars.cpp +++ b/radio/src/gui/128x64/model_gvars.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" void editGVarValue(coord_t x, coord_t y, event_t event, uint8_t gvar, uint8_t flightMode, LcdFlags flags) { diff --git a/radio/src/gui/128x64/model_input_edit.cpp b/radio/src/gui/128x64/model_input_edit.cpp index 3ff5db35e..a71b2b0c1 100644 --- a/radio/src/gui/128x64/model_input_edit.cpp +++ b/radio/src/gui/128x64/model_input_edit.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #define EXPO_ONE_2ND_COLUMN (6*FW+1) diff --git a/radio/src/gui/128x64/model_logical_switches.cpp b/radio/src/gui/128x64/model_logical_switches.cpp index c15c01aee..252e3711d 100644 --- a/radio/src/gui/128x64/model_logical_switches.cpp +++ b/radio/src/gui/128x64/model_logical_switches.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "switches.h" enum LogicalSwitchFields { diff --git a/radio/src/gui/128x64/model_mix_edit.cpp b/radio/src/gui/128x64/model_mix_edit.cpp index ded57f5b9..dfd9b36cd 100644 --- a/radio/src/gui/128x64/model_mix_edit.cpp +++ b/radio/src/gui/128x64/model_mix_edit.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "mixes.h" enum MixFields { diff --git a/radio/src/gui/128x64/model_outputs.cpp b/radio/src/gui/128x64/model_outputs.cpp index 7a65f5a14..58218e683 100644 --- a/radio/src/gui/128x64/model_outputs.cpp +++ b/radio/src/gui/128x64/model_outputs.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" enum MenuModelOutputsItems { ITEM_OUTPUTS_OFFSET, diff --git a/radio/src/gui/128x64/model_select.cpp b/radio/src/gui/128x64/model_select.cpp index 28e527a71..986a53190 100644 --- a/radio/src/gui/128x64/model_select.cpp +++ b/radio/src/gui/128x64/model_select.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #define MODELSEL_W LCD_W diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 521cf5fce..b14bf7ef1 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "mixer_scheduler.h" #include "hal/adc_driver.h" #include "hal/switch_driver.h" diff --git a/radio/src/gui/128x64/model_special_functions.cpp b/radio/src/gui/128x64/model_special_functions.cpp index c355581eb..692c9f702 100644 --- a/radio/src/gui/128x64/model_special_functions.cpp +++ b/radio/src/gui/128x64/model_special_functions.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #define MODEL_SPECIAL_FUNC_1ST_COLUMN (0) #define MODEL_SPECIAL_FUNC_2ND_COLUMN (4*FW-1) diff --git a/radio/src/gui/128x64/model_telemetry.cpp b/radio/src/gui/128x64/model_telemetry.cpp index 0b65869ae..ed9ca7a45 100644 --- a/radio/src/gui/128x64/model_telemetry.cpp +++ b/radio/src/gui/128x64/model_telemetry.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" enum MenuModelTelemetryFrskyItems { ITEM_TELEMETRY_SENSORS_LABEL, diff --git a/radio/src/gui/128x64/model_telemetry_sensor.cpp b/radio/src/gui/128x64/model_telemetry_sensor.cpp index e309324de..fd9bd7c00 100644 --- a/radio/src/gui/128x64/model_telemetry_sensor.cpp +++ b/radio/src/gui/128x64/model_telemetry_sensor.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" enum SensorFields { SENSOR_FIELD_NAME, diff --git a/radio/src/gui/128x64/model_templates.cpp b/radio/src/gui/128x64/model_templates.cpp index dbfe1d794..36587fbbd 100644 --- a/radio/src/gui/128x64/model_templates.cpp +++ b/radio/src/gui/128x64/model_templates.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" void menuModelTemplates(event_t event) { diff --git a/radio/src/gui/128x64/popups.cpp b/radio/src/gui/128x64/popups.cpp index 2ed74169d..b8ebe7bc2 100644 --- a/radio/src/gui/128x64/popups.cpp +++ b/radio/src/gui/128x64/popups.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" const unsigned char ASTERISK_BITMAP[] = { #include "asterisk.lbm" diff --git a/radio/src/gui/128x64/popups.h b/radio/src/gui/128x64/popups.h index 1c3329575..f98eedcde 100644 --- a/radio/src/gui/128x64/popups.h +++ b/radio/src/gui/128x64/popups.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _POPUPS_H_ -#define _POPUPS_H_ +#pragma once #include @@ -46,5 +45,3 @@ enum { }; #include "../common/stdlcd/popups.h" - -#endif // _POPUPS_H_ diff --git a/radio/src/gui/128x64/radio_calibration.cpp b/radio/src/gui/128x64/radio_calibration.cpp index 9bb1e1999..cd9d7f318 100644 --- a/radio/src/gui/128x64/radio_calibration.cpp +++ b/radio/src/gui/128x64/radio_calibration.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "hal/adc_driver.h" #include "gui/common/stdlcd/calibration.h" diff --git a/radio/src/gui/128x64/radio_diaganas.cpp b/radio/src/gui/128x64/radio_diaganas.cpp index b9204be69..893ae86b9 100644 --- a/radio/src/gui/128x64/radio_diaganas.cpp +++ b/radio/src/gui/128x64/radio_diaganas.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "hal/adc_driver.h" #define HOLDANAVALUEFRAMES 4 /* 4* 50ms = 200 ms update rate */ diff --git a/radio/src/gui/128x64/radio_diagkeys.cpp b/radio/src/gui/128x64/radio_diagkeys.cpp index 0364ed601..f9309ed74 100644 --- a/radio/src/gui/128x64/radio_diagkeys.cpp +++ b/radio/src/gui/128x64/radio_diagkeys.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "hal/rotary_encoder.h" #include "hal/switch_driver.h" #include "hal/key_driver.h" diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp index d83330b5d..dc244f600 100644 --- a/radio/src/gui/128x64/radio_setup.cpp +++ b/radio/src/gui/128x64/radio_setup.cpp @@ -21,7 +21,7 @@ #define LANGUAGE_PACKS_DEFINITION -#include "opentx.h" +#include "edgetx.h" #include "tasks/mixer_task.h" #include "hal/adc_driver.h" #include "hal/usb_driver.h" diff --git a/radio/src/gui/128x64/splash.cpp b/radio/src/gui/128x64/splash.cpp index 48cbc67cd..237ffaa09 100644 --- a/radio/src/gui/128x64/splash.cpp +++ b/radio/src/gui/128x64/splash.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" const unsigned char splashdata[] = { 'S','P','S',0, diff --git a/radio/src/gui/128x64/startup_shutdown.cpp b/radio/src/gui/128x64/startup_shutdown.cpp index 92f6f0211..c5bf3cb65 100644 --- a/radio/src/gui/128x64/startup_shutdown.cpp +++ b/radio/src/gui/128x64/startup_shutdown.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #define SLEEP_BITMAP_WIDTH 42 diff --git a/radio/src/gui/128x64/view_about.cpp b/radio/src/gui/128x64/view_about.cpp index 7d16ec649..5c5f44d98 100644 --- a/radio/src/gui/128x64/view_about.cpp +++ b/radio/src/gui/128x64/view_about.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "stamp.h" #define ABOUT_INDENT 4 diff --git a/radio/src/gui/128x64/view_channels.cpp b/radio/src/gui/128x64/view_channels.cpp index e4630eb16..39bd926f2 100644 --- a/radio/src/gui/128x64/view_channels.cpp +++ b/radio/src/gui/128x64/view_channels.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" constexpr coord_t CHANNEL_NAME_OFFSET = 1; constexpr coord_t CHANNEL_VALUE_OFFSET = CHANNEL_NAME_OFFSET + 42; diff --git a/radio/src/gui/128x64/view_main.cpp b/radio/src/gui/128x64/view_main.cpp index c82e868ec..ef616f4f2 100644 --- a/radio/src/gui/128x64/view_main.cpp +++ b/radio/src/gui/128x64/view_main.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "hal/adc_driver.h" #include "hal/switch_driver.h" diff --git a/radio/src/gui/128x64/view_statistics.cpp b/radio/src/gui/128x64/view_statistics.cpp index 40ce0f7fb..f37b6a55f 100644 --- a/radio/src/gui/128x64/view_statistics.cpp +++ b/radio/src/gui/128x64/view_statistics.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "tasks.h" #include "mixer_scheduler.h" diff --git a/radio/src/gui/128x64/view_telemetry.cpp b/radio/src/gui/128x64/view_telemetry.cpp index 5a1708a5f..250a9be2e 100644 --- a/radio/src/gui/128x64/view_telemetry.cpp +++ b/radio/src/gui/128x64/view_telemetry.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #define STATUS_BAR_Y (7*FH+1) diff --git a/radio/src/gui/128x64/widgets.cpp b/radio/src/gui/128x64/widgets.cpp index 7220f75ca..9642a091e 100644 --- a/radio/src/gui/128x64/widgets.cpp +++ b/radio/src/gui/128x64/widgets.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" // For surface radio void drawWheel(coord_t centrex, int16_t tval) diff --git a/radio/src/gui/212x64/bmp.cpp b/radio/src/gui/212x64/bmp.cpp index 4cf78d782..e2cf750ec 100644 --- a/radio/src/gui/212x64/bmp.cpp +++ b/radio/src/gui/212x64/bmp.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" uint8_t * lcdLoadBitmap(uint8_t * bmp, const char * filename, uint16_t width, uint16_t height) { diff --git a/radio/src/gui/212x64/gui.h b/radio/src/gui/212x64/gui.h index b0cbd9121..ba7a8c76a 100644 --- a/radio/src/gui/212x64/gui.h +++ b/radio/src/gui/212x64/gui.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _GUI_H_ -#define _GUI_H_ +#pragma once #include "gui_common.h" #include "lcd.h" @@ -193,5 +192,3 @@ FlightModesType editFlightModes(coord_t x, coord_t y, event_t event, FlightModes #define IS_MAIN_VIEW_DISPLAYED() menuHandlers[0] == menuMainView #define IS_TELEMETRY_VIEW_DISPLAYED() menuHandlers[0] == menuViewTelemetry #define IS_OTHER_VIEW_DISPLAYED() (menuHandlers[0] == menuMainViewChannelsMonitor || menuHandlers[0] == menuChannelsView) - -#endif // _GUI_H_ diff --git a/radio/src/gui/212x64/lcd.cpp b/radio/src/gui/212x64/lcd.cpp index e0230b4d7..12f2e1a80 100644 --- a/radio/src/gui/212x64/lcd.cpp +++ b/radio/src/gui/212x64/lcd.cpp @@ -33,7 +33,7 @@ #endif #if !defined(BOOT) - #include "opentx.h" + #include "edgetx.h" #include "hal/switch_driver.h" #include "hal/adc_driver.h" #include "switches.h" diff --git a/radio/src/gui/212x64/lcd.h b/radio/src/gui/212x64/lcd.h index d47d17136..35d613c10 100644 --- a/radio/src/gui/212x64/lcd.h +++ b/radio/src/gui/212x64/lcd.h @@ -23,7 +23,7 @@ #include -#include "opentx_types.h" +#include "edgetx_types.h" #include "board.h" #define BOX_WIDTH 31 diff --git a/radio/src/gui/212x64/menu_model.cpp b/radio/src/gui/212x64/menu_model.cpp index ec4df571a..f6974de4f 100644 --- a/radio/src/gui/212x64/menu_model.cpp +++ b/radio/src/gui/212x64/menu_model.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" const MenuHandler menuTabModel[] = { { menuModelSelect, nullptr }, diff --git a/radio/src/gui/212x64/menu_radio.cpp b/radio/src/gui/212x64/menu_radio.cpp index fbe265418..db3b37647 100644 --- a/radio/src/gui/212x64/menu_radio.cpp +++ b/radio/src/gui/212x64/menu_radio.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" const MenuHandler menuTabGeneral[MENU_RADIO_PAGES_COUNT] = { #if defined(RADIO_TOOLS) diff --git a/radio/src/gui/212x64/menus.h b/radio/src/gui/212x64/menus.h index ea78eed8e..511ed7196 100644 --- a/radio/src/gui/212x64/menus.h +++ b/radio/src/gui/212x64/menus.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _MENUS_H_ -#define _MENUS_H_ +#pragma once #include "keys.h" #include "common/stdlcd/menus.h" @@ -128,5 +127,3 @@ void menuModelUSBJoystick(event_t event); #endif extern const MenuHandler menuTabModel[MENU_MODEL_PAGES_COUNT]; - -#endif // _MENUS_H_ diff --git a/radio/src/gui/212x64/model_curve_edit.cpp b/radio/src/gui/212x64/model_curve_edit.cpp index 88a7bd5d8..3b49f8dd8 100644 --- a/radio/src/gui/212x64/model_curve_edit.cpp +++ b/radio/src/gui/212x64/model_curve_edit.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "hal/rotary_encoder.h" void runPopupCurvePreset(event_t event) diff --git a/radio/src/gui/212x64/model_custom_scripts.cpp b/radio/src/gui/212x64/model_custom_scripts.cpp index ef494b858..f881a3c9a 100644 --- a/radio/src/gui/212x64/model_custom_scripts.cpp +++ b/radio/src/gui/212x64/model_custom_scripts.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" void onModelCustomScriptMenu(const char *result) { diff --git a/radio/src/gui/212x64/model_display.cpp b/radio/src/gui/212x64/model_display.cpp index ed1634396..bf643c157 100644 --- a/radio/src/gui/212x64/model_display.cpp +++ b/radio/src/gui/212x64/model_display.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" enum MenuModelDisplayItems { ITEM_DISPLAY_TOP_BAR_LABEL, diff --git a/radio/src/gui/212x64/model_failsafe.cpp b/radio/src/gui/212x64/model_failsafe.cpp index 5fa5190b6..1f52f99bd 100644 --- a/radio/src/gui/212x64/model_failsafe.cpp +++ b/radio/src/gui/212x64/model_failsafe.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" extern uint8_t g_moduleIdx; diff --git a/radio/src/gui/212x64/model_flightmodes.cpp b/radio/src/gui/212x64/model_flightmodes.cpp index df641e538..65848198f 100644 --- a/radio/src/gui/212x64/model_flightmodes.cpp +++ b/radio/src/gui/212x64/model_flightmodes.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" void displayFlightModes(coord_t x, coord_t y, FlightModesType value) { diff --git a/radio/src/gui/212x64/model_gvars.cpp b/radio/src/gui/212x64/model_gvars.cpp index 840b9b3fd..a70492cec 100644 --- a/radio/src/gui/212x64/model_gvars.cpp +++ b/radio/src/gui/212x64/model_gvars.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" static int numFlightModes() { return modelFMEnabled() ? MAX_FLIGHT_MODES : 1; } diff --git a/radio/src/gui/212x64/model_input_edit.cpp b/radio/src/gui/212x64/model_input_edit.cpp index d6f773ed1..70a72ab12 100644 --- a/radio/src/gui/212x64/model_input_edit.cpp +++ b/radio/src/gui/212x64/model_input_edit.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #define EXPO_ONE_2ND_COLUMN (LCD_W-8*FW-90) diff --git a/radio/src/gui/212x64/model_logical_switches.cpp b/radio/src/gui/212x64/model_logical_switches.cpp index 0af49768c..547da8322 100644 --- a/radio/src/gui/212x64/model_logical_switches.cpp +++ b/radio/src/gui/212x64/model_logical_switches.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "switches.h" enum LogicalSwitchFields { diff --git a/radio/src/gui/212x64/model_mix_edit.cpp b/radio/src/gui/212x64/model_mix_edit.cpp index 9faec4ea1..f124458b9 100644 --- a/radio/src/gui/212x64/model_mix_edit.cpp +++ b/radio/src/gui/212x64/model_mix_edit.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "mixes.h" enum MixFields { diff --git a/radio/src/gui/212x64/model_outputs.cpp b/radio/src/gui/212x64/model_outputs.cpp index d6da7deb3..e8e27eaf3 100644 --- a/radio/src/gui/212x64/model_outputs.cpp +++ b/radio/src/gui/212x64/model_outputs.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" enum LimitsItems { ITEM_LIMITS_CH_NAME, diff --git a/radio/src/gui/212x64/model_select.cpp b/radio/src/gui/212x64/model_select.cpp index 55e21ea03..9ab4e9e07 100644 --- a/radio/src/gui/212x64/model_select.cpp +++ b/radio/src/gui/212x64/model_select.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #define MODELSEL_W 133 diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp index 525f646a2..86e8313bb 100644 --- a/radio/src/gui/212x64/model_setup.cpp +++ b/radio/src/gui/212x64/model_setup.cpp @@ -24,7 +24,7 @@ #include "hal/switch_driver.h" #include "hal/module_port.h" -#include "opentx.h" +#include "edgetx.h" #include "mixer_scheduler.h" #include "switches.h" diff --git a/radio/src/gui/212x64/model_special_functions.cpp b/radio/src/gui/212x64/model_special_functions.cpp index 9ba6414fc..29b4027cf 100644 --- a/radio/src/gui/212x64/model_special_functions.cpp +++ b/radio/src/gui/212x64/model_special_functions.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #define MODEL_SPECIAL_FUNC_1ST_COLUMN (4*FW+2) #define MODEL_SPECIAL_FUNC_2ND_COLUMN (8*FW+2) diff --git a/radio/src/gui/212x64/model_telemetry.cpp b/radio/src/gui/212x64/model_telemetry.cpp index 18f676947..58419b45e 100644 --- a/radio/src/gui/212x64/model_telemetry.cpp +++ b/radio/src/gui/212x64/model_telemetry.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" enum MenuModelTelemetryFrskyItems { ITEM_TELEMETRY_SENSORS_LABEL, diff --git a/radio/src/gui/212x64/model_telemetry_sensor.cpp b/radio/src/gui/212x64/model_telemetry_sensor.cpp index f9bf48033..f131f785d 100644 --- a/radio/src/gui/212x64/model_telemetry_sensor.cpp +++ b/radio/src/gui/212x64/model_telemetry_sensor.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" enum SensorFields { SENSOR_FIELD_NAME, diff --git a/radio/src/gui/212x64/popups.cpp b/radio/src/gui/212x64/popups.cpp index 12063cfca..9cbe20113 100644 --- a/radio/src/gui/212x64/popups.cpp +++ b/radio/src/gui/212x64/popups.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" const unsigned char ASTERISK_BITMAP[] = { #include "asterisk.lbm" diff --git a/radio/src/gui/212x64/popups.h b/radio/src/gui/212x64/popups.h index b70806058..1389e6bbe 100644 --- a/radio/src/gui/212x64/popups.h +++ b/radio/src/gui/212x64/popups.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _POPUPS_H_ -#define _POPUPS_H_ +#pragma once #define MESSAGEBOX_X 10 #define MESSAGEBOX_Y 8 @@ -44,5 +43,3 @@ enum { }; #include "../common/stdlcd/popups.h" - -#endif // _POPUPS_H_ diff --git a/radio/src/gui/212x64/radio_calibration.cpp b/radio/src/gui/212x64/radio_calibration.cpp index b2c63368f..5de08f7e8 100644 --- a/radio/src/gui/212x64/radio_calibration.cpp +++ b/radio/src/gui/212x64/radio_calibration.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "hal/adc_driver.h" #include "gui/common/stdlcd/calibration.h" diff --git a/radio/src/gui/212x64/radio_diaganas.cpp b/radio/src/gui/212x64/radio_diaganas.cpp index 7c3c460ff..d469926b0 100644 --- a/radio/src/gui/212x64/radio_diaganas.cpp +++ b/radio/src/gui/212x64/radio_diaganas.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "../../hal/adc_driver.h" #define HOLDANAVALUEFRAMES 4 /* 4* 50ms = 200 ms update rate */ diff --git a/radio/src/gui/212x64/radio_diagkeys.cpp b/radio/src/gui/212x64/radio_diagkeys.cpp index 4aac97d8d..17025859e 100644 --- a/radio/src/gui/212x64/radio_diagkeys.cpp +++ b/radio/src/gui/212x64/radio_diagkeys.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "hal/rotary_encoder.h" #include "hal/switch_driver.h" diff --git a/radio/src/gui/212x64/radio_setup.cpp b/radio/src/gui/212x64/radio_setup.cpp index d1f221f38..35b73c716 100644 --- a/radio/src/gui/212x64/radio_setup.cpp +++ b/radio/src/gui/212x64/radio_setup.cpp @@ -24,7 +24,7 @@ #define LANGUAGE_PACKS_DEFINITION -#include "opentx.h" +#include "edgetx.h" #include "tasks/mixer_task.h" #include "input_mapping.h" diff --git a/radio/src/gui/212x64/splash.cpp b/radio/src/gui/212x64/splash.cpp index fe19a94e6..23094fd3a 100644 --- a/radio/src/gui/212x64/splash.cpp +++ b/radio/src/gui/212x64/splash.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #define MAXIMUM_SPLASH_IMAGE_SIZE 3072 const struct { diff --git a/radio/src/gui/212x64/startup_shutdown.cpp b/radio/src/gui/212x64/startup_shutdown.cpp index 61944cd8a..51225c8a7 100644 --- a/radio/src/gui/212x64/startup_shutdown.cpp +++ b/radio/src/gui/212x64/startup_shutdown.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #define ANIMATIONS_BITMAP_WIDTH 30 diff --git a/radio/src/gui/212x64/view_about.cpp b/radio/src/gui/212x64/view_about.cpp index f79542991..5c07e98b6 100644 --- a/radio/src/gui/212x64/view_about.cpp +++ b/radio/src/gui/212x64/view_about.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "stamp.h" #define ABOUT_INDENT 6 diff --git a/radio/src/gui/212x64/view_channels.cpp b/radio/src/gui/212x64/view_channels.cpp index 22289d236..01d505257 100644 --- a/radio/src/gui/212x64/view_channels.cpp +++ b/radio/src/gui/212x64/view_channels.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" struct ViewChannelsState { bool longNames; diff --git a/radio/src/gui/212x64/view_main.cpp b/radio/src/gui/212x64/view_main.cpp index 7c10aebcd..6a74c5491 100644 --- a/radio/src/gui/212x64/view_main.cpp +++ b/radio/src/gui/212x64/view_main.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "hal/trainer_driver.h" #include "hal/adc_driver.h" #include "hal/switch_driver.h" diff --git a/radio/src/gui/212x64/view_statistics.cpp b/radio/src/gui/212x64/view_statistics.cpp index 1f73e0acc..4c892904a 100644 --- a/radio/src/gui/212x64/view_statistics.cpp +++ b/radio/src/gui/212x64/view_statistics.cpp @@ -20,7 +20,7 @@ */ #include "hal/adc_driver.h" -#include "opentx.h" +#include "edgetx.h" #include "tasks.h" #define STATS_1ST_COLUMN FW/2 diff --git a/radio/src/gui/212x64/view_telemetry.cpp b/radio/src/gui/212x64/view_telemetry.cpp index d2dae9760..7c1bb728d 100644 --- a/radio/src/gui/212x64/view_telemetry.cpp +++ b/radio/src/gui/212x64/view_telemetry.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #define STATUS_BAR_Y (7*FH+1) diff --git a/radio/src/gui/212x64/widgets.cpp b/radio/src/gui/212x64/widgets.cpp index 3d05ee954..635381d13 100644 --- a/radio/src/gui/212x64/widgets.cpp +++ b/radio/src/gui/212x64/widgets.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" void drawStick(coord_t centrex, int16_t xval, int16_t yval) { diff --git a/radio/src/gui/colorlcd/LvglWrapper.cpp b/radio/src/gui/colorlcd/LvglWrapper.cpp index 14d04bef5..f44c8e5c7 100644 --- a/radio/src/gui/colorlcd/LvglWrapper.cpp +++ b/radio/src/gui/colorlcd/LvglWrapper.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "hal/rotary_encoder.h" #include "LvglWrapper.h" diff --git a/radio/src/gui/colorlcd/LvglWrapper.h b/radio/src/gui/colorlcd/LvglWrapper.h index 1babfc119..2c50e50e8 100644 --- a/radio/src/gui/colorlcd/LvglWrapper.h +++ b/radio/src/gui/colorlcd/LvglWrapper.h @@ -22,7 +22,7 @@ #pragma once #include -#include "opentx_types.h" +#include "edgetx_types.h" void initLvglTheme(); diff --git a/radio/src/gui/colorlcd/bitmaps.cpp b/radio/src/gui/colorlcd/bitmaps.cpp index dfd3bb459..584193387 100644 --- a/radio/src/gui/colorlcd/bitmaps.cpp +++ b/radio/src/gui/colorlcd/bitmaps.cpp @@ -23,7 +23,7 @@ #include "libopenui.h" #include "lz4/lz4.h" -#include "opentx_helpers.h" +#include "edgetx_helpers.h" LZ4BitmapBuffer::LZ4BitmapBuffer(uint8_t format, const LZ4Bitmap* lz4Data) : BitmapBuffer(format, 0, 0, nullptr) diff --git a/radio/src/gui/colorlcd/controls/channel_bar.h b/radio/src/gui/colorlcd/controls/channel_bar.h index c5a67dd06..f7ca4a874 100644 --- a/radio/src/gui/colorlcd/controls/channel_bar.h +++ b/radio/src/gui/colorlcd/controls/channel_bar.h @@ -21,7 +21,7 @@ #pragma once -#include "opentx.h" +#include "edgetx.h" class ChannelBar : public Window { diff --git a/radio/src/gui/colorlcd/controls/channel_range.cpp b/radio/src/gui/colorlcd/controls/channel_range.cpp index 8d9ec89f5..bdf10714b 100644 --- a/radio/src/gui/colorlcd/controls/channel_range.cpp +++ b/radio/src/gui/colorlcd/controls/channel_range.cpp @@ -21,7 +21,7 @@ #include "channel_range.h" -#include "opentx.h" +#include "edgetx.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/controls/curve.cpp b/radio/src/gui/colorlcd/controls/curve.cpp index 7a294c167..1a8f7df6f 100644 --- a/radio/src/gui/colorlcd/controls/curve.cpp +++ b/radio/src/gui/colorlcd/controls/curve.cpp @@ -22,7 +22,7 @@ #include "curve.h" #include "bitmaps.h" -#include "opentx.h" +#include "edgetx.h" #include "strhelpers.h" //----------------------------------------------------------------------------- diff --git a/radio/src/gui/colorlcd/controls/curve_param.cpp b/radio/src/gui/colorlcd/controls/curve_param.cpp index 7ec898922..155d449d3 100644 --- a/radio/src/gui/colorlcd/controls/curve_param.cpp +++ b/radio/src/gui/colorlcd/controls/curve_param.cpp @@ -24,7 +24,7 @@ #include "gvar_numberedit.h" #include "source_numberedit.h" #include "model_curves.h" -#include "opentx.h" +#include "edgetx.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/controls/fm_matrix.cpp b/radio/src/gui/colorlcd/controls/fm_matrix.cpp index 3415534fb..96ff32c8c 100644 --- a/radio/src/gui/colorlcd/controls/fm_matrix.cpp +++ b/radio/src/gui/colorlcd/controls/fm_matrix.cpp @@ -21,7 +21,7 @@ #include "fm_matrix.h" -#include "opentx.h" +#include "edgetx.h" #include "etx_lv_theme.h" template diff --git a/radio/src/gui/colorlcd/controls/gvar_numberedit.cpp b/radio/src/gui/colorlcd/controls/gvar_numberedit.cpp index 9e6598b65..3e9e34704 100644 --- a/radio/src/gui/colorlcd/controls/gvar_numberedit.cpp +++ b/radio/src/gui/colorlcd/controls/gvar_numberedit.cpp @@ -20,7 +20,7 @@ */ #include "gvar_numberedit.h" -#include "opentx.h" +#include "edgetx.h" void GVarNumberEdit::value_changed(lv_event_t* e) { diff --git a/radio/src/gui/colorlcd/controls/input_source.cpp b/radio/src/gui/colorlcd/controls/input_source.cpp index 2eb58a67e..010798064 100644 --- a/radio/src/gui/colorlcd/controls/input_source.cpp +++ b/radio/src/gui/colorlcd/controls/input_source.cpp @@ -21,7 +21,7 @@ #include "input_source.h" -#include "opentx.h" +#include "edgetx.h" #include "sourcechoice.h" #include "switchchoice.h" diff --git a/radio/src/gui/colorlcd/controls/source_numberedit.cpp b/radio/src/gui/colorlcd/controls/source_numberedit.cpp index dd3aec81b..6c7768d7c 100644 --- a/radio/src/gui/colorlcd/controls/source_numberedit.cpp +++ b/radio/src/gui/colorlcd/controls/source_numberedit.cpp @@ -21,7 +21,7 @@ #include "source_numberedit.h" -#include "opentx.h" +#include "edgetx.h" #include "sourcechoice.h" void SourceNumberEdit::value_changed(lv_event_t* e) diff --git a/radio/src/gui/colorlcd/controls/sourcechoice.cpp b/radio/src/gui/colorlcd/controls/sourcechoice.cpp index 16e76039b..82d34fcc9 100644 --- a/radio/src/gui/colorlcd/controls/sourcechoice.cpp +++ b/radio/src/gui/colorlcd/controls/sourcechoice.cpp @@ -25,7 +25,7 @@ #include "lcd.h" #include "menu.h" #include "menutoolbar.h" -#include "opentx.h" +#include "edgetx.h" #include "strhelpers.h" #include "switches.h" diff --git a/radio/src/gui/colorlcd/controls/switch_warn_dialog.h b/radio/src/gui/colorlcd/controls/switch_warn_dialog.h index a3b8d62d4..c948dddb1 100644 --- a/radio/src/gui/colorlcd/controls/switch_warn_dialog.h +++ b/radio/src/gui/colorlcd/controls/switch_warn_dialog.h @@ -23,7 +23,7 @@ #include "fullscreen_dialog.h" #include "mainwindow.h" -#include "opentx.h" +#include "edgetx.h" class SwitchWarnDialog : public FullScreenDialog { diff --git a/radio/src/gui/colorlcd/controls/switchchoice.cpp b/radio/src/gui/colorlcd/controls/switchchoice.cpp index ab9d09682..8a1b0b6d3 100644 --- a/radio/src/gui/colorlcd/controls/switchchoice.cpp +++ b/radio/src/gui/colorlcd/controls/switchchoice.cpp @@ -23,7 +23,7 @@ #include "dataconstants.h" #include "menu.h" #include "menutoolbar.h" -#include "opentx.h" +#include "edgetx.h" #include "strhelpers.h" #include "switches.h" diff --git a/radio/src/gui/colorlcd/fonts.h b/radio/src/gui/colorlcd/fonts.h index 1796954b1..e90d30fb5 100644 --- a/radio/src/gui/colorlcd/fonts.h +++ b/radio/src/gui/colorlcd/fonts.h @@ -20,7 +20,7 @@ #include -#include "opentx_types.h" +#include "edgetx_types.h" enum FontIndex { FONT_STD_INDEX, diff --git a/radio/src/gui/colorlcd/lcd.h b/radio/src/gui/colorlcd/lcd.h index 1fe9525c9..4b325ecfd 100644 --- a/radio/src/gui/colorlcd/lcd.h +++ b/radio/src/gui/colorlcd/lcd.h @@ -21,7 +21,7 @@ #pragma once -#include "opentx_types.h" +#include "edgetx_types.h" #include "colors.h" diff --git a/radio/src/gui/colorlcd/libui/bitmapbuffer.cpp b/radio/src/gui/colorlcd/libui/bitmapbuffer.cpp index 2b4458423..13707fce0 100644 --- a/radio/src/gui/colorlcd/libui/bitmapbuffer.cpp +++ b/radio/src/gui/colorlcd/libui/bitmapbuffer.cpp @@ -27,7 +27,7 @@ #include "dma2d.h" #include "fonts.h" #include "lvgl/src/draw/sw/lv_draw_sw.h" -#include "opentx_helpers.h" +#include "edgetx_helpers.h" #include "strhelpers.h" BitmapBuffer::BitmapBuffer(uint8_t format, uint16_t width, uint16_t height) : diff --git a/radio/src/gui/colorlcd/libui/bitmapbuffer_draw_extra.cpp b/radio/src/gui/colorlcd/libui/bitmapbuffer_draw_extra.cpp index 262c20958..d83ca0b93 100644 --- a/radio/src/gui/colorlcd/libui/bitmapbuffer_draw_extra.cpp +++ b/radio/src/gui/colorlcd/libui/bitmapbuffer_draw_extra.cpp @@ -22,7 +22,7 @@ #include "bitmaps.h" #include "board.h" #include "dma2d.h" -#include "opentx.h" +#include "edgetx.h" #include "strhelpers.h" #include "telemetry/telemetry_sensors.h" #include "translations.h" diff --git a/radio/src/gui/colorlcd/libui/bitmapbuffer_fileio.cpp b/radio/src/gui/colorlcd/libui/bitmapbuffer_fileio.cpp index 9ea05edc7..9f6e497cb 100644 --- a/radio/src/gui/colorlcd/libui/bitmapbuffer_fileio.cpp +++ b/radio/src/gui/colorlcd/libui/bitmapbuffer_fileio.cpp @@ -20,7 +20,7 @@ #include "bitmapbuffer.h" #include "lib_file.h" -#include "opentx_helpers.h" +#include "edgetx_helpers.h" FIL imgFile __DMA; diff --git a/radio/src/gui/colorlcd/libui/dialog.cpp b/radio/src/gui/colorlcd/libui/dialog.cpp index 36789bad3..f0925ae3d 100644 --- a/radio/src/gui/colorlcd/libui/dialog.cpp +++ b/radio/src/gui/colorlcd/libui/dialog.cpp @@ -18,7 +18,7 @@ #include "dialog.h" -#include "opentx.h" +#include "edgetx.h" #include "mainwindow.h" #include "progress.h" #include "etx_lv_theme.h" diff --git a/radio/src/gui/colorlcd/libui/filechoice.cpp b/radio/src/gui/colorlcd/libui/filechoice.cpp index 88de737f9..0f5baf8da 100644 --- a/radio/src/gui/colorlcd/libui/filechoice.cpp +++ b/radio/src/gui/colorlcd/libui/filechoice.cpp @@ -20,7 +20,7 @@ #include -#include "opentx.h" +#include "edgetx.h" #include "lib_file.h" #include "menu.h" #include "menutoolbar.h" diff --git a/radio/src/gui/colorlcd/libui/fullscreen_dialog.cpp b/radio/src/gui/colorlcd/libui/fullscreen_dialog.cpp index d83f94304..83261aa8e 100644 --- a/radio/src/gui/colorlcd/libui/fullscreen_dialog.cpp +++ b/radio/src/gui/colorlcd/libui/fullscreen_dialog.cpp @@ -24,7 +24,7 @@ #include "LvglWrapper.h" #include "libopenui.h" #include "mainwindow.h" -#include "opentx.h" +#include "edgetx.h" #include "etx_lv_theme.h" #include "view_main.h" #include "hal/watchdog_driver.h" diff --git a/radio/src/gui/colorlcd/libui/libopenui_defines.h b/radio/src/gui/colorlcd/libui/libopenui_defines.h index e5cad30c5..9d38fddb1 100644 --- a/radio/src/gui/colorlcd/libui/libopenui_defines.h +++ b/radio/src/gui/colorlcd/libui/libopenui_defines.h @@ -20,7 +20,7 @@ #include "debug.h" #include "hal.h" -#include "opentx_types.h" +#include "edgetx_types.h" #include "colors.h" #include "keys.h" diff --git a/radio/src/gui/colorlcd/libui/list_line_button.cpp b/radio/src/gui/colorlcd/libui/list_line_button.cpp index 0bbb51c64..8c5839c5d 100644 --- a/radio/src/gui/colorlcd/libui/list_line_button.cpp +++ b/radio/src/gui/colorlcd/libui/list_line_button.cpp @@ -23,7 +23,7 @@ #include -#include "opentx.h" +#include "edgetx.h" #include "etx_lv_theme.h" static void input_mix_line_constructor(const lv_obj_class_t* class_p, diff --git a/radio/src/gui/colorlcd/libui/list_line_button.h b/radio/src/gui/colorlcd/libui/list_line_button.h index b23f2b07b..0c16387d0 100644 --- a/radio/src/gui/colorlcd/libui/list_line_button.h +++ b/radio/src/gui/colorlcd/libui/list_line_button.h @@ -22,7 +22,7 @@ #pragma once #include "button.h" -#include "opentx_types.h" +#include "edgetx_types.h" #include "tabsgroup.h" class ListLineButton : public ButtonBase diff --git a/radio/src/gui/colorlcd/libui/menu.cpp b/radio/src/gui/colorlcd/libui/menu.cpp index a7367f067..f5066d7d8 100644 --- a/radio/src/gui/colorlcd/libui/menu.cpp +++ b/radio/src/gui/colorlcd/libui/menu.cpp @@ -21,7 +21,7 @@ #include #include "menutoolbar.h" -#include "opentx.h" +#include "edgetx.h" #include "table.h" #include "etx_lv_theme.h" diff --git a/radio/src/gui/colorlcd/libui/popups.cpp b/radio/src/gui/colorlcd/libui/popups.cpp index ad68f16c2..1af160dd9 100644 --- a/radio/src/gui/colorlcd/libui/popups.cpp +++ b/radio/src/gui/colorlcd/libui/popups.cpp @@ -22,7 +22,7 @@ #include "popups.h" #include "libopenui.h" -#include "opentx.h" +#include "edgetx.h" #include "pwr.h" #include "hal/watchdog_driver.h" #include "etx_lv_theme.h" diff --git a/radio/src/gui/colorlcd/libui/view_text.cpp b/radio/src/gui/colorlcd/libui/view_text.cpp index 81276dc2d..2f3461445 100644 --- a/radio/src/gui/colorlcd/libui/view_text.cpp +++ b/radio/src/gui/colorlcd/libui/view_text.cpp @@ -21,7 +21,7 @@ #include "view_text.h" #include "menu.h" -#include "opentx.h" +#include "edgetx.h" #include "sdcard.h" #include "etx_lv_theme.h" #include "fullscreen_dialog.h" diff --git a/radio/src/gui/colorlcd/libui/window.h b/radio/src/gui/colorlcd/libui/window.h index 1ad311873..abafde865 100644 --- a/radio/src/gui/colorlcd/libui/window.h +++ b/radio/src/gui/colorlcd/libui/window.h @@ -25,7 +25,7 @@ #include "LvglWrapper.h" #include "bitmapbuffer.h" #include "libopenui_defines.h" -#include "opentx_helpers.h" +#include "edgetx_helpers.h" #include "etx_lv_theme.h" typedef uint32_t WindowFlags; diff --git a/radio/src/gui/colorlcd/lv_conf.h b/radio/src/gui/colorlcd/lv_conf.h index a31b0a4a8..5448320f6 100644 --- a/radio/src/gui/colorlcd/lv_conf.h +++ b/radio/src/gui/colorlcd/lv_conf.h @@ -1,21 +1,27 @@ -/** - * @file lv_conf.h - * Configuration file for v8.2.0 +/* + * Copyright (C) EdgeTX + * + * Based on code named + * opentx - https://github.com/opentx/opentx + * 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. */ -/* - * Copy this file as `lv_conf.h` - * 1. simply next to the `lvgl` folder - * 2. or any other places and - * - define `LV_CONF_INCLUDE_SIMPLE` - * - add the path as include path - */ +#pragma once /* clang-format off */ -#if 1 /*Set it to "1" to enable content*/ - -#ifndef LV_CONF_H -#define LV_CONF_H #include @@ -841,9 +847,3 @@ # define LV_DEMO_MUSIC_LARGE 0 # define LV_DEMO_MUSIC_AUTO_PLAY 0 #endif - -/*--END OF LV_CONF_H--*/ - -#endif /*LV_CONF_H*/ - -#endif /*End of "Content enable"*/ diff --git a/radio/src/gui/colorlcd/mainview/layout.cpp b/radio/src/gui/colorlcd/mainview/layout.cpp index 60a4900ac..320391ebe 100644 --- a/radio/src/gui/colorlcd/mainview/layout.cpp +++ b/radio/src/gui/colorlcd/mainview/layout.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "topbar_impl.h" #include "view_main.h" diff --git a/radio/src/gui/colorlcd/mainview/menu_screen.cpp b/radio/src/gui/colorlcd/mainview/menu_screen.cpp index 3944c1f24..c2315dbc7 100644 --- a/radio/src/gui/colorlcd/mainview/menu_screen.cpp +++ b/radio/src/gui/colorlcd/mainview/menu_screen.cpp @@ -24,7 +24,7 @@ #include "menu_model.h" #include "menu_radio.h" #include "model_select.h" -#include "opentx.h" +#include "edgetx.h" #include "screen_setup.h" #include "storage/storage.h" #include "view_channels.h" diff --git a/radio/src/gui/colorlcd/mainview/screen_setup.cpp b/radio/src/gui/colorlcd/mainview/screen_setup.cpp index 2d96c0d47..d9e208930 100644 --- a/radio/src/gui/colorlcd/mainview/screen_setup.cpp +++ b/radio/src/gui/colorlcd/mainview/screen_setup.cpp @@ -26,7 +26,7 @@ #include "color_picker.h" #include "layout_factory_impl.h" #include "libopenui.h" -#include "opentx.h" +#include "edgetx.h" #include "topbar.h" #include "view_main.h" #include "widget_settings.h" diff --git a/radio/src/gui/colorlcd/mainview/sliders.cpp b/radio/src/gui/colorlcd/mainview/sliders.cpp index a53f29fc4..9675e3c8b 100644 --- a/radio/src/gui/colorlcd/mainview/sliders.cpp +++ b/radio/src/gui/colorlcd/mainview/sliders.cpp @@ -23,7 +23,7 @@ #include "bitmaps.h" #include "hal/adc_driver.h" -#include "opentx.h" +#include "edgetx.h" #include "switches.h" static const lv_style_const_prop_t shadow1_props[] = { diff --git a/radio/src/gui/colorlcd/mainview/topbar.cpp b/radio/src/gui/colorlcd/mainview/topbar.cpp index 6dbc091d0..d83e87aaa 100644 --- a/radio/src/gui/colorlcd/mainview/topbar.cpp +++ b/radio/src/gui/colorlcd/mainview/topbar.cpp @@ -23,7 +23,7 @@ #include "layer.h" #include "menu_screen.h" -#include "opentx.h" +#include "edgetx.h" #include "storage/storage.h" #include "etx_lv_theme.h" #include "topbar_impl.h" diff --git a/radio/src/gui/colorlcd/mainview/topbar_impl.cpp b/radio/src/gui/colorlcd/mainview/topbar_impl.cpp index a3748012d..74208a186 100644 --- a/radio/src/gui/colorlcd/mainview/topbar_impl.cpp +++ b/radio/src/gui/colorlcd/mainview/topbar_impl.cpp @@ -20,7 +20,7 @@ */ #include "topbar_impl.h" -#include "opentx.h" +#include "edgetx.h" #include "theme_manager.h" #include "view_main.h" diff --git a/radio/src/gui/colorlcd/mainview/trims.cpp b/radio/src/gui/colorlcd/mainview/trims.cpp index 6da33de1a..7943c9a05 100644 --- a/radio/src/gui/colorlcd/mainview/trims.cpp +++ b/radio/src/gui/colorlcd/mainview/trims.cpp @@ -23,7 +23,7 @@ #include "bitmaps.h" #include "input_mapping.h" -#include "opentx.h" +#include "edgetx.h" #include "sliders.h" class TrimIcon : public SliderIcon diff --git a/radio/src/gui/colorlcd/mainview/view_about.cpp b/radio/src/gui/colorlcd/mainview/view_about.cpp index a29433423..0b51f61a0 100644 --- a/radio/src/gui/colorlcd/mainview/view_about.cpp +++ b/radio/src/gui/colorlcd/mainview/view_about.cpp @@ -21,7 +21,7 @@ #include "view_about.h" -#include "opentx.h" +#include "edgetx.h" #include "stamp.h" #if defined(VERSION_TAG) diff --git a/radio/src/gui/colorlcd/mainview/view_channels.cpp b/radio/src/gui/colorlcd/mainview/view_channels.cpp index f4f00ccff..fd0373748 100644 --- a/radio/src/gui/colorlcd/mainview/view_channels.cpp +++ b/radio/src/gui/colorlcd/mainview/view_channels.cpp @@ -27,7 +27,7 @@ #include "menu_radio.h" #include "menu_screen.h" #include "model_select.h" -#include "opentx.h" +#include "edgetx.h" #include "view_logical_switches.h" //----------------------------------------------------------------------------- diff --git a/radio/src/gui/colorlcd/mainview/view_logical_switches.cpp b/radio/src/gui/colorlcd/mainview/view_logical_switches.cpp index 11ae108fd..9c94cac00 100644 --- a/radio/src/gui/colorlcd/mainview/view_logical_switches.cpp +++ b/radio/src/gui/colorlcd/mainview/view_logical_switches.cpp @@ -21,7 +21,7 @@ #include "view_logical_switches.h" -#include "opentx.h" +#include "edgetx.h" #include "switches.h" #include "etx_lv_theme.h" diff --git a/radio/src/gui/colorlcd/mainview/view_main.cpp b/radio/src/gui/colorlcd/mainview/view_main.cpp index f44ce2d18..ef9a9a10c 100644 --- a/radio/src/gui/colorlcd/mainview/view_main.cpp +++ b/radio/src/gui/colorlcd/mainview/view_main.cpp @@ -25,7 +25,7 @@ #include "menu_radio.h" #include "menu_screen.h" #include "model_select.h" -#include "opentx.h" +#include "edgetx.h" #include "topbar_impl.h" #include "view_channels.h" #include "view_main_menu.h" diff --git a/radio/src/gui/colorlcd/mainview/view_main_decoration.cpp b/radio/src/gui/colorlcd/mainview/view_main_decoration.cpp index c50ca012a..0b11a70da 100644 --- a/radio/src/gui/colorlcd/mainview/view_main_decoration.cpp +++ b/radio/src/gui/colorlcd/mainview/view_main_decoration.cpp @@ -22,9 +22,9 @@ #include "view_main_decoration.h" // because of IS_POT_MULTIPOS() and pal -#include "opentx.h" +#include "edgetx.h" -// these 2 need things from opentx.h +// these 2 need things from edgetx.h #include "sliders.h" #include "trims.h" diff --git a/radio/src/gui/colorlcd/mainview/view_main_menu.cpp b/radio/src/gui/colorlcd/mainview/view_main_menu.cpp index f4b04d1c2..55b79fa61 100644 --- a/radio/src/gui/colorlcd/mainview/view_main_menu.cpp +++ b/radio/src/gui/colorlcd/mainview/view_main_menu.cpp @@ -25,7 +25,7 @@ #include "menu_radio.h" #include "menu_screen.h" #include "model_select.h" -#include "opentx.h" +#include "edgetx.h" #include "select_fab_carousel.h" #include "etx_lv_theme.h" #include "view_about.h" diff --git a/radio/src/gui/colorlcd/mainview/view_statistics.cpp b/radio/src/gui/colorlcd/mainview/view_statistics.cpp index 0747d0a8b..d6e27efd4 100644 --- a/radio/src/gui/colorlcd/mainview/view_statistics.cpp +++ b/radio/src/gui/colorlcd/mainview/view_statistics.cpp @@ -21,7 +21,7 @@ #include "view_statistics.h" -#include "opentx.h" +#include "edgetx.h" #include "tasks.h" #include "tasks/mixer_task.h" #include "mixer_scheduler.h" diff --git a/radio/src/gui/colorlcd/mainview/widget.cpp b/radio/src/gui/colorlcd/mainview/widget.cpp index d5b340297..4012ea79d 100644 --- a/radio/src/gui/colorlcd/mainview/widget.cpp +++ b/radio/src/gui/colorlcd/mainview/widget.cpp @@ -21,7 +21,7 @@ #include "widget.h" -#include "opentx.h" +#include "edgetx.h" #include "etx_lv_theme.h" #include "view_main.h" #include "widget_settings.h" diff --git a/radio/src/gui/colorlcd/mainview/widget_settings.cpp b/radio/src/gui/colorlcd/mainview/widget_settings.cpp index 5833f048d..360039029 100644 --- a/radio/src/gui/colorlcd/mainview/widget_settings.cpp +++ b/radio/src/gui/colorlcd/mainview/widget_settings.cpp @@ -23,7 +23,7 @@ #include "color_picker.h" #include "libopenui.h" -#include "opentx.h" +#include "edgetx.h" #include "sourcechoice.h" #include "switchchoice.h" #include "view_main.h" diff --git a/radio/src/gui/colorlcd/model/curveedit.cpp b/radio/src/gui/colorlcd/model/curveedit.cpp index bd08d2b06..5605a8d0b 100644 --- a/radio/src/gui/colorlcd/model/curveedit.cpp +++ b/radio/src/gui/colorlcd/model/curveedit.cpp @@ -22,7 +22,7 @@ #include "curveedit.h" #include "libopenui.h" -#include "opentx.h" // TODO for applyCustomCurve +#include "edgetx.h" // TODO for applyCustomCurve #include "etx_lv_theme.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/model/function_switches.cpp b/radio/src/gui/colorlcd/model/function_switches.cpp index 695facdd7..103f28f98 100644 --- a/radio/src/gui/colorlcd/model/function_switches.cpp +++ b/radio/src/gui/colorlcd/model/function_switches.cpp @@ -23,7 +23,7 @@ #include "function_switches.h" -#include "opentx.h" +#include "edgetx.h" #include "strhelpers.h" #include "switches.h" diff --git a/radio/src/gui/colorlcd/model/input_edit.cpp b/radio/src/gui/colorlcd/model/input_edit.cpp index 1d991372e..01299c881 100644 --- a/radio/src/gui/colorlcd/model/input_edit.cpp +++ b/radio/src/gui/colorlcd/model/input_edit.cpp @@ -27,7 +27,7 @@ #include "source_numberedit.h" #include "input_edit_adv.h" #include "input_source.h" -#include "opentx.h" +#include "edgetx.h" #include "etx_lv_theme.h" #include "switchchoice.h" diff --git a/radio/src/gui/colorlcd/model/input_edit_adv.cpp b/radio/src/gui/colorlcd/model/input_edit_adv.cpp index 2e3e12ead..6f9fd7293 100644 --- a/radio/src/gui/colorlcd/model/input_edit_adv.cpp +++ b/radio/src/gui/colorlcd/model/input_edit_adv.cpp @@ -22,7 +22,7 @@ #include "input_edit_adv.h" #include "fm_matrix.h" -#include "opentx.h" +#include "edgetx.h" #include "etx_lv_theme.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/model/menu_model.cpp b/radio/src/gui/colorlcd/model/menu_model.cpp index bd2a14827..e4076d0ae 100644 --- a/radio/src/gui/colorlcd/model/menu_model.cpp +++ b/radio/src/gui/colorlcd/model/menu_model.cpp @@ -35,7 +35,7 @@ #include "model_select.h" #include "model_setup.h" #include "model_telemetry.h" -#include "opentx.h" +#include "edgetx.h" #include "special_functions.h" #include "translations.h" #include "view_channels.h" diff --git a/radio/src/gui/colorlcd/model/mixer_edit.cpp b/radio/src/gui/colorlcd/model/mixer_edit.cpp index ca500045f..5e6e49b90 100644 --- a/radio/src/gui/colorlcd/model/mixer_edit.cpp +++ b/radio/src/gui/colorlcd/model/mixer_edit.cpp @@ -27,7 +27,7 @@ #include "curve_param.h" #include "mixer_edit_adv.h" #include "mixes.h" -#include "opentx.h" +#include "edgetx.h" #include "etx_lv_theme.h" #include "sourcechoice.h" #include "switchchoice.h" diff --git a/radio/src/gui/colorlcd/model/mixer_edit_adv.cpp b/radio/src/gui/colorlcd/model/mixer_edit_adv.cpp index 0cb6126c9..37df3ce13 100644 --- a/radio/src/gui/colorlcd/model/mixer_edit_adv.cpp +++ b/radio/src/gui/colorlcd/model/mixer_edit_adv.cpp @@ -24,7 +24,7 @@ #include "fm_matrix.h" #include "mixes.h" #include "numberedit.h" -#include "opentx.h" +#include "edgetx.h" #include "etx_lv_theme.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/model/model_curves.cpp b/radio/src/gui/colorlcd/model/model_curves.cpp index 66c078b6a..1239ed467 100644 --- a/radio/src/gui/colorlcd/model/model_curves.cpp +++ b/radio/src/gui/colorlcd/model/model_curves.cpp @@ -23,7 +23,7 @@ #include "curveedit.h" #include "libopenui.h" -#include "opentx.h" +#include "edgetx.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/model/model_curves.h b/radio/src/gui/colorlcd/model/model_curves.h index 55371a089..02a37b5d5 100644 --- a/radio/src/gui/colorlcd/model/model_curves.h +++ b/radio/src/gui/colorlcd/model/model_curves.h @@ -21,7 +21,7 @@ #pragma once -#include "opentx.h" +#include "edgetx.h" #include "tabsgroup.h" class ModelCurvesPage : public PageTab diff --git a/radio/src/gui/colorlcd/model/model_flightmodes.cpp b/radio/src/gui/colorlcd/model/model_flightmodes.cpp index a2c55902b..eb41f6f1e 100644 --- a/radio/src/gui/colorlcd/model/model_flightmodes.cpp +++ b/radio/src/gui/colorlcd/model/model_flightmodes.cpp @@ -23,7 +23,7 @@ #include "libopenui.h" #include "list_line_button.h" -#include "opentx.h" +#include "edgetx.h" #include "page.h" #include "switchchoice.h" #include "etx_lv_theme.h" diff --git a/radio/src/gui/colorlcd/model/model_flightmodes.h b/radio/src/gui/colorlcd/model/model_flightmodes.h index 0c47feef5..4e17a48a9 100644 --- a/radio/src/gui/colorlcd/model/model_flightmodes.h +++ b/radio/src/gui/colorlcd/model/model_flightmodes.h @@ -22,7 +22,7 @@ #pragma once #include "tabsgroup.h" -#include "opentx.h" +#include "edgetx.h" class ModelFlightModesPage : public PageTab { diff --git a/radio/src/gui/colorlcd/model/model_gvars.cpp b/radio/src/gui/colorlcd/model/model_gvars.cpp index c9a45df4b..ce9c5c2ae 100644 --- a/radio/src/gui/colorlcd/model/model_gvars.cpp +++ b/radio/src/gui/colorlcd/model/model_gvars.cpp @@ -24,7 +24,7 @@ #include "libopenui.h" #include "list_line_button.h" #include "numberedit.h" -#include "opentx.h" +#include "edgetx.h" #include "page.h" #include "etx_lv_theme.h" diff --git a/radio/src/gui/colorlcd/model/model_gvars.h b/radio/src/gui/colorlcd/model/model_gvars.h index c09da19f6..3a67f3aed 100644 --- a/radio/src/gui/colorlcd/model/model_gvars.h +++ b/radio/src/gui/colorlcd/model/model_gvars.h @@ -22,7 +22,7 @@ #pragma once #include "tabsgroup.h" -#include "opentx.h" +#include "edgetx.h" class ModelGVarsPage : public PageTab { diff --git a/radio/src/gui/colorlcd/model/model_heli.cpp b/radio/src/gui/colorlcd/model/model_heli.cpp index 999868b62..f9556a108 100644 --- a/radio/src/gui/colorlcd/model/model_heli.cpp +++ b/radio/src/gui/colorlcd/model/model_heli.cpp @@ -20,7 +20,7 @@ */ #include "model_heli.h" -#include "opentx.h" +#include "edgetx.h" #include "libopenui.h" #include "sourcechoice.h" diff --git a/radio/src/gui/colorlcd/model/model_heli.h b/radio/src/gui/colorlcd/model/model_heli.h index 1291b7538..b8852630b 100644 --- a/radio/src/gui/colorlcd/model/model_heli.h +++ b/radio/src/gui/colorlcd/model/model_heli.h @@ -21,7 +21,7 @@ #pragma once -#include "opentx.h" +#include "edgetx.h" #include "tabsgroup.h" class ModelHeliPage : public PageTab diff --git a/radio/src/gui/colorlcd/model/model_inputs.cpp b/radio/src/gui/colorlcd/model/model_inputs.cpp index aa14d763a..b11a6e501 100644 --- a/radio/src/gui/colorlcd/model/model_inputs.cpp +++ b/radio/src/gui/colorlcd/model/model_inputs.cpp @@ -25,7 +25,7 @@ #include "hal/adc_driver.h" #include "input_edit.h" -#include "opentx.h" +#include "edgetx.h" #include "tasks/mixer_task.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/model/model_logical_switches.cpp b/radio/src/gui/colorlcd/model/model_logical_switches.cpp index 1c0e56547..9c584a386 100644 --- a/radio/src/gui/colorlcd/model/model_logical_switches.cpp +++ b/radio/src/gui/colorlcd/model/model_logical_switches.cpp @@ -23,7 +23,7 @@ #include "libopenui.h" #include "list_line_button.h" -#include "opentx.h" +#include "edgetx.h" #include "page.h" #include "sourcechoice.h" #include "switchchoice.h" diff --git a/radio/src/gui/colorlcd/model/model_logical_switches.h b/radio/src/gui/colorlcd/model/model_logical_switches.h index f2c4dcfe0..99bba16a3 100644 --- a/radio/src/gui/colorlcd/model/model_logical_switches.h +++ b/radio/src/gui/colorlcd/model/model_logical_switches.h @@ -22,7 +22,7 @@ #pragma once #include "tabsgroup.h" -#include "opentx.h" +#include "edgetx.h" class ModelLogicalSwitchesPage : public PageTab { diff --git a/radio/src/gui/colorlcd/model/model_mixer_scripts.cpp b/radio/src/gui/colorlcd/model/model_mixer_scripts.cpp index 15995bbaf..f69292c0b 100644 --- a/radio/src/gui/colorlcd/model/model_mixer_scripts.cpp +++ b/radio/src/gui/colorlcd/model/model_mixer_scripts.cpp @@ -27,7 +27,7 @@ #include "list_line_button.h" #include "lua/lua_api.h" #include "menus.h" -#include "opentx.h" +#include "edgetx.h" #include "page.h" #include "sourcechoice.h" #include "etx_lv_theme.h" diff --git a/radio/src/gui/colorlcd/model/model_mixer_scripts.h b/radio/src/gui/colorlcd/model/model_mixer_scripts.h index 775d32c82..ccf989e42 100644 --- a/radio/src/gui/colorlcd/model/model_mixer_scripts.h +++ b/radio/src/gui/colorlcd/model/model_mixer_scripts.h @@ -22,7 +22,7 @@ #pragma once #include "tabsgroup.h" -#include "opentx.h" +#include "edgetx.h" class ModelMixerScriptsPage : public PageTab { diff --git a/radio/src/gui/colorlcd/model/model_mixes.cpp b/radio/src/gui/colorlcd/model/model_mixes.cpp index 148f40edf..e82cf8edb 100644 --- a/radio/src/gui/colorlcd/model/model_mixes.cpp +++ b/radio/src/gui/colorlcd/model/model_mixes.cpp @@ -20,7 +20,7 @@ */ #include "model_mixes.h" -#include "opentx.h" +#include "edgetx.h" #include "mixer_edit.h" #include "mixes.h" #include "channel_bar.h" diff --git a/radio/src/gui/colorlcd/model/model_outputs.cpp b/radio/src/gui/colorlcd/model/model_outputs.cpp index ead8b21bd..2bd49b90d 100644 --- a/radio/src/gui/colorlcd/model/model_outputs.cpp +++ b/radio/src/gui/colorlcd/model/model_outputs.cpp @@ -23,7 +23,7 @@ #include "channel_bar.h" #include "list_line_button.h" -#include "opentx.h" +#include "edgetx.h" #include "output_edit.h" #include "etx_lv_theme.h" diff --git a/radio/src/gui/colorlcd/model/model_select.cpp b/radio/src/gui/colorlcd/model/model_select.cpp index 24ac56157..06895fb70 100644 --- a/radio/src/gui/colorlcd/model/model_select.cpp +++ b/radio/src/gui/colorlcd/model/model_select.cpp @@ -26,7 +26,7 @@ #include "menu_radio.h" #include "menu_screen.h" #include "model_templates.h" -#include "opentx.h" +#include "edgetx.h" #include "standalone_lua.h" #include "etx_lv_theme.h" #include "view_channels.h" diff --git a/radio/src/gui/colorlcd/model/model_setup.cpp b/radio/src/gui/colorlcd/model/model_setup.cpp index ff1f221ac..fea59d407 100644 --- a/radio/src/gui/colorlcd/model/model_setup.cpp +++ b/radio/src/gui/colorlcd/model/model_setup.cpp @@ -41,7 +41,7 @@ #include "trainer_setup.h" #include "trims_setup.h" #include "module_setup.h" -#include "opentx.h" +#include "edgetx.h" #include "storage/modelslist.h" #include "etx_lv_theme.h" diff --git a/radio/src/gui/colorlcd/model/model_telemetry.cpp b/radio/src/gui/colorlcd/model/model_telemetry.cpp index 26066f633..99b429dfb 100644 --- a/radio/src/gui/colorlcd/model/model_telemetry.cpp +++ b/radio/src/gui/colorlcd/model/model_telemetry.cpp @@ -24,7 +24,7 @@ #include "fullscreen_dialog.h" #include "libopenui.h" #include "list_line_button.h" -#include "opentx.h" +#include "edgetx.h" #include "page.h" #include "sourcechoice.h" #include "etx_lv_theme.h" diff --git a/radio/src/gui/colorlcd/model/model_telemetry.h b/radio/src/gui/colorlcd/model/model_telemetry.h index 152583045..0ece1f613 100644 --- a/radio/src/gui/colorlcd/model/model_telemetry.h +++ b/radio/src/gui/colorlcd/model/model_telemetry.h @@ -22,7 +22,7 @@ #pragma once #include "tabsgroup.h" -#include "opentx.h" +#include "edgetx.h" class ModelTelemetryPage : public PageTab { diff --git a/radio/src/gui/colorlcd/model/model_templates.h b/radio/src/gui/colorlcd/model/model_templates.h index 6560e5baf..133af21ba 100644 --- a/radio/src/gui/colorlcd/model/model_templates.h +++ b/radio/src/gui/colorlcd/model/model_templates.h @@ -23,7 +23,7 @@ #include -#include "opentx.h" +#include "edgetx.h" #include "page.h" class TemplatePage : public Page diff --git a/radio/src/gui/colorlcd/model/model_usbjoystick.cpp b/radio/src/gui/colorlcd/model/model_usbjoystick.cpp index 09ce6bf67..a60f5c383 100644 --- a/radio/src/gui/colorlcd/model/model_usbjoystick.cpp +++ b/radio/src/gui/colorlcd/model/model_usbjoystick.cpp @@ -24,7 +24,7 @@ #include "button_matrix.h" #include "channel_bar.h" #include "list_line_button.h" -#include "opentx.h" +#include "edgetx.h" #include "etx_lv_theme.h" #include "usb_joystick.h" diff --git a/radio/src/gui/colorlcd/model/output_edit.cpp b/radio/src/gui/colorlcd/model/output_edit.cpp index 1b03a0cf7..c4266581d 100644 --- a/radio/src/gui/colorlcd/model/output_edit.cpp +++ b/radio/src/gui/colorlcd/model/output_edit.cpp @@ -23,7 +23,7 @@ #include "channel_bar.h" #include "gvar_numberedit.h" -#include "opentx.h" +#include "edgetx.h" #include "etx_lv_theme.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/model/preflight_checks.cpp b/radio/src/gui/colorlcd/model/preflight_checks.cpp index 8268741ff..e07660631 100644 --- a/radio/src/gui/colorlcd/model/preflight_checks.cpp +++ b/radio/src/gui/colorlcd/model/preflight_checks.cpp @@ -24,7 +24,7 @@ #include "button_matrix.h" #include "hal/adc_driver.h" #include "hal/switch_driver.h" -#include "opentx.h" +#include "edgetx.h" #include "strhelpers.h" #include "etx_lv_theme.h" diff --git a/radio/src/gui/colorlcd/model/special_functions.h b/radio/src/gui/colorlcd/model/special_functions.h index 7bdc7a5c2..a5dfa309d 100644 --- a/radio/src/gui/colorlcd/model/special_functions.h +++ b/radio/src/gui/colorlcd/model/special_functions.h @@ -23,7 +23,7 @@ #include "libopenui.h" #include "list_line_button.h" -#include "opentx.h" +#include "edgetx.h" #include "page.h" #include "tabsgroup.h" diff --git a/radio/src/gui/colorlcd/model/throttle_params.cpp b/radio/src/gui/colorlcd/model/throttle_params.cpp index a737ead87..9083f8ab9 100644 --- a/radio/src/gui/colorlcd/model/throttle_params.cpp +++ b/radio/src/gui/colorlcd/model/throttle_params.cpp @@ -20,7 +20,7 @@ */ #include "throttle_params.h" -#include "opentx.h" +#include "edgetx.h" #include "sourcechoice.h" #include "switchchoice.h" diff --git a/radio/src/gui/colorlcd/model/timer_setup.cpp b/radio/src/gui/colorlcd/model/timer_setup.cpp index 8a5c59e48..b0b904ffe 100644 --- a/radio/src/gui/colorlcd/model/timer_setup.cpp +++ b/radio/src/gui/colorlcd/model/timer_setup.cpp @@ -21,7 +21,7 @@ #include "timer_setup.h" -#include "opentx.h" +#include "edgetx.h" #include "switchchoice.h" #include "timeedit.h" diff --git a/radio/src/gui/colorlcd/model/trainer_bluetooth.cpp b/radio/src/gui/colorlcd/model/trainer_bluetooth.cpp index e076d95db..dd66784c0 100644 --- a/radio/src/gui/colorlcd/model/trainer_bluetooth.cpp +++ b/radio/src/gui/colorlcd/model/trainer_bluetooth.cpp @@ -20,7 +20,7 @@ */ #include "trainer_bluetooth.h" -#include "opentx.h" +#include "edgetx.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/model/trainer_setup.cpp b/radio/src/gui/colorlcd/model/trainer_setup.cpp index bf5c9cc6d..19f323a21 100644 --- a/radio/src/gui/colorlcd/model/trainer_setup.cpp +++ b/radio/src/gui/colorlcd/model/trainer_setup.cpp @@ -20,7 +20,7 @@ */ #include "trainer_setup.h" -#include "opentx.h" +#include "edgetx.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/model/trims_setup.cpp b/radio/src/gui/colorlcd/model/trims_setup.cpp index c565b147e..2699a514c 100644 --- a/radio/src/gui/colorlcd/model/trims_setup.cpp +++ b/radio/src/gui/colorlcd/model/trims_setup.cpp @@ -21,7 +21,7 @@ #include "trims_setup.h" -#include "opentx.h" +#include "edgetx.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/module/access_settings.cpp b/radio/src/gui/colorlcd/module/access_settings.cpp index c330ac56c..d6c8c27d3 100644 --- a/radio/src/gui/colorlcd/module/access_settings.cpp +++ b/radio/src/gui/colorlcd/module/access_settings.cpp @@ -24,7 +24,7 @@ #include #include "channel_bar.h" -#include "opentx.h" +#include "edgetx.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/module/afhds2a_settings.cpp b/radio/src/gui/colorlcd/module/afhds2a_settings.cpp index 6c6a2f60d..6b97e2c35 100644 --- a/radio/src/gui/colorlcd/module/afhds2a_settings.cpp +++ b/radio/src/gui/colorlcd/module/afhds2a_settings.cpp @@ -20,7 +20,7 @@ */ #include "afhds2a_settings.h" -#include "opentx.h" +#include "edgetx.h" #include "pulses/flysky.h" diff --git a/radio/src/gui/colorlcd/module/afhds3_options.cpp b/radio/src/gui/colorlcd/module/afhds3_options.cpp index f949599f5..49cb47476 100644 --- a/radio/src/gui/colorlcd/module/afhds3_options.cpp +++ b/radio/src/gui/colorlcd/module/afhds3_options.cpp @@ -20,7 +20,7 @@ */ #include "afhds3_options.h" -#include "opentx.h" +#include "edgetx.h" static const lv_coord_t col_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST}; diff --git a/radio/src/gui/colorlcd/module/afhds3_settings.cpp b/radio/src/gui/colorlcd/module/afhds3_settings.cpp index 4c2e649be..eaa4fbf92 100644 --- a/radio/src/gui/colorlcd/module/afhds3_settings.cpp +++ b/radio/src/gui/colorlcd/module/afhds3_settings.cpp @@ -22,7 +22,7 @@ #include "afhds3_settings.h" #include "afhds3_options.h" -#include "opentx.h" +#include "edgetx.h" static const char* const _afhds3_region[] = {"CE", "FCC"}; diff --git a/radio/src/gui/colorlcd/module/bind_menu_d16.cpp b/radio/src/gui/colorlcd/module/bind_menu_d16.cpp index adcad43af..ca4d740a4 100644 --- a/radio/src/gui/colorlcd/module/bind_menu_d16.cpp +++ b/radio/src/gui/colorlcd/module/bind_menu_d16.cpp @@ -20,7 +20,7 @@ */ #include "bind_menu_d16.h" -#include "opentx.h" +#include "edgetx.h" #if defined(MULTIMODULE) #include "telemetry/multi.h" diff --git a/radio/src/gui/colorlcd/module/crossfire_settings.cpp b/radio/src/gui/colorlcd/module/crossfire_settings.cpp index 3cf0dac25..1bcd25f3a 100644 --- a/radio/src/gui/colorlcd/module/crossfire_settings.cpp +++ b/radio/src/gui/colorlcd/module/crossfire_settings.cpp @@ -20,7 +20,7 @@ */ #include "crossfire_settings.h" -#include "opentx.h" +#include "edgetx.h" #include "mixer_scheduler.h" diff --git a/radio/src/gui/colorlcd/module/custom_failsafe.cpp b/radio/src/gui/colorlcd/module/custom_failsafe.cpp index 332f2c298..a8080fb4f 100644 --- a/radio/src/gui/colorlcd/module/custom_failsafe.cpp +++ b/radio/src/gui/colorlcd/module/custom_failsafe.cpp @@ -22,7 +22,7 @@ #include "custom_failsafe.h" #include "channel_bar.h" -#include "opentx.h" +#include "edgetx.h" #include "etx_lv_theme.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/module/module_setup.cpp b/radio/src/gui/colorlcd/module/module_setup.cpp index 032dbae2b..68f3f14c6 100644 --- a/radio/src/gui/colorlcd/module/module_setup.cpp +++ b/radio/src/gui/colorlcd/module/module_setup.cpp @@ -28,7 +28,7 @@ #include "custom_failsafe.h" #include "form.h" #include "mixer_scheduler.h" -#include "opentx.h" +#include "edgetx.h" #include "ppm_settings.h" #include "storage/modelslist.h" #include "etx_lv_theme.h" diff --git a/radio/src/gui/colorlcd/module/mpm_settings.cpp b/radio/src/gui/colorlcd/module/mpm_settings.cpp index c27f62ff3..30d9b97d3 100644 --- a/radio/src/gui/colorlcd/module/mpm_settings.cpp +++ b/radio/src/gui/colorlcd/module/mpm_settings.cpp @@ -24,7 +24,7 @@ #include "choice.h" #include "io/multi_protolist.h" #include "multi_rfprotos.h" -#include "opentx.h" +#include "edgetx.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/module/ppm_settings.cpp b/radio/src/gui/colorlcd/module/ppm_settings.cpp index 5aef4e93b..4551ab483 100644 --- a/radio/src/gui/colorlcd/module/ppm_settings.cpp +++ b/radio/src/gui/colorlcd/module/ppm_settings.cpp @@ -21,7 +21,7 @@ #include "ppm_settings.h" -#include "opentx.h" +#include "edgetx.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/module/pxx1_settings.cpp b/radio/src/gui/colorlcd/module/pxx1_settings.cpp index edda61673..047837281 100644 --- a/radio/src/gui/colorlcd/module/pxx1_settings.cpp +++ b/radio/src/gui/colorlcd/module/pxx1_settings.cpp @@ -22,7 +22,7 @@ #include "pxx1_settings.h" #include "choice.h" -#include "opentx.h" +#include "edgetx.h" #define SET_DIRTY() storageDirty(EE_MODEL) diff --git a/radio/src/gui/colorlcd/radio/hw_bluetooth.cpp b/radio/src/gui/colorlcd/radio/hw_bluetooth.cpp index 1adaf2e0a..c26818b68 100644 --- a/radio/src/gui/colorlcd/radio/hw_bluetooth.cpp +++ b/radio/src/gui/colorlcd/radio/hw_bluetooth.cpp @@ -21,7 +21,7 @@ #include "hw_bluetooth.h" -#include "opentx.h" +#include "edgetx.h" #define SET_DIRTY() storageDirty(EE_GENERAL) diff --git a/radio/src/gui/colorlcd/radio/hw_extmodule.cpp b/radio/src/gui/colorlcd/radio/hw_extmodule.cpp index d14bc562c..a8a0e0e97 100644 --- a/radio/src/gui/colorlcd/radio/hw_extmodule.cpp +++ b/radio/src/gui/colorlcd/radio/hw_extmodule.cpp @@ -21,7 +21,7 @@ #include "hw_extmodule.h" -#include "opentx.h" +#include "edgetx.h" #define SET_DIRTY() storageDirty(EE_GENERAL) diff --git a/radio/src/gui/colorlcd/radio/hw_inputs.cpp b/radio/src/gui/colorlcd/radio/hw_inputs.cpp index 27a7b5c76..2698ad3b8 100644 --- a/radio/src/gui/colorlcd/radio/hw_inputs.cpp +++ b/radio/src/gui/colorlcd/radio/hw_inputs.cpp @@ -24,7 +24,7 @@ #include "analogs.h" #include "hal/adc_driver.h" #include "hal/switch_driver.h" -#include "opentx.h" +#include "edgetx.h" #include "switches.h" #define SET_DIRTY() storageDirty(EE_GENERAL) diff --git a/radio/src/gui/colorlcd/radio/hw_intmodule.cpp b/radio/src/gui/colorlcd/radio/hw_intmodule.cpp index 0304c6ce3..61f404d69 100644 --- a/radio/src/gui/colorlcd/radio/hw_intmodule.cpp +++ b/radio/src/gui/colorlcd/radio/hw_intmodule.cpp @@ -21,7 +21,7 @@ #include "hw_intmodule.h" -#include "opentx.h" +#include "edgetx.h" #if defined(CROSSFIRE) #include "telemetry/crossfire.h" diff --git a/radio/src/gui/colorlcd/radio/hw_serial.cpp b/radio/src/gui/colorlcd/radio/hw_serial.cpp index 3e827f75d..73dc45dc8 100644 --- a/radio/src/gui/colorlcd/radio/hw_serial.cpp +++ b/radio/src/gui/colorlcd/radio/hw_serial.cpp @@ -20,7 +20,7 @@ */ #include "hw_serial.h" -#include "opentx.h" +#include "edgetx.h" #define SET_DIRTY() storageDirty(EE_GENERAL) diff --git a/radio/src/gui/colorlcd/radio/menu_radio.cpp b/radio/src/gui/colorlcd/radio/menu_radio.cpp index 63afc582e..df26edc47 100644 --- a/radio/src/gui/colorlcd/radio/menu_radio.cpp +++ b/radio/src/gui/colorlcd/radio/menu_radio.cpp @@ -25,7 +25,7 @@ #include "menu_screen.h" #include "model_select.h" #include "myeeprom.h" -#include "opentx.h" +#include "edgetx.h" #include "radio_calibration.h" #include "radio_hardware.h" #include "radio_sdmanager.h" diff --git a/radio/src/gui/colorlcd/radio/preview_window.cpp b/radio/src/gui/colorlcd/radio/preview_window.cpp index 01dc9a752..efeb242bd 100644 --- a/radio/src/gui/colorlcd/radio/preview_window.cpp +++ b/radio/src/gui/colorlcd/radio/preview_window.cpp @@ -22,7 +22,7 @@ #include "preview_window.h" #include "libopenui.h" -#include "opentx.h" +#include "edgetx.h" #include "sliders.h" #include "etx_lv_theme.h" #include "trims.h" diff --git a/radio/src/gui/colorlcd/radio/radio_calibration.cpp b/radio/src/gui/colorlcd/radio/radio_calibration.cpp index 778fab001..d1cca29de 100644 --- a/radio/src/gui/colorlcd/radio/radio_calibration.cpp +++ b/radio/src/gui/colorlcd/radio/radio_calibration.cpp @@ -22,7 +22,7 @@ #include "radio_calibration.h" #include "hal/adc_driver.h" -#include "opentx.h" +#include "edgetx.h" #include "sliders.h" #include "view_main_decoration.h" diff --git a/radio/src/gui/colorlcd/radio/radio_diaganas.cpp b/radio/src/gui/colorlcd/radio/radio_diaganas.cpp index a256e8d34..ed192e54c 100644 --- a/radio/src/gui/colorlcd/radio/radio_diaganas.cpp +++ b/radio/src/gui/colorlcd/radio/radio_diaganas.cpp @@ -23,7 +23,7 @@ #include "hal/adc_driver.h" #include "libopenui.h" -#include "opentx.h" +#include "edgetx.h" #include "etx_lv_theme.h" // #if defined(IMU_LSM6DS33) diff --git a/radio/src/gui/colorlcd/radio/radio_diagcustswitches.cpp b/radio/src/gui/colorlcd/radio/radio_diagcustswitches.cpp index 598322b5c..f5d00cbc1 100644 --- a/radio/src/gui/colorlcd/radio/radio_diagcustswitches.cpp +++ b/radio/src/gui/colorlcd/radio/radio_diagcustswitches.cpp @@ -25,7 +25,7 @@ #include "board.h" #include "libopenui.h" -#include "opentx.h" +#include "edgetx.h" class RadioCustSwitchesDiagsWindow : public Window { diff --git a/radio/src/gui/colorlcd/radio/radio_diagkeys.cpp b/radio/src/gui/colorlcd/radio/radio_diagkeys.cpp index a4714fd7c..641808edf 100644 --- a/radio/src/gui/colorlcd/radio/radio_diagkeys.cpp +++ b/radio/src/gui/colorlcd/radio/radio_diagkeys.cpp @@ -23,7 +23,7 @@ #include "hal/rotary_encoder.h" #include "libopenui.h" -#include "opentx.h" +#include "edgetx.h" #if defined(PCBPL18) static const uint8_t _trimMap[MAX_TRIMS * 2] = {8, 9, 10, 11, 12, 13, 14, 15, diff --git a/radio/src/gui/colorlcd/radio/radio_ghost_module_config.cpp b/radio/src/gui/colorlcd/radio/radio_ghost_module_config.cpp index 61f6cd9fd..bdc460f2e 100644 --- a/radio/src/gui/colorlcd/radio/radio_ghost_module_config.cpp +++ b/radio/src/gui/colorlcd/radio/radio_ghost_module_config.cpp @@ -22,7 +22,7 @@ #include "radio_ghost_module_config.h" #include "libopenui.h" -#include "opentx.h" +#include "edgetx.h" #include "telemetry/ghost.h" #include "telemetry/ghost_menu.h" diff --git a/radio/src/gui/colorlcd/radio/radio_hardware.cpp b/radio/src/gui/colorlcd/radio/radio_hardware.cpp index 8538c8228..e92e1a4e4 100644 --- a/radio/src/gui/colorlcd/radio/radio_hardware.cpp +++ b/radio/src/gui/colorlcd/radio/radio_hardware.cpp @@ -27,7 +27,7 @@ #include "hw_intmodule.h" #include "hw_serial.h" #include "libopenui.h" -#include "opentx.h" +#include "edgetx.h" #include "radio_calibration.h" #include "radio_diaganas.h" #include "radio_diagkeys.h" diff --git a/radio/src/gui/colorlcd/radio/radio_sdmanager.cpp b/radio/src/gui/colorlcd/radio/radio_sdmanager.cpp index cde86f1d8..d1a99c335 100644 --- a/radio/src/gui/colorlcd/radio/radio_sdmanager.cpp +++ b/radio/src/gui/colorlcd/radio/radio_sdmanager.cpp @@ -20,7 +20,7 @@ */ #include "radio_sdmanager.h" -#include "opentx.h" +#include "edgetx.h" #include "libopenui.h" #include "LvglWrapper.h" #include "io/frsky_firmware_update.h" diff --git a/radio/src/gui/colorlcd/radio/radio_setup.cpp b/radio/src/gui/colorlcd/radio/radio_setup.cpp index 403693e10..660119ba0 100644 --- a/radio/src/gui/colorlcd/radio/radio_setup.cpp +++ b/radio/src/gui/colorlcd/radio/radio_setup.cpp @@ -27,7 +27,7 @@ #include "hal/usb_driver.h" #include "input_mapping.h" #include "libopenui.h" -#include "opentx.h" +#include "edgetx.h" #include "page.h" #include "storage/modelslist.h" #include "tasks/mixer_task.h" diff --git a/radio/src/gui/colorlcd/radio/radio_spectrum_analyser.cpp b/radio/src/gui/colorlcd/radio/radio_spectrum_analyser.cpp index 15438e0c7..f1634e2f8 100644 --- a/radio/src/gui/colorlcd/radio/radio_spectrum_analyser.cpp +++ b/radio/src/gui/colorlcd/radio/radio_spectrum_analyser.cpp @@ -22,7 +22,7 @@ #include "radio_spectrum_analyser.h" #include "libopenui.h" -#include "opentx.h" +#include "edgetx.h" #define SET_DIRTY() storageDirty(EE_GENERAL) diff --git a/radio/src/gui/colorlcd/radio/radio_theme.cpp b/radio/src/gui/colorlcd/radio/radio_theme.cpp index ea607b339..a2a0cdefd 100644 --- a/radio/src/gui/colorlcd/radio/radio_theme.cpp +++ b/radio/src/gui/colorlcd/radio/radio_theme.cpp @@ -25,7 +25,7 @@ #include "color_editor.h" #include "color_list.h" #include "libopenui.h" -#include "opentx.h" +#include "edgetx.h" #include "page.h" #include "preview_window.h" #include "etx_lv_theme.h" diff --git a/radio/src/gui/colorlcd/radio/radio_theme.h b/radio/src/gui/colorlcd/radio/radio_theme.h index 05178f489..3398257ab 100644 --- a/radio/src/gui/colorlcd/radio/radio_theme.h +++ b/radio/src/gui/colorlcd/radio/radio_theme.h @@ -22,7 +22,7 @@ #pragma once #include "tabsgroup.h" -#include "opentx.h" +#include "edgetx.h" class ListBox; class TabsGroup; diff --git a/radio/src/gui/colorlcd/radio/radio_tools.cpp b/radio/src/gui/colorlcd/radio/radio_tools.cpp index 3be7961e7..ffe5148d8 100644 --- a/radio/src/gui/colorlcd/radio/radio_tools.cpp +++ b/radio/src/gui/colorlcd/radio/radio_tools.cpp @@ -26,7 +26,7 @@ #include "hal/module_port.h" #include "libopenui.h" #include "lua/lua_api.h" -#include "opentx.h" +#include "edgetx.h" #include "radio_ghost_module_config.h" #include "radio_spectrum_analyser.h" #include "standalone_lua.h" diff --git a/radio/src/gui/colorlcd/radio/radio_trainer.cpp b/radio/src/gui/colorlcd/radio/radio_trainer.cpp index 52d1a395d..137d4ef4e 100644 --- a/radio/src/gui/colorlcd/radio/radio_trainer.cpp +++ b/radio/src/gui/colorlcd/radio/radio_trainer.cpp @@ -24,7 +24,7 @@ #include "hal/adc_driver.h" #include "input_mapping.h" #include "libopenui.h" -#include "opentx.h" +#include "edgetx.h" #include "strhelpers.h" #define SET_DIRTY() storageDirty(EE_GENERAL) diff --git a/radio/src/gui/colorlcd/radio/radio_trainer.h b/radio/src/gui/colorlcd/radio/radio_trainer.h index c54c13091..99ea50b93 100644 --- a/radio/src/gui/colorlcd/radio/radio_trainer.h +++ b/radio/src/gui/colorlcd/radio/radio_trainer.h @@ -22,7 +22,7 @@ #pragma once #include "tabsgroup.h" -#include "opentx.h" +#include "edgetx.h" class RadioTrainerPage : public PageTab { diff --git a/radio/src/gui/colorlcd/radio/radio_version.cpp b/radio/src/gui/colorlcd/radio/radio_version.cpp index 651f6b564..affc73b6c 100644 --- a/radio/src/gui/colorlcd/radio/radio_version.cpp +++ b/radio/src/gui/colorlcd/radio/radio_version.cpp @@ -24,7 +24,7 @@ #include "fw_version.h" #include "hal/module_port.h" #include "libopenui.h" -#include "opentx.h" +#include "edgetx.h" #include "options.h" #include "etx_lv_theme.h" diff --git a/radio/src/gui/colorlcd/startup_shutdown.cpp b/radio/src/gui/colorlcd/startup_shutdown.cpp index 93a0d595c..fbb90912b 100644 --- a/radio/src/gui/colorlcd/startup_shutdown.cpp +++ b/radio/src/gui/colorlcd/startup_shutdown.cpp @@ -21,7 +21,7 @@ #include "hal/abnormal_reboot.h" #include "inactivity_timer.h" -#include "opentx.h" +#include "edgetx.h" #include "stamp.h" #include "theme_manager.h" diff --git a/radio/src/gui/colorlcd/themes/theme_manager.h b/radio/src/gui/colorlcd/themes/theme_manager.h index a6be838ec..7d9e94f08 100644 --- a/radio/src/gui/colorlcd/themes/theme_manager.h +++ b/radio/src/gui/colorlcd/themes/theme_manager.h @@ -25,7 +25,7 @@ #include "colors.h" #include "debug.h" -#include "opentx.h" +#include "edgetx.h" #include "sdcard.h" struct ColorEntry diff --git a/radio/src/gui/colorlcd/widgets/gauge.cpp b/radio/src/gui/colorlcd/widgets/gauge.cpp index 781cd5524..d42d8fdaa 100644 --- a/radio/src/gui/colorlcd/widgets/gauge.cpp +++ b/radio/src/gui/colorlcd/widgets/gauge.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "widget.h" class GaugeWidget : public Widget diff --git a/radio/src/gui/colorlcd/widgets/modelbmp.cpp b/radio/src/gui/colorlcd/widgets/modelbmp.cpp index 504f95891..de2953d53 100644 --- a/radio/src/gui/colorlcd/widgets/modelbmp.cpp +++ b/radio/src/gui/colorlcd/widgets/modelbmp.cpp @@ -21,7 +21,7 @@ #include -#include "opentx.h" +#include "edgetx.h" #include "widget.h" #define ETX_STATE_BG_FILL LV_STATE_USER_1 diff --git a/radio/src/gui/colorlcd/widgets/outputs.cpp b/radio/src/gui/colorlcd/widgets/outputs.cpp index 40093f939..084154d6c 100644 --- a/radio/src/gui/colorlcd/widgets/outputs.cpp +++ b/radio/src/gui/colorlcd/widgets/outputs.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "widget.h" #define ETX_STATE_BG_FILL LV_STATE_USER_1 diff --git a/radio/src/gui/colorlcd/widgets/radio_info.cpp b/radio/src/gui/colorlcd/widgets/radio_info.cpp index 8e2e7cb89..ae598a9ab 100644 --- a/radio/src/gui/colorlcd/widgets/radio_info.cpp +++ b/radio/src/gui/colorlcd/widgets/radio_info.cpp @@ -20,7 +20,7 @@ */ #include "hal/usb_driver.h" -#include "opentx.h" +#include "edgetx.h" #include "theme_manager.h" #include "widget.h" #include "widgets_container_impl.h" diff --git a/radio/src/gui/colorlcd/widgets/text.cpp b/radio/src/gui/colorlcd/widgets/text.cpp index 8d239b4c9..d745fd2fc 100644 --- a/radio/src/gui/colorlcd/widgets/text.cpp +++ b/radio/src/gui/colorlcd/widgets/text.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "widget.h" #define TEXT_WIDGET_DEFAULT_LABEL \ diff --git a/radio/src/gui/colorlcd/widgets/timer.cpp b/radio/src/gui/colorlcd/widgets/timer.cpp index 887c28011..426ba5037 100644 --- a/radio/src/gui/colorlcd/widgets/timer.cpp +++ b/radio/src/gui/colorlcd/widgets/timer.cpp @@ -20,7 +20,7 @@ */ #include "bitmaps.h" -#include "opentx.h" +#include "edgetx.h" #include "widget.h" #define ETX_STATE_BG_WARNING LV_STATE_USER_1 diff --git a/radio/src/gui/colorlcd/widgets/value.cpp b/radio/src/gui/colorlcd/widgets/value.cpp index 954199a5b..b46f0c88d 100644 --- a/radio/src/gui/colorlcd/widgets/value.cpp +++ b/radio/src/gui/colorlcd/widgets/value.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "widget.h" #define ETX_STATE_TIMER_ELAPSED LV_STATE_USER_1 diff --git a/radio/src/gui/common/stdlcd/calibration.cpp b/radio/src/gui/common/stdlcd/calibration.cpp index 980298535..f3bf8b817 100644 --- a/radio/src/gui/common/stdlcd/calibration.cpp +++ b/radio/src/gui/common/stdlcd/calibration.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "calibration.h" #include "hal/adc_driver.h" diff --git a/radio/src/gui/common/stdlcd/calibration.h b/radio/src/gui/common/stdlcd/calibration.h index 924438a6f..d7b7771a6 100644 --- a/radio/src/gui/common/stdlcd/calibration.h +++ b/radio/src/gui/common/stdlcd/calibration.h @@ -21,7 +21,7 @@ #pragma once -#include "opentx_types.h" +#include "edgetx_types.h" // Runs the main calibration steps void menuCommonCalib(event_t event); diff --git a/radio/src/gui/common/stdlcd/draw_functions.cpp b/radio/src/gui/common/stdlcd/draw_functions.cpp index 2c4dafd9b..2da1caf4e 100644 --- a/radio/src/gui/common/stdlcd/draw_functions.cpp +++ b/radio/src/gui/common/stdlcd/draw_functions.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include #include "hal/adc_driver.h" diff --git a/radio/src/gui/common/stdlcd/menus.cpp b/radio/src/gui/common/stdlcd/menus.cpp index 2c770fbe9..dee40a302 100644 --- a/radio/src/gui/common/stdlcd/menus.cpp +++ b/radio/src/gui/common/stdlcd/menus.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" MenuHandlerFunc menuHandlers[5]; event_t menuEvent = 0; diff --git a/radio/src/gui/common/stdlcd/menus.h b/radio/src/gui/common/stdlcd/menus.h index 04fd323b4..f63250856 100644 --- a/radio/src/gui/common/stdlcd/menus.h +++ b/radio/src/gui/common/stdlcd/menus.h @@ -19,10 +19,9 @@ * GNU General Public License for more details. */ -#ifndef _COMMON_MENUS_H_ -#define _COMMON_MENUS_H_ +#pragma once -#include "opentx_types.h" +#include "edgetx_types.h" typedef int8_t horzpos_t; typedef uint16_t vertpos_t; @@ -62,5 +61,3 @@ inline MenuHandlerFunc lastPopMenu() { return menuHandlers[menuLevel + 1]; } - -#endif // _COMMON_MENUS_H_ diff --git a/radio/src/gui/common/stdlcd/model_curves.cpp b/radio/src/gui/common/stdlcd/model_curves.cpp index a0397be91..e11a0a8b3 100644 --- a/radio/src/gui/common/stdlcd/model_curves.cpp +++ b/radio/src/gui/common/stdlcd/model_curves.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #if defined(GVARS_IN_CURVES_SCREEN) #warning "define still not added to CMakeLists.txt" diff --git a/radio/src/gui/common/stdlcd/model_heli.cpp b/radio/src/gui/common/stdlcd/model_heli.cpp index b1617fdb6..3785f5e59 100644 --- a/radio/src/gui/common/stdlcd/model_heli.cpp +++ b/radio/src/gui/common/stdlcd/model_heli.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" enum MenuModelHeliItems { ITEM_HELI_SWASHTYPE, diff --git a/radio/src/gui/common/stdlcd/model_inputs.cpp b/radio/src/gui/common/stdlcd/model_inputs.cpp index af1621cb8..d60b29d63 100644 --- a/radio/src/gui/common/stdlcd/model_inputs.cpp +++ b/radio/src/gui/common/stdlcd/model_inputs.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "tasks/mixer_task.h" #include "hal/adc_driver.h" #include "input_mapping.h" diff --git a/radio/src/gui/common/stdlcd/model_mixes.cpp b/radio/src/gui/common/stdlcd/model_mixes.cpp index d07a90f77..3998c6a1d 100644 --- a/radio/src/gui/common/stdlcd/model_mixes.cpp +++ b/radio/src/gui/common/stdlcd/model_mixes.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "tasks/mixer_task.h" #include "hal/adc_driver.h" #include "input_mapping.h" diff --git a/radio/src/gui/common/stdlcd/model_module_options.cpp b/radio/src/gui/common/stdlcd/model_module_options.cpp index 52c2696a1..daca8eb2b 100644 --- a/radio/src/gui/common/stdlcd/model_module_options.cpp +++ b/radio/src/gui/common/stdlcd/model_module_options.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include #define RECEIVER_OPTIONS_2ND_COLUMN (11*FW) diff --git a/radio/src/gui/common/stdlcd/model_notes.cpp b/radio/src/gui/common/stdlcd/model_notes.cpp index d69453237..8a06de327 100644 --- a/radio/src/gui/common/stdlcd/model_notes.cpp +++ b/radio/src/gui/common/stdlcd/model_notes.cpp @@ -18,7 +18,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" void menuModelNotes(event_t event) { diff --git a/radio/src/gui/common/stdlcd/model_receiver_options.cpp b/radio/src/gui/common/stdlcd/model_receiver_options.cpp index d3ed310ed..b2dc3217c 100644 --- a/radio/src/gui/common/stdlcd/model_receiver_options.cpp +++ b/radio/src/gui/common/stdlcd/model_receiver_options.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #define RECEIVER_OPTIONS_2ND_COLUMN 80 @@ -208,7 +208,7 @@ void menuModelReceiverOptions(event_t event) break; case ITEM_RECEIVER_SETTINGS_CAPABILITY_NOT_SUPPORTED2: - lcdDrawText(LCD_W/2, y+1, STR_OPENTX_UPGRADE_REQUIRED, SMLSIZE|CENTERED); + lcdDrawText(LCD_W/2, y+1, STR_EDGETX_UPGRADE_REQUIRED, SMLSIZE|CENTERED); break; default: diff --git a/radio/src/gui/common/stdlcd/model_setup_pxx2.cpp b/radio/src/gui/common/stdlcd/model_setup_pxx2.cpp index 9ff745486..f993fb4be 100644 --- a/radio/src/gui/common/stdlcd/model_setup_pxx2.cpp +++ b/radio/src/gui/common/stdlcd/model_setup_pxx2.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" void onPXX2R9MBindModeMenu(const char * result) { diff --git a/radio/src/gui/common/stdlcd/model_usbjoystick.cpp b/radio/src/gui/common/stdlcd/model_usbjoystick.cpp index 35ddd05c0..f7dc9bdea 100644 --- a/radio/src/gui/common/stdlcd/model_usbjoystick.cpp +++ b/radio/src/gui/common/stdlcd/model_usbjoystick.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "usb_joystick.h" #define _STR_MAX(x) "/" #x diff --git a/radio/src/gui/common/stdlcd/popups.cpp b/radio/src/gui/common/stdlcd/popups.cpp index c38cf1ca6..cb0f79ba0 100644 --- a/radio/src/gui/common/stdlcd/popups.cpp +++ b/radio/src/gui/common/stdlcd/popups.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" const char * warningText = nullptr; const char * warningInfoText; diff --git a/radio/src/gui/common/stdlcd/radio_ghost_menu.cpp b/radio/src/gui/common/stdlcd/radio_ghost_menu.cpp index 921347114..8742214ab 100644 --- a/radio/src/gui/common/stdlcd/radio_ghost_menu.cpp +++ b/radio/src/gui/common/stdlcd/radio_ghost_menu.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #if defined(GHOST) && defined(HARDWARE_EXTERNAL_MODULE) diff --git a/radio/src/gui/common/stdlcd/radio_hardware.cpp b/radio/src/gui/common/stdlcd/radio_hardware.cpp index 50dc4ed5f..6541b3327 100644 --- a/radio/src/gui/common/stdlcd/radio_hardware.cpp +++ b/radio/src/gui/common/stdlcd/radio_hardware.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "hal/adc_driver.h" #include "hal/switch_driver.h" diff --git a/radio/src/gui/common/stdlcd/radio_power_meter.cpp b/radio/src/gui/common/stdlcd/radio_power_meter.cpp index ed5bad56b..05f2e1ecc 100644 --- a/radio/src/gui/common/stdlcd/radio_power_meter.cpp +++ b/radio/src/gui/common/stdlcd/radio_power_meter.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "timers_driver.h" extern uint8_t g_moduleIdx; diff --git a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp index f72641410..b926685e9 100644 --- a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp +++ b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp @@ -20,7 +20,7 @@ */ #include -#include "opentx.h" +#include "edgetx.h" #include "io/frsky_firmware_update.h" #include "io/multi_firmware_update.h" #include "io/bootloader_flash.h" diff --git a/radio/src/gui/common/stdlcd/radio_spectrum_analyser.cpp b/radio/src/gui/common/stdlcd/radio_spectrum_analyser.cpp index dc8d2e755..cea18b8b2 100644 --- a/radio/src/gui/common/stdlcd/radio_spectrum_analyser.cpp +++ b/radio/src/gui/common/stdlcd/radio_spectrum_analyser.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "timers_driver.h" extern uint8_t g_moduleIdx; diff --git a/radio/src/gui/common/stdlcd/radio_tools.cpp b/radio/src/gui/common/stdlcd/radio_tools.cpp index c47e40ceb..052dd48de 100644 --- a/radio/src/gui/common/stdlcd/radio_tools.cpp +++ b/radio/src/gui/common/stdlcd/radio_tools.cpp @@ -21,7 +21,7 @@ #include #include -#include "opentx.h" +#include "edgetx.h" #include "hal/module_port.h" extern uint8_t g_moduleIdx; diff --git a/radio/src/gui/common/stdlcd/radio_trainer.cpp b/radio/src/gui/common/stdlcd/radio_trainer.cpp index e72fc0a3c..dc9302276 100644 --- a/radio/src/gui/common/stdlcd/radio_trainer.cpp +++ b/radio/src/gui/common/stdlcd/radio_trainer.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "hal/adc_driver.h" #include "input_mapping.h" diff --git a/radio/src/gui/common/stdlcd/radio_version.cpp b/radio/src/gui/common/stdlcd/radio_version.cpp index 6f4e71c21..e13864790 100644 --- a/radio/src/gui/common/stdlcd/radio_version.cpp +++ b/radio/src/gui/common/stdlcd/radio_version.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "options.h" #include "hal/module_port.h" diff --git a/radio/src/gui/common/stdlcd/splash.cpp b/radio/src/gui/common/stdlcd/splash.cpp index bdb6f2847..0bf96ddc3 100644 --- a/radio/src/gui/common/stdlcd/splash.cpp +++ b/radio/src/gui/common/stdlcd/splash.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "inactivity_timer.h" static bool splashStarted = false; diff --git a/radio/src/gui/common/stdlcd/view_telemetry.cpp b/radio/src/gui/common/stdlcd/view_telemetry.cpp index c31b44f1c..7cdeb44b0 100644 --- a/radio/src/gui/common/stdlcd/view_telemetry.cpp +++ b/radio/src/gui/common/stdlcd/view_telemetry.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" extern bool displayTelemetryScreen(); extern void displayRssiLine(); diff --git a/radio/src/gui/common/stdlcd/view_text.cpp b/radio/src/gui/common/stdlcd/view_text.cpp index 80c2a82d2..d4351f2ef 100644 --- a/radio/src/gui/common/stdlcd/view_text.cpp +++ b/radio/src/gui/common/stdlcd/view_text.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" constexpr uint32_t TEXT_FILE_MAXSIZE = 2048; constexpr char CHECKABLE_PREFIX = '='; diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp index 347c33cbf..5f8a9e7a2 100644 --- a/radio/src/gui/gui_common.cpp +++ b/radio/src/gui/gui_common.cpp @@ -24,7 +24,7 @@ #include "hal/switch_driver.h" #include "hal/trainer_driver.h" -#include "opentx.h" +#include "edgetx.h" #include "switches.h" #include "mixes.h" diff --git a/radio/src/gui/navigation/common.cpp b/radio/src/gui/navigation/common.cpp index 38147b507..b870cf0bf 100644 --- a/radio/src/gui/navigation/common.cpp +++ b/radio/src/gui/navigation/common.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "navigation.h" #include "hal/switch_driver.h" diff --git a/radio/src/gui/navigation/navigation.cpp b/radio/src/gui/navigation/navigation.cpp index ebaae57b2..ee48eeb34 100644 --- a/radio/src/gui/navigation/navigation.cpp +++ b/radio/src/gui/navigation/navigation.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "navigation.h" #include "switches.h" diff --git a/radio/src/gui/screenshot.cpp b/radio/src/gui/screenshot.cpp index f1aed9270..1fcf84a49 100644 --- a/radio/src/gui/screenshot.cpp +++ b/radio/src/gui/screenshot.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" constexpr uint16_t BMP_HEADERSIZE = 0x76; diff --git a/radio/src/gvars.cpp b/radio/src/gvars.cpp index 96bb1a3d1..03d11dc79 100644 --- a/radio/src/gvars.cpp +++ b/radio/src/gvars.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" uint8_t gvarDisplayTimer = 0; uint8_t gvarLastChanged = 0; diff --git a/radio/src/gyro.cpp b/radio/src/gyro.cpp index ffd0e8d3f..e74f12e69 100644 --- a/radio/src/gyro.cpp +++ b/radio/src/gyro.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #define _USE_MATH_DEFINES #include diff --git a/radio/src/hal/adc_driver.cpp b/radio/src/hal/adc_driver.cpp index a408c877e..cc1a1ac3b 100644 --- a/radio/src/hal/adc_driver.cpp +++ b/radio/src/hal/adc_driver.cpp @@ -22,7 +22,7 @@ #include "adc_driver.h" #include "board.h" -#include "opentx.h" +#include "edgetx.h" const etx_hal_adc_driver_t* _hal_adc_driver = nullptr; const etx_hal_adc_inputs_t* _hal_adc_inputs = nullptr; diff --git a/radio/src/hal/adc_driver.h b/radio/src/hal/adc_driver.h index 863d38ba4..0c6f70f09 100644 --- a/radio/src/hal/adc_driver.h +++ b/radio/src/hal/adc_driver.h @@ -22,7 +22,7 @@ #pragma once #include -#include "opentx_types.h" +#include "edgetx_types.h" // 12-bit values #define ADC_MAX_VALUE 4095 diff --git a/radio/src/hal/switch_driver.cpp b/radio/src/hal/switch_driver.cpp index 3c7f1d698..81fce2380 100644 --- a/radio/src/hal/switch_driver.cpp +++ b/radio/src/hal/switch_driver.cpp @@ -25,8 +25,8 @@ #include "hal/adc_driver.h" #include "dataconstants.h" -#include "opentx_helpers.h" -#include "opentx.h" +#include "edgetx_helpers.h" +#include "edgetx.h" // Board API void boardInitSwitches(); diff --git a/radio/src/hal/switch_driver.h b/radio/src/hal/switch_driver.h index d2a3e1579..03a511617 100644 --- a/radio/src/hal/switch_driver.h +++ b/radio/src/hal/switch_driver.h @@ -22,7 +22,7 @@ #pragma once #include -#include "opentx_types.h" +#include "edgetx_types.h" enum SwitchHwType { SWITCH_HW_2POS = 0, diff --git a/radio/src/haptic.cpp b/radio/src/haptic.cpp index 8ca61d77d..09a334ecb 100644 --- a/radio/src/haptic.cpp +++ b/radio/src/haptic.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "haptic.h" hapticQueue::hapticQueue() diff --git a/radio/src/haptic.h b/radio/src/haptic.h index 34766e882..219beeb6f 100644 --- a/radio/src/haptic.h +++ b/radio/src/haptic.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _HAPTIC_H_ -#define _HAPTIC_H_ +#pragma once #define HAPTIC_QUEUE_LENGTH 4 @@ -72,6 +71,3 @@ extern hapticQueue haptic; #define IS_HAPTIC_BUSY() haptic.busy() #define HAPTIC_HEARTBEAT() haptic.heartbeat() - - -#endif // _HAPTIC_H_ diff --git a/radio/src/inactivity_timer.cpp b/radio/src/inactivity_timer.cpp index 508b9f78c..06d31feb0 100644 --- a/radio/src/inactivity_timer.cpp +++ b/radio/src/inactivity_timer.cpp @@ -21,7 +21,7 @@ #include "inactivity_timer.h" #include "hal/adc_driver.h" -#include "opentx.h" +#include "edgetx.h" void inactivityTimerReset(ActivitySource src) { diff --git a/radio/src/input_mapping.cpp b/radio/src/input_mapping.cpp index 5e870964b..1abd03265 100644 --- a/radio/src/input_mapping.cpp +++ b/radio/src/input_mapping.cpp @@ -22,7 +22,7 @@ #include "input_mapping.h" #include "hal/adc_driver.h" -#include "opentx.h" +#include "edgetx.h" #define _CHANNEL_ORDER(a,b,c,d) \ (((a) & 0x3) | (((b) & 0x3) << 2) | (((c) & 0x3) << 4) | (((d) & 0x3) << 6)) diff --git a/radio/src/io/bootloader_flash.cpp b/radio/src/io/bootloader_flash.cpp index b25919ebe..16541ca66 100644 --- a/radio/src/io/bootloader_flash.cpp +++ b/radio/src/io/bootloader_flash.cpp @@ -20,7 +20,7 @@ */ #include -#include "opentx.h" +#include "edgetx.h" #include "bootloader_flash.h" #include "timers_driver.h" diff --git a/radio/src/io/frsky_firmware_update.cpp b/radio/src/io/frsky_firmware_update.cpp index edb418afb..9febcbfae 100644 --- a/radio/src/io/frsky_firmware_update.cpp +++ b/radio/src/io/frsky_firmware_update.cpp @@ -20,7 +20,7 @@ */ #include -#include "opentx.h" +#include "edgetx.h" #include "frsky_firmware_update.h" #include "debug.h" #include "timers_driver.h" diff --git a/radio/src/io/frsky_firmware_update.h b/radio/src/io/frsky_firmware_update.h index a1a21748c..b01910c4d 100644 --- a/radio/src/io/frsky_firmware_update.h +++ b/radio/src/io/frsky_firmware_update.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _FRSKY_FIRMWARE_UPDATE_H_ -#define _FRSKY_FIRMWARE_UPDATE_H_ +#pragma once #include "dataconstants.h" #include "definitions.h" @@ -147,5 +146,3 @@ class FrskyDeviceFirmwareUpdate { const char * uploadFileToHorusXJT(const char * filename, FIL * file, ProgressHandler progressHandler); const char * endTransfer(); }; - -#endif // _FRSKY_FIRMWARE_UPDATE_H_ diff --git a/radio/src/io/frsky_sport.h b/radio/src/io/frsky_sport.h index d6a975135..e0293f6c6 100644 --- a/radio/src/io/frsky_sport.h +++ b/radio/src/io/frsky_sport.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _IO_FRSKY_SPORT_H_ -#define _IO_FRSKY_SPORT_H_ +#pragma once #include "dataconstants.h" @@ -34,5 +33,3 @@ PACK(union SportTelemetryPacket }; uint8_t raw[8]; }); - -#endif // _IO_FRSKY_SPORT_H_ diff --git a/radio/src/io/multi_firmware_update.cpp b/radio/src/io/multi_firmware_update.cpp index cf8c44a1d..0a9bec47d 100644 --- a/radio/src/io/multi_firmware_update.cpp +++ b/radio/src/io/multi_firmware_update.cpp @@ -25,7 +25,7 @@ #include "hal/module_port.h" #include -#include "opentx.h" +#include "edgetx.h" #include "multi_firmware_update.h" #include "stk500.h" #include "debug.h" diff --git a/radio/src/io/multi_protolist.cpp b/radio/src/io/multi_protolist.cpp index ca494a5f0..bd566e80d 100644 --- a/radio/src/io/multi_protolist.cpp +++ b/radio/src/io/multi_protolist.cpp @@ -28,7 +28,7 @@ #include "pulses/pulses.h" #include "gui_common.h" -#include "opentx.h" // reusableBuffer +#include "edgetx.h" // reusableBuffer #include diff --git a/radio/src/io/multi_protolist.h b/radio/src/io/multi_protolist.h index f431dca6b..a8f56d1b3 100644 --- a/radio/src/io/multi_protolist.h +++ b/radio/src/io/multi_protolist.h @@ -20,7 +20,7 @@ */ #include "dataconstants.h" -#include "opentx_types.h" +#include "edgetx_types.h" #include #include diff --git a/radio/src/keys.cpp b/radio/src/keys.cpp index 3b4f610f0..870127a7b 100644 --- a/radio/src/keys.cpp +++ b/radio/src/keys.cpp @@ -20,7 +20,7 @@ */ #include "keys.h" -#include "opentx_helpers.h" +#include "edgetx_helpers.h" #include "definitions.h" #include "timers_driver.h" @@ -29,7 +29,7 @@ #include "dataconstants.h" #if !defined(BOOT) && defined(USE_HATS_AS_KEYS) -#include "opentx.h" +#include "edgetx.h" #endif // long key press minimum duration (x10ms), diff --git a/radio/src/keys.h b/radio/src/keys.h index eda2586f2..2f55d5853 100644 --- a/radio/src/keys.h +++ b/radio/src/keys.h @@ -19,11 +19,10 @@ * GNU General Public License for more details. */ -#ifndef _KEYS_H_ -#define _KEYS_H_ +#pragma once #include -#include "opentx_types.h" +#include "edgetx_types.h" #include "hal/key_driver.h" @@ -211,5 +210,3 @@ struct InactivityData }; extern InactivityData inactivity; - -#endif // _KEYS_H_ diff --git a/radio/src/logs.cpp b/radio/src/logs.cpp index f70833731..5ea2c3827 100644 --- a/radio/src/logs.cpp +++ b/radio/src/logs.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "ff.h" #include "analogs.h" diff --git a/radio/src/lua/api_colorlcd.cpp b/radio/src/lua/api_colorlcd.cpp index 4bc14de1f..686d7c3c0 100644 --- a/radio/src/lua/api_colorlcd.cpp +++ b/radio/src/lua/api_colorlcd.cpp @@ -24,7 +24,7 @@ #include #include -#include "opentx.h" +#include "edgetx.h" #include "libopenui.h" #include "widget.h" diff --git a/radio/src/lua/api_colorlcd_lvgl.cpp b/radio/src/lua/api_colorlcd_lvgl.cpp index 4c0f0173e..6c1de047a 100644 --- a/radio/src/lua/api_colorlcd_lvgl.cpp +++ b/radio/src/lua/api_colorlcd_lvgl.cpp @@ -24,7 +24,7 @@ #include "libopenui.h" #include "lua_api.h" #include "lua_widget.h" -#include "opentx.h" +#include "edgetx.h" #include "api_colorlcd.h" diff --git a/radio/src/lua/api_general.cpp b/radio/src/lua/api_general.cpp index 7c9410487..1b722e781 100644 --- a/radio/src/lua/api_general.cpp +++ b/radio/src/lua/api_general.cpp @@ -23,7 +23,7 @@ #include #include -#include "opentx.h" +#include "edgetx.h" #include "stamp.h" #include "lua_api.h" #include "api_filesystem.h" diff --git a/radio/src/lua/api_model.cpp b/radio/src/lua/api_model.cpp index acc14b943..efb94f6a9 100644 --- a/radio/src/lua/api_model.cpp +++ b/radio/src/lua/api_model.cpp @@ -23,7 +23,7 @@ #include #include -#include "opentx.h" +#include "edgetx.h" #include "lua_api.h" #include "../timers.h" #include "model_init.h" diff --git a/radio/src/lua/api_stdlcd.cpp b/radio/src/lua/api_stdlcd.cpp index 19332eb72..362fda7b2 100644 --- a/radio/src/lua/api_stdlcd.cpp +++ b/radio/src/lua/api_stdlcd.cpp @@ -23,7 +23,7 @@ #include #include -#include "opentx.h" +#include "edgetx.h" #include "lua_api.h" /*luadoc diff --git a/radio/src/lua/interface.cpp b/radio/src/lua/interface.cpp index bb5fb6993..142093962 100644 --- a/radio/src/lua/interface.cpp +++ b/radio/src/lua/interface.cpp @@ -25,7 +25,7 @@ #include #include -#include "opentx.h" +#include "edgetx.h" #include "bin_allocator.h" #include "lua_api.h" diff --git a/radio/src/lua/lua_api.h b/radio/src/lua/lua_api.h index 40e75e7ec..9796a411d 100644 --- a/radio/src/lua/lua_api.h +++ b/radio/src/lua/lua_api.h @@ -34,7 +34,7 @@ extern "C" { } #include "dataconstants.h" -#include "opentx_types.h" +#include "edgetx_types.h" #ifndef LUA_SCRIPT_LOAD_MODE // Can force loading of binary (.luac) or plain-text (.lua) versions of scripts specifically, and control diff --git a/radio/src/lua/lua_event.cpp b/radio/src/lua/lua_event.cpp index f92006e28..3ac789dbd 100644 --- a/radio/src/lua/lua_event.cpp +++ b/radio/src/lua/lua_event.cpp @@ -20,7 +20,7 @@ */ #include "lua_event.h" -#include "opentx_helpers.h" +#include "edgetx_helpers.h" #include "board_common.h" #include "timers_driver.h" #include "keys.h" diff --git a/radio/src/lua/lua_event.h b/radio/src/lua/lua_event.h index f3cb40d60..ec12c550c 100644 --- a/radio/src/lua/lua_event.h +++ b/radio/src/lua/lua_event.h @@ -21,7 +21,7 @@ #pragma once -#include "opentx_types.h" +#include "edgetx_types.h" #define EVENT_BUFFER_SIZE 4 diff --git a/radio/src/lua/lua_lvgl_widget.cpp b/radio/src/lua/lua_lvgl_widget.cpp index 5be1d7600..549299c07 100644 --- a/radio/src/lua/lua_lvgl_widget.cpp +++ b/radio/src/lua/lua_lvgl_widget.cpp @@ -20,7 +20,7 @@ */ #include "lua_widget.h" -#include "opentx.h" +#include "edgetx.h" #include "page.h" #include "slider.h" #include "toggleswitch.h" diff --git a/radio/src/lua/lua_widget.h b/radio/src/lua/lua_widget.h index ef83b88f7..410e75abe 100644 --- a/radio/src/lua/lua_widget.h +++ b/radio/src/lua/lua_widget.h @@ -28,7 +28,7 @@ #include "lua_api.h" #include "lua_lvgl_widget.h" -#include "opentx_types.h" +#include "edgetx_types.h" #define LUA_TAP_TIME 250 // 250 ms diff --git a/radio/src/lua/widgets.cpp b/radio/src/lua/widgets.cpp index ba0ade164..aabe0bc85 100644 --- a/radio/src/lua/widgets.cpp +++ b/radio/src/lua/widgets.cpp @@ -22,7 +22,7 @@ #include #include -#include "opentx.h" +#include "edgetx.h" #include "lua_api.h" #include "widget.h" diff --git a/radio/src/main.cpp b/radio/src/main.cpp index c55511541..18edb69d6 100644 --- a/radio/src/main.cpp +++ b/radio/src/main.cpp @@ -23,7 +23,7 @@ #include "hal/storage.h" #include "hal/abnormal_reboot.h" #include "hal/usb_driver.h" -#include "opentx.h" +#include "edgetx.h" #if defined(LIBOPENUI) #include "libopenui.h" diff --git a/radio/src/maths.cpp b/radio/src/maths.cpp index 4bb52f631..592dd1c18 100644 --- a/radio/src/maths.cpp +++ b/radio/src/maths.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" uint16_t isqrt32(uint32_t n) { diff --git a/radio/src/mixer.cpp b/radio/src/mixer.cpp index 16922c6d7..cd328b43c 100644 --- a/radio/src/mixer.cpp +++ b/radio/src/mixer.cpp @@ -19,8 +19,8 @@ * GNU General Public License for more details. */ -#include "opentx.h" -#include "opentx_types.h" +#include "edgetx.h" +#include "edgetx_types.h" #include "timers.h" #include "switches.h" #include "input_mapping.h" diff --git a/radio/src/mixer_scheduler.cpp b/radio/src/mixer_scheduler.cpp index 4a0084979..1fcca7ce3 100644 --- a/radio/src/mixer_scheduler.cpp +++ b/radio/src/mixer_scheduler.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "mixer_scheduler.h" #include "tasks/mixer_task.h" #include "hal/usb_driver.h" diff --git a/radio/src/mixes.cpp b/radio/src/mixes.cpp index 118bf1561..362455eaa 100644 --- a/radio/src/mixes.cpp +++ b/radio/src/mixes.cpp @@ -23,7 +23,7 @@ #include "tasks/mixer_task.h" #include "hal/adc_driver.h" -#include "opentx.h" +#include "edgetx.h" static uint8_t _nb_mix_lines; diff --git a/radio/src/model_audio.cpp b/radio/src/model_audio.cpp index de1bb86c2..6fb3d3fda 100644 --- a/radio/src/model_audio.cpp +++ b/radio/src/model_audio.cpp @@ -21,7 +21,7 @@ #include "model_audio.h" -#include "opentx.h" +#include "edgetx.h" #include "switches.h" static const char* const _suffixes[] = {"-off", "-on"}; diff --git a/radio/src/model_audio.h b/radio/src/model_audio.h index e680006fe..fd23de0ef 100644 --- a/radio/src/model_audio.h +++ b/radio/src/model_audio.h @@ -21,7 +21,7 @@ #pragma once -#include "opentx_types.h" +#include "edgetx_types.h" char* getModelAudioPath(char* path, bool trailingSlash = true); diff --git a/radio/src/model_init.cpp b/radio/src/model_init.cpp index 654e3b400..9ff6e6e3d 100644 --- a/radio/src/model_init.cpp +++ b/radio/src/model_init.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "hal/adc_driver.h" #include "input_mapping.h" #include "mixes.h" diff --git a/radio/src/module.h b/radio/src/module.h index 64a1ec4c4..deafc2da4 100644 --- a/radio/src/module.h +++ b/radio/src/module.h @@ -19,13 +19,10 @@ * GNU General Public License for more details. */ -#ifndef _MODULE_H_ -#define _MODULE_H_ +#pragma once #include void resetModuleSettings(uint8_t module); void pxx2AddReceiver(uint8_t moduleIndex, uint8_t receiverIndex); void pxx2DeleteReceiver(uint8_t moduleIndex, uint8_t receiverIndex); - -#endif diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index 5621ff0fd..fe880f70a 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _MYEEPROM_H_ -#define _MYEEPROM_H_ +#pragma once #include "datastructs.h" #include "bitfield.h" @@ -275,5 +274,3 @@ extern ModelData g_model; constexpr uint8_t EE_GENERAL = 0x01; constexpr uint8_t EE_MODEL = 0x02; constexpr uint8_t EE_LABELS = 0x04; - -#endif // _MYEEPROM_H_ diff --git a/radio/src/options.h b/radio/src/options.h index 25fc5cc7b..6377452b6 100644 --- a/radio/src/options.h +++ b/radio/src/options.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef OPENTX_OPTIONS_H -#define OPENTX_OPTIONS_H +#pragma once static const char * const options[] = { #if defined(AUTOUPDATE) @@ -106,5 +105,3 @@ static const char * const options[] = { #endif nullptr //sentinel }; - -#endif //OPENTX_OPTIONS_H diff --git a/radio/src/pulses/afhds2.cpp b/radio/src/pulses/afhds2.cpp index 0671811d8..a7ecd8029 100644 --- a/radio/src/pulses/afhds2.cpp +++ b/radio/src/pulses/afhds2.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "afhds2.h" #include "flysky.h" diff --git a/radio/src/pulses/afhds2.h b/radio/src/pulses/afhds2.h index 82dffa999..021fd94c7 100644 --- a/radio/src/pulses/afhds2.h +++ b/radio/src/pulses/afhds2.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef PULSES_AFHDS2_H_ -#define PULSES_AFHDS2_H_ +#pragma once #include #include @@ -34,5 +33,3 @@ extern const etx_serial_init afhds2SerialInitParams; extern const etx_proto_driver_t Afhds2InternalDriver; - -#endif /* PULSES_AFHDS2_H_ */ diff --git a/radio/src/pulses/afhds3.h b/radio/src/pulses/afhds3.h index b884ed09c..01e6acb1c 100644 --- a/radio/src/pulses/afhds3.h +++ b/radio/src/pulses/afhds3.h @@ -24,9 +24,9 @@ #include "bitfield.h" #include "definitions.h" #include "dataconstants.h" -#include "opentx_types.h" +#include "edgetx_types.h" #include "myeeprom.h" -#include "opentx_helpers.h" +#include "edgetx_helpers.h" #include "pulses_common.h" #include #include "fifo.h" diff --git a/radio/src/pulses/afhds3_transport.cpp b/radio/src/pulses/afhds3_transport.cpp index b6f02372b..f451d62e1 100644 --- a/radio/src/pulses/afhds3_transport.cpp +++ b/radio/src/pulses/afhds3_transport.cpp @@ -20,7 +20,7 @@ */ #include "afhds3_transport.h" -#include "opentx_helpers.h" +#include "edgetx_helpers.h" #include "debug.h" #include "board.h" diff --git a/radio/src/pulses/crossfire.cpp b/radio/src/pulses/crossfire.cpp index 808ac0b4c..8daa71542 100644 --- a/radio/src/pulses/crossfire.cpp +++ b/radio/src/pulses/crossfire.cpp @@ -24,7 +24,7 @@ #include "stm32_hal_ll.h" #endif -#include "opentx.h" +#include "edgetx.h" #include "mixer_scheduler.h" #include "hal/module_driver.h" #include "hal/module_port.h" diff --git a/radio/src/pulses/dsm2.cpp b/radio/src/pulses/dsm2.cpp index 32ac9796c..3510388dc 100644 --- a/radio/src/pulses/dsm2.cpp +++ b/radio/src/pulses/dsm2.cpp @@ -23,7 +23,7 @@ #include "hal/module_port.h" #include "mixer_scheduler.h" -#include "opentx.h" +#include "edgetx.h" #include "telemetry/spektrum.h" #define DSM2_SEND_BIND (1 << 7) diff --git a/radio/src/pulses/flysky.cpp b/radio/src/pulses/flysky.cpp index 6c99e3243..bec148251 100644 --- a/radio/src/pulses/flysky.cpp +++ b/radio/src/pulses/flysky.cpp @@ -21,17 +21,15 @@ * Dedicate for FlySky NV14 board. */ -#include "opentx.h" +#pragma once + +#include "edgetx.h" #include "flysky.h" #include "telemetry/flysky_nv14.h" #define IS_VALID_COMMAND_ID(id) ((id) < CMD_LAST) -#ifndef custom_log -#define custom_log -#endif - enum AfhdsSpecialChars { END = 0xC0, //Frame end START = END, diff --git a/radio/src/pulses/ghost.cpp b/radio/src/pulses/ghost.cpp index 3301f031c..e06d49743 100644 --- a/radio/src/pulses/ghost.cpp +++ b/radio/src/pulses/ghost.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "ghost.h" #include "telemetry/ghost.h" #include "telemetry/ghost_menu.h" diff --git a/radio/src/pulses/modules_constants.h b/radio/src/pulses/modules_constants.h index 6572ce71a..7e40d25d7 100644 --- a/radio/src/pulses/modules_constants.h +++ b/radio/src/pulses/modules_constants.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _MODULES_CONSTANTS_H_ -#define _MODULES_CONSTANTS_H_ +#pragma once #include "storage/yaml/yaml_defs.h" @@ -159,5 +158,3 @@ enum AfhdsModes { AFHDS_SUBTYPE_PPM_SBUS, AFHDS_SUBTYPE_LAST = AFHDS_SUBTYPE_PPM_SBUS }; - -#endif // _MODULES_CONSTANTS_H_ diff --git a/radio/src/pulses/modules_helpers.cpp b/radio/src/pulses/modules_helpers.cpp index 3950f65b2..36d438a56 100644 --- a/radio/src/pulses/modules_helpers.cpp +++ b/radio/src/pulses/modules_helpers.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #if defined(EXTERNAL_ANTENNA) bool isExternalAntennaEnabled() diff --git a/radio/src/pulses/modules_helpers.h b/radio/src/pulses/modules_helpers.h index 512f45401..c2eac81d2 100644 --- a/radio/src/pulses/modules_helpers.h +++ b/radio/src/pulses/modules_helpers.h @@ -23,7 +23,7 @@ #include "bitfield.h" #include "definitions.h" -#include "opentx_helpers.h" +#include "edgetx_helpers.h" #include "storage/storage.h" #include "globals.h" #include "MultiProtoDefs.h" diff --git a/radio/src/pulses/multi.cpp b/radio/src/pulses/multi.cpp index 6d718080b..055750949 100644 --- a/radio/src/pulses/multi.cpp +++ b/radio/src/pulses/multi.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "multi.h" #include "io/multi_protolist.h" diff --git a/radio/src/pulses/ppm.cpp b/radio/src/pulses/ppm.cpp index 980ed62fc..5c56150d9 100644 --- a/radio/src/pulses/ppm.cpp +++ b/radio/src/pulses/ppm.cpp @@ -25,7 +25,7 @@ #include "hal/module_port.h" #include "mixer_scheduler.h" -#include "opentx.h" +#include "edgetx.h" #include "telemetry/mlink.h" diff --git a/radio/src/pulses/pulses.cpp b/radio/src/pulses/pulses.cpp index f4f6db58e..63e38cb12 100644 --- a/radio/src/pulses/pulses.cpp +++ b/radio/src/pulses/pulses.cpp @@ -20,7 +20,7 @@ */ // #include "hal.h" -#include "opentx.h" +#include "edgetx.h" #include "mixer_scheduler.h" #include "heartbeat_driver.h" diff --git a/radio/src/pulses/pulses.h b/radio/src/pulses/pulses.h index 4ba572d75..15b5543d2 100644 --- a/radio/src/pulses/pulses.h +++ b/radio/src/pulses/pulses.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _PULSES_H_ -#define _PULSES_H_ +#pragma once #include "definitions.h" #include "dataconstants.h" @@ -237,5 +236,3 @@ inline bool isModuleInBeepMode() return false; } - -#endif // _PULSES_H_ diff --git a/radio/src/pulses/pulses_common.h b/radio/src/pulses/pulses_common.h index 56a550a29..6bd85d9b8 100644 --- a/radio/src/pulses/pulses_common.h +++ b/radio/src/pulses/pulses_common.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _PULSES_COMMON_H_ -#define _PULSES_COMMON_H_ +#pragma once #include @@ -87,5 +86,3 @@ class PulsesBuffer: public DataBuffer { *(DataBuffer::ptr - 1) = value; } }; - -#endif diff --git a/radio/src/pulses/pxx1.cpp b/radio/src/pulses/pxx1.cpp index b0faa3392..c6839c277 100644 --- a/radio/src/pulses/pxx1.cpp +++ b/radio/src/pulses/pxx1.cpp @@ -27,7 +27,7 @@ #include "pxx1_transport.h" #include "pxx1.h" -#include "opentx.h" +#include "edgetx.h" static uint32_t _pxx1_internal_baudrate = PXX1_DEFAULT_SERIAL_BAUDRATE; diff --git a/radio/src/pulses/pxx2.cpp b/radio/src/pulses/pxx2.cpp index 96d34d202..cada78f0e 100644 --- a/radio/src/pulses/pxx2.cpp +++ b/radio/src/pulses/pxx2.cpp @@ -20,7 +20,7 @@ */ #include -#include "opentx.h" +#include "edgetx.h" #include "io/frsky_firmware_update.h" #include "lib_file.h" #include "mixer_scheduler.h" diff --git a/radio/src/pulses/pxx2.h b/radio/src/pulses/pxx2.h index 453a514e8..1e3cb2d55 100644 --- a/radio/src/pulses/pxx2.h +++ b/radio/src/pulses/pxx2.h @@ -19,14 +19,13 @@ * GNU General Public License for more details. */ -#ifndef _PULSES_PXX2_H_ -#define _PULSES_PXX2_H_ +#pragma once #include "pxx.h" #include "hal/module_driver.h" #include "dataconstants.h" -#include "opentx_types.h" +#include "edgetx_types.h" #define PXX2_TYPE_C_MODULE 0x01 #define PXX2_TYPE_ID_REGISTER 0x01 @@ -282,5 +281,3 @@ BindInformation& getPXX2BindInformationBuffer(); PXX2HardwareAndSettings& getPXX2HardwareAndSettingsBuffer(); extern const etx_proto_driver_t Pxx2Driver; - -#endif diff --git a/radio/src/pulses/pxx2_ota.cpp b/radio/src/pulses/pxx2_ota.cpp index 74d81b0e7..7287a5245 100644 --- a/radio/src/pulses/pxx2_ota.cpp +++ b/radio/src/pulses/pxx2_ota.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "io/frsky_firmware_update.h" #include "tasks/mixer_task.h" diff --git a/radio/src/pulses/sbus.cpp b/radio/src/pulses/sbus.cpp index d384b8908..5c6a63b34 100644 --- a/radio/src/pulses/sbus.cpp +++ b/radio/src/pulses/sbus.cpp @@ -24,7 +24,7 @@ #include "hal/serial_driver.h" #include "mixer_scheduler.h" -#include "opentx.h" +#include "edgetx.h" #define SBUS_NORMAL_CHANS 16 #define SBUS_CHAN_BITS 11 diff --git a/radio/src/pwr.h b/radio/src/pwr.h index 095adaf48..16c4ce732 100644 --- a/radio/src/pwr.h +++ b/radio/src/pwr.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _PWR_H_ -#define _PWR_H_ +#pragma once enum PowerState { e_power_on, @@ -29,5 +28,3 @@ enum PowerState { e_power_off, e_power_press, }; - -#endif // _PWR_H_ diff --git a/radio/src/rtc.cpp b/radio/src/rtc.cpp index 806e9ce6f..96a33a3f0 100644 --- a/radio/src/rtc.cpp +++ b/radio/src/rtc.cpp @@ -20,7 +20,7 @@ */ #include -#include "opentx.h" +#include "edgetx.h" extern void rtcdriver_settime(struct gtm * t); diff --git a/radio/src/rtc.h b/radio/src/rtc.h index 471a08ded..40a985ef0 100644 --- a/radio/src/rtc.h +++ b/radio/src/rtc.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _RTC_H_ -#define _RTC_H_ +#pragma once #include @@ -63,5 +62,3 @@ void gettime(struct gtm * tm); #if defined(__cplusplus) && !defined(SIMU) } #endif - -#endif // _RTC_H_ diff --git a/radio/src/rtos.h b/radio/src/rtos.h index 3e27d19f1..705502ddf 100644 --- a/radio/src/rtos.h +++ b/radio/src/rtos.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _RTOS_H_ -#define _RTOS_H_ +#pragma once #include #include @@ -325,5 +324,3 @@ extern "C++" { #ifdef __cplusplus } #endif - -#endif // _RTOS_H_ diff --git a/radio/src/sbus.cpp b/radio/src/sbus.cpp index 02ad9316b..d28925a8a 100644 --- a/radio/src/sbus.cpp +++ b/radio/src/sbus.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "sbus.h" #include "timers_driver.h" diff --git a/radio/src/sbus.h b/radio/src/sbus.h index 981a7c7ed..2d0bfc945 100644 --- a/radio/src/sbus.h +++ b/radio/src/sbus.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _SBUS_H_ -#define _SBUS_H_ +#pragma once #define SBUS_BAUDRATE 100000 #define SBUS_FRAME_SIZE 25 @@ -37,5 +36,3 @@ int sbusAuxGetByte(uint8_t* byte); void sbusSetGetByte(int (*fct)(uint8_t*)); void processSbusInput(); - -#endif // _SBUS_H_ diff --git a/radio/src/sdcard.cpp b/radio/src/sdcard.cpp index 982285a80..9784699ce 100644 --- a/radio/src/sdcard.cpp +++ b/radio/src/sdcard.cpp @@ -25,7 +25,7 @@ #include "hal/fatfs_diskio.h" #include "hal/storage.h" -#include "opentx.h" +#include "edgetx.h" #if defined(LIBOPENUI) #include "libopenui.h" diff --git a/radio/src/sdcard.h b/radio/src/sdcard.h index 5a67cf716..112e38d36 100644 --- a/radio/src/sdcard.h +++ b/radio/src/sdcard.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _SDCARD_H_ -#define _SDCARD_H_ +#pragma once #include "ff.h" @@ -162,5 +161,3 @@ const char * sdMoveFile(const char * srcFilename, const char * srcDir, const cha #define LIST_NONE_SD_FILE 1 #define LIST_SD_FILE_EXT 2 bool sdListFiles(const char * path, const char * extension, const uint8_t maxlen, const char * selection, uint8_t flags=0); - -#endif // _SDCARD_H_ diff --git a/radio/src/serial.cpp b/radio/src/serial.cpp index fda2c4546..2728ab4da 100644 --- a/radio/src/serial.cpp +++ b/radio/src/serial.cpp @@ -36,7 +36,7 @@ #endif #if !defined(BOOT) - #include "opentx.h" + #include "edgetx.h" #include "lua/lua_api.h" #else #include "dataconstants.h" diff --git a/radio/src/serial.h b/radio/src/serial.h index f5f5c340b..47a307d2b 100644 --- a/radio/src/serial.h +++ b/radio/src/serial.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _SERIAL_H_ -#define _SERIAL_H_ +#pragma once #include #include "hal/serial_port.h" @@ -69,6 +68,3 @@ void dbgSerialSetSendCb(void* ctx, void (*cb)(void*, uint8_t)); // Query debug callback void (*dbgSerialGetSendCb())(void*, uint8_t); void* dbgSerialGetSendCbCtx(); - -#endif // _SERIAL_H_ - diff --git a/radio/src/simu.cpp b/radio/src/simu.cpp index f942057d6..0f339f242 100644 --- a/radio/src/simu.cpp +++ b/radio/src/simu.cpp @@ -29,7 +29,7 @@ #include "FXPNGImage.h" #include #include "fxkeys.h" -#include "opentx.h" +#include "edgetx.h" #include #include diff --git a/radio/src/spacemouse.cpp b/radio/src/spacemouse.cpp index 139e0c04b..74828f825 100644 --- a/radio/src/spacemouse.cpp +++ b/radio/src/spacemouse.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" // #include #include "tasks/mixer_task.h" diff --git a/radio/src/spacemouse.h b/radio/src/spacemouse.h index 4984cb12d..7801318a0 100644 --- a/radio/src/spacemouse.h +++ b/radio/src/spacemouse.h @@ -20,8 +20,7 @@ * GNU General Public License for more details. */ -#ifndef _SPACEMOUSE_H_ -#define _SPACEMOUSE_H_ +#pragma once #include @@ -66,5 +65,3 @@ void spacemousePoll(); void spacemouseTare(); void spacemouseStartStreaming(); void spacemouseStopStreaming(); - -#endif // _SPACEMOUSE_H_ diff --git a/radio/src/storage/modelslist.cpp b/radio/src/storage/modelslist.cpp index 39507c72f..3a07a6ba7 100644 --- a/radio/src/storage/modelslist.cpp +++ b/radio/src/storage/modelslist.cpp @@ -26,7 +26,7 @@ using std::list; #if defined(SDCARD_YAML) -#include "opentx.h" +#include "edgetx.h" #include "storage/sdcard_yaml.h" #include "yaml/yaml_datastructs.h" #include "yaml/yaml_labelslist.h" diff --git a/radio/src/storage/rlc.h b/radio/src/storage/rlc.h index efb96aa96..8fa1b8b85 100644 --- a/radio/src/storage/rlc.h +++ b/radio/src/storage/rlc.h @@ -19,10 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _RLC_H_ -#define _RLC_H_ +#pragma once unsigned int compress(uint8_t * dst, unsigned int dstsize, const uint8_t * src, unsigned int len); unsigned int uncompress(uint8_t * dst, unsigned int dstsize, const uint8_t * src, unsigned int len); - -#endif diff --git a/radio/src/storage/rtc_backup.cpp b/radio/src/storage/rtc_backup.cpp index a6f573c24..1736cfaaf 100644 --- a/radio/src/storage/rtc_backup.cpp +++ b/radio/src/storage/rtc_backup.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "rtc_backup.h" namespace Backup { diff --git a/radio/src/storage/rtc_backup.h b/radio/src/storage/rtc_backup.h index 13d00dc11..a0f94ffd0 100644 --- a/radio/src/storage/rtc_backup.h +++ b/radio/src/storage/rtc_backup.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _RTC_BACKUP_H_ -#define _RTC_BACKUP_H_ +#pragma once #include "definitions.h" @@ -35,5 +34,3 @@ void rambackupWrite(); bool rambackupRestore(); unsigned int compress(uint8_t * dst, unsigned int dstsize, const uint8_t * src, unsigned int len); unsigned int uncompress(uint8_t * dst, unsigned int dstsize, const uint8_t * src, unsigned int len); - -#endif // _RTC_BACKUP_H_ diff --git a/radio/src/storage/sdcard_common.cpp b/radio/src/storage/sdcard_common.cpp index 59b64743b..b19116ad2 100644 --- a/radio/src/storage/sdcard_common.cpp +++ b/radio/src/storage/sdcard_common.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "storage.h" #include "sdcard_common.h" #include "modelslist.h" diff --git a/radio/src/storage/sdcard_common.h b/radio/src/storage/sdcard_common.h index 5b7c17130..9be3d7e54 100644 --- a/radio/src/storage/sdcard_common.h +++ b/radio/src/storage/sdcard_common.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _SDCARD_COMMON_H_ -#define _SDCARD_COMMON_H_ +#pragma once #include "ff.h" #include "translations.h" @@ -85,5 +84,3 @@ const char * loadRadioSettings(const char * path); const char * loadRadioSettings(); void checkModelIdUnique(uint8_t index, uint8_t module); - -#endif // _SDCARD_RAW_H_ diff --git a/radio/src/storage/sdcard_raw.h b/radio/src/storage/sdcard_raw.h index 78a13ed2a..ec494316b 100644 --- a/radio/src/storage/sdcard_raw.h +++ b/radio/src/storage/sdcard_raw.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _SDCARD_RAW_H_ -#define _SDCARD_RAW_H_ +#pragma once #include "FatFs/ff.h" @@ -44,5 +43,3 @@ const char* readModelBin(const char* filename, uint8_t* buffer, uint32_t size, uint8_t* version); const char* writeModelBin(); - -#endif diff --git a/radio/src/storage/sdcard_yaml.cpp b/radio/src/storage/sdcard_yaml.cpp index 6620dcd29..1ef9d4c61 100644 --- a/radio/src/storage/sdcard_yaml.cpp +++ b/radio/src/storage/sdcard_yaml.cpp @@ -21,8 +21,8 @@ #include "hal/adc_driver.h" #include "myeeprom.h" -#include "opentx.h" -#include "opentx_helpers.h" +#include "edgetx.h" +#include "edgetx_helpers.h" #include "storage.h" #include "sdcard_common.h" #include "sdcard_raw.h" @@ -351,7 +351,7 @@ const char * readModelYaml(const char * filename, uint8_t * buffer, uint32_t siz auto md = reinterpret_cast(buffer); #if defined(FLIGHT_MODES) && defined(GVARS) // reset GVars to default values - // Note: taken from opentx.cpp::modelDefault() + // Note: taken from edgetx.cpp::modelDefault() //TODO: new func in gvars for (int p=1; p #include "definitions.h" -#include "opentx_types.h" +#include "edgetx_types.h" class TelemetryItem; diff --git a/radio/src/switches.cpp b/radio/src/switches.cpp index 67072f256..d0d047bb8 100644 --- a/radio/src/switches.cpp +++ b/radio/src/switches.cpp @@ -23,8 +23,8 @@ #include "hal/adc_driver.h" #include "myeeprom.h" -#include "opentx.h" -#include "opentx_constants.h" +#include "edgetx.h" +#include "edgetx_constants.h" #include "switches.h" #include "input_mapping.h" diff --git a/radio/src/switches.h b/radio/src/switches.h index 08ea25f56..429d2f58f 100644 --- a/radio/src/switches.h +++ b/radio/src/switches.h @@ -23,7 +23,7 @@ #include -#include "opentx_constants.h" +#include "edgetx_constants.h" enum LogicalSwitchFamilies { LS_FAMILY_OFS, diff --git a/radio/src/targets/common/arm/stm32/audio_dac_driver.cpp b/radio/src/targets/common/arm/stm32/audio_dac_driver.cpp index 333fb1dc8..e582b5f72 100644 --- a/radio/src/targets/common/arm/stm32/audio_dac_driver.cpp +++ b/radio/src/targets/common/arm/stm32/audio_dac_driver.cpp @@ -24,7 +24,7 @@ #include "stm32_timer.h" #include "stm32_dma.h" -#include "opentx.h" +#include "edgetx.h" #if !defined(SIMU) const AudioBuffer * nextBuffer = nullptr; diff --git a/radio/src/targets/common/arm/stm32/board_common.h b/radio/src/targets/common/arm/stm32/board_common.h index de58c88f3..fb10b5043 100644 --- a/radio/src/targets/common/arm/stm32/board_common.h +++ b/radio/src/targets/common/arm/stm32/board_common.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _BOARD_COMMON_H_ -#define _BOARD_COMMON_H_ +#pragma once #include #include "cpu_id.h" @@ -43,5 +42,3 @@ #endif #include "delays_driver.h" - -#endif diff --git a/radio/src/targets/common/arm/stm32/bootloader/bin_files.h b/radio/src/targets/common/arm/stm32/bootloader/bin_files.h index a457eaae5..f7a8d1b04 100644 --- a/radio/src/targets/common/arm/stm32/bootloader/bin_files.h +++ b/radio/src/targets/common/arm/stm32/bootloader/bin_files.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _bin_files_h_ -#define _bin_files_h_ +#pragma once #include #include "sdcard.h" @@ -98,5 +97,3 @@ FRESULT readBinFile(); // Close the previously opened file FRESULT closeBinFile(); - -#endif diff --git a/radio/src/targets/common/arm/stm32/bootloader/boot.h b/radio/src/targets/common/arm/stm32/bootloader/boot.h index 5f747239f..12f1625a5 100644 --- a/radio/src/targets/common/arm/stm32/bootloader/boot.h +++ b/radio/src/targets/common/arm/stm32/bootloader/boot.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _boot_h_ -#define _boot_h_ +#pragma once #include #include "stamp.h" @@ -89,5 +88,3 @@ uint32_t bootloaderGetMenuItemCount(int baseCount); bool bootloaderRadioMenu(uint32_t menuItem, event_t event); void blExit(); - -#endif diff --git a/radio/src/targets/common/arm/stm32/cpu_id.cpp b/radio/src/targets/common/arm/stm32/cpu_id.cpp index 43cc12b15..6ce8e599f 100644 --- a/radio/src/targets/common/arm/stm32/cpu_id.cpp +++ b/radio/src/targets/common/arm/stm32/cpu_id.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #if defined(SIMU) const uint32_t cpu_uid[3] = { 0x12345678, 0x55AA55AA, 0x87654321}; diff --git a/radio/src/targets/common/arm/stm32/dma2d.h b/radio/src/targets/common/arm/stm32/dma2d.h index 2802eaa19..879180a8a 100644 --- a/radio/src/targets/common/arm/stm32/dma2d.h +++ b/radio/src/targets/common/arm/stm32/dma2d.h @@ -21,7 +21,7 @@ #pragma once -#include "opentx_types.h" +#include "edgetx_types.h" #if !defined(SIMU) static inline void DMAWait() diff --git a/radio/src/targets/common/arm/stm32/rotary_encoder_driver.cpp b/radio/src/targets/common/arm/stm32/rotary_encoder_driver.cpp index 23400a7b4..4faac3006 100644 --- a/radio/src/targets/common/arm/stm32/rotary_encoder_driver.cpp +++ b/radio/src/targets/common/arm/stm32/rotary_encoder_driver.cpp @@ -32,7 +32,7 @@ #include "stm32_timer.h" #if !defined(BOOT) - #include "opentx.h" + #include "edgetx.h" #endif #if ROTARY_ENCODER_GRANULARITY == 2 diff --git a/radio/src/targets/common/arm/stm32/timers_driver.h b/radio/src/targets/common/arm/stm32/timers_driver.h index 7dbd7e6c3..a165c9770 100644 --- a/radio/src/targets/common/arm/stm32/timers_driver.h +++ b/radio/src/targets/common/arm/stm32/timers_driver.h @@ -21,7 +21,7 @@ #pragma once -#include "opentx_types.h" +#include "edgetx_types.h" extern "C" volatile tmr10ms_t g_tmr10ms; static inline tmr10ms_t get_tmr10ms() { return g_tmr10ms; } diff --git a/radio/src/targets/common/arm/stm32/trainer_driver.cpp b/radio/src/targets/common/arm/stm32/trainer_driver.cpp index be7995ede..1dc593465 100644 --- a/radio/src/targets/common/arm/stm32/trainer_driver.cpp +++ b/radio/src/targets/common/arm/stm32/trainer_driver.cpp @@ -27,7 +27,7 @@ #include "hal.h" -#include "opentx.h" +#include "edgetx.h" #include "trainer.h" static void (*_trainer_timer_isr)(); diff --git a/radio/src/targets/common/arm/stm32/usb_driver.cpp b/radio/src/targets/common/arm/stm32/usb_driver.cpp index 17c35d603..afe881c1b 100644 --- a/radio/src/targets/common/arm/stm32/usb_driver.cpp +++ b/radio/src/targets/common/arm/stm32/usb_driver.cpp @@ -22,7 +22,7 @@ #if defined(USBJ_EX) #include "usb_joystick.h" #else -#include "opentx_helpers.h" +#include "edgetx_helpers.h" #endif extern "C" { diff --git a/radio/src/targets/common/arm/stm32/vs1053b.cpp b/radio/src/targets/common/arm/stm32/vs1053b.cpp index 440fcd374..3a59ac143 100644 --- a/radio/src/targets/common/arm/stm32/vs1053b.cpp +++ b/radio/src/targets/common/arm/stm32/vs1053b.cpp @@ -26,7 +26,7 @@ #include "hal/gpio.h" -#include "opentx.h" +#include "edgetx.h" #if !defined(SIMU) diff --git a/radio/src/targets/horus/backlight_driver.cpp b/radio/src/targets/horus/backlight_driver.cpp index 197a3d226..db5bc3a35 100644 --- a/radio/src/targets/horus/backlight_driver.cpp +++ b/radio/src/targets/horus/backlight_driver.cpp @@ -23,7 +23,7 @@ #include "stm32_gpio.h" #include "stm32_timer.h" -#include "opentx_types.h" +#include "edgetx_types.h" #include "board.h" #if !defined(BOOT) diff --git a/radio/src/targets/horus/board.cpp b/radio/src/targets/horus/board.cpp index e9c82e919..470d5a32f 100644 --- a/radio/src/targets/horus/board.cpp +++ b/radio/src/targets/horus/board.cpp @@ -37,7 +37,7 @@ #include "timers_driver.h" #include "dataconstants.h" -#include "opentx_types.h" +#include "edgetx_types.h" #include "globals.h" #include "sdcard.h" #include "debug.h" @@ -61,7 +61,7 @@ void boardBLInit() #endif #if !defined(BOOT) -#include "opentx.h" +#include "edgetx.h" void boardInit() { diff --git a/radio/src/targets/horus/board.h b/radio/src/targets/horus/board.h index 4e37c8ebd..f0319e076 100644 --- a/radio/src/targets/horus/board.h +++ b/radio/src/targets/horus/board.h @@ -19,13 +19,10 @@ * GNU General Public License for more details. */ -#ifndef _BOARD_H_ -#define _BOARD_H_ +#pragma once -//#include "stm32_hal.h" -//#include "stm32_hal_ll.h" #include "definitions.h" -#include "opentx_constants.h" +#include "edgetx_constants.h" // Defines used in board_common.h #define ROTARY_ENCODER_NAVIGATION @@ -344,5 +341,3 @@ void bluetoothDisable(); #else #define NUM_FUNCTIONS_SWITCHES 0 #endif - -#endif // _BOARD_H_ diff --git a/radio/src/targets/horus/hal.h b/radio/src/targets/horus/hal.h index 2326cb157..1ad62adc8 100644 --- a/radio/src/targets/horus/hal.h +++ b/radio/src/targets/horus/hal.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _HAL_H_ -#define _HAL_H_ +#pragma once #define CPU_FREQ 168000000 #define PERI1_FREQUENCY 42000000 @@ -1099,5 +1098,3 @@ #define LCD_PHYS_W LCD_W #define LCD_DEPTH 16 #endif - -#endif // _HAL_H_ diff --git a/radio/src/targets/horus/imu_lsm6ds33.cpp b/radio/src/targets/horus/imu_lsm6ds33.cpp index 2493207b8..a5ad8eee1 100644 --- a/radio/src/targets/horus/imu_lsm6ds33.cpp +++ b/radio/src/targets/horus/imu_lsm6ds33.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "i2c_driver.h" #include "imu_lsm6ds33.h" diff --git a/radio/src/targets/horus/lcd_driver.cpp b/radio/src/targets/horus/lcd_driver.cpp index 6ef6db885..9659140df 100644 --- a/radio/src/targets/horus/lcd_driver.cpp +++ b/radio/src/targets/horus/lcd_driver.cpp @@ -24,7 +24,7 @@ #include "stm32_hal_ll.h" #include "stm32_hal.h" -#include "opentx_types.h" +#include "edgetx_types.h" #include "dma2d.h" #include "board.h" #include "hal.h" diff --git a/radio/src/targets/horus/lcd_st7796s_driver.cpp b/radio/src/targets/horus/lcd_st7796s_driver.cpp index 136a4499a..7fabd4d6e 100644 --- a/radio/src/targets/horus/lcd_st7796s_driver.cpp +++ b/radio/src/targets/horus/lcd_st7796s_driver.cpp @@ -31,7 +31,7 @@ #include "dma2d.h" #include "hal.h" #include "lcd.h" -#include "opentx_types.h" +#include "edgetx_types.h" static LTDC_HandleTypeDef hltdc; static void* initialFrameBuffer = nullptr; diff --git a/radio/src/targets/horus/tp_gt911.cpp b/radio/src/targets/horus/tp_gt911.cpp index 99984b237..47bab716a 100644 --- a/radio/src/targets/horus/tp_gt911.cpp +++ b/radio/src/targets/horus/tp_gt911.cpp @@ -33,7 +33,7 @@ #include "delays_driver.h" #include "rtos.h" -#include "opentx_types.h" +#include "edgetx_types.h" #include "debug.h" #include diff --git a/radio/src/targets/horus/usb_descriptor.h b/radio/src/targets/horus/usb_descriptor.h index 2f344a4b5..acd181ce2 100644 --- a/radio/src/targets/horus/usb_descriptor.h +++ b/radio/src/targets/horus/usb_descriptor.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _USB_DESCRIPTOR_H_ -#define _USB_DESCRIPTOR_H_ +#pragma once #if defined(PCBX12S) #define USB_NAME "FrSky Horus" @@ -51,5 +50,3 @@ #define USB_MANUFACTURER 'F', 'r', 'S', 'k', 'y', ' ', ' ', ' ' /* 8 bytes */ #define USB_PRODUCT 'X', '1', '0', ' ', ' ', ' ', ' ', ' ' /* 8 Bytes */ #endif - -#endif // _USB_DESCRIPTOR_H_ diff --git a/radio/src/targets/nv14/backlight_driver.cpp b/radio/src/targets/nv14/backlight_driver.cpp index 9c9269c37..b8e1b14b0 100644 --- a/radio/src/targets/nv14/backlight_driver.cpp +++ b/radio/src/targets/nv14/backlight_driver.cpp @@ -23,7 +23,7 @@ #include "stm32_gpio.h" #include "stm32_timer.h" -#include "opentx_types.h" +#include "edgetx_types.h" #include "board.h" #include "globals.h" diff --git a/radio/src/targets/nv14/battery_driver.cpp b/radio/src/targets/nv14/battery_driver.cpp index fc640578c..ecbe685cb 100644 --- a/radio/src/targets/nv14/battery_driver.cpp +++ b/radio/src/targets/nv14/battery_driver.cpp @@ -22,7 +22,7 @@ #include "hal/gpio.h" #include "stm32_gpio.h" -#include "opentx.h" +#include "edgetx.h" #include "battery_driver.h" #define __BATTERY_DRIVER_C__ diff --git a/radio/src/targets/nv14/board.h b/radio/src/targets/nv14/board.h index 9245b5b37..a363045bf 100644 --- a/radio/src/targets/nv14/board.h +++ b/radio/src/targets/nv14/board.h @@ -19,11 +19,10 @@ * GNU General Public License for more details. */ -#ifndef _BOARD_H_ -#define _BOARD_H_ +#pragma once #include "definitions.h" -#include "opentx_constants.h" +#include "edgetx_constants.h" #include "board_common.h" #include "hal.h" @@ -240,5 +239,3 @@ void hapticOn(uint32_t pwmPercent); bool touchPanelEventOccured(); struct TouchState touchPanelRead(); struct TouchState getInternalTouchState(); - -#endif // _BOARD_H_ diff --git a/radio/src/targets/nv14/hal.h b/radio/src/targets/nv14/hal.h index ca4f8b92e..8f084c0e6 100644 --- a/radio/src/targets/nv14/hal.h +++ b/radio/src/targets/nv14/hal.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _HAL_H_ -#define _HAL_H_ +#pragma once #define CPU_FREQ 168000000 @@ -476,5 +475,3 @@ #define LCD_DEPTH 16 #define LCD_CONTRAST_DEFAULT 20 - -#endif // _HAL_H_ diff --git a/radio/src/targets/nv14/lcd_driver.cpp b/radio/src/targets/nv14/lcd_driver.cpp index 56055a080..1b11febd8 100644 --- a/radio/src/targets/nv14/lcd_driver.cpp +++ b/radio/src/targets/nv14/lcd_driver.cpp @@ -22,7 +22,7 @@ #include "stm32_hal_ll.h" #include "stm32_hal.h" -#include "opentx_types.h" +#include "edgetx_types.h" #include "dma2d.h" #include "hal.h" #include "hal/gpio.h" diff --git a/radio/src/targets/nv14/lcd_driver.h b/radio/src/targets/nv14/lcd_driver.h index 6f0820f00..054b79902 100644 --- a/radio/src/targets/nv14/lcd_driver.h +++ b/radio/src/targets/nv14/lcd_driver.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef __LCD_DRIVER_H__ -#define __LCD_DRIVER_H__ +#pragma once #define HBP ( 24 ) // TODO use names from FlySky #define VBP ( 10 ) @@ -91,11 +90,3 @@ extern lcdSpiInitFucPtr lcdOnFunction; #define VERTICAL_BACK_PORCH ( 6 ) #define VERTICAL_FRONT_PORCH ( 14 - VERTICAL_BACK_PORCH ) #endif - - - -#endif - - - - diff --git a/radio/src/targets/nv14/touch_driver.h b/radio/src/targets/nv14/touch_driver.h index f722edb67..8d3e4d8ce 100644 --- a/radio/src/targets/nv14/touch_driver.h +++ b/radio/src/targets/nv14/touch_driver.h @@ -71,8 +71,8 @@ * ****************************************************************************** */ -#ifndef __FT6X06_H -#define __FT6X06_H + +#pragma once #ifdef __cplusplus extern "C" { @@ -364,4 +364,3 @@ extern void TouchDriver( void ); #ifdef __cplusplus } #endif -#endif /* __FT6X06_H */ diff --git a/radio/src/targets/nv14/usb_descriptor.h b/radio/src/targets/nv14/usb_descriptor.h index a5488ed19..07c39ae62 100644 --- a/radio/src/targets/nv14/usb_descriptor.h +++ b/radio/src/targets/nv14/usb_descriptor.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _USB_DESCRIPTOR_H_ -#define _USB_DESCRIPTOR_H_ +#pragma once #if (PCBREV == EL18) #define USB_NAME "Flysky EL18" @@ -31,5 +30,3 @@ #define USB_MANUFACTURER 'F', 'l', 'y', 's', 'k', 'y', ' ', ' ' /* 8 bytes */ #define USB_PRODUCT 'N', 'V', '1', '4', ' ', ' ', ' ', ' ' /* 8 Bytes */ #endif - -#endif // _USB_DESCRIPTOR_H_ diff --git a/radio/src/targets/pl18/backlight_driver.cpp b/radio/src/targets/pl18/backlight_driver.cpp index 3996e0926..3f72815f6 100644 --- a/radio/src/targets/pl18/backlight_driver.cpp +++ b/radio/src/targets/pl18/backlight_driver.cpp @@ -23,7 +23,7 @@ #include "stm32_gpio.h" #include "stm32_timer.h" -#include "opentx_types.h" +#include "edgetx_types.h" #include "board.h" #include "globals.h" diff --git a/radio/src/targets/pl18/battery_driver.cpp b/radio/src/targets/pl18/battery_driver.cpp index 1a93916a0..18b113262 100644 --- a/radio/src/targets/pl18/battery_driver.cpp +++ b/radio/src/targets/pl18/battery_driver.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "battery_driver.h" #include "boards/generic_stm32/rgb_leds.h" diff --git a/radio/src/targets/pl18/board.h b/radio/src/targets/pl18/board.h index 9a9e2af94..1f4ac4d35 100644 --- a/radio/src/targets/pl18/board.h +++ b/radio/src/targets/pl18/board.h @@ -19,11 +19,10 @@ * GNU General Public License for more details. */ -#ifndef _BOARD_H_ -#define _BOARD_H_ +#pragma once #include "definitions.h" -#include "opentx_constants.h" +#include "edgetx_constants.h" #include "board_common.h" #include "hal.h" @@ -227,5 +226,3 @@ void hapticOn(uint32_t pwmPercent); bool touchPanelEventOccured(); struct TouchState touchPanelRead(); struct TouchState getInternalTouchState(); - -#endif // _BOARD_H_ diff --git a/radio/src/targets/pl18/hal.h b/radio/src/targets/pl18/hal.h index 1d5976a95..c5c47c959 100644 --- a/radio/src/targets/pl18/hal.h +++ b/radio/src/targets/pl18/hal.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _HAL_H_ -#define _HAL_H_ +#pragma once #define CPU_FREQ 168000000 @@ -653,5 +652,3 @@ #define LCD_DEPTH 16 #define LCD_CONTRAST_DEFAULT 20 - -#endif // _HAL_H_ diff --git a/radio/src/targets/pl18/lcd_driver.cpp b/radio/src/targets/pl18/lcd_driver.cpp index 8b186f703..6b398fb3f 100644 --- a/radio/src/targets/pl18/lcd_driver.cpp +++ b/radio/src/targets/pl18/lcd_driver.cpp @@ -21,7 +21,7 @@ #include "stm32_hal_ll.h" #include "stm32_hal.h" -#include "opentx_types.h" +#include "edgetx_types.h" #include "dma2d.h" #include "hal.h" #include "hal/gpio.h" diff --git a/radio/src/targets/pl18/lcd_driver.h b/radio/src/targets/pl18/lcd_driver.h index 839f5e08f..5827a1a2a 100644 --- a/radio/src/targets/pl18/lcd_driver.h +++ b/radio/src/targets/pl18/lcd_driver.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef __LCD_DRIVER_H__ -#define __LCD_DRIVER_H__ +#pragma once #define HBP ( 24 ) // TODO use names from FlySky #define VBP ( 10 ) @@ -75,11 +74,3 @@ extern lcdSpiInitFucPtr lcdOnFunction; #define VERTICAL_BACK_PORCH ( 6 ) #define VERTICAL_FRONT_PORCH ( 14 - VERTICAL_BACK_PORCH ) #endif - - - -#endif - - - - diff --git a/radio/src/targets/pl18/usb_descriptor.h b/radio/src/targets/pl18/usb_descriptor.h index 1639e6397..27ec010c9 100644 --- a/radio/src/targets/pl18/usb_descriptor.h +++ b/radio/src/targets/pl18/usb_descriptor.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _USB_DESCRIPTOR_H_ -#define _USB_DESCRIPTOR_H_ +#pragma once #if defined(RADIO_PL18EV) #define USB_NAME "FlySky PL18EV" @@ -31,5 +30,3 @@ #define USB_MANUFACTURER 'F', 'l', 'y', 'S', 'k', 'y', ' ', ' ' /* 8 bytes */ #define USB_PRODUCT 'P', 'L', '1', '8', ' ', ' ', ' ', ' ' /* 8 Bytes */ #endif - -#endif // _USB_DESCRIPTOR_H_ diff --git a/radio/src/targets/simu/opentxsimulator.cpp b/radio/src/targets/simu/opentxsimulator.cpp index a37188294..3a509c6f2 100644 --- a/radio/src/targets/simu/opentxsimulator.cpp +++ b/radio/src/targets/simu/opentxsimulator.cpp @@ -20,7 +20,7 @@ */ #include "opentxsimulator.h" -#include "opentx.h" +#include "edgetx.h" #include "simulcd.h" #include "switches.h" @@ -558,7 +558,7 @@ void OpenTxSimulator::checkOutputsChanged() const static int16_t limit = 512 * 2; qint32 tmpVal; uint8_t i, idx; - const uint8_t phase = getFlightMode(); // opentx.cpp + const uint8_t phase = getFlightMode(); // edgetx.cpp for (i=0; i < chansDim; i++) { if (lastOutputs.chans[i] != channelOutputs[i] || m_resetOutputsData) { diff --git a/radio/src/targets/simu/opentxsimulator.h b/radio/src/targets/simu/opentxsimulator.h index 758529475..dca0e5c9f 100644 --- a/radio/src/targets/simu/opentxsimulator.h +++ b/radio/src/targets/simu/opentxsimulator.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _OPENTX_SIMULATOR_H_ -#define _OPENTX_SIMULATOR_H_ +#pragma once #include "simulatorinterface.h" @@ -111,5 +110,3 @@ class DLLEXPORT OpenTxSimulator : public SimulatorInterface bool m_stopRequested; }; - -#endif // _OPENTX_SIMULATOR_H_ diff --git a/radio/src/targets/simu/rs232.h b/radio/src/targets/simu/rs232.h index ab90cd796..73fc13c72 100644 --- a/radio/src/targets/simu/rs232.h +++ b/radio/src/targets/simu/rs232.h @@ -30,8 +30,7 @@ THE SOFTWARE. */ -#ifndef RS232_H -#define RS232_H +#pragma once #ifdef __cplusplus extern "C" { @@ -151,5 +150,3 @@ extern "C" { #ifdef __cplusplus } #endif - -#endif // RS232_H diff --git a/radio/src/targets/simu/simpgmspace.cpp b/radio/src/targets/simu/simpgmspace.cpp index 9fc805385..b44c422f6 100644 --- a/radio/src/targets/simu/simpgmspace.cpp +++ b/radio/src/targets/simu/simpgmspace.cpp @@ -26,7 +26,7 @@ #include #endif -#include "opentx.h" +#include "edgetx.h" #include "simulcd.h" #include "hal/adc_driver.h" diff --git a/radio/src/targets/simu/simpgmspace.h b/radio/src/targets/simu/simpgmspace.h index 179398b47..8fb272233 100644 --- a/radio/src/targets/simu/simpgmspace.h +++ b/radio/src/targets/simu/simpgmspace.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _SIMPGMSPACE_H_ -#define _SIMPGMSPACE_H_ +#pragma once #include #define sleep(x) usleep(1000*x) @@ -94,5 +93,3 @@ void simuMain(); extern struct TouchState simTouchState; extern bool simTouchOccured; #endif - -#endif // _SIMPGMSPACE_H_ diff --git a/radio/src/targets/simu/simudisk.cpp b/radio/src/targets/simu/simudisk.cpp index 9ef85300a..5eb9886af 100644 --- a/radio/src/targets/simu/simudisk.cpp +++ b/radio/src/targets/simu/simudisk.cpp @@ -20,7 +20,7 @@ */ #if defined(SIMU_DISKIO) -#include "opentx.h" +#include "edgetx.h" #include "ff.h" #include "diskio.h" #include diff --git a/radio/src/targets/simu/simueeprom.cpp b/radio/src/targets/simu/simueeprom.cpp index dcd07213d..ed39cdeff 100644 --- a/radio/src/targets/simu/simueeprom.cpp +++ b/radio/src/targets/simu/simueeprom.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" const char * eepromFile = nullptr; FILE * fp = nullptr; diff --git a/radio/src/targets/simu/simufatfs.cpp b/radio/src/targets/simu/simufatfs.cpp index 26bd3802c..6a946168a 100644 --- a/radio/src/targets/simu/simufatfs.cpp +++ b/radio/src/targets/simu/simufatfs.cpp @@ -23,7 +23,7 @@ #include #include #include -#include "opentx.h" +#include "edgetx.h" #if defined(SIMU_USE_SDCARD) // rest of file is excluded otherwise diff --git a/radio/src/targets/simu/simulcd.h b/radio/src/targets/simu/simulcd.h index c826d2726..7b96a1989 100644 --- a/radio/src/targets/simu/simulcd.h +++ b/radio/src/targets/simu/simulcd.h @@ -19,10 +19,9 @@ * GNU General Public License for more details. */ -#ifndef _SIMULCD_H_ -#define _SIMULCD_H_ +#pragma once -#include "opentx_types.h" +#include "edgetx_types.h" #include "lcd.h" extern int g_snapshot_idx; @@ -34,5 +33,3 @@ extern pixel_t* simuLcdBuf; extern pixel_t simuLcdBuf[DISPLAY_BUFFER_SIZE]; extern pixel_t displayBuf[DISPLAY_BUFFER_SIZE]; #endif - -#endif // _SIMULCD_H_ diff --git a/radio/src/targets/taranis/bind_button_driver.cpp b/radio/src/targets/taranis/bind_button_driver.cpp index 01c088d5c..7ee50ae69 100644 --- a/radio/src/targets/taranis/bind_button_driver.cpp +++ b/radio/src/targets/taranis/bind_button_driver.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "MultiProtoDefs.h" bool setBindProtocolSelection() diff --git a/radio/src/targets/taranis/board.cpp b/radio/src/targets/taranis/board.cpp index baf333ea4..0e7b8e58d 100644 --- a/radio/src/targets/taranis/board.cpp +++ b/radio/src/targets/taranis/board.cpp @@ -49,7 +49,7 @@ #endif #if !defined(BOOT) - #include "opentx.h" + #include "edgetx.h" #if defined(PXX1) #include "pulses/pxx1.h" #endif diff --git a/radio/src/targets/taranis/board.h b/radio/src/targets/taranis/board.h index 73190dae7..dbb68aa2b 100644 --- a/radio/src/targets/taranis/board.h +++ b/radio/src/targets/taranis/board.h @@ -27,7 +27,7 @@ #include "hal/watchdog_driver.h" #include "definitions.h" -#include "opentx_constants.h" +#include "edgetx_constants.h" #include "board_common.h" #if defined(ROTARY_ENCODER_NAVIGATION) diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h index af1e34a58..579e9ed4c 100644 --- a/radio/src/targets/taranis/hal.h +++ b/radio/src/targets/taranis/hal.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _HAL_H_ -#define _HAL_H_ +#pragma once #if defined(STM32F413xx) #define CPU_FREQ 100000000 @@ -2774,5 +2773,3 @@ #define MIXER_SCHEDULER_TIMER_FREQ (PERI1_FREQUENCY * TIMER_MULT_APB1) #define MIXER_SCHEDULER_TIMER_IRQn TIM8_BRK_TIM12_IRQn #define MIXER_SCHEDULER_TIMER_IRQHandler TIM8_BRK_TIM12_IRQHandler - -#endif // _HAL_H_ diff --git a/radio/src/targets/taranis/lcd_driver_spi.cpp b/radio/src/targets/taranis/lcd_driver_spi.cpp index 06295e82a..5b5d99991 100644 --- a/radio/src/targets/taranis/lcd_driver_spi.cpp +++ b/radio/src/targets/taranis/lcd_driver_spi.cpp @@ -31,7 +31,7 @@ #include "hal/abnormal_reboot.h" #if !defined(BOOT) - #include "opentx.h" + #include "edgetx.h" #endif #if defined(OLED_SCREEN) diff --git a/radio/src/targets/taranis/top_lcd_driver.cpp b/radio/src/targets/taranis/top_lcd_driver.cpp index ca949de5e..b16012ea8 100644 --- a/radio/src/targets/taranis/top_lcd_driver.cpp +++ b/radio/src/targets/taranis/top_lcd_driver.cpp @@ -22,7 +22,7 @@ #include "hal/gpio.h" #include "stm32_gpio.h" -#include "opentx.h" +#include "edgetx.h" #include "board.h" #include "lcd.h" diff --git a/radio/src/targets/taranis/usb_descriptor.h b/radio/src/targets/taranis/usb_descriptor.h index 7fa24e07d..fd1680a05 100644 --- a/radio/src/targets/taranis/usb_descriptor.h +++ b/radio/src/targets/taranis/usb_descriptor.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _USB_DESCRIPTOR_H_ -#define _USB_DESCRIPTOR_H_ +#pragma once #if defined(RADIO_TX12) || defined(RADIO_TX12MK2) #define USB_NAME "Radiomaster TX12" @@ -91,5 +90,3 @@ #define USB_MANUFACTURER 'F', 'r', 'S', 'k', 'y', ' ', ' ', ' ' /* 8 bytes */ #define USB_PRODUCT 'T', 'a', 'r', 'a', 'n', 'i', 's', ' ' /* 8 Bytes */ #endif - -#endif // _USB_DESCRIPTOR_H_ diff --git a/radio/src/tasks.cpp b/radio/src/tasks.cpp index 09e774a59..8944f6039 100644 --- a/radio/src/tasks.cpp +++ b/radio/src/tasks.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "timers_driver.h" #include "hal/abnormal_reboot.h" #include "hal/watchdog_driver.h" diff --git a/radio/src/tasks.h b/radio/src/tasks.h index c17c32084..89f60156d 100644 --- a/radio/src/tasks.h +++ b/radio/src/tasks.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _TASKS_H_ -#define _TASKS_H_ +#pragma once #include "rtos.h" @@ -72,5 +71,3 @@ inline void resetForcePowerOffRequest() { timeForcePowerOffPressed = 0; } - -#endif // _TASKS_H_ diff --git a/radio/src/tasks/mixer_task.cpp b/radio/src/tasks/mixer_task.cpp index 92409c0e0..d7b33a675 100644 --- a/radio/src/tasks/mixer_task.cpp +++ b/radio/src/tasks/mixer_task.cpp @@ -23,7 +23,7 @@ #include "mixer_task.h" #include "mixer_scheduler.h" -#include "opentx.h" +#include "edgetx.h" #include "switches.h" #include "hal/usb_driver.h" diff --git a/radio/src/telemetry/crossfire.cpp b/radio/src/telemetry/crossfire.cpp index 4b4579655..259c7d4d8 100644 --- a/radio/src/telemetry/crossfire.cpp +++ b/radio/src/telemetry/crossfire.cpp @@ -20,7 +20,7 @@ */ #include "crossfire.h" -#include "opentx.h" +#include "edgetx.h" // clang-format off #define CS(id,subId,name,unit,precision) {id,subId,unit,precision,name} diff --git a/radio/src/telemetry/crossfire.h b/radio/src/telemetry/crossfire.h index 073f734df..e12d9298b 100644 --- a/radio/src/telemetry/crossfire.h +++ b/radio/src/telemetry/crossfire.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _CROSSFIRE_H_ -#define _CROSSFIRE_H_ +#pragma once #include #include "dataconstants.h" @@ -183,5 +182,3 @@ const uint8_t CROSSFIRE_FRAME_PERIODS[] = { #endif #define CROSSFIRE_TELEM_MIRROR_BAUDRATE 115200 - -#endif // _CROSSFIRE_H_ diff --git a/radio/src/telemetry/flysky_ibus.cpp b/radio/src/telemetry/flysky_ibus.cpp index ff0f87913..8e387ca2a 100644 --- a/radio/src/telemetry/flysky_ibus.cpp +++ b/radio/src/telemetry/flysky_ibus.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" /* * TXID + RXID are already skipped in MULTI module to save memory+transmission time, format from Multi is: diff --git a/radio/src/telemetry/flysky_ibus.h b/radio/src/telemetry/flysky_ibus.h index 632b63927..c2d3da0cf 100644 --- a/radio/src/telemetry/flysky_ibus.h +++ b/radio/src/telemetry/flysky_ibus.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _FLYSKY_IBUS_H -#define _FLYSKY_IBUS_H +#pragma once void processFlySkySensor(const uint8_t *packet, uint8_t type); @@ -32,6 +31,3 @@ void flySkySetDefault(int index, uint16_t id, uint8_t subId, uint8_t instance); void processFlySkyPacket(const uint8_t * packet); void processFlySkyPacketAC(const uint8_t * packet); - - -#endif diff --git a/radio/src/telemetry/flysky_nv14.cpp b/radio/src/telemetry/flysky_nv14.cpp index d2851cf67..18e80a8f9 100644 --- a/radio/src/telemetry/flysky_nv14.cpp +++ b/radio/src/telemetry/flysky_nv14.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "flysky_nv14.h" #include "flysky_ibus.h" #include "pulses/afhds2.h" diff --git a/radio/src/telemetry/flysky_nv14.h b/radio/src/telemetry/flysky_nv14.h index 003dc5cba..0fdc45347 100644 --- a/radio/src/telemetry/flysky_nv14.h +++ b/radio/src/telemetry/flysky_nv14.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef __FLYSKY_NV14_H__ -#define __FLYSKY_NV14_H__ +#pragma once enum FlySkySensorType_E { FLYSKY_SENSOR_RX_VOLTAGE, @@ -67,5 +66,3 @@ void processInternalFlySkyTelemetryData(uint8_t byte); uint8_t intmoduleGetByte(uint8_t * byte); extern bool syncAfhds2Module; - -#endif diff --git a/radio/src/telemetry/frsky.cpp b/radio/src/telemetry/frsky.cpp index 412442803..1294fef74 100644 --- a/radio/src/telemetry/frsky.cpp +++ b/radio/src/telemetry/frsky.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" static inline bool pushFrskyTelemetryData(bool is_sport, uint8_t data, uint8_t* buffer, uint8_t& len) diff --git a/radio/src/telemetry/frsky.h b/radio/src/telemetry/frsky.h index 54a90dab5..04a399f47 100644 --- a/radio/src/telemetry/frsky.h +++ b/radio/src/telemetry/frsky.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _FRSKY_H_ -#define _FRSKY_H_ +#pragma once #include "../../definitions.h" #include "telemetry_holders.h" @@ -139,5 +138,3 @@ inline bool isRasValueValid() #endif constexpr uint8_t FRSKY_BAD_ANTENNA_THRESHOLD = 0x33; - -#endif // _FRSKY_H_ diff --git a/radio/src/telemetry/frsky_d.cpp b/radio/src/telemetry/frsky_d.cpp index c21ff8a2b..987d1b7c4 100644 --- a/radio/src/telemetry/frsky_d.cpp +++ b/radio/src/telemetry/frsky_d.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" void parseTelemHubByte(uint8_t byte) { diff --git a/radio/src/telemetry/frsky_pxx2.cpp b/radio/src/telemetry/frsky_pxx2.cpp index b43738e9e..153bba346 100644 --- a/radio/src/telemetry/frsky_pxx2.cpp +++ b/radio/src/telemetry/frsky_pxx2.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #if defined(PXX2) diff --git a/radio/src/telemetry/frsky_sport.cpp b/radio/src/telemetry/frsky_sport.cpp index 652997ff5..2a81d1892 100644 --- a/radio/src/telemetry/frsky_sport.cpp +++ b/radio/src/telemetry/frsky_sport.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" struct FrSkySportSensor { const uint16_t firstId; diff --git a/radio/src/telemetry/ghost.cpp b/radio/src/telemetry/ghost.cpp index 85e36c6c7..988c7a555 100644 --- a/radio/src/telemetry/ghost.cpp +++ b/radio/src/telemetry/ghost.cpp @@ -22,7 +22,7 @@ #include "ghost.h" #include "ghost_menu.h" -#include "opentx.h" +#include "edgetx.h" const char * const ghstRfProfileValue[GHST_RF_PROFILE_COUNT] = { "Auto", "Norm", "Race", "Pure", "Long", "Unused", "Race2", "Pure2" }; const char * const ghstVtxBandName[GHST_VTX_BAND_COUNT] = { "- - -" , "IRC", "Race", "BandE", "BandB", "BandA" }; diff --git a/radio/src/telemetry/hitec.cpp b/radio/src/telemetry/hitec.cpp index d83f6d457..b9b54deac 100644 --- a/radio/src/telemetry/hitec.cpp +++ b/radio/src/telemetry/hitec.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" /* Full telemetry packet[0] = TX RSSI value diff --git a/radio/src/telemetry/hitec.h b/radio/src/telemetry/hitec.h index e5abdeb58..2e144a59c 100644 --- a/radio/src/telemetry/hitec.h +++ b/radio/src/telemetry/hitec.h @@ -19,13 +19,10 @@ * GNU General Public License for more details. */ -#ifndef _HITEC_H -#define _HITEC_H +#pragma once void processHitecTelemetryData(uint8_t data, uint8_t* rxBuffer, uint8_t& rxBufferCount); void hitecSetDefault(int index, uint16_t id, uint8_t subId, uint8_t instance); // Used by multi protocol void processHitecPacket(const uint8_t *packet); - -#endif diff --git a/radio/src/telemetry/hott.cpp b/radio/src/telemetry/hott.cpp index f2bfd1a83..d4979403f 100644 --- a/radio/src/telemetry/hott.cpp +++ b/radio/src/telemetry/hott.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" /* HoTT Telemetry diff --git a/radio/src/telemetry/hott.h b/radio/src/telemetry/hott.h index c7116e7be..8acba4066 100644 --- a/radio/src/telemetry/hott.h +++ b/radio/src/telemetry/hott.h @@ -19,12 +19,9 @@ * GNU General Public License for more details. */ -#ifndef _HOTT_H -#define _HOTT_H +#pragma once void hottSetDefault(int index, uint16_t id, uint8_t subId, uint8_t instance); // Used by multi protocol void processHottPacket(const uint8_t * packet); - -#endif diff --git a/radio/src/telemetry/mlink.cpp b/radio/src/telemetry/mlink.cpp index 6db7e6f3e..1dbf59715 100644 --- a/radio/src/telemetry/mlink.cpp +++ b/radio/src/telemetry/mlink.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "mlink.h" struct MLinkSensor diff --git a/radio/src/telemetry/multi.cpp b/radio/src/telemetry/multi.cpp index 891ddcca3..9d4604616 100644 --- a/radio/src/telemetry/multi.cpp +++ b/radio/src/telemetry/multi.cpp @@ -18,7 +18,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "hal/module_port.h" #include "telemetry.h" diff --git a/radio/src/telemetry/multi.h b/radio/src/telemetry/multi.h index 6bc111b25..d028bcfcf 100644 --- a/radio/src/telemetry/multi.h +++ b/radio/src/telemetry/multi.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef OPENTX_MULTI_H -#define OPENTX_MULTI_H +#pragma once #include "timers_driver.h" @@ -155,5 +154,3 @@ bool isMultiModeScanning(uint8_t module); bool isMultiTelemReceiving(uint8_t module); void checkFailsafeMulti(); - -#endif //OPENTX_MULTI_H diff --git a/radio/src/telemetry/spektrum.cpp b/radio/src/telemetry/spektrum.cpp index 5b21799d9..ccbf47065 100644 --- a/radio/src/telemetry/spektrum.cpp +++ b/radio/src/telemetry/spektrum.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "spektrum.h" #include "hal/module_port.h" #include "tasks/mixer_task.h" diff --git a/radio/src/telemetry/spektrum.h b/radio/src/telemetry/spektrum.h index 4a2b4f89d..45d895bbb 100644 --- a/radio/src/telemetry/spektrum.h +++ b/radio/src/telemetry/spektrum.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _SPEKTRUM_H -#define _SPEKTRUM_H +#pragma once void processSpektrumTelemetryData(uint8_t module, uint8_t data, uint8_t* rxBuffer, uint8_t& rxBufferCount); void spektrumSetDefault(int index, uint16_t id, uint8_t subId, uint8_t instance); @@ -28,4 +27,3 @@ void spektrumSetDefault(int index, uint16_t id, uint8_t subId, uint8_t instance) // Used directly by multi telemetry protocol void processSpektrumPacket(const uint8_t *packet); void processDSMBindPacket(uint8_t module, const uint8_t *packet); -#endif diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp index ad60dcfb9..22b2ef2a4 100644 --- a/radio/src/telemetry/telemetry.cpp +++ b/radio/src/telemetry/telemetry.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "multi.h" #include "pulses/afhds3.h" #include "pulses/flysky.h" diff --git a/radio/src/telemetry/telemetry.h b/radio/src/telemetry/telemetry.h index 859287c9d..364ac91f7 100644 --- a/radio/src/telemetry/telemetry.h +++ b/radio/src/telemetry/telemetry.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _TELEMETRY_H_ -#define _TELEMETRY_H_ +#pragma once #include "dataconstants.h" #include "myeeprom.h" @@ -274,5 +273,3 @@ struct ModuleSyncStatus }; ModuleSyncStatus& getModuleSyncStatus(uint8_t moduleIdx); - -#endif // _TELEMETRY_H_ diff --git a/radio/src/telemetry/telemetry_holders.h b/radio/src/telemetry/telemetry_holders.h index fa17e6b50..9485abc32 100644 --- a/radio/src/telemetry/telemetry_holders.h +++ b/radio/src/telemetry/telemetry_holders.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _TELEMETRY_HOLDERS_H_ -#define _TELEMETRY_HOLDERS_H_ +#pragma once #include #include @@ -131,5 +130,3 @@ class TelemetryMinDecorator: public T { protected: uint8_t _min; }; - -#endif // _TELEMETRY_HOLDERS_H_ diff --git a/radio/src/telemetry/telemetry_sensors.cpp b/radio/src/telemetry/telemetry_sensors.cpp index 9849438ab..60a958ca4 100644 --- a/radio/src/telemetry/telemetry_sensors.cpp +++ b/radio/src/telemetry/telemetry_sensors.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #define _USE_MATH_DEFINES #include diff --git a/radio/src/telemetry/telemetry_sensors.h b/radio/src/telemetry/telemetry_sensors.h index a698824dc..b087cbded 100644 --- a/radio/src/telemetry/telemetry_sensors.h +++ b/radio/src/telemetry/telemetry_sensors.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _TELEMETRY_SENSORS_H_ -#define _TELEMETRY_SENSORS_H_ +#pragma once #include "telemetry.h" @@ -133,5 +132,3 @@ class TelemetryItem extern TelemetryItem telemetryItems[MAX_TELEMETRY_SENSORS]; extern uint8_t allowNewSensors; bool isFaiForbidden(source_t idx); - -#endif // _TELEMETRY_SENSORS_H_ diff --git a/radio/src/tests/gtests.h b/radio/src/tests/gtests.h index 9de7adb2f..83e23d769 100644 --- a/radio/src/tests/gtests.h +++ b/radio/src/tests/gtests.h @@ -19,15 +19,14 @@ * GNU General Public License for more details. */ -#ifndef _GTESTS_H_ -#define _GTESTS_H_ +#pragma once #include #include #include #define SWAP_DEFINED -#include "opentx.h" +#include "edgetx.h" #include "model_init.h" #include "switches.h" #include "hal/switch_driver.h" @@ -115,5 +114,3 @@ class OpenTxTest : public testing::Test RADIO_RESET(); } }; - -#endif // _GTESTS_H_ diff --git a/radio/src/tests/lcd.cpp b/radio/src/tests/lcd.cpp index b6dc3e505..e1ac08cbb 100644 --- a/radio/src/tests/lcd.cpp +++ b/radio/src/tests/lcd.cpp @@ -28,7 +28,7 @@ #include #define SWAP_DEFINED -#include "opentx.h" +#include "edgetx.h" #include "location.h" #include "targets/simu/simulcd.h" diff --git a/radio/src/tests/lcd_480x272.cpp b/radio/src/tests/lcd_480x272.cpp index e135a5815..adf72a90d 100644 --- a/radio/src/tests/lcd_480x272.cpp +++ b/radio/src/tests/lcd_480x272.cpp @@ -24,7 +24,7 @@ #define SWAP_DEFINED #include "location.h" -#include "opentx.h" +#include "edgetx.h" #if defined(COLORLCD) diff --git a/radio/src/tests/lua.cpp b/radio/src/tests/lua.cpp index 605dd806d..74200b98b 100644 --- a/radio/src/tests/lua.cpp +++ b/radio/src/tests/lua.cpp @@ -25,7 +25,7 @@ #if defined(LUA) #define SWAP_DEFINED -#include "opentx.h" +#include "edgetx.h" #define MIXSRC_THR (MIXSRC_FIRST_STICK + inputMappingGetThrottle()) #define MIXSRC_TRIMTHR (MIXSRC_FIRST_TRIM + inputMappingGetThrottle()) diff --git a/radio/src/timers.cpp b/radio/src/timers.cpp index eb8f0dab1..fea9d4703 100644 --- a/radio/src/timers.cpp +++ b/radio/src/timers.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #include "timers.h" #include "switches.h" diff --git a/radio/src/timers.h b/radio/src/timers.h index 2afc9ecaa..a1094ac52 100644 --- a/radio/src/timers.h +++ b/radio/src/timers.h @@ -19,10 +19,9 @@ * GNU General Public License for more details. */ -#ifndef _TIMERS_H_ -#define _TIMERS_H_ +#pragma once -#include "opentx_types.h" +#include "edgetx_types.h" #define TMR_OFF 0 #define TMR_RUNNING 1 @@ -59,5 +58,3 @@ void evalTimers(int16_t throttle, uint8_t tick10ms); int16_t throttleSource2Source(int16_t thrSrc); int16_t source2ThrottleSource(int16_t src); - -#endif // _TIMERS_H_ diff --git a/radio/src/touch.h b/radio/src/touch.h index b04c796c5..4572ed7c4 100644 --- a/radio/src/touch.h +++ b/radio/src/touch.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _TOUCH_H_ -#define _TOUCH_H_ +#pragma once enum TouchEvent { @@ -49,5 +48,3 @@ struct TouchState #define SLIDE_RANGE 6 extern struct TouchState touchState; - -#endif // _TOUCH_H_ diff --git a/radio/src/trainer.cpp b/radio/src/trainer.cpp index 3c1d3f44d..aa850d9ec 100644 --- a/radio/src/trainer.cpp +++ b/radio/src/trainer.cpp @@ -21,7 +21,7 @@ #include "hal/trainer_driver.h" -#include "opentx.h" +#include "edgetx.h" // Timer gets decremented in per10ms() #define TRAINER_IN_VALID_TIMEOUT 100 // 1s diff --git a/radio/src/trainer.h b/radio/src/trainer.h index 28a2954b4..14eb19cf1 100644 --- a/radio/src/trainer.h +++ b/radio/src/trainer.h @@ -19,8 +19,7 @@ * GNU General Public License for more details. */ -#ifndef _TRAINER_H_ -#define _TRAINER_H_ +#pragma once #include "dataconstants.h" @@ -43,5 +42,3 @@ void stopTrainer(); // Allows notifications on trainer setting change (old_mode, new_mode) void trainerSetChangeCb(void (*changeCb)(uint8_t, uint8_t)); - -#endif // _TRAINER_H_ diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 26c620b08..e856910af 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" #define ISTR(x) const char* const STR_##x[] = { TR_##x } @@ -356,7 +356,7 @@ const char STR_MENU_GLOBAL_VARS[] = TR_MENU_GLOBAL_VARS; const char STR_INTERNALRF[] = TR_INTERNALRF; const char STR_INTERNAL_MODULE[] = TR_INTERNAL_MODULE; const char STR_EXTERNAL_MODULE[] = TR_EXTERNAL_MODULE; -const char STR_OPENTX_UPGRADE_REQUIRED[] = TR_OPENTX_UPGRADE_REQUIRED; +const char STR_EDGETX_UPGRADE_REQUIRED[] = TR_EDGETX_UPGRADE_REQUIRED; const char STR_TELEMETRY_DISABLED[] = TR_TELEMETRY_DISABLED; const char STR_MORE_OPTIONS_AVAILABLE[] = TR_MORE_OPTIONS_AVAILABLE; const char STR_NO_MODULE_INFORMATION[] = TR_NO_MODULE_INFORMATION; diff --git a/radio/src/translations.h b/radio/src/translations.h index b67060b6d..71f725a49 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -22,7 +22,7 @@ #pragma once #include -#include "opentx_types.h" +#include "edgetx_types.h" #include "translations/untranslated.h" #include "audio.h" @@ -583,7 +583,7 @@ extern const char STR_BIND_OK[]; extern const char STR_INTERNALRF[]; extern const char STR_INTERNAL_MODULE[]; extern const char STR_EXTERNAL_MODULE[]; -extern const char STR_OPENTX_UPGRADE_REQUIRED[]; +extern const char STR_EDGETX_UPGRADE_REQUIRED[]; extern const char STR_TELEMETRY_DISABLED[]; extern const char STR_MORE_OPTIONS_AVAILABLE[]; extern const char STR_NO_MODULE_INFORMATION[]; diff --git a/radio/src/translations/cn.h b/radio/src/translations/cn.h index 104dc3c88..0824dc289 100644 --- a/radio/src/translations/cn.h +++ b/radio/src/translations/cn.h @@ -802,7 +802,7 @@ #define TR_INTERNALRF "内置发射" #define TR_INTERNAL_MODULE TR("内置发射", "内置发射") #define TR_EXTERNAL_MODULE TR("外置发射", "外置发射") -#define TR_OPENTX_UPGRADE_REQUIRED "OpenTX需要升级" +#define TR_EDGETX_UPGRADE_REQUIRED "EdgeTX需要升级" #define TR_TELEMETRY_DISABLED "禁用回传" #define TR_MORE_OPTIONS_AVAILABLE "更多可用选项" #define TR_NO_MODULE_INFORMATION "无模块信息" diff --git a/radio/src/translations/cz.h b/radio/src/translations/cz.h index 9ad35d149..6d18853cd 100644 --- a/radio/src/translations/cz.h +++ b/radio/src/translations/cz.h @@ -813,7 +813,7 @@ #define TR_INTERNALRF "Interní RF modul" #define TR_INTERNAL_MODULE "Interní modul" #define TR_EXTERNAL_MODULE "Externí modul" -#define TR_OPENTX_UPGRADE_REQUIRED TR("Aktualizujte EdgeTX", "Vyžadována aktualizace EdgeTX") +#define TR_EDGETX_UPGRADE_REQUIRED TR("Aktualizujte EdgeTX", "Vyžadována aktualizace EdgeTX") #define TR_TELEMETRY_DISABLED "Telem. zakázána" #define TR_MORE_OPTIONS_AVAILABLE TR("Více možností", "Více dostupných možností") #define TR_NO_MODULE_INFORMATION "Žádné info o modulu" diff --git a/radio/src/translations/da.h b/radio/src/translations/da.h index 0e101d1ae..3f4f21a40 100644 --- a/radio/src/translations/da.h +++ b/radio/src/translations/da.h @@ -806,7 +806,7 @@ #define TR_INTERNALRF "Intern RF" #define TR_INTERNAL_MODULE TR("Int. module", "Intern modul") #define TR_EXTERNAL_MODULE TR("Ext. module", "Eksternt modul") -#define TR_OPENTX_UPGRADE_REQUIRED "OpenTX kræver opgradering" +#define TR_EDGETX_UPGRADE_REQUIRED "EdgeTX kræver opgradering" #define TR_TELEMETRY_DISABLED "Telem. deaktiveret" #define TR_MORE_OPTIONS_AVAILABLE "Flere tilvalg mulige" #define TR_NO_MODULE_INFORMATION "Ingen modul information" diff --git a/radio/src/translations/de.h b/radio/src/translations/de.h index 594f1705d..39bb9a46c 100644 --- a/radio/src/translations/de.h +++ b/radio/src/translations/de.h @@ -800,7 +800,7 @@ #define TR_INTERNALRF "Internes HF-Modul" #define TR_INTERNAL_MODULE TR("Int. Modul", "Internes Modul") #define TR_EXTERNAL_MODULE TR("Ext. Modul", "Externes Modul") -#define TR_OPENTX_UPGRADE_REQUIRED "OpenTX upgrade nötig" +#define TR_EDGETX_UPGRADE_REQUIRED "EdgeTX upgrade nötig" #define TR_TELEMETRY_DISABLED "Deaktiv. Telem." //more chars doesn't fit on QX7 #define TR_MORE_OPTIONS_AVAILABLE "mehr Optionen verfügbar" #define TR_NO_MODULE_INFORMATION "keine Modul Info" diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h index 52b3b2897..c6dacd4f2 100644 --- a/radio/src/translations/en.h +++ b/radio/src/translations/en.h @@ -804,7 +804,7 @@ #define TR_INTERNALRF "Internal RF" #define TR_INTERNAL_MODULE TR("Int. module", "Internal module") #define TR_EXTERNAL_MODULE TR("Ext. module", "External module") -#define TR_OPENTX_UPGRADE_REQUIRED "OpenTX upgrade required" +#define TR_EDGETX_UPGRADE_REQUIRED "EdgeTX upgrade required" #define TR_TELEMETRY_DISABLED "Telem. disabled" #define TR_MORE_OPTIONS_AVAILABLE "More options available" #define TR_NO_MODULE_INFORMATION "No module information" diff --git a/radio/src/translations/es.h b/radio/src/translations/es.h index 11f6c7974..f95df9ce2 100644 --- a/radio/src/translations/es.h +++ b/radio/src/translations/es.h @@ -796,7 +796,7 @@ #define TR_INTERNALRF "RF interna" #define TR_INTERNAL_MODULE TR("Módulo int", "Módulo interno") #define TR_EXTERNAL_MODULE TR("Módulo ext", "Módulo externo") -#define TR_OPENTX_UPGRADE_REQUIRED "Actualiz. OpenTX requerida" +#define TR_EDGETX_UPGRADE_REQUIRED "Actualiz. EdgeTX requerida" #define TR_TELEMETRY_DISABLED "Telem. inactiva" #define TR_MORE_OPTIONS_AVAILABLE "Más opciones disp." #define TR_NO_MODULE_INFORMATION "Sin información módulo" diff --git a/radio/src/translations/fi.h b/radio/src/translations/fi.h index e1b2cd8c9..2ac6fceb8 100644 --- a/radio/src/translations/fi.h +++ b/radio/src/translations/fi.h @@ -811,7 +811,7 @@ #define TR_INTERNALRF "Internal RF" #define TR_INTERNAL_MODULE TR("Int. module","Internal module") #define TR_EXTERNAL_MODULE TR("Ext. module","External module") -#define TR_OPENTX_UPGRADE_REQUIRED "OpenTX upgrade required" +#define TR_EDGETX_UPGRADE_REQUIRED "EdgeTX upgrade required" #define TR_TELEMETRY_DISABLED "Telem. disabled" #define TR_MORE_OPTIONS_AVAILABLE "More options available" #define TR_NO_MODULE_INFORMATION "No module information" diff --git a/radio/src/translations/fr.h b/radio/src/translations/fr.h index d968ff49a..f4a0e3776 100644 --- a/radio/src/translations/fr.h +++ b/radio/src/translations/fr.h @@ -802,7 +802,7 @@ #define TR_INTERNALRF "HF interne" #define TR_INTERNAL_MODULE TR("Module int.","Module interne") #define TR_EXTERNAL_MODULE TR("Module ext.","Module externe") -#define TR_OPENTX_UPGRADE_REQUIRED "Màj OpenTX nécessaire" +#define TR_EDGETX_UPGRADE_REQUIRED "Màj EdgeTX nécessaire" #define TR_TELEMETRY_DISABLED "Télém. désactivée" #define TR_MORE_OPTIONS_AVAILABLE "Autres options disponibles" #define TR_NO_MODULE_INFORMATION "Pas d'info Module" diff --git a/radio/src/translations/he.h b/radio/src/translations/he.h index f043dabe0..9fb5ea75a 100644 --- a/radio/src/translations/he.h +++ b/radio/src/translations/he.h @@ -805,7 +805,7 @@ #define TR_INTERNALRF "מודול פנימי" #define TR_INTERNAL_MODULE TR("Int. module", "מודול פנימי") #define TR_EXTERNAL_MODULE TR("Ext. module", "מודול חיצוני") -#define TR_OPENTX_UPGRADE_REQUIRED "OpenTX upgrade required" +#define TR_EDGETX_UPGRADE_REQUIRED "EdgeTX upgrade required" #define TR_TELEMETRY_DISABLED "Telem. disabled" #define TR_MORE_OPTIONS_AVAILABLE "More options available" #define TR_NO_MODULE_INFORMATION "No module information" diff --git a/radio/src/translations/it.h b/radio/src/translations/it.h index 64903b4ec..8cf4e2db0 100644 --- a/radio/src/translations/it.h +++ b/radio/src/translations/it.h @@ -800,7 +800,7 @@ #define TR_INTERNALRF "Modulo interno" #define TR_INTERNAL_MODULE TR("Modulo int.", "Modulo interno") #define TR_EXTERNAL_MODULE TR("Modulo est.", "Modulo esterno") -#define TR_OPENTX_UPGRADE_REQUIRED "OpenTX richiede aggiornamento" +#define TR_EDGETX_UPGRADE_REQUIRED "EdgeTX richiede aggiornamento" #define TR_TELEMETRY_DISABLED TR("Telem. off", "Telem. disabilitata") #define TR_MORE_OPTIONS_AVAILABLE "Altre opzioni assenti" #define TR_NO_MODULE_INFORMATION "Nessuna info del modulo" diff --git a/radio/src/translations/jp.h b/radio/src/translations/jp.h index 7ba6575fb..9b30ca1b8 100644 --- a/radio/src/translations/jp.h +++ b/radio/src/translations/jp.h @@ -805,7 +805,7 @@ #define TR_INTERNALRF "内部RFモジュール" #define TR_INTERNAL_MODULE TR("Int. module", "内部モジュール") #define TR_EXTERNAL_MODULE TR("Ext. module", "外部モジュール") -#define TR_OPENTX_UPGRADE_REQUIRED "OpenTXアップグレードが必要です" +#define TR_EDGETX_UPGRADE_REQUIRED "EdgeTXアップグレードが必要です" #define TR_TELEMETRY_DISABLED "テレメトリー無効" #define TR_MORE_OPTIONS_AVAILABLE "その他のオプション" #define TR_NO_MODULE_INFORMATION "モジュール情報なし" diff --git a/radio/src/translations/nl.h b/radio/src/translations/nl.h index ec1e6fac9..6edb09bc5 100644 --- a/radio/src/translations/nl.h +++ b/radio/src/translations/nl.h @@ -797,7 +797,7 @@ #define TR_INTERNALRF "Interne RF" #define TR_INTERNAL_MODULE TR("Int. module","Internal module") #define TR_EXTERNAL_MODULE TR("Ext. module","External module") -#define TR_OPENTX_UPGRADE_REQUIRED "OpenTX upgrade required" +#define TR_EDGETX_UPGRADE_REQUIRED "EdgeTX upgrade required" #define TR_TELEMETRY_DISABLED "Telem. disabled" #define TR_MORE_OPTIONS_AVAILABLE "More options available" #define TR_NO_MODULE_INFORMATION "No module information" diff --git a/radio/src/translations/pl.h b/radio/src/translations/pl.h index 44f11117c..da206cf9c 100644 --- a/radio/src/translations/pl.h +++ b/radio/src/translations/pl.h @@ -798,7 +798,7 @@ #define TR_INTERNALRF "Wewn.Moduł RF" #define TR_INTERNAL_MODULE TR("Moduł wewn.", "Moduł wewnętrzny") #define TR_EXTERNAL_MODULE TR("Moduł zewn.", "Moduł zewnętrzny") -#define TR_OPENTX_UPGRADE_REQUIRED "OpenTX upgrade required" +#define TR_EDGETX_UPGRADE_REQUIRED "EdgeTX upgrade required" #define TR_TELEMETRY_DISABLED "Telem. disabled" #define TR_MORE_OPTIONS_AVAILABLE "More options available" #define TR_NO_MODULE_INFORMATION "No module information" diff --git a/radio/src/translations/pt.h b/radio/src/translations/pt.h index 41f7b48ee..0baab5e16 100644 --- a/radio/src/translations/pt.h +++ b/radio/src/translations/pt.h @@ -809,7 +809,7 @@ #define TR_INTERNALRF "RF Interno" #define TR_INTERNAL_MODULE TR("Modulo Int.", "Modulo Interno") #define TR_EXTERNAL_MODULE TR("Modulo Ext.", "Modulo Externo") -#define TR_OPENTX_UPGRADE_REQUIRED "OpenTX upgrade required" +#define TR_EDGETX_UPGRADE_REQUIRED "EdgeTX upgrade required" #define TR_TELEMETRY_DISABLED "Telem. desativada" #define TR_MORE_OPTIONS_AVAILABLE "More options available" #define TR_NO_MODULE_INFORMATION "No module information" diff --git a/radio/src/translations/ru.h b/radio/src/translations/ru.h index 489bf809b..48c9458ff 100644 --- a/radio/src/translations/ru.h +++ b/radio/src/translations/ru.h @@ -808,7 +808,7 @@ #define TR_INTERNALRF "Внут RF" #define TR_INTERNAL_MODULE TR("Внут. Модуль", "Внут Модуль") #define TR_EXTERNAL_MODULE TR("Внеш. Модуль", "Внеш Модуль") -#define TR_OPENTX_UPGRADE_REQUIRED "OpenTX требуется обновл" +#define TR_EDGETX_UPGRADE_REQUIRED "EdgeTX требуется обновл" #define TR_TELEMETRY_DISABLED "Телем. откл" #define TR_MORE_OPTIONS_AVAILABLE "Доступно больше опций" #define TR_NO_MODULE_INFORMATION "Нет инфо о модуле" diff --git a/radio/src/translations/se.h b/radio/src/translations/se.h index 435adcc39..561e43bf8 100644 --- a/radio/src/translations/se.h +++ b/radio/src/translations/se.h @@ -818,7 +818,7 @@ #define TR_INTERNALRF "Intern radiomodul" #define TR_INTERNAL_MODULE TR("Int. modul","Intern modul") #define TR_EXTERNAL_MODULE TR("Ext. modul","Extern modul") -#define TR_OPENTX_UPGRADE_REQUIRED "EdgeTX behöver uppgraderas" +#define TR_EDGETX_UPGRADE_REQUIRED "EdgeTX behöver uppgraderas" #define TR_TELEMETRY_DISABLED "Telem. inaktiverad" #define TR_MORE_OPTIONS_AVAILABLE "Fler alternativ finns" #define TR_NO_MODULE_INFORMATION "Modulinformation saknas" diff --git a/radio/src/translations/tts_cn.cpp b/radio/src/translations/tts_cn.cpp index 392bdcb3f..78ab8fc5a 100644 --- a/radio/src/translations/tts_cn.cpp +++ b/radio/src/translations/tts_cn.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" enum ChinesePrompts { CN_PROMPT_NUMBERS_BASE = 0, diff --git a/radio/src/translations/tts_cz.cpp b/radio/src/translations/tts_cz.cpp index a3ba1da9d..04deb703e 100644 --- a/radio/src/translations/tts_cz.cpp +++ b/radio/src/translations/tts_cz.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" enum CzechPrompts { CZ_PROMPT_NUMBERS_BASE = 0, diff --git a/radio/src/translations/tts_da.cpp b/radio/src/translations/tts_da.cpp index 6cfa2ec7f..45811f0ff 100644 --- a/radio/src/translations/tts_da.cpp +++ b/radio/src/translations/tts_da.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" enum DanishPrompts { DA_PROMPT_NUMBERS_BASE = 0, diff --git a/radio/src/translations/tts_de.cpp b/radio/src/translations/tts_de.cpp index 62513daae..d8522d3d3 100644 --- a/radio/src/translations/tts_de.cpp +++ b/radio/src/translations/tts_de.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.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 e679f0d2e..af42cc03b 100644 --- a/radio/src/translations/tts_en.cpp +++ b/radio/src/translations/tts_en.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.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 64918790e..4e73e5b23 100644 --- a/radio/src/translations/tts_es.cpp +++ b/radio/src/translations/tts_es.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" enum SpanishPrompts { ES_PROMPT_NUMBERS_BASE = 0, diff --git a/radio/src/translations/tts_fr.cpp b/radio/src/translations/tts_fr.cpp index 36cdcd2fd..0f54475ea 100644 --- a/radio/src/translations/tts_fr.cpp +++ b/radio/src/translations/tts_fr.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" enum FrenchPrompts { FR_PROMPT_NUMBERS_BASE = 0, diff --git a/radio/src/translations/tts_he.cpp b/radio/src/translations/tts_he.cpp index 6d83c10bb..8da5b3871 100644 --- a/radio/src/translations/tts_he.cpp +++ b/radio/src/translations/tts_he.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" enum HebrewPrompts { HE_PROMPT_NUMBERS_BASE = 0, diff --git a/radio/src/translations/tts_hu.cpp b/radio/src/translations/tts_hu.cpp index d387c99f7..01840c71c 100644 --- a/radio/src/translations/tts_hu.cpp +++ b/radio/src/translations/tts_hu.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.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 6a31a2e77..614b99994 100644 --- a/radio/src/translations/tts_it.cpp +++ b/radio/src/translations/tts_it.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" enum ItalianPrompts { IT_PROMPT_NUMBERS_BASE = 0, diff --git a/radio/src/translations/tts_jp.cpp b/radio/src/translations/tts_jp.cpp index 7e5e5d6fd..2e5baab81 100644 --- a/radio/src/translations/tts_jp.cpp +++ b/radio/src/translations/tts_jp.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" enum JapanesePrompts { JP_PROMPT_NUMBERS_BASE = 0, diff --git a/radio/src/translations/tts_nl.cpp b/radio/src/translations/tts_nl.cpp index 8803880ee..d5503209e 100644 --- a/radio/src/translations/tts_nl.cpp +++ b/radio/src/translations/tts_nl.cpp @@ -21,7 +21,7 @@ // NOTE: This file is identical to the EN version -#include "opentx.h" +#include "edgetx.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 3fffee0a9..41b41fb39 100644 --- a/radio/src/translations/tts_pl.cpp +++ b/radio/src/translations/tts_pl.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.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 ab8c80051..d263fb1f6 100644 --- a/radio/src/translations/tts_pt.cpp +++ b/radio/src/translations/tts_pt.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" enum PortuguesePrompts { PT_PROMPT_NUMBERS_BASE = 0, diff --git a/radio/src/translations/tts_ru.cpp b/radio/src/translations/tts_ru.cpp index a7aa19d8f..0a7ebcced 100644 --- a/radio/src/translations/tts_ru.cpp +++ b/radio/src/translations/tts_ru.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" enum RusPrompts { RU_PROMPT_NUMBERS_BASE = 0, diff --git a/radio/src/translations/tts_se.cpp b/radio/src/translations/tts_se.cpp index b9427daf5..e9f076131 100644 --- a/radio/src/translations/tts_se.cpp +++ b/radio/src/translations/tts_se.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.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 74fdc91b6..73e511bb4 100644 --- a/radio/src/translations/tts_sk.cpp +++ b/radio/src/translations/tts_sk.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" enum SlovakPrompts { SK_PROMPT_NUMBERS_BASE = 0, diff --git a/radio/src/translations/tts_ua.cpp b/radio/src/translations/tts_ua.cpp index 5a83a93de..66b5cad91 100644 --- a/radio/src/translations/tts_ua.cpp +++ b/radio/src/translations/tts_ua.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" enum UAPrompts { UA_PROMPT_NUMBERS_BASE = 0, diff --git a/radio/src/translations/tw.h b/radio/src/translations/tw.h index e4a9197f2..1ad0ef80e 100644 --- a/radio/src/translations/tw.h +++ b/radio/src/translations/tw.h @@ -807,7 +807,7 @@ #define TR_INTERNALRF "內置發射" #define TR_INTERNAL_MODULE TR("內置發射", "內置發射") #define TR_EXTERNAL_MODULE TR("外置發射", "外置發射") -#define TR_OPENTX_UPGRADE_REQUIRED "OpenTX需要升級" +#define TR_EDGETX_UPGRADE_REQUIRED "EdgeTX需要升級" #define TR_TELEMETRY_DISABLED "禁用回傳" #define TR_MORE_OPTIONS_AVAILABLE "更多可用選項" #define TR_NO_MODULE_INFORMATION "無模塊信息" diff --git a/radio/src/translations/ua.h b/radio/src/translations/ua.h index 3953e5ef7..de8b28248 100644 --- a/radio/src/translations/ua.h +++ b/radio/src/translations/ua.h @@ -808,7 +808,7 @@ #define TR_INTERNALRF "Внутрійшній RF" #define TR_INTERNAL_MODULE TR("Внутр. модуль", "Внутрішній модуль") #define TR_EXTERNAL_MODULE TR("Зовн. модуль", "Зовнішній модуль") -#define TR_OPENTX_UPGRADE_REQUIRED "Потрібне оновлення OpenTX" +#define TR_EDGETX_UPGRADE_REQUIRED "Потрібне оновлення EdgeTX" #define TR_TELEMETRY_DISABLED "Телем. вимкнуто" #define TR_MORE_OPTIONS_AVAILABLE "Доступні додаткові опції" #define TR_NO_MODULE_INFORMATION "Інформація по модулю відсутня" diff --git a/radio/src/usb_joystick.cpp b/radio/src/usb_joystick.cpp index cdabda9ad..aee476038 100644 --- a/radio/src/usb_joystick.cpp +++ b/radio/src/usb_joystick.cpp @@ -24,7 +24,7 @@ #include #include "hal/usb_driver.h" -#include "opentx.h" +#include "edgetx.h" #define MAX_HID_REPORTDESC 160 #define MAX_HID_REPORT 80 diff --git a/radio/src/vario.cpp b/radio/src/vario.cpp index 0e8a2e830..76df44a11 100644 --- a/radio/src/vario.cpp +++ b/radio/src/vario.cpp @@ -19,7 +19,7 @@ * GNU General Public License for more details. */ -#include "opentx.h" +#include "edgetx.h" void varioWakeup() {