KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

Merge branch 'master' into mueller/ipc-updates

Browse Source
This commit is contained in:
Robin Müller 2020-09-26 14:21:05 +02:00
commit 496251bd68
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
events/fwSubsystemIdRanges.h
View File

@ -19,6 +19,7 @@ enum {
SYSTEM_MANAGER_1 = 75, SYSTEM_MANAGER_1 = 75,
SYSTEM_1 = 79, SYSTEM_1 = 79,
PUS_SERVICE_1 = 80, PUS_SERVICE_1 = 80,
PUS_SERVICE_9 = 89,
PUS_SERVICE_17 = 97, PUS_SERVICE_17 = 97,
FW_SUBSYSTEM_ID_RANGE FW_SUBSYSTEM_ID_RANGE
}; };

2
objectmanager/frameworkObjects.h
View File

@ -8,6 +8,8 @@ enum framework_objects {
PUS_SERVICE_2 = 0x53000002, PUS_SERVICE_2 = 0x53000002,
PUS_SERVICE_5 = 0x53000005, PUS_SERVICE_5 = 0x53000005,
PUS_SERVICE_8 = 0x53000008, PUS_SERVICE_8 = 0x53000008,
PUS_SERVICE_9 = 0x53000009,
PUS_SERVICE_17 = 0x53000017,
PUS_SERVICE_200 = 0x53000200, PUS_SERVICE_200 = 0x53000200,
//Generic IDs for IPC, modes, health, events //Generic IDs for IPC, modes, health, events

2
osal/linux/Clock.cpp
View File

@ -6,8 +6,8 @@
#include <linux/sysinfo.h> #include <linux/sysinfo.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <fstream>
//#include <fstream>
uint16_t Clock::leapSeconds = 0; uint16_t Clock::leapSeconds = 0;
MutexIF* Clock::timeMutex = NULL; MutexIF* Clock::timeMutex = NULL;

1
returnvalues/FwClassIds.h
View File

@ -56,7 +56,6 @@ enum {
DEVICE_COMMUNICATION_IF, //DC DEVICE_COMMUNICATION_IF, //DC
BSP, //BSP BSP, //BSP
TIME_STAMPER_IF, //TSI 53 TIME_STAMPER_IF, //TSI 53
//TODO This will shift all IDs for FLP
SGP4PROPAGATOR_CLASS, //SGP4 54 SGP4PROPAGATOR_CLASS, //SGP4 54
MUTEX_IF, //MUX 55 MUTEX_IF, //MUX 55
MESSAGE_QUEUE_IF,//MQI 56 MESSAGE_QUEUE_IF,//MQI 56