o Reworking the code after implementing much more on the Android app.

1 files changed, 42 insertions, 68 deletions

diff --git a/services_lock.h b/services_lock.h
index fe0057a..a0e8801 100644
--- a/services_lock.h
+++ b/services_lock.h
@@ -15,72 +15,47 @@
 
 #define SETUP_ID 0
 #define SETUP_FORMAT 3 /** nRF8001 D */
-#define ACI_DYNAMIC_DATA_SIZE 165
+#define ACI_DYNAMIC_DATA_SIZE 162
 
 /* Service: Gap - Characteristic: Device name - Pipe: SET */
 #define PIPE_GAP_DEVICE_NAME_SET          1
 #define PIPE_GAP_DEVICE_NAME_SET_MAX_SIZE 10
 
-/* Service: Battery - Characteristic: Battery Level - Pipe: BROADCAST */
-#define PIPE_BATTERY_BATTERY_LEVEL_BROADCAST          2
-#define PIPE_BATTERY_BATTERY_LEVEL_BROADCAST_MAX_SIZE 1
-
-/* Service: Battery - Characteristic: Battery Level - Pipe: TX */
-#define PIPE_BATTERY_BATTERY_LEVEL_TX          3
-#define PIPE_BATTERY_BATTERY_LEVEL_TX_MAX_SIZE 1
-
 /* Service: Battery - Characteristic: Battery Level - Pipe: SET */
-#define PIPE_BATTERY_BATTERY_LEVEL_SET          4
+#define PIPE_BATTERY_BATTERY_LEVEL_SET          2
 #define PIPE_BATTERY_BATTERY_LEVEL_SET_MAX_SIZE 1
 
 /* Service: Battery - Characteristic: Battery Power State - Pipe: SET */
-#define PIPE_BATTERY_BATTERY_POWER_STATE_SET          5
+#define PIPE_BATTERY_BATTERY_POWER_STATE_SET          3
 #define PIPE_BATTERY_BATTERY_POWER_STATE_SET_MAX_SIZE 1
 
 /* Service: Battery - Characteristic: Battery Level State - Pipe: SET */
-#define PIPE_BATTERY_BATTERY_LEVEL_STATE_SET          6
+#define PIPE_BATTERY_BATTERY_LEVEL_STATE_SET          4
 #define PIPE_BATTERY_BATTERY_LEVEL_STATE_SET_MAX_SIZE 2
 
-/* Service: Soil Moisture - Characteristic: Soil Moisture Level - Pipe: BROADCAST */
-#define PIPE_SOIL_MOISTURE_SOIL_MOISTURE_LEVEL_BROADCAST          7
-#define PIPE_SOIL_MOISTURE_SOIL_MOISTURE_LEVEL_BROADCAST_MAX_SIZE 5
-
-/* Service: Soil Moisture - Characteristic: Soil Moisture Level - Pipe: TX */
-#define PIPE_SOIL_MOISTURE_SOIL_MOISTURE_LEVEL_TX          8
-#define PIPE_SOIL_MOISTURE_SOIL_MOISTURE_LEVEL_TX_MAX_SIZE 5
-
-/* Service: Soil Moisture - Characteristic: Soil Moisture Level - Pipe: SET */
-#define PIPE_SOIL_MOISTURE_SOIL_MOISTURE_LEVEL_SET          9
-#define PIPE_SOIL_MOISTURE_SOIL_MOISTURE_LEVEL_SET_MAX_SIZE 5
-
-/* Service: Soil Moisture - Characteristic: Soil Moisture Level - Pipe: BROADCAST */
-#define PIPE_SOIL_MOISTURE_SOIL_MOISTURE_LEVEL_BROADCAST_1          10
-#define PIPE_SOIL_MOISTURE_SOIL_MOISTURE_LEVEL_BROADCAST_1_MAX_SIZE 5
+/* Service: Soil Moisture - Characteristic: Soil Moisture Control - Pipe: TX */
+#define PIPE_SOIL_MOISTURE_SOIL_MOISTURE_CONTROL_TX          5
+#define PIPE_SOIL_MOISTURE_SOIL_MOISTURE_CONTROL_TX_MAX_SIZE 20
 
-/* Service: Soil Moisture - Characteristic: Soil Moisture Level - Pipe: TX */
-#define PIPE_SOIL_MOISTURE_SOIL_MOISTURE_LEVEL_TX_1          11
-#define PIPE_SOIL_MOISTURE_SOIL_MOISTURE_LEVEL_TX_1_MAX_SIZE 5
+/* Service: Soil Moisture - Characteristic: Soil Moisture Control - Pipe: SET */
+#define PIPE_SOIL_MOISTURE_SOIL_MOISTURE_CONTROL_SET          6
+#define PIPE_SOIL_MOISTURE_SOIL_MOISTURE_CONTROL_SET_MAX_SIZE 20
 
-/* Service: Soil Moisture - Characteristic: Soil Moisture Level - Pipe: SET */
-#define PIPE_SOIL_MOISTURE_SOIL_MOISTURE_LEVEL_SET_1          12
-#define PIPE_SOIL_MOISTURE_SOIL_MOISTURE_LEVEL_SET_1_MAX_SIZE 5
+/* Service: Soil Moisture - Characteristic: Soil Moisture Control - Pipe: RX_ACK_AUTO */
+#define PIPE_SOIL_MOISTURE_SOIL_MOISTURE_CONTROL_RX_ACK_AUTO          7
+#define PIPE_SOIL_MOISTURE_SOIL_MOISTURE_CONTROL_RX_ACK_AUTO_MAX_SIZE 20
 
 
-#define NUMBER_OF_PIPES 12
+#define NUMBER_OF_PIPES 7
 
 #define SERVICES_PIPE_TYPE_MAPPING_CONTENT {\
   {ACI_STORE_LOCAL, ACI_SET},   \
-  {ACI_STORE_LOCAL, ACI_TX_BROADCAST},   \
-  {ACI_STORE_LOCAL, ACI_TX},   \
-  {ACI_STORE_LOCAL, ACI_SET},   \
   {ACI_STORE_LOCAL, ACI_SET},   \
   {ACI_STORE_LOCAL, ACI_SET},   \
-  {ACI_STORE_LOCAL, ACI_TX_BROADCAST},   \
-  {ACI_STORE_LOCAL, ACI_TX},   \
   {ACI_STORE_LOCAL, ACI_SET},   \
-  {ACI_STORE_LOCAL, ACI_TX_BROADCAST},   \
   {ACI_STORE_LOCAL, ACI_TX},   \
   {ACI_STORE_LOCAL, ACI_SET},   \
+  {ACI_STORE_LOCAL, ACI_RX_ACK_AUTO},   \
 }
 
 #define GAP_PPCP_MAX_CONN_INT 0xffff /**< Maximum connection interval as a multiple of 1.25 msec , 0xFFFF means no specific value requested */
@@ -97,19 +72,19 @@
     },\
     {0x00,\
         {\
-            0x1f,0x06,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x00,0x0c,0x01,0x01,0x00,0x00,0x06,0x00,0x01,\
-            0x81,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
+            0x1f,0x06,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x00,0x07,0x01,0x01,0x00,0x00,0x06,0x00,0x01,\
+            0xd1,0x0f,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
         },\
     },\
     {0x00,\
         {\
-            0x1f,0x06,0x10,0x1c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
-            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x90,0x00,0xff,\
+            0x1f,0x06,0x10,0x1c,0x10,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x50,0x03,0x90,0x01,0xff,\
         },\
     },\
     {0x00,\
         {\
-            0x1f,0x06,0x10,0x38,0xff,0xff,0x02,0x58,0x0a,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00,\
+            0x1f,0x06,0x10,0x38,0xff,0xff,0x02,0x58,0x0a,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,\
             0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
         },\
     },\
@@ -126,13 +101,13 @@
     },\
     {0x00,\
         {\
-            0x1f,0x06,0x20,0x1c,0x03,0x00,0x03,0x2a,0x00,0x01,0x77,0x61,0x74,0x64,0x69,0x63,0x73,0x65,0x6d,0x69,\
+            0x1f,0x06,0x20,0x1c,0x04,0x00,0x03,0x2a,0x00,0x01,0x57,0x6f,0x6f,0x74,0x69,0x63,0x73,0x65,0x6d,0x69,\
             0x04,0x04,0x05,0x05,0x00,0x04,0x28,0x03,0x01,0x02,0x05,0x00,\
         },\
     },\
     {0x00,\
         {\
-            0x1f,0x06,0x20,0x38,0x01,0x2a,0x06,0x04,0x03,0x02,0x00,0x05,0x2a,0x01,0x01,0x00,0x00,0x04,0x04,0x05,\
+            0x1f,0x06,0x20,0x38,0x01,0x2a,0x06,0x04,0x03,0x02,0x00,0x05,0x2a,0x01,0x01,0x80,0x01,0x04,0x04,0x05,\
             0x05,0x00,0x06,0x28,0x03,0x01,0x02,0x07,0x00,0x04,0x2a,0x06,\
         },\
     },\
@@ -145,73 +120,72 @@
     {0x00,\
         {\
             0x1f,0x06,0x20,0x70,0x04,0x02,0x02,0x00,0x09,0x28,0x00,0x01,0x0f,0x18,0x04,0x04,0x05,0x05,0x00,0x0a,\
-            0x28,0x03,0x01,0x12,0x0b,0x00,0x19,0x2a,0x16,0x04,0x02,0x01,\
+            0x28,0x03,0x01,0x02,0x0b,0x00,0x19,0x2a,0x06,0x04,0x02,0x01,\
         },\
     },\
     {0x00,\
         {\
-            0x1f,0x06,0x20,0x8c,0x00,0x0b,0x2a,0x19,0x01,0x10,0x46,0x14,0x03,0x02,0x00,0x0c,0x29,0x02,0x01,0x00,\
-            0x00,0x04,0x04,0x05,0x05,0x00,0x0d,0x28,0x03,0x01,0x02,0x0e,\
+            0x1f,0x06,0x20,0x8c,0x00,0x0b,0x2a,0x19,0x01,0x10,0x04,0x04,0x05,0x05,0x00,0x0c,0x28,0x03,0x01,0x02,\
+            0x0d,0x00,0x1a,0x2a,0x06,0x04,0x02,0x01,0x00,0x0d,0x2a,0x1a,\
         },\
     },\
     {0x00,\
         {\
-            0x1f,0x06,0x20,0xa8,0x00,0x1a,0x2a,0x06,0x04,0x02,0x01,0x00,0x0e,0x2a,0x1a,0x01,0x00,0x04,0x04,0x05,\
-            0x05,0x00,0x0f,0x28,0x03,0x01,0x02,0x10,0x00,0x1b,0x2a,0x06,\
+            0x1f,0x06,0x20,0xa8,0x01,0x00,0x04,0x04,0x05,0x05,0x00,0x0e,0x28,0x03,0x01,0x02,0x0f,0x00,0x1b,0x2a,\
+            0x06,0x04,0x03,0x02,0x00,0x0f,0x2a,0x1b,0x01,0x00,0x00,0x04,\
         },\
     },\
     {0x00,\
         {\
-            0x1f,0x06,0x20,0xc4,0x04,0x03,0x02,0x00,0x10,0x2a,0x1b,0x01,0x00,0x00,0x04,0x04,0x02,0x02,0x00,0x11,\
-            0x28,0x00,0x01,0x10,0x00,0x04,0x04,0x05,0x05,0x00,0x12,0x28,\
+            0x1f,0x06,0x20,0xc4,0x04,0x10,0x10,0x00,0x10,0x28,0x00,0x01,0x3f,0xd8,0x1f,0x4a,0x8e,0xbc,0xd3,0x70,\
+            0xc5,0x59,0x5d,0x03,0x10,0x00,0xd0,0x32,0x04,0x04,0x13,0x13,\
         },\
     },\
     {0x00,\
         {\
-            0x1f,0x06,0x20,0xe0,0x03,0x01,0x12,0x13,0x00,0x11,0x00,0x16,0x04,0x06,0x05,0x00,0x13,0x00,0x11,0x01,\
-            0xaa,0x55,0xaa,0x55,0xaa,0x46,0x14,0x03,0x02,0x00,0x14,0x29,\
+            0x1f,0x06,0x20,0xe0,0x00,0x11,0x28,0x03,0x01,0x1a,0x12,0x00,0x3f,0xd8,0x1f,0x4a,0x8e,0xbc,0xd3,0x70,\
+            0xc5,0x59,0x5d,0x03,0x11,0x00,0xd0,0x32,0x54,0x14,0x14,0x00,\
         },\
     },\
     {0x00,\
         {\
-            0x1f,0x06,0x20,0xfc,0x02,0x01,0x00,0x00,0x04,0x04,0x02,0x02,0x00,0x15,0x28,0x00,0x01,0x10,0x00,0x04,\
-            0x04,0x05,0x05,0x00,0x16,0x28,0x03,0x01,0x12,0x17,0x00,0x11,\
+            0x1f,0x06,0x20,0xfc,0x00,0x12,0x00,0x11,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x46,0x14,0x03,\
         },\
     },\
     {0x00,\
         {\
-            0x1e,0x06,0x21,0x18,0x00,0x14,0x04,0x05,0x00,0x00,0x17,0x00,0x11,0x01,0x00,0x00,0x00,0x00,0x00,0x46,\
-            0x14,0x03,0x02,0x00,0x18,0x29,0x02,0x01,0x00,0x00,0x00,\
+            0x0c,0x06,0x21,0x18,0x02,0x00,0x13,0x29,0x02,0x01,0x00,0x00,0x00,\
         },\
     },\
     {0x00,\
         {\
-            0x1f,0x06,0x40,0x00,0x2a,0x00,0x01,0x00,0x80,0x04,0x00,0x03,0x00,0x00,0x2a,0x19,0x01,0x00,0x83,0x04,\
-            0x00,0x0b,0x00,0x0c,0x2a,0x1a,0x01,0x00,0x80,0x04,0x00,0x0e,\
+            0x1f,0x06,0x40,0x00,0x2a,0x00,0x01,0x00,0x80,0x04,0x00,0x03,0x00,0x00,0x2a,0x19,0x01,0x00,0x80,0x04,\
+            0x00,0x0b,0x00,0x00,0x2a,0x1a,0x01,0x00,0x80,0x04,0x00,0x0d,\
         },\
     },\
     {0x00,\
         {\
-            0x1f,0x06,0x40,0x1c,0x00,0x00,0x2a,0x1b,0x01,0x00,0x80,0x04,0x00,0x10,0x00,0x00,0x00,0x11,0x01,0x00,\
-            0x83,0x04,0x00,0x13,0x00,0x14,0x00,0x11,0x01,0x00,0x83,0x04,\
+            0x19,0x06,0x40,0x1c,0x00,0x00,0x2a,0x1b,0x01,0x00,0x80,0x04,0x00,0x0f,0x00,0x00,0x00,0x11,0x02,0x04,\
+            0x82,0x04,0x00,0x12,0x00,0x13,\
         },\
     },\
     {0x00,\
         {\
-            0x07,0x06,0x40,0x38,0x00,0x17,0x00,0x18,\
+            0x13,0x06,0x50,0x00,0x3f,0xd8,0x1f,0x4a,0x8e,0xbc,0xd3,0x70,0xc5,0x59,0x5d,0x03,0x00,0x00,0xd0,0x32,\
         },\
     },\
     {0x00,\
         {\
-            0x15,0x06,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
-            0x00,0x00,\
+            0x12,0x06,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
         },\
     },\
     {0x00,\
         {\
-            0x06,0x06,0xf0,0x00,0x83,0x4b,0xec,\
+            0x06,0x06,0xf0,0x00,0x83,0x0d,0x8f,\
         },\
     },\
 }
 
 #endif
+