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
BUTTON1 and BUTTON2, 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 BUTTON1
 // Set up Hardware interrupt button.
-InterruptIn obs_button(SW2);
-InterruptIn unreg_button(SW3);
-#else
+InterruptIn obs_button(BUTTON1);
+#else // BUTTON1
 //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 BUTTON2
+InterruptIn unreg_button(BUTTON2);
+#endif // BUTTON2
+
+
 /*
  * Arguments for running "blink" in it's own thread.
  */
@@ -242,11 +246,11 @@ class ButtonResource {
 
             // up counter
             counter++;
-    #ifdef TARGET_K64F
+    #ifdef BUTTON1
             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);
-    #endif
+    #endif // BUTTON1
             // serialize the value of counter as a string, and tell connector
             char buffer[20];
             int size = sprintf(buffer,"%d",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 BUTTON2
+    // 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 // BUTTON2
 
-    // Observation Button (SW2) press will send update of endpoint resource values to connector
+#ifdef BUTTON1
+    // 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 // BUTTON1
 
     // Create endpoint interface to manage register and unregister
     mbed_client.create_interface(MBED_SERVER_ADDRESS, network);