Revision 19:b2c04428ffed, committed 2016-05-10

Comitter:

fabiombed

Date:

Tue May 10 13:36:00 2016 +0000

Parent:

18:319a1bb8f837

Child:

20:05e3440240ed

Commit message:

Fine Tuning

Changed in this revision

--- a/CustomSensorsService.h	Fri Apr 22 14:40:14 2016 +0000
+++ b/CustomSensorsService.h	Tue May 10 13:36:00 2016 +0000
@@ -109,7 +109,9 @@
             PRINTF("sendEnvStatus handle: %d\n\r", statusCharacteristic.getValueAttribute().getHandle());
             memcpy (pastenvStatus, envStatus, STATUS_DATA_LEN);
             ble.gattServer().write(statusCharacteristic.getValueAttribute().getHandle(), envStatus, STATUS_DATA_LEN, 0);         
-            printf(" (Update)");
+            #ifdef Debug
+                printf(" (Update)");
+            #endif
     } 
 
     void updateEnvStatus (uint16_t Sta, uint16_t TimeStamp) {
@@ -128,7 +130,9 @@
             PRINTF("sendEnvDifference handle: %d\n\r", differenceCharacteristic.getValueAttribute().getHandle());
             memcpy (pastenvDifference, envDifference, DIFFERENCE_DATA_LEN);
             ble.gattServer().write(differenceCharacteristic.getValueAttribute().getHandle(), envDifference, DIFFERENCE_DATA_LEN, 0);         
-            printf(" (Update)");
+            #ifdef Debug
+                printf(" (Update)");
+            #endif
     } 
 
     void updateEnvDifference (uint16_t Dif, uint16_t TimeStamp) {
@@ -147,7 +151,9 @@
             PRINTF("sendEnvPosition handle: %d\n\r", positionCharacteristic.getValueAttribute().getHandle());
             memcpy (pastenvPosition, envPosition, POSITION_DATA_LEN);
             ble.gattServer().write(positionCharacteristic.getValueAttribute().getHandle(), envPosition, POSITION_DATA_LEN, 0);         
-            printf(" (Update)");
+            #ifdef Debug
+                printf(" (Update)");
+            #endif
     } 
 
     void updateEnvPosition (uint16_t Pos, uint16_t TimeStamp) {
@@ -166,7 +172,9 @@
             PRINTF("sendEnvSunpanel handle: %d\n\r", sunpanelCharacteristic.getValueAttribute().getHandle());
             memcpy (pastenvSunpanel, envSunpanel, SUNPANEL_DATA_LEN);
             ble.gattServer().write(sunpanelCharacteristic.getValueAttribute().getHandle(), envSunpanel, SUNPANEL_DATA_LEN, 0);         
-            printf(" (Update)");
+            #ifdef Debug
+                printf(" (Update)");
+            #endif
     } 
 
     void updateEnvSunpanel (uint16_t Sun, uint16_t TimeStamp) {

--- a/main.cpp	Fri Apr 22 14:40:14 2016 +0000
+++ b/main.cpp	Tue May 10 13:36:00 2016 +0000
@@ -3,7 +3,7 @@
  * @file    main.cpp
  * @author  Fabio Brembilla
  * @version V2.0.0
- * @date    April, 2016
+ * @date    May, 2016
  * @brief   SunTracker + BLE (Server) Vertical Application
  *          This application use IHM01A1, 6180XA1, IKS01A1, IDB0XA1 expansion boards
  ******************************************************************************
@@ -42,6 +42,7 @@
 #define EasySpin    //IHM01A1 Main (remove only for debug)
 #define Sensors     //IKS01A1 Option
 #define Ble         //IDB0XA1 Option
+//#define Debug       //Verbose about Printf
 
 /* Includes ------------------------------------------------------------------*/
 
@@ -89,10 +90,10 @@
 } cns_t;
 
 #define BLE_DEV_NAME "SunTracker"
-//#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 address (must be set into CLIENT BLE_peer_address_BE)
-#define BLE_ADVERTISING_INTERVAL 1000
-
+#define BLE_DEV_MAC 0xFC,0x03,0x02,0x01,0xFB,0xFA // SERVER address (must be set into CLIENT BLE_peer_address_BE)
+#define BLE_ADVERTISING_INTERVAL 100
+uint8_t dat[] = {0x01,0x80,0x00,0x00,0x78,0x00}; // Data Sent during Advertising, must respect a Standard ST
+    
 #include "CustomControlService.h"
 #include "CustomSensorsService.h"
 
@@ -117,9 +118,9 @@
 #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_STA 0.5 // Timeout for Ticker Status (in second)
+#define TIMEOUT_DIF 0.1 // Timeout for Ticker Difference (in second)
+#define TIMEOUT_POS 0.1 // Timeout for Ticker Position (in second)
 #define TIMEOUT_SUN 0.5 // Timeout for Ticker SunPanel (in second)
 
 /* Variables -----------------------------------------------------------------*/
@@ -143,6 +144,7 @@
 bool tickerDif=false;
 bool tickerPos=false;
 bool tickerSun=false;
+bool BLEConnected=false;// BLE Connection Status
 
 /* Initializations ------------------------------------------------------------*/
 
@@ -193,8 +195,7 @@
 
     Status++;
 
-//#ifdef Sensors
-#ifdef Ble
+#ifdef Sensors //#ifdef Ble
     if (Status>3)  { Status=1; }
 #else
     if (Status>2)  { Status=1; }
@@ -235,22 +236,30 @@
 
     if (p_customsensorservice->isStatusHandle(eventDataP->handle))
     {   
-        printf("\n\r\n\rSend BLE Display Status %d", Status);
+        #ifdef Debug
+            printf("\n\r\n\rSend BLE Display Status %d", Status);
+        #endif
         p_customsensorservice->sendEnvStatus(Status, TimeStamp);
         
-    } else if (p_customsensorservice->isDifferenceHandle(eventDataP->handle)) {
-
-        printf("\n\rSend BLE Difference %d lux/mems", diff); // Send BLE diff, no diff_abs
+    } else if (p_customsensorservice->isDifferenceHandle(eventDataP->handle))
+    {
+        #ifdef Debug
+            printf("\n\rSend BLE Difference %d lux/mems", diff); // Send BLE diff, no diff_abs
+        #endif
         p_customsensorservice->sendEnvDifference(diff, TimeStamp);
 
-    } else if (p_customsensorservice->isPositionHandle(eventDataP->handle)) {
-
-        printf("\n\rSend BLE Position %d", pos);
+    } else if (p_customsensorservice->isPositionHandle(eventDataP->handle))
+    {
+        #ifdef Debug
+            printf("\n\rSend BLE Position %d", pos);
+        #endif    
         p_customsensorservice->sendEnvPosition(pos, TimeStamp);
 
-    } else if (p_customsensorservice->isSunpanelHandle(eventDataP->handle)) {
-
-        printf("\n\rSend BLE Sunpanel %d mV", measure);            
+    } else if (p_customsensorservice->isSunpanelHandle(eventDataP->handle))
+    {
+        #ifdef Debug
+            printf("\n\rSend BLE Sunpanel %d mV", measure);
+        #endif    
         p_customsensorservice->sendEnvSunpanel(measure, TimeStamp);
 
     }
@@ -265,7 +274,7 @@
     {       
         // From CLIENT it receives a command in this format: Feature (4) + Type (1) + Data (2)        
         uint32_t Feature = eventDataP->data[0]<<24 | eventDataP->data[1]<<16 | eventDataP->data[2]<<8 | eventDataP->data[3];
-        uint8_t Type = eventDataP->data[4];
+        //uint8_t Type = eventDataP->data[4];
         int16_t Data = eventDataP->data[5]<<8 | eventDataP->data[6];
         
         //printf("\r\n\r\nmyonDataWriteCallback (Feature %x)", Feature);
@@ -282,7 +291,9 @@
                 break;
      
             case FeatureDifference:
-                printf("\r\n\r\nReceived DIFF %d", Data);
+                #ifdef Debug
+                    printf("\r\n\r\nReceived DIFF %d", Data);
+                #endif
                 diff = Data;
                 break;
  
@@ -302,12 +313,14 @@
 static void onConnectionCallback(const Gap::ConnectionCallbackParams_t * connectionParams)
 {
     printf("\r\n\r\nonConnectionCallback (Line %d)", __LINE__);   
+    BLEConnected=true;
 }
 
 static void onDisconnectionCallback(const Gap::DisconnectionCallbackParams_t * disConnectionReason)
 {
     printf("\r\n\r\nonDisconnectionCallback (Line %d)", __LINE__);
     p_BLEdev->gap().startAdvertising();
+    BLEConnected=false;
 }
 
 #endif
@@ -344,7 +357,6 @@
     // 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,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));
@@ -546,8 +558,10 @@
     //printf("Measure = %.0f mV\r\n", measure);
     //board->display->DisplayDigit("A", 0);
 
+    //if (abs(measure-prev_meas)>(prev_meas*0.1)) { prev_meas = measure; }
+    //if (Status==2) { sprintf(DisplayStr, "%d", prev_meas); }
+    
     if (Status==2) { sprintf(DisplayStr, "%d", measure); }
-     
 }
 
 /* Ticker --------------------------------------------------------------------*/
@@ -578,9 +592,10 @@
     // Loop until push User Button to Set 0 Point
     printf("\r\nWait PUSH Button");
     strcpy(DisplayStr,"pusH");
-    while(Status==0) {
+    while(Status==0)
+    {
         #ifdef FlightSense
-        board->display->DisplayString(DisplayStr, 4);
+        board->display->DisplayString(DisplayStr, strlen(DisplayStr)); // if I set fix len=4, it aligns digit from left
         //printf("%s\n\r", DisplayStr);
         #endif
         
@@ -588,7 +603,9 @@
         if (p_customsensorservice->isStatusNotificationEn()) {
             if (tickerSta) {
                 tickerSta=false;
-                printf("\n\r\n\rSend BLE Display Status %d", Status);
+                #ifdef Debug
+                    printf("\n\r\n\rSend BLE Display Status %d", Status);
+                #endif
                 //p_customsensorservice->sendEnvStatus(Status, TimeStamp);
                 p_customsensorservice->updateEnvStatus(Status, TimeStamp);    
             }
@@ -611,26 +628,33 @@
 
     // Main Loop
     while(true)
-    {
+    {  
         if (Status==1 | Status==2)    { Measure_Babybear(); }
         
-        #ifndef Ble // without BLE it uses Accelerometer from SERVER, otherwise receive the value from CLIENT
-        if (Status==3)                { Measure_Accelerometer(); }
-        #endif
+        // If BLE is not connected, it uses Accelerometer from SERVER, otherwise receive the value from CLIENT
+        if (BLEConnected==false) {
+            if (Status==3)            { Measure_Accelerometer(); }
+        }
         
         Control_Motor();
         Measure_SolarPanel();
         
         #ifdef FlightSense
-        board->display->DisplayString(DisplayStr, 4);
+        board->display->DisplayString(DisplayStr, strlen(DisplayStr)); // if I set fix len=4, it aligns digit from left
         //printf("%s\n\r", DisplayStr);
         #endif
         
         #ifdef Ble 
+        //if (Status==3 & BLEConnected==false) { diff=0; }
+        //if Status 3 and BLE not connected set diff=0 (no more useful if use SERVER Accelerometer)
+        //After disconnect CLIENT, until it receive the timeout/notify to be really disconnected, it not receive diff!
+        
         if (p_customsensorservice->isStatusNotificationEn()) {
             if (tickerSta) {
                 tickerSta=false;
-                printf("\n\r\n\rSend BLE Display Status %d", Status);
+                #ifdef Debug
+                    printf("\n\r\n\rSend BLE Display Status %d", Status);
+                #endif
                 //p_customsensorservice->sendEnvStatus(Status, TimeStamp);
                 p_customsensorservice->updateEnvStatus(Status, TimeStamp);    
             }
@@ -638,35 +662,38 @@
         if (p_customsensorservice->isDifferenceNotificationEn()) {
             if (tickerDif) {
                 tickerDif=false;
-                printf("\n\rSend BLE Difference %d lux/mems", diff); // Send BLE diff, no diff_abs
+                #ifdef Debug
+                    printf("\n\rSend BLE Difference %d lux/mems", diff); // Send BLE diff, no diff_abs
+                #endif
                 //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);
+                tickerPos=false;
+                #ifdef Debug      
+                    printf("\n\rSend BLE Position %d", pos);
+                #endif
                 //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);            
+                tickerSun=false;
+                #ifdef Debug   
+                    printf("\n\rSend BLE SunPanel %d mV", measure); 
+                #endif           
                 //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
-        
     }
 
     //status_l=board->sensor_left->StopMeasurement(als_continuous_polling);
     //status_r=board->sensor_right->StopMeasurement(als_continuous_polling);
-
 }
\ No newline at end of file