fixed conflicts
This commit is contained in:
@ -27,6 +27,7 @@ START_TRACKER_ID = bytes([0x44, 0x13, 0x00, 0x1])
|
||||
RAD_SENSOR_ID = bytes([0x44, 0x32, 0x00, 0xA5])
|
||||
PLOC_SUPV_ID = bytes([0x44, 0x33, 0x00, 0x16])
|
||||
PLOC_UPDATER_ID = bytes([0x44, 0x33, 0x00, 0x00])
|
||||
CORE_CONTROLLER_ID = bytes([0x43, 0x00, 0x00, 0x03])
|
||||
|
||||
|
||||
def get_object_ids() -> Dict[bytes, list]:
|
||||
@ -48,5 +49,6 @@ def get_object_ids() -> Dict[bytes, list]:
|
||||
RW4_ID: "Reaction Wheel 4",
|
||||
RAD_SENSOR_ID: "Radiation Sensor",
|
||||
PLOC_SUPV_ID: "PLOC Supervisor",
|
||||
CORE_CONTROLLER_ID: "Core Controller",
|
||||
})
|
||||
return object_id_dict
|
||||
|
Reference in New Issue
Block a user