eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

Merge remote-tracking branch 'origin/develop' into heater_handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2022-12-13 10:13:32 +01:00
commit 7ea2fd67c7
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fsfw

@ -1 +1 @@
Subproject commit 5b0ea91222a6b8efb2f4562cfecbcb735dfeedd5 Subproject commit 05cad893a2b713827cf4cdc9afe49675f18afcc7

2
mission/devices/devicedefinitions/GPSDefinitions.h
View File

@ -1,9 +1,9 @@
#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_GPSDEFINITIONS_H_ #ifndef MISSION_DEVICES_DEVICEDEFINITIONS_GPSDEFINITIONS_H_
#define MISSION_DEVICES_DEVICEDEFINITIONS_GPSDEFINITIONS_H_ #define MISSION_DEVICES_DEVICEDEFINITIONS_GPSDEFINITIONS_H_
#include "eive/eventSubsystemIds.h"
#include "fsfw/datapoollocal/StaticLocalDataSet.h" #include "fsfw/datapoollocal/StaticLocalDataSet.h"
#include "fsfw/devicehandlers/DeviceHandlerIF.h" #include "fsfw/devicehandlers/DeviceHandlerIF.h"
#include "eive/eventSubsystemIds.h"
namespace GpsHyperion { namespace GpsHyperion {

2
tmtc

@ -1 +1 @@
Subproject commit 56d0f26cbffbfbf4e790d3a19858162291104934 Subproject commit 30cf47365fec68a4b78395de03ecb2ae95af4e7e