From cd395aa9c444d10846bc1ef5b263a7e09278e7d8 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 24 Jun 2021 16:43:15 +0200 Subject: [PATCH] updated object IDs again --- common/config/commonObjects.h | 12 ++++++------ tmtc | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/common/config/commonObjects.h b/common/config/commonObjects.h index 24d7cc27..a8d8fc4f 100644 --- a/common/config/commonObjects.h +++ b/common/config/commonObjects.h @@ -17,12 +17,12 @@ enum commonObjects: uint32_t { CORE_CONTROLLER = 0x43000003, /* 0x44 ('D') for device handlers */ - P60DOCK_HANDLER = 0x44200000, - PDU1_HANDLER = 0x44200001, - PDU2_HANDLER = 0x44200002, - ACU_HANDLER = 0x44200003, - TMP1075_HANDLER_1 = 0x44400004, - TMP1075_HANDLER_2 = 0x44400005, + P60DOCK_HANDLER = 0x44250000, + PDU1_HANDLER = 0x44250001, + PDU2_HANDLER = 0x44250002, + ACU_HANDLER = 0x44250003, + TMP1075_HANDLER_1 = 0x44420004, + TMP1075_HANDLER_2 = 0x44420005, MGM_0_LIS3_HANDLER = 0x44120006, MGM_1_RM3100_HANDLER = 0x44120007, MGM_2_LIS3_HANDLER = 0x44120008, diff --git a/tmtc b/tmtc index f4e5bc19..8a66b2a7 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit f4e5bc19568fc9786a3e5ac0a9164dbfe1dcbbe3 +Subproject commit 8a66b2a721882acf342d1e25c9967db3651a919f