Revision 10:ac3615194d04, committed 2016-10-24

Comitter:

mbed_official

Date:

Mon Oct 24 11:15:35 2016 +0100

Parent:

9:28cc52dc2acd

Child:

11:41c947b801db

Commit message:

Merge pull request #32 from ARMmbed/oob

Sync with mbed OS 5.2 OOB repo

Commit copied from https://github.com/ARMmbed/mbed-os-example-ble

Changed in this revision

--- a/mbed-events.lib	Wed Oct 05 05:15:58 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-https://github.com/ARMmbed/mbed-events.git#6be60bf880c11a0beafcc2064bf467f8d897529a

--- a/mbed-os.lib	Wed Oct 05 05:15:58 2016 +0100
+++ b/mbed-os.lib	Mon Oct 24 11:15:35 2016 +0100
@@ -1,1 +1,1 @@
-https://github.com/ARMmbed/mbed-os/#a6f3fd1a60d5df59246d7caf3f108c4d34e1808e
+https://github.com/ARMmbed/mbed-os/#1d875083b701a5e530f97ba615e2c0d2060d09e5

--- a/source/main.cpp	Wed Oct 05 05:15:58 2016 +0100
+++ b/source/main.cpp	Mon Oct 24 11:15:35 2016 +0100
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <mbed-events/events.h>
+#include <events/mbed_events.h>
 #include <mbed.h>
 #include "ble/BLE.h"
 #include "ble/Gap.h"
@@ -55,7 +55,7 @@
     led1 = !led1; /* Do blinky on LED1 while we're waiting for BLE events */
 
     if (BLE::Instance().getGapState().connected) {
-        eventQueue.post(updateSensorValue);
+        eventQueue.call(updateSensorValue);
     }
 }
 
@@ -97,20 +97,18 @@
 
 void scheduleBleEventsProcessing(BLE::OnEventsToProcessCallbackContext* context) {
     BLE &ble = BLE::Instance();
-    eventQueue.post(Callback<void()>(&ble, &BLE::processEvents));
+    eventQueue.call(Callback<void()>(&ble, &BLE::processEvents));
 }
 
 int main()
 {
-    eventQueue.post_every(500, periodicCallback);
+    eventQueue.call_every(500, periodicCallback);
 
     BLE &ble = BLE::Instance();
     ble.onEventsToProcess(scheduleBleEventsProcessing);
     ble.init(bleInitComplete);
 
-    while (true) {
-        eventQueue.dispatch();
-    }
+    eventQueue.dispatch_forever();
 
     return 0;
 }