Merge remote-tracking branch 'origin/main' into feature_3v3_stack_switching

This commit is contained in:
Robin Müller 2023-04-03 19:58:29 +02:00
commit de1188c1bb

View File

@ -2,6 +2,8 @@ from eive_tmtc.config.object_ids import (
ACS_SUBSYSTEM_ID, ACS_SUBSYSTEM_ID,
ACS_CONTROLLER, ACS_CONTROLLER,
IMTQ_HANDLER_ID, IMTQ_HANDLER_ID,
GPS_0_HEALTH_DEV,
GPS_1_HEALTH_DEV,
GYRO_0_ADIS_HANDLER_ID, GYRO_0_ADIS_HANDLER_ID,
GYRO_1_L3G_HANDLER_ID, GYRO_1_L3G_HANDLER_ID,
ACS_BOARD_ASS_ID, ACS_BOARD_ASS_ID,
@ -27,6 +29,7 @@ ACS_OBJ_DICT = {
6: ("GYR 1 L3G", GYRO_1_L3G_HANDLER_ID), 6: ("GYR 1 L3G", GYRO_1_L3G_HANDLER_ID),
7: ("MGM 0 LIS3", MGM_0_LIS3_HANDLER_ID), 7: ("MGM 0 LIS3", MGM_0_LIS3_HANDLER_ID),
8: ("MGM 1 RM3100", MGM_1_RM3100_HANDLER_ID), 8: ("MGM 1 RM3100", MGM_1_RM3100_HANDLER_ID),
9: ("GPS 0 Health Device", GPS_0_HEALTH_DEV)
} }