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

moved some object ids

Browse Source
This commit is contained in:
Robin Müller 2021-06-24 16:49:36 +02:00 committed by Robin.Mueller
parent cd395aa9c4
commit a167b53096
3 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
common/config/commonObjects.h
View File

@ -35,22 +35,43 @@ enum commonObjects: uint32_t {
IMTQ_HANDLER = 0x44140014,
PLOC_HANDLER = 0x44330015,
SUS_1 = 0x44000016,
SUS_2 = 0x44000017,
SUS_3 = 0x44000018,
SUS_4 = 0x44000019,
SUS_5 = 0x44000020,
SUS_6 = 0x44000021,
SUS_7 = 0x44000022,
SUS_8 = 0x44000023,
SUS_9 = 0x44000024,
SUS_10 = 0x44000025,
SUS_11 = 0x44000026,
SUS_12 = 0x44000027,
SUS_13 = 0x44000028,
/**
* Not yet specified which pt1000 will measure which device/location in the satellite.
* Therefore object ids are named according to the IC naming of the RTDs in the schematic.
*/
RTD_IC3 = 0x44420016,
RTD_IC4 = 0x44420017,
RTD_IC5 = 0x44420018,
RTD_IC6 = 0x44420019,
RTD_IC7 = 0x44420020,
RTD_IC8 = 0x44420021,
RTD_IC9 = 0x44420022,
RTD_IC10 = 0x44420023,
RTD_IC11 = 0x44420024,
RTD_IC12 = 0x44420025,
RTD_IC13 = 0x44420026,
RTD_IC14 = 0x44420027,
RTD_IC15 = 0x44420028,
RTD_IC16 = 0x44420029,
RTD_IC17 = 0x44420030,
RTD_IC18 = 0x44420031,
GPS0_HANDLER = 0x44130029,
GPS1_HANDLER = 0x44130130
SUS_1 = 0x44120032,
SUS_2 = 0x44120033,
SUS_3 = 0x44120034,
SUS_4 = 0x44120035,
SUS_5 = 0x44120036,
SUS_6 = 0x44120037,
SUS_7 = 0x44120038,
SUS_8 = 0x44120039,
SUS_9 = 0x44120040,
SUS_10 = 0x44120041,
SUS_11 = 0x44120042,
SUS_12 = 0x44120043,
SUS_13 = 0x44120044,
GPS0_HANDLER = 0x44130045,
GPS1_HANDLER = 0x44130146
};
}

31
linux/fsfwconfig/objects/systemObjectList.h
View File

@ -49,32 +49,11 @@ enum sourceObjects: uint32_t {
GPIO_IF = 0x49010005,
/* Custom device handler */
PCDU_HANDLER = 0x44200050,
SOLAR_ARRAY_DEPL_HANDLER = 0x44410051,
SYRLINKS_HK_HANDLER = 0x44530052,
HEATER_HANDLER = 0x44410053,
/**
* Not yet specified which pt1000 will measure which device/location in the satellite.
* Therefore object ids are named according to the IC naming of the RTDs in the schematic.
*/
RTD_IC3 = 0x44420054,
RTD_IC4 = 0x44420056,
RTD_IC5 = 0x44420057,
RTD_IC6 = 0x44420058,
RTD_IC7 = 0x44420059,
RTD_IC8 = 0x44420060,
RTD_IC9 = 0x44420061,
RTD_IC10 = 0x44420062,
RTD_IC11 = 0x44420063,
RTD_IC12 = 0x44420064,
RTD_IC13 = 0x44420065,
RTD_IC14 = 0x44420066,
RTD_IC15 = 0x44420067,
RTD_IC16 = 0x44420068,
RTD_IC17 = 0x44420069,
RTD_IC18 = 0x44420070,
RAD_SENSOR = 0x44300071,
PCDU_HANDLER = 0x442000A1,
SOLAR_ARRAY_DEPL_HANDLER = 0x444100A2,
SYRLINKS_HK_HANDLER = 0x445300A3,
HEATER_HANDLER = 0x444100A4,
RAD_SENSOR = 0x443200A5,
/* 0x54 ('T') for test handlers */
TEST_TASK = 0x54694269,

2
tmtc

@ -1 +1 @@
Subproject commit 8a66b2a721882acf342d1e25c9967db3651a919f
Subproject commit 2a9862489d57e2ccbf8b9ca5017f5e89395acddf