Diff: main.cpp

Revision:

14:09f208b24460

Parent:

13:0f26a3fc1f32

Child:

15:9f9f5d82743d

--- a/main.cpp	Tue Jun 07 18:20:12 2016 +0000
+++ b/main.cpp	Mon Jun 13 17:09:43 2016 +0000
@@ -20,11 +20,17 @@
 
 DigitalOut  led1(LED1);
 DigitalOut  led2(LED2);
-InterruptIn button(P0_15); /* The Pin where your Button is Connected */
+InterruptIn button0(P0_15);
+InterruptIn button1(P0_16);
+InterruptIn button2(P0_17);
+InterruptIn button3(P0_18);
+InterruptIn button4(P0_19);
+InterruptIn button5(P0_20);
 
 const uint16_t        MIN_ADVERT_INTERVAL = 50; /* msec */
-const static char     DEVICE_NAME[] = "Button";
+const static char     DEVICE_NAME[] = "OT";
 static const uint16_t uuid16_list[] = {ButtonService::BUTTON_SERVICE_UUID};
+static uint8_t        gpio_states[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
 enum {
     RELEASED = 0,
@@ -39,20 +45,33 @@
     led2 = !led2;
 }
 
-void buttonPressedCallback(void)
+void button0PressedCallback(void)
 {
     /* Note that the buttonPressedCallback() executes in interrupt context, so it is safer to access
      * BLE device API from the main thread. */
     buttonState = PRESSED;
+    gpio_states[0]=0x01;
 }
 
-void buttonReleasedCallback(void)
+void button0ReleasedCallback(void)
 {
     /* Note that the buttonReleasedCallback() executes in interrupt context, so it is safer to access
      * BLE device API from the main thread. */
     buttonState = RELEASED;
+    gpio_states[0]=0x00;
 }
 
+void button1PressedCallback(void) { buttonState = PRESSED;  gpio_states[1]=0x01; }
+void button1ReleasedCallback(void){ buttonState = RELEASED; gpio_states[1]=0x00; }
+void button2PressedCallback(void) { buttonState = PRESSED;  gpio_states[2]=0x01; }
+void button2ReleasedCallback(void){ buttonState = RELEASED; gpio_states[2]=0x00; }
+void button3PressedCallback(void) { buttonState = PRESSED;  gpio_states[3]=0x01; }
+void button3ReleasedCallback(void){ buttonState = RELEASED; gpio_states[3]=0x00; }
+void button4PressedCallback(void) { buttonState = PRESSED;  gpio_states[4]=0x01; }
+void button4ReleasedCallback(void){ buttonState = RELEASED; gpio_states[4]=0x00; }
+void button5PressedCallback(void) { buttonState = PRESSED;  gpio_states[5]=0x01; }
+void button5ReleasedCallback(void){ buttonState = RELEASED; gpio_states[5]=0x00; }
+
 void disconnectionCallback(const Gap::DisconnectionCallbackParams_t *params)
 {
     BLE::Instance().gap().startAdvertising();
@@ -66,19 +85,22 @@
 /**
  * This function is called when the ble initialization process has failled
  */
-void onBleInitError(BLE &ble, ble_error_t error)
+void onBleInitError(BLE &ble, ble_error_t bt_error)
 {
     /* Initialization error handling should go here */
     error("Panic!");
 }
 
 void setPir(uint8_t pir){
+    // http://tokencube.com/bluetooth-sensor.html
     uint8_t data[] = { 
         0xee, 0xff, // Tokencube Manufacturer ID
         0x04, // Token Module Version
         0x01, // Firmware Version
         0x11, // Page 1 of 1
-        0x07, pir // pir value
+        0x07, pir, // pir value
+        // custom data - state of all 6 gpio's
+        0x0F, gpio_states[0], gpio_states[1], gpio_states[2], gpio_states[3], gpio_states[4], gpio_states[5]
     };
     BLE::Instance().gap().accumulateAdvertisingPayload(GapAdvertisingData::MANUFACTURER_SPECIFIC_DATA, data, sizeof(data));
 }
@@ -122,7 +144,7 @@
     ble.gap().setAdvertisingType(GapAdvertisingParams::ADV_CONNECTABLE_UNDIRECTED);
     
     uint16_t minInterval = ble.gap().getMinAdvertisingInterval();
-    if(minInterval < 50) minInterval = 50;
+    if(minInterval < MIN_ADVERT_INTERVAL) minInterval = MIN_ADVERT_INTERVAL;
     ble.gap().setAdvertisingInterval(minInterval); /* ms. */
     setPir(0x00);
     ble.gap().startAdvertising();
@@ -137,12 +159,23 @@
 
 int main(void)
 {
-    led1 = !0;
-    led2 = !0;
     Ticker ticker;
+    
+    led1 = !0; led2 = !0;
+    
     ticker.attach(periodicCallback, 1);
-    button.fall(buttonPressedCallback);
-    button.rise(buttonReleasedCallback);
+    button0.fall(button0PressedCallback);
+    button0.rise(button0ReleasedCallback);
+    button1.fall(button1PressedCallback);
+    button1.rise(button1ReleasedCallback);
+    button2.fall(button2PressedCallback);
+    button2.rise(button2ReleasedCallback);
+    button3.fall(button3PressedCallback);
+    button3.rise(button3ReleasedCallback);
+    button4.fall(button4PressedCallback);
+    button4.rise(button4ReleasedCallback);
+    button5.fall(button5PressedCallback);
+    button5.rise(button5ReleasedCallback);
 
     BLE &ble = BLE::Instance();
     ble.init(bleInitComplete);