Skip to content

Commit 44304a4

Browse files
committed
Merge branch 'startup' of github.com:Open-Source-Space-Foundation/proves-core-reference into startup
2 parents 90d133b + ccea379 commit 44304a4

File tree

2 files changed

+15
-18
lines changed

2 files changed

+15
-18
lines changed

FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentPackets.fppi

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,6 @@ telemetry packets ReferenceDeploymentPackets {
6161
ReferenceDeployment.antennaDeployer.LastDistance
6262
}
6363

64-
packet FileStatus id 9 group 4{
65-
66-
FileHandling.fileUplink.FilesReceived
67-
FileHandling.fileUplink.PacketsReceived
68-
FileHandling.fileDownlink.FilesSent
69-
FileHandling.fileDownlink.PacketsSent
70-
FileHandling.fileManager.CommandsExecuted
71-
FileHandling.fileManager.Errors
72-
FileHandling.fileUplink.Warnings
73-
FileHandling.fileDownlink.Warnings
74-
75-
}
76-
7764
} omit {
7865
CdhCore.cmdDisp.CommandErrors
7966
# Only has one library, no custom versions
@@ -96,4 +83,12 @@ telemetry packets ReferenceDeploymentPackets {
9683
CdhCore.version.CustomVersion08
9784
CdhCore.version.CustomVersion09
9885
CdhCore.version.CustomVersion10
86+
FileHandling.fileUplink.FilesReceived
87+
FileHandling.fileUplink.PacketsReceived
88+
FileHandling.fileDownlink.FilesSent
89+
FileHandling.fileDownlink.PacketsSent
90+
FileHandling.fileManager.CommandsExecuted
91+
FileHandling.fileManager.Errors
92+
FileHandling.fileUplink.Warnings
93+
FileHandling.fileDownlink.Warnings
9994
}

FprimeZephyrReference/ReferenceDeployment/Top/ReferenceDeploymentTopologyDefs.hpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
// SubtopologyTopologyDefs includes
1616
#include "Svc/Subtopologies/CdhCore/SubtopologyTopologyDefs.hpp"
1717
#include "Svc/Subtopologies/ComCcsds/SubtopologyTopologyDefs.hpp"
18+
#include "Svc/Subtopologies/FileHandling/SubtopologyTopologyDefs.hpp"
1819

1920
// ComCcsds Enum Includes
2021
#include "Svc/Subtopologies/ComCcsds/Ports_ComBufferQueueEnumAc.hpp"
@@ -69,11 +70,12 @@ namespace ReferenceDeployment {
6970
* autocoder. The contents are entirely up to the definition of the project. This deployment uses subtopologies.
7071
*/
7172
struct TopologyState {
72-
const device* uartDevice; //!< UART device path for communication
73-
const device* loraDevice; //!< LoRa device path for communication
74-
U32 baudRate; //!< Baud rate for UART communication
75-
CdhCore::SubtopologyState cdhCore; //!< Subtopology state for CdhCore
76-
ComCcsds::SubtopologyState comCcsds; //!< Subtopology state for ComCcsds
73+
const device* uartDevice; //!< UART device path for communication
74+
const device* loraDevice; //!< LoRa device path for communication
75+
U32 baudRate; //!< Baud rate for UART communication
76+
CdhCore::SubtopologyState cdhCore; //!< Subtopology state for CdhCore
77+
ComCcsds::SubtopologyState comCcsds; //!< Subtopology state for ComCcsds
78+
FileHandling::SubtopologyState fileHandling; //!< Subtopology state for FileHandling
7779
};
7880

7981
namespace PingEntries = ::PingEntries;

0 commit comments

Comments
 (0)