From f8f0032d1e50b41b43c8e1bae70f96e42e6d4def Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 3 Aug 2021 11:18:24 +0200 Subject: [PATCH 1/5] reboot feature finished --- bsp_q7s/core/CoreController.cpp | 30 ++++++++++++++++++++++++++++-- bsp_q7s/core/CoreController.h | 3 ++- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/bsp_q7s/core/CoreController.cpp b/bsp_q7s/core/CoreController.cpp index 72171c65..69c234f5 100644 --- a/bsp_q7s/core/CoreController.cpp +++ b/bsp_q7s/core/CoreController.cpp @@ -159,8 +159,7 @@ ReturnValue_t CoreController::executeAction(ActionId_t actionId, MessageQueueId_ return actionListDirectoryIntoFile(actionId, commandedBy, data, size); } case(REBOOT_OBC): { - return HasReturnvaluesIF::RETURN_OK; - break; + return actionPerformReboot(data, size); } default: { return HasActionsIF::INVALID_ACTION_ID; @@ -457,6 +456,33 @@ void CoreController::initPrint() { #endif } +ReturnValue_t CoreController::actionPerformReboot(const uint8_t *data, size_t size) { + if(size < 1) { + return HasActionsIF::INVALID_PARAMETERS; + } + bool rebootSameBootCopy = data[0]; + if(rebootSameBootCopy) { + int result = std::system("xsc_boot_copy -r"); + if(result != 0) { + utility::handleSystemError(result, "CoreController::executeAction"); + return HasReturnvaluesIF::RETURN_FAILED; + } + return HasActionsIF::EXECUTION_FINISHED; + } + if(size < 3) { + return HasActionsIF::INVALID_PARAMETERS; + } + // The second byte in data is the target chip, the third byte is the target copy + std::string cmdString = "xsc_boot_copy " + std::to_string(data[1]) + + std::to_string(data[2]); + int result = std::system(cmdString.c_str()); + if(result != 0) { + utility::handleSystemError(result, "CoreController::executeAction"); + return HasReturnvaluesIF::RETURN_FAILED; + } + return HasActionsIF::EXECUTION_FINISHED; +} + void CoreController::performWatchdogControlOperation() { // Only perform each fifth iteration if(watchdogFifoFd != 0 and opDivider.checkAndIncrement()) { diff --git a/bsp_q7s/core/CoreController.h b/bsp_q7s/core/CoreController.h index 92b22dd4..4a71e6e7 100644 --- a/bsp_q7s/core/CoreController.h +++ b/bsp_q7s/core/CoreController.h @@ -24,7 +24,7 @@ public: }; static constexpr ActionId_t LIST_DIRECTORY_INTO_FILE = 0; - static constexpr ActionId_t REBOOT_OBC = 1; + static constexpr ActionId_t REBOOT_OBC = 32; static constexpr uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::CORE; @@ -68,6 +68,7 @@ private: ReturnValue_t actionListDirectoryIntoFile(ActionId_t actionId, MessageQueueId_t commandedBy, const uint8_t *data, size_t size); + ReturnValue_t actionPerformReboot(const uint8_t *data, size_t size); void initPrint(); From 59c4ed74e030dfead7d639700230600939fa8cbc Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 3 Aug 2021 11:21:28 +0200 Subject: [PATCH 2/5] minor bugfix --- bsp_q7s/core/CoreController.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bsp_q7s/core/CoreController.cpp b/bsp_q7s/core/CoreController.cpp index 69c234f5..847f6a52 100644 --- a/bsp_q7s/core/CoreController.cpp +++ b/bsp_q7s/core/CoreController.cpp @@ -473,7 +473,7 @@ ReturnValue_t CoreController::actionPerformReboot(const uint8_t *data, size_t si return HasActionsIF::INVALID_PARAMETERS; } // The second byte in data is the target chip, the third byte is the target copy - std::string cmdString = "xsc_boot_copy " + std::to_string(data[1]) + + std::string cmdString = "xsc_boot_copy " + std::to_string(data[1]) + " " + std::to_string(data[2]); int result = std::system(cmdString.c_str()); if(result != 0) { From 3cc37865056d3527f876e9c808e9e2d836f24670 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 3 Aug 2021 15:29:45 +0200 Subject: [PATCH 3/5] TCP default now, bugfixes in CoreController --- bsp_q7s/boardtest/FileSystemTest.cpp | 5 +++++ bsp_q7s/boardtest/FileSystemTest.h | 5 ----- bsp_q7s/boardtest/Q7STestTask.cpp | 4 ++-- bsp_q7s/core/CoreController.cpp | 18 ++++++++++++++---- bsp_q7s/memory/FileSystemHandler.cpp | 4 ++-- common/config/commonConfig.h.in | 2 +- fsfw | 2 +- tmtc | 2 +- 8 files changed, 26 insertions(+), 16 deletions(-) diff --git a/bsp_q7s/boardtest/FileSystemTest.cpp b/bsp_q7s/boardtest/FileSystemTest.cpp index 1de5bb7a..92c4cf3d 100644 --- a/bsp_q7s/boardtest/FileSystemTest.cpp +++ b/bsp_q7s/boardtest/FileSystemTest.cpp @@ -4,6 +4,11 @@ #include #include +enum SdCard { + SDC0, + SDC1 +}; + FileSystemTest::FileSystemTest() { using namespace std; SdCard sdCard = SdCard::SDC0; diff --git a/bsp_q7s/boardtest/FileSystemTest.h b/bsp_q7s/boardtest/FileSystemTest.h index 907c86ca..256a0b36 100644 --- a/bsp_q7s/boardtest/FileSystemTest.h +++ b/bsp_q7s/boardtest/FileSystemTest.h @@ -1,11 +1,6 @@ #ifndef BSP_Q7S_BOARDTEST_FILESYSTEMTEST_H_ #define BSP_Q7S_BOARDTEST_FILESYSTEMTEST_H_ -enum SdCard { - SDC0, - SDC1 -}; - class FileSystemTest { public: FileSystemTest(); diff --git a/bsp_q7s/boardtest/Q7STestTask.cpp b/bsp_q7s/boardtest/Q7STestTask.cpp index 4e763641..f9439fc1 100644 --- a/bsp_q7s/boardtest/Q7STestTask.cpp +++ b/bsp_q7s/boardtest/Q7STestTask.cpp @@ -24,8 +24,8 @@ ReturnValue_t Q7STestTask::performOneShotAction() { //testScratchApi(); //testJsonLibDirect(); //testDummyParams(); - FsOpCodes opCode = FsOpCodes::ATTEMPT_DIR_REMOVAL_NON_EMPTY; - testFileSystemHandlerDirect(opCode); + //FsOpCodes opCode = FsOpCodes::ATTEMPT_DIR_REMOVAL_NON_EMPTY; + //testFileSystemHandlerDirect(opCode); return TestTask::performOneShotAction(); } diff --git a/bsp_q7s/core/CoreController.cpp b/bsp_q7s/core/CoreController.cpp index 847f6a52..b1ca47d9 100644 --- a/bsp_q7s/core/CoreController.cpp +++ b/bsp_q7s/core/CoreController.cpp @@ -23,8 +23,8 @@ CoreController::Chip CoreController::currentChip = Chip::NO_CHIP; CoreController::Copy CoreController::currentCopy = Copy::NO_COPY; CoreController::CoreController(object_id_t objectId): - ExtendedControllerBase(objectId, objects::NO_OBJECT, 5), - opDivider(5) { + ExtendedControllerBase(objectId, objects::NO_OBJECT, 5), + opDivider(5) { ReturnValue_t result = HasReturnvaluesIF::RETURN_OK; try { result = initWatchdogFifo(); @@ -49,7 +49,7 @@ CoreController::CoreController(object_id_t objectId): } ReturnValue_t CoreController::handleCommandMessage(CommandMessage *message) { - return HasReturnvaluesIF::RETURN_OK; + return ExtendedControllerBase::handleCommandMessage(message); } void CoreController::performControlOperation() { @@ -74,7 +74,7 @@ ReturnValue_t CoreController::initialize() { "count failed" << std::endl; } - return HasReturnvaluesIF::RETURN_OK; + return ExtendedControllerBase::initialize(); } ReturnValue_t CoreController::checkModeCommand(Mode_t mode, Submode_t submode, @@ -462,6 +462,12 @@ ReturnValue_t CoreController::actionPerformReboot(const uint8_t *data, size_t si } bool rebootSameBootCopy = data[0]; if(rebootSameBootCopy) { +#if OBSW_VERBOSE_LEVEL >= 1 + sif::info << "CoreController::actionPerformReboot: Rebooting on current image" << std::endl; +#endif + // Attempt graceful shutdown by unmounting and switching off SD cards + SdCardManager::instance()->switchOffSdCard(sd::SdCard::SLOT_0); + SdCardManager::instance()->switchOffSdCard(sd::SdCard::SLOT_1); int result = std::system("xsc_boot_copy -r"); if(result != 0) { utility::handleSystemError(result, "CoreController::executeAction"); @@ -472,6 +478,10 @@ ReturnValue_t CoreController::actionPerformReboot(const uint8_t *data, size_t si if(size < 3) { return HasActionsIF::INVALID_PARAMETERS; } +#if OBSW_VERBOSE_LEVEL >= 1 + sif::info << "CoreController::actionPerformReboot: Rebooting on " << + static_cast(data[1]) << " " << static_cast(data[2]) << std::endl; +#endif // The second byte in data is the target chip, the third byte is the target copy std::string cmdString = "xsc_boot_copy " + std::to_string(data[1]) + " " + std::to_string(data[2]); diff --git a/bsp_q7s/memory/FileSystemHandler.cpp b/bsp_q7s/memory/FileSystemHandler.cpp index 159512a0..5a7895da 100644 --- a/bsp_q7s/memory/FileSystemHandler.cpp +++ b/bsp_q7s/memory/FileSystemHandler.cpp @@ -226,7 +226,7 @@ ReturnValue_t FileSystemHandler::removeDirectory(const char *repositoryPath, else { // Check error code. Most probably denied permissions because folder is not empty sif::warning << "FileSystemHandler::removeDirectory: Deleting directory failed with " - "code" << err.value() << ": " << strerror(err.value()) << std::endl; + "code " << err.value() << ": " << strerror(err.value()) << std::endl; if(err.value() == ENOTEMPTY) { return DIRECTORY_NOT_EMPTY; } @@ -242,7 +242,7 @@ ReturnValue_t FileSystemHandler::removeDirectory(const char *repositoryPath, } else { sif::warning << "FileSystemHandler::removeDirectory: Deleting directory failed with " - "code" << err.value() << ": " << strerror(err.value()) << std::endl; + "code " << err.value() << ": " << strerror(err.value()) << std::endl; // Check error code if(err.value() == ENOTEMPTY) { return DIRECTORY_NOT_EMPTY; diff --git a/common/config/commonConfig.h.in b/common/config/commonConfig.h.in index 2b0590c8..52b5dd45 100644 --- a/common/config/commonConfig.h.in +++ b/common/config/commonConfig.h.in @@ -5,6 +5,6 @@ // Use TCP instead of UDP for the TMTC bridge. This allows using the TMTC client locally // because UDP packets are not allowed in the VPN -#define OBSW_USE_TMTC_TCP_BRIDGE 0 +#define OBSW_USE_TMTC_TCP_BRIDGE 1 #endif /* COMMON_CONFIG_COMMONCONFIG_H_ */ diff --git a/fsfw b/fsfw index 0ff81294..296c587e 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 0ff81294e7e209bb4a26171b10d80fe522e65bcf +Subproject commit 296c587e3de10c579847e04af3176b3acaa2d701 diff --git a/tmtc b/tmtc index 477743f6..bc32472d 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 477743f6264689327528beb5344c39247af6c49e +Subproject commit bc32472d88a0d7a1566f53c05a1bc49f3c377985 From 9790b395e6a50e515f0957d50f8a0d84ba9b3394 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 3 Aug 2021 15:58:01 +0200 Subject: [PATCH 4/5] include replacements --- bsp_linux_board/ObjectFactory.cpp | 16 ++++++++-------- bsp_q7s/core/ObjectFactory.cpp | 18 +++++++++--------- bsp_q7s/gpio/gpioCallbacks.cpp | 4 ++-- bsp_q7s/gpio/gpioCallbacks.h | 4 ++-- bsp_q7s/spi/Q7sSpiComIF.h | 2 +- bsp_q7s/spiCallbacks/rwSpiCallback.cpp | 4 ++-- bsp_q7s/spiCallbacks/rwSpiCallback.h | 4 ++-- common/config/spiConf.h | 2 +- fsfw | 2 +- linux/boardtest/LibgpiodTest.h | 4 ++-- linux/boardtest/SpiTestClass.cpp | 8 ++++---- linux/boardtest/SpiTestClass.h | 4 ++-- linux/devices/HeaterHandler.cpp | 2 +- linux/devices/HeaterHandler.h | 2 +- linux/devices/SolarArrayDeploymentHandler.cpp | 2 +- linux/devices/SolarArrayDeploymentHandler.h | 2 +- linux/devices/SusHandler.cpp | 2 +- linux/devices/SusHandler.h | 2 +- linux/fsfwconfig/devices/gpioIds.h | 2 +- linux/obc/CCSDSIPCoreBridge.h | 4 ++-- mission/devices/GyroADIS16507Handler.cpp | 8 ++++---- mission/devices/PlocSupervisorHandler.h | 2 +- mission/devices/RwHandler.h | 2 +- 23 files changed, 51 insertions(+), 51 deletions(-) diff --git a/bsp_linux_board/ObjectFactory.cpp b/bsp_linux_board/ObjectFactory.cpp index 0d3e8ce5..b24b633f 100644 --- a/bsp_linux_board/ObjectFactory.cpp +++ b/bsp_linux_board/ObjectFactory.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include "ObjectFactory.h" @@ -31,12 +31,12 @@ #include "fsfw/osal/common/UdpTmTcBridge.h" #include "fsfw/osal/common/UdpTcPollingTask.h" -#include "fsfw/hal/devicehandlers/GyroL3GD20Handler.h" -#include "fsfw/hal/linux/gpio/LinuxLibgpioIF.h" -#include "fsfw/hal/linux/rpi/GpioRPi.h" -#include "fsfw/hal/common/gpio/GpioCookie.h" -#include "fsfw/hal/linux/spi/SpiCookie.h" -#include "fsfw/hal/linux/spi/SpiComIF.h" +#include "fsfw_hal/devicehandlers/GyroL3GD20Handler.h" +#include "fsfw_hal/linux/gpio/LinuxLibgpioIF.h" +#include "fsfw_hal/linux/rpi/GpioRPi.h" +#include "fsfw_hal/common/gpio/GpioCookie.h" +#include "fsfw_hal/linux/spi/SpiCookie.h" +#include "fsfw_hal/linux/spi/SpiComIF.h" void Factory::setStaticFrameworkObjectIds() { PusServiceBase::packetSource = objects::PUS_PACKET_DISTRIBUTOR; diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp index 53da02c5..a1ac3868 100644 --- a/bsp_q7s/core/ObjectFactory.cpp +++ b/bsp_q7s/core/ObjectFactory.cpp @@ -48,15 +48,15 @@ #include "mission/utility/TmFunnel.h" #include "linux/obc/CCSDSIPCoreBridge.h" -#include "fsfw/hal/linux/uart/UartComIF.h" -#include "fsfw/hal/linux/uart/UartCookie.h" -#include "fsfw/hal/devicehandlers/GyroL3GD20Handler.h" -#include "fsfw/hal/linux/i2c/I2cCookie.h" -#include "fsfw/hal/linux/i2c/I2cComIF.h" -#include "fsfw/hal/linux/spi/SpiCookie.h" -#include "fsfw/hal/linux/spi/SpiComIF.h" -#include "fsfw/hal/linux/gpio/LinuxLibgpioIF.h" -#include "fsfw/hal/common/gpio/GpioCookie.h" +#include "fsfw_hal/linux/uart/UartComIF.h" +#include "fsfw_hal/linux/uart/UartCookie.h" +#include "fsfw_hal/devicehandlers/GyroL3GD20Handler.h" +#include "fsfw_hal/linux/i2c/I2cCookie.h" +#include "fsfw_hal/linux/i2c/I2cComIF.h" +#include "fsfw_hal/linux/spi/SpiCookie.h" +#include "fsfw_hal/linux/spi/SpiComIF.h" +#include "fsfw_hal/linux/gpio/LinuxLibgpioIF.h" +#include "fsfw_hal/common/gpio/GpioCookie.h" #include "fsfw/datapoollocal/LocalDataPoolManager.h" #include "fsfw/tmtcservices/CommandingServiceBase.h" diff --git a/bsp_q7s/gpio/gpioCallbacks.cpp b/bsp_q7s/gpio/gpioCallbacks.cpp index 29e7f86d..5499517b 100644 --- a/bsp_q7s/gpio/gpioCallbacks.cpp +++ b/bsp_q7s/gpio/gpioCallbacks.cpp @@ -1,8 +1,8 @@ #include "gpioCallbacks.h" #include -#include -#include +#include +#include #include diff --git a/bsp_q7s/gpio/gpioCallbacks.h b/bsp_q7s/gpio/gpioCallbacks.h index 55e67895..eaf9a701 100644 --- a/bsp_q7s/gpio/gpioCallbacks.h +++ b/bsp_q7s/gpio/gpioCallbacks.h @@ -1,8 +1,8 @@ #ifndef LINUX_GPIO_GPIOCALLBACKS_H_ #define LINUX_GPIO_GPIOCALLBACKS_H_ -#include -#include +#include +#include namespace gpioCallbacks { diff --git a/bsp_q7s/spi/Q7sSpiComIF.h b/bsp_q7s/spi/Q7sSpiComIF.h index 4326bf8c..a10d63dd 100644 --- a/bsp_q7s/spi/Q7sSpiComIF.h +++ b/bsp_q7s/spi/Q7sSpiComIF.h @@ -1,7 +1,7 @@ #ifndef BSP_Q7S_SPI_Q7SSPICOMIF_H_ #define BSP_Q7S_SPI_Q7SSPICOMIF_H_ -#include +#include /** diff --git a/bsp_q7s/spiCallbacks/rwSpiCallback.cpp b/bsp_q7s/spiCallbacks/rwSpiCallback.cpp index 0f60288f..f05fbbdf 100644 --- a/bsp_q7s/spiCallbacks/rwSpiCallback.cpp +++ b/bsp_q7s/spiCallbacks/rwSpiCallback.cpp @@ -1,8 +1,8 @@ #include #include #include -#include -#include +#include +#include #include "devices/gpioIds.h" namespace rwSpiCallback { diff --git a/bsp_q7s/spiCallbacks/rwSpiCallback.h b/bsp_q7s/spiCallbacks/rwSpiCallback.h index fd7f1592..e5a79e64 100644 --- a/bsp_q7s/spiCallbacks/rwSpiCallback.h +++ b/bsp_q7s/spiCallbacks/rwSpiCallback.h @@ -2,8 +2,8 @@ #define BSP_Q7S_RW_SPI_CALLBACK_H_ #include -#include -#include +#include +#include namespace rwSpiCallback { diff --git a/common/config/spiConf.h b/common/config/spiConf.h index 05866555..47600eb3 100644 --- a/common/config/spiConf.h +++ b/common/config/spiConf.h @@ -2,7 +2,7 @@ #define COMMON_CONFIG_SPICONF_H_ #include -#include +#include /** * SPI configuration will be contained here to let the device handlers remain independent diff --git a/fsfw b/fsfw index 296c587e..bb88490c 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 296c587e3de10c579847e04af3176b3acaa2d701 +Subproject commit bb88490cc6cda5474d1d4913452eeb758da8cc25 diff --git a/linux/boardtest/LibgpiodTest.h b/linux/boardtest/LibgpiodTest.h index 38325622..a18c618e 100644 --- a/linux/boardtest/LibgpiodTest.h +++ b/linux/boardtest/LibgpiodTest.h @@ -2,8 +2,8 @@ #define TEST_TESTTASKS_LIBGPIODTEST_H_ #include "TestTask.h" -#include -#include +#include +#include #include /** diff --git a/linux/boardtest/SpiTestClass.cpp b/linux/boardtest/SpiTestClass.cpp index 6f634168..84750f66 100644 --- a/linux/boardtest/SpiTestClass.cpp +++ b/linux/boardtest/SpiTestClass.cpp @@ -8,10 +8,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/linux/boardtest/SpiTestClass.h b/linux/boardtest/SpiTestClass.h index 7982c601..dd112a0e 100644 --- a/linux/boardtest/SpiTestClass.h +++ b/linux/boardtest/SpiTestClass.h @@ -1,8 +1,8 @@ #ifndef LINUX_BOARDTEST_SPITESTCLASS_H_ #define LINUX_BOARDTEST_SPITESTCLASS_H_ -#include -#include +#include +#include #include #include diff --git a/linux/devices/HeaterHandler.cpp b/linux/devices/HeaterHandler.cpp index c821aa6c..60a60328 100644 --- a/linux/devices/HeaterHandler.cpp +++ b/linux/devices/HeaterHandler.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include HeaterHandler::HeaterHandler(object_id_t setObjectId_, object_id_t gpioDriverId_, CookieIF * gpioCookie_, object_id_t mainLineSwitcherObjectId_, uint8_t mainLineSwitch_) : diff --git a/linux/devices/HeaterHandler.h b/linux/devices/HeaterHandler.h index ebb267f6..b52e22d4 100644 --- a/linux/devices/HeaterHandler.h +++ b/linux/devices/HeaterHandler.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include /** diff --git a/linux/devices/SolarArrayDeploymentHandler.cpp b/linux/devices/SolarArrayDeploymentHandler.cpp index 05052c61..eea546f6 100644 --- a/linux/devices/SolarArrayDeploymentHandler.cpp +++ b/linux/devices/SolarArrayDeploymentHandler.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/linux/devices/SolarArrayDeploymentHandler.h b/linux/devices/SolarArrayDeploymentHandler.h index 97cb48c7..5e573128 100644 --- a/linux/devices/SolarArrayDeploymentHandler.h +++ b/linux/devices/SolarArrayDeploymentHandler.h @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include /** diff --git a/linux/devices/SusHandler.cpp b/linux/devices/SusHandler.cpp index bf06e031..c31160c4 100644 --- a/linux/devices/SusHandler.cpp +++ b/linux/devices/SusHandler.cpp @@ -2,7 +2,7 @@ #include "OBSWConfig.h" #include -#include +#include SusHandler::SusHandler(object_id_t objectId, object_id_t comIF, CookieIF * comCookie, LinuxLibgpioIF* gpioComIF, gpioId_t chipSelectId) : diff --git a/linux/devices/SusHandler.h b/linux/devices/SusHandler.h index d40d9371..ca9a5c45 100644 --- a/linux/devices/SusHandler.h +++ b/linux/devices/SusHandler.h @@ -3,7 +3,7 @@ #include "devicedefinitions/SusDefinitions.h" #include -#include +#include /** * @brief This is the device handler class for the SUS sensor. The sensor is diff --git a/linux/fsfwconfig/devices/gpioIds.h b/linux/fsfwconfig/devices/gpioIds.h index 4b222b97..aad06629 100644 --- a/linux/fsfwconfig/devices/gpioIds.h +++ b/linux/fsfwconfig/devices/gpioIds.h @@ -1,7 +1,7 @@ #ifndef FSFWCONFIG_DEVICES_GPIOIDS_H_ #define FSFWCONFIG_DEVICES_GPIOIDS_H_ -#include +#include namespace gpioIds { enum gpioId_t { diff --git a/linux/obc/CCSDSIPCoreBridge.h b/linux/obc/CCSDSIPCoreBridge.h index f5127828..2ba68a3a 100644 --- a/linux/obc/CCSDSIPCoreBridge.h +++ b/linux/obc/CCSDSIPCoreBridge.h @@ -3,8 +3,8 @@ #include "OBSWConfig.h" #include -#include -#include +#include +#include #include diff --git a/mission/devices/GyroADIS16507Handler.cpp b/mission/devices/GyroADIS16507Handler.cpp index 7b45b8c5..ac49a89d 100644 --- a/mission/devices/GyroADIS16507Handler.cpp +++ b/mission/devices/GyroADIS16507Handler.cpp @@ -4,10 +4,10 @@ #include "GyroADIS16507Handler.h" #if OBSW_ADIS16507_LINUX_COM_IF == 1 -#include "fsfw/hal/linux/utility.h" -#include "fsfw/hal/linux/spi/SpiCookie.h" -#include "fsfw/hal/linux/spi/SpiComIF.h" -#include "fsfw/hal/linux/UnixFileGuard.h" +#include "fsfw_hal/linux/utility.h" +#include "fsfw_hal/linux/spi/SpiCookie.h" +#include "fsfw_hal/linux/spi/SpiComIF.h" +#include "fsfw_hal/linux/UnixFileGuard.h" #include #include #endif diff --git a/mission/devices/PlocSupervisorHandler.h b/mission/devices/PlocSupervisorHandler.h index d4ad811c..041989a3 100644 --- a/mission/devices/PlocSupervisorHandler.h +++ b/mission/devices/PlocSupervisorHandler.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include /** * @brief This is the device handler for the supervisor of the PLOC which is programmed by diff --git a/mission/devices/RwHandler.h b/mission/devices/RwHandler.h index a0577043..cd753be0 100644 --- a/mission/devices/RwHandler.h +++ b/mission/devices/RwHandler.h @@ -3,7 +3,7 @@ #include #include -#include +#include #include /** From 3a88a435058b0a41db365f6e03f23884bfdb5cfc Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 4 Aug 2021 13:18:09 +0200 Subject: [PATCH 5/5] tmtc update --- tmtc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmtc b/tmtc index bc32472d..a226bf65 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit bc32472d88a0d7a1566f53c05a1bc49f3c377985 +Subproject commit a226bf659eeadd3ad300b249d2659043317e2245