From f447a1bdeff60ccba709e35c3528acca1ab66906 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 27 Dec 2020 17:14:26 +0100 Subject: [PATCH 1/2] another fix --- mission/devices/MGMHandlerLIS3MDL.cpp | 4 ++-- tmtc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mission/devices/MGMHandlerLIS3MDL.cpp b/mission/devices/MGMHandlerLIS3MDL.cpp index 1cc83bf8..5de4f719 100644 --- a/mission/devices/MGMHandlerLIS3MDL.cpp +++ b/mission/devices/MGMHandlerLIS3MDL.cpp @@ -154,7 +154,7 @@ ReturnValue_t MGMHandlerLIS3MDL::buildCommandFromCommand( return setOperatingMode(commandData, commandDataLen); } default: - lastSentCommand = DeviceHandlerIF::NO_COMMAND; + lastSentCommand = DeviceHandlerIF::NO_COMMAND_ID; return DeviceHandlerIF::COMMAND_NOT_IMPLEMENTED; } return HasReturnvaluesIF::RETURN_FAILED; @@ -283,7 +283,7 @@ ReturnValue_t MGMHandlerLIS3MDL::interpretDeviceReply(DeviceCommandId_t id, } default: { - return DeviceHandlerIF::UNKNOW_DEVICE_REPLY; + return DeviceHandlerIF::UNKNOWN_DEVICE_REPLY; } } diff --git a/tmtc b/tmtc index e0c896e6..9be8713f 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit e0c896e62d25286d00599ca57b71d0a3495ed95f +Subproject commit 9be8713fa0cc6128e9469da2e635365b03146de3 From e475cc408b45eefd20f25dae16880514c9aa0d74 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 27 Dec 2020 17:15:59 +0100 Subject: [PATCH 2/2] fix --- mission/devices/MGMHandlerLIS3MDL.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mission/devices/MGMHandlerLIS3MDL.h b/mission/devices/MGMHandlerLIS3MDL.h index b400daee..a5a1cadf 100644 --- a/mission/devices/MGMHandlerLIS3MDL.h +++ b/mission/devices/MGMHandlerLIS3MDL.h @@ -144,7 +144,7 @@ private: * As this is a SPI Device, we get the Answer of the last sent command in * the next read cycle, so we could check the command for identification. */ - DeviceCommandId_t lastSentCommand = DeviceHandlerIF::NO_COMMAND; + DeviceCommandId_t lastSentCommand = DeviceHandlerIF::NO_COMMAND_ID; /** * We always update all registers together, so this method updates