Diff: main.cpp

Revision:

5:4609a86755be

Parent:

3:b0eb973cddda

Child:

6:759aab2880a7

--- a/main.cpp	Mon Mar 16 16:12:08 2015 +0000
+++ b/main.cpp	Mon Mar 16 19:03:09 2015 +0000
@@ -33,17 +33,24 @@
 // Logging facility
 Logger logger(&pc);
 
-// Which Nordic board are we using?
-#define NORDIC_BOARD           1           // 1 - DK, 2 - Dongle, 3 - mkit
-
-#if NORDIC_BOARD == 1
-    #define NORDIC_MODEL "nRF51822-DK"
+// which Nordic board?
+#ifdef TARGET_NRF51_DK
+    #define NORDIC_MODEL        "nRF51822-DK"
+    #define MY_ENDPOINT_NAME    "ble-hrm-endpt-dk"
+    #define NORDIC_SDA          SDA
+    #define NORDIC_SCL          SCL   
 #endif
-#if NORDIC_BOARD == 2
-    #define NORDIC_MODEL "nRF51822-DONGLE"
+#ifdef TARGET_NRF51_DONGLE
+    #define NORDIC_MODEL        "nRF51822-DONGLE"
+    #define MY_ENDPOINT_NAME    "ble-hrm-endpt"
+    #define NORDIC_SDA          P0_20
+    #define NORDIC_SCL          P0_19
 #endif
-#if NORDIC_BOARD == 3
-    #define NORDIC_MODEL "nRF51822-MKIT"
+#ifdef TARGET_NRF51_MKIT
+    #define NORDIC_MODEL        "nRF51822-MKIT"
+    #define MY_ENDPOINT_NAME    "ble-hrm-endpt-mkit"
+    #define NORDIC_SDA          P0_22
+    #define NORDIC_SCL          P0_20
 #endif
 
 // Static Resources
@@ -65,9 +72,6 @@
 #include "HeartrateResource.h"
 HeartrateResource hr(&logger,"888/0/5850",true); // observable   
 
-// Set our own unique endpoint name
-#define MY_ENDPOINT_NAME                       "ble-hrm-endpt"
-
 // My NSP Domain
 #define MY_NSP_DOMAIN                          "domain"                               
 
@@ -112,4 +116,4 @@
     // starts the endpoint by finalizing its configuration (configure_endpoint() above called),creating a Thread and reading NSP events...
     logger.log("Start the endpoint to finish setup and enter the main loop...");
     Connector::Endpoint::start();
-}
+}
\ No newline at end of file