Improved button support

Modify the main.cpp to understand the new "abstract" buttons in mbed OS.
Prevoius buttons were applicable only to K64F, but since mbed OS has
BUTTON_1 and BUTTON_2, you can check for those in a board independent manner.

Author: Janne Kiiskilä

main.cpp

@@ -66,18 +66,22 @@ struct MbedClientDevice device = {
 MbedClient mbed_client(device);
 
 
-// In case of K64F board , there is button resource available
-// to change resource value and unregister
-#ifdef TARGET_K64F
+// If board has a button_1, use it to update the counter.
+#ifdef BUTTON_1
 // Set up Hardware interrupt button.
-InterruptIn obs_button(SW2);
-InterruptIn unreg_button(SW3);
+InterruptIn obs_button(BUTTON_1);
 #else
 //In non K64F boards , set up a timer to simulate updating resource,
 // there is no functionality to unregister.
 Ticker timer;
 #endif
 
+// If the board has a 2nd button - hook the unregistration to that.
+#ifdef BUTTON_2
+InterruptIn unreg_button(BUTTON_2);
+#endif
+
+
 /*
  * Arguments for running "blink" in it's own thread.
  */
@@ -242,7 +246,7 @@ class ButtonResource {
 
             // up counter
             counter++;
-    #ifdef TARGET_K64F
+    #ifdef BUTTON_1
             printf("handle_button_click, new value of counter is %d\n", counter);
     #else
             printf("simulate button_click, new value of counter is %d\n", counter);
@@ -373,18 +377,20 @@ Add MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES and MBEDTLS_TEST_NULL_ENTROPY in mbed_app
     LedResource led_resource;
     BigPayloadResource big_payload_resource;
 
-#ifdef TARGET_K64F
-    // On press of SW3 button on K64F board, example application
+#ifdef BUTTON_2
+    // On press 2nd button (boards that have it), example application
     // will call unregister API towards mbed Device Connector
     //unreg_button.fall(&mbed_client,&MbedClient::test_unregister);
     unreg_button.fall(&unregister);
+#endif // BUTTON_2
 
-    // Observation Button (SW2) press will send update of endpoint resource values to connector
+#ifdef BUTTON_1
+    // 1st button - observation button press will send update of endpoint resource values to connector
     obs_button.fall(&button_clicked);
 #else
     // Send update of endpoint resource values to connector every 15 seconds periodically
     timer.attach(&button_clicked, 15.0);
-#endif
+#endif // BUTTON_1
 
     // Create endpoint interface to manage register and unregister
     mbed_client.create_interface(MBED_SERVER_ADDRESS, network);