Merge remote-tracking branch 'origin/develop' into mueller/master

2021-08-09 16:45:32 +02:00
parent 03510e5de9 ec27521c35
commit 3b915f4c97
22 changed files with 1452 additions and 596 deletions
--- a/common/config/commonConfig.h.in
+++ b/common/config/commonConfig.h.in
@ -5,6 +5,6 @@

 // Use TCP instead of UDP for the TMTC bridge. This allows using the TMTC client locally
 // because UDP packets are not allowed in the VPN
-#define OBSW_USE_TMTC_TCP_BRIDGE        1
+#define OBSW_USE_TMTC_TCP_BRIDGE        0

 #endif /* COMMON_CONFIG_COMMONCONFIG_H_ */
--- a/common/config/commonObjects.h
+++ b/common/config/commonObjects.h
@ -80,7 +80,9 @@ enum commonObjects: uint32_t {
    RW3 = 0x44120003,
    RW4 = 0x44120004,

-    START_TRACKER = 0x44130001
+    START_TRACKER = 0x44130001,
+
+    PLOC_UPDATER = 0x44330000
 };
 }

--- a/common/config/commonSubsystemIds.h
+++ b/common/config/commonSubsystemIds.h
@ -17,6 +17,7 @@ enum: uint8_t {
 	STR_HANDLER = 114,
 	PLOC_SUPERVISOR_HANDLER = 115,
 	FILE_SYSTEM = 116,
+	PLOC_UPDATER = 117,
 	COMMON_SUBSYSTEM_ID_END
 };
 }