diff --git a/common/config/commonObjects.h b/common/config/commonObjects.h index a813fc11..24d7cc27 100644 --- a/common/config/commonObjects.h +++ b/common/config/commonObjects.h @@ -17,20 +17,20 @@ enum commonObjects: uint32_t { CORE_CONTROLLER = 0x43000003, /* 0x44 ('D') for device handlers */ - P60DOCK_HANDLER = 0x44200001, - PDU1_HANDLER = 0x44200002, - PDU2_HANDLER = 0x44200003, - ACU_HANDLER = 0x44200004, - TMP1075_HANDLER_1 = 0x44400005, - TMP1075_HANDLER_2 = 0x44400006, - MGM_0_LIS3_HANDLER = 0x44120007, - MGM_1_RM3100_HANDLER = 0x44120008, - MGM_2_LIS3_HANDLER = 0x44120009, - MGM_3_RM3100_HANDLER = 0x44120010, - GYRO_0_ADIS_HANDLER = 0x44120011, - GYRO_1_L3G_HANDLER = 0x44120012, - GYRO_2_ADIS_HANDLER = 0x44120013, - GYRO_3_L3G_HANDLER = 0x44120014, + P60DOCK_HANDLER = 0x44200000, + PDU1_HANDLER = 0x44200001, + PDU2_HANDLER = 0x44200002, + ACU_HANDLER = 0x44200003, + TMP1075_HANDLER_1 = 0x44400004, + TMP1075_HANDLER_2 = 0x44400005, + MGM_0_LIS3_HANDLER = 0x44120006, + MGM_1_RM3100_HANDLER = 0x44120007, + MGM_2_LIS3_HANDLER = 0x44120008, + MGM_3_RM3100_HANDLER = 0x44120009, + GYRO_0_ADIS_HANDLER = 0x44120010, + GYRO_1_L3G_HANDLER = 0x44120011, + GYRO_2_ADIS_HANDLER = 0x44120012, + GYRO_3_L3G_HANDLER = 0x44120013, IMTQ_HANDLER = 0x44140014, PLOC_HANDLER = 0x44330015, @@ -39,18 +39,18 @@ enum commonObjects: uint32_t { SUS_2 = 0x44000017, SUS_3 = 0x44000018, SUS_4 = 0x44000019, - SUS_5 = 0x4400001A, - SUS_6 = 0x4400001B, - SUS_7 = 0x4400001C, - SUS_8 = 0x4400001D, - SUS_9 = 0x4400001E, - SUS_10 = 0x4400001F, - SUS_11 = 0x44000021, - SUS_12 = 0x44000022, - SUS_13 = 0x44000023, + 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, - GPS0_HANDLER = 0x44001000, - GPS1_HANDLER = 0x44002000 + GPS0_HANDLER = 0x44130029, + GPS1_HANDLER = 0x44130130 }; } diff --git a/linux/fsfwconfig/objects/systemObjectList.h b/linux/fsfwconfig/objects/systemObjectList.h index a1c644da..05fbc997 100644 --- a/linux/fsfwconfig/objects/systemObjectList.h +++ b/linux/fsfwconfig/objects/systemObjectList.h @@ -49,32 +49,32 @@ enum sourceObjects: uint32_t { GPIO_IF = 0x49010005, /* Custom device handler */ - PCDU_HANDLER = 0x44200032, - SOLAR_ARRAY_DEPL_HANDLER = 0x44410033, - SYRLINKS_HK_HANDLER = 0x44530034, - HEATER_HANDLER = 0x44410035, + 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 = 0x44420036, - RTD_IC4 = 0x44420037, - RTD_IC5 = 0x44420038, - RTD_IC6 = 0x44420039, - RTD_IC7 = 0x44420040, - RTD_IC8 = 0x44420041, - RTD_IC9 = 0x44420042, - RTD_IC10 = 0x44420043, - RTD_IC11 = 0x44420044, - RTD_IC12 = 0x44420045, - RTD_IC13 = 0x44420046, - RTD_IC14 = 0x44420047, - RTD_IC15 = 0x44420048, - RTD_IC16 = 0x44420049, - RTD_IC17 = 0x44420050, - RTD_IC18 = 0x44420051, + 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 = 0x44300052, + RAD_SENSOR = 0x44300071, /* 0x54 ('T') for test handlers */ TEST_TASK = 0x54694269,