Revision 4:762404f17d9d, committed 2017-05-09

Comitter:

Cornetin

Date:

Tue May 09 08:01:53 2017 +0000

Parent:

3:823f105078c7

Commit message:

led blinking working

Changed in this revision

diff -r 823f105078c7 -r 762404f17d9d BMP085.lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/BMP085.lib	Tue May 09 08:01:53 2017 +0000
@@ -0,0 +1,1 @@
+https://mbed.org/teams/silabs-abakurs/code/BMP085/#33acd2e1edab

diff -r 823f105078c7 -r 762404f17d9d main.cpp
--- a/main.cpp	Thu Jan 07 02:49:37 2016 +0000
+++ b/main.cpp	Tue May 09 08:01:53 2017 +0000
@@ -2,17 +2,17 @@
 
 Copyright (c) 2012-2014 RedBearLab
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
-and associated documentation files (the "Software"), to deal in the Software without restriction, 
-including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, 
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+and associated documentation files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
 subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
-PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE 
-FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 */
@@ -28,15 +28,19 @@
 
 #define TXRX_BUF_LEN                     20
 
-#define DIGITAL_OUT_PIN                  P0_17  //D7
+#define DIGITAL_OUT_PIN_LED              P0_17  //D7
+#define DIGITAL_OUT_PIN_BARO             P0_10  //D2
 #define DIGITAL_IN_PIN                   P0_5   //A4
 #define PWM_PIN                          P0_16  //D6
 #define SERVO_PIN                        P0_14  //D10
-#define ANALOG_IN_PIN                    P0_6   //A5
+#define ANALOG_IN_PIN                    P0_1   //A0
 
 BLE             ble;
 
-DigitalOut      LED_SET(DIGITAL_OUT_PIN);
+DigitalOut      LED_SET(DIGITAL_OUT_PIN_LED);
+bool            LED_BLINK;
+
+
 DigitalIn       BUTTON(DIGITAL_IN_PIN);
 PwmOut          PWM(PWM_PIN);
 AnalogIn        ANALOG(ANALOG_IN_PIN);
@@ -62,9 +66,9 @@
 
 
 GattCharacteristic  txCharacteristic (uart_tx_uuid, txPayload, 1, TXRX_BUF_LEN, GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_WRITE | GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_WRITE_WITHOUT_RESPONSE);
-                                      
+
 GattCharacteristic  rxCharacteristic (uart_rx_uuid, rxPayload, 1, TXRX_BUF_LEN, GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_NOTIFY);
-                                      
+
 GattCharacteristic *uartChars[] = {&txCharacteristic, &rxCharacteristic};
 
 GattService         uartService(uart_base_uuid, uartChars, sizeof(uartChars) / sizeof(GattCharacteristic *));
@@ -79,62 +83,53 @@
 }
 
 void WrittenHandler(const GattWriteCallbackParams *Handler)
-{   
+{
     uint8_t buf[TXRX_BUF_LEN];
     uint16_t bytesRead, index;
-    
-    if (Handler->handle == txCharacteristic.getValueAttribute().getHandle()) 
-    {
+
+    if (Handler->handle == txCharacteristic.getValueAttribute().getHandle()) {
         ble.readCharacteristicValue(txCharacteristic.getValueAttribute().getHandle(), buf, &bytesRead);
         memset(txPayload, 0, TXRX_BUF_LEN);
-        memcpy(txPayload, buf, TXRX_BUF_LEN);       
-        
+        memcpy(txPayload, buf, TXRX_BUF_LEN);
+
         for(index=0; index<bytesRead; index++)
             pc.putc(buf[index]);
-            
-        if(buf[0] == 0x01)
-        {
-            if(buf[1] == 0x01)
-                LED_SET = 1;
+
+        if(buf[0] == 0x01) {
+            if(buf[1] == 0x01){
+               LED_BLINK = 1;
+            }
             else
-                LED_SET = 0;    
-        }
-        else if(buf[0] == 0xA0)
-        {
+                LED_BLINK = 0;
+        } else if(buf[0] == 0xA0) {
             if(buf[1] == 0x01)
                 analog_enabled = 1;
             else
                 analog_enabled = 0;
-        }
-        else if(buf[0] == 0x02)
-        {
+        } else if(buf[0] == 0x02) {
             float value = (float)buf[1]/255;
             PWM = value;
-        }
-        else if(buf[0] == 0x03)
-        {
+        } else if(buf[0] == 0x03) {
             MYSERVO.write(buf[1]);
-        }
-        else if(buf[0] == 0x04)
-        {
+        } else if(buf[0] == 0x04) {
             analog_enabled = 0;
             PWM = 0;
             MYSERVO.write(0);
-            LED_SET = 0;
-            old_state = 0;    
+            LED_BLINK = 0;
+            old_state = 0;
         }
 
     }
 }
 /*
 void uartCB(void)
-{   
-    while(pc.readable())    
+{
+    while(pc.readable())
     {
-        rx_buf[rx_len++] = pc.getc();    
+        rx_buf[rx_len++] = pc.getc();
         if(rx_len>=20 || rx_buf[rx_len-1]=='\0' || rx_buf[rx_len-1]=='\n')
         {
-            ble.updateCharacteristicValue(rxCharacteristic.getValueAttribute().getHandle(), rx_buf, rx_len); 
+            ble.updateCharacteristicValue(rxCharacteristic.getValueAttribute().getHandle(), rx_buf, rx_len);
             pc.printf("RecHandler \r\n");
             pc.printf("Length: ");
             pc.putc(rx_len);
@@ -146,75 +141,79 @@
 }
 */
 void m_status_check_handle(void)
-{   
+{
     uint8_t buf[3];
-    if (analog_enabled)  // if analog reading enabled
-    {
+    if (analog_enabled) { // if analog reading enabled
         // Read and send out
         float s = ANALOG;
-        uint16_t value = s*1024; 
+        uint16_t value = s*1024;
         buf[0] = (0x0B);
         buf[1] = (value >> 8);
         buf[2] = (value);
-        ble.updateCharacteristicValue(rxCharacteristic.getValueAttribute().getHandle(), buf, 3); 
+        ble.updateCharacteristicValue(rxCharacteristic.getValueAttribute().getHandle(), buf, 3);
     }
-    
+
     // If digital in changes, report the state
-    if (BUTTON != old_state)
-    {
+    if (BUTTON != old_state) {
         old_state = BUTTON;
-        
-        if (BUTTON == 1)
-        {
+
+        if (BUTTON == 1) {
             buf[0] = (0x0A);
             buf[1] = (0x01);
-            buf[2] = (0x00);    
-            ble.updateCharacteristicValue(rxCharacteristic.getValueAttribute().getHandle(), buf, 3); 
-        }
-        else
-        {
+            buf[2] = (0x00);
+            ble.updateCharacteristicValue(rxCharacteristic.getValueAttribute().getHandle(), buf, 3);
+        } else {
             buf[0] = (0x0A);
             buf[1] = (0x00);
             buf[2] = (0x00);
-           ble.updateCharacteristicValue(rxCharacteristic.getValueAttribute().getHandle(), buf, 3); 
+            ble.updateCharacteristicValue(rxCharacteristic.getValueAttribute().getHandle(), buf, 3);
         }
     }
 }
 
 
 int main(void)
-{   
+{
     Ticker ticker;
     ticker.attach_us(m_status_check_handle, 200000);
-    
+
     ble.init();
     ble.onDisconnection(disconnectionCallback);
-    ble.onDataWritten(WrittenHandler);  
-    
+    ble.onDataWritten(WrittenHandler);
+
     pc.baud(9600);
     pc.printf("SimpleChat Init \r\n");
 
     //pc.attach( uartCB , pc.RxIrq);
-    
-    // setup advertising 
+
+    // setup advertising
     ble.accumulateAdvertisingPayload(GapAdvertisingData::BREDR_NOT_SUPPORTED);
     ble.setAdvertisingType(GapAdvertisingParams::ADV_CONNECTABLE_UNDIRECTED);
     ble.accumulateAdvertisingPayload(GapAdvertisingData::SHORTENED_LOCAL_NAME,
-                                    (const uint8_t *)"Biscuit", sizeof("Biscuit") - 1);
+                                     (const uint8_t *)"NRFTRUC", sizeof("NRFTRUC") - 1);
     ble.accumulateAdvertisingPayload(GapAdvertisingData::COMPLETE_LIST_128BIT_SERVICE_IDS,
-                                    (const uint8_t *)uart_base_uuid_rev, sizeof(uart_base_uuid));
-    // 100ms; in multiples of 0.625ms. 
+                                     (const uint8_t *)uart_base_uuid_rev, sizeof(uart_base_uuid));
+    // 100ms; in multiples of 0.625ms.
     ble.setAdvertisingInterval(160);
 
     ble.addService(uartService);
-    
-    ble.startAdvertising(); 
-    
+
+    ble.startAdvertising();
+
     pc.printf("Advertising Start \r\n");
     
-    while(1)
-    {
-        ble.waitForEvent(); 
+    BMP085 baro();
+    while(1) {
+        ble.waitForEvent();
+        
+        if (LED_BLINK) {
+            LED_SET = 1;
+            wait(0.05);
+            LED_SET = 0;
+            wait(0.05);
+        }
+        else
+            LED_SET = 0;
     }
 }