From 4aaf08a3961783c4c7a8a8cd30e5ddde638b4ffd Mon Sep 17 00:00:00 2001 From: follower Date: Sat, 8 Dec 2007 15:06:40 +0000 Subject: [PATCH] Move default configuration into NetworkInterface constructor. Change default values. git-svn-id: svn+ssh://oldsvn/home/mlalondesvn/svn/cral@98 3ee9b42a-b53c-0410-a25e-f0b6218d5d5b --- .../wiz810mj/src/demo/WizDemo4/WizDemo4.pde | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/branches/follower/wiz810mj/src/demo/WizDemo4/WizDemo4.pde b/branches/follower/wiz810mj/src/demo/WizDemo4/WizDemo4.pde index 770a506..75eed92 100644 --- a/branches/follower/wiz810mj/src/demo/WizDemo4/WizDemo4.pde +++ b/branches/follower/wiz810mj/src/demo/WizDemo4/WizDemo4.pde @@ -236,6 +236,15 @@ NetworkInterface::NetworkInterface(Wiz810MjDevice& networkDevice) : device (netw it is needed to give the 'device' Reference a value supplied to the method rather than having a new 'Wiz810MjDevice' instance created. */ + + // This may not be the best place to do all this, but it'll do for now: + device.setMac(0x02,0xDE,0xAD,0xBE,0xEF,0x00); + + device.setIp(169,254,254,169); // A local-link IP -- NOTE: This is out of spec. + device.setMask(255,255,0,0); // Matches local-link IP /16 + + device.setGateway(0,0,0,0); // We can't even guess this, so just skip it. + }; // NetworkInterface Network = NetworkInterface(...); // TODO: Make this a global @@ -262,16 +271,11 @@ void setup () { Wiz810MjDevice WIZ810MJ = Wiz810MjDevice(PIN_RESET); Serial.println("Test W5100 configuration..."); - - WIZ810MJ.setMac(0x02,0xDE,0xAD,0xBE,0xEF,0x00); - - // WIZ810MJ.setIp(192,168,2,105); - WIZ810MJ.setMask(255,255,255,0); - WIZ810MJ.setGateway(192,168,2,101); - + NetworkInterface Network = NetworkInterface(WIZ810MJ); Network.device.setIp(192,168,2,105); + Network.device.setMask(255,255,255,0); Serial.println("End test W5100 configuration...");