Diff: main.cpp

Revision:

15:019b8d60c89d

Parent:

14:644f9e7278e9

Child:

16:d69c0d5d5ab2

diff -r 644f9e7278e9 -r 019b8d60c89d main.cpp
--- a/main.cpp	Wed Mar 16 19:17:08 2016 +0000
+++ b/main.cpp	Mon Mar 21 10:18:41 2016 +0000
@@ -82,19 +82,13 @@
 typedef uint16_t ShortUUIDBytes_t;
 typedef uint8_t  LongUUIDBytes_t[LENGTH_OF_LONG_UUID];
 
-typedef struct {
-    int32_t AXIS_X;
-    int32_t AXIS_Y;
-    int32_t AXIS_Z;
-} AxesRaw_TypeDef;
-
 typedef enum ConnectionStatus_t {
     DISCONNECTED    =0,
     CONNECTED       =1
 } cns_t;
 
 #define BLE_DEV_NAME "SunTracker"
-#define BLE_DEV_MAC 0xAA,0xBB,0xCC,0xDD,0xEE,0xFF // must be the same of BLE_peer_address_BE into CLIENT
+#define BLE_DEV_MAC 0xAA,0xBB,0xCC,0xDD,0xEE,0xFF // SERVER address (must be set into CLIENT BLE_peer_address_BE)
 //#define BLE_DEV_MAC 0xFD,0x66,0x05,0x13,0xBE,0xBA // Default ST
 #define BLE_ADVERTISING_INTERVAL 1000
 
@@ -105,6 +99,8 @@
 static CustomControlService *p_customcontrolservice = NULL;
 static CustomSensorService  *p_customsensorservice = NULL;
 
+int16_t value_read = 0;
+
 #endif
 
 /* Definitions ---------------------------------------------------------------*/
@@ -123,17 +119,17 @@
 int8_t dir=0;          // Motor Rotation Direction: 0 = Stop, 1 = Anticlockwise, 2 = Clockwise
 int8_t changedir=0;    // Change Direction: 0 = No, 1 = Yes
 int8_t arrest=0;       // Arrest: 0 = No, 1 = Yes
-int32_t babybear=0;    // Difference (in Lux) between Left and Right
+int16_t babybear=0;    // Difference (in Lux) between Left and Right
 int32_t acc_data[3];   // Difference of Accelerometer
-int32_t diff=0;        // Babybear or Accelerometer difference [--> Send BLE]
-int32_t diff_abs=0;    // Abs of Babybear or Accelerometer difference
+int16_t diff=0;        // Babybear or Accelerometer difference [--> Send BLE]
+int16_t diff_abs=0;    // Abs of Babybear or Accelerometer difference
 int8_t left=0;         // Left Command for Rotate Direction
 int8_t right=0;        // Right Command for Rotate Direction
 int8_t start=0;        // Waiting User Button Push
-int32_t pos=0;         // Motor Position [--> Send BLE]
-int32_t measure=0;     // ADC Value from SunPanel [--> Send BLE]
+int16_t pos=0;         // Motor Position [--> Send BLE]
+int16_t measure=0;     // ADC Value from SunPanel [--> Send BLE]
 char DisplayStr[5];    // Status Display
-int8_t Display=0;      // Shown on Display: 0 = Motor Speed, 1 = Solar Panel Value, 2 = Manual Control [--> Send BLE]
+int8_t display=0;      // Shown on Display: 0 = Motor Speed, 1 = Solar Panel Value, 2 = Manual Control [--> Send BLE]
 int16_t status, status_t, status_b, status_l, status_r; // Babybear Status
 
 /* Initializations ------------------------------------------------------------*/
@@ -170,18 +166,18 @@
 void User_Button_Pressed(void)
 {
 
-    if (start>0)    { Display++; }
+    if (start>0)    { display++; }
 #ifdef Sensors
-    if (Display>2)  { Display=0; }
+    if (display>2)  { display=0; }
 #else
-    if (Display>1)  { Display=0; }
+    if (display>1)  { display=0; }
 #endif 
     if (start==0)   { start=1; }
 
     char State[12]; // Characters into State must be <12 and never =>12 or it crash!!!
-    if (Display==0) strcpy(State,"FlightSense");
-    if (Display==1) strcpy(State,"ADCSunPanel");
-    if (Display==2) strcpy(State,"Sensors");
+    if (display==0) strcpy(State,"FlightSense");
+    if (display==1) strcpy(State,"ADCSunPanel");
+    if (display==2) strcpy(State,"Sensors");
     printf("\r\n\r\nPUSH Display: %s", State);
 
 }
@@ -192,12 +188,18 @@
 
 static void onUpdatesEnabledCallback(GattAttribute::Handle_t handle)
 {
-    
+    if (p_customcontrolservice->isContHandle(handle)) p_customcontrolservice->enNotify(handle);
+    if (p_customsensorservice->isDifferenceHandle(handle)) p_customsensorservice->enNotify(handle);  
+    if (p_customsensorservice->isPositionHandle(handle)) p_customsensorservice->enNotify(handle);
+    if (p_customsensorservice->isSunpanelHandle(handle)) p_customsensorservice->enNotify(handle);     
 }
 
 static void onUpdatesDisabledCallback(Gap::Handle_t handle)
 {
-    
+    if (p_customcontrolservice->isContHandle(handle)) p_customcontrolservice->disNotify(handle);
+    if (p_customsensorservice->isDifferenceHandle(handle)) p_customsensorservice->disNotify(handle);  
+    if (p_customsensorservice->isPositionHandle(handle)) p_customsensorservice->disNotify(handle);
+    if (p_customsensorservice->isSunpanelHandle(handle)) p_customsensorservice->disNotify(handle);    
 }
 
 static void onDataReadCallback(const GattReadCallbackParams *eventDataP)
@@ -209,18 +211,28 @@
 static void myonDataWriteCallback(const GattWriteCallbackParams *eventDataP)
 {   
     //printf ("myonDataWriteCallback attr_handle: %x  att_data[3]: %x  data_length: %d\n\r", eventDataP->handle, eventDataP->data[3], eventDataP->len );
+
+    // Return original value after inverted with STORE_LE_16 to send by BLE
+    value_read = eventDataP->data[0] + (eventDataP->data[1]<<8);
     
-    if (p_customcontrolservice->isContHandle(eventDataP->handle)) // Only if write come from this Service
+    if (p_customcontrolservice->isContHandle(eventDataP->handle))
     {
-        // Receive 8 byte: data[0] + data[1] + data[2] + data[3]
-        printf("\r\n\r\nmyonDataWriteCallback (data[0] %x)", eventDataP->data[0]);
-        printf("\r\nmyonDataWriteCallback (data[1] %x)", eventDataP->data[1]);
-        printf("\r\nmyonDataWriteCallback (data[2] %x)", eventDataP->data[2]);
-        printf("\r\nmyonDataWriteCallback (data[3] %x)", eventDataP->data[3]);
-        printf("\r\nmyonDataWriteCallback (data %d)", eventDataP->data[0]+eventDataP->data[1]+eventDataP->data[2]+eventDataP->data[3]);
+        //printf("\r\n\r\nmyonDataWriteCallback (data[0] %x)", eventDataP->data[0]);
+        //printf("\r\nmyonDataWriteCallback (data[1] %x)", eventDataP->data[1]);
+        printf("\r\n\r\nonDataRead BUTTON (data %d)", value_read);
         
         User_Button_Pressed(); // Change Display Status
     }
+    
+    if (p_customsensorservice->isDifferenceHandle(eventDataP->handle))
+    {
+        //printf("\r\n\r\nmyonDataWriteCallback (data[0] %x)", eventDataP->data[0]);
+        //printf("\r\nmyonDataWriteCallback (data[1] %x)", eventDataP->data[1]);
+        //printf("\r\n\r\nonDataRead (data %d)", value_read);
+        
+        diff = value_read; // Change Diff
+    }
+    
 }
 
 static void onConnectionCallback(const Gap::ConnectionCallbackParams_t * connectionParams)
@@ -444,8 +456,8 @@
     // Stop Motor
     if (diff_abs<=TOLLERANCE) { 
         arrest=1; 
-        if (Display==0) { strcpy(DisplayStr,"----"); }
-        if (Display==2) { strcpy(DisplayStr,"E  3"); }
+        if (display==0) { strcpy(DisplayStr,"----"); }
+        if (display==2) { strcpy(DisplayStr,"E  3"); }
     }
         
     if (arrest==1 && dir!=0 ) { // Stop just one time
@@ -470,7 +482,7 @@
     //printf("Measure = %.0f mV\r\n", measure);
     //board->display->DisplayDigit("A", 0);
 
-    if (Display==1) { sprintf(DisplayStr, "%d", measure); }
+    if (display==1) { sprintf(DisplayStr, "%d", measure); }
      
 }
 
@@ -511,9 +523,12 @@
     // Main Loop
     while(true)
     {
-        if (Display==0 | Display==1)    { Measure_Babybear(); }
-        if (Display==2)                 { Measure_Accelerometer(); }
-
+        if (display==0 | display==1)    { Measure_Babybear(); }
+        
+        #ifndef Ble // without BLE it uses Accelerometer from SERVER, otherwise receive the value from CLIENT
+        if (display==2)                 { Measure_Accelerometer(); }
+        #endif
+        
         Control_Motor();
         Measure_SolarPanel();
         
@@ -524,25 +539,28 @@
         
         #ifdef Ble
         INTLOOP++;
-        //if (INTLOOP==100) { p_customsensorservice->sendEnvPosition(rand(),0); printf("Read BLE\n\r"); INTLOOP=0; }
         if (INTLOOP==100)
-        {
-            printf("\n\r\n\rSend BLE Display %d", Display);
-            //p_customcontrolservice->sendControlState(Display);
-            p_customcontrolservice->updateControlState(Display);            
-            
-            printf("\n\rSend BLE Difference %d lux/mems", diff); // Send BLE diff, no diff_abs
-            //p_customsensorservice->sendEnvDifference(diff);
-            p_customsensorservice->updateEnvDifference(diff);
-
-            printf("\n\rSend BLE Position %d", pos);
-            //p_customsensorservice->sendEnvPosition(pos);
-            p_customsensorservice->updateEnvPosition(pos);
-            
-            printf("\n\rSend BLE Sunpanel %d mV", measure);            
-            //p_customsensorservice->sendEnvSunpanel(measure);
-            p_customsensorservice->updateEnvSunpanel(measure);
-            
+        {    
+            //if (p_customcontrolservice->isControlNotificationEn()) {
+                printf("\n\r\n\rSend BLE Display %d", display);
+                p_customcontrolservice->sendControlState(display);
+                //p_customcontrolservice->updateControlState(display);            
+            //}
+            //if (p_customsensorservice->isDifferenceNotificationEn()) {
+                printf("\n\rSend BLE Difference %d lux/mems", diff); // Send BLE diff, no diff_abs
+                p_customsensorservice->sendEnvDifference(diff);
+                //p_customsensorservice->updateEnvDifference(diff);
+            //}
+            //if (p_customsensorservice->isPositionNotificationEn()) {            
+                printf("\n\rSend BLE Position %d", pos);
+                p_customsensorservice->sendEnvPosition(pos);
+                //p_customsensorservice->updateEnvPosition(pos);
+            //}
+            //if (p_customsensorservice->isSunpanelNotificationEn()) {            
+                printf("\n\rSend BLE Sunpanel %d mV", measure);            
+                p_customsensorservice->sendEnvSunpanel(measure);
+                //p_customsensorservice->updateEnvSunpanel(measure);
+            //}
             INTLOOP=0;
         }