[ARDUINO][BLE] Enable Arduino BLE support in RI sample

Change-Id: Ie326dca25edbfea638e5fea718ad0802224e4c39
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3807
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

diff --git a/arduino.scons b/arduino.scons
index ae3b53f..4329775 100644 (file)
--- a/arduino.scons
+++ b/arduino.scons
@@ -35,6 +35,7 @@ Help(vars.GenerateHelpText(env))
 env.ImportLib('SPI')
 if 'ETH' in env.get('SHIELD'):
        env.ImportLib('Ethernet')
+       env.AppendUnique(CPPDEFINES = ['ARDUINOETH'])
 if 'WIFI' in env.get('SHIELD'):
        env.ImportLib('WiFi')
        env.AppendUnique(CPPDEFINES = ['ARDUINOWIFI'])

diff --git a/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript b/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript
index 5b551bb..829ce52 100644 (file)
--- a/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript
+++ b/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript
@@ -21,9 +21,6 @@
 Import('env')
 
 transport = env.get('TARGET_TRANSPORT')
-if 'BLE' in transport:
-        # Only supported for ethernet and WiFi.
-        Return()
 
 arduino_simplecs_env = env.Clone()
 ######################################################################

diff --git a/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/ocserver.cpp b/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/ocserver.cpp
index 22aab31..9c9885c 100644 (file)
--- a/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/ocserver.cpp
+++ b/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/ocserver.cpp
@@ -31,7 +31,7 @@
 #include <SPI.h>
 #include <WiFi.h>
 #include <WiFiUdp.h>
-#else
+#elif defined ARDUINOETH
 // Arduino Ethernet Shield
 #include <EthernetServer.h>
 #include <Ethernet.h>
@@ -107,7 +107,7 @@ int ConnectToNetwork()
     OC_LOG_V(INFO, TAG, "IP Address:  %d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
     return 0;
 }
-#else
+#elif defined ARDUINOETH
 // Arduino Ethernet Shield
 int ConnectToNetwork()
 {
@@ -249,11 +249,13 @@ void setup()
     OC_LOG(DEBUG, TAG, ("OCServer is starting..."));
 
     // Connect to Ethernet or WiFi network
+#if defined(ARDUINOWIFI) || defined(ARDUINOETH)
     if (ConnectToNetwork() != 0)
     {
         OC_LOG(ERROR, TAG, ("Unable to connect to network"));
         return;
     }
+#endif
 
     // Initialize the OC Stack in Server mode
     if (OCInit(NULL, 0, OC_SERVER) != OC_STACK_OK)