Skip to content

Fix relative includes #870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
balazsracz wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix relative includes #870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a5415d
Fix relative include paths
google-labs-jules[bot] Aug 11, 2025
0492feb
Fix relative include paths
google-labs-jules[bot] Aug 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions applications/blink_raw/targets/freertos.armv7m.ti-launchpad-tm4c129/HwInit.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@
#include "driverlib/interrupt.h"
#include "driverlib/pin_map.h"
#include "os/OS.hxx"
#include "TivaDev.hxx"
#include "TivaEEPROMEmulation.hxx"
#include "freertos_drivers/ti/TivaDev.hxx"
#include "freertos_drivers/ti/TivaEEPROMEmulation.hxx"
#include "hardware.hxx"

#include "FreeRTOSTCP.hxx"
#include "freertos_drivers/net_freertos_tcp/FreeRTOSTCP.hxx"

/** override stdin */
const char *STDIN_DEVICE = "/dev/ser0";
Expand Down
4 changes: 2 additions & 2 deletions applications/bootloader/targets/bare.armv7m.bracz-acc2/BootloaderHal.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#define TARGET_IS_TM4C123_RB1

#include "../boards/ti-tm4c123-generic/BootloaderHal.hxx"
#include "bootloader_hal.h"
#include "openlcb/bootloader_hal.h"
#include "driverlib/rom.h"
#include "driverlib/rom_map.h"
#include "driverlib/gpio.h"
Expand All @@ -14,7 +14,7 @@

#include "nmranet_config.h"
#include "openlcb/Defs.hxx"
#include "TivaGPIO.hxx"
#include "freertos_drivers/ti/TivaGPIO.hxx"

extern "C" {

Expand Down
4 changes: 2 additions & 2 deletions applications/bootloader/targets/bare.armv7m.bracz-acc3/BootloaderHal.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#define TARGET_IS_TM4C123_RB1

#include "../boards/ti-tm4c123-generic/BootloaderHal.hxx"
#include "bootloader_hal.h"
#include "openlcb/bootloader_hal.h"
#include "driverlib/rom.h"
#include "driverlib/rom_map.h"
#include "driverlib/gpio.h"
Expand All @@ -14,7 +14,7 @@

#include "nmranet_config.h"
#include "openlcb/Defs.hxx"
#include "TivaGPIO.hxx"
#include "freertos_drivers/ti/TivaGPIO.hxx"

extern "C" {

Expand Down
4 changes: 2 additions & 2 deletions applications/bootloader/targets/bare.armv7m.bracz-railcom/BootloaderHal.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#define TARGET_IS_TM4C123_RB1

#include "../boards/ti-tm4c123-generic/BootloaderHal.hxx"
#include "bootloader_hal.h"
#include "openlcb/bootloader_hal.h"
#include "driverlib/rom.h"
#include "driverlib/rom_map.h"
#include "driverlib/gpio.h"
Expand All @@ -14,7 +14,7 @@

#include "nmranet_config.h"
#include "openlcb/Defs.hxx"
#include "TivaGPIO.hxx"
#include "freertos_drivers/ti/TivaGPIO.hxx"
#define PINDEFS_ONLY
#include "hardware.hxx"

Expand Down
4 changes: 2 additions & 2 deletions applications/bootloader/targets/bare.armv7m.ek-tm4c123gxl/BootloaderHal.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#define TARGET_IS_TM4C123_RB1

#include "../boards/ti-tm4c123-generic/BootloaderHal.hxx"
#include "bootloader_hal.h"
#include "openlcb/bootloader_hal.h"
#include "driverlib/rom.h"
#include "driverlib/rom_map.h"
#include "driverlib/gpio.h"
Expand All @@ -14,7 +14,7 @@

#include "nmranet_config.h"
#include "openlcb/Defs.hxx"
#include "TivaGPIO.hxx"
#include "freertos_drivers/ti/TivaGPIO.hxx"
#include "openlcb/If.hxx"

//OVERRIDE_CONST(nmranet_can_bitrate, 1000000);
Expand Down
6 changes: 3 additions & 3 deletions applications/can_eth/targets/freertos.armv7m.ek-tm4c1294xl/HwInit.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@
#include "driverlib/interrupt.h"
#include "driverlib/pin_map.h"
#include "os/OS.hxx"
#include "TivaDev.hxx"
#include "TivaEEPROMEmulation.hxx"
#include "freertos_drivers/ti/TivaDev.hxx"
#include "freertos_drivers/ti/TivaEEPROMEmulation.hxx"
#include "hardware.hxx"

#include "FreeRTOSTCP.hxx"
#include "freertos_drivers/net_freertos_tcp/FreeRTOSTCP.hxx"

/** override stdin */
const char *STDIN_DEVICE = "/dev/ser0";
Expand Down
14 changes: 7 additions & 7 deletions applications/dcc_decoder/targets/freertos.armv6m.st-stm32f091rc-nucleo/HwInit.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include <new>
#include <cstdint>

#include "stm32f0xx_hal_conf.h"
#include "freertos_drivers/st/stm32f0xx_hal_conf.h"
#include "stm32f0xx_hal_rcc.h"
#include "stm32f0xx_hal_flash.h"
#include "stm32f0xx_hal_gpio.h"
Expand All @@ -45,12 +45,12 @@
#include "stm32f0xx_hal.h"

#include "os/OS.hxx"
#include "Stm32Uart.hxx"
#include "Stm32Can.hxx"
#include "Stm32EEPROMEmulation.hxx"
#include "Stm32RailcomSender.hxx"
#include "freertos_drivers/st/Stm32Uart.hxx"
#include "freertos_drivers/st/Stm32Can.hxx"
#include "freertos_drivers/st/Stm32EEPROMEmulation.hxx"
#include "freertos_drivers/st/Stm32RailcomSender.hxx"
#include "hardware.hxx"
#include "DummyGPIO.hxx"
#include "freertos_drivers/common/DummyGPIO.hxx"

struct Debug
{
Expand All @@ -60,7 +60,7 @@ struct Debug
typedef DummyPin CapTimerOverflow;
};

#include "Stm32DCCDecoder.hxx"
#include "freertos_drivers/st/Stm32DCCDecoder.hxx"

/** override stdin */
const char *STDIN_DEVICE = "/dev/ser0";
Expand Down
4 changes: 2 additions & 2 deletions applications/dcc_decoder/targets/freertos.armv6m.st-stm32f091rc-nucleo/hardware.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

#include "BlinkerGPIO.hxx"
#include "Stm32Gpio.hxx"
#include "freertos_drivers/common/BlinkerGPIO.hxx"
#include "freertos_drivers/st/Stm32Gpio.hxx"
#include "utils/GpioInitializer.hxx"

GPIO_PIN(LED_GREEN_RAW, LedPin, A, 5);
Expand Down
14 changes: 7 additions & 7 deletions applications/dcc_decoder/targets/freertos.armv7m.ek-tm4c123gxl/HwInit.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@

#include "hardware.hxx"

#include "TivaDev.hxx"
#include "freertos_drivers/ti/TivaDev.hxx"

#include "TivaEEPROMEmulation.hxx"
#include "TivaEEPROMBitSet.hxx"
#include "TivaGPIO.hxx"
#include "DummyGPIO.hxx"
#include "bootloader_hal.h"
#include "freertos_drivers/ti/TivaEEPROMEmulation.hxx"
#include "freertos_drivers/ti/TivaEEPROMBitSet.hxx"
#include "freertos_drivers/ti/TivaGPIO.hxx"
#include "freertos_drivers/common/DummyGPIO.hxx"
#include "openlcb/bootloader_hal.h"

struct Debug
{
Expand All @@ -65,7 +65,7 @@ struct Debug
typedef DummyPin CapTimerOverflow;
};

#include "TivaDCCDecoder.hxx"
#include "freertos_drivers/ti/TivaDCCDecoder.hxx"


/** override stdin */
Expand Down
6 changes: 3 additions & 3 deletions applications/dcc_decoder/targets/freertos.armv7m.ek-tm4c123gxl/hardware.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#ifndef _HARDWARE_HXX_
#define _HARDWARE_HXX_

#include "TivaGPIO.hxx"
#include "DummyGPIO.hxx"
#include "BlinkerGPIO.hxx"
#include "freertos_drivers/ti/TivaGPIO.hxx"
#include "freertos_drivers/common/DummyGPIO.hxx"
#include "freertos_drivers/common/BlinkerGPIO.hxx"
#include "driverlib/rom_map.h"
#include "utils/GpioInitializer.hxx"

Expand Down
14 changes: 7 additions & 7 deletions applications/dmx_controller/targets/custom-cc3220sf/HwInit.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@
#include "driverlib/pin.h"
#include "driverlib/utils.h"
#include "os/OS.hxx"
#include "DummyGPIO.hxx"
#include "CC32xxUart.hxx"
#include "CC32xxSPI.hxx"
#include "CC32xxWiFi.hxx"
#include "MCP2515Can.hxx"
#include "CC32xxEEPROMEmulation.hxx"
#include "freertos_drivers/common/DummyGPIO.hxx"
#include "freertos_drivers/ti/CC32xxUart.hxx"
#include "freertos_drivers/ti/CC32xxSPI.hxx"
#include "freertos_drivers/net_cc32xx/CC32xxWiFi.hxx"
#include "freertos_drivers/common/MCP2515Can.hxx"
#include "freertos_drivers/ti/CC32xxEEPROMEmulation.hxx"
#include "hardware.hxx"
#include "bootloader_hal.h"
#include "openlcb/bootloader_hal.h"

#include "CC3200_compat/simplelink.h"
//#include "netapp.h"
Expand Down
4 changes: 2 additions & 2 deletions applications/dmx_controller/targets/custom-cc3220sf/hardware.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef _HARDWARE_HXX_
#define _HARDWARE_HXX_

#include "CC3200GPIO.hxx"
#include "BlinkerGPIO.hxx"
#include "freertos_drivers/ti/CC3200GPIO.hxx"
#include "freertos_drivers/common/BlinkerGPIO.hxx"
#include "driverlib/rom_map.h"
#include "utils/GpioInitializer.hxx"
#include "driverlib/adc.h"
Expand Down
2 changes: 1 addition & 1 deletion applications/dmx_controller/targets/custom-cc3220sf/main.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
#include "config.hxx"
#include "hardware.hxx"

#include "CC32xxWiFi.hxx"
#include "freertos_drivers/net_cc32xx/CC32xxWiFi.hxx"
#include "utils/stdio_logging.h"
#include "freertos/tc_ioctl.h"

Expand Down
6 changes: 3 additions & 3 deletions applications/io_board/targets/freertos.armv7m.lpc1768-mbed/main.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
#include "openlcb/ConfiguredConsumer.hxx"
#include "openlcb/ConfiguredProducer.hxx"

#include "BlinkerGPIO.hxx"
#include "DummyGPIO.hxx"
#include "freertos_drivers/common/BlinkerGPIO.hxx"
#include "freertos_drivers/common/DummyGPIO.hxx"
#include "freertos_drivers/common/RamDisk.hxx"
#include "Lpc17xx40xxGPIO.hxx"
#include "freertos_drivers/nxp/Lpc17xx40xxGPIO.hxx"
#include "config.hxx"

// These preprocessor symbols are used to select which physical connections
Expand Down
6 changes: 3 additions & 3 deletions applications/io_board/targets/freertos.armv7m.lpc1769-lpcxpresso/main.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
#include "openlcb/ConfiguredConsumer.hxx"
#include "openlcb/ConfiguredProducer.hxx"

#include "BlinkerGPIO.hxx"
#include "DummyGPIO.hxx"
#include "freertos_drivers/common/BlinkerGPIO.hxx"
#include "freertos_drivers/common/DummyGPIO.hxx"
#include "freertos_drivers/common/RamDisk.hxx"
#include "Lpc17xx40xxGPIO.hxx"
#include "freertos_drivers/nxp/Lpc17xx40xxGPIO.hxx"
#include "config.hxx"

// These preprocessor symbols are used to select which physical connections
Expand Down
2 changes: 1 addition & 1 deletion applications/io_board/targets/freertos.armv7m.ti-launchpad-cc3220sf/main.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
#include "config.hxx"
#include "hardware.hxx"

#include "CC32xxWiFi.hxx"
#include "freertos_drivers/net_cc32xx/CC32xxWiFi.hxx"
#include "utils/stdio_logging.h"

// These preprocessor symbols are used to select which physical connections
Expand Down
14 changes: 7 additions & 7 deletions applications/modbus_controller/targets/custom-cc3220sf/HwInit.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@
#include "driverlib/pin.h"
#include "driverlib/utils.h"
#include "os/OS.hxx"
#include "DummyGPIO.hxx"
#include "CC32xxUart.hxx"
#include "CC32xxSPI.hxx"
#include "CC32xxWiFi.hxx"
#include "MCP2515Can.hxx"
#include "CC32xxEEPROMEmulation.hxx"
#include "freertos_drivers/common/DummyGPIO.hxx"
#include "freertos_drivers/ti/CC32xxUart.hxx"
#include "freertos_drivers/ti/CC32xxSPI.hxx"
#include "freertos_drivers/net_cc32xx/CC32xxWiFi.hxx"
#include "freertos_drivers/common/MCP2515Can.hxx"
#include "freertos_drivers/ti/CC32xxEEPROMEmulation.hxx"
#include "hardware.hxx"
#include "bootloader_hal.h"
#include "openlcb/bootloader_hal.h"

#include "CC3200_compat/simplelink.h"
//#include "netapp.h"
Expand Down
4 changes: 2 additions & 2 deletions applications/modbus_controller/targets/custom-cc3220sf/hardware.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef _HARDWARE_HXX_
#define _HARDWARE_HXX_

#include "CC3200GPIO.hxx"
#include "BlinkerGPIO.hxx"
#include "freertos_drivers/ti/CC3200GPIO.hxx"
#include "freertos_drivers/common/BlinkerGPIO.hxx"
#include "driverlib/rom_map.h"
#include "utils/GpioInitializer.hxx"
#include "driverlib/adc.h"
Expand Down
2 changes: 1 addition & 1 deletion applications/modbus_controller/targets/custom-cc3220sf/main.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
#include "config.hxx"
#include "hardware.hxx"

#include "CC32xxWiFi.hxx"
#include "freertos_drivers/net_cc32xx/CC32xxWiFi.hxx"
#include "freertos_drivers/common/WifiDefs.hxx"
#include "console/FileCommands.hxx"

Expand Down
2 changes: 1 addition & 1 deletion applications/nucleo_io/targets/freertos.armv6m.st-stm32f091rc-nucleo-dev-board/main.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
#include "os/MmapGpio.hxx"
#include "config.hxx"
#include "hardware.hxx"
#include "PWM.hxx"
#include "freertos_drivers/common/PWM.hxx"
#include "i2c.h"
#include "i2c-dev.h"

Expand Down
4 changes: 2 additions & 2 deletions applications/reflash_bootloader/targets/bare.armv7m.bracz-acc2/BootloaderHal.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#define TARGET_IS_TM4C123_RB1

#include "../boards/ti-tm4c123-generic/BootloaderHal.hxx"
#include "bootloader_hal.h"
#include "openlcb/bootloader_hal.h"
#include "driverlib/rom.h"
#include "driverlib/rom_map.h"
#include "driverlib/gpio.h"
Expand All @@ -14,7 +14,7 @@

#include "nmranet_config.h"
#include "openlcb/Defs.hxx"
#include "TivaGPIO.hxx"
#include "freertos_drivers/ti/TivaGPIO.hxx"

extern "C" {

Expand Down
4 changes: 2 additions & 2 deletions applications/reflash_bootloader/targets/bare.armv7m.bracz-acc3/BootloaderHal.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#define TARGET_IS_TM4C123_RB1

#include "../boards/ti-tm4c123-generic/BootloaderHal.hxx"
#include "bootloader_hal.h"
#include "openlcb/bootloader_hal.h"
#include "driverlib/rom.h"
#include "driverlib/rom_map.h"
#include "driverlib/gpio.h"
Expand All @@ -14,7 +14,7 @@

#include "nmranet_config.h"
#include "openlcb/Defs.hxx"
#include "TivaGPIO.hxx"
#include "freertos_drivers/ti/TivaGPIO.hxx"

extern "C" {

Expand Down
4 changes: 2 additions & 2 deletions applications/reflash_bootloader/targets/bare.armv7m.bracz-railcom/BootloaderHal.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#define TARGET_IS_TM4C123_RB1

#include "../boards/ti-tm4c123-generic/BootloaderHal.hxx"
#include "bootloader_hal.h"
#include "openlcb/bootloader_hal.h"
#include "driverlib/rom.h"
#include "driverlib/rom_map.h"
#include "driverlib/gpio.h"
Expand All @@ -14,7 +14,7 @@

#include "nmranet_config.h"
#include "openlcb/Defs.hxx"
#include "TivaGPIO.hxx"
#include "freertos_drivers/ti/TivaGPIO.hxx"
#define PINDEFS_ONLY
#include "hardware.hxx"

Expand Down
4 changes: 2 additions & 2 deletions applications/reflash_bootloader/targets/bare.armv7m.ek-tm4c123gxl/BootloaderHal.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#define TARGET_IS_TM4C123_RB1

#include "../boards/ti-tm4c123-generic/BootloaderHal.hxx"
#include "bootloader_hal.h"
#include "openlcb/bootloader_hal.h"
#include "driverlib/rom.h"
#include "driverlib/rom_map.h"
#include "driverlib/gpio.h"
Expand All @@ -14,7 +14,7 @@

#include "nmranet_config.h"
#include "openlcb/Defs.hxx"
#include "TivaGPIO.hxx"
#include "freertos_drivers/ti/TivaGPIO.hxx"

//OVERRIDE_CONST(nmranet_can_bitrate, 1000000);

Expand Down
Loading
Loading