fixed merge conflicts

2021-04-26 17:50:36 +02:00
parent ebdc492ed1 ec76222907
commit d63c825c7f
17 changed files with 929 additions and 23 deletions
--- a/mission/devices/devicedefinitions/IMTQHandlerDefinitions.h
+++ b/mission/devices/devicedefinitions/IMTQHandlerDefinitions.h
@ -32,6 +32,7 @@ namespace IMTQ {
 	static const uint8_t MAX_REPLY_SIZE = SIZE_ENG_HK_DATA_REPLY;
 	static const uint8_t MAX_COMMAND_SIZE = 9;

+	/** Define entries in IMTQ specific dataset */
 	static const uint8_t ENG_HK_SET_POOL_ENTRIES = 11;
 	static const uint8_t CAL_MTM_POOL_ENTRIES = 4;