Diff: main.cpp

Revision:

1:6458709fb459

Parent:

0:1dbfda43d8b4

Child:

2:d5bdd080d451

--- a/main.cpp	Mon Jun 22 22:01:52 2015 +0000
+++ b/main.cpp	Fri Jul 10 15:19:15 2015 +0000
@@ -1,13 +1,18 @@
 //**********************
 // BLE demo for mbed_HRM1017
 //
+// successful combination
+// mbed=rev.97/BLE_API=rev.341/nRF51822=rev.111
+// mbed=rev.101/BLE_API=rev.738/nRF51822=rev.385
+//
 // (C)Copyright 2015 All rights reserved by Y.Onodera
 // http://einstlab.web.fc2.com
 //**********************
 #if defined(TARGET_HRM1017)
 #include "mbed.h"
 #include "ADT7410.h"
-#include "BLEDevice.h"              // BLEライブラリのヘッダ
+//#include "BLEDevice.h"            // BLEライブラリのヘッダ BLE_API=rev.341
+#include "BLE.h"                    // BLEライブラリのヘッダ BLE_API=rev.738
 #include "BatteryService.h"         // BatteryServiceのヘッダ
 #include "HeartRateService.h"       // HeartRateServiceのヘッダ
 #include "HealthThermometerService.h" // HealthThermometerServiceのヘッダ
@@ -49,20 +54,17 @@
 
 
 // BLE接続処理
-#define OLD
+//#define OLD
 #ifdef OLD
-// old version BLE_API until rev.341
+// BLE_API=rev.341
 void connectionCallback(
 Gap::Handle_t handle, 
 Gap::addr_type_t peerAddrType, const Gap::address_t peerAddr, 
 const Gap::ConnectionParams_t *params) 
 #else
-// new version
+// BLE_API=rev.738
 void connectionCallback(
-Gap::Handle_t handle,
-Gap::addr_type_t peerAddrType, const Gap::address_t peerAddr,
-Gap::addr_type_t ownAddrType, const Gap::address_t ownAddr,
-const Gap::ConnectionParams_t *params)
+const Gap::ConnectionCallbackParams_t *params)
 #endif
 {
     led2 = 1;
@@ -79,6 +81,8 @@
 
 
 // BLE接続タイムアウト処理
+#ifdef OLD
+// BLE_API=rev.341
 void connectTimeoutCallback(void)
 {
     // to do
@@ -89,6 +93,12 @@
 //  System-off
 //  NRF_POWER->SYSTEMOFF = 1;
 }
+#else
+// BLE_API rev.738
+void connectTimeoutCallback(Gap::TimeoutSource_t source)
+{
+}
+#endif
 
 
 void initAdvertising(void)