fixed merge conflicts

This commit is contained in:
2021-06-11 14:55:28 +02:00
59 changed files with 333 additions and 118 deletions

View File

@ -6,7 +6,7 @@
namespace CLASS_ID {
enum commonClassIds: uint8_t {
MISSION_CLASS_ID_START = FW_CLASS_ID_COUNT,
COMMON_CLASS_ID_START = FW_CLASS_ID_COUNT,
MGM_LIS3MDL, //MGMLIS3
MGM_RM3100, //MGMRM3100
PCDU_HANDLER, //PCDU