Revision 9:ca289bf57f52, committed 2016-02-26

Comitter:

fabiombed

Date:

Fri Feb 26 12:51:03 2016 +0000

Parent:

8:144855fe02bd

Child:

10:d154094297ce

Commit message:

SunTracker with MEMS but without BLE

Changed in this revision

--- a/CustomControlService.h	Fri Feb 12 10:52:50 2016 +0000
+++ b/CustomControlService.h	Fri Feb 26 12:51:03 2016 +0000
@@ -65,9 +65,9 @@
 
         GattCharacteristic *charTable[] = {&userbuttonCharacteristic};
 
-        GattService   configService(CONTROL_SERVICE_UUID_128, charTable, sizeof(charTable) / sizeof(GattCharacteristic *));              
+        GattService   controlService(CONTROL_SERVICE_UUID_128, charTable, sizeof(charTable) / sizeof(GattCharacteristic *));              
                 
-        ble.gattServer().addService(configService);                              
+        ble.gattServer().addService(controlService);                              
                 
         isEnabledControlNotify = false;
         memset (controlData, 0, SIZEOF_CONTROL_DATA_LEN); 

--- a/main.cpp	Fri Feb 12 10:52:50 2016 +0000
+++ b/main.cpp	Fri Feb 26 12:51:03 2016 +0000
@@ -135,7 +135,7 @@
 
 InterruptIn mybutton(USER_BUTTON);
 
-//AnalogIn analog_read(A1); // A1 Conflict with BLE SPI_CS --> Changed it!!!
+AnalogIn analog_read(PC_3); // A1 Conflict with BLE SPI_CS del BLE --> Changed in Morpho PC_3
 
 /* User_Button_Pressed -------------------------------------------------------*/
 
@@ -150,6 +150,87 @@
 
 }
 
+/* Bluetooth CallBack ---------------------------------------------------------*/
+
+static void onUpdatesEnabledCallback(GattAttribute::Handle_t handle)
+{
+    
+}
+
+static void onUpdatesDisabledCallback(Gap::Handle_t handle)
+{
+    
+}
+
+static void onDataReadCallback(const GattReadCallbackParams *eventDataP)
+{
+    
+}
+
+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 );
+    
+    if (p_customcontrolservice->isContHandle(eventDataP->handle)) // Only if write come from this Service
+    {
+        uint8_t Command = eventDataP->data[3];  // Riceve 8 byte: data[0] + data[1] + data[2] + data[3]
+        printf("myonDataWriteCallback (Command %x)\r\n", Command);
+    }
+}
+
+static void onConnectionCallback(const Gap::ConnectionCallbackParams_t * connectionParams)
+{
+    printf("onConnectionCallback (Line %d)\r\n", __LINE__);   
+}
+
+static void onDisconnectionCallback(const Gap::DisconnectionCallbackParams_t * disConnectionReason)
+{
+    printf("onDisconnectionCallback (Line %d)\r\n", __LINE__);
+    p_BLEdev->gap().startAdvertising();
+}
+
+/* Bluetooth Initialization ---------------------------------------------------*/
+
+bool BLE_Initialization(void)
+{
+
+    p_BLEdev = new BLE;
+    if (!p_BLEdev) { printf("\r\nBLE Device creation failed\r\n"); }
+    const Gap::Address_t BLE_address_BE = {BLE_DEV_MAC};        
+    p_BLEdev->gap().setAddress(BLEProtocol::AddressType::PUBLIC, BLE_address_BE);
+    
+    p_BLEdev->init();
+
+    // Set BLE CallBack Functions
+    p_BLEdev->gattServer().onUpdatesEnabled(onUpdatesEnabledCallback);
+    p_BLEdev->gattServer().onUpdatesDisabled(onUpdatesDisabledCallback);
+    p_BLEdev->gattServer().onDataRead(onDataReadCallback);
+    p_BLEdev->gattServer().onDataWritten(myonDataWriteCallback);
+    p_BLEdev->gap().onConnection(onConnectionCallback);
+    p_BLEdev->gap().onDisconnection(onDisconnectionCallback);
+    //p_BLEdev->gattServer().onConfirmationReceived(onConfirmationReceivedCallback);    
+    //p_BLEdev->gattServer().onDataSent(onDataSentCallback);    
+    //p_BLEdev->gap().onTimeout(onTimeoutCallback);
+
+    // BLE Services
+    p_customcontrolservice =  new CustomControlService(*p_BLEdev);   
+    p_customsensorservice = new CustomSensorService(*p_BLEdev);
+
+    // 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};    
+    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));
+    p_BLEdev->gap().setAdvertisingType(GapAdvertisingParams::ADV_CONNECTABLE_UNDIRECTED);
+    p_BLEdev->gap().setAdvertisingInterval(BLE_ADVERTISING_INTERVAL);
+    p_BLEdev->gap().startAdvertising();
+
+    return true;
+    
+}
+
 /* Initialization ------------------------------------------------------------*/
 
 bool Initialization(void)
@@ -165,8 +246,8 @@
     //board=X_NUCLEO_6180XA1::Instance(&dev_i2c);
     board=X_NUCLEO_6180XA1::Instance(&dev_i2c, NC, NC, NC, NC);
 
-    //status=board->InitBoard();
-    //if(status) VL6180x_ErrLog("Failed to init the board!\n\r");
+    status=board->InitBoard();
+    if(status) VL6180x_ErrLog("Failed to init the board!\n\r");
 
     // Put GPIO not used as Interrupt in Hi-Z
     status_t=board->sensor_top->SetGPIOxFunctionality(1, GPIOx_SELECT_OFF);
@@ -183,7 +264,8 @@
 //----
 
     // Initializing Motor Component
-    motor = new L6474(D2, D8, D7, D9, D10, dev_spi); // D7 conflict with BNRG_RST (when motor change direction 0-1 reset BLE)
+    motor = new L6474(D2, D8, PB_2, D9, D10, dev_spi); // D7 conflict with BNRG_RST (when motor change direction 0-1 reset BLE)
+                                                       // Used Morpho PB_2 and made HW wiring
     if (motor->Init(NULL) != COMPONENT_OK)
         return false;
 
@@ -298,7 +380,7 @@
 {
     
     // AnalogIn: 0V return 0.0 , 3.3V return 1.0
-    float measure = 0; //analog_read.read() * 3300;
+    float measure = analog_read.read() * 3300;
     //printf("Measure = %.0f mV\r\n", measure);
     //board->display->DisplayDigit("A", 0);
 
@@ -309,87 +391,6 @@
     
 }
 
-/* Bluetooth CallBack ---------------------------------------------------------*/
-
-static void onUpdatesEnabledCallback(GattAttribute::Handle_t handle)
-{
-    
-}
-
-static void onUpdatesDisabledCallback(Gap::Handle_t handle)
-{
-    
-}
-
-static void onDataReadCallback(const GattReadCallbackParams *eventDataP)
-{
-    
-}
-
-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 );
-    
-    if (p_customcontrolservice->isContHandle(eventDataP->handle)) // Only if write come from this Service
-    {
-        uint8_t Command = eventDataP->data[3];  // Riceve 8 byte: data[0] + data[1] + data[2] + data[3]
-        printf("myonDataWriteCallback (Command %x)\r\n", Command);
-    }
-}
-
-static void onConnectionCallback(const Gap::ConnectionCallbackParams_t * connectionParams)
-{
-    printf("onConnectionCallback (Line %d)\r\n", __LINE__);   
-}
-
-static void onDisconnectionCallback(const Gap::DisconnectionCallbackParams_t * disConnectionReason)
-{
-    printf("onDisconnectionCallback (Line %d)\r\n", __LINE__);
-    p_BLEdev->gap().startAdvertising();
-}
-
-/* Bluetooth Initialization ---------------------------------------------------*/
-
-bool BLE_Initialization(void)
-{
-
-    p_BLEdev = new BLE;
-    if (!p_BLEdev) { printf("\r\nBLE Device creation failed\r\n"); }
-    const Gap::Address_t BLE_address_BE = {BLE_DEV_MAC};        
-    p_BLEdev->gap().setAddress(BLEProtocol::AddressType::PUBLIC, BLE_address_BE);
-    
-    p_BLEdev->init();
-
-    // Set BLE CallBack Functions
-    p_BLEdev->gattServer().onUpdatesEnabled(onUpdatesEnabledCallback);
-    p_BLEdev->gattServer().onUpdatesDisabled(onUpdatesDisabledCallback);
-    p_BLEdev->gattServer().onDataRead(onDataReadCallback);
-    p_BLEdev->gattServer().onDataWritten(myonDataWriteCallback);
-    p_BLEdev->gap().onConnection(onConnectionCallback);
-    p_BLEdev->gap().onDisconnection(onDisconnectionCallback);
-    //p_BLEdev->gattServer().onConfirmationReceived(onConfirmationReceivedCallback);    
-    //p_BLEdev->gattServer().onDataSent(onDataSentCallback);    
-    //p_BLEdev->gap().onTimeout(onTimeoutCallback);
-
-    // BLE Services
-    p_customcontrolservice =  new CustomControlService(*p_BLEdev);   
-    p_customsensorservice = new CustomSensorService(*p_BLEdev);
-
-    // 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};    
-    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));
-    p_BLEdev->gap().setAdvertisingType(GapAdvertisingParams::ADV_CONNECTABLE_UNDIRECTED);
-    p_BLEdev->gap().setAdvertisingInterval(BLE_ADVERTISING_INTERVAL);
-    p_BLEdev->gap().startAdvertising();
-
-    return true;
-    
-}
-
 /* Main ----------------------------------------------------------------------*/
 
 int main()
@@ -397,12 +398,12 @@
 
     // Printing to the console
     printf("SunTracker by Fabio Brembilla\r\n\n");
-
+    
     Initialization();
     printf("Initialization OK (Line %d)\r\n", __LINE__);    
     
-    BLE_Initialization();
-    printf("BLE_Initialization OK (Line %d)\r\n", __LINE__);  
+    //BLE_Initialization();
+    //printf("BLE_Initialization OK (Line %d)\r\n", __LINE__);  
         
     mybutton.fall(&User_Button_Pressed);
     printf("Wait Push Button\r\n");
@@ -411,13 +412,13 @@
     strcpy(DisplayStr,"pusH");
     while(start<1) {
         board->display->DisplayString(DisplayStr, 4);
-        p_BLEdev->waitForEvent();
+        //p_BLEdev->waitForEvent();
         //printf("%s\n\r", DisplayStr);
     }
 
     printf("Start Main Loop\r\n");
 
-    static int INTLOOP=0;
+    //static int INTLOOP=0;
 
     // Main Loop
     while(true)
@@ -428,10 +429,10 @@
         Control_Motor();
         Measure_SolarPanel();
         
-        INTLOOP++;
-        if (INTLOOP==100) { p_customsensorservice->sendEnvPosition(rand(),0); printf("Read BLE\n\r"); INTLOOP=0; }
+        //INTLOOP++;
+        //if (INTLOOP==100) { p_customsensorservice->sendEnvPosition(rand(),0); printf("Read BLE\n\r"); INTLOOP=0; }
         
-        p_BLEdev->waitForEvent();
+        //p_BLEdev->waitForEvent();
     }
 
     //status_l=board->sensor_left->StopMeasurement(als_continuous_polling);