EdgeTX · pfeerick · Aug 14, 2024 · Aug 7, 2024 · Aug 7, 2024 · Aug 8, 2024
diff --git a/radio/releasenotes.txt b/radio/releasenotes.txt
diff --git 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
@@ -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
@@ -21,7 +21,7 @@
 
 #include <math.h>
 
-#include "opentx.h"
+#include "edgetx.h"
 #include "strhelpers.h"
 #include "switches.h"
 

diff --git 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 <stddef.h>
 #include <string.h>
 #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
@@ -21,7 +21,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "opentx.h"
+#include "edgetx.h"
 #include "bin_allocator.h"
 
 

diff --git 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
@@ -20,7 +20,7 @@
  */
 
 #include <stdio.h>
-#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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -19,14 +19,11 @@
  * GNU General Public License for more details.
  */
 
-#ifndef CHKSIZE_H
-#define CHKSIZE_H
+#pragma once
 
 #include <inttypes.h>
 
 template <typename ToCheck, size_t expectedSize, size_t realSize = sizeof(ToCheck)>
 void check_size() {
   static_assert(expectedSize == realSize, "struct size changed");
 }
-
-#endif
diff --git a/radio/src/cli.cpp b/radio/src/cli.cpp
@@ -22,7 +22,7 @@
 #include <FreeRTOS/include/FreeRTOS.h>
 #include <FreeRTOS/include/stream_buffer.h>
 
-#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
@@ -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
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  */
 
-#ifndef __CRC_H__
-#define __CRC_H__
+#pragma once
 
 #include <inttypes.h>
 
@@ -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
@@ -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
@@ -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
@@ -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
@@ -19,7 +19,7 @@
  * GNU General Public License for more details.
  */
 
-#include "opentx.h"
+#include "edgetx.h"
 #include "stamp.h"
 #include <stdarg.h>
 

diff --git 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 <float.h>
 #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
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _DEFINITIONS_H_
-#define _DEFINITIONS_H_
+#pragma once
 
 #include <inttypes.h>
 #include <stdbool.h>
@@ -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
@@ -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
@@ -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 → radio/src/edgetx.cpp b/radio/src/opentx.cpp → 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 → radio/src/edgetx.h b/radio/src/opentx.h → radio/src/edgetx.h
@@ -23,8 +23,8 @@
 
 #include <stdlib.h>
 #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 → radio/src/edgetx_constants.h b/radio/src/opentx_constants.h → radio/src/edgetx_constants.h
diff --git a/radio/src/opentx_helpers.h → radio/src/edgetx_helpers.h b/radio/src/opentx_helpers.h → radio/src/edgetx_helpers.h
diff --git a/radio/src/opentx_types.h → radio/src/edgetx_types.h b/radio/src/opentx_types.h → radio/src/edgetx_types.h
diff --git 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 <inttypes.h>
 
@@ -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
@@ -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
@@ -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
@@ -37,7 +37,7 @@
  * along with Cleanflight.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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
@@ -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 <inttypes.h>
 
 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);