Diff: main.cpp

Revision:

7:3afe21b24e58

Parent:

5:8b1ff723682d

Child:

8:de0336411ac1

--- a/main.cpp	Thu Aug 16 21:35:37 2018 +0000
+++ b/main.cpp	Fri May 03 17:20:07 2019 +0000
@@ -47,20 +47,21 @@
 /****************************Call Back Functions*******************************/
 void ButtonRight(void)
 {
-    printf("Right\r\n");
+    pc.printf("Right\r\n");
     StartHaptic();
-    kw40z_device.ToggleAdvertisementMode();
+    //kw40z_device.ToggleAdvertisementMode();
 }
 
 void ButtonLeft(void)
 {
-    printf("Left\r\n");
+    pc.printf("Left\r\n");
     StartHaptic();
-    kw40z_device.ToggleAdvertisementMode();
+    //kw40z_device.ToggleAdvertisementMode();
 }
 
 void PassKey(void)
 {
+    pc.printf("passkey\n");
     StartHaptic();
     strcpy((char *) text,"PAIR CODE");
     oled.TextBox((uint8_t *)text,0,25,95,18);
@@ -72,27 +73,27 @@
 
 // Key modification: use the alert functionality enabled by the host-ble interface
 // to define our own command.
-void MessageReceived(uint8_t *data, uint8_t length)
+void alertReceived(uint8_t *data, uint8_t length)
 {
     StartHaptic();
     data[length] = 0;
     printf("%s\n\r", data);
     
-    // data (our command) must 20 bytes long.
-    // CMD for turning on: 'ledonledonledonledon'
-    //if (data[4] == 'n') {
-//        greenLed = LED_ON;
-//        redLed = LED_ON;
-//        blueLed = LED_ON;
-//        pc.printf("on\n\r", data);
+   // data (our command) must 20 bytes long.
+   // CMD for turning on: 'ledonledonledonledon'
+    if (data[4] == 'n') {
+        greenLed = LED_ON;
+        redLed = LED_ON;
+        blueLed = LED_ON;
+        pc.printf("on\n\r", data);
     
-    // CMD for turning off: 'ledoffledoffledoffled'
-//    } else if (data[4] == 'f') {
-//        greenLed = LED_OFF;
-//        redLed = LED_OFF;
-//        blueLed = LED_OFF;
-//        pc.printf("off\n\r", data);
-//    }
+     //CMD for turning off: 'ledoffledoffledoffled'
+    } else if (data[4] == 'f') {
+        greenLed = LED_OFF;
+        redLed = LED_OFF;
+        blueLed = LED_OFF;
+        pc.printf("off\n\r", data);
+    }
 }
 /***********************End of Call Back Functions*****************************/
 
@@ -104,7 +105,7 @@
     kw40z_device.attach_buttonLeft(&ButtonLeft);
     kw40z_device.attach_buttonRight(&ButtonRight);
     kw40z_device.attach_passkey(&PassKey);
-    kw40z_device.attach_message(&MessageReceived);
+    kw40z_device.attach_alert(&alertReceived);
 
     pc.baud(115200);
     pc.printf("hello\n\r");
@@ -141,8 +142,12 @@
      
     txThread.start(txTask); /*Start transmitting Sensor Tag Data */
     
+    int i = 0;
     while (true) 
     {
+        if (i % 20 == 0)
+            pc.printf("still here, %d\n\r", i);
+        i = i + 1;
         // blueLed = !kw40z_device.GetAdvertisementMode(); /*Indicate BLE Advertisment Mode*/   
         Thread::wait(50);
     }