Skip to content

Changing the Order of the Imports #87

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

Merged
merged 2 commits into from
Nov 11, 2025
Merged

Changing the Order of the Imports #87

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
daf206f
inital order change
ineskhou Nov 11, 2025
8e38db0
Merge branch 'main' of github.com:Open-Source-Space-Foundation/proves…
ineskhou Nov 11, 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: 6 additions & 0 deletions .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,9 @@ BasedOnStyle: Chromium
IndentWidth: 4
ColumnLimit: 120
AccessModifierOffset: -2
SortIncludes: true
IncludeBlocks: Regroup
IncludeCategories:
# Zephyr headers come last
- Regex: '^<zephyr/.*>'
Priority: 3
1 change: 1 addition & 0 deletions FprimeZephyrReference/ComCcsdsUart/SubtopologyTopologyDefs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <Fw/Types/MallocAllocator.hpp>
#include <Svc/BufferManager/BufferManager.hpp>
#include <Svc/FrameAccumulator/FrameDetector/CcsdsTcFrameDetector.hpp>

#include "ComCcsdsConfig/ComCcsdsSubtopologyConfig.hpp"
#include "Svc/Subtopologies/ComCcsds/ComCcsdsConfig/FppConstantsAc.hpp"

Expand Down
1 change: 1 addition & 0 deletions FprimeZephyrReference/Components/Burnwire/Burnwire.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define Components_Burnwire_HPP

#include <atomic>

#include "FprimeZephyrReference/Components/Burnwire/BurnwireComponentAc.hpp"

namespace Components {
Expand Down
1 change: 1 addition & 0 deletions FprimeZephyrReference/Components/ComDelay/ComDelay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// ======================================================================

#include "FprimeZephyrReference/Components/ComDelay/ComDelay.hpp"

#include "FprimeZephyrReference/Components/ComDelay/FppConstantsAc.hpp"

namespace Components {
Expand Down
1 change: 1 addition & 0 deletions FprimeZephyrReference/Components/ComDelay/ComDelay.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#define Components_ComDelay_HPP

#include <atomic>

#include "FprimeZephyrReference/Components/ComDelay/ComDelayComponentAc.hpp"

namespace Components {
Expand Down
1 change: 1 addition & 0 deletions FprimeZephyrReference/Components/Drv/Ina219Manager/Ina219Manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
// ======================================================================

#include "FprimeZephyrReference/Components/Drv/Ina219Manager/Ina219Manager.hpp"

#include <Fw/Types/Assert.hpp>

namespace Drv {
Expand Down
1 change: 0 additions & 1 deletion FprimeZephyrReference/Components/Drv/Ina219Manager/Ina219Manager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#define Drv_Ina219Manager_HPP

#include "FprimeZephyrReference/Components/Drv/Ina219Manager/Ina219ManagerComponentAc.hpp"

#include <zephyr/device.h>
#include <zephyr/drivers/sensor.h>
#include <zephyr/kernel.h>
Expand Down
1 change: 0 additions & 1 deletion FprimeZephyrReference/Components/Drv/Lis2mdlManager/Lis2mdlManager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#define Components_Lis2mdlManager_HPP

#include "FprimeZephyrReference/Components/Drv/Lis2mdlManager/Lis2mdlManagerComponentAc.hpp"

#include <zephyr/device.h>
#include <zephyr/drivers/sensor.h>
#include <zephyr/kernel.h>
Expand Down
1 change: 0 additions & 1 deletion FprimeZephyrReference/Components/Drv/Lsm6dsoManager/Lsm6dsoManager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#define Components_Lsm6dsoManager_HPP

#include "FprimeZephyrReference/Components/Drv/Lsm6dsoManager/Lsm6dsoManagerComponentAc.hpp"

#include <zephyr/device.h>
#include <zephyr/drivers/sensor.h>
#include <zephyr/kernel.h>
Expand Down
6 changes: 2 additions & 4 deletions FprimeZephyrReference/Components/Drv/RtcManager/RtcManager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@
#ifndef Components_RtcManager_HPP
#define Components_RtcManager_HPP

#include "FprimeZephyrReference/Components/Drv/RtcManager/RtcManagerComponentAc.hpp"

#include <Fw/Logger/Logger.hpp>
#include <cerrno>
#include <string>
#include <vector>

#include <Fw/Logger/Logger.hpp>

#include "FprimeZephyrReference/Components/Drv/RtcManager/RtcManagerComponentAc.hpp"
#include <zephyr/device.h>
#include <zephyr/drivers/rtc.h>
#include <zephyr/drivers/sensor.h>
Expand Down
3 changes: 2 additions & 1 deletion FprimeZephyrReference/Components/FatalHandler/FatalHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@
//
// ======================================================================

#include <zephyr/sys/reboot.h>
#include <FprimeZephyrReference/Components/FatalHandler/FatalHandler.hpp>
#include <Fw/FPrimeBasicTypes.hpp>
#include <Fw/Logger/Logger.hpp>

#include <zephyr/sys/reboot.h>

namespace Components {

// ----------------------------------------------------------------------
Expand Down
3 changes: 2 additions & 1 deletion FprimeZephyrReference/Components/FsSpace/FsSpace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
// ======================================================================

#include "FprimeZephyrReference/Components/FsSpace/FsSpace.hpp"

#include "Os/FileSystem.hpp"
#include <zephyr/kernel.h>
#include <zephyr/sys/printk.h>
#include "Os/FileSystem.hpp"

namespace Components {

Expand Down
1 change: 1 addition & 0 deletions FprimeZephyrReference/Components/Watchdog/Watchdog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// ======================================================================

#include "FprimeZephyrReference/Components/Watchdog/Watchdog.hpp"

#include "config/FpConfig.hpp"

namespace Components {
Expand Down
1 change: 1 addition & 0 deletions FprimeZephyrReference/Components/Watchdog/Watchdog.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "FprimeZephyrReference/Components/Watchdog/WatchdogComponentAc.hpp"
// Need to explicitly include because Fw.On is no longer a tlm channel I believe
#include <atomic>

#include "Fw/Types/OnEnumAc.hpp"

namespace Components {
Expand Down
1 change: 0 additions & 1 deletion FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentTopologyDefs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

// Include autocoded FPP constants
#include "FprimeZephyrReference/ReferenceDeployment/Top/FppConstantsAc.hpp"

#include <zephyr/device.h>
#include <zephyr/drivers/uart.h>
#include <zephyr/kernel.h>
Expand Down
3 changes: 2 additions & 1 deletion FprimeZephyrReference/project/config/LoRaCfg.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#ifndef LORA_CFG_HPP
#define LORA_CFG_HPP
#include <zephyr/drivers/lora.h>
#include <Fw/FPrimeBasicTypes.hpp>

#include <zephyr/drivers/lora.h>
namespace LoRaConfig {
const U32 FREQUENCY = 437400000; //!< LoRa frequency in Hz
lora_signal_bandwidth BANDWIDTH = BW_125_KHZ; //!< LoRa bandwidth
Expand Down
Loading