From 881e9430a17de82334b65041150a3c122d342f41 Mon Sep 17 00:00:00 2001
From: Mimmo La Fauci <mlafauci@metodo2.it>
Date: Tue, 26 Mar 2013 22:26:21 +0100
Subject: Fix print message on dhcp status

---
 firmwares/wifishield/wifiHD/Release/wifiHD.elf | Bin 724331 -> 724331 bytes
 firmwares/wifishield/wifiHD/Release/wifiHD.hex |  16 ++++++++--------
 firmwares/wifishield/wifiHD/src/cmd_wl.c       |   2 +-
 firmwares/wifishield/wifiHD/src/main.c         |   4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'firmwares/wifishield/wifiHD')

diff --git a/firmwares/wifishield/wifiHD/Release/wifiHD.elf b/firmwares/wifishield/wifiHD/Release/wifiHD.elf
index 323f296..d4a8bde 100644
Binary files a/firmwares/wifishield/wifiHD/Release/wifiHD.elf and b/firmwares/wifishield/wifiHD/Release/wifiHD.elf differ
diff --git a/firmwares/wifishield/wifiHD/Release/wifiHD.hex b/firmwares/wifishield/wifiHD/Release/wifiHD.hex
index b8a95b5..0122587 100644
--- a/firmwares/wifishield/wifiHD/Release/wifiHD.hex
+++ b/firmwares/wifishield/wifiHD/Release/wifiHD.hex
@@ -2048,8 +2048,8 @@
 :107FD800F01F00136E0870285008F01F001C500C8A
 :107FE80049CCF01F000F6E0870385008F01F0017BA
 :107FF800500C499CF01F000A2FEDC048497CF01F27
-:108008000008497CF01F00060DC93008F009180067
-:10801800C2A0494CC298000080039314800094C405
+:108008000008497CF01F00060DC93018F009180057
+:10801800C2A1494CC298000080039314800094C404
 :10802800800191288003932C8000967080039348E8
 :108038008001997C80039358800393A880009784DB
 :10804800000080D08000CAE4800096A8800393686E
@@ -2239,10 +2239,10 @@
 :108BC8008000B1D88000AE50800397908000CABC66
 :108BD80080002E60D42116971896333CF01F00149D
 :108BE8000C9CF01F0014201D1ADC493CF01F0013D8
-:108BF8000FC92FED3008F0091800C130490CF01FDB
+:108BF80030182FED0FC6F0061800C121490CF01FE0
 :108C0800000F6E0CF01F000F48F849095C5CF20C6D
-:108C18001700F00C1710F01F00093018AED8C04824
-:108C28006E0CF01F000BF01F000BD8228000A30071
+:108C18001700F00C1710F01F0009AED6C0486E0CF4
+:108C2800F01F000BF01F000BD82200008000A300EB
 :108C3800800096E48003979C800094C4800397B8D2
 :108C48008000B950800397D080037FC08000CB8814
 :108C58008000C690D42149471896F01F0014189533
@@ -2254,8 +2254,8 @@
 :108CB800800096A8800397D8800094C480006B2C0D
 :108CC800000016A28003995C800397E8D4211897C6
 :108CD800F01F0027300A4A7B4A7CF01F0028300A20
-:108CE8004A7B4A8CF01F0025300A4A7B4A7CF01FD9
-:108CF8000023300A4A6B4A7CF01F0020300A4A6B76
+:108CE8004A7B4A8CF01F00254A7B300A4A7CF01FD9
+:108CF80000230E9A4A6B4A7CF01F0020300A4A6B08
 :108D08004A6CF01F001E4A6B300A4A6CF01F001BA9
 :108D18000E9A4A5B4A5CF01F0019300A4A4B4A5CBB
 :108D2800F01F0016300A4A4B4A4CF01F0014300A54
@@ -14704,7 +14704,7 @@
 :1096E000202025730A000000636F756C64206E6F84
 :1096F0007420616C6C6F63617465206669726D774C
 :10970000617265206275666665720A00547565202F
-:109710004D61722032362031393A34383A333120B3
+:109710004D61722032362032323A30393A353420B7
 :109720003230313300000000776C5F696E69745F1E
 :10973000636F6D706C6574655F6362006661696C10
 :10974000656420746F20696E697420776C20636F84
diff --git a/firmwares/wifishield/wifiHD/src/cmd_wl.c b/firmwares/wifishield/wifiHD/src/cmd_wl.c
index 3985072..a210dec 100644
--- a/firmwares/wifishield/wifiHD/src/cmd_wl.c
+++ b/firmwares/wifishield/wifiHD/src/cmd_wl.c
@@ -466,7 +466,7 @@ cmd_status(int argc, char* argv[], void* ctx)
         else
                 printk("ip interface is down\n");
         printk("dhcp : ");
-        if (ncfg->dhcp_enabled) {
+        if (ncfg->dhcp_enabled == DYNAMIC_IP_CONFIG) {
                 printk("enabled\n");
         }
         else {
diff --git a/firmwares/wifishield/wifiHD/src/main.c b/firmwares/wifishield/wifiHD/src/main.c
index 5800ba8..fffb34e 100644
--- a/firmwares/wifishield/wifiHD/src/main.c
+++ b/firmwares/wifishield/wifiHD/src/main.c
@@ -109,7 +109,7 @@ wl_cm_conn_cb(struct wl_network_t* net, void* ctx)
 	INFO_INIT("Connection cb...\n");
 
 	printk("link up, connected to \"%s\"\n", ssid2str(&net->ssid));
-    if ( hs->net_cfg.dhcp_enabled ) {
+    if ( hs->net_cfg.dhcp_enabled == DYNAMIC_IP_CONFIG ) {
 			INFO_INIT("Start DHCP...\n");
 		    printk("requesting dhcp ... ");
             int8_t result = dhcp_start(hs->net_cfg.netif);
@@ -273,7 +273,7 @@ void initShell(void* ctx)
         console_add_cmd("scan", cmd_scan, NULL);
         console_add_cmd("connect", cmd_connect, NULL);
         console_add_cmd("setkey", cmd_setkey, NULL);
-        console_add_cmd("status", cmd_status, NULL);
+        console_add_cmd("status", cmd_status, ctx);
         console_add_cmd("debug", cmd_debug, NULL);
         console_add_cmd("dumpBuf", cmd_dumpBuf, NULL);
 		console_add_cmd("ipconfig", cmd_set_ip, ctx);
-- 
cgit v1.2.3-18-g5258