From 00a4dbb0633dc1a61a9aff4117de4ee2e68e274f Mon Sep 17 00:00:00 2001 From: Ryan Turner Date: Thu, 25 Sep 2025 20:47:42 -0500 Subject: [PATCH] style: resolve ambiguous paths on include macros Update meson and cmake config to only include openrtx and platform paths. Update files to use <..> for system and external libraries, ".." for project files and new relative paths as necessary. Did not attempt to fix areas where includes that should be <..> were previously ".." Inspired by #96, closes #359. Acked-by: Silvano Seva --- CMakeLists.txt | 15 +----- meson.build | 19 +------ .../include/calibration/calibInfo_CS7000.h | 2 +- openrtx/include/calibration/calibInfo_GDx.h | 2 +- openrtx/include/calibration/calibInfo_MDx.h | 2 +- openrtx/include/calibration/calibInfo_Mod17.h | 2 +- openrtx/include/core/audio_codec.h | 2 +- openrtx/include/core/audio_path.h | 2 +- openrtx/include/core/audio_stream.h | 4 +- openrtx/include/core/cps.h | 4 +- openrtx/include/core/ctcssDetector.hpp | 2 +- openrtx/include/core/gps.h | 2 +- openrtx/include/core/graphics.h | 6 +-- openrtx/include/core/input.h | 2 +- openrtx/include/core/nvmem_access.h | 2 +- openrtx/include/core/settings.h | 2 +- openrtx/include/core/state.h | 8 +-- openrtx/include/core/utils.h | 2 +- openrtx/include/core/voicePromptUtils.h | 4 +- openrtx/include/core/voicePrompts.h | 2 +- openrtx/include/interfaces/cps_io.h | 2 +- openrtx/include/interfaces/nvmem.h | 6 +-- openrtx/include/interfaces/platform.h | 4 +- openrtx/include/interfaces/radio.h | 2 +- openrtx/include/peripherals/gpio.h | 2 +- openrtx/include/peripherals/rtc.h | 2 +- .../include/protocols/M17/M17Constants.hpp | 2 +- openrtx/include/protocols/M17/M17DSP.hpp | 2 +- .../include/protocols/M17/M17Demodulator.hpp | 16 +++--- .../include/protocols/M17/M17Modulator.hpp | 8 +-- openrtx/include/rtx/OpMode.hpp | 4 +- openrtx/include/rtx/OpMode_FM.hpp | 2 +- openrtx/include/rtx/OpMode_M17.hpp | 10 ++-- openrtx/include/rtx/rtx.h | 4 +- openrtx/include/ui/ui_default.h | 12 ++--- openrtx/include/ui/ui_mod17.h | 14 +++--- openrtx/src/core/audio_codec.c | 10 ++-- openrtx/src/core/audio_path.cpp | 2 +- openrtx/src/core/audio_stream.c | 2 +- openrtx/src/core/backup.c | 4 +- openrtx/src/core/battery.c | 4 +- openrtx/src/core/chan.c | 2 +- openrtx/src/core/cps.c | 4 +- openrtx/src/core/crc.c | 2 +- openrtx/src/core/data_conversion.c | 4 +- openrtx/src/core/datetime.c | 2 +- openrtx/src/core/dsp.cpp | 2 +- openrtx/src/core/gps.c | 6 +-- openrtx/src/core/graphics.c | 50 +++++++++---------- openrtx/src/core/input.c | 4 +- openrtx/src/core/memory_profiling.cpp | 2 +- openrtx/src/core/nvmem_access.c | 4 +- openrtx/src/core/openrtx.c | 22 ++++---- openrtx/src/core/queue.c | 2 +- openrtx/src/core/state.c | 16 +++--- openrtx/src/core/threads.c | 32 ++++++------ openrtx/src/core/utils.c | 4 +- openrtx/src/core/voicePromptUtils.c | 8 +-- openrtx/src/core/voicePrompts.c | 20 ++++---- openrtx/src/core/xmodem.c | 6 +-- openrtx/src/main.c | 8 +-- openrtx/src/protocols/M17/M17Callsign.cpp | 2 +- openrtx/src/protocols/M17/M17DSP.cpp | 4 +- openrtx/src/protocols/M17/M17Demodulator.cpp | 12 ++--- openrtx/src/protocols/M17/M17FrameDecoder.cpp | 14 +++--- openrtx/src/protocols/M17/M17FrameEncoder.cpp | 10 ++-- openrtx/src/protocols/M17/M17Golay.cpp | 2 +- .../src/protocols/M17/M17LinkSetupFrame.cpp | 6 +-- openrtx/src/protocols/M17/M17Modulator.cpp | 6 +-- openrtx/src/rtx/OpMode_FM.cpp | 12 ++--- openrtx/src/rtx/OpMode_M17.cpp | 20 ++++---- openrtx/src/rtx/rtx.cpp | 10 ++-- openrtx/src/ui/default/ui.c | 26 +++++----- openrtx/src/ui/default/ui_main.c | 10 ++-- openrtx/src/ui/default/ui_menu.c | 20 ++++---- openrtx/src/ui/default/ui_strings.c | 6 +-- openrtx/src/ui/module17/ui.c | 20 ++++---- openrtx/src/ui/module17/ui_main.c | 6 +-- openrtx/src/ui/module17/ui_menu.c | 16 +++--- platform/drivers/ADC/ADC0_GDx.c | 2 +- platform/drivers/ADC/adc_stm32.h | 2 +- platform/drivers/ADC/adc_stm32f4.c | 2 +- platform/drivers/ADC/adc_stm32h7.c | 2 +- platform/drivers/CPS/cps_io_libc.c | 2 +- platform/drivers/CPS/cps_io_native_GDx.c | 10 ++-- platform/drivers/CPS/cps_io_native_MD3x0.c | 10 ++-- platform/drivers/CPS/cps_io_native_MD9600.c | 10 ++-- platform/drivers/CPS/cps_io_native_MDUV3x0.c | 10 ++-- platform/drivers/CPS/cps_io_native_Mod17.c | 2 +- platform/drivers/GPIO/gpio-native.h | 10 ++-- platform/drivers/GPIO/gpio_mk22.c | 2 +- platform/drivers/GPIO/gpio_mk22.h | 4 +- platform/drivers/GPIO/gpio_shiftReg.c | 6 +-- platform/drivers/GPIO/gpio_shiftReg.h | 4 +- platform/drivers/GPIO/gpio_stm32.c | 2 +- platform/drivers/GPIO/gpio_stm32.h | 2 +- platform/drivers/GPS/gps_linux.c | 2 +- platform/drivers/GPS/gps_stm32.cpp | 4 +- platform/drivers/GPS/gps_zephyr.c | 4 +- platform/drivers/GPS/nmea_rbuf.c | 2 +- platform/drivers/NVM/AT24Cx.h | 2 +- platform/drivers/NVM/AT24Cx_GDx.c | 6 +-- platform/drivers/NVM/W25Qx.c | 6 +-- platform/drivers/NVM/W25Qx.h | 6 +-- platform/drivers/NVM/eeep.c | 2 +- platform/drivers/NVM/eeep.h | 2 +- platform/drivers/NVM/flash_zephyr.h | 2 +- platform/drivers/NVM/nvmem_CS7000.c | 22 ++++---- platform/drivers/NVM/nvmem_GDx.c | 16 +++--- platform/drivers/NVM/nvmem_MDx.c | 14 +++--- platform/drivers/NVM/nvmem_Mod17.c | 6 +-- platform/drivers/NVM/nvmem_linux.c | 6 +-- platform/drivers/NVM/nvmem_settings_MDx.c | 6 +-- platform/drivers/NVM/nvmem_ttwrplus.c | 2 +- platform/drivers/NVM/posix_file.c | 2 +- platform/drivers/NVM/posix_file.h | 2 +- platform/drivers/SPI/spi_bitbang.c | 2 +- platform/drivers/SPI/spi_bitbang.h | 4 +- platform/drivers/SPI/spi_custom.h | 2 +- platform/drivers/SPI/spi_mk22.c | 2 +- platform/drivers/SPI/spi_mk22.h | 2 +- platform/drivers/SPI/spi_stm32.h | 2 +- platform/drivers/SPI/spi_stm32f4.c | 4 +- platform/drivers/SPI/spi_stm32h7.c | 4 +- platform/drivers/USB/usb.h | 2 +- platform/drivers/USB/usb_MDx.cpp | 6 +-- platform/drivers/USB/usb_descriptors.c | 2 +- platform/drivers/audio/Cx000_dac.cpp | 2 +- platform/drivers/audio/Cx000_dac.h | 2 +- platform/drivers/audio/MAX9814_Mod17.cpp | 4 +- platform/drivers/audio/audio_CS7000.cpp | 20 ++++---- platform/drivers/audio/audio_GDx.c | 8 +-- platform/drivers/audio/audio_MDx.cpp | 18 +++---- platform/drivers/audio/audio_Mod17.c | 6 +-- platform/drivers/audio/audio_linux.c | 4 +- platform/drivers/audio/audio_ttwrplus.c | 4 +- platform/drivers/audio/file_source.h | 2 +- platform/drivers/audio/stm32_adc.cpp | 14 +++--- platform/drivers/audio/stm32_adc.h | 2 +- platform/drivers/audio/stm32_dac.cpp | 14 +++--- platform/drivers/audio/stm32_dac.h | 2 +- platform/drivers/audio/stm32_pwm.cpp | 6 +-- platform/drivers/audio/stm32_pwm.h | 4 +- platform/drivers/backlight/backlight_CS7000.c | 6 +-- platform/drivers/backlight/backlight_GDx.c | 6 +-- platform/drivers/backlight/backlight_MDx.c | 6 +-- platform/drivers/baseband/AK2365A.c | 4 +- platform/drivers/baseband/AK2365A.h | 4 +- platform/drivers/baseband/AT1846S.h | 2 +- platform/drivers/baseband/AT1846S_GDx.cpp | 6 +-- platform/drivers/baseband/AT1846S_SA8x8.cpp | 6 +-- platform/drivers/baseband/AT1846S_UV3x0.cpp | 8 +-- platform/drivers/baseband/HR_C5000.h | 2 +- platform/drivers/baseband/HR_C5000_MDx.cpp | 8 +-- platform/drivers/baseband/HR_C6000.cpp | 4 +- platform/drivers/baseband/HR_C6000.h | 4 +- platform/drivers/baseband/HR_C6000_CS7000.cpp | 8 +-- platform/drivers/baseband/HR_C6000_GDx.cpp | 8 +-- platform/drivers/baseband/HR_C6000_UV3x0.cpp | 8 +-- platform/drivers/baseband/HR_Cx000.cpp | 12 ++--- platform/drivers/baseband/HR_Cx000.h | 4 +- platform/drivers/baseband/MCP4551.c | 2 +- platform/drivers/baseband/MCP4551.h | 4 +- platform/drivers/baseband/SA8x8.c | 4 +- platform/drivers/baseband/SKY72310.c | 4 +- platform/drivers/baseband/SKY72310.h | 4 +- platform/drivers/baseband/radioUtils.h | 2 +- platform/drivers/baseband/radio_CS7000.cpp | 28 +++++------ platform/drivers/baseband/radio_GDx.cpp | 18 +++---- platform/drivers/baseband/radio_MD3x0.cpp | 22 ++++---- platform/drivers/baseband/radio_MD9600.cpp | 2 +- platform/drivers/baseband/radio_Mod17.cpp | 10 ++-- platform/drivers/baseband/radio_UV3x0.cpp | 18 +++---- platform/drivers/baseband/radio_linux.cpp | 4 +- platform/drivers/baseband/radio_ttwrplus.cpp | 8 +-- .../drivers/chSelector/chSelector_MD9600.c | 6 +-- .../drivers/chSelector/chSelector_UV3x0.c | 6 +-- platform/drivers/display/HX8353_MD3x.cpp | 12 ++--- platform/drivers/display/SH1106_ttwrplus.c | 4 +- platform/drivers/display/SH110x_Mod17.c | 8 +-- platform/drivers/display/SSD1306_Mod17.c | 10 ++-- platform/drivers/display/SSD1309_Mod17.c | 8 +-- platform/drivers/display/ST7567_MD9600.c | 8 +-- platform/drivers/display/ST7735R_CS7000.c | 12 ++--- platform/drivers/display/UC1701_GDx.c | 10 ++-- platform/drivers/display/display_Mod17.c | 8 +-- platform/drivers/display/display_libSDL.c | 8 +-- platform/drivers/keyboard/cap1206.h | 2 +- platform/drivers/keyboard/keyboard_CS7000.c | 10 ++-- platform/drivers/keyboard/keyboard_DM1701.c | 8 +-- platform/drivers/keyboard/keyboard_GDx.c | 6 +-- platform/drivers/keyboard/keyboard_MD3x.c | 8 +-- platform/drivers/keyboard/keyboard_MD9600.c | 10 ++-- platform/drivers/keyboard/keyboard_Mod17.c | 12 ++--- platform/drivers/keyboard/keyboard_linux.c | 6 +-- platform/drivers/keyboard/keyboard_ttwrplus.c | 8 +-- platform/drivers/stubs/audio_stub.c | 2 +- platform/drivers/stubs/cps_io_stub.c | 2 +- platform/drivers/stubs/display_stub.c | 4 +- platform/drivers/stubs/inputStream_stub.c | 2 +- platform/drivers/stubs/keyboard_stub.c | 2 +- platform/drivers/stubs/nvmem_stub.c | 2 +- platform/drivers/stubs/outputStream_stub.c | 2 +- platform/drivers/stubs/radio_stub.c | 2 +- platform/drivers/tones/toneGenerator_MDx.cpp | 4 +- platform/mcu/CMSIS/Include/core_cmFunc.h | 6 +-- platform/mcu/CMSIS/Include/core_cmInstr.h | 6 +-- platform/mcu/CMSIS/Include/core_cmSimd.h | 6 +-- platform/mcu/ESP32S3/drivers/delays.c | 2 +- platform/mcu/MK22FN512xxx12/boot/bsp.cpp | 6 +-- .../MK22FN512xxx12/boot/libc_integration.cpp | 4 +- platform/mcu/MK22FN512xxx12/drivers/I2C0.c | 2 +- .../mcu/MK22FN512xxx12/drivers/delays.cpp | 2 +- platform/mcu/MK22FN512xxx12/drivers/rng.c | 4 +- .../mcu/MK22FN512xxx12/drivers/usb_vcom.c | 4 +- platform/mcu/STM32F4xx/boot/bsp.cpp | 4 +- platform/mcu/STM32F4xx/drivers/DmaStream.hpp | 2 +- platform/mcu/STM32F4xx/drivers/Timer.hpp | 2 +- platform/mcu/STM32F4xx/drivers/USART3.cpp | 2 +- platform/mcu/STM32F4xx/drivers/delays.cpp | 2 +- platform/mcu/STM32F4xx/drivers/flash.c | 2 +- platform/mcu/STM32F4xx/drivers/i2c_stm32.c | 2 +- platform/mcu/STM32F4xx/drivers/i2c_stm32.h | 2 +- platform/mcu/STM32F4xx/drivers/rcc.c | 2 +- platform/mcu/STM32F4xx/drivers/rcc.h | 2 +- platform/mcu/STM32F4xx/drivers/rng.c | 6 +-- platform/mcu/STM32F4xx/drivers/rtc.c | 4 +- platform/mcu/STM32F4xx/drivers/timers.h | 2 +- platform/mcu/STM32F4xx/drivers/usb/usb_bsp.c | 4 +- platform/mcu/STM32F4xx/drivers/usb_vcom.c | 2 +- platform/mcu/STM32H7xx/boot/bsp.cpp | 2 +- platform/mcu/STM32H7xx/drivers/DmaStream.hpp | 2 +- platform/mcu/STM32H7xx/drivers/delays.cpp | 2 +- platform/mcu/STM32H7xx/drivers/rcc.cpp | 2 +- platform/mcu/x86_64/drivers/delays.c | 2 +- platform/mcu/x86_64/drivers/rng.cpp | 2 +- platform/targets/CS7000-PLUS/hwconfig.c | 20 ++++---- platform/targets/CS7000-PLUS/hwconfig.h | 4 +- platform/targets/CS7000-PLUS/pinmap.h | 2 +- platform/targets/CS7000-PLUS/platform.c | 22 ++++---- platform/targets/CS7000/hwconfig.c | 20 ++++---- platform/targets/CS7000/hwconfig.h | 4 +- platform/targets/CS7000/pinmap.h | 2 +- platform/targets/CS7000/platform.c | 22 ++++---- platform/targets/DM-1701/hwconfig.c | 12 ++--- platform/targets/DM-1701/hwconfig.h | 4 +- platform/targets/DM-1701/pinmap.h | 2 +- platform/targets/DM-1701/platform.c | 24 ++++----- platform/targets/GDx/hwconfig.c | 8 +-- platform/targets/GDx/hwconfig.h | 2 +- platform/targets/GDx/pinmap_DM1801.h | 2 +- platform/targets/GDx/pinmap_GD77.h | 2 +- platform/targets/GDx/platform.c | 16 +++--- platform/targets/MD-3x0/hwconfig.c | 20 ++++---- platform/targets/MD-3x0/hwconfig.h | 2 +- platform/targets/MD-3x0/pinmap.h | 2 +- platform/targets/MD-3x0/platform.c | 24 ++++----- platform/targets/MD-9600/hwconfig.c | 12 ++--- platform/targets/MD-9600/hwconfig.h | 2 +- platform/targets/MD-9600/pinmap.h | 2 +- platform/targets/MD-9600/platform.c | 30 +++++------ platform/targets/MD-UV3x0/hwconfig.c | 16 +++--- platform/targets/MD-UV3x0/hwconfig.h | 4 +- platform/targets/MD-UV3x0/pinmap.h | 2 +- platform/targets/MD-UV3x0/platform.c | 30 +++++------ platform/targets/Module17/hwconfig.h | 4 +- platform/targets/Module17/pinmap.h | 2 +- platform/targets/Module17/platform.c | 22 ++++---- platform/targets/linux/emulator/emulator.c | 6 +-- platform/targets/linux/emulator/emulator.h | 4 +- platform/targets/linux/emulator/sdl_engine.c | 2 +- platform/targets/linux/emulator/sdl_engine.h | 6 +-- platform/targets/linux/platform.c | 8 +-- platform/targets/ttwrplus/platform.c | 14 +++--- platform/targets/ttwrplus/pmu.cpp | 8 +-- platform/targets/ttwrplus/ttwrplus.dts | 4 +- tests/platform/boot_test.c | 4 +- tests/platform/calib_read.c | 12 ++--- tests/platform/codec2_encode_test.c | 16 +++--- tests/platform/display_test.c | 8 +-- tests/platform/gimmi_ridimmi.c | 10 ++-- tests/platform/gpio_demo.c | 8 +-- tests/platform/keyboard_test.c | 12 ++--- tests/platform/mic_test.c | 12 ++--- tests/platform/nvm_dump.c | 6 +-- tests/platform/platform_test.c | 10 ++-- tests/platform/tonegen.c | 4 +- tests/unit/M17_demodulator.cpp | 8 +-- tests/unit/M17_golay.cpp | 2 +- tests/unit/M17_rrc.cpp | 2 +- tests/unit/M17_viterbi.cpp | 8 +-- tests/unit/convert_minmea_coord.c | 2 +- tests/unit/cps.c | 2 +- tests/unit/linux_inputStream_test.cpp | 2 +- tests/unit/play_sine.c | 2 +- tests/unit/ui_check_standby.c | 4 +- tests/unit/voice_prompts.c | 4 +- 297 files changed, 983 insertions(+), 1013 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 779b0f06..f05b58f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,20 +63,7 @@ target_include_directories(app PRIVATE openrtx/include - openrtx/include/rtx - openrtx/include/core - openrtx/include/calibration - openrtx/include/protocols - openrtx/include/fonts/adafruit - openrtx/include/fonts/symbols - platform/drivers/ADC - platform/drivers/NVM - platform/drivers/GPS - platform/drivers/USB - platform/drivers/tones - platform/drivers/baseband - platform/drivers/backlight - platform/drivers/chSelector + platform subprojects/codec2 subprojects/codec2/src diff --git a/meson.build b/meson.build index fb155372..ba17e00e 100644 --- a/meson.build +++ b/meson.build @@ -68,24 +68,7 @@ openrtx_src = ['openrtx/src/core/state.c', 'openrtx/src/protocols/M17/M17FrameDecoder.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', - 'openrtx/include/fonts/symbols', - 'platform/drivers/ADC', - 'platform/drivers/NVM', - 'platform/drivers/GPS', - 'platform/drivers/SPI', - 'platform/drivers/USB', - 'platform/drivers/GPIO', - 'platform/drivers/tones', - 'platform/drivers/audio', - 'platform/drivers/baseband', - 'platform/drivers/backlight', - 'platform/drivers/chSelector'] +openrtx_inc = ['openrtx/include', 'platform'] ## ## OpenRTX UI sources diff --git a/openrtx/include/calibration/calibInfo_CS7000.h b/openrtx/include/calibration/calibInfo_CS7000.h index 00dab117..aca536e6 100644 --- a/openrtx/include/calibration/calibInfo_CS7000.h +++ b/openrtx/include/calibration/calibInfo_CS7000.h @@ -18,7 +18,7 @@ #ifndef CALIBINFO_CS7000_H #define CALIBINFO_CS7000_H -#include +#include "core/datatypes.h" #include diff --git a/openrtx/include/calibration/calibInfo_GDx.h b/openrtx/include/calibration/calibInfo_GDx.h index 8150cbb4..8dd8ff3b 100644 --- a/openrtx/include/calibration/calibInfo_GDx.h +++ b/openrtx/include/calibration/calibInfo_GDx.h @@ -21,7 +21,7 @@ #ifndef CALIBINFO_GDX_H #define CALIBINFO_GDX_H -#include +#include "core/datatypes.h" #include /** diff --git a/openrtx/include/calibration/calibInfo_MDx.h b/openrtx/include/calibration/calibInfo_MDx.h index 3647be8e..3fccf49c 100644 --- a/openrtx/include/calibration/calibInfo_MDx.h +++ b/openrtx/include/calibration/calibInfo_MDx.h @@ -21,7 +21,7 @@ #ifndef CALIBINFO_MDX_H #define CALIBINFO_MDX_H -#include +#include "core/datatypes.h" #include /** diff --git a/openrtx/include/calibration/calibInfo_Mod17.h b/openrtx/include/calibration/calibInfo_Mod17.h index 24a36fb3..c760a393 100644 --- a/openrtx/include/calibration/calibInfo_Mod17.h +++ b/openrtx/include/calibration/calibInfo_Mod17.h @@ -22,7 +22,7 @@ #ifndef CALIBINFO_MOD17_H #define CALIBINFO_MOD17_H -#include +#include "core/datatypes.h" #include /** diff --git a/openrtx/include/core/audio_codec.h b/openrtx/include/core/audio_codec.h index 9564d40e..64d203b8 100644 --- a/openrtx/include/core/audio_codec.h +++ b/openrtx/include/core/audio_codec.h @@ -21,7 +21,7 @@ #ifndef AUDIO_CODEC_H #define AUDIO_CODEC_H -#include +#include "core/audio_path.h" #include #include diff --git a/openrtx/include/core/audio_path.h b/openrtx/include/core/audio_path.h index 294e7c07..fff6e580 100644 --- a/openrtx/include/core/audio_path.h +++ b/openrtx/include/core/audio_path.h @@ -20,7 +20,7 @@ #ifndef AUDIO_PATH_H #define AUDIO_PATH_H -#include +#include "interfaces/audio.h" #include #ifdef __cplusplus diff --git a/openrtx/include/core/audio_stream.h b/openrtx/include/core/audio_stream.h index da1672b5..6c2e6e17 100644 --- a/openrtx/include/core/audio_stream.h +++ b/openrtx/include/core/audio_stream.h @@ -24,8 +24,8 @@ #include #include #include -#include -#include +#include "core/audio_path.h" +#include "interfaces/audio.h" #ifdef __cplusplus extern "C" { diff --git a/openrtx/include/core/cps.h b/openrtx/include/core/cps.h index ec3b974d..e0990451 100644 --- a/openrtx/include/core/cps.h +++ b/openrtx/include/core/cps.h @@ -23,8 +23,8 @@ #include #include -#include -#include +#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/ctcssDetector.hpp b/openrtx/include/core/ctcssDetector.hpp index a920ba05..8a45f82d 100644 --- a/openrtx/include/core/ctcssDetector.hpp +++ b/openrtx/include/core/ctcssDetector.hpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include "core/goertzel.hpp" /* * Goertzel filter coefficients for the 50 CTCSS tones, computed for a sampling diff --git a/openrtx/include/core/gps.h b/openrtx/include/core/gps.h index af028ad1..02face3a 100644 --- a/openrtx/include/core/gps.h +++ b/openrtx/include/core/gps.h @@ -20,7 +20,7 @@ #ifndef GPS_H #define GPS_H -#include +#include "core/datetime.h" #include #include diff --git a/openrtx/include/core/graphics.h b/openrtx/include/core/graphics.h index c0bdc8d7..dbc555d0 100644 --- a/openrtx/include/core/graphics.h +++ b/openrtx/include/core/graphics.h @@ -20,12 +20,12 @@ #ifndef GRAPHICS_H #define GRAPHICS_H -#include -#include +#include "core/datatypes.h" +#include "fonts/symbols/symbols.h" #include #include #include -#include +#include "core/gps.h" #ifdef __cplusplus extern "C" { diff --git a/openrtx/include/core/input.h b/openrtx/include/core/input.h index 6596baab..6f6fbec5 100644 --- a/openrtx/include/core/input.h +++ b/openrtx/include/core/input.h @@ -20,7 +20,7 @@ #ifndef INPUT_H #define INPUT_H -#include +#include "interfaces/keyboard.h" #include #include diff --git a/openrtx/include/core/nvmem_access.h b/openrtx/include/core/nvmem_access.h index 2809a6c8..fa9edcf7 100644 --- a/openrtx/include/core/nvmem_access.h +++ b/openrtx/include/core/nvmem_access.h @@ -21,7 +21,7 @@ #ifndef NVMEM_ACCESS_H #define NVMEM_ACCESS_H -#include +#include "interfaces/nvmem.h" #include #include diff --git a/openrtx/include/core/settings.h b/openrtx/include/core/settings.h index fc74facc..b55adf60 100644 --- a/openrtx/include/core/settings.h +++ b/openrtx/include/core/settings.h @@ -21,7 +21,7 @@ #ifndef SETTINGS_H #define SETTINGS_H -#include +#include "hwconfig.h" #include typedef enum diff --git a/openrtx/include/core/state.h b/openrtx/include/core/state.h index 50ec93b1..74b39f62 100644 --- a/openrtx/include/core/state.h +++ b/openrtx/include/core/state.h @@ -21,12 +21,12 @@ #ifndef STATE_H #define STATE_H -#include -#include +#include "core/datatypes.h" +#include "core/settings.h" #include #include -#include -#include +#include "core/cps.h" +#include "core/gps.h" /** * Part of this structure has been commented because the corresponding diff --git a/openrtx/include/core/utils.h b/openrtx/include/core/utils.h index e2cd6af2..f657684f 100644 --- a/openrtx/include/core/utils.h +++ b/openrtx/include/core/utils.h @@ -20,7 +20,7 @@ #ifndef UTILS_H #define UTILS_H -#include +#include "core/datatypes.h" #include #include diff --git a/openrtx/include/core/voicePromptUtils.h b/openrtx/include/core/voicePromptUtils.h index 97186949..7581a4fd 100644 --- a/openrtx/include/core/voicePromptUtils.h +++ b/openrtx/include/core/voicePromptUtils.h @@ -20,9 +20,9 @@ #ifndef VOICE_PROMPT_UTILS_H #define VOICE_PROMPT_UTILS_H -#include "cps.h" +#include "core/cps.h" #include "ui/ui_strings.h" -#include "voicePrompts.h" +#include "core/voicePrompts.h" /* Please Note! diff --git a/openrtx/include/core/voicePrompts.h b/openrtx/include/core/voicePrompts.h index 013b4a4d..afb5b982 100644 --- a/openrtx/include/core/voicePrompts.h +++ b/openrtx/include/core/voicePrompts.h @@ -20,7 +20,7 @@ #ifndef VOICEPROMPTS_H #define VOICEPROMPTS_H -#include +#include "core/datatypes.h" #include /** diff --git a/openrtx/include/interfaces/cps_io.h b/openrtx/include/interfaces/cps_io.h index dff27af5..b9588930 100644 --- a/openrtx/include/interfaces/cps_io.h +++ b/openrtx/include/interfaces/cps_io.h @@ -22,7 +22,7 @@ #define CPS_IO_H #include -#include +#include "core/cps.h" #ifdef __cplusplus extern "C" { diff --git a/openrtx/include/interfaces/nvmem.h b/openrtx/include/interfaces/nvmem.h index 59d3142c..e059ae52 100644 --- a/openrtx/include/interfaces/nvmem.h +++ b/openrtx/include/interfaces/nvmem.h @@ -22,9 +22,9 @@ #define NVMEM_H #include -#include -#include -#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/platform.h b/openrtx/include/interfaces/platform.h index 5561775f..d9902478 100644 --- a/openrtx/include/interfaces/platform.h +++ b/openrtx/include/interfaces/platform.h @@ -22,8 +22,8 @@ #include #include -#include -#include +#include "core/datetime.h" +#include "hwconfig.h" #ifdef __cplusplus extern "C" { diff --git a/openrtx/include/interfaces/radio.h b/openrtx/include/interfaces/radio.h index d6e24e7e..d569e3af 100644 --- a/openrtx/include/interfaces/radio.h +++ b/openrtx/include/interfaces/radio.h @@ -23,7 +23,7 @@ #include #include -#include +#include "rtx/rtx.h" #ifdef __cplusplus extern "C" { diff --git a/openrtx/include/peripherals/gpio.h b/openrtx/include/peripherals/gpio.h index 686ae38c..d7d1de4b 100644 --- a/openrtx/include/peripherals/gpio.h +++ b/openrtx/include/peripherals/gpio.h @@ -20,7 +20,7 @@ #include #include -#include +#include "drivers/GPIO/gpio-native.h" #ifdef __cplusplus extern "C" { diff --git a/openrtx/include/peripherals/rtc.h b/openrtx/include/peripherals/rtc.h index 80134102..e96c6f4a 100644 --- a/openrtx/include/peripherals/rtc.h +++ b/openrtx/include/peripherals/rtc.h @@ -20,7 +20,7 @@ #ifndef RTC_H #define RTC_H -#include +#include "core/datetime.h" #include /** diff --git a/openrtx/include/protocols/M17/M17Constants.hpp b/openrtx/include/protocols/M17/M17Constants.hpp index 71b9ad4e..8189b0ad 100644 --- a/openrtx/include/protocols/M17/M17Constants.hpp +++ b/openrtx/include/protocols/M17/M17Constants.hpp @@ -21,7 +21,7 @@ #ifndef M17_CONSTANTS_H #define M17_CONSTANTS_H -#include +#include "protocols/M17/M17Datatypes.hpp" #include #include diff --git a/openrtx/include/protocols/M17/M17DSP.hpp b/openrtx/include/protocols/M17/M17DSP.hpp index f49bb8fa..52962e2b 100644 --- a/openrtx/include/protocols/M17/M17DSP.hpp +++ b/openrtx/include/protocols/M17/M17DSP.hpp @@ -27,7 +27,7 @@ #error This header is C++ only! #endif -#include +#include "core/fir.hpp" #include namespace M17 diff --git a/openrtx/include/protocols/M17/M17Demodulator.hpp b/openrtx/include/protocols/M17/M17Demodulator.hpp index 1fc1e85d..8ac39715 100644 --- a/openrtx/include/protocols/M17/M17Demodulator.hpp +++ b/openrtx/include/protocols/M17/M17Demodulator.hpp @@ -27,19 +27,19 @@ #error This header is C++ only! #endif -#include +#include "core/iir.hpp" #include #include #include #include -#include +#include "core/dsp.h" #include -#include -#include -#include -#include -#include -#include +#include "core/audio_path.h" +#include "core/audio_stream.h" +#include "protocols/M17/M17Datatypes.hpp" +#include "protocols/M17/M17Constants.hpp" +#include "protocols/M17/Correlator.hpp" +#include "protocols/M17/Synchronizer.hpp" namespace M17 { diff --git a/openrtx/include/protocols/M17/M17Modulator.hpp b/openrtx/include/protocols/M17/M17Modulator.hpp index 0a007c85..1de04677 100644 --- a/openrtx/include/protocols/M17/M17Modulator.hpp +++ b/openrtx/include/protocols/M17/M17Modulator.hpp @@ -25,10 +25,10 @@ #error This header is C++ only! #endif -#include -#include -#include -#include +#include "core/audio_stream.h" +#include "protocols/M17/PwmCompensator.hpp" +#include "protocols/M17/M17Constants.hpp" +#include "core/audio_path.h" #include #include #include diff --git a/openrtx/include/rtx/OpMode.hpp b/openrtx/include/rtx/OpMode.hpp index a03c2d7d..dfe52d55 100644 --- a/openrtx/include/rtx/OpMode.hpp +++ b/openrtx/include/rtx/OpMode.hpp @@ -21,8 +21,8 @@ #ifndef OPMODE_H #define OPMODE_H -#include -#include "rtx.h" +#include "interfaces/delays.h" +#include "rtx/rtx.h" /** * This class provides a standard interface for all the operating modes. diff --git a/openrtx/include/rtx/OpMode_FM.hpp b/openrtx/include/rtx/OpMode_FM.hpp index c7e2664a..388ef7b8 100644 --- a/openrtx/include/rtx/OpMode_FM.hpp +++ b/openrtx/include/rtx/OpMode_FM.hpp @@ -21,7 +21,7 @@ #ifndef OPMODE_FM_H #define OPMODE_FM_H -#include +#include "core/audio_path.h" #include "OpMode.hpp" /** diff --git a/openrtx/include/rtx/OpMode_M17.hpp b/openrtx/include/rtx/OpMode_M17.hpp index a6a64750..8a222faf 100644 --- a/openrtx/include/rtx/OpMode_M17.hpp +++ b/openrtx/include/rtx/OpMode_M17.hpp @@ -21,11 +21,11 @@ #ifndef OPMODE_M17_H #define OPMODE_M17_H -#include -#include -#include -#include -#include +#include "protocols/M17/M17FrameDecoder.hpp" +#include "protocols/M17/M17FrameEncoder.hpp" +#include "protocols/M17/M17Demodulator.hpp" +#include "protocols/M17/M17Modulator.hpp" +#include "core/audio_path.h" #include "OpMode.hpp" /** diff --git a/openrtx/include/rtx/rtx.h b/openrtx/include/rtx/rtx.h index 33ac38ea..9058f689 100644 --- a/openrtx/include/rtx/rtx.h +++ b/openrtx/include/rtx/rtx.h @@ -21,9 +21,9 @@ #ifndef RTX_H #define RTX_H -#include +#include "core/datatypes.h" #include -#include +#include "core/cps.h" #include #ifdef __cplusplus diff --git a/openrtx/include/ui/ui_default.h b/openrtx/include/ui/ui_default.h index 5703fe93..55d9059d 100644 --- a/openrtx/include/ui/ui_default.h +++ b/openrtx/include/ui/ui_default.h @@ -21,13 +21,13 @@ #define UI_DEFAULT_H #include -#include -#include -#include +#include "core/state.h" +#include "core/graphics.h" +#include "interfaces/keyboard.h" #include -#include -#include -#include +#include "core/event.h" +#include "hwconfig.h" +#include "core/ui.h" // Maximum menu entry length #define MAX_ENTRY_LEN 21 diff --git a/openrtx/include/ui/ui_mod17.h b/openrtx/include/ui/ui_mod17.h index cc973de8..53373933 100644 --- a/openrtx/include/ui/ui_mod17.h +++ b/openrtx/include/ui/ui_mod17.h @@ -21,14 +21,14 @@ #define UI_MOD17_H #include -#include -#include -#include -#include +#include "core/state.h" +#include "core/graphics.h" +#include "interfaces/keyboard.h" +#include "calibration/calibInfo_Mod17.h" #include -#include -#include -#include +#include "core/event.h" +#include "hwconfig.h" +#include "core/ui.h" // Maximum menu entry length #define MAX_ENTRY_LEN 21 diff --git a/openrtx/src/core/audio_codec.c b/openrtx/src/core/audio_codec.c index adb8b432..353837c0 100644 --- a/openrtx/src/core/audio_codec.c +++ b/openrtx/src/core/audio_codec.c @@ -18,21 +18,21 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include +#include "core/audio_stream.h" +#include "core/audio_codec.h" #include -#include +#include "core/threads.h" // codec2 system library has a weird include prefix #if defined(PLATFORM_LINUX) #include #else -#include +#include "codec2.h" #endif #include #include #include #include -#include +#include "core/dsp.h" #define BUF_SIZE 4 diff --git a/openrtx/src/core/audio_path.cpp b/openrtx/src/core/audio_path.cpp index d9038c41..f7d25e0e 100644 --- a/openrtx/src/core/audio_path.cpp +++ b/openrtx/src/core/audio_path.cpp @@ -18,7 +18,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "core/audio_path.h" #include #include diff --git a/openrtx/src/core/audio_stream.c b/openrtx/src/core/audio_stream.c index b4aafac7..3a5ab155 100644 --- a/openrtx/src/core/audio_stream.c +++ b/openrtx/src/core/audio_stream.c @@ -18,7 +18,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "core/audio_stream.h" #include #define MAX_NUM_STREAMS 3 diff --git a/openrtx/src/core/backup.c b/openrtx/src/core/backup.c index 7685fa68..32d17ea4 100644 --- a/openrtx/src/core/backup.c +++ b/openrtx/src/core/backup.c @@ -18,8 +18,8 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include +#include "core/backup.h" +#include "core/xmodem.h" #include #include "W25Qx.h" diff --git a/openrtx/src/core/battery.c b/openrtx/src/core/battery.c index 2bc62821..79514c95 100644 --- a/openrtx/src/core/battery.c +++ b/openrtx/src/core/battery.c @@ -17,8 +17,8 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include +#include "core/battery.h" +#include "hwconfig.h" #include /* diff --git a/openrtx/src/core/chan.c b/openrtx/src/core/chan.c index f8554f79..4ce0aeef 100644 --- a/openrtx/src/core/chan.c +++ b/openrtx/src/core/chan.c @@ -15,7 +15,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include "chan.h" +#include "core/chan.h" void chan_init(chan_t *c) { diff --git a/openrtx/src/core/cps.c b/openrtx/src/core/cps.c index 704cab02..f89f5871 100644 --- a/openrtx/src/core/cps.c +++ b/openrtx/src/core/cps.c @@ -18,8 +18,8 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include +#include "interfaces/platform.h" +#include "core/cps.h" const uint16_t ctcss_tone[CTCSS_FREQ_NUM] = { diff --git a/openrtx/src/core/crc.c b/openrtx/src/core/crc.c index 94e0dfa5..fecba6ff 100644 --- a/openrtx/src/core/crc.c +++ b/openrtx/src/core/crc.c @@ -18,7 +18,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "core/crc.h" uint16_t crc_ccitt(const void *data, const size_t len) { diff --git a/openrtx/src/core/data_conversion.c b/openrtx/src/core/data_conversion.c index 5de4d589..c2513da6 100644 --- a/openrtx/src/core/data_conversion.c +++ b/openrtx/src/core/data_conversion.c @@ -18,8 +18,8 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include +#include "core/data_conversion.h" +#include "hwconfig.h" /* * Trivial implementation of Cortex M4 SIMD instructions for all the diff --git a/openrtx/src/core/datetime.c b/openrtx/src/core/datetime.c index ae93d617..628a7698 100644 --- a/openrtx/src/core/datetime.c +++ b/openrtx/src/core/datetime.c @@ -18,7 +18,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "core/datetime.h" #include #include diff --git a/openrtx/src/core/dsp.cpp b/openrtx/src/core/dsp.cpp index ec1ba09f..b4b435fe 100644 --- a/openrtx/src/core/dsp.cpp +++ b/openrtx/src/core/dsp.cpp @@ -18,7 +18,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "core/dsp.h" int16_t dsp_dcBlockFilter(struct dcBlock *dcb, int16_t sample) { diff --git a/openrtx/src/core/gps.c b/openrtx/src/core/gps.c index aeda40ff..6667ea7f 100644 --- a/openrtx/src/core/gps.c +++ b/openrtx/src/core/gps.c @@ -17,11 +17,11 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include +#include "interfaces/platform.h" +#include "core/gps.h" #include #include -#include +#include "core/state.h" #include #include diff --git a/openrtx/src/core/graphics.c b/openrtx/src/core/graphics.c index f239d543..b2ed4e17 100644 --- a/openrtx/src/core/graphics.c +++ b/openrtx/src/core/graphics.c @@ -22,39 +22,39 @@ * It is suitable for both color, grayscale and B/W display */ -#include -#include -#include +#include "interfaces/display.h" +#include "hwconfig.h" +#include "core/graphics.h" #include #include #include #include #include #include -#include +#include "core/utils.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "fonts/adafruit/gfxfont.h" +#include "fonts/adafruit/TomThumb.h" +#include "fonts/adafruit/FreeSans6pt7b.h" +#include "fonts/adafruit/FreeSans8pt7b.h" +#include "fonts/adafruit/FreeSans9pt7b.h" +#include "fonts/adafruit/FreeSans10pt7b.h" +#include "fonts/adafruit/FreeSans12pt7b.h" +#include "fonts/adafruit/FreeSans16pt7b.h" +#include "fonts/adafruit/FreeSans18pt7b.h" +#include "fonts/adafruit/FreeSans24pt7b.h" +#include "fonts/adafruit/UbuntuRegular6pt7b.h" +#include "fonts/adafruit/UbuntuRegular8pt7b.h" +#include "fonts/adafruit/UbuntuRegular9pt7b.h" +#include "fonts/adafruit/UbuntuRegular10pt7b.h" +#include "fonts/adafruit/UbuntuRegular12pt7b.h" +#include "fonts/adafruit/UbuntuRegular16pt7b.h" +#include "fonts/adafruit/UbuntuRegular18pt7b.h" +#include "fonts/adafruit/UbuntuRegular24pt7b.h" -#include -#include -#include +#include "fonts/symbols/Symbols5pt7b.h" +#include "fonts/symbols/Symbols6pt7b.h" +#include "fonts/symbols/Symbols8pt7b.h" // Variable swap macro #define DEG_RAD 0.017453292519943295769236907684886 diff --git a/openrtx/src/core/input.c b/openrtx/src/core/input.c index fec538b4..8888f92e 100644 --- a/openrtx/src/core/input.c +++ b/openrtx/src/core/input.c @@ -17,10 +17,10 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "interfaces/delays.h" #include #include -#include +#include "core/input.h" static long long keyTs[KBD_NUM_KEYS]; // Timestamp of each keypress static uint32_t longPressSent; // Flags to manage long-press events diff --git a/openrtx/src/core/memory_profiling.cpp b/openrtx/src/core/memory_profiling.cpp index 746a4a69..4bb9b7ca 100644 --- a/openrtx/src/core/memory_profiling.cpp +++ b/openrtx/src/core/memory_profiling.cpp @@ -18,7 +18,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "core/memory_profiling.h" #ifdef _MIOSIX diff --git a/openrtx/src/core/nvmem_access.c b/openrtx/src/core/nvmem_access.c index 5b148f57..7d93a7ed 100644 --- a/openrtx/src/core/nvmem_access.c +++ b/openrtx/src/core/nvmem_access.c @@ -18,8 +18,8 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include +#include "interfaces/nvmem.h" +#include "core/nvmem_access.h" #include #include #include diff --git a/openrtx/src/core/openrtx.c b/openrtx/src/core/openrtx.c index 05878757..a84cebb7 100644 --- a/openrtx/src/core/openrtx.c +++ b/openrtx/src/core/openrtx.c @@ -18,17 +18,17 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "interfaces/platform.h" +#include "interfaces/keyboard.h" +#include "interfaces/display.h" +#include "interfaces/delays.h" +#include "interfaces/cps_io.h" +#include "core/voicePrompts.h" +#include "core/graphics.h" +#include "core/openrtx.h" +#include "core/threads.h" +#include "core/state.h" +#include "core/ui.h" #ifdef PLATFORM_LINUX #include #endif diff --git a/openrtx/src/core/queue.c b/openrtx/src/core/queue.c index f5bc3ea4..fbc8ff1e 100644 --- a/openrtx/src/core/queue.c +++ b/openrtx/src/core/queue.c @@ -19,7 +19,7 @@ ***************************************************************************/ #include -#include "queue.h" +#include "core/queue.h" void queue_init(queue_t *q) { diff --git a/openrtx/src/core/state.c b/openrtx/src/core/state.c index 04fec28b..7829af9a 100644 --- a/openrtx/src/core/state.c +++ b/openrtx/src/core/state.c @@ -18,17 +18,17 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "core/ui.h" #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include "core/event.h" +#include "core/state.h" +#include "core/battery.h" +#include "hwconfig.h" +#include "interfaces/platform.h" +#include "interfaces/nvmem.h" +#include "interfaces/delays.h" state_t state; pthread_mutex_t state_mutex; diff --git a/openrtx/src/core/threads.c b/openrtx/src/core/threads.c index da998fed..7a12c60f 100644 --- a/openrtx/src/core/threads.c +++ b/openrtx/src/core/threads.c @@ -18,26 +18,26 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "hwconfig.h" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "core/ui.h" +#include "core/state.h" +#include "core/threads.h" +#include "core/graphics.h" +#include "interfaces/platform.h" +#include "interfaces/delays.h" +#include "interfaces/radio.h" +#include "core/event.h" +#include "rtx/rtx.h" #include -#include -#include -#include -#include -#include +#include "core/utils.h" +#include "core/input.h" +#include "core/backup.h" +#include "core/gps.h" +#include "core/voicePrompts.h" #if defined(PLATFORM_TTWRPLUS) -#include +#include "pmu.h" #endif /* Mutex for concurrent access to RTX state variable */ diff --git a/openrtx/src/core/utils.c b/openrtx/src/core/utils.c index 468d1281..89a143cc 100644 --- a/openrtx/src/core/utils.c +++ b/openrtx/src/core/utils.c @@ -18,10 +18,10 @@ ***************************************************************************/ #include -#include +#include "core/utils.h" #include #include -#include +#include "core/cps.h" uint8_t interpCalParameter(const freq_t freq, const freq_t *calPoints, const uint8_t *param, const uint8_t elems) diff --git a/openrtx/src/core/voicePromptUtils.c b/openrtx/src/core/voicePromptUtils.c index 885c0fa6..bb62f8e4 100644 --- a/openrtx/src/core/voicePromptUtils.c +++ b/openrtx/src/core/voicePromptUtils.c @@ -25,14 +25,14 @@ #include "core/voicePromptUtils.h" -#include +#include "core/state.h" #include #include #include -#include +#include "core/utils.h" #include -#include -#include +#include "ui/ui_default.h" +#include "core/beeps.h" #include "interfaces/cps_io.h" const uint16_t BOOT_MELODY[] = {400, 3, 600, 3, 800, 3, 0, 0}; diff --git a/openrtx/src/core/voicePrompts.c b/openrtx/src/core/voicePrompts.c index bebf8f34..cf9867b8 100644 --- a/openrtx/src/core/voicePrompts.c +++ b/openrtx/src/core/voicePrompts.c @@ -18,21 +18,21 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include +#include "interfaces/platform.h" +#include "interfaces/keyboard.h" +#include "interfaces/delays.h" +#include "core/voicePromptUtils.h" +#include "ui/ui_strings.h" +#include "core/voicePrompts.h" +#include "core/audio_codec.h" +#include "core/audio_path.h" #include // For strncasecmp #include -#include +#include "core/state.h" #include #include #include -#include +#include "core/beeps.h" #include static const uint32_t VOICE_PROMPTS_DATA_MAGIC = 0x5056; //'VP' diff --git a/openrtx/src/core/xmodem.c b/openrtx/src/core/xmodem.c index a944b7fe..8ae352e7 100644 --- a/openrtx/src/core/xmodem.c +++ b/openrtx/src/core/xmodem.c @@ -18,12 +18,12 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "drivers/USB/usb_vcom.h" #include #include -#include +#include "core/xmodem.h" #include -#include +#include "core/crc.h" #define SOH (0x01) // start of 128-byte data packet #define STX (0x02) // start of 1024-byte data packet diff --git a/openrtx/src/main.c b/openrtx/src/main.c index 0a5ecbeb..bd4508a1 100644 --- a/openrtx/src/main.c +++ b/openrtx/src/main.c @@ -18,15 +18,15 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "core/openrtx.h" #ifdef PLATFORM_MD9600 -#include -#include +#include "interfaces/platform.h" +#include "interfaces/delays.h" #endif #ifdef PLATFORM_LINUX -#include +#include "emulator/sdl_engine.h" #endif int main(void) diff --git a/openrtx/src/protocols/M17/M17Callsign.cpp b/openrtx/src/protocols/M17/M17Callsign.cpp index a3bae72d..126b034e 100644 --- a/openrtx/src/protocols/M17/M17Callsign.cpp +++ b/openrtx/src/protocols/M17/M17Callsign.cpp @@ -21,7 +21,7 @@ ***************************************************************************/ #include -#include +#include "protocols/M17/M17Callsign.hpp" bool M17::encode_callsign(const std::string& callsign, call_t& encodedCall, bool strict) diff --git a/openrtx/src/protocols/M17/M17DSP.cpp b/openrtx/src/protocols/M17/M17DSP.cpp index bbee540e..a12002ba 100644 --- a/openrtx/src/protocols/M17/M17DSP.cpp +++ b/openrtx/src/protocols/M17/M17DSP.cpp @@ -18,8 +18,8 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include +#include "protocols/M17/M17DSP.hpp" +#include "hwconfig.h" #ifdef CONFIG_M17 Fir< std::tuple_size< decltype(M17::rrc_taps_48k) >::value > M17::rrc_48k(M17::rrc_taps_48k); diff --git a/openrtx/src/protocols/M17/M17Demodulator.cpp b/openrtx/src/protocols/M17/M17Demodulator.cpp index 888e1a67..6c202ff0 100644 --- a/openrtx/src/protocols/M17/M17Demodulator.cpp +++ b/openrtx/src/protocols/M17/M17Demodulator.cpp @@ -20,10 +20,10 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include +#include "protocols/M17/M17Demodulator.hpp" +#include "protocols/M17/M17DSP.hpp" +#include "protocols/M17/M17Utils.hpp" +#include "core/audio_stream.h" #include #include #include @@ -32,10 +32,10 @@ using namespace M17; #ifdef ENABLE_DEMOD_LOG -#include +#include "core/ringbuf.hpp" #include #ifndef PLATFORM_LINUX -#include +#include "drivers/USB/usb_vcom.h" #endif typedef struct diff --git a/openrtx/src/protocols/M17/M17FrameDecoder.cpp b/openrtx/src/protocols/M17/M17FrameDecoder.cpp index c2e69b56..35964ce7 100644 --- a/openrtx/src/protocols/M17/M17FrameDecoder.cpp +++ b/openrtx/src/protocols/M17/M17FrameDecoder.cpp @@ -18,13 +18,13 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include +#include "protocols/M17/M17Golay.hpp" +#include "protocols/M17/M17FrameDecoder.hpp" +#include "protocols/M17/M17Interleaver.hpp" +#include "protocols/M17/M17Decorrelator.hpp" +#include "protocols/M17/M17CodePuncturing.hpp" +#include "protocols/M17/M17Constants.hpp" +#include "protocols/M17/M17Utils.hpp" #include using namespace M17; diff --git a/openrtx/src/protocols/M17/M17FrameEncoder.cpp b/openrtx/src/protocols/M17/M17FrameEncoder.cpp index b9b7504c..c91584e0 100644 --- a/openrtx/src/protocols/M17/M17FrameEncoder.cpp +++ b/openrtx/src/protocols/M17/M17FrameEncoder.cpp @@ -18,11 +18,11 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include +#include "protocols/M17/M17CodePuncturing.hpp" +#include "protocols/M17/M17Decorrelator.hpp" +#include "protocols/M17/M17Interleaver.hpp" +#include "protocols/M17/M17FrameEncoder.hpp" +#include "protocols/M17/M17Constants.hpp" using namespace M17; diff --git a/openrtx/src/protocols/M17/M17Golay.cpp b/openrtx/src/protocols/M17/M17Golay.cpp index bd5cd191..20c7460b 100644 --- a/openrtx/src/protocols/M17/M17Golay.cpp +++ b/openrtx/src/protocols/M17/M17Golay.cpp @@ -20,7 +20,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "protocols/M17/M17Golay.hpp" using namespace M17; diff --git a/openrtx/src/protocols/M17/M17LinkSetupFrame.cpp b/openrtx/src/protocols/M17/M17LinkSetupFrame.cpp index e941805b..7972fa62 100644 --- a/openrtx/src/protocols/M17/M17LinkSetupFrame.cpp +++ b/openrtx/src/protocols/M17/M17LinkSetupFrame.cpp @@ -19,9 +19,9 @@ ***************************************************************************/ #include -#include -#include -#include +#include "protocols/M17/M17Golay.hpp" +#include "protocols/M17/M17Callsign.hpp" +#include "protocols/M17/M17LinkSetupFrame.hpp" using namespace M17; diff --git a/openrtx/src/protocols/M17/M17Modulator.cpp b/openrtx/src/protocols/M17/M17Modulator.cpp index ce39c647..8062b159 100644 --- a/openrtx/src/protocols/M17/M17Modulator.cpp +++ b/openrtx/src/protocols/M17/M17Modulator.cpp @@ -21,9 +21,9 @@ #include #include #include -#include -#include -#include +#include "protocols/M17/M17Modulator.hpp" +#include "protocols/M17/M17Utils.hpp" +#include "protocols/M17/M17DSP.hpp" #if defined(PLATFORM_LINUX) #include diff --git a/openrtx/src/rtx/OpMode_FM.cpp b/openrtx/src/rtx/OpMode_FM.cpp index 50cdfe51..9cdc782a 100644 --- a/openrtx/src/rtx/OpMode_FM.cpp +++ b/openrtx/src/rtx/OpMode_FM.cpp @@ -18,14 +18,14 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include +#include "interfaces/platform.h" +#include "interfaces/delays.h" +#include "interfaces/radio.h" +#include "rtx/OpMode_FM.hpp" +#include "rtx/rtx.h" #if defined(PLATFORM_TTWRPLUS) -#include "AT1846S.h" +#include "drivers/baseband/AT1846S.h" #endif /** diff --git a/openrtx/src/rtx/OpMode_M17.cpp b/openrtx/src/rtx/OpMode_M17.cpp index bd790c29..68a977b6 100644 --- a/openrtx/src/rtx/OpMode_M17.cpp +++ b/openrtx/src/rtx/OpMode_M17.cpp @@ -18,19 +18,19 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include +#include "interfaces/platform.h" +#include "interfaces/delays.h" +#include "interfaces/audio.h" +#include "interfaces/radio.h" +#include "protocols/M17/M17Callsign.hpp" +#include "rtx/OpMode_M17.hpp" +#include "core/audio_codec.h" #include -#include +#include "rtx/rtx.h" #ifdef PLATFORM_MOD17 -#include -#include +#include "calibration/calibInfo_Mod17.h" +#include "interfaces/platform.h" extern mod17Calib_t mod17CalData; #endif diff --git a/openrtx/src/rtx/rtx.cpp b/openrtx/src/rtx/rtx.cpp index 8849f397..bdca6948 100644 --- a/openrtx/src/rtx/rtx.cpp +++ b/openrtx/src/rtx/rtx.cpp @@ -18,12 +18,12 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include +#include "interfaces/radio.h" +#include "hwconfig.h" #include -#include -#include -#include +#include "rtx/rtx.h" +#include "rtx/OpMode_FM.hpp" +#include "rtx/OpMode_M17.hpp" static pthread_mutex_t *cfgMutex; // Mutex for incoming config messages static const rtxStatus_t *newCnf; // Pointer for incoming config messages diff --git a/openrtx/src/ui/default/ui.c b/openrtx/src/ui/default/ui.c index f69b7a27..184aa656 100644 --- a/openrtx/src/ui/default/ui.c +++ b/openrtx/src/ui/default/ui.c @@ -66,20 +66,20 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include "ui/ui_default.h" +#include "rtx/rtx.h" +#include "interfaces/platform.h" +#include "interfaces/display.h" +#include "interfaces/cps_io.h" +#include "interfaces/nvmem.h" +#include "interfaces/delays.h" #include -#include -#include -#include -#include -#include -#include +#include "core/battery.h" +#include "core/input.h" +#include "core/utils.h" +#include "hwconfig.h" +#include "core/voicePromptUtils.h" +#include "core/beeps.h" /* UI main screen functions, their implementation is in "ui_main.c" */ extern void _ui_drawMainBackground(); diff --git a/openrtx/src/ui/default/ui_main.c b/openrtx/src/ui/default/ui_main.c index 5f7ed801..1a4b76bc 100644 --- a/openrtx/src/ui/default/ui_main.c +++ b/openrtx/src/ui/default/ui_main.c @@ -18,14 +18,14 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include +#include "interfaces/platform.h" +#include "interfaces/cps_io.h" #include #include -#include +#include "ui/ui_default.h" #include -#include -#include +#include "ui/ui_strings.h" +#include "core/utils.h" void _ui_drawMainBackground() { diff --git a/openrtx/src/ui/default/ui_menu.c b/openrtx/src/ui/default/ui_menu.c index bcabb081..57f8b23c 100644 --- a/openrtx/src/ui/default/ui_menu.c +++ b/openrtx/src/ui/default/ui_menu.c @@ -22,18 +22,18 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "core/utils.h" +#include "ui/ui_default.h" +#include "interfaces/nvmem.h" +#include "interfaces/cps_io.h" +#include "interfaces/platform.h" +#include "interfaces/delays.h" +#include "core/memory_profiling.h" +#include "ui/ui_strings.h" +#include "core/voicePromptUtils.h" #ifdef PLATFORM_TTWRPLUS -#include +#include "drivers/baseband/SA8x8.h" #endif /* UI main screen helper functions, their implementation is in "ui_main.c" */ diff --git a/openrtx/src/ui/default/ui_strings.c b/openrtx/src/ui/default/ui_strings.c index 671efc5c..b678e339 100644 --- a/openrtx/src/ui/default/ui_strings.c +++ b/openrtx/src/ui/default/ui_strings.c @@ -21,9 +21,9 @@ #include #include -#include -#include -#include +#include "ui/ui_strings.h" +#include "ui/EnglishStrings.h" +#include "ui/SpanishStrings.h" const stringsTable_t languages[NUM_LANGUAGES] = {englishStrings,spanishStrings}; const stringsTable_t* currentLanguage = &languages[0]; diff --git a/openrtx/src/ui/module17/ui.c b/openrtx/src/ui/module17/ui.c index 52202bde..7e9f1418 100644 --- a/openrtx/src/ui/module17/ui.c +++ b/openrtx/src/ui/module17/ui.c @@ -20,17 +20,17 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include "ui/ui_mod17.h" +#include "rtx/rtx.h" +#include "interfaces/platform.h" +#include "interfaces/display.h" +#include "interfaces/cps_io.h" +#include "interfaces/nvmem.h" +#include "interfaces/delays.h" #include -#include -#include -#include +#include "core/battery.h" +#include "core/input.h" +#include "hwconfig.h" /* UI main screen functions, their implementation is in "ui_main.c" */ extern void _ui_drawMainBackground(); diff --git a/openrtx/src/ui/module17/ui_main.c b/openrtx/src/ui/module17/ui_main.c index 26934e0a..bab2dd59 100644 --- a/openrtx/src/ui/module17/ui_main.c +++ b/openrtx/src/ui/module17/ui_main.c @@ -18,11 +18,11 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include +#include "interfaces/platform.h" +#include "interfaces/cps_io.h" #include #include -#include +#include "ui/ui_mod17.h" #include void _ui_drawMainBackground() diff --git a/openrtx/src/ui/module17/ui_menu.c b/openrtx/src/ui/module17/ui_menu.c index c48dd4fd..cd85de49 100644 --- a/openrtx/src/ui/module17/ui_menu.c +++ b/openrtx/src/ui/module17/ui_menu.c @@ -21,14 +21,14 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "core/utils.h" +#include "ui/ui_mod17.h" +#include "interfaces/nvmem.h" +#include "interfaces/cps_io.h" +#include "interfaces/platform.h" +#include "interfaces/delays.h" +#include "core/memory_profiling.h" +#include "hwconfig.h" /* UI main screen helper functions, their implementation is in "ui_main.c" */ extern void _ui_drawMainBottom(); diff --git a/platform/drivers/ADC/ADC0_GDx.c b/platform/drivers/ADC/ADC0_GDx.c index 6ea4122d..bfcc673c 100644 --- a/platform/drivers/ADC/ADC0_GDx.c +++ b/platform/drivers/ADC/ADC0_GDx.c @@ -16,7 +16,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "hwconfig.h" #include "ADC0_GDx.h" void adc0_init() diff --git a/platform/drivers/ADC/adc_stm32.h b/platform/drivers/ADC/adc_stm32.h index a588381c..c546afe2 100644 --- a/platform/drivers/ADC/adc_stm32.h +++ b/platform/drivers/ADC/adc_stm32.h @@ -18,7 +18,7 @@ #ifndef ADC_STM32_H #define ADC_STM32_H -#include +#include "peripherals/adc.h" #ifdef __cplusplus extern "C" { diff --git a/platform/drivers/ADC/adc_stm32f4.c b/platform/drivers/ADC/adc_stm32f4.c index 5773888c..a510aaa3 100644 --- a/platform/drivers/ADC/adc_stm32f4.c +++ b/platform/drivers/ADC/adc_stm32f4.c @@ -16,7 +16,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "stm32f4xx.h" #include #include #include "adc_stm32.h" diff --git a/platform/drivers/ADC/adc_stm32h7.c b/platform/drivers/ADC/adc_stm32h7.c index 35afb858..af42487e 100644 --- a/platform/drivers/ADC/adc_stm32h7.c +++ b/platform/drivers/ADC/adc_stm32h7.c @@ -15,7 +15,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "stm32h7xx.h" #include #include #include "adc_stm32.h" diff --git a/platform/drivers/CPS/cps_io_libc.c b/platform/drivers/CPS/cps_io_libc.c index 427b17d3..2eef83ab 100644 --- a/platform/drivers/CPS/cps_io_libc.c +++ b/platform/drivers/CPS/cps_io_libc.c @@ -18,7 +18,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "interfaces/cps_io.h" #include #include #include diff --git a/platform/drivers/CPS/cps_io_native_GDx.c b/platform/drivers/CPS/cps_io_native_GDx.c index 6bab7395..3ce649f8 100644 --- a/platform/drivers/CPS/cps_io_native_GDx.c +++ b/platform/drivers/CPS/cps_io_native_GDx.c @@ -19,11 +19,11 @@ ***************************************************************************/ #include -#include -#include -#include -#include -#include +#include "wchar.h" +#include "interfaces/delays.h" +#include "interfaces/cps_io.h" +#include "core/nvmem_access.h" +#include "core/utils.h" #include "AT24Cx.h" #include "W25Qx.h" #include "cps_data_GDx.h" diff --git a/platform/drivers/CPS/cps_io_native_MD3x0.c b/platform/drivers/CPS/cps_io_native_MD3x0.c index 4fd074da..2fec8dd9 100644 --- a/platform/drivers/CPS/cps_io_native_MD3x0.c +++ b/platform/drivers/CPS/cps_io_native_MD3x0.c @@ -18,12 +18,12 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include +#include "interfaces/cps_io.h" +#include "interfaces/delays.h" +#include "core/nvmem_access.h" #include -#include -#include +#include "wchar.h" +#include "core/utils.h" #include "cps_data_MD3x0.h" #include "W25Qx.h" diff --git a/platform/drivers/CPS/cps_io_native_MD9600.c b/platform/drivers/CPS/cps_io_native_MD9600.c index bb12f5cf..c60c7b4e 100644 --- a/platform/drivers/CPS/cps_io_native_MD9600.c +++ b/platform/drivers/CPS/cps_io_native_MD9600.c @@ -18,12 +18,12 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "wchar.h" #include -#include -#include -#include -#include +#include "interfaces/nvmem.h" +#include "interfaces/delays.h" +#include "core/nvmem_access.h" +#include "core/utils.h" #include "cps_data_MDUV3x0.h" #include "W25Qx.h" diff --git a/platform/drivers/CPS/cps_io_native_MDUV3x0.c b/platform/drivers/CPS/cps_io_native_MDUV3x0.c index 643cf9a4..982bf948 100644 --- a/platform/drivers/CPS/cps_io_native_MDUV3x0.c +++ b/platform/drivers/CPS/cps_io_native_MDUV3x0.c @@ -18,12 +18,12 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "wchar.h" #include -#include -#include -#include -#include +#include "core/nvmem_access.h" +#include "interfaces/delays.h" +#include "interfaces/cps_io.h" +#include "core/utils.h" #include "cps_data_MDUV3x0.h" #include "W25Qx.h" diff --git a/platform/drivers/CPS/cps_io_native_Mod17.c b/platform/drivers/CPS/cps_io_native_Mod17.c index 823e962c..710b9593 100644 --- a/platform/drivers/CPS/cps_io_native_Mod17.c +++ b/platform/drivers/CPS/cps_io_native_Mod17.c @@ -18,7 +18,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "interfaces/cps_io.h" /** diff --git a/platform/drivers/GPIO/gpio-native.h b/platform/drivers/GPIO/gpio-native.h index 1811b6bb..86233862 100644 --- a/platform/drivers/GPIO/gpio-native.h +++ b/platform/drivers/GPIO/gpio-native.h @@ -19,13 +19,13 @@ #define GPIO_NATIVE_H #if defined(STM32F405xx) -#include -#include +#include "stm32f4xx.h" +#include "drivers/GPIO/gpio_stm32.h" #elif defined(STM32H743xx) -#include -#include +#include "stm32h7xx.h" +#include "drivers/GPIO/gpio_stm32.h" #elif defined(MK22FN512xx) -#include +#include "drivers/GPIO/gpio_mk22.h" #endif #endif /* GPIO_NATIVE_H */ diff --git a/platform/drivers/GPIO/gpio_mk22.c b/platform/drivers/GPIO/gpio_mk22.c index 6d19b37f..c3055a80 100644 --- a/platform/drivers/GPIO/gpio_mk22.c +++ b/platform/drivers/GPIO/gpio_mk22.c @@ -16,7 +16,7 @@ ***************************************************************************/ #include #include "MK22F51212.h" -#include "gpio_mk22.h" +#include "drivers/GPIO/gpio_mk22.h" /* * MK22 GPIO management is a bit convoluted: instead of having all the registers diff --git a/platform/drivers/GPIO/gpio_mk22.h b/platform/drivers/GPIO/gpio_mk22.h index 0fb5436b..de0e714a 100644 --- a/platform/drivers/GPIO/gpio_mk22.h +++ b/platform/drivers/GPIO/gpio_mk22.h @@ -18,8 +18,8 @@ #ifndef GPIO_MK22_H #define GPIO_MK22_H -#include -#include +#include "peripherals/gpio.h" +#include "hwconfig.h" #include #ifdef __cplusplus diff --git a/platform/drivers/GPIO/gpio_shiftReg.c b/platform/drivers/GPIO/gpio_shiftReg.c index befc4db4..0b7eed1d 100644 --- a/platform/drivers/GPIO/gpio_shiftReg.c +++ b/platform/drivers/GPIO/gpio_shiftReg.c @@ -15,11 +15,11 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include +#include "interfaces/delays.h" +#include "peripherals/gpio.h" #include #include -#include "gpio_shiftReg.h" +#include "drivers/GPIO/gpio_shiftReg.h" void gpioShiftReg_init(const struct gpioDev *dev) { diff --git a/platform/drivers/GPIO/gpio_shiftReg.h b/platform/drivers/GPIO/gpio_shiftReg.h index 5ef5bd5f..04f51b4b 100644 --- a/platform/drivers/GPIO/gpio_shiftReg.h +++ b/platform/drivers/GPIO/gpio_shiftReg.h @@ -18,8 +18,8 @@ #ifndef GPIO_SHIFTREG_H #define GPIO_SHIFTREG_H -#include -#include +#include "peripherals/gpio.h" +#include "peripherals/spi.h" #include #ifdef __cplusplus diff --git a/platform/drivers/GPIO/gpio_stm32.c b/platform/drivers/GPIO/gpio_stm32.c index f6efacd0..cfe3313e 100644 --- a/platform/drivers/GPIO/gpio_stm32.c +++ b/platform/drivers/GPIO/gpio_stm32.c @@ -16,7 +16,7 @@ ***************************************************************************/ #include -#include "gpio_stm32.h" +#include "drivers/GPIO/gpio_stm32.h" static inline void setGpioAf(GPIO_TypeDef *port, uint8_t pin, const uint8_t af) { diff --git a/platform/drivers/GPIO/gpio_stm32.h b/platform/drivers/GPIO/gpio_stm32.h index 769086c8..d4a68587 100644 --- a/platform/drivers/GPIO/gpio_stm32.h +++ b/platform/drivers/GPIO/gpio_stm32.h @@ -18,7 +18,7 @@ #ifndef GPIO_STM32_H #define GPIO_STM32_H -#include +#include "peripherals/gpio.h" #include #ifdef __cplusplus diff --git a/platform/drivers/GPS/gps_linux.c b/platform/drivers/GPS/gps_linux.c index caceaf1d..92748cba 100644 --- a/platform/drivers/GPS/gps_linux.c +++ b/platform/drivers/GPS/gps_linux.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include "core/gps.h" #define MAX_NMEA_LEN 80 #define NMEA_SAMPLES 8 diff --git a/platform/drivers/GPS/gps_stm32.cpp b/platform/drivers/GPS/gps_stm32.cpp index e8096318..afbe0255 100644 --- a/platform/drivers/GPS/gps_stm32.cpp +++ b/platform/drivers/GPS/gps_stm32.cpp @@ -18,8 +18,8 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include +#include "hwconfig.h" +#include "rcc.h" #include "nmea_rbuf.h" #include "gps_stm32.h" diff --git a/platform/drivers/GPS/gps_zephyr.c b/platform/drivers/GPS/gps_zephyr.c index a0a2b7eb..4a6f8dd7 100644 --- a/platform/drivers/GPS/gps_zephyr.c +++ b/platform/drivers/GPS/gps_zephyr.c @@ -20,8 +20,8 @@ #include #include -#include -#include +#include "hwconfig.h" +#include "drivers/GPS/nmea_rbuf.h" #if !DT_NODE_HAS_STATUS(DT_ALIAS(gps), okay) #error "Please select the correct gps UART device" diff --git a/platform/drivers/GPS/nmea_rbuf.c b/platform/drivers/GPS/nmea_rbuf.c index dec3b632..c95a707b 100644 --- a/platform/drivers/GPS/nmea_rbuf.c +++ b/platform/drivers/GPS/nmea_rbuf.c @@ -18,7 +18,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "hwconfig.h" #include #include #include diff --git a/platform/drivers/NVM/AT24Cx.h b/platform/drivers/NVM/AT24Cx.h index 2863e6cd..6ce9b8a2 100644 --- a/platform/drivers/NVM/AT24Cx.h +++ b/platform/drivers/NVM/AT24Cx.h @@ -23,7 +23,7 @@ #include #include -#include +#include "interfaces/nvmem.h" /** * Driver for ATMEL AT24Cx family of I2C EEPROM devices, used as external non diff --git a/platform/drivers/NVM/AT24Cx_GDx.c b/platform/drivers/NVM/AT24Cx_GDx.c index 2112f558..b7d80691 100644 --- a/platform/drivers/NVM/AT24Cx_GDx.c +++ b/platform/drivers/NVM/AT24Cx_GDx.c @@ -18,11 +18,11 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include +#include "peripherals/gpio.h" +#include "interfaces/delays.h" #include #include -#include +#include "I2C0.h" #include "AT24Cx.h" static const uint8_t DEV_ADDR = 0xA0; /* EEPROM I2C address */ diff --git a/platform/drivers/NVM/W25Qx.c b/platform/drivers/NVM/W25Qx.c index 74bf2e57..cb36c024 100644 --- a/platform/drivers/NVM/W25Qx.c +++ b/platform/drivers/NVM/W25Qx.c @@ -23,9 +23,9 @@ #include #include #include -#include -#include -#include +#include "hwconfig.h" +#include "peripherals/gpio.h" +#include "interfaces/delays.h" #define CMD_WRITE 0x02 /* Read data */ #define CMD_READ 0x03 /* Read data */ diff --git a/platform/drivers/NVM/W25Qx.h b/platform/drivers/NVM/W25Qx.h index f830e8e8..d5e8104b 100644 --- a/platform/drivers/NVM/W25Qx.h +++ b/platform/drivers/NVM/W25Qx.h @@ -24,9 +24,9 @@ #include #include #include -#include -#include -#include +#include "peripherals/spi.h" +#include "peripherals/gpio.h" +#include "interfaces/nvmem.h" /** * Driver for Winbond W25Qx family of SPI flash devices, used as external non diff --git a/platform/drivers/NVM/eeep.c b/platform/drivers/NVM/eeep.c index e68ff235..a2ad214a 100644 --- a/platform/drivers/NVM/eeep.c +++ b/platform/drivers/NVM/eeep.c @@ -19,7 +19,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "core/nvmem_access.h" #include #include #include diff --git a/platform/drivers/NVM/eeep.h b/platform/drivers/NVM/eeep.h index 6889c93f..8e22b0ef 100644 --- a/platform/drivers/NVM/eeep.h +++ b/platform/drivers/NVM/eeep.h @@ -22,7 +22,7 @@ #ifndef EEEP_H #define EEEP_H -#include +#include "interfaces/nvmem.h" /** * Driver for Emulated EEPROM, providing a means to store recurrent data without diff --git a/platform/drivers/NVM/flash_zephyr.h b/platform/drivers/NVM/flash_zephyr.h index fa359720..c2f16228 100644 --- a/platform/drivers/NVM/flash_zephyr.h +++ b/platform/drivers/NVM/flash_zephyr.h @@ -21,7 +21,7 @@ #ifndef FLASH_ZEPHYR_H #define FLASH_ZEPHYR_H -#include +#include "interfaces/nvmem.h" /** * Wrapper interface for the Zephyr RTOS flash memory device driver. diff --git a/platform/drivers/NVM/nvmem_CS7000.c b/platform/drivers/NVM/nvmem_CS7000.c index bb3fa7f9..165bbe3a 100644 --- a/platform/drivers/NVM/nvmem_CS7000.c +++ b/platform/drivers/NVM/nvmem_CS7000.c @@ -15,18 +15,18 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include -#include +#include "interfaces/nvmem.h" +#include "interfaces/delays.h" +#include "calibration/calibInfo_CS7000.h" +#include "core/nvmem_access.h" +#include "drivers/SPI/spi_bitbang.h" +#include "drivers/SPI/spi_stm32.h" #include -#include -#include -#include -#include -#include +#include "wchar.h" +#include "core/utils.h" +#include "core/crc.h" +#include "drivers/NVM/W25Qx.h" +#include "drivers/NVM/eeep.h" static const struct W25QxCfg cfg = { diff --git a/platform/drivers/NVM/nvmem_GDx.c b/platform/drivers/NVM/nvmem_GDx.c index 22a92d78..3cef60c3 100644 --- a/platform/drivers/NVM/nvmem_GDx.c +++ b/platform/drivers/NVM/nvmem_GDx.c @@ -19,14 +19,14 @@ ***************************************************************************/ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "wchar.h" +#include "interfaces/delays.h" +#include "interfaces/nvmem.h" +#include "core/nvmem_access.h" +#include "calibration/calibInfo_GDx.h" +#include "drivers/SPI/spi_bitbang.h" +#include "hwconfig.h" +#include "core/utils.h" #include "AT24Cx.h" #include "W25Qx.h" diff --git a/platform/drivers/NVM/nvmem_MDx.c b/platform/drivers/NVM/nvmem_MDx.c index 4c16ddb2..bbb56388 100644 --- a/platform/drivers/NVM/nvmem_MDx.c +++ b/platform/drivers/NVM/nvmem_MDx.c @@ -18,14 +18,14 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include +#include "interfaces/nvmem.h" +#include "interfaces/delays.h" +#include "calibration/calibInfo_MDx.h" +#include "core/nvmem_access.h" +#include "drivers/SPI/spi_stm32.h" #include -#include -#include +#include "wchar.h" +#include "core/utils.h" #include "W25Qx.h" #define SECREG_READ(dev, offs, data, len) \ diff --git a/platform/drivers/NVM/nvmem_Mod17.c b/platform/drivers/NVM/nvmem_Mod17.c index 3eceee48..d43b137f 100644 --- a/platform/drivers/NVM/nvmem_Mod17.c +++ b/platform/drivers/NVM/nvmem_Mod17.c @@ -18,10 +18,10 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include +#include "interfaces/nvmem.h" +#include "calibration/calibInfo_Mod17.h" #include -#include +#include "core/crc.h" #include "flash.h" /* diff --git a/platform/drivers/NVM/nvmem_linux.c b/platform/drivers/NVM/nvmem_linux.c index f96c3842..dcd5d612 100644 --- a/platform/drivers/NVM/nvmem_linux.c +++ b/platform/drivers/NVM/nvmem_linux.c @@ -23,9 +23,9 @@ #include #include #include -#include -#include -#include +#include "drivers/NVM/posix_file.h" +#include "core/nvmem_access.h" +#include "interfaces/nvmem.h" #define NVM_MAX_PATHLEN 256 diff --git a/platform/drivers/NVM/nvmem_settings_MDx.c b/platform/drivers/NVM/nvmem_settings_MDx.c index 2f8d30cc..ef2ece74 100644 --- a/platform/drivers/NVM/nvmem_settings_MDx.c +++ b/platform/drivers/NVM/nvmem_settings_MDx.c @@ -18,10 +18,10 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "interfaces/nvmem.h" #include -#include -#include +#include "core/cps.h" +#include "core/crc.h" #include "flash.h" /* diff --git a/platform/drivers/NVM/nvmem_ttwrplus.c b/platform/drivers/NVM/nvmem_ttwrplus.c index 32967295..c518b7cb 100644 --- a/platform/drivers/NVM/nvmem_ttwrplus.c +++ b/platform/drivers/NVM/nvmem_ttwrplus.c @@ -20,7 +20,7 @@ #include #include -#include +#include "interfaces/nvmem.h" #include "flash_zephyr.h" ZEPHYR_FLASH_DEVICE_DEFINE(eflash, flash, FIXED_PARTITION_SIZE(storage_partition)); diff --git a/platform/drivers/NVM/posix_file.c b/platform/drivers/NVM/posix_file.c index 6a4acd0f..fa4a1424 100644 --- a/platform/drivers/NVM/posix_file.c +++ b/platform/drivers/NVM/posix_file.c @@ -18,7 +18,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "interfaces/nvmem.h" #include #include #include diff --git a/platform/drivers/NVM/posix_file.h b/platform/drivers/NVM/posix_file.h index b6c2f64f..a5be6521 100644 --- a/platform/drivers/NVM/posix_file.h +++ b/platform/drivers/NVM/posix_file.h @@ -21,7 +21,7 @@ #ifndef POSIX_FILE_H #define POSIX_FILE_H -#include +#include "interfaces/nvmem.h" /** * Device driver for file-based nonvolatile memory storage. The driver diff --git a/platform/drivers/SPI/spi_bitbang.c b/platform/drivers/SPI/spi_bitbang.c index bc73b30a..444164d6 100644 --- a/platform/drivers/SPI/spi_bitbang.c +++ b/platform/drivers/SPI/spi_bitbang.c @@ -18,7 +18,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "interfaces/delays.h" #include "spi_bitbang.h" uint8_t spiBitbang_sendRecv(const void *priv, uint8_t data) diff --git a/platform/drivers/SPI/spi_bitbang.h b/platform/drivers/SPI/spi_bitbang.h index 0b9ca778..cd745d04 100644 --- a/platform/drivers/SPI/spi_bitbang.h +++ b/platform/drivers/SPI/spi_bitbang.h @@ -21,8 +21,8 @@ #ifndef SPI_BITBANG_H #define SPI_BITBANG_H -#include -#include +#include "peripherals/gpio.h" +#include "peripherals/spi.h" #include "spi_custom.h" #ifdef __cplusplus diff --git a/platform/drivers/SPI/spi_custom.h b/platform/drivers/SPI/spi_custom.h index fbd13552..9b14f62f 100644 --- a/platform/drivers/SPI/spi_custom.h +++ b/platform/drivers/SPI/spi_custom.h @@ -21,7 +21,7 @@ #ifndef SPI_CUSTOM_H #define SPI_CUSTOM_H -#include +#include "peripherals/spi.h" #ifdef __cplusplus extern "C" { diff --git a/platform/drivers/SPI/spi_mk22.c b/platform/drivers/SPI/spi_mk22.c index 7e7ceb7d..278f7991 100644 --- a/platform/drivers/SPI/spi_mk22.c +++ b/platform/drivers/SPI/spi_mk22.c @@ -19,7 +19,7 @@ ***************************************************************************/ #include -#include +#include "MK22F51212.h" #include "spi_mk22.h" diff --git a/platform/drivers/SPI/spi_mk22.h b/platform/drivers/SPI/spi_mk22.h index dcdd7241..3bef5ed5 100644 --- a/platform/drivers/SPI/spi_mk22.h +++ b/platform/drivers/SPI/spi_mk22.h @@ -21,7 +21,7 @@ #ifndef SPI_MK22_H #define SPI_MK22_H -#include +#include "peripherals/spi.h" #ifdef __cplusplus extern "C" { diff --git a/platform/drivers/SPI/spi_stm32.h b/platform/drivers/SPI/spi_stm32.h index a40a277a..bce1a642 100644 --- a/platform/drivers/SPI/spi_stm32.h +++ b/platform/drivers/SPI/spi_stm32.h @@ -21,7 +21,7 @@ #ifndef SPI_STM32_H #define SPI_STM32_H -#include +#include "peripherals/spi.h" #ifdef __cplusplus extern "C" { diff --git a/platform/drivers/SPI/spi_stm32f4.c b/platform/drivers/SPI/spi_stm32f4.c index 96f4dea0..090593d8 100644 --- a/platform/drivers/SPI/spi_stm32f4.c +++ b/platform/drivers/SPI/spi_stm32f4.c @@ -18,9 +18,9 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "rcc.h" #include -#include +#include "stm32f4xx.h" #include "spi_stm32.h" diff --git a/platform/drivers/SPI/spi_stm32h7.c b/platform/drivers/SPI/spi_stm32h7.c index b7503608..8d410f39 100644 --- a/platform/drivers/SPI/spi_stm32h7.c +++ b/platform/drivers/SPI/spi_stm32h7.c @@ -15,9 +15,9 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "rcc.h" #include -#include +#include "stm32h7xx.h" #include "spi_stm32.h" diff --git a/platform/drivers/USB/usb.h b/platform/drivers/USB/usb.h index b299ff04..67071bad 100644 --- a/platform/drivers/USB/usb.h +++ b/platform/drivers/USB/usb.h @@ -22,7 +22,7 @@ #include #include -#include +#include "tusb.h" #ifdef __cplusplus extern "C" { diff --git a/platform/drivers/USB/usb_MDx.cpp b/platform/drivers/USB/usb_MDx.cpp index 792201eb..6d8bf200 100644 --- a/platform/drivers/USB/usb_MDx.cpp +++ b/platform/drivers/USB/usb_MDx.cpp @@ -18,9 +18,9 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include +#include "interfaces/platform.h" +#include "peripherals/gpio.h" +#include "hwconfig.h" #include "usb.h" /* diff --git a/platform/drivers/USB/usb_descriptors.c b/platform/drivers/USB/usb_descriptors.c index a29fdab2..73f39a15 100644 --- a/platform/drivers/USB/usb_descriptors.c +++ b/platform/drivers/USB/usb_descriptors.c @@ -23,7 +23,7 @@ * */ -#include +#include "interfaces/platform.h" #include "tusb.h" /* A combination of interfaces must have a unique product id, since PC will save device driver after the first plug. diff --git a/platform/drivers/audio/Cx000_dac.cpp b/platform/drivers/audio/Cx000_dac.cpp index cdf8b440..15d744a2 100644 --- a/platform/drivers/audio/Cx000_dac.cpp +++ b/platform/drivers/audio/Cx000_dac.cpp @@ -15,7 +15,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "drivers/baseband/HR_C6000.h" #include #include #include "Cx000_dac.h" diff --git a/platform/drivers/audio/Cx000_dac.h b/platform/drivers/audio/Cx000_dac.h index a934f6d9..eaff0105 100644 --- a/platform/drivers/audio/Cx000_dac.h +++ b/platform/drivers/audio/Cx000_dac.h @@ -20,7 +20,7 @@ #include #include -#include +#include "interfaces/audio.h" #ifdef __cplusplus extern "C" { diff --git a/platform/drivers/audio/MAX9814_Mod17.cpp b/platform/drivers/audio/MAX9814_Mod17.cpp index a29c5fc1..6606784d 100644 --- a/platform/drivers/audio/MAX9814_Mod17.cpp +++ b/platform/drivers/audio/MAX9814_Mod17.cpp @@ -15,8 +15,8 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include +#include "peripherals/gpio.h" +#include "hwconfig.h" #include "MAX9814.h" /* diff --git a/platform/drivers/audio/audio_CS7000.cpp b/platform/drivers/audio/audio_CS7000.cpp index 032537d7..a2fe55a8 100644 --- a/platform/drivers/audio/audio_CS7000.cpp +++ b/platform/drivers/audio/audio_CS7000.cpp @@ -18,16 +18,16 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "interfaces/platform.h" +#include "interfaces/delays.h" +#include "interfaces/audio.h" +#include "interfaces/radio.h" +#include "peripherals/gpio.h" +#include "hwconfig.h" +#include "core/threads.h" +#include "core/state.h" +#include "drivers/baseband/HR_C6000.h" +#include "drivers/SPI/spi_stm32.h" #include "stm32_dac.h" #include "stm32_adc.h" #include "Cx000_dac.h" diff --git a/platform/drivers/audio/audio_GDx.c b/platform/drivers/audio/audio_GDx.c index 768800f5..9c1f1675 100644 --- a/platform/drivers/audio/audio_GDx.c +++ b/platform/drivers/audio/audio_GDx.c @@ -18,10 +18,10 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include +#include "interfaces/audio.h" +#include "peripherals/gpio.h" +#include "interfaces/radio.h" +#include "hwconfig.h" #define PATH(x,y) ((x << 4) | y) diff --git a/platform/drivers/audio/audio_MDx.cpp b/platform/drivers/audio/audio_MDx.cpp index 1e58fe43..8a6a9039 100644 --- a/platform/drivers/audio/audio_MDx.cpp +++ b/platform/drivers/audio/audio_MDx.cpp @@ -18,20 +18,20 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include +#include "interfaces/platform.h" +#include "interfaces/delays.h" +#include "interfaces/audio.h" +#include "interfaces/radio.h" +#include "peripherals/gpio.h" +#include "hwconfig.h" +#include "core/threads.h" +#include "core/state.h" #include "toneGenerator_MDx.h" #include "stm32_pwm.h" #include "stm32_adc.h" #if defined(PLATFORM_MDUV3x0) || defined (PLATFORM_DM1701) -#include +#include "drivers/baseband/HR_C6000.h" #include "Cx000_dac.h" #endif diff --git a/platform/drivers/audio/audio_Mod17.c b/platform/drivers/audio/audio_Mod17.c index 9102d93b..9f499b8c 100644 --- a/platform/drivers/audio/audio_Mod17.c +++ b/platform/drivers/audio/audio_Mod17.c @@ -18,9 +18,9 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include +#include "interfaces/audio.h" +#include "peripherals/gpio.h" +#include "hwconfig.h" #include "MAX9814.h" #include "stm32_dac.h" #include "stm32_adc.h" diff --git a/platform/drivers/audio/audio_linux.c b/platform/drivers/audio/audio_linux.c index 3ecbcbdd..b352532d 100644 --- a/platform/drivers/audio/audio_linux.c +++ b/platform/drivers/audio/audio_linux.c @@ -18,8 +18,8 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include +#include "interfaces/audio.h" +#include "hwconfig.h" #include "file_source.h" diff --git a/platform/drivers/audio/audio_ttwrplus.c b/platform/drivers/audio/audio_ttwrplus.c index 0f9f0f73..063e8e6e 100644 --- a/platform/drivers/audio/audio_ttwrplus.c +++ b/platform/drivers/audio/audio_ttwrplus.c @@ -18,8 +18,8 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include "SA8x8.h" +#include "interfaces/audio.h" +#include "drivers/baseband/SA8x8.h" const struct audioDevice outputDevices[] = { diff --git a/platform/drivers/audio/file_source.h b/platform/drivers/audio/file_source.h index 801567ea..a44e7955 100644 --- a/platform/drivers/audio/file_source.h +++ b/platform/drivers/audio/file_source.h @@ -21,7 +21,7 @@ #ifndef FILE_SOURCE_H #define FILE_SOURCE_H -#include +#include "interfaces/audio.h" #ifdef __cplusplus extern "C" { diff --git a/platform/drivers/audio/stm32_adc.cpp b/platform/drivers/audio/stm32_adc.cpp index 9fffbde2..222e4fe9 100644 --- a/platform/drivers/audio/stm32_adc.cpp +++ b/platform/drivers/audio/stm32_adc.cpp @@ -19,24 +19,24 @@ ***************************************************************************/ #include -#include -#include -#include -#include -#include +#include "core/cache_cortexMx.h" +#include "interfaces/delays.h" +#include "peripherals/gpio.h" +#include "DmaStream.hpp" +#include "hwconfig.h" #include #include #include "stm32_adc.h" #if defined(STM32H743xx) -#include +#include "Lptim.hpp" typedef Lptim timebase_type; #define TimebaseCh1 Lptim(LPTIM3_BASE, 168000000) #define TimebaseCh2 Lptim(LPTIM3_BASE, 168000000) #define TimebaseCh3 Lptim(LPTIM3_BASE, 168000000) #else -#include +#include "Timer.hpp" typedef Timer timebase_type; #define TimebaseCh1 Timer(TIM2_BASE) diff --git a/platform/drivers/audio/stm32_adc.h b/platform/drivers/audio/stm32_adc.h index 8da2467e..fb806c02 100644 --- a/platform/drivers/audio/stm32_adc.h +++ b/platform/drivers/audio/stm32_adc.h @@ -23,7 +23,7 @@ #include #include -#include +#include "interfaces/audio.h" #ifdef __cplusplus extern "C" { diff --git a/platform/drivers/audio/stm32_dac.cpp b/platform/drivers/audio/stm32_dac.cpp index 2675679a..a62b88af 100644 --- a/platform/drivers/audio/stm32_dac.cpp +++ b/platform/drivers/audio/stm32_dac.cpp @@ -19,17 +19,17 @@ ***************************************************************************/ #include -#include -#include -#include -#include +#include "core/cache_cortexMx.h" +#include "peripherals/gpio.h" +#include "core/data_conversion.h" +#include "DmaStream.hpp" #include #include -#include +#include "hwconfig.h" #include "stm32_dac.h" #if defined(STM32H743xx) -#include +#include "Lptim.hpp" #define DAC DAC1 #define DAC_TRIG_CH1 (11 << 2) // lptim1_out @@ -39,7 +39,7 @@ typedef Lptim timebase_type; #define TimebaseCh1 Lptim(LPTIM1_BASE, 168000000) #define TimebaseCh2 Lptim(LPTIM2_BASE, 168000000) #else -#include +#include "Timer.hpp" #define DAC_TRIG_CH1 0x00 #define DAC_TRIG_CH2 DAC_CR_TSEL2_1 diff --git a/platform/drivers/audio/stm32_dac.h b/platform/drivers/audio/stm32_dac.h index 934ee982..47ef5125 100644 --- a/platform/drivers/audio/stm32_dac.h +++ b/platform/drivers/audio/stm32_dac.h @@ -23,7 +23,7 @@ #include #include -#include +#include "interfaces/audio.h" #ifdef __cplusplus extern "C" { diff --git a/platform/drivers/audio/stm32_pwm.cpp b/platform/drivers/audio/stm32_pwm.cpp index 6301e488..5f23b1ea 100644 --- a/platform/drivers/audio/stm32_pwm.cpp +++ b/platform/drivers/audio/stm32_pwm.cpp @@ -19,9 +19,9 @@ ***************************************************************************/ #include -#include -#include -#include +#include "core/data_conversion.h" +#include "DmaStream.hpp" +#include "Timer.hpp" #include #include #include "stm32_pwm.h" diff --git a/platform/drivers/audio/stm32_pwm.h b/platform/drivers/audio/stm32_pwm.h index 742898cd..5cbf133e 100644 --- a/platform/drivers/audio/stm32_pwm.h +++ b/platform/drivers/audio/stm32_pwm.h @@ -23,8 +23,8 @@ #include #include -#include -#include +#include "stm32f4xx.h" +#include "interfaces/audio.h" #ifdef __cplusplus extern "C" { diff --git a/platform/drivers/backlight/backlight_CS7000.c b/platform/drivers/backlight/backlight_CS7000.c index 69161ed9..792d57cb 100644 --- a/platform/drivers/backlight/backlight_CS7000.c +++ b/platform/drivers/backlight/backlight_CS7000.c @@ -15,9 +15,9 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include +#include "interfaces/platform.h" +#include "peripherals/gpio.h" +#include "hwconfig.h" #include "backlight.h" void backlight_init() diff --git a/platform/drivers/backlight/backlight_GDx.c b/platform/drivers/backlight/backlight_GDx.c index f16acd54..1d764943 100644 --- a/platform/drivers/backlight/backlight_GDx.c +++ b/platform/drivers/backlight/backlight_GDx.c @@ -18,9 +18,9 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include +#include "interfaces/platform.h" +#include "peripherals/gpio.h" +#include "hwconfig.h" #include "backlight.h" void backlight_init() diff --git a/platform/drivers/backlight/backlight_MDx.c b/platform/drivers/backlight/backlight_MDx.c index f08678b6..ffda0c1b 100644 --- a/platform/drivers/backlight/backlight_MDx.c +++ b/platform/drivers/backlight/backlight_MDx.c @@ -18,9 +18,9 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include +#include "interfaces/platform.h" +#include "peripherals/gpio.h" +#include "hwconfig.h" #include "backlight.h" #if defined(PLATFORM_MDUV3x0) && defined(CONFIG_SCREEN_BRIGHTNESS) diff --git a/platform/drivers/baseband/AK2365A.c b/platform/drivers/baseband/AK2365A.c index c680a915..94bf96e2 100644 --- a/platform/drivers/baseband/AK2365A.c +++ b/platform/drivers/baseband/AK2365A.c @@ -15,8 +15,8 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include "AK2365A.h" +#include "interfaces/delays.h" +#include "drivers/baseband/AK2365A.h" static inline void writeReg(const struct ak2365a *dev, uint8_t reg, uint8_t value) diff --git a/platform/drivers/baseband/AK2365A.h b/platform/drivers/baseband/AK2365A.h index cd457f06..ffa41c02 100644 --- a/platform/drivers/baseband/AK2365A.h +++ b/platform/drivers/baseband/AK2365A.h @@ -18,8 +18,8 @@ #ifndef AK2365A_H #define AK2365A_H -#include -#include +#include "peripherals/gpio.h" +#include "peripherals/spi.h" #include #include diff --git a/platform/drivers/baseband/AT1846S.h b/platform/drivers/baseband/AT1846S.h index 6ce09d67..c5d4d7d2 100644 --- a/platform/drivers/baseband/AT1846S.h +++ b/platform/drivers/baseband/AT1846S.h @@ -23,7 +23,7 @@ #include #include -#include +#include "core/datatypes.h" /** * Enumeration type defining the bandwidth settings supported by the AT1846S chip. diff --git a/platform/drivers/baseband/AT1846S_GDx.cpp b/platform/drivers/baseband/AT1846S_GDx.cpp index 62f2ff0a..364a5ece 100644 --- a/platform/drivers/baseband/AT1846S_GDx.cpp +++ b/platform/drivers/baseband/AT1846S_GDx.cpp @@ -18,9 +18,9 @@ * along with this program; if not, see * **************************************************************************/ -#include -#include -#include "AT1846S.h" +#include "interfaces/delays.h" +#include "I2C0.h" +#include "drivers/baseband/AT1846S.h" void AT1846S::init() { diff --git a/platform/drivers/baseband/AT1846S_SA8x8.cpp b/platform/drivers/baseband/AT1846S_SA8x8.cpp index bd5f70e6..e90edd5d 100644 --- a/platform/drivers/baseband/AT1846S_SA8x8.cpp +++ b/platform/drivers/baseband/AT1846S_SA8x8.cpp @@ -18,9 +18,9 @@ * along with this program; if not, see * **************************************************************************/ -#include -#include "AT1846S.h" -#include "SA8x8.h" +#include "interfaces/delays.h" +#include "drivers/baseband/AT1846S.h" +#include "drivers/baseband/SA8x8.h" void AT1846S::init() { diff --git a/platform/drivers/baseband/AT1846S_UV3x0.cpp b/platform/drivers/baseband/AT1846S_UV3x0.cpp index 45c408d5..6795354b 100644 --- a/platform/drivers/baseband/AT1846S_UV3x0.cpp +++ b/platform/drivers/baseband/AT1846S_UV3x0.cpp @@ -18,10 +18,10 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include "AT1846S.h" +#include "peripherals/gpio.h" +#include "interfaces/delays.h" +#include "hwconfig.h" +#include "drivers/baseband/AT1846S.h" void AT1846S::init() { diff --git a/platform/drivers/baseband/HR_C5000.h b/platform/drivers/baseband/HR_C5000.h index faaefa37..1c8de7d8 100644 --- a/platform/drivers/baseband/HR_C5000.h +++ b/platform/drivers/baseband/HR_C5000.h @@ -21,7 +21,7 @@ #ifndef HRC5000_H #define HRC5000_H -#include "HR_Cx000.h" +#include "drivers/baseband/HR_Cx000.h" enum class C5000_SpiOpModes : uint8_t { diff --git a/platform/drivers/baseband/HR_C5000_MDx.cpp b/platform/drivers/baseband/HR_C5000_MDx.cpp index 86593f7e..f9e340fc 100644 --- a/platform/drivers/baseband/HR_C5000_MDx.cpp +++ b/platform/drivers/baseband/HR_C5000_MDx.cpp @@ -18,10 +18,10 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include "HR_C5000.h" +#include "interfaces/delays.h" +#include "peripherals/gpio.h" +#include "hwconfig.h" +#include "drivers/baseband/HR_C5000.h" static const uint8_t initSeq1[] = {0x00, 0x00, 0xFF, 0xB0, 0x00, 0x00, 0x00, 0x00}; static const uint8_t initSeq2[] = diff --git a/platform/drivers/baseband/HR_C6000.cpp b/platform/drivers/baseband/HR_C6000.cpp index 5945b7c8..b41fde50 100644 --- a/platform/drivers/baseband/HR_C6000.cpp +++ b/platform/drivers/baseband/HR_C6000.cpp @@ -18,8 +18,8 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include "HR_C6000.h" +#include "core/utils.h" +#include "drivers/baseband/HR_C6000.h" /* * Table of HR_C6000 CTCSS tones, used for reverse lookup of tone index to be diff --git a/platform/drivers/baseband/HR_C6000.h b/platform/drivers/baseband/HR_C6000.h index f28820fc..b761fbbe 100644 --- a/platform/drivers/baseband/HR_C6000.h +++ b/platform/drivers/baseband/HR_C6000.h @@ -21,8 +21,8 @@ #ifndef HRC6000_H #define HRC6000_H -#include -#include "HR_Cx000.h" +#include "core/datatypes.h" +#include "drivers/baseband/HR_Cx000.h" enum class C6000_SpiOpModes : uint8_t { diff --git a/platform/drivers/baseband/HR_C6000_CS7000.cpp b/platform/drivers/baseband/HR_C6000_CS7000.cpp index 242086fb..b3cd361d 100644 --- a/platform/drivers/baseband/HR_C6000_CS7000.cpp +++ b/platform/drivers/baseband/HR_C6000_CS7000.cpp @@ -15,10 +15,10 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include "HR_C6000.h" +#include "peripherals/gpio.h" +#include "interfaces/delays.h" +#include "hwconfig.h" +#include "drivers/baseband/HR_C6000.h" static const uint8_t initSeq1[] = { diff --git a/platform/drivers/baseband/HR_C6000_GDx.cpp b/platform/drivers/baseband/HR_C6000_GDx.cpp index ed2fd197..35b62898 100644 --- a/platform/drivers/baseband/HR_C6000_GDx.cpp +++ b/platform/drivers/baseband/HR_C6000_GDx.cpp @@ -18,10 +18,10 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include "HR_C6000.h" +#include "peripherals/gpio.h" +#include "interfaces/delays.h" +#include "hwconfig.h" +#include "drivers/baseband/HR_C6000.h" static const uint8_t initSeq1[] = { 0x01, 0x04, 0xD5, 0xD7, 0xF7, 0x7F, 0xD7, 0x57 }; static const uint8_t initSeq2[] = diff --git a/platform/drivers/baseband/HR_C6000_UV3x0.cpp b/platform/drivers/baseband/HR_C6000_UV3x0.cpp index ac81f7fa..8b5d8eea 100644 --- a/platform/drivers/baseband/HR_C6000_UV3x0.cpp +++ b/platform/drivers/baseband/HR_C6000_UV3x0.cpp @@ -18,10 +18,10 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include "HR_C6000.h" +#include "peripherals/gpio.h" +#include "interfaces/delays.h" +#include "hwconfig.h" +#include "drivers/baseband/HR_C6000.h" static const uint8_t initSeq1[] = { 0x01, 0x04, 0xD5, 0xD7, 0xF7, 0x7F, 0xD7, 0x57 }; static const uint8_t initSeq2[] = diff --git a/platform/drivers/baseband/HR_Cx000.cpp b/platform/drivers/baseband/HR_Cx000.cpp index eb8718c4..8cf95792 100644 --- a/platform/drivers/baseband/HR_Cx000.cpp +++ b/platform/drivers/baseband/HR_Cx000.cpp @@ -18,13 +18,13 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include +#include "interfaces/delays.h" +#include "peripherals/gpio.h" #include -#include -#include "HR_Cx000.h" -#include "HR_C5000.h" -#include "HR_C6000.h" +#include "hwconfig.h" +#include "drivers/baseband/HR_Cx000.h" +#include "drivers/baseband/HR_C5000.h" +#include "drivers/baseband/HR_C6000.h" template <> void HR_Cx000< C5000_SpiOpModes >::setDacGain(int8_t gain) diff --git a/platform/drivers/baseband/HR_Cx000.h b/platform/drivers/baseband/HR_Cx000.h index b2b3f64d..39319724 100644 --- a/platform/drivers/baseband/HR_Cx000.h +++ b/platform/drivers/baseband/HR_Cx000.h @@ -21,8 +21,8 @@ #ifndef HRCx000_H #define HRCx000_H -#include -#include +#include "peripherals/gpio.h" +#include "peripherals/spi.h" #include #include #include diff --git a/platform/drivers/baseband/MCP4551.c b/platform/drivers/baseband/MCP4551.c index d30732c6..fc1a9932 100644 --- a/platform/drivers/baseband/MCP4551.c +++ b/platform/drivers/baseband/MCP4551.c @@ -19,7 +19,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include "MCP4551.h" +#include "drivers/baseband/MCP4551.h" // Common WIPER values #define MCP4551_WIPER_MID 0x080 diff --git a/platform/drivers/baseband/MCP4551.h b/platform/drivers/baseband/MCP4551.h index fce7fc36..80237cf0 100644 --- a/platform/drivers/baseband/MCP4551.h +++ b/platform/drivers/baseband/MCP4551.h @@ -24,8 +24,8 @@ #include #include -#include -#include +#include "core/datatypes.h" +#include "peripherals/i2c.h" #ifdef __cplusplus extern "C" { diff --git a/platform/drivers/baseband/SA8x8.c b/platform/drivers/baseband/SA8x8.c index 8e984bb1..eed126c4 100644 --- a/platform/drivers/baseband/SA8x8.c +++ b/platform/drivers/baseband/SA8x8.c @@ -21,10 +21,10 @@ #include #include #include -#include +#include "interfaces/delays.h" #include #include -#include "SA8x8.h" +#include "drivers/baseband/SA8x8.h" /* * Minimum required version of sa868-fw diff --git a/platform/drivers/baseband/SKY72310.c b/platform/drivers/baseband/SKY72310.c index 8ee56eb6..62654dd8 100644 --- a/platform/drivers/baseband/SKY72310.c +++ b/platform/drivers/baseband/SKY72310.c @@ -16,9 +16,9 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "interfaces/delays.h" #include -#include "SKY72310.h" +#include "drivers/baseband/SKY72310.h" static inline void writeReg(const struct sky73210 *dev, const uint16_t value) { diff --git a/platform/drivers/baseband/SKY72310.h b/platform/drivers/baseband/SKY72310.h index 3db8f50a..c9fc755e 100644 --- a/platform/drivers/baseband/SKY72310.h +++ b/platform/drivers/baseband/SKY72310.h @@ -19,8 +19,8 @@ #ifndef SKY73210_H #define SKY73210_H -#include -#include +#include "peripherals/gpio.h" +#include "peripherals/spi.h" #include #include diff --git a/platform/drivers/baseband/radioUtils.h b/platform/drivers/baseband/radioUtils.h index 04ed117c..d5709795 100644 --- a/platform/drivers/baseband/radioUtils.h +++ b/platform/drivers/baseband/radioUtils.h @@ -22,7 +22,7 @@ #define RADIO_UTILS_H #include -#include +#include "core/datatypes.h" #ifdef __cplusplus extern "C" { diff --git a/platform/drivers/baseband/radio_CS7000.cpp b/platform/drivers/baseband/radio_CS7000.cpp index 524e697c..3d982997 100644 --- a/platform/drivers/baseband/radio_CS7000.cpp +++ b/platform/drivers/baseband/radio_CS7000.cpp @@ -15,21 +15,21 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "interfaces/nvmem.h" +#include "interfaces/radio.h" +#include "interfaces/delays.h" +#include "peripherals/gpio.h" +#include "peripherals/adc.h" +#include "calibration/calibInfo_CS7000.h" +#include "drivers/SPI/spi_bitbang.h" +#include "core/ctcssDetector.hpp" +#include "drivers/audio/stm32_adc.h" +#include "hwconfig.h" #include -#include -#include "HR_C6000.h" -#include "SKY72310.h" -#include "AK2365A.h" +#include "core/utils.h" +#include "drivers/baseband/HR_C6000.h" +#include "drivers/baseband/SKY72310.h" +#include "drivers/baseband/AK2365A.h" #ifdef PLATFORM_CS7000P #define DAC DAC1 diff --git a/platform/drivers/baseband/radio_GDx.cpp b/platform/drivers/baseband/radio_GDx.cpp index 433750d2..5d420ecd 100644 --- a/platform/drivers/baseband/radio_GDx.cpp +++ b/platform/drivers/baseband/radio_GDx.cpp @@ -18,17 +18,17 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include -#include +#include "interfaces/radio.h" +#include "interfaces/nvmem.h" +#include "peripherals/gpio.h" +#include "calibration/calibInfo_GDx.h" +#include "hwconfig.h" +#include "drivers/SPI/spi_mk22.h" #include -#include +#include "core/utils.h" #include "radioUtils.h" -#include "HR_C6000.h" -#include "AT1846S.h" +#include "drivers/baseband/HR_C6000.h" +#include "drivers/baseband/AT1846S.h" static const rtxStatus_t *config; // Pointer to data structure with radio configuration diff --git a/platform/drivers/baseband/radio_MD3x0.cpp b/platform/drivers/baseband/radio_MD3x0.cpp index 071a287e..7eb67da5 100644 --- a/platform/drivers/baseband/radio_MD3x0.cpp +++ b/platform/drivers/baseband/radio_MD3x0.cpp @@ -18,18 +18,18 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include +#include "drivers/tones/toneGenerator_MDx.h" +#include "interfaces/nvmem.h" +#include "interfaces/radio.h" +#include "peripherals/gpio.h" +#include "calibration/calibInfo_MDx.h" +#include "drivers/SPI/spi_bitbang.h" +#include "drivers/ADC/adc_stm32.h" +#include "hwconfig.h" #include -#include -#include "HR_C5000.h" -#include "SKY72310.h" +#include "core/utils.h" +#include "drivers/baseband/HR_C5000.h" +#include "drivers/baseband/SKY72310.h" static const freq_t IF_FREQ = 49950000; // Intermediate frequency: 49.95MHz diff --git a/platform/drivers/baseband/radio_MD9600.cpp b/platform/drivers/baseband/radio_MD9600.cpp index 2a3de20a..6ee30b21 100644 --- a/platform/drivers/baseband/radio_MD9600.cpp +++ b/platform/drivers/baseband/radio_MD9600.cpp @@ -18,7 +18,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "interfaces/radio.h" void radio_init(const rtxStatus_t *rtxState) { diff --git a/platform/drivers/baseband/radio_Mod17.cpp b/platform/drivers/baseband/radio_Mod17.cpp index 1e8a7087..bb615b53 100644 --- a/platform/drivers/baseband/radio_Mod17.cpp +++ b/platform/drivers/baseband/radio_Mod17.cpp @@ -18,11 +18,11 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include +#include "interfaces/radio.h" +#include "peripherals/gpio.h" +#include "calibration/calibInfo_Mod17.h" +#include "hwconfig.h" +#include "drivers/baseband/MCP4551.h" #include "../audio/MAX9814.h" static enum opstatus radioStatus; // Current operating status diff --git a/platform/drivers/baseband/radio_UV3x0.cpp b/platform/drivers/baseband/radio_UV3x0.cpp index 0ddae4b2..f97ded5d 100644 --- a/platform/drivers/baseband/radio_UV3x0.cpp +++ b/platform/drivers/baseband/radio_UV3x0.cpp @@ -18,17 +18,17 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include -#include +#include "interfaces/delays.h" +#include "interfaces/nvmem.h" +#include "interfaces/radio.h" +#include "peripherals/gpio.h" +#include "calibration/calibInfo_MDx.h" +#include "hwconfig.h" #include -#include +#include "core/utils.h" #include "radioUtils.h" -#include "HR_C6000.h" -#include "AT1846S.h" +#include "drivers/baseband/HR_C6000.h" +#include "drivers/baseband/AT1846S.h" static const rtxStatus_t *config; // Pointer to data structure with radio configuration diff --git a/platform/drivers/baseband/radio_linux.cpp b/platform/drivers/baseband/radio_linux.cpp index b723eabd..f66bff1a 100644 --- a/platform/drivers/baseband/radio_linux.cpp +++ b/platform/drivers/baseband/radio_linux.cpp @@ -18,8 +18,8 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include +#include "emulator/emulator.h" +#include "interfaces/radio.h" #include #include diff --git a/platform/drivers/baseband/radio_ttwrplus.cpp b/platform/drivers/baseband/radio_ttwrplus.cpp index c439b1bb..ac03d601 100644 --- a/platform/drivers/baseband/radio_ttwrplus.cpp +++ b/platform/drivers/baseband/radio_ttwrplus.cpp @@ -18,12 +18,12 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "interfaces/radio.h" #include -#include +#include "pmu.h" #include "radioUtils.h" -#include "AT1846S.h" -#include "SA8x8.h" +#include "drivers/baseband/AT1846S.h" +#include "drivers/baseband/SA8x8.h" static const rtxStatus_t *config; // Pointer to data structure with radio configuration diff --git a/platform/drivers/chSelector/chSelector_MD9600.c b/platform/drivers/chSelector/chSelector_MD9600.c index 12562421..2276a86e 100644 --- a/platform/drivers/chSelector/chSelector_MD9600.c +++ b/platform/drivers/chSelector/chSelector_MD9600.c @@ -18,9 +18,9 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include +#include "interfaces/platform.h" +#include "peripherals/gpio.h" +#include "hwconfig.h" #include #include "chSelector.h" diff --git a/platform/drivers/chSelector/chSelector_UV3x0.c b/platform/drivers/chSelector/chSelector_UV3x0.c index 15226ed1..8689c069 100644 --- a/platform/drivers/chSelector/chSelector_UV3x0.c +++ b/platform/drivers/chSelector/chSelector_UV3x0.c @@ -18,9 +18,9 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include +#include "interfaces/platform.h" +#include "peripherals/gpio.h" +#include "hwconfig.h" #include #include "chSelector.h" diff --git a/platform/drivers/display/HX8353_MD3x.cpp b/platform/drivers/display/HX8353_MD3x.cpp index d3342757..ba869390 100644 --- a/platform/drivers/display/HX8353_MD3x.cpp +++ b/platform/drivers/display/HX8353_MD3x.cpp @@ -16,12 +16,12 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include -#include +#include "peripherals/gpio.h" +#include "interfaces/display.h" +#include "interfaces/delays.h" +#include "interfaces/platform.h" +#include "drivers/backlight/backlight.h" +#include "hwconfig.h" #include #include #include diff --git a/platform/drivers/display/SH1106_ttwrplus.c b/platform/drivers/display/SH1106_ttwrplus.c index 68ef09c5..3a3836ad 100644 --- a/platform/drivers/display/SH1106_ttwrplus.c +++ b/platform/drivers/display/SH1106_ttwrplus.c @@ -19,10 +19,10 @@ ***************************************************************************/ #include -#include +#include "interfaces/display.h" #include #include -#include +#include "hwconfig.h" #include // Display is monochromatic, one bit per pixel diff --git a/platform/drivers/display/SH110x_Mod17.c b/platform/drivers/display/SH110x_Mod17.c index f23c09d5..96432844 100644 --- a/platform/drivers/display/SH110x_Mod17.c +++ b/platform/drivers/display/SH110x_Mod17.c @@ -23,10 +23,10 @@ #include #include #include -#include -#include -#include -#include +#include "peripherals/gpio.h" +#include "interfaces/delays.h" +#include "hwconfig.h" +#include "drivers/SPI/spi_stm32.h" #include "SH110x_Mod17.h" extern const struct spiDevice spi2; diff --git a/platform/drivers/display/SSD1306_Mod17.c b/platform/drivers/display/SSD1306_Mod17.c index dfbd5d9b..e5211aa6 100644 --- a/platform/drivers/display/SSD1306_Mod17.c +++ b/platform/drivers/display/SSD1306_Mod17.c @@ -23,11 +23,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include "peripherals/gpio.h" +#include "interfaces/display.h" +#include "interfaces/delays.h" +#include "hwconfig.h" +#include "drivers/SPI/spi_stm32.h" extern const struct spiDevice spi2; diff --git a/platform/drivers/display/SSD1309_Mod17.c b/platform/drivers/display/SSD1309_Mod17.c index 8b6c839b..a379c3a6 100644 --- a/platform/drivers/display/SSD1309_Mod17.c +++ b/platform/drivers/display/SSD1309_Mod17.c @@ -23,10 +23,10 @@ #include #include #include -#include -#include -#include -#include +#include "peripherals/gpio.h" +#include "interfaces/delays.h" +#include "hwconfig.h" +#include "drivers/SPI/spi_stm32.h" #include "SSD1309_Mod17.h" extern const struct spiDevice spi2; diff --git a/platform/drivers/display/ST7567_MD9600.c b/platform/drivers/display/ST7567_MD9600.c index 9bb40e49..50e21fb9 100644 --- a/platform/drivers/display/ST7567_MD9600.c +++ b/platform/drivers/display/ST7567_MD9600.c @@ -22,10 +22,10 @@ #include #include #include -#include -#include -#include -#include +#include "peripherals/gpio.h" +#include "peripherals/spi.h" +#include "interfaces/display.h" +#include "interfaces/delays.h" #include "hwconfig.h" diff --git a/platform/drivers/display/ST7735R_CS7000.c b/platform/drivers/display/ST7735R_CS7000.c index 378e908a..7d1ada97 100644 --- a/platform/drivers/display/ST7735R_CS7000.c +++ b/platform/drivers/display/ST7735R_CS7000.c @@ -15,12 +15,12 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include -#include +#include "peripherals/gpio.h" +#include "interfaces/display.h" +#include "interfaces/delays.h" +#include "interfaces/platform.h" +#include "drivers/backlight/backlight.h" +#include "hwconfig.h" #include enum ST775RCmd diff --git a/platform/drivers/display/UC1701_GDx.c b/platform/drivers/display/UC1701_GDx.c index 937d68ac..7fbbdeac 100644 --- a/platform/drivers/display/UC1701_GDx.c +++ b/platform/drivers/display/UC1701_GDx.c @@ -22,11 +22,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include "drivers/backlight/backlight.h" +#include "peripherals/gpio.h" +#include "interfaces/display.h" +#include "interfaces/delays.h" +#include "hwconfig.h" /** * \internal diff --git a/platform/drivers/display/display_Mod17.c b/platform/drivers/display/display_Mod17.c index a7e3da9f..40fca936 100644 --- a/platform/drivers/display/display_Mod17.c +++ b/platform/drivers/display/display_Mod17.c @@ -19,10 +19,10 @@ #include #include #include -#include -#include -#include -#include +#include "peripherals/gpio.h" +#include "hwconfig.h" +#include "interfaces/platform.h" +#include "drivers/SPI/spi_stm32.h" #include "SH110x_Mod17.h" #include "SSD1309_Mod17.h" diff --git a/platform/drivers/display/display_libSDL.c b/platform/drivers/display/display_libSDL.c index 3abc4156..0e7ff707 100644 --- a/platform/drivers/display/display_libSDL.c +++ b/platform/drivers/display/display_libSDL.c @@ -25,12 +25,12 @@ * this driver. */ -#include -#include -#include +#include "interfaces/display.h" +#include "emulator/sdl_engine.h" +#include "core/chan.h" #include #include -#include +#include "SDL2/SDL.h" static bool inProgress; /* Flag to signal when rendering is in progress */ diff --git a/platform/drivers/keyboard/cap1206.h b/platform/drivers/keyboard/cap1206.h index c870de55..78ab0419 100644 --- a/platform/drivers/keyboard/cap1206.h +++ b/platform/drivers/keyboard/cap1206.h @@ -18,7 +18,7 @@ #ifndef CAP1206_H #define CAP1206_H -#include +#include "peripherals/i2c.h" #include #ifdef __cplusplus diff --git a/platform/drivers/keyboard/keyboard_CS7000.c b/platform/drivers/keyboard/keyboard_CS7000.c index bbb6a2aa..455a5ac9 100644 --- a/platform/drivers/keyboard/keyboard_CS7000.c +++ b/platform/drivers/keyboard/keyboard_CS7000.c @@ -16,11 +16,11 @@ ***************************************************************************/ #include -#include -#include -#include -#include -#include +#include "peripherals/gpio.h" +#include "interfaces/delays.h" +#include "interfaces/keyboard.h" +#include "interfaces/platform.h" +#include "hwconfig.h" /* diff --git a/platform/drivers/keyboard/keyboard_DM1701.c b/platform/drivers/keyboard/keyboard_DM1701.c index 638507e6..e0d0165f 100644 --- a/platform/drivers/keyboard/keyboard_DM1701.c +++ b/platform/drivers/keyboard/keyboard_DM1701.c @@ -21,10 +21,10 @@ #include #include -#include -#include -#include -#include +#include "peripherals/gpio.h" +#include "interfaces/delays.h" +#include "interfaces/keyboard.h" +#include "interfaces/platform.h" #include "hwconfig.h" static int8_t old_pos = 0; diff --git a/platform/drivers/keyboard/keyboard_GDx.c b/platform/drivers/keyboard/keyboard_GDx.c index 3dab7729..3c745e35 100644 --- a/platform/drivers/keyboard/keyboard_GDx.c +++ b/platform/drivers/keyboard/keyboard_GDx.c @@ -18,9 +18,9 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include +#include "peripherals/gpio.h" +#include "interfaces/delays.h" +#include "interfaces/keyboard.h" #include "hwconfig.h" void kbd_init() diff --git a/platform/drivers/keyboard/keyboard_MD3x.c b/platform/drivers/keyboard/keyboard_MD3x.c index 7e77c644..e0629d7e 100644 --- a/platform/drivers/keyboard/keyboard_MD3x.c +++ b/platform/drivers/keyboard/keyboard_MD3x.c @@ -20,10 +20,10 @@ #include #include -#include -#include -#include -#include +#include "peripherals/gpio.h" +#include "interfaces/delays.h" +#include "interfaces/keyboard.h" +#include "interfaces/platform.h" #include "hwconfig.h" static int8_t old_pos = 0; diff --git a/platform/drivers/keyboard/keyboard_MD9600.c b/platform/drivers/keyboard/keyboard_MD9600.c index cac717e5..b2ca1574 100644 --- a/platform/drivers/keyboard/keyboard_MD9600.c +++ b/platform/drivers/keyboard/keyboard_MD9600.c @@ -22,11 +22,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include "peripherals/gpio.h" +#include "interfaces/delays.h" +#include "interfaces/keyboard.h" +#include "interfaces/platform.h" +#include "drivers/ADC/adc_stm32.h" #include "hwconfig.h" /** diff --git a/platform/drivers/keyboard/keyboard_Mod17.c b/platform/drivers/keyboard/keyboard_Mod17.c index 2aa4411b..1535139d 100644 --- a/platform/drivers/keyboard/keyboard_Mod17.c +++ b/platform/drivers/keyboard/keyboard_Mod17.c @@ -20,12 +20,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include "peripherals/gpio.h" +#include "interfaces/delays.h" +#include "interfaces/keyboard.h" +#include "interfaces/platform.h" +#include "hwconfig.h" +#include "i2c_stm32.h" #include "cap1206.h" diff --git a/platform/drivers/keyboard/keyboard_linux.c b/platform/drivers/keyboard/keyboard_linux.c index 56d11966..15d0fdeb 100644 --- a/platform/drivers/keyboard/keyboard_linux.c +++ b/platform/drivers/keyboard/keyboard_linux.c @@ -20,9 +20,9 @@ #include #include -#include -#include -#include +#include "interfaces/keyboard.h" +#include "emulator/sdl_engine.h" +#include "emulator/emulator.h" void kbd_init() { diff --git a/platform/drivers/keyboard/keyboard_ttwrplus.c b/platform/drivers/keyboard/keyboard_ttwrplus.c index 1403a595..53c5c55b 100644 --- a/platform/drivers/keyboard/keyboard_ttwrplus.c +++ b/platform/drivers/keyboard/keyboard_ttwrplus.c @@ -19,10 +19,10 @@ ***************************************************************************/ #include -#include -#include -#include -#include +#include "interfaces/keyboard.h" +#include "interfaces/platform.h" +#include "hwconfig.h" +#include "pmu.h" static const struct device *const buttons_dev = DEVICE_DT_GET(DT_NODELABEL(buttons)); diff --git a/platform/drivers/stubs/audio_stub.c b/platform/drivers/stubs/audio_stub.c index 9a32cda6..fc55ae22 100644 --- a/platform/drivers/stubs/audio_stub.c +++ b/platform/drivers/stubs/audio_stub.c @@ -18,7 +18,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "interfaces/audio.h" const struct audioDevice outputDevices[] = { diff --git a/platform/drivers/stubs/cps_io_stub.c b/platform/drivers/stubs/cps_io_stub.c index 2b957700..b38f5b47 100644 --- a/platform/drivers/stubs/cps_io_stub.c +++ b/platform/drivers/stubs/cps_io_stub.c @@ -18,7 +18,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "interfaces/cps_io.h" int cps_open(char *cps_name) diff --git a/platform/drivers/stubs/display_stub.c b/platform/drivers/stubs/display_stub.c index f0ffca40..1d197c03 100644 --- a/platform/drivers/stubs/display_stub.c +++ b/platform/drivers/stubs/display_stub.c @@ -18,8 +18,8 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include +#include "interfaces/display.h" +#include "hwconfig.h" #include diff --git a/platform/drivers/stubs/inputStream_stub.c b/platform/drivers/stubs/inputStream_stub.c index 918c1351..6295144e 100644 --- a/platform/drivers/stubs/inputStream_stub.c +++ b/platform/drivers/stubs/inputStream_stub.c @@ -18,7 +18,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "interfaces/audio_stream.h" streamId inputStream_start(const enum AudioSource source, const enum AudioPriority prio, diff --git a/platform/drivers/stubs/keyboard_stub.c b/platform/drivers/stubs/keyboard_stub.c index 2182e2f2..9286ab11 100644 --- a/platform/drivers/stubs/keyboard_stub.c +++ b/platform/drivers/stubs/keyboard_stub.c @@ -18,7 +18,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "interfaces/keyboard.h" void kbd_init() { diff --git a/platform/drivers/stubs/nvmem_stub.c b/platform/drivers/stubs/nvmem_stub.c index a7a95f92..d886e771 100644 --- a/platform/drivers/stubs/nvmem_stub.c +++ b/platform/drivers/stubs/nvmem_stub.c @@ -18,7 +18,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "interfaces/nvmem.h" void nvm_init() diff --git a/platform/drivers/stubs/outputStream_stub.c b/platform/drivers/stubs/outputStream_stub.c index 947fbf8b..05af566f 100644 --- a/platform/drivers/stubs/outputStream_stub.c +++ b/platform/drivers/stubs/outputStream_stub.c @@ -18,7 +18,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "interfaces/audio_stream.h" streamId outputStream_start(const enum AudioSink destination, const enum AudioPriority prio, diff --git a/platform/drivers/stubs/radio_stub.c b/platform/drivers/stubs/radio_stub.c index 401a3ea0..19d8b19a 100644 --- a/platform/drivers/stubs/radio_stub.c +++ b/platform/drivers/stubs/radio_stub.c @@ -18,7 +18,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "interfaces/radio.h" void radio_init(const rtxStatus_t *rtxState) diff --git a/platform/drivers/tones/toneGenerator_MDx.cpp b/platform/drivers/tones/toneGenerator_MDx.cpp index 8a111bd7..d4f30091 100644 --- a/platform/drivers/tones/toneGenerator_MDx.cpp +++ b/platform/drivers/tones/toneGenerator_MDx.cpp @@ -20,8 +20,8 @@ #include "toneGenerator_MDx.h" #include -#include -#include +#include "hwconfig.h" +#include "peripherals/gpio.h" #include using namespace miosix; diff --git a/platform/mcu/CMSIS/Include/core_cmFunc.h b/platform/mcu/CMSIS/Include/core_cmFunc.h index ca319a55..99176a10 100644 --- a/platform/mcu/CMSIS/Include/core_cmFunc.h +++ b/platform/mcu/CMSIS/Include/core_cmFunc.h @@ -62,11 +62,11 @@ /*------------------ ICC Compiler ----------------------*/ #elif defined ( __ICCARM__ ) - #include + #include "cmsis_iar.h" /*------------------ TI CCS Compiler -------------------*/ #elif defined ( __TMS470__ ) - #include + #include "cmsis_ccs.h" /*------------------ TASKING Compiler ------------------*/ #elif defined ( __TASKING__ ) @@ -78,7 +78,7 @@ /*------------------ COSMIC Compiler -------------------*/ #elif defined ( __CSMC__ ) - #include + #include "cmsis_csm.h" #endif diff --git a/platform/mcu/CMSIS/Include/core_cmInstr.h b/platform/mcu/CMSIS/Include/core_cmInstr.h index a0a50645..c2407233 100644 --- a/platform/mcu/CMSIS/Include/core_cmInstr.h +++ b/platform/mcu/CMSIS/Include/core_cmInstr.h @@ -62,11 +62,11 @@ /*------------------ ICC Compiler ----------------------*/ #elif defined ( __ICCARM__ ) - #include + #include "cmsis_iar.h" /*------------------ TI CCS Compiler -------------------*/ #elif defined ( __TMS470__ ) - #include + #include "cmsis_ccs.h" /*------------------ TASKING Compiler ------------------*/ #elif defined ( __TASKING__ ) @@ -78,7 +78,7 @@ /*------------------ COSMIC Compiler -------------------*/ #elif defined ( __CSMC__ ) - #include + #include "cmsis_csm.h" #endif diff --git a/platform/mcu/CMSIS/Include/core_cmSimd.h b/platform/mcu/CMSIS/Include/core_cmSimd.h index 4d76bf90..f4968734 100644 --- a/platform/mcu/CMSIS/Include/core_cmSimd.h +++ b/platform/mcu/CMSIS/Include/core_cmSimd.h @@ -66,11 +66,11 @@ /*------------------ ICC Compiler ----------------------*/ #elif defined ( __ICCARM__ ) - #include + #include "cmsis_iar.h" /*------------------ TI CCS Compiler -------------------*/ #elif defined ( __TMS470__ ) - #include + #include "cmsis_ccs.h" /*------------------ TASKING Compiler ------------------*/ #elif defined ( __TASKING__ ) @@ -82,7 +82,7 @@ /*------------------ COSMIC Compiler -------------------*/ #elif defined ( __CSMC__ ) - #include + #include "cmsis_csm.h" #endif diff --git a/platform/mcu/ESP32S3/drivers/delays.c b/platform/mcu/ESP32S3/drivers/delays.c index f41aa194..276816ac 100644 --- a/platform/mcu/ESP32S3/drivers/delays.c +++ b/platform/mcu/ESP32S3/drivers/delays.c @@ -15,7 +15,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "interfaces/delays.h" #include #include diff --git a/platform/mcu/MK22FN512xxx12/boot/bsp.cpp b/platform/mcu/MK22FN512xxx12/boot/bsp.cpp index 2c48a331..941e6522 100644 --- a/platform/mcu/MK22FN512xxx12/boot/bsp.cpp +++ b/platform/mcu/MK22FN512xxx12/boot/bsp.cpp @@ -24,12 +24,12 @@ * Board support package, this file initializes hardware. ************************************************************************/ -#include +#include "interfaces/bsp.h" #include #include -#include +#include "hwconfig.h" -#include +#include "peripherals/gpio.h" namespace miosix { diff --git a/platform/mcu/MK22FN512xxx12/boot/libc_integration.cpp b/platform/mcu/MK22FN512xxx12/boot/libc_integration.cpp index e64bf4ac..2c205041 100644 --- a/platform/mcu/MK22FN512xxx12/boot/libc_integration.cpp +++ b/platform/mcu/MK22FN512xxx12/boot/libc_integration.cpp @@ -17,8 +17,8 @@ #include #include -#include -#include +#include "drivers/USB/usb_vcom.h" +#include "filesystem/file_access.h" using namespace std; diff --git a/platform/mcu/MK22FN512xxx12/drivers/I2C0.c b/platform/mcu/MK22FN512xxx12/drivers/I2C0.c index 8e724f3f..b91df707 100644 --- a/platform/mcu/MK22FN512xxx12/drivers/I2C0.c +++ b/platform/mcu/MK22FN512xxx12/drivers/I2C0.c @@ -20,7 +20,7 @@ #include "I2C0.h" #include -#include +#include "MK22F51212.h" pthread_mutex_t mutex; diff --git a/platform/mcu/MK22FN512xxx12/drivers/delays.cpp b/platform/mcu/MK22FN512xxx12/drivers/delays.cpp index 77b77e69..a5eb11d4 100644 --- a/platform/mcu/MK22FN512xxx12/drivers/delays.cpp +++ b/platform/mcu/MK22FN512xxx12/drivers/delays.cpp @@ -16,7 +16,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "interfaces/delays.h" #include /** diff --git a/platform/mcu/MK22FN512xxx12/drivers/rng.c b/platform/mcu/MK22FN512xxx12/drivers/rng.c index 3bffb661..f2de52f7 100644 --- a/platform/mcu/MK22FN512xxx12/drivers/rng.c +++ b/platform/mcu/MK22FN512xxx12/drivers/rng.c @@ -18,8 +18,8 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include +#include "peripherals/rng.h" +#include "MK22F51212.h" void rng_init() { diff --git a/platform/mcu/MK22FN512xxx12/drivers/usb_vcom.c b/platform/mcu/MK22FN512xxx12/drivers/usb_vcom.c index 8512c61e..93f4c4e5 100644 --- a/platform/mcu/MK22FN512xxx12/drivers/usb_vcom.c +++ b/platform/mcu/MK22FN512xxx12/drivers/usb_vcom.c @@ -28,11 +28,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "peripherals/gpio.h" #include #include #include -#include +#include "MK22F51212.h" #include "usb/usb.h" #include "usb_vcom.h" diff --git a/platform/mcu/STM32F4xx/boot/bsp.cpp b/platform/mcu/STM32F4xx/boot/bsp.cpp index 1e412f7c..229aa241 100644 --- a/platform/mcu/STM32F4xx/boot/bsp.cpp +++ b/platform/mcu/STM32F4xx/boot/bsp.cpp @@ -24,10 +24,10 @@ * Board support package, this file initializes hardware. ************************************************************************/ -#include +#include "interfaces/bsp.h" #include #include -#include +#include "hwconfig.h" #include "../drivers/usb_vcom.h" #include "../drivers/USART3.h" diff --git a/platform/mcu/STM32F4xx/drivers/DmaStream.hpp b/platform/mcu/STM32F4xx/drivers/DmaStream.hpp index 164acb59..3d90a590 100644 --- a/platform/mcu/STM32F4xx/drivers/DmaStream.hpp +++ b/platform/mcu/STM32F4xx/drivers/DmaStream.hpp @@ -22,7 +22,7 @@ #define DMA_STREAM_H #include -#include +#include "stm32f4xx.h" #include /** diff --git a/platform/mcu/STM32F4xx/drivers/Timer.hpp b/platform/mcu/STM32F4xx/drivers/Timer.hpp index 09f2ff6f..0c5e04f7 100644 --- a/platform/mcu/STM32F4xx/drivers/Timer.hpp +++ b/platform/mcu/STM32F4xx/drivers/Timer.hpp @@ -21,7 +21,7 @@ #ifndef TIMER_H #define TIMER_H -#include +#include "stm32f4xx.h" /** * Handler class for STM32F4 Timer peripheral. diff --git a/platform/mcu/STM32F4xx/drivers/USART3.cpp b/platform/mcu/STM32F4xx/drivers/USART3.cpp index 6408b3db..7b9ee1bb 100644 --- a/platform/mcu/STM32F4xx/drivers/USART3.cpp +++ b/platform/mcu/STM32F4xx/drivers/USART3.cpp @@ -22,7 +22,7 @@ ***************************************************************************/ #include -#include +#include "peripherals/gpio.h" #include #include #include "USART3.h" diff --git a/platform/mcu/STM32F4xx/drivers/delays.cpp b/platform/mcu/STM32F4xx/drivers/delays.cpp index 50a79e66..096cfa44 100644 --- a/platform/mcu/STM32F4xx/drivers/delays.cpp +++ b/platform/mcu/STM32F4xx/drivers/delays.cpp @@ -16,7 +16,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "interfaces/delays.h" #include /** diff --git a/platform/mcu/STM32F4xx/drivers/flash.c b/platform/mcu/STM32F4xx/drivers/flash.c index 9109c755..37c8d2c4 100644 --- a/platform/mcu/STM32F4xx/drivers/flash.c +++ b/platform/mcu/STM32F4xx/drivers/flash.c @@ -18,7 +18,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "stm32f4xx.h" #include #include "flash.h" diff --git a/platform/mcu/STM32F4xx/drivers/i2c_stm32.c b/platform/mcu/STM32F4xx/drivers/i2c_stm32.c index fd5271e5..ba9612bd 100644 --- a/platform/mcu/STM32F4xx/drivers/i2c_stm32.c +++ b/platform/mcu/STM32F4xx/drivers/i2c_stm32.c @@ -19,7 +19,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "stm32f4xx.h" #include #include #include "i2c_stm32.h" diff --git a/platform/mcu/STM32F4xx/drivers/i2c_stm32.h b/platform/mcu/STM32F4xx/drivers/i2c_stm32.h index 338abaae..0db7fa4d 100644 --- a/platform/mcu/STM32F4xx/drivers/i2c_stm32.h +++ b/platform/mcu/STM32F4xx/drivers/i2c_stm32.h @@ -22,7 +22,7 @@ #ifndef I2C_STM32_H #define I2C_STM32_H -#include +#include "peripherals/i2c.h" /** * Device driver API for STM32 I2C peripheral. diff --git a/platform/mcu/STM32F4xx/drivers/rcc.c b/platform/mcu/STM32F4xx/drivers/rcc.c index e33009a0..3c9443c0 100644 --- a/platform/mcu/STM32F4xx/drivers/rcc.c +++ b/platform/mcu/STM32F4xx/drivers/rcc.c @@ -19,7 +19,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "stm32f4xx.h" #include #include "rcc.h" diff --git a/platform/mcu/STM32F4xx/drivers/rcc.h b/platform/mcu/STM32F4xx/drivers/rcc.h index 1d2d46d0..d56a0c37 100644 --- a/platform/mcu/STM32F4xx/drivers/rcc.h +++ b/platform/mcu/STM32F4xx/drivers/rcc.h @@ -22,7 +22,7 @@ #ifndef RCC_H #define RCC_H -#include +#include "hwconfig.h" #include #ifdef __cplusplus diff --git a/platform/mcu/STM32F4xx/drivers/rng.c b/platform/mcu/STM32F4xx/drivers/rng.c index 502a49c2..837789d1 100644 --- a/platform/mcu/STM32F4xx/drivers/rng.c +++ b/platform/mcu/STM32F4xx/drivers/rng.c @@ -18,9 +18,9 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include +#include "interfaces/delays.h" +#include "peripherals/rng.h" +#include "stm32f4xx.h" #include static uint32_t oldValue = 0; diff --git a/platform/mcu/STM32F4xx/drivers/rtc.c b/platform/mcu/STM32F4xx/drivers/rtc.c index 6ec5e62e..db34ca48 100644 --- a/platform/mcu/STM32F4xx/drivers/rtc.c +++ b/platform/mcu/STM32F4xx/drivers/rtc.c @@ -17,8 +17,8 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include +#include "peripherals/rtc.h" +#include "stm32f4xx.h" void rtc_init() { diff --git a/platform/mcu/STM32F4xx/drivers/timers.h b/platform/mcu/STM32F4xx/drivers/timers.h index 928bd004..e5f9d6ee 100644 --- a/platform/mcu/STM32F4xx/drivers/timers.h +++ b/platform/mcu/STM32F4xx/drivers/timers.h @@ -22,7 +22,7 @@ #define TIMERS_H #include -#include +#include "stm32f4xx.h" #ifdef __cplusplus extern "C" { diff --git a/platform/mcu/STM32F4xx/drivers/usb/usb_bsp.c b/platform/mcu/STM32F4xx/drivers/usb/usb_bsp.c index 40076176..d21f173f 100644 --- a/platform/mcu/STM32F4xx/drivers/usb/usb_bsp.c +++ b/platform/mcu/STM32F4xx/drivers/usb/usb_bsp.c @@ -30,8 +30,8 @@ #include "usb_bsp.h" #include "usbd_conf.h" #include "stm32f4xx.h" -#include -#include +#include "peripherals/gpio.h" +#include "interfaces/delays.h" extern USB_OTG_CORE_HANDLE USB_OTG_dev; extern uint32_t USBD_OTG_ISR_Handler(USB_OTG_CORE_HANDLE *pdev); diff --git a/platform/mcu/STM32F4xx/drivers/usb_vcom.c b/platform/mcu/STM32F4xx/drivers/usb_vcom.c index d3db6aa5..a60ff8b3 100644 --- a/platform/mcu/STM32F4xx/drivers/usb_vcom.c +++ b/platform/mcu/STM32F4xx/drivers/usb_vcom.c @@ -26,7 +26,7 @@ #include "usbd_req.h" #include "stm32f4xx.h" -#include +#include "interfaces/delays.h" #include "usb_vcom.h" /* Common USB OTG handle, also defined as 'extern' in other modules */ diff --git a/platform/mcu/STM32H7xx/boot/bsp.cpp b/platform/mcu/STM32H7xx/boot/bsp.cpp index 9a0d9692..db31d33a 100644 --- a/platform/mcu/STM32H7xx/boot/bsp.cpp +++ b/platform/mcu/STM32H7xx/boot/bsp.cpp @@ -21,7 +21,7 @@ * Board support package, this file initializes hardware. ************************************************************************/ -#include +#include "interfaces/bsp.h" #include #include #include "stm32h743xx.h" diff --git a/platform/mcu/STM32H7xx/drivers/DmaStream.hpp b/platform/mcu/STM32H7xx/drivers/DmaStream.hpp index 9b930c7a..7e163026 100644 --- a/platform/mcu/STM32H7xx/drivers/DmaStream.hpp +++ b/platform/mcu/STM32H7xx/drivers/DmaStream.hpp @@ -22,7 +22,7 @@ #define DMA_STREAM_H #include -#include +#include "stm32h7xx.h" #include /** diff --git a/platform/mcu/STM32H7xx/drivers/delays.cpp b/platform/mcu/STM32H7xx/drivers/delays.cpp index 02bb7354..8118ab1a 100644 --- a/platform/mcu/STM32H7xx/drivers/delays.cpp +++ b/platform/mcu/STM32H7xx/drivers/delays.cpp @@ -16,7 +16,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "interfaces/delays.h" #include void delayMs(unsigned int mseconds) diff --git a/platform/mcu/STM32H7xx/drivers/rcc.cpp b/platform/mcu/STM32H7xx/drivers/rcc.cpp index 41d729be..e4bf2eed 100644 --- a/platform/mcu/STM32H7xx/drivers/rcc.cpp +++ b/platform/mcu/STM32H7xx/drivers/rcc.cpp @@ -26,7 +26,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "stm32h7xx.h" #include "rcc.h" /** diff --git a/platform/mcu/x86_64/drivers/delays.c b/platform/mcu/x86_64/drivers/delays.c index 5b8d4cfe..67b7db78 100644 --- a/platform/mcu/x86_64/drivers/delays.c +++ b/platform/mcu/x86_64/drivers/delays.c @@ -15,7 +15,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "interfaces/delays.h" #include #include #include diff --git a/platform/mcu/x86_64/drivers/rng.cpp b/platform/mcu/x86_64/drivers/rng.cpp index 4138de62..abb60359 100644 --- a/platform/mcu/x86_64/drivers/rng.cpp +++ b/platform/mcu/x86_64/drivers/rng.cpp @@ -18,7 +18,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include +#include "peripherals/rng.h" #include #include diff --git a/platform/targets/CS7000-PLUS/hwconfig.c b/platform/targets/CS7000-PLUS/hwconfig.c index 7cc37117..28a08a82 100644 --- a/platform/targets/CS7000-PLUS/hwconfig.c +++ b/platform/targets/CS7000-PLUS/hwconfig.c @@ -15,17 +15,17 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include +#include "drivers/GPIO/gpio_shiftReg.h" +#include "drivers/SPI/spi_bitbang.h" +#include "drivers/SPI/spi_custom.h" +#include "drivers/SPI/spi_stm32.h" +#include "drivers/ADC/adc_stm32.h" +#include "drivers/GPS/gps_stm32.h" +#include "hwconfig.h" #include -#include -#include -#include +#include "drivers/baseband/SKY72310.h" +#include "drivers/baseband/AK2365A.h" +#include "core/gps.h" /** * SPI bitbang function for SN74HC595 gpio extender. diff --git a/platform/targets/CS7000-PLUS/hwconfig.h b/platform/targets/CS7000-PLUS/hwconfig.h index 8b2a1399..698c0e07 100644 --- a/platform/targets/CS7000-PLUS/hwconfig.h +++ b/platform/targets/CS7000-PLUS/hwconfig.h @@ -18,13 +18,13 @@ #ifndef HWCONFIG_H #define HWCONFIG_H -#include +#include "stm32h7xx.h" #include "pinmap.h" #ifdef __cplusplus // Export the HR_C6000 driver only for C++ sources -#include +#include "drivers/baseband/HR_C6000.h" extern HR_C6000 C6000; diff --git a/platform/targets/CS7000-PLUS/pinmap.h b/platform/targets/CS7000-PLUS/pinmap.h index d94cc5de..b5c2ea81 100644 --- a/platform/targets/CS7000-PLUS/pinmap.h +++ b/platform/targets/CS7000-PLUS/pinmap.h @@ -18,7 +18,7 @@ #ifndef PINMAP_H #define PINMAP_H -#include +#include "stm32h7xx.h" /* Power control */ #define BAT_DETECT GPIOB,2 diff --git a/platform/targets/CS7000-PLUS/platform.c b/platform/targets/CS7000-PLUS/platform.c index 38813b99..be5ca254 100644 --- a/platform/targets/CS7000-PLUS/platform.c +++ b/platform/targets/CS7000-PLUS/platform.c @@ -15,18 +15,18 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "interfaces/platform.h" +#include "peripherals/gpio.h" +#include "interfaces/nvmem.h" +#include "interfaces/audio.h" +#include "drivers/GPIO/gpio_shiftReg.h" +#include "drivers/SPI/spi_bitbang.h" +#include "drivers/ADC/adc_stm32.h" +#include "drivers/GPS/gps_stm32.h" +#include "drivers/audio/Cx000_dac.h" +#include "hwconfig.h" #include -#include +#include "core/gps.h" static const hwInfo_t hwInfo = { diff --git a/platform/targets/CS7000/hwconfig.c b/platform/targets/CS7000/hwconfig.c index 43c24117..90595d03 100644 --- a/platform/targets/CS7000/hwconfig.c +++ b/platform/targets/CS7000/hwconfig.c @@ -15,17 +15,17 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include +#include "drivers/GPIO/gpio_shiftReg.h" +#include "drivers/SPI/spi_bitbang.h" +#include "drivers/SPI/spi_custom.h" +#include "drivers/ADC/adc_stm32.h" +#include "drivers/SPI/spi_stm32.h" +#include "drivers/GPS/gps_stm32.h" +#include "drivers/baseband/SKY72310.h" +#include "hwconfig.h" #include -#include -#include +#include "drivers/baseband/AK2365A.h" +#include "core/gps.h" static const struct spiConfig spiFlashCfg = { diff --git a/platform/targets/CS7000/hwconfig.h b/platform/targets/CS7000/hwconfig.h index c8cf724c..f743f178 100644 --- a/platform/targets/CS7000/hwconfig.h +++ b/platform/targets/CS7000/hwconfig.h @@ -18,13 +18,13 @@ #ifndef HWCONFIG_H #define HWCONFIG_H -#include +#include "stm32f4xx.h" #include "pinmap.h" #ifdef __cplusplus // Export the HR_C6000 driver only for C++ sources -#include +#include "drivers/baseband/HR_C6000.h" extern HR_C6000 C6000; diff --git a/platform/targets/CS7000/pinmap.h b/platform/targets/CS7000/pinmap.h index 3bad75f3..d1e216aa 100644 --- a/platform/targets/CS7000/pinmap.h +++ b/platform/targets/CS7000/pinmap.h @@ -18,7 +18,7 @@ #ifndef PINMAP_H #define PINMAP_H -#include +#include "stm32f4xx.h" /* Power control */ #define BAT_DETECT GPIOB,2 diff --git a/platform/targets/CS7000/platform.c b/platform/targets/CS7000/platform.c index 32b21716..c660f09d 100644 --- a/platform/targets/CS7000/platform.c +++ b/platform/targets/CS7000/platform.c @@ -15,18 +15,18 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "interfaces/platform.h" +#include "peripherals/gpio.h" +#include "interfaces/nvmem.h" +#include "interfaces/audio.h" +#include "drivers/GPIO/gpio_shiftReg.h" +#include "drivers/SPI/spi_bitbang.h" +#include "drivers/ADC/adc_stm32.h" +#include "drivers/GPS/gps_stm32.h" +#include "drivers/audio/Cx000_dac.h" +#include "hwconfig.h" #include -#include +#include "core/gps.h" static const hwInfo_t hwInfo = { diff --git a/platform/targets/DM-1701/hwconfig.c b/platform/targets/DM-1701/hwconfig.c index a8e145fb..9a511740 100644 --- a/platform/targets/DM-1701/hwconfig.c +++ b/platform/targets/DM-1701/hwconfig.c @@ -18,13 +18,13 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include +#include "drivers/SPI/spi_bitbang.h" +#include "drivers/SPI/spi_custom.h" +#include "hwconfig.h" #include -#include -#include -#include +#include "pinmap.h" +#include "drivers/SPI/spi_stm32.h" +#include "drivers/ADC/adc_stm32.h" static pthread_mutex_t c6000_mutex; static pthread_mutex_t adcMutex; diff --git a/platform/targets/DM-1701/hwconfig.h b/platform/targets/DM-1701/hwconfig.h index cb3f35e9..15df7398 100644 --- a/platform/targets/DM-1701/hwconfig.h +++ b/platform/targets/DM-1701/hwconfig.h @@ -21,13 +21,13 @@ #ifndef HWCONFIG_H #define HWCONFIG_H -#include +#include "stm32f4xx.h" #include "pinmap.h" #ifdef __cplusplus // Export the HR_C6000 driver only for C++ sources -#include +#include "drivers/baseband/HR_C6000.h" extern HR_C6000 C6000; diff --git a/platform/targets/DM-1701/pinmap.h b/platform/targets/DM-1701/pinmap.h index db8bba6a..29d7f05f 100644 --- a/platform/targets/DM-1701/pinmap.h +++ b/platform/targets/DM-1701/pinmap.h @@ -21,7 +21,7 @@ #ifndef PINMAP_H #define PINMAP_H -#include +#include "stm32f4xx.h" /* Power keep switch */ #define PWR_SW GPIOA,7 diff --git a/platform/targets/DM-1701/platform.c b/platform/targets/DM-1701/platform.c index 81615aa2..bc9d5453 100644 --- a/platform/targets/DM-1701/platform.c +++ b/platform/targets/DM-1701/platform.c @@ -18,21 +18,21 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include +#include "interfaces/platform.h" +#include "peripherals/gpio.h" +#include "hwconfig.h" #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "calibration/calibInfo_MDx.h" +#include "interfaces/nvmem.h" +#include "drivers/tones/toneGenerator_MDx.h" +#include "peripherals/rtc.h" +#include "interfaces/audio.h" +#include "drivers/chSelector/chSelector.h" +#include "drivers/ADC/adc_stm32.h" +#include "drivers/audio/Cx000_dac.h" #ifdef ENABLE_BKLIGHT_DIMMING -#include +#include "drivers/backlight/backlight.h" #endif static const hwInfo_t hwInfo = diff --git a/platform/targets/GDx/hwconfig.c b/platform/targets/GDx/hwconfig.c index 732a275a..84171cbb 100644 --- a/platform/targets/GDx/hwconfig.c +++ b/platform/targets/GDx/hwconfig.c @@ -18,10 +18,10 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include +#include "drivers/SPI/spi_bitbang.h" +#include "drivers/SPI/spi_custom.h" +#include "drivers/SPI/spi_mk22.h" +#include "hwconfig.h" static const struct spiConfig spiFlashCfg = { diff --git a/platform/targets/GDx/hwconfig.h b/platform/targets/GDx/hwconfig.h index c1b9ff26..1af42fc8 100644 --- a/platform/targets/GDx/hwconfig.h +++ b/platform/targets/GDx/hwconfig.h @@ -21,7 +21,7 @@ #ifndef HWCONFIG_H #define HWCONFIG_H -#include +#include "MK22F51212.h" #ifdef PLATFORM_GD77 #include "pinmap_GD77.h" diff --git a/platform/targets/GDx/pinmap_DM1801.h b/platform/targets/GDx/pinmap_DM1801.h index e242909d..9c48fdec 100644 --- a/platform/targets/GDx/pinmap_DM1801.h +++ b/platform/targets/GDx/pinmap_DM1801.h @@ -21,7 +21,7 @@ #ifndef PINMAP_H #define PINMAP_H -#include +#include "MK22F51212.h" /* Power keep switch */ #define PWR_SW GPIOE,26 diff --git a/platform/targets/GDx/pinmap_GD77.h b/platform/targets/GDx/pinmap_GD77.h index f7b821a3..ea0ec331 100644 --- a/platform/targets/GDx/pinmap_GD77.h +++ b/platform/targets/GDx/pinmap_GD77.h @@ -21,7 +21,7 @@ #ifndef PINMAP_H #define PINMAP_H -#include +#include "MK22F51212.h" /* Power keep switch */ #define PWR_SW GPIOE,26 diff --git a/platform/targets/GDx/platform.c b/platform/targets/GDx/platform.c index 6e7cca0d..fb1ec27f 100644 --- a/platform/targets/GDx/platform.c +++ b/platform/targets/GDx/platform.c @@ -18,16 +18,16 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include -#include +#include "interfaces/platform.h" +#include "interfaces/nvmem.h" +#include "interfaces/audio.h" +#include "peripherals/gpio.h" +#include "calibration/calibInfo_GDx.h" +#include "drivers/ADC/ADC0_GDx.h" #include -#include +#include "I2C0.h" #include -#include +#include "drivers/backlight/backlight.h" #include "hwconfig.h" pthread_mutex_t adc_mutex; diff --git a/platform/targets/MD-3x0/hwconfig.c b/platform/targets/MD-3x0/hwconfig.c index fdbae249..88e44758 100644 --- a/platform/targets/MD-3x0/hwconfig.c +++ b/platform/targets/MD-3x0/hwconfig.c @@ -18,16 +18,16 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "peripherals/gpio.h" +#include "drivers/SPI/spi_bitbang.h" +#include "drivers/SPI/spi_custom.h" +#include "drivers/SPI/spi_stm32.h" +#include "drivers/ADC/adc_stm32.h" +#include "drivers/GPS/gps_stm32.h" +#include "drivers/baseband/SKY72310.h" +#include "hwconfig.h" +#include "pinmap.h" +#include "core/gps.h" static void gpsEnable(void *priv) { diff --git a/platform/targets/MD-3x0/hwconfig.h b/platform/targets/MD-3x0/hwconfig.h index 4fdf6264..be1267e8 100644 --- a/platform/targets/MD-3x0/hwconfig.h +++ b/platform/targets/MD-3x0/hwconfig.h @@ -20,7 +20,7 @@ #ifndef HWCONFIG_H #define HWCONFIG_H -#include +#include "stm32f4xx.h" #include "pinmap.h" #ifdef __cplusplus diff --git a/platform/targets/MD-3x0/pinmap.h b/platform/targets/MD-3x0/pinmap.h index a535ca58..895988da 100644 --- a/platform/targets/MD-3x0/pinmap.h +++ b/platform/targets/MD-3x0/pinmap.h @@ -21,7 +21,7 @@ #ifndef PINMAP_H #define PINMAP_H -#include +#include "stm32f4xx.h" /* Power keep switch */ #define PWR_SW GPIOA,7 diff --git a/platform/targets/MD-3x0/platform.c b/platform/targets/MD-3x0/platform.c index 93db2054..50656fd3 100644 --- a/platform/targets/MD-3x0/platform.c +++ b/platform/targets/MD-3x0/platform.c @@ -17,19 +17,19 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include +#include "peripherals/gpio.h" +#include "interfaces/nvmem.h" +#include "interfaces/platform.h" +#include "interfaces/delays.h" +#include "hwconfig.h" #include -#include -#include -#include -#include -#include -#include -#include +#include "drivers/ADC/adc_stm32.h" +#include "calibration/calibInfo_MDx.h" +#include "drivers/tones/toneGenerator_MDx.h" +#include "peripherals/rtc.h" +#include "interfaces/audio.h" +#include "drivers/GPS/gps_stm32.h" +#include "core/gps.h" static hwInfo_t hwInfo; diff --git a/platform/targets/MD-9600/hwconfig.c b/platform/targets/MD-9600/hwconfig.c index d48610e7..0ab14ebf 100644 --- a/platform/targets/MD-9600/hwconfig.c +++ b/platform/targets/MD-9600/hwconfig.c @@ -18,13 +18,13 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include +#include "peripherals/gpio.h" +#include "hwconfig.h" +#include "drivers/SPI/spi_stm32.h" +#include "drivers/ADC/adc_stm32.h" +#include "drivers/GPS/gps_stm32.h" #include -#include +#include "core/gps.h" static void gpsEnable(void *priv) { diff --git a/platform/targets/MD-9600/hwconfig.h b/platform/targets/MD-9600/hwconfig.h index 2e8ac3ec..52a78f87 100644 --- a/platform/targets/MD-9600/hwconfig.h +++ b/platform/targets/MD-9600/hwconfig.h @@ -21,7 +21,7 @@ #ifndef HWCONFIG_H #define HWCONFIG_H -#include +#include "stm32f4xx.h" #include "pinmap.h" #ifdef __cplusplus diff --git a/platform/targets/MD-9600/pinmap.h b/platform/targets/MD-9600/pinmap.h index b9f4a1a7..4ab98848 100644 --- a/platform/targets/MD-9600/pinmap.h +++ b/platform/targets/MD-9600/pinmap.h @@ -21,7 +21,7 @@ #ifndef PINMAP_H #define PINMAP_H -#include +#include "stm32f4xx.h" #ifdef __cplusplus extern "C" { diff --git a/platform/targets/MD-9600/platform.c b/platform/targets/MD-9600/platform.c index 6e607faa..d8ea9d7b 100644 --- a/platform/targets/MD-9600/platform.c +++ b/platform/targets/MD-9600/platform.c @@ -18,22 +18,22 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include -#include +#include "peripherals/gpio.h" +#include "interfaces/nvmem.h" +#include "interfaces/platform.h" +#include "interfaces/delays.h" +#include "drivers/backlight/backlight.h" +#include "hwconfig.h" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "drivers/ADC/adc_stm32.h" +#include "calibration/calibInfo_MDx.h" +#include "drivers/tones/toneGenerator_MDx.h" +#include "peripherals/rtc.h" +#include "interfaces/audio.h" +#include "drivers/SPI/spi_stm32.h" +#include "drivers/GPS/gps_stm32.h" +#include "drivers/chSelector/chSelector.h" +#include "core/gps.h" /* TODO: Hardcoded hwInfo until we implement reading from flash */ static const hwInfo_t hwInfo = diff --git a/platform/targets/MD-UV3x0/hwconfig.c b/platform/targets/MD-UV3x0/hwconfig.c index 171607e8..3594fcb6 100644 --- a/platform/targets/MD-UV3x0/hwconfig.c +++ b/platform/targets/MD-UV3x0/hwconfig.c @@ -18,15 +18,15 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include +#include "drivers/SPI/spi_bitbang.h" +#include "drivers/SPI/spi_custom.h" +#include "hwconfig.h" #include -#include -#include -#include -#include -#include +#include "pinmap.h" +#include "drivers/SPI/spi_stm32.h" +#include "drivers/ADC/adc_stm32.h" +#include "drivers/GPS/gps_stm32.h" +#include "core/gps.h" static pthread_mutex_t c6000_mutex; static pthread_mutex_t adcMutex; diff --git a/platform/targets/MD-UV3x0/hwconfig.h b/platform/targets/MD-UV3x0/hwconfig.h index 48e2ab20..ba51db99 100644 --- a/platform/targets/MD-UV3x0/hwconfig.h +++ b/platform/targets/MD-UV3x0/hwconfig.h @@ -20,13 +20,13 @@ #ifndef HWCONFIG_H #define HWCONFIG_H -#include +#include "stm32f4xx.h" #include "pinmap.h" #ifdef __cplusplus // Export the HR_C6000 driver only for C++ sources -#include +#include "drivers/baseband/HR_C6000.h" extern HR_C6000 C6000; diff --git a/platform/targets/MD-UV3x0/pinmap.h b/platform/targets/MD-UV3x0/pinmap.h index 791a101c..27d6152c 100644 --- a/platform/targets/MD-UV3x0/pinmap.h +++ b/platform/targets/MD-UV3x0/pinmap.h @@ -21,7 +21,7 @@ #ifndef PINMAP_H #define PINMAP_H -#include +#include "stm32f4xx.h" /* Power keep switch */ #define PWR_SW GPIOA,7 diff --git a/platform/targets/MD-UV3x0/platform.c b/platform/targets/MD-UV3x0/platform.c index 523ddcac..929405b3 100644 --- a/platform/targets/MD-UV3x0/platform.c +++ b/platform/targets/MD-UV3x0/platform.c @@ -17,24 +17,24 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include +#include "interfaces/platform.h" +#include "interfaces/delays.h" +#include "peripherals/gpio.h" +#include "hwconfig.h" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "drivers/ADC/adc_stm32.h" +#include "calibration/calibInfo_MDx.h" +#include "interfaces/nvmem.h" +#include "drivers/tones/toneGenerator_MDx.h" +#include "peripherals/rtc.h" +#include "interfaces/audio.h" +#include "drivers/chSelector/chSelector.h" +#include "drivers/audio/Cx000_dac.h" +#include "drivers/GPS/gps_stm32.h" +#include "core/gps.h" #ifdef CONFIG_SCREEN_BRIGHTNESS -#include +#include "drivers/backlight/backlight.h" #endif mduv3x0Calib_t calibration; diff --git a/platform/targets/Module17/hwconfig.h b/platform/targets/Module17/hwconfig.h index ef34483f..b07fe8e8 100644 --- a/platform/targets/Module17/hwconfig.h +++ b/platform/targets/Module17/hwconfig.h @@ -22,8 +22,8 @@ #ifndef HWCONFIG_H #define HWCONFIG_H -#include -#include +#include "peripherals/i2c.h" +#include "stm32f4xx.h" #include #include #include "pinmap.h" diff --git a/platform/targets/Module17/pinmap.h b/platform/targets/Module17/pinmap.h index bb8b6878..749b45a0 100644 --- a/platform/targets/Module17/pinmap.h +++ b/platform/targets/Module17/pinmap.h @@ -21,7 +21,7 @@ #ifndef PINMAP_H #define PINMAP_H -#include +#include "stm32f4xx.h" /* Signalling LEDs */ #define PTT_LED GPIOC,8 diff --git a/platform/targets/Module17/platform.c b/platform/targets/Module17/platform.c index 24954c81..11ab350a 100644 --- a/platform/targets/Module17/platform.c +++ b/platform/targets/Module17/platform.c @@ -19,17 +19,17 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "interfaces/platform.h" +#include "interfaces/delays.h" +#include "interfaces/nvmem.h" +#include "interfaces/audio.h" +#include "peripherals/gpio.h" +#include "drivers/i2c_stm32.h" +#include "calibration/calibInfo_Mod17.h" +#include "drivers/ADC/adc_stm32.h" +#include "drivers/backlight/backlight.h" +#include "hwconfig.h" +#include "drivers/baseband/MCP4551.h" #include diff --git a/platform/targets/linux/emulator/emulator.c b/platform/targets/linux/emulator/emulator.c index cb6a6f64..ef78bfc2 100644 --- a/platform/targets/linux/emulator/emulator.c +++ b/platform/targets/linux/emulator/emulator.c @@ -23,10 +23,10 @@ #include #include #include -#include +#include "SDL2/SDL.h" -#include -#include +#include "readline/readline.h" +#include "readline/history.h" #include "emulator.h" #include "sdl_engine.h" diff --git a/platform/targets/linux/emulator/emulator.h b/platform/targets/linux/emulator/emulator.h index 386b3874..916e6210 100644 --- a/platform/targets/linux/emulator/emulator.h +++ b/platform/targets/linux/emulator/emulator.h @@ -20,10 +20,10 @@ #ifndef EMULATOR_H #define EMULATOR_H -#include +#include "interfaces/keyboard.h" #include #include -#include +#include "SDL2/SDL.h" #ifndef CONFIG_SCREEN_WIDTH #define CONFIG_SCREEN_WIDTH 160 diff --git a/platform/targets/linux/emulator/sdl_engine.c b/platform/targets/linux/emulator/sdl_engine.c index 15d6bf7c..864076e2 100644 --- a/platform/targets/linux/emulator/sdl_engine.c +++ b/platform/targets/linux/emulator/sdl_engine.c @@ -17,7 +17,7 @@ #include #include -#include +#include "core/state.h" #include "sdl_engine.h" #include "emulator.h" diff --git a/platform/targets/linux/emulator/sdl_engine.h b/platform/targets/linux/emulator/sdl_engine.h index 7feb0d9d..d4f63cca 100644 --- a/platform/targets/linux/emulator/sdl_engine.h +++ b/platform/targets/linux/emulator/sdl_engine.h @@ -17,10 +17,10 @@ #ifndef SDL_ENGINE_H #define SDL_ENGINE_H -#include -#include +#include "interfaces/keyboard.h" +#include "SDL2/SDL.h" #include -#include +#include "core/chan.h" /* * Screen dimensions, adjust basing on the size of the screen you need to diff --git a/platform/targets/linux/platform.c b/platform/targets/linux/platform.c index 4b6e43f8..01f3f31e 100644 --- a/platform/targets/linux/platform.c +++ b/platform/targets/linux/platform.c @@ -15,11 +15,11 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include +#include "calibration/calibInfo_Mod17.h" +#include "interfaces/platform.h" +#include "interfaces/nvmem.h" #include -#include +#include "core/gps.h" #include "emulator.h" /* diff --git a/platform/targets/ttwrplus/platform.c b/platform/targets/ttwrplus/platform.c index c1901eee..c2896231 100644 --- a/platform/targets/ttwrplus/platform.c +++ b/platform/targets/ttwrplus/platform.c @@ -17,18 +17,18 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include +#include "interfaces/platform.h" +#include "interfaces/delays.h" +#include "drivers/GPS/gps_zephyr.h" +#include "hwconfig.h" +#include "core/gps.h" #include #include #include #include -#include -#include +#include "drivers/baseband/SA8x8.h" +#include "pmu.h" #define BUTTON_PTT_NODE DT_NODELABEL(button_ptt) diff --git a/platform/targets/ttwrplus/pmu.cpp b/platform/targets/ttwrplus/pmu.cpp index 03c00363..5f6205eb 100644 --- a/platform/targets/ttwrplus/pmu.cpp +++ b/platform/targets/ttwrplus/pmu.cpp @@ -19,14 +19,14 @@ #include #include -#include -#include -#include +#include "interfaces/delays.h" +#include "interfaces/keyboard.h" +#include "hwconfig.h" #include "pmu.h" // PMU is controlled through the XPowersLib external library #define XPOWERS_CHIP_AXP2101 -#include +#include "XPowersLib.h" #if DT_NODE_HAS_STATUS(DT_ALIAS(i2c_0), okay) diff --git a/platform/targets/ttwrplus/ttwrplus.dts b/platform/targets/ttwrplus/ttwrplus.dts index eebc90c8..32b61621 100644 --- a/platform/targets/ttwrplus/ttwrplus.dts +++ b/platform/targets/ttwrplus/ttwrplus.dts @@ -5,8 +5,8 @@ #include #include -#include -#include +#include "dt-bindings/pinctrl/esp32s3-pinctrl.h" +#include "dt-bindings/input/input-event-codes.h" #include #include diff --git a/tests/platform/boot_test.c b/tests/platform/boot_test.c index b421fd47..3766353a 100644 --- a/tests/platform/boot_test.c +++ b/tests/platform/boot_test.c @@ -19,8 +19,8 @@ ***************************************************************************/ #include -#include -#include +#include "interfaces/platform.h" +#include "interfaces/delays.h" int main() { diff --git a/tests/platform/calib_read.c b/tests/platform/calib_read.c index 04686dd2..788d3487 100644 --- a/tests/platform/calib_read.c +++ b/tests/platform/calib_read.c @@ -21,12 +21,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include "interfaces/nvmem.h" +#include "interfaces/platform.h" +#include "interfaces/delays.h" +#include "calibration/calibInfo_GDx.h" +#include "core/nvmem_access.h" +#include "core/utils.h" struct md3x0FullCalib { // 0x0000 diff --git a/tests/platform/codec2_encode_test.c b/tests/platform/codec2_encode_test.c index ef0cfa5e..4347f139 100644 --- a/tests/platform/codec2_encode_test.c +++ b/tests/platform/codec2_encode_test.c @@ -18,18 +18,18 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include -#include -#include +#include "core/audio_stream.h" +#include "core/audio_path.h" +#include "interfaces/platform.h" +#include "interfaces/delays.h" +#include "core/memory_profiling.h" +#include "interfaces/audio.h" #include -#include +#include "codec2.h" #include #include #include -#include +#include "core/dsp.h" static const size_t audioBufSize = 320; static const size_t dataBufSize = 2 * 1024; diff --git a/tests/platform/display_test.c b/tests/platform/display_test.c index d5ee6bea..ca8b45f3 100644 --- a/tests/platform/display_test.c +++ b/tests/platform/display_test.c @@ -17,10 +17,10 @@ * along with this program; if not, see * ***************************************************************************/ -#include -#include -#include -#include +#include "core/graphics.h" +#include "interfaces/platform.h" +#include "interfaces/display.h" +#include "interfaces/delays.h" int main() { diff --git a/tests/platform/gimmi_ridimmi.c b/tests/platform/gimmi_ridimmi.c index 05d985cd..a458ee6e 100644 --- a/tests/platform/gimmi_ridimmi.c +++ b/tests/platform/gimmi_ridimmi.c @@ -23,11 +23,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include "interfaces/delays.h" +#include "interfaces/gpio.h" +#include "interfaces/platform.h" +#include "rtx/rtx.h" +#include "hwconfig.h" /* * Uncomment this directive to sample audio coming from RTX stage instead of the diff --git a/tests/platform/gpio_demo.c b/tests/platform/gpio_demo.c index fcf0f3dd..136c63e5 100644 --- a/tests/platform/gpio_demo.c +++ b/tests/platform/gpio_demo.c @@ -20,11 +20,11 @@ #include #include #include -#include -#include -#include +#include "os.h" +#include "interfaces/gpio.h" +#include "interfaces/graphics.h" #include "hwconfig.h" -#include +#include "interfaces/platform.h" void printBits(uint16_t value, point_t pos) { diff --git a/tests/platform/keyboard_test.c b/tests/platform/keyboard_test.c index 56de658e..5a024d69 100644 --- a/tests/platform/keyboard_test.c +++ b/tests/platform/keyboard_test.c @@ -21,12 +21,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include "hwconfig.h" +#include "core/graphics.h" +#include "interfaces/platform.h" +#include "interfaces/keyboard.h" +#include "interfaces/display.h" +#include "interfaces/delays.h" char *keys_list[] = { " ", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", diff --git a/tests/platform/mic_test.c b/tests/platform/mic_test.c index 52050a99..91dceb7d 100644 --- a/tests/platform/mic_test.c +++ b/tests/platform/mic_test.c @@ -21,12 +21,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include "interfaces/delays.h" +#include "interfaces/audio.h" +#include "core/audio_path.h" +#include "core/audio_stream.h" +#include "interfaces/platform.h" +#include "core/dsp.h" int main() { diff --git a/tests/platform/nvm_dump.c b/tests/platform/nvm_dump.c index 818641bb..a6af3f28 100644 --- a/tests/platform/nvm_dump.c +++ b/tests/platform/nvm_dump.c @@ -23,9 +23,9 @@ #include #include #include -#include -#include -#include +#include "core/nvmem_access.h" +#include "interfaces/nvmem.h" +#include "interfaces/delays.h" #define LINE_LENGTH 16 #define CHUNK_SIZE (LINE_LENGTH * 2) diff --git a/tests/platform/platform_test.c b/tests/platform/platform_test.c index 1a7ea3b2..54548818 100644 --- a/tests/platform/platform_test.c +++ b/tests/platform/platform_test.c @@ -20,11 +20,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include "core/graphics.h" +#include "hwconfig.h" +#include "interfaces/platform.h" +#include "interfaces/delays.h" +#include "interfaces/display.h" int main(void) { diff --git a/tests/platform/tonegen.c b/tests/platform/tonegen.c index 0c3be4e5..3b8f1b3a 100644 --- a/tests/platform/tonegen.c +++ b/tests/platform/tonegen.c @@ -19,8 +19,8 @@ #include #include -#include -#include +#include "interfaces/gpio.h" +#include "interfaces/delays.h" #include "toneGenerator_MDx.h" #include "hwconfig.h" diff --git a/tests/unit/M17_demodulator.cpp b/tests/unit/M17_demodulator.cpp index 979b65f3..0fc4c011 100644 --- a/tests/unit/M17_demodulator.cpp +++ b/tests/unit/M17_demodulator.cpp @@ -26,10 +26,10 @@ #include #include #include -#include -#include -#include -#include +#include "protocols/M17/M17DSP.h" +#include "protocols/M17/M17Demodulator.h" +#include "protocols/M17/M17Utils.h" +#include "core/audio_stream.h" using namespace std; diff --git a/tests/unit/M17_golay.cpp b/tests/unit/M17_golay.cpp index c919f891..4f4b4c56 100644 --- a/tests/unit/M17_golay.cpp +++ b/tests/unit/M17_golay.cpp @@ -22,7 +22,7 @@ #include #include #include -#include "M17/M17Golay.hpp" +#include "protocols/M17/M17Golay.hpp" using namespace std; diff --git a/tests/unit/M17_rrc.cpp b/tests/unit/M17_rrc.cpp index b989393d..43a05b54 100644 --- a/tests/unit/M17_rrc.cpp +++ b/tests/unit/M17_rrc.cpp @@ -22,7 +22,7 @@ #include #include #include -#include "M17/M17DSP.hpp" +#include "protocols/M17/M17DSP.hpp" #define IMPULSE_SIZE 4096 diff --git a/tests/unit/M17_viterbi.cpp b/tests/unit/M17_viterbi.cpp index ccd2b94a..38d454fd 100644 --- a/tests/unit/M17_viterbi.cpp +++ b/tests/unit/M17_viterbi.cpp @@ -23,10 +23,10 @@ #include #include #include -#include "M17/M17ConvolutionalEncoder.hpp" -#include "M17/M17CodePuncturing.hpp" -#include "M17/M17Viterbi.hpp" -#include "M17/M17Utils.hpp" +#include "protocols/M17/M17ConvolutionalEncoder.hpp" +#include "protocols/M17/M17CodePuncturing.hpp" +#include "protocols/M17/M17Viterbi.hpp" +#include "protocols/M17/M17Utils.hpp" using namespace std; diff --git a/tests/unit/convert_minmea_coord.c b/tests/unit/convert_minmea_coord.c index 34899cf5..f9b0e17c 100644 --- a/tests/unit/convert_minmea_coord.c +++ b/tests/unit/convert_minmea_coord.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include "core/gps.h" static void assert_conversion(struct minmea_float *f, int32_t expected) { diff --git a/tests/unit/cps.c b/tests/unit/cps.c index bdf4088f..5a4e34ee 100644 --- a/tests/unit/cps.c +++ b/tests/unit/cps.c @@ -1,4 +1,4 @@ -#include +#include "interfaces/cps_io.h" #include #include diff --git a/tests/unit/linux_inputStream_test.cpp b/tests/unit/linux_inputStream_test.cpp index 18604483..f6e4e73d 100644 --- a/tests/unit/linux_inputStream_test.cpp +++ b/tests/unit/linux_inputStream_test.cpp @@ -23,7 +23,7 @@ #include #include -#include "audio_stream.h" +#include "core/audio_stream.h" static const char* files[] = {"MIC.raw", "RTX.raw", "MCU.raw"}; diff --git a/tests/unit/play_sine.c b/tests/unit/play_sine.c index 12e48bc0..484a5ef3 100644 --- a/tests/unit/play_sine.c +++ b/tests/unit/play_sine.c @@ -22,7 +22,7 @@ // Test private methods #define private public -#include +#include "core/audio_stream.h" #include #include diff --git a/tests/unit/ui_check_standby.c b/tests/unit/ui_check_standby.c index 12ac08c9..2365feb0 100644 --- a/tests/unit/ui_check_standby.c +++ b/tests/unit/ui_check_standby.c @@ -1,8 +1,8 @@ #include #include #include -#include -#include +#include "core/state.h" +#include "core/settings.h" extern bool _ui_checkStandby(long long); extern state_t state; diff --git a/tests/unit/voice_prompts.c b/tests/unit/voice_prompts.c index 4441712f..6bb61fcd 100644 --- a/tests/unit/voice_prompts.c +++ b/tests/unit/voice_prompts.c @@ -22,8 +22,8 @@ // Test private methods #define private public -#include -#include +#include "core/state.h" +#include "core/voicePromptUtils.h" /** * Test voice prompts playback