Merge pull request #24 from OpenShock/feature/implement-flatbuffers

Implement flatbuffers
OpenShock · Oct 6, 2023 · 4d425c9 · 4d425c9
2 parents 31ed932 + 9e7fdcd
commit 4d425c9
Show file tree

Hide file tree

Showing 15 changed files with 442 additions and 28 deletions.
diff --git a/include/CommandHandler.h b/include/CommandHandler.h
@@ -1,13 +1,15 @@
 #pragma once
 
+#include "ShockerCommandType.h"
+
 #include <cstdint>
 
 // TODO: This is bad architecture. Fix it.
 
 namespace OpenShock::CommandHandler {
   void Init();
   bool HandleCommand(std::uint16_t shockerId,
-                     std::uint8_t method,
+                     OpenShock::ShockerCommandType type,
                      std::uint8_t intensity,
                      unsigned int duration,
                      std::uint8_t shockerModel);

diff --git a/include/RFTransmitter.h b/include/RFTransmitter.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "ShockerCommandType.h"
+
 #include <cstdint>
 
 // Forward definitions to remove clutter
@@ -19,7 +21,7 @@ namespace OpenShock {
 
     bool SendCommand(std::uint8_t shockerModel,
                      std::uint16_t shockerId,
-                     std::uint8_t method,
+                     OpenShock::ShockerCommandType type,
                      std::uint8_t intensity,
                      unsigned int duration);
     void ClearPendingCommands();

diff --git a/include/Rmt/MainEncoder.h b/include/Rmt/MainEncoder.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "ShockerCommandType.h"
+
 #include <esp32-hal.h>
 
 #include <cstdint>
@@ -8,6 +10,6 @@
 
 namespace OpenShock::Rmt {
   std::vector<rmt_data_t>
-    GetSequence(std::uint16_t shockerId, std::uint8_t method, std::uint8_t intensity, std::uint8_t shockerModel);
+    GetSequence(std::uint16_t shockerId, OpenShock::ShockerCommandType type, std::uint8_t intensity, std::uint8_t shockerModel);
   std::shared_ptr<std::vector<rmt_data_t>> GetZeroSequence(std::uint16_t shockerId, std::uint8_t shockerModel);
 }
diff --git a/include/Rmt/PetTrainerEncoder.h b/include/Rmt/PetTrainerEncoder.h
@@ -1,10 +1,12 @@
 #pragma once
 
+#include "ShockerCommandType.h"
+
 #include <esp32-hal.h>
 
 #include <cstdint>
 #include <vector>
 
 namespace OpenShock::Rmt::PetTrainerEncoder {
-  std::vector<rmt_data_t> GetSequence(std::uint16_t shockerId, std::uint8_t method, std::uint8_t intensity);
+  std::vector<rmt_data_t> GetSequence(std::uint16_t shockerId, OpenShock::ShockerCommandType type, std::uint8_t intensity);
 }
diff --git a/include/Rmt/XlcEncoder.h b/include/Rmt/XlcEncoder.h
@@ -1,11 +1,15 @@
 #pragma once
 
+#include "ShockerCommandType.h"
+
 #include <esp32-hal.h>
 
 #include <cstdint>
 #include <vector>
 
 namespace OpenShock::Rmt::XlcEncoder {
-  std::vector<rmt_data_t>
-    GetSequence(std::uint16_t transmitterId, std::uint8_t channelId, std::uint8_t method, std::uint8_t intensity);
+  std::vector<rmt_data_t> GetSequence(std::uint16_t transmitterId,
+                                      std::uint8_t channelId,
+                                      OpenShock::ShockerCommandType type,
+                                      std::uint8_t intensity);
 }
diff --git a/include/ShockerCommandType.h b/include/ShockerCommandType.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <cstdint>
+
+namespace OpenShock {
+
+  enum ShockerCommandType : std::uint8_t {
+    Stop    = 0,
+    Shock   = 1,
+    Vibrate = 2,
+    Sound   = 3,
+  };
+
+}  // namespace OpenShock