OpenRTX · carpikes · Jul 17, 2022 · Jul 21, 2022
diff --git a/meson.build b/meson.build
@@ -53,20 +53,7 @@ openrtx_src = ['openrtx/src/core/state.c',
                'openrtx/src/protocols/M17/M17Transmitter.cpp',
                'openrtx/src/protocols/M17/M17LinkSetupFrame.cpp']
 
-openrtx_inc = ['openrtx/include',
-               'openrtx/include/rtx',
-               'openrtx/include/core',
-               'openrtx/include/calibration',
-               'openrtx/include/protocols',
-               'openrtx/include/fonts/adafruit',
-               'platform/drivers/ADC',
-               'platform/drivers/NVM',
-               'platform/drivers/GPS',
-               'platform/drivers/USB',
-               'platform/drivers/tones',
-               'platform/drivers/baseband',
-               'platform/drivers/backlight',
-               'platform/drivers/chSelector']
+openrtx_inc = ['openrtx/include', 'platform']
 
 main_src = []
 

diff --git a/openrtx/include/calibration/calibInfo_GDx.h b/openrtx/include/calibration/calibInfo_GDx.h
@@ -21,9 +21,10 @@
 #ifndef CALIBINFO_GDX_H
 #define CALIBINFO_GDX_H
 
-#include <datatypes.h>
 #include <stdint.h>
 
+#include "core/datatypes.h"
+
 /**
  * \brief Calibration data for GDx platforms.
  */

diff --git a/openrtx/include/calibration/calibInfo_MDx.h b/openrtx/include/calibration/calibInfo_MDx.h
@@ -21,9 +21,10 @@
 #ifndef CALIBINFO_MDX_H
 #define CALIBINFO_MDX_H
 
-#include <datatypes.h>
 #include <stdint.h>
 
+#include "core/datatypes.h"
+
 /**
  * Data types defining the structure of calibration data stored in external
  * flash memory of MDx devices.

diff --git a/openrtx/include/core/audio_codec.h b/openrtx/include/core/audio_codec.h
@@ -21,9 +21,10 @@
 #ifndef AUDIO_CODEC_H
 #define AUDIO_CODEC_H
 
-#include <interfaces/audio_path.h>
-#include <stdint.h>
 #include <stdbool.h>
+#include <stdint.h>
+
+#include "interfaces/audio_path.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/openrtx/include/core/cps.h b/openrtx/include/core/cps.h
@@ -21,10 +21,11 @@
 #ifndef CPS_H
 #define CPS_H
 
-#include <stdint.h>
 #include <stdbool.h>
-#include <datatypes.h>
-#include <rtx.h>
+#include <stdint.h>
+
+#include "core/datatypes.h"
+#include "rtx/rtx.h"
 
 // Magic number to identify the binary file
 #define CPS_MAGIC 0x43585452

diff --git a/openrtx/include/core/event.h b/openrtx/include/core/event.h
@@ -20,6 +20,8 @@
 #ifndef EVENT_H
 #define EVENT_H
 
+#include <stdint.h>
+
 /**
  * This enum describes the event message type:
  * - EVENT_KBD is used to send a keypress

diff --git a/openrtx/include/core/gps.h b/openrtx/include/core/gps.h
@@ -20,9 +20,11 @@
 #ifndef GPS_H
 #define GPS_H
 
-#include <interfaces/rtc.h>
 #include <stdint.h>
 
+#include "interfaces/rtc.h"
+#include "datetime.h"
+
 /**
  * Data structure representing a single satellite as part of a GPS fix.
  */

diff --git a/openrtx/include/core/graphics.h b/openrtx/include/core/graphics.h
@@ -21,9 +21,13 @@
 #define GRAPHICS_H
 
 #include <stdbool.h>
-#include <stddef.h>
 #include <stdint.h>
-#include <gps.h>
+
+#include "core/state.h"
+#include "interfaces/display.h"
+
+// This one before the fonts
+#include "fonts/adafruit/gfxfont.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -96,7 +100,6 @@ typedef enum
     TEXT_ALIGN_RIGHT
 } textAlign_t;
 
-
 /**
  * This function calls the correspondent method of the low level interface display.h
  * It initializes the display.

diff --git a/openrtx/include/core/input.h b/openrtx/include/core/input.h
@@ -20,10 +20,11 @@
 #ifndef INPUT_H
 #define INPUT_H
 
-#include <interfaces/keyboard.h>
 #include <inttypes.h>
 #include <stdbool.h>
 
+#include "interfaces/keyboard.h"
+
 /**
  * Time interval in milliseconds after which a keypress is considered a long-press
  */

diff --git a/openrtx/include/core/queue.h b/openrtx/include/core/queue.h
@@ -22,10 +22,10 @@
 #define QUEUE_H
 
 #include <pthread.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdint.h>
 #include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 // Ring buffer size (MAX = 255)
 #define MSG_QTY 10

diff --git a/openrtx/include/core/ringbuf.hpp b/openrtx/include/core/ringbuf.hpp
@@ -26,6 +26,7 @@
 #endif
 
 #include <pthread.h>
+
 #include <cstdint>
 
 /**

diff --git a/openrtx/include/core/state.h b/openrtx/include/core/state.h
@@ -21,13 +21,14 @@
 #ifndef STATE_H
 #define STATE_H
 
-#include <interfaces/rtc.h>
-#include <datatypes.h>
-#include <settings.h>
 #include <pthread.h>
 #include <stdbool.h>
-#include <cps.h>
-#include <gps.h>
+
+#include "cps.h"
+#include "datatypes.h"
+#include "gps.h"
+#include "interfaces/rtc.h"
+#include "settings.h"
 
 /**
  * Data structure representing the settings of the M17 mode.

diff --git a/openrtx/include/core/ui.h b/openrtx/include/core/ui.h
@@ -21,12 +21,13 @@
 #define UI_H
 
 #include <stdbool.h>
-#include <state.h>
-#include <graphics.h>
-#include <interfaces/keyboard.h>
 #include <stdint.h>
-#include <event.h>
-#include <hwconfig.h>
+
+#include "core/graphics.h"
+#include "event.h"
+#include "hwconfig.h"
+#include "interfaces/keyboard.h"
+#include "state.h"
 
 // Maximum menu entry length
 #define MAX_ENTRY_LEN 21

diff --git a/openrtx/include/core/utils.h b/openrtx/include/core/utils.h
@@ -20,9 +20,10 @@
 #ifndef CALIB_UTILS_H
 #define CALIB_UTILS_H
 
-#include <datatypes.h>
 #include <stdint.h>
 
+#include "datatypes.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/openrtx/include/core/xmodem.h b/openrtx/include/core/xmodem.h
@@ -21,9 +21,9 @@
 #ifndef XMODEM_H
 #define XMODEM_H
 
-#include <sys/types.h>
-#include <stdint.h>
 #include <stddef.h>
+#include <stdint.h>
+#include <sys/types.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/openrtx/include/fonts/adafruit/gfxfont.h b/openrtx/include/fonts/adafruit/gfxfont.h
@@ -7,6 +7,8 @@
 #ifndef _GFXFONT_H_
 #define _GFXFONT_H_
 
+#include <stdint.h>
+
 /// Font data stored PER GLYPH
 typedef struct {
   uint16_t bitmapOffset; ///< Pointer into GFXfont->bitmap

diff --git a/openrtx/include/interfaces/audio.h b/openrtx/include/interfaces/audio.h
@@ -23,7 +23,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <rtx.h>
+
+#include "rtx/rtx.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/openrtx/include/interfaces/cps_io.h b/openrtx/include/interfaces/cps_io.h
@@ -22,7 +22,7 @@
 #define CPS_IO_H
 
 #include <stdint.h>
-#include <cps.h>
+#include "core/cps.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/openrtx/include/interfaces/nvmem.h b/openrtx/include/interfaces/nvmem.h
@@ -22,9 +22,10 @@
 #define NVMEM_H
 
 #include <stdint.h>
-#include <cps.h>
-#include <settings.h>
-#include "platform.h"
+
+#include "core/cps.h"
+#include "core/settings.h"
+#include "interfaces/platform.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/openrtx/include/interfaces/radio.h b/openrtx/include/interfaces/radio.h
@@ -23,7 +23,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <rtx.h>
+
+#include "rtx/rtx.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/openrtx/include/interfaces/rtc.h b/openrtx/include/interfaces/rtc.h
@@ -20,9 +20,10 @@
 #ifndef RTC_H
 #define RTC_H
 
-#include <datetime.h>
 #include <stdint.h>
 
+#include "core/datetime.h"
+
 /**
  * Standard interface for real time clock drivers, providing both calendar and
  * clock functionalities.

diff --git a/openrtx/include/protocols/M17/M17Constants.hpp b/openrtx/include/protocols/M17/M17Constants.hpp
@@ -21,9 +21,11 @@
 #ifndef M17_CONSTANTS_H
 #define M17_CONSTANTS_H
 
-#include <M17/M17Datatypes.hpp>
-#include <cstdint>
 #include <array>
+#include <cstddef>
+#include <cstdint>
+
+#include "M17Datatypes.hpp"
 
 #ifndef __cplusplus
 #error This header is C++ only!

diff --git a/openrtx/include/protocols/M17/M17DSP.hpp b/openrtx/include/protocols/M17/M17DSP.hpp
@@ -27,9 +27,10 @@
 #error This header is C++ only!
 #endif
 
-#include <fir.hpp>
 #include <array>
 
+#include "core/fir.hpp"
+
 namespace M17
 {
 

diff --git a/openrtx/include/protocols/M17/M17Demodulator.hpp b/openrtx/include/protocols/M17/M17Demodulator.hpp
@@ -27,15 +27,16 @@
 #error This header is C++ only!
 #endif
 
-#include <cstdint>
-#include <cstddef>
-#include <memory>
 #include <array>
-#include <dsp.h>
 #include <cmath>
-#include <interfaces/audio_stream.h>
-#include <M17/M17Datatypes.hpp>
-#include <M17/M17Constants.hpp>
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+
+#include "M17Constants.hpp"
+#include "M17Datatypes.hpp"
+#include "core/dsp.h"
+#include "interfaces/audio_stream.h"
 
 namespace M17
 {

diff --git a/openrtx/include/protocols/M17/M17FrameDecoder.hpp b/openrtx/include/protocols/M17/M17FrameDecoder.hpp
@@ -25,12 +25,13 @@
 #error This header is C++ only!
 #endif
 
+#include <array>
 #include <cstdint>
 #include <string>
-#include <array>
+
 #include "M17LinkSetupFrame.hpp"
-#include "M17Viterbi.hpp"
 #include "M17StreamFrame.hpp"
+#include "M17Viterbi.hpp"
 
 namespace M17
 {

diff --git a/openrtx/include/protocols/M17/M17FrameEncoder.hpp b/openrtx/include/protocols/M17/M17FrameEncoder.hpp
@@ -25,8 +25,9 @@
 #error This header is C++ only!
 #endif
 
-#include <string>
 #include <array>
+#include <string>
+
 #include "M17ConvolutionalEncoder.hpp"
 #include "M17LinkSetupFrame.hpp"
 #include "M17StreamFrame.hpp"

diff --git a/openrtx/include/protocols/M17/M17Modulator.hpp b/openrtx/include/protocols/M17/M17Modulator.hpp
@@ -25,12 +25,13 @@
 #error This header is C++ only!
 #endif
 
-#include <interfaces/audio_stream.h>
-#include <M17/M17Constants.hpp>
+#include <array>
 #include <cstdint>
 #include <memory>
-#include <array>
-#include <dsp.h>
+
+#include "M17Constants.hpp"
+#include "core/dsp.h"
+#include "interfaces/audio_stream.h"
 
 namespace M17
 {

diff --git a/openrtx/include/protocols/M17/M17StreamFrame.hpp b/openrtx/include/protocols/M17/M17StreamFrame.hpp
@@ -27,6 +27,7 @@
 
 #include <cstring>
 #include <string>
+
 #include "M17Datatypes.hpp"
 
 namespace M17