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

fixed merge conflicts

Browse Source
This commit is contained in:
Jakob.Meier
2021-07-23 17:48:11 +02:00
parent 0cc454d891 62fe0571b1
commit a2e62b28c3
70 changed files with 1597 additions and 606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/config/commonObjects.h
View File

@ -10,6 +10,7 @@ enum commonObjects: uint32_t {
PUS_PACKET_DISTRIBUTOR = 0x50000200,
UDP_BRIDGE = 0x50000300,
UDP_POLLING_TASK = 0x50000400,
FILE_SYSTEM_HANDLER = 0x50000500,
/* 0x43 ('C') for Controllers */
THERMAL_CONTROLLER = 0x43400001,

1
common/config/commonSubsystemIds.h
View File

@ -16,6 +16,7 @@ enum: uint8_t {
RW_HANDLER = 113,
STR_HANDLER = 114,
PLOC_SUPERVISOR_HANDLER = 115,
FILE_SYSTEM = 116,
COMMON_SUBSYSTEM_ID_END
};
}

2
common/config/spiConf.h
View File

@ -2,7 +2,7 @@
#define COMMON_CONFIG_SPICONF_H_
#include <cstdint>
#include <fsfw_hal/linux/spi/spiDefinitions.h>
#include <fsfw/hal/linux/spi/spiDefinitions.h>
/**
* SPI configuration will be contained here to let the device handlers remain independent