Extend Commands.h to include new Command protocol model

Author: andreagilardoni

src/message/Commands.h

@@ -17,11 +17,33 @@
 #include <stdint.h>
 #include <stddef.h>
 
+<<<<<<< HEAD
 /******************************************************************************
  * TYPEDEF
  ******************************************************************************/
 
 enum CommandId : uint16_t {
+=======
+#if __cplusplus >= 201402L // Cpp14
+#include <algorithm>
+#endif // __cplusplus
+
+/******************************************************************************
+ * DEFINE
+ ******************************************************************************/
+
+#define THING_ID_SIZE               37
+#define SHA256_SIZE                 32
+#define URL_SIZE                   256
+#define ID_SIZE                     16
+#define MAX_LIB_VERSION_SIZE        10
+
+/******************************************************************************
+    TYPEDEF
+ ******************************************************************************/
+
+enum CommandID: uint32_t {
+>>>>>>> 9d4009fa (Extend Commands.h to include new Command protocol model)
 
   /* Device commands */
   DeviceBeginCmdId,
@@ -39,12 +61,112 @@ enum CommandId : uint16_t {
   /* Generic commands */
   ResetCmdId,
 
+<<<<<<< HEAD
+=======
+  /* OTA commands */
+  OtaBeginUpId,
+  OtaProgressCmdUpId,
+  OtaUpdateCmdDownId,
+
+  /* Timezone commands */
+  TimezoneCommandUpId,
+  TimezoneCommandDownId,
+
+>>>>>>> 9d4009fa (Extend Commands.h to include new Command protocol model)
   /* Unknown command id */
   UnknownCmdId
 };
 
 struct Command {
+<<<<<<< HEAD
   CommandId id;
 };
 
 typedef Command Message;
+=======
+  CommandID id;
+};
+
+typedef Command Message;
+
+struct ThingGetIdCmdUp {
+  Command c;
+  struct {
+    char thing_id[THING_ID_SIZE];
+  } params;
+};
+
+struct ThingGetLastValueCmdUp {
+  Command c;
+};
+
+struct OtaBeginUp {
+  Command c;
+  struct {
+    uint8_t sha [SHA256_SIZE];
+  } params;
+};
+
+struct DeviceBeginCmdUp {
+  Command c;
+  struct {
+    char lib_version[MAX_LIB_VERSION_SIZE];
+  } params;
+};
+
+struct OtaProgressCmdUp {
+  Command c;
+  struct {
+    uint8_t  id[ID_SIZE];
+    uint8_t  state;
+    int32_t  state_data;
+    uint64_t time;
+  } params;
+};
+
+struct TimezoneCommandUp {
+    Command c;
+};
+
+struct OtaUpdateCmdDown {
+  Command c;
+  struct {
+    uint8_t id[ID_SIZE];
+    char    url[URL_SIZE];
+    uint8_t initialSha256[SHA256_SIZE];
+    uint8_t finalSha256[SHA256_SIZE];
+  } params;
+};
+
+struct ThingGetIdCmdDown {
+  Command c;
+  struct {
+    char thing_id[THING_ID_SIZE];
+  } params;
+};
+
+struct ThingGetLastValueCmdDown {
+  Command c;
+  struct {
+    uint8_t * last_values;
+    size_t length;
+  } params;
+};
+
+struct TimezoneCommandDown{
+  Command c;
+  struct {
+    int32_t offset;
+    uint32_t until;
+  } params;
+};
+
+union CommandDown {
+  struct Command                  c;
+  struct OtaUpdateCmdDown         otaUpdateCmdDown;
+  struct ThingGetIdCmdDown        thingGetIdCmdDown;
+  struct ThingGetLastValueCmdDown thingGetLastValueCmdDown;
+  struct TimezoneCommandDown      timezoneCommandDown;
+};
+
+>>>>>>> 9d4009fa (Extend Commands.h to include new Command protocol model)