ble-dongle: Split commands into shared and non-shared

nucleo-wb55-dongle-ble/app/Command.hpp

@@ -1,40 +0,0 @@
-/*
- * Command.hpp
- *
- *  Created on: Jul 8, 2021
- *      Author: Andreas Berthoud
- */
-
-#ifndef SRC_COMMAND_H_
-#define SRC_COMMAND_H_
-
-#include <stdint.h>
-
-extern "C" void pop_and_execute_commands();
-extern "C" void handle_received_command(uint8_t command_id, uint8_t * payload_ptr, uint16_t length);
-
-typedef enum : uint8_t {
-    COMMAND_NONE = 0,
-    COMMAND_LOG = 0x1,
-    COMMAND_HEARTBEAT_REQUEST = 0x2,
-    COMMAND_HEARTBEAT_RESPONSE = 0x3,
-    COMMAND_LED_REQUEST = 0x4,
-    COMMAND_LED_RESPONSE = 0x5,
-    COMMAND_GP_REQUEST = 0x6,
-    COMMAND_GP_RESPONSE = 0x7,
-} CommandId;
-
-
-class Command {
-public:
-  CommandId id; 
-
-  virtual ~Command() {};
-
-  virtual CommandId get_command_id() = 0;
-  virtual bool execute() = 0;
-};
-
-void push_command(Command * command);
-
-#endif /* SRC_COMMAND_H_ */

nucleo-wb55-dongle-ble/app/commands.hpp

@@ -1,16 +0,0 @@
-/*
- * commands.hpp
- *
- *  Created on: Jul 13, 2021
- *      Author: Andreas Berthoud
- */
-
-#ifndef COMMANDS_HPP_
-#define COMMANDS_HPP_
-
-extern "C" void log_debug(const char * format, int nargs, ...);
-extern "C" void log_info(const char * format, int nargs, ...);
-extern "C" void log_warning(const char * format, int nargs, ...);
-extern "C" void log_error(const char * format, int nargs, ...);
-
-#endif /* COMMANDS_HPP_ */

nucleo-wb55-dongle-ble/app/GPCommand.cpp → nucleo-wb55-dongle-ble/commands/GPCommand.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "GPCommand.hpp"
+
 #include "app_ble.h"
 
 GPResponse::GPResponse(uint16_t response_identifier, bool was_successful) 

nucleo-wb55-dongle-ble/commands/dispatch.cpp

@@ -0,0 +1,32 @@
+/*
+ * dispatch.cpp
+ *
+ *  Created on: 18 Jul 2021
+ *      Author: Andreas Berthoud
+ */
+
+#include "dispatch.hpp"
+
+#include "GPCommand.hpp"
+#include "HeartbeatCommand.hpp"
+#include "LedCommand.hpp"
+
+void handle_received_command(uint8_t command_id, uint8_t * payload_ptr, uint16_t size) {
+
+  switch (command_id)
+  {
+  case COMMAND_HEARTBEAT_REQUEST:
+    push_command(new HeartbeatRequest(payload_ptr, size));
+    break;
+  case COMMAND_LED_REQUEST:
+    push_command(new LedRequest(payload_ptr, size));
+    break;
+  case COMMAND_GP_REQUEST:
+    push_command(new GPRequest(payload_ptr, size));
+    break;
+
+  default:
+    break;
+  }
+
+}

nucleo-wb55-dongle-ble/commands/dispatch.hpp

@@ -0,0 +1,15 @@
+/*
+ * dispatch.hpp
+ *
+ *  Created on: 18 Jul 2021
+ *      Author: Andreas Berthoud
+ */
+
+#ifndef DISPATCH_HPP_
+#define DISPATCH_HPP_
+
+#include <stdint.h>
+
+extern "C" void handle_received_command(uint8_t command_id, uint8_t * payload_ptr, uint16_t length);
+
+#endif /* DISPATCH_HPP_ */

nucleo-wb55-dongle-ble/shared_commands/Command.hpp

@@ -0,0 +1,25 @@
+/*
+ * Command.hpp
+ *
+ *  Created on: Jul 8, 2021
+ *      Author: Andreas Berthoud
+ */
+
+#ifndef SRC_COMMAND_H_
+#define SRC_COMMAND_H_
+
+#include "commands.hpp"
+
+class Command {
+public:
+  CommandId id; 
+
+  virtual ~Command() {};
+
+  virtual CommandId get_command_id() = 0;
+  virtual bool execute() = 0;
+};
+
+void push_command(Command * command);
+
+#endif /* SRC_COMMAND_H_ */

nucleo-wb55-dongle-ble/app/LogCommand.hpp → nucleo-wb55-dongle-ble/shared_commands/LogCommand.hpp

@@ -9,6 +9,7 @@
 #define LOGCOMMAND_H_
 
 #include "Notification.hpp"
+#include <stdarg.h>
 
 extern "C" void log_debug(const char * logger_name, const char * format, int nargs, ...);
 extern "C" void log_info(const char * logger_name, const char * format, int nargs, ...);

nucleo-wb55-dongle-ble/app/commands.h → nucleo-wb55-dongle-ble/shared_commands/commands.h

@@ -8,12 +8,12 @@
 #ifndef COMMANDS_H_
 #define COMMANDS_H_
 
-void pop_and_execute_commands();
-void handle_received_command(uint8_t command_id, uint8_t * payload_ptr, uint16_t length);
-
 void log_debug(const char * logger_name, const char * format, int nargs, ...);
 void log_info(const char * logger_name, const char * format, int nargs, ...);
 void log_warning(const char * logger_name, const char * format, int nargs, ...);
 void log_error(const char * logger_name, const char * format, int nargs, ...);
 
+void pop_and_execute_commands();
+void handle_received_command(uint8_t command_id, uint8_t * payload_ptr, uint16_t length);
+
 #endif /* COMMANDS_H_ */

nucleo-wb55-dongle-ble/shared_commands/commands.hpp

@@ -0,0 +1,24 @@
+/*
+ * commands.hpp
+ *
+ *  Created on: Jul 13, 2021
+ *      Author: Andreas Berthoud
+ */
+
+#ifndef COMMANDS_HPP_
+#define COMMANDS_HPP_
+
+#include <stdint.h>
+
+typedef enum : uint8_t {
+    COMMAND_NONE = 0,
+    COMMAND_LOG = 0x1,
+    COMMAND_HEARTBEAT_REQUEST = 0x2,
+    COMMAND_HEARTBEAT_RESPONSE = 0x3,
+    COMMAND_LED_REQUEST = 0x4,
+    COMMAND_LED_RESPONSE = 0x5,
+    COMMAND_GP_REQUEST = 0x6,
+    COMMAND_GP_RESPONSE = 0x7,
+} CommandId;
+
+#endif /* COMMANDS_HPP_ */

nucleo-wb55-dongle-ble/app/Command.cpp → nucleo-wb55-dongle-ble/shared_commands/execute.cpp

@@ -1,19 +1,17 @@
 /*
- * Command.cpp
+ * execute.cpp
  *
- *  Created on: Jul 8, 2021
+ *  Created on: 18 Jul 2021
  *      Author: Andreas Berthoud
  */
+
 #include <queue>
 #include <cstring>
 
 #include "Command.hpp"
-#include "string.h"
+#include "execute.hpp"
 #include "stm32wbxx_hal.h"
-#include "commands.hpp"
+#include "LogCommand.hpp"
-#include "HeartbeatCommand.hpp"
-#include "LedCommand.hpp"
-#include "GPCommand.hpp"
 
 std::queue<Command*> command_queue;
 
@@ -28,29 +26,12 @@ void pop_and_execute_commands() {
     bool was_successful = command->execute();
     HAL_Delay(5);  // this delay is required. Otherwise, the command were not sent somehow...
     if (!was_successful) {
-      log_error("Execution of command with ID %n was not successful!", 1, command->id);
+      log_error("pop_and_execute_commands", "Execution of command with ID %n was not successful!", 1, command->id);
     }
     delete command;
     command_queue.pop();
   }
 }
 
-void handle_received_command(uint8_t command_id, uint8_t * payload_ptr, uint16_t size) {
-
-  switch (command_id)
-  {
-  case COMMAND_HEARTBEAT_REQUEST:
-    push_command(new HeartbeatRequest(payload_ptr, size));
-    break;
-  case COMMAND_LED_REQUEST:
-    push_command(new LedRequest(payload_ptr, size));
-    break;
-  case COMMAND_GP_REQUEST:
-    push_command(new GPRequest(payload_ptr, size));
-    break;
-
-  default:
-    break;
-  }
 
-}
+

nucleo-wb55-dongle-ble/shared_commands/execute.hpp

@@ -0,0 +1,13 @@
+/*
+ * execute.hpp
+ *
+ *  Created on: 18 Jul 2021
+ *      Author: Andreas Berthoud
+ */
+
+#ifndef EXECUTE_HPP_
+#define EXECUTE_HPP_
+
+extern "C" void pop_and_execute_commands();
+
+#endif /* EXECUTE_HPP_ */