Diff: CustomControlService.h

Revision:

17:582eba752042

Parent:

15:019b8d60c89d

diff -r d69c0d5d5ab2 -r 582eba752042 CustomControlService.h
--- a/CustomControlService.h	Tue Apr 12 09:20:52 2016 +0000
+++ b/CustomControlService.h	Tue Apr 19 08:53:07 2016 +0000
@@ -2,7 +2,7 @@
   * @file    CustomControlService.h
   * @author  Fabio Brembilla
   * @version V1.0.0
-  * @date    January, 2016
+  * @date    April, 2016
   * @brief   SunTracker Custom Service for BlueTooth (IDB0XA1 expansion board)
   *****************************************************************************
   * @attention
@@ -36,127 +36,124 @@
 
 #include "BLE.h"
 #include "UUID.h"
-                              
+
+#define STORE_BE_32(buf, val)    ( ((buf)[3] =  (uint8_t) (val)     ) , \
+                                   ((buf)[2] =  (uint8_t) (val>>8)  ) , \
+                                   ((buf)[1] =  (uint8_t) (val>>16) ) , \
+                                   ((buf)[0] =  (uint8_t) (val>>24) ) )     
+                
 /* BLE Services: Primary + 1 Secondary (Char Desk) */
-//const LongUUIDBytes_t CONTROL_SERVICE_UUID_128 = {0x00,0x00,0x00,0x00,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A}; //Primary
+//const LongUUIDBytes_t CONTROL_SERVICE_UUID = {0x00,0x00,0x00,0x00,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A}; //Primary
 //const LongUUIDBytes_t USER_BUTTON_CHAR_UUID    = {0x00,0x00,0x00,0x01,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A,0x0A}; //User Button Control
-const ShortUUIDBytes_t CONTROL_SERVICE_UUID_128 = 0xA000;
-const ShortUUIDBytes_t USER_BUTTON_CHAR_UUID    = 0xA001;                      
-                            
-#define SIZEOF_CONTROL_DATA_LEN     2
-// 1 byte   0xFF     8 bit      int8
-// 2 byte   0xFFFF   16 bit     int16
+//const ShortUUIDBytes_t CONTROL_SERVICE_UUID  = 0xA000;
+//const ShortUUIDBytes_t CONTROL_COMMAND_CHAR_UUID = 0xA001;                      
+
+/* BLE Services: Primary + 1 Secondary (Char Desk) */
+const UUID::LongUUIDBytes_t CONTROL_SERVICE_UUID        = {0x00,0x00,0x00,0x00,0x00,0x0F,0x11,0xe1,0x9a,0xb4,0x00,0x02,0xa5,0xd5,0xc5,0x1b};
+//const LongUUIDBytes_t CONTROL_REGISTER_CHAR_UUID  = {0x00,0x00,0x00,0x01,0x00,0x0F,0x11,0xe1,0xac,0x36,0x00,0x02,0xa5,0xd5,0xc5,0x1b}; //Not Used
+const UUID::LongUUIDBytes_t CONTROL_COMMAND_CHAR_UUID   = {0x00,0x00,0x00,0x02,0x00,0x0F,0x11,0xe1,0xac,0x36,0x00,0x02,0xa5,0xd5,0xc5,0x1b};
+
+//#define SIZEOF_CONTROL_DATA_LEN     2
+// 1 byte   0xFF        8 bit      int8
+// 2 byte   0xFFFF      16 bit     int16
+// 4 byte   0xFFFFFFFF  32 bit     int32
+#define COMMAND_DATA_LEN         2+4+1+2 // TimeStamp (only for Response) + Feature + Type + Data
 
 /* Custom Control Service */
 class CustomControlService  {
 public:
     CustomControlService(BLE &_ble) :
         ble(_ble),
-                userbuttonCharacteristic(USER_BUTTON_CHAR_UUID, controlData, SIZEOF_CONTROL_DATA_LEN, SIZEOF_CONTROL_DATA_LEN,
-                                         GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ | GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_WRITE | GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_NOTIFY)
+                commandCharacteristic(CONTROL_COMMAND_CHAR_UUID, commandData, COMMAND_DATA_LEN, COMMAND_DATA_LEN,                                        
+                                         GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_WRITE | GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_NOTIFY)
         {  
         static bool serviceAdded = false; // To be sure to define just one time
         if (serviceAdded) {
             return;
         }
 
-        GattCharacteristic *charTable[] = {&userbuttonCharacteristic};
-        GattService   controlService(CONTROL_SERVICE_UUID_128, charTable, sizeof(charTable) / sizeof(GattCharacteristic *));              
+        GattCharacteristic *charTable[] = {&commandCharacteristic};
+        GattService   controlService(CONTROL_SERVICE_UUID, charTable, sizeof(charTable) / sizeof(GattCharacteristic *));              
         ble.gattServer().addService(controlService);                              
                 
-        isEnabledControlNotify          = false;
-        memset (controlData, 0, SIZEOF_CONTROL_DATA_LEN);
+        isEnabledCommandNotify          = false;
+        memset (commandData, 0, COMMAND_DATA_LEN);
         isBTLEConnected                 = DISCONNECTED;
         serviceAdded                    = true;
     }
 
 // Tests Method
 
-    void sendControlState(uint8_t State) {
-            STORE_LE_16(controlData,State);
-            PRINTF("sendControlState handle: %d\n\r", userbuttonCharacteristic.getValueAttribute().getHandle());
-            memcpy (pastcontrolData, controlData, SIZEOF_CONTROL_DATA_LEN);
-            ble.gattServer().write(userbuttonCharacteristic.getValueAttribute().getHandle(), controlData, SIZEOF_CONTROL_DATA_LEN, 0);         
+/* BlueMicrosystem1 (only for Response)
+
+    uint32_t sendcontrolState(uint8_t val, uint8_t Command, uint32_t Feature, uint16_t TimeStamp) {      
+            STORE_LE_16(commandData ,TimeStamp); 
+            STORE_BE_32(commandData+2,Feature);          
+            commandData[6] = Command;
+            commandData[7] = (val==0x01) ? 100: val;                     
+            return ble.gattServer().write(commandCharacteristic.getValueAttribute().getHandle(), commandData, COMMAND_DATA_LEN, 0);
+    }
+    
+    uint32_t updatecontrolState(uint8_t val, uint8_t Command, uint32_t Feature, uint16_t TimeStamp) {
+            if (ble.getGapState().connected && isEnabledCommandNotify ) {  
+                return sendcontrolState(val, Command, Feature, TimeStamp);
+            }
+            return 0;
+    }
+*/
+
+/* Old SunTracker
+
+   void sendCommandState(uint8_t State) {
+            STORE_LE_16(commandData,State);
+            PRINTF("sendCommandState handle: %d\n\r", commandCharacteristic.getValueAttribute().getHandle());
+            memcpy (pastcommandData, commandData, COMMAND_DATA_LEN);
+            ble.gattServer().write(commandCharacteristic.getValueAttribute().getHandle(), commandData, COMMAND_DATA_LEN, 0);         
             printf(" (Update)"); 
     } 
 
-    void updateControlState(uint8_t Temp) {
-            if (ble.getGapState().connected && isEnabledControlNotify ) { 
-                if (memcmp (&pastcontrolData[0], &Temp, SIZEOF_CONTROL_DATA_LEN) != 0) {
-                    sendControlState(Temp);           
+    void updateCommandState(uint8_t State) {
+            if (ble.getGapState().connected && isEnabledCommandNotify ) { 
+                if (memcmp (&pastcommandData[0], &State, COMMAND_DATA_LEN) != 0) {
+                    sendCommandState(State);           
                 }
             }
     }
 
-/* with TimeStamp
-
-    void sendControlState(int16_t State, uint16_t TimeStamp) {
-            STORE_LE_16(controlData,TimeStamp);
-            STORE_LE_16(controlData+2,State);
-            PRINTF("sendControlState!! handle: %d\n\r", userbuttonCharacteristic.getValueAttribute().getHandle());
-            memcpy (pastcontrolData, controlData, SIZEOF_CONTROL_DATA_LEN);
-            ble.gattServer().write(userbuttonCharacteristic.getValueAttribute().getHandle(), controlData, SIZEOF_CONTROL_DATA_LEN, 0);         
-    } 
-
-    void updateControlState(int16_t Temp, uint16_t TimeStamp) {
-            if (memcmp (&pastcontrolData[2], &Temp, 2) != 0) {
-                sendControlState(Temp,  TimeStamp);              
-            }
-    }
-    
-*/
-
-/* 
- 
-    uint32_t sendcontrolState(uint32_t Feature, uint8_t Command, uint8_t val, uint16_t TimeStamp) {      
-            STORE_LE_16(controlData ,TimeStamp); 
-            STORE_BE_32(controlData+2,Feature);          
-            controlData[6] = Command;
-            controlData[7] = (val==0x01) ? 100: val;                     
-            return ble.gattServer().write(userbuttonCharacteristic.getValueAttribute().getHandle(), controlData, SIZEOF_CONTROL_DATA_LEN, 0);
-    }
-    
-    uint32_t updatecontrolState(uint32_t Feature, uint8_t Command, uint8_t val, uint16_t TimeStamp) {
-            if (ble.getGapState().connected && isEnabledControlNotify ) {  
-            return sendcontrolState(Feature, Command, val, TimeStamp);
-            }
-            return 0;
-    }
-
 */  
 
     void enNotify (Gap::Handle_t handle) {
             printf("\n\r\n\renNotify (handle %d)", handle);
-            if (isContHandle(handle)) { isEnabledControlNotify = true; return; }    
+            if (isCommandHandle(handle)) { isEnabledCommandNotify = true; return; }    
     }
     
     void disNotify (Gap::Handle_t handle) {
             printf("\n\r\n\rdisNotify (handle %d)", handle);
-            if (isContHandle(handle)) { isEnabledControlNotify = false; return; }    
+            if (isCommandHandle(handle)) { isEnabledCommandNotify = false; return; }    
     }   
 
-    bool isControlNotificationEn (void) {
-            return isEnabledControlNotify;
+    bool isCommandNotificationEn (void) {
+            return isEnabledCommandNotify;
     }
     
-    bool isContHandle (Gap::Handle_t handle) {
-            if (handle == userbuttonCharacteristic.getValueAttribute().getHandle()) return true;
+    bool isCommandHandle (Gap::Handle_t handle) {
+            if (handle == commandCharacteristic.getValueAttribute().getHandle()) return true;
             return false;
     }
     
     void updateConnectionStatus(ConnectionStatus_t status) {            
-            isEnabledControlNotify = false;
-            memset (controlData, 0, SIZEOF_CONTROL_DATA_LEN);
+            isEnabledCommandNotify = false;
+            memset (commandData, 0, COMMAND_DATA_LEN);
             isBTLEConnected = status;             
     }      
 
 // Variables Initialization
 private:
         BLE                              &ble;
-        uint8_t                          controlData[SIZEOF_CONTROL_DATA_LEN];                
-        uint8_t                          pastcontrolData[SIZEOF_CONTROL_DATA_LEN]; 
-        GattCharacteristic               userbuttonCharacteristic;  
+        uint8_t                          commandData[COMMAND_DATA_LEN];                
+        uint8_t                          pastcommandData[COMMAND_DATA_LEN]; 
+        GattCharacteristic               commandCharacteristic;  
         ConnectionStatus_t               isBTLEConnected;
-        bool                             isEnabledControlNotify;
+        bool                             isEnabledCommandNotify;
 
 };