🔀 Merge branch 'yann/feature/rfid/allow-deep-sleep' into develop

leka · Feb 4, 2024 · 53d1a4f · 53d1a4f
2 parents f1298d8 + 22d8ce7
commit 53d1a4f
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 2 deletions.
diff --git a/drivers/CoreRFIDReader/include/CoreRFIDReaderCR95HF.h b/drivers/CoreRFIDReader/include/CoreRFIDReaderCR95HF.h
@@ -186,6 +186,9 @@ class CoreRFIDReaderCR95HF : public interface::RFIDReader
 	auto getTag() -> rfid::Tag & final;
 	void onTagReadable() final;
 
+	void enableDeepSleep() final;
+	void disableDeepSleep() final;
+
   private:
 	void _receiveResponseFromTag();
 

diff --git a/drivers/CoreRFIDReader/source/CoreRFIDReaderCR95HF.cpp b/drivers/CoreRFIDReader/source/CoreRFIDReaderCR95HF.cpp
@@ -104,4 +104,14 @@ void CoreRFIDReaderCR95HF::onTagReadable()
 	_on_tag_readable(_tag);
 }
 
+void CoreRFIDReaderCR95HF::enableDeepSleep()
+{
+	_serial.enableDeepSleep();
+}
+
+void CoreRFIDReaderCR95HF::disableDeepSleep()
+{
+	_serial.disableDeepSleep();
+}
+
 }	// namespace leka
diff --git a/drivers/CoreRFIDReader/tests/CoreRFIDReaderCR95HF_test.cpp b/drivers/CoreRFIDReader/tests/CoreRFIDReaderCR95HF_test.cpp
@@ -212,3 +212,17 @@ TEST_F(CoreRFIDReaderTest, getTag)
 
 	EXPECT_EQ(tag.data, expected_values);
 }
+
+TEST_F(CoreRFIDReaderTest, enableDeepSleep)
+{
+	EXPECT_CALL(mockBufferedSerial, enableDeepSleep());
+
+	reader.enableDeepSleep();
+}
+
+TEST_F(CoreRFIDReaderTest, disableDeepSleep)
+{
+	EXPECT_CALL(mockBufferedSerial, disableDeepSleep());
+
+	reader.disableDeepSleep();
+}
diff --git a/include/interface/drivers/RFIDReader.h b/include/interface/drivers/RFIDReader.h
@@ -8,6 +8,8 @@
 #include <functional>
 #include <span>
 
+#include "DeepSleepEnabled.h"
+
 namespace leka {
 
 namespace rfid {
@@ -43,7 +45,7 @@ namespace rfid {
 
 namespace interface {
 
-	class RFIDReader
+	class RFIDReader : public interface::DeepSleepEnabled
 	{
 	  public:
 		virtual ~RFIDReader() = default;

diff --git a/libs/RFIDKit/include/RFIDKit.h b/libs/RFIDKit/include/RFIDKit.h
@@ -6,11 +6,12 @@
 
 #include "ISO14443A.h"
 #include "MagicCard.h"
+#include "interface/drivers/DeepSleepEnabled.h"
 #include "interface/drivers/RFIDReader.h"
 
 namespace leka {
 
-class RFIDKit
+class RFIDKit : public interface::DeepSleepEnabled
 {
   public:
 	explicit RFIDKit(interface::RFIDReader &rfid_reader) : _rfid_reader(rfid_reader) {};
@@ -23,6 +24,9 @@ class RFIDKit
 	[[nodiscard]] auto getCallback() const -> const std::function<void(const MagicCard &)> &;
 	[[nodiscard]] auto getLastMagicCardActivated() const -> const MagicCard &;
 
+	void enableDeepSleep() final;
+	void disableDeepSleep() final;
+
   private:
 	interface::RFIDReader &_rfid_reader;
 	MagicCard _card = MagicCard::none;

diff --git a/libs/RFIDKit/source/RFIDKit.cpp b/libs/RFIDKit/source/RFIDKit.cpp
@@ -53,4 +53,14 @@ void RFIDKit::onTagActivated(std::function<void(const MagicCard &_card)> const &
 	return _card;
 }
 
+void RFIDKit::enableDeepSleep()
+{
+	_rfid_reader.enableDeepSleep();
+}
+
+void RFIDKit::disableDeepSleep()
+{
+	_rfid_reader.disableDeepSleep();
+}
+
 }	// namespace leka
diff --git a/libs/RFIDKit/tests/RFIDKit_test.cpp b/libs/RFIDKit/tests/RFIDKit_test.cpp
@@ -181,3 +181,17 @@ TEST_F(RFIDKitTest, getLastMagicCardActivated)
 
 	EXPECT_EQ(rfid_kit.getLastMagicCardActivated(), MagicCard::emergency_stop);
 }
+
+TEST_F(RFIDKitTest, enableDeepSleep)
+{
+	EXPECT_CALL(mock_reader, enableDeepSleep());
+
+	rfid_kit.enableDeepSleep();
+}
+
+TEST_F(RFIDKitTest, disableDeepSleep)
+{
+	EXPECT_CALL(mock_reader, disableDeepSleep());
+
+	rfid_kit.disableDeepSleep();
+}
diff --git a/tests/unit/mocks/mocks/leka/CoreRFIDReader.h b/tests/unit/mocks/mocks/leka/CoreRFIDReader.h
@@ -21,6 +21,9 @@ class CoreRFIDReader : public interface::RFIDReader
 	MOCK_METHOD(void, onTagReadable, (), (override));
 	MOCK_METHOD(void, registerOnTagDetectedCallback, (const std::function<void()> &), (override));
 	MOCK_METHOD(void, registerOnTagReadableCallback, (const std::function<void(rfid::Tag &)> &), (override));
+
+	MOCK_METHOD(void, enableDeepSleep, (), (override));
+	MOCK_METHOD(void, disableDeepSleep, (), (override));
 };
 
 }	// namespace leka::mock