From 90f5e8958e0f49e2c303abfb9d1f557e28caf78c Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Sun, 7 Dec 2014 00:06:27 +0100
Subject: o Implementing getting and setting of values.

---
 services.h | 43 ++++++++++++++++---------------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

(limited to 'services.h')

diff --git a/services.h b/services.h
index ad217d1..8f57541 100644
--- a/services.h
+++ b/services.h
@@ -11,7 +11,7 @@
 
 #define SETUP_ID 1
 #define SETUP_FORMAT 3 /** nRF8001 D */
-#define ACI_DYNAMIC_DATA_SIZE 141
+#define ACI_DYNAMIC_DATA_SIZE 143
 
 /* Service: Gap - Characteristic: Device name - Pipe: SET */
 #define PIPE_GAP_DEVICE_NAME_SET          1
@@ -25,26 +25,21 @@
 #define PIPE_FIKEN_STATUS_PANEL_GAUGE_DATA_SET          3
 #define PIPE_FIKEN_STATUS_PANEL_GAUGE_DATA_SET_MAX_SIZE 2
 
-/* Service: Fiken Status Panel - Characteristic: Led - Pipe: RX_ACK */
-#define PIPE_FIKEN_STATUS_PANEL_LED_RX_ACK          4
-#define PIPE_FIKEN_STATUS_PANEL_LED_RX_ACK_MAX_SIZE 3
-
 /* Service: Fiken Status Panel - Characteristic: Gauge Control - Pipe: TX */
-#define PIPE_FIKEN_STATUS_PANEL_GAUGE_CONTROL_TX          5
-#define PIPE_FIKEN_STATUS_PANEL_GAUGE_CONTROL_TX_MAX_SIZE 2
+#define PIPE_FIKEN_STATUS_PANEL_GAUGE_CONTROL_TX          4
+#define PIPE_FIKEN_STATUS_PANEL_GAUGE_CONTROL_TX_MAX_SIZE 10
 
 /* Service: Fiken Status Panel - Characteristic: Gauge Control - Pipe: RX */
-#define PIPE_FIKEN_STATUS_PANEL_GAUGE_CONTROL_RX          6
-#define PIPE_FIKEN_STATUS_PANEL_GAUGE_CONTROL_RX_MAX_SIZE 2
+#define PIPE_FIKEN_STATUS_PANEL_GAUGE_CONTROL_RX          5
+#define PIPE_FIKEN_STATUS_PANEL_GAUGE_CONTROL_RX_MAX_SIZE 10
 
 
-#define NUMBER_OF_PIPES 6
+#define NUMBER_OF_PIPES 5
 
 #define SERVICES_PIPE_TYPE_MAPPING_CONTENT {\
   {ACI_STORE_LOCAL, ACI_SET},   \
   {ACI_STORE_LOCAL, ACI_RX_ACK},   \
   {ACI_STORE_LOCAL, ACI_SET},   \
-  {ACI_STORE_LOCAL, ACI_RX_ACK},   \
   {ACI_STORE_LOCAL, ACI_TX},   \
   {ACI_STORE_LOCAL, ACI_RX},   \
 }
@@ -54,7 +49,7 @@
 #define GAP_PPCP_SLAVE_LATENCY 0
 #define GAP_PPCP_CONN_TIMEOUT 0xffff /** Connection Supervision timeout multiplier as a multiple of 10msec, 0xFFFF means no specific value requested */
 
-#define NB_SETUP_MESSAGES 20
+#define NB_SETUP_MESSAGES 19
 #define SETUP_MESSAGES_CONTENT {\
     {0x00,\
         {\
@@ -63,7 +58,7 @@
     },\
     {0x00,\
         {\
-            0x1f,0x06,0x10,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x06,0x00,0x01,0x00,0x00,0x06,0x00,0x00,\
+            0x1f,0x06,0x10,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x05,0x00,0x01,0x00,0x00,0x06,0x00,0x00,\
             0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
         },\
     },\
@@ -123,35 +118,29 @@
     {0x00,\
         {\
             0x1f,0x06,0x20,0xa8,0x00,0x0b,0x00,0x02,0x02,0x12,0x34,0x04,0x04,0x13,0x13,0x00,0x0c,0x28,0x03,0x01,\
-            0x0a,0x0d,0x00,0x3f,0xd8,0x1f,0x4a,0x8e,0xbc,0xd3,0x70,0xc5,\
-        },\
-    },\
-    {0x00,\
-        {\
-            0x1f,0x06,0x20,0xc4,0x59,0x5d,0x03,0x03,0x00,0xd0,0x32,0x46,0x14,0x04,0x03,0x00,0x0d,0x00,0x03,0x02,\
-            0x00,0x00,0x00,0x04,0x04,0x13,0x13,0x00,0x0e,0x28,0x03,0x01,\
+            0x14,0x0d,0x00,0x3f,0xd8,0x1f,0x4a,0x8e,0xbc,0xd3,0x70,0xc5,\
         },\
     },\
     {0x00,\
         {\
-            0x1f,0x06,0x20,0xe0,0x14,0x0f,0x00,0x3f,0xd8,0x1f,0x4a,0x8e,0xbc,0xd3,0x70,0xc5,0x59,0x5d,0x03,0x04,\
-            0x00,0xd0,0x32,0x56,0x10,0x03,0x02,0x00,0x0f,0x00,0x04,0x02,\
+            0x1f,0x06,0x20,0xc4,0x59,0x5d,0x03,0x04,0x00,0xd0,0x32,0x54,0x10,0x0a,0x00,0x00,0x0d,0x00,0x04,0x02,\
+            0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x46,0x14,\
         },\
     },\
     {0x00,\
         {\
-            0x11,0x06,0x20,0xfc,0x00,0x00,0x46,0x14,0x03,0x02,0x00,0x10,0x29,0x02,0x01,0x00,0x00,0x00,\
+            0x0d,0x06,0x20,0xe0,0x03,0x02,0x00,0x0e,0x29,0x02,0x01,0x00,0x00,0x00,\
         },\
     },\
     {0x00,\
         {\
             0x1f,0x06,0x40,0x00,0x2a,0x00,0x01,0x00,0x80,0x04,0x00,0x03,0x00,0x00,0x00,0x02,0x02,0x00,0x90,0x04,\
-            0x00,0x0b,0x00,0x00,0x00,0x03,0x02,0x00,0x10,0x04,0x00,0x0d,\
+            0x00,0x0b,0x00,0x00,0x00,0x04,0x02,0x00,0x0a,0x04,0x00,0x0d,\
         },\
     },\
     {0x00,\
         {\
-            0x0f,0x06,0x40,0x1c,0x00,0x00,0x00,0x04,0x02,0x00,0x0a,0x04,0x00,0x0f,0x00,0x10,\
+            0x05,0x06,0x40,0x1c,0x00,0x0e,\
         },\
     },\
     {0x00,\
@@ -161,12 +150,12 @@
     },\
     {0x00,\
         {\
-            0x0f,0x06,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
+            0x0c,0x06,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
         },\
     },\
     {0x00,\
         {\
-            0x06,0x06,0xf0,0x00,0x03,0x9e,0x82,\
+            0x06,0x06,0xf0,0x00,0x03,0x77,0x58,\
         },\
     },\
 }
-- 
cgit v1.2.3