Diff: Blynk/BlynkProtocolDefs.h

Revision:

10:c241e4227173

Parent:

9:7369ec77a3ea

Child:

14:76d8fd871a4d

--- a/Blynk/BlynkProtocolDefs.h	Thu Jan 05 14:55:36 2017 +0200
+++ b/Blynk/BlynkProtocolDefs.h	Thu Jan 12 02:10:58 2017 +0200
@@ -31,7 +31,7 @@
     BLYNK_CMD_NOTIFY         = 14,
     BLYNK_CMD_BRIDGE         = 15,
     BLYNK_CMD_HARDWARE_SYNC  = 16,
-    BLYNK_CMD_HARDWARE_INFO  = 17,
+    BLYNK_CMD_INTERNAL       = 17,
     BLYNK_CMD_SMS            = 18,
     BLYNK_CMD_PROPERTY       = 19,
     BLYNK_CMD_HARDWARE       = 20,
@@ -52,8 +52,6 @@
 
     BLYNK_CMD_REDIRECT        = 41,
 
-    BLYNK_CMD_APP_CONNECTED   = 50,
-
     BLYNK_CMD_DEBUG_PRINT     = 55
 };
 
@@ -113,23 +111,26 @@
 #endif
 
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-    #define BLYNK_HW_PM (('p' << 0) | ('m' << 8))
-    #define BLYNK_HW_DW (('d' << 0) | ('w' << 8))
-    #define BLYNK_HW_DR (('d' << 0) | ('r' << 8))
-    #define BLYNK_HW_AW (('a' << 0) | ('w' << 8))
-    #define BLYNK_HW_AR (('a' << 0) | ('r' << 8))
-    #define BLYNK_HW_VW (('v' << 0) | ('w' << 8))
-    #define BLYNK_HW_VR (('v' << 0) | ('r' << 8))
+    #define BLYNK_STR_16(a,b)     ((uint16_t(a) << 0) | (uint16_t(b) << 8))
+    #define BLYNK_STR_32(a,b,c,d) ((uint32_t(a) << 0) | (uint32_t(b) << 8) | (uint32_t(c) << 16) | (uint32_t(d) << 24))
 #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-    #define BLYNK_HW_PM (('p' << 8) | ('m' << 0))
-    #define BLYNK_HW_DW (('d' << 8) | ('w' << 0))
-    #define BLYNK_HW_DR (('d' << 8) | ('r' << 0))
-    #define BLYNK_HW_AW (('a' << 8) | ('w' << 0))
-    #define BLYNK_HW_AR (('a' << 8) | ('r' << 0))
-    #define BLYNK_HW_VW (('v' << 8) | ('w' << 0))
-    #define BLYNK_HW_VR (('v' << 8) | ('r' << 0))
+    #define BLYNK_STR_16(a,b)     ((uint16_t(b) << 0) | (uint16_t(a) << 8))
+    #define BLYNK_STR_32(a,b,c,d) ((uint32_t(d) << 0) | (uint32_t(c) << 8) | (uint32_t(b) << 16) | (uint32_t(a) << 24))
 #else
     #error byte order problem
 #endif
 
+#define BLYNK_HW_PM BLYNK_STR_16('p','m')
+#define BLYNK_HW_DW BLYNK_STR_16('d','w')
+#define BLYNK_HW_DR BLYNK_STR_16('d','r')
+#define BLYNK_HW_AW BLYNK_STR_16('a','w')
+#define BLYNK_HW_AR BLYNK_STR_16('a','r')
+#define BLYNK_HW_VW BLYNK_STR_16('v','w')
+#define BLYNK_HW_VR BLYNK_STR_16('v','r')
+
+#define BLYNK_INT_RTC  BLYNK_STR_32('r','t','c',0)
+#define BLYNK_INT_OTA  BLYNK_STR_32('o','t','a',0)
+#define BLYNK_INT_ACON BLYNK_STR_32('a','c','o','n')
+#define BLYNK_INT_ADIS BLYNK_STR_32('a','d','i','s')
+
 #endif