From e48f9948a748e2bf08843b0941d157905cc47eda Mon Sep 17 00:00:00 2001
From: Sarah Marsh <Sarah.Marsh@arm.com>
Date: Fri, 21 Jul 2017 16:09:59 -0500
Subject: [PATCH] Add ETHERNET and ODIN_WIFI to odin device has. Add odin WiFi
 test configuration

---
 targets/targets.json                  |  5 +++++
 tools/test_configs/OdinInterface.json | 27 +++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 tools/test_configs/OdinInterface.json

diff --git a/targets/targets.json b/targets/targets.json
index 452e29db01..25d315ba2a 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -1688,8 +1688,13 @@
         "supported_form_factors": ["ARDUINO"],
         "core": "Cortex-M4F",
         "extra_labels_add": ["STM32F4", "STM32F439", "STM32F439ZI","STM32F439xx", "STM32F439xI"],
+<<<<<<< HEAD
         "macros": ["MBEDTLS_CONFIG_HW_SUPPORT", "HSE_VALUE=24000000", "HSE_STARTUP_TIMEOUT=5000", "CB_INTERFACE_SDIO","CB_CHIP_WL18XX","SUPPORT_80211D_ALWAYS","WLAN_ENABLED","MBEDTLS_ARC4_C","MBEDTLS_DES_C","MBEDTLS_MD4_C","MBEDTLS_MD5_C","MBEDTLS_SHA1_C"],
         "device_has_add": ["CAN", "EMAC", "TRNG", "FLASH"],
+=======
+        "macros": ["HSE_VALUE=24000000", "HSE_STARTUP_TIMEOUT=5000", "CB_INTERFACE_SDIO","CB_CHIP_WL18XX","SUPPORT_80211D_ALWAYS","WLAN_ENABLED","MBEDTLS_ARC4_C","MBEDTLS_DES_C","MBEDTLS_MD4_C","MBEDTLS_MD5_C","MBEDTLS_SHA1_C"],
+        "device_has_add": ["CAN", "EMAC", "TRNG", "FLASH", "ETHERNET", "ODIN_WIFI"],
+>>>>>>> Add ETHERNET and ODIN_WIFI to odin device has. Add odin WiFi test configuration
         "device_has_remove": ["RTC", "SLEEP"],
         "features": ["LWIP"],
         "release_versions": ["5"],
diff --git a/tools/test_configs/OdinInterface.json b/tools/test_configs/OdinInterface.json
new file mode 100644
index 0000000000..3ebac83f0e
--- /dev/null
+++ b/tools/test_configs/OdinInterface.json
@@ -0,0 +1,27 @@
+{
+    "config": {
+        "header-file": {
+            "help" : "String for including your driver header file",
+            "value" : "\"OdinWiFiInterface.h\""
+        },
+        "object-construction" : {
+            "value" : "new OdinWiFiInterface()"
+        },
+        "connect-statement" : {
+            "help" : "Must use 'net' variable name",
+            "value" : "((OdinWiFiInterface *)net)->connect(WIFI_SSID, WIFI_PASSWORD)"
+        },
+        "echo-server-addr" : {
+            "help" : "IP address of echo server",
+            "value" : "\"195.34.89.241\""
+        },
+        "echo-server-port" : {
+            "help" : "Port of echo server",
+            "value" : "7"
+        },
+        "tcp-echo-prefix" : {
+            "help" : "Some servers send a prefix before echoed message",
+            "value" : "\"u-blox AG TCP/UDP test service\\n\""
+        }
+    }
+}