Diff: main.cpp

Revision:

18:319a1bb8f837

Parent:

17:582eba752042

Child:

19:b2c04428ffed

diff -r 582eba752042 -r 319a1bb8f837 main.cpp
--- a/main.cpp	Tue Apr 19 08:53:07 2016 +0000
+++ b/main.cpp	Fri Apr 22 14:40:14 2016 +0000
@@ -100,10 +100,10 @@
 static CustomControlService *p_customcontrolservice = NULL;
 static CustomSensorService  *p_customsensorservice = NULL;
 
-#define FeatureStatus      0x00000400
-#define FeatureDifference  0x00000800
-#define FeaturePosition    0x00001000
-#define FeatureSunPanel    0x00002000
+#define FeatureStatus      0x00000800
+#define FeatureDifference  0x00001000
+#define FeaturePosition    0x00002000
+#define FeatureSunPanel    0x00004000
 
 #endif
 
@@ -114,9 +114,13 @@
 #define SET_MAX 200     // Set Motor MaxSpeed
 #define SET_MIN 100     // Set Motor MinSpeed
 #define STOP 1000       // Set Motor Stop Position
-#define TOLLERANCE 100  // Tollerance between Left and Right before Start Movement
-#define RANGE_1 200     // Range 1 for Motor Speed
+#define TOLLERANCE 80   // Tollerance between Left and Right before Start Movement
+#define RANGE_1 250     // Range 1 for Motor Speed
 #define RANGE_2 500     // Range 2 for Motor Speed
+#define TIMEOUT_STA 1   // Timeout for Ticker Status (in second)
+#define TIMEOUT_DIF 0.5 // Timeout for Ticker Difference (in second)
+#define TIMEOUT_POS 0.5 // Timeout for Ticker Position (in second)
+#define TIMEOUT_SUN 0.5 // Timeout for Ticker SunPanel (in second)
 
 /* Variables -----------------------------------------------------------------*/
 
@@ -135,6 +139,10 @@
 int16_t Status=0;      // Status Shown on Display: 0 = Idle, 1 = Motor Speed, 2 = Solar Panel Value, 3 = Manual Control [--> Send BLE]
 int16_t status_bb, status_t, status_b, status_l, status_r; // Babybear Status
 uint16_t TimeStamp=0;  // TimeStamp for BLE
+bool tickerSta=false;
+bool tickerDif=false;
+bool tickerPos=false;
+bool tickerSun=false;
 
 /* Initializations ------------------------------------------------------------*/
 
@@ -185,7 +193,8 @@
 
     Status++;
 
-#ifdef Sensors
+//#ifdef Sensors
+#ifdef Ble
     if (Status>3)  { Status=1; }
 #else
     if (Status>2)  { Status=1; }
@@ -221,7 +230,7 @@
 
 static void onDataReadCallback(const GattReadCallbackParams *eventDataP)
 {
-/*
+
     // if receive a manual Read request
 
     if (p_customsensorservice->isStatusHandle(eventDataP->handle))
@@ -245,7 +254,7 @@
         p_customsensorservice->sendEnvSunpanel(measure, TimeStamp);
 
     }
-*/  
+ 
 }
 
 // This Callback happen when it RECEIVE a WRITE
@@ -335,7 +344,7 @@
     // Setup BLE Advertising
     const static char DEVICE_NAME[] = BLE_DEV_NAME;
     p_BLEdev->gap().accumulateAdvertisingPayload(GapAdvertisingData::BREDR_NOT_SUPPORTED | GapAdvertisingData::LE_GENERAL_DISCOVERABLE);
-    uint8_t dat[] = {0x01,0x80,0x00,0xFC,0x00,0x00};    
+    uint8_t dat[] = {0x01,0x80,0x00,0x00,0x78,0x00}; // Data Sent during Advertising, must respect a Standard ST
     p_BLEdev->gap().accumulateScanResponse(GapAdvertisingData::MANUFACTURER_SPECIFIC_DATA,dat,6);    
     p_BLEdev->gap().accumulateAdvertisingPayload(GapAdvertisingData::UNKNOWN);
     p_BLEdev->gap().accumulateAdvertisingPayload(GapAdvertisingData::COMPLETE_LOCAL_NAME, (uint8_t *)DEVICE_NAME, sizeof(DEVICE_NAME));
@@ -541,6 +550,13 @@
      
 }
 
+/* Ticker --------------------------------------------------------------------*/
+
+void tickerSta_Callback(void) { tickerSta=true; }
+void tickerDif_Callback(void) { tickerDif=true; }
+void tickerPos_Callback(void) { tickerPos=true; }
+void tickerSun_Callback(void) { tickerSun=true; }
+
 /* Main ----------------------------------------------------------------------*/
 
 int main()
@@ -555,9 +571,10 @@
     mybutton.fall(&User_Button_Pressed);
 
     #ifdef Ble
-    static int INTLOOP=0;
-    #endif
-
+    Ticker tickerSta_ticker, tickerDif_ticker, tickerPos_ticker, tickerSun_ticker;
+    tickerSta_ticker.attach(tickerSta_Callback, TIMEOUT_STA);
+    #endif 
+    
     // Loop until push User Button to Set 0 Point
     printf("\r\nWait PUSH Button");
     strcpy(DisplayStr,"pusH");
@@ -568,23 +585,25 @@
         #endif
         
         #ifdef Ble
-        /*
-        INTLOOP++;
-        if (INTLOOP==100)
-        {
-            p_customsensorservice->sendEnvStatus(Status, TimeStamp);
-            p_customsensorservice->sendEnvDifference(diff, TimeStamp);
-            p_customsensorservice->sendEnvPosition(pos, TimeStamp);
-            p_customsensorservice->sendEnvSunpanel(measure, TimeStamp);
-            INTLOOP=0;
+        if (p_customsensorservice->isStatusNotificationEn()) {
+            if (tickerSta) {
+                tickerSta=false;
+                printf("\n\r\n\rSend BLE Display Status %d", Status);
+                //p_customsensorservice->sendEnvStatus(Status, TimeStamp);
+                p_customsensorservice->updateEnvStatus(Status, TimeStamp);    
+            }
         }
-        */    
-        //p_BLEdev->waitForEvent(); // Without it the CLIENT can't start to communicate
+        p_BLEdev->waitForEvent(); // Without it the CLIENT can't start to communicate
         #endif 
     }
 
     printf("\r\n\r\nStart Main Loop");
-    INTLOOP=0;
+
+    #ifdef Ble
+    tickerDif_ticker.attach(tickerDif_Callback, TIMEOUT_DIF);
+    tickerPos_ticker.attach(tickerPos_Callback, TIMEOUT_POS);
+    tickerSun_ticker.attach(tickerSun_Callback, TIMEOUT_SUN);
+    #endif 
     
     #ifdef EasySpin
     motor->Enable(); // To put the motor on hold by execute CmdEnable
@@ -605,37 +624,43 @@
         #ifdef FlightSense
         board->display->DisplayString(DisplayStr, 4);
         //printf("%s\n\r", DisplayStr);
-        #endif   
-        
-        #ifdef Ble
+        #endif
         
-        INTLOOP++;
-        if (INTLOOP==100)
-        {    
-            //if (p_customsensorservice->isStatusNotificationEn()) {
+        #ifdef Ble 
+        if (p_customsensorservice->isStatusNotificationEn()) {
+            if (tickerSta) {
+                tickerSta=false;
                 printf("\n\r\n\rSend BLE Display Status %d", Status);
-                p_customsensorservice->sendEnvStatus(Status, TimeStamp);
-                //p_customsensorservice->updateEnvStatus(Status, TimeStamp));            
-            //}
-            //if (p_customsensorservice->isDifferenceNotificationEn()) {
+                //p_customsensorservice->sendEnvStatus(Status, TimeStamp);
+                p_customsensorservice->updateEnvStatus(Status, TimeStamp);    
+            }
+        }
+        if (p_customsensorservice->isDifferenceNotificationEn()) {
+            if (tickerDif) {
+                tickerDif=false;
                 printf("\n\rSend BLE Difference %d lux/mems", diff); // Send BLE diff, no diff_abs
-                p_customsensorservice->sendEnvDifference(diff, TimeStamp);
-                //p_customsensorservice->updateEnvDifference(diff, TimeStamp));
-            //}
-            //if (p_customsensorservice->isPositionNotificationEn()) {            
+                //p_customsensorservice->sendEnvDifference(diff, TimeStamp);
+                p_customsensorservice->updateEnvDifference(diff, TimeStamp);
+            }
+        }
+        if (p_customsensorservice->isPositionNotificationEn()) {
+            if (tickerPos) {
+                tickerPos=false;       
                 printf("\n\rSend BLE Position %d", pos);
-                p_customsensorservice->sendEnvPosition(pos, TimeStamp);
-                //p_customsensorservice->updateEnvPosition(pos, TimeStamp));
-            //}
-            //if (p_customsensorservice->isSunpanelNotificationEn()) {            
-                printf("\n\rSend BLE Sunpanel %d mV", measure);            
-                p_customsensorservice->sendEnvSunpanel(measure, TimeStamp);
-                //p_customsensorservice->updateEnvSunpanel(measure, TimeStamp));
-            //}
-            INTLOOP=0;
-            //diff=0; // To reset it in case from Mems don't arrive a future value
+                //p_customsensorservice->sendEnvPosition(pos, TimeStamp);
+                p_customsensorservice->updateEnvPosition(pos, TimeStamp);
+            }
         }
-        
+        if (p_customsensorservice->isSunpanelNotificationEn()) {
+            if (tickerSun) {
+                tickerSun=false;      
+                printf("\n\rSend BLE SunPanel %d mV", measure);            
+                //p_customsensorservice->sendEnvSunpanel(measure, TimeStamp);
+                p_customsensorservice->updateEnvSunpanel(measure, TimeStamp);
+            }
+        }
+        //diff=0; // To reset it in case from Accelerometer doesn't arrive a future value (is better that Acc. always send a value)
+         
         p_BLEdev->waitForEvent();
         #endif