From 2e6023bc2aadfe418dbdedf9a085e740a83f570f Mon Sep 17 00:00:00 2001 From: Fede85 Date: Thu, 11 Apr 2013 17:36:15 +0200 Subject: [PATCH] edited some ethernet ad wifi examples --- .../examples/DnsWebClient/DnsWebClient.ino | 81 ------------------- .../examples/TwitterClient/TwitterClient.ino | 1 + .../Ethernet/examples/WebClient/WebClient.ino | 24 ++++-- .../WiFiChatServer.ino} | 0 .../WiFiPachubeClient.ino} | 0 .../WiFiPachubeClientString.ino} | 0 .../WiFiTwitterClient.ino} | 4 +- .../WiFiUdpSendReceiveString.ino} | 0 .../WiFiWebClient.ino} | 8 +- .../WiFiWebClientRepeating.ino} | 0 .../WiFiWebServer.ino} | 0 11 files changed, 23 insertions(+), 95 deletions(-) delete mode 100644 libraries/Ethernet/examples/DnsWebClient/DnsWebClient.ino rename libraries/WiFi/examples/{WifiChatServer/WifiChatServer.ino => WiFiChatServer/WiFiChatServer.ino} (100%) rename libraries/WiFi/examples/{WifiPachubeClient/WifiPachubeClient.ino => WiFiPachubeClient/WiFiPachubeClient.ino} (100%) rename libraries/WiFi/examples/{WifiPachubeClientString/WifiPachubeClientString.ino => WiFiPachubeClientString/WiFiPachubeClientString.ino} (100%) rename libraries/WiFi/examples/{WifiTwitterClient/WifiTwitterClient.ino => WiFiTwitterClient/WiFiTwitterClient.ino} (98%) rename libraries/WiFi/examples/{WifiUdpSendReceiveString/WifiUdpSendReceiveString.ino => WiFiUdpSendReceiveString/WiFiUdpSendReceiveString.ino} (100%) rename libraries/WiFi/examples/{WifiWebClient/WifiWebClient.ino => WiFiWebClient/WiFiWebClient.ino} (92%) rename libraries/WiFi/examples/{WifiWebClientRepeating/WifiWebClientRepeating.ino => WiFiWebClientRepeating/WiFiWebClientRepeating.ino} (100%) rename libraries/WiFi/examples/{WifiWebServer/WifiWebServer.ino => WiFiWebServer/WiFiWebServer.ino} (100%) diff --git a/libraries/Ethernet/examples/DnsWebClient/DnsWebClient.ino b/libraries/Ethernet/examples/DnsWebClient/DnsWebClient.ino deleted file mode 100644 index c14abf403..000000000 --- a/libraries/Ethernet/examples/DnsWebClient/DnsWebClient.ino +++ /dev/null @@ -1,81 +0,0 @@ -/* - DNS and DHCP-based Web client - - This sketch connects to a website (http://www.google.com) - using an Arduino Wiznet Ethernet shield. - - Circuit: - * Ethernet shield attached to pins 10, 11, 12, 13 - - created 18 Dec 2009 - by David A. Mellis - modified 9 Apr 2012 - by Tom Igoe, based on work by Adrian McEwen - - */ - -#include -#include - -// Enter a MAC address for your controller below. -// Newer Ethernet shields have a MAC address printed on a sticker on the shield -byte mac[] = { 0x00, 0xAA, 0xBB, 0xCC, 0xDE, 0x02 }; -char serverName[] = "www.google.com"; - -// Initialize the Ethernet client library -// with the IP address and port of the server -// that you want to connect to (port 80 is default for HTTP): -EthernetClient client; - -void setup() { - // Open serial communications and wait for port to open: - Serial.begin(9600); - while (!Serial) { - ; // wait for serial port to connect. Needed for Leonardo only - } - - - // start the Ethernet connection: - if (Ethernet.begin(mac) == 0) { - Serial.println("Failed to configure Ethernet using DHCP"); - // no point in carrying on, so do nothing forevermore: - while(true); - } - // give the Ethernet shield a second to initialize: - delay(1000); - Serial.println("connecting..."); - - // if you get a connection, report back via serial: - - if (client.connect(serverName, 80)) { - Serial.println("connected"); - // Make a HTTP request: - client.println("GET /search?q=arduino HTTP/1.0"); - client.println(); - } - else { - // kf you didn't get a connection to the server: - Serial.println("connection failed"); - } -} - -void loop() -{ - // if there are incoming bytes available - // from the server, read them and print them: - if (client.available()) { - char c = client.read(); - Serial.print(c); - } - - // if the server's disconnected, stop the client: - if (!client.connected()) { - Serial.println(); - Serial.println("disconnecting."); - client.stop(); - - // do nothing forevermore: - while(true); - } -} - diff --git a/libraries/Ethernet/examples/TwitterClient/TwitterClient.ino b/libraries/Ethernet/examples/TwitterClient/TwitterClient.ino index 3587d72d3..9fee1feab 100644 --- a/libraries/Ethernet/examples/TwitterClient/TwitterClient.ino +++ b/libraries/Ethernet/examples/TwitterClient/TwitterClient.ino @@ -127,6 +127,7 @@ void connectToServer() { // make HTTP GET request to twitter: client.println("GET /1/statuses/user_timeline.xml?screen_name=arduino&count=1 HTTP/1.1"); client.println("HOST: api.twitter.com"); + client.println("Connection: close"); client.println(); } // note the time of this connect attempt: diff --git a/libraries/Ethernet/examples/WebClient/WebClient.ino b/libraries/Ethernet/examples/WebClient/WebClient.ino index 5d5d7f20b..40523a4d9 100644 --- a/libraries/Ethernet/examples/WebClient/WebClient.ino +++ b/libraries/Ethernet/examples/WebClient/WebClient.ino @@ -8,8 +8,9 @@ * Ethernet shield attached to pins 10, 11, 12, 13 created 18 Dec 2009 - modified 9 Apr 2012 by David A. Mellis + modified 9 Apr 2012 + by Tom Igoe, based on work by Adrian McEwen */ @@ -18,8 +19,14 @@ // Enter a MAC address for your controller below. // Newer Ethernet shields have a MAC address printed on a sticker on the shield -byte mac[] = { 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED }; -IPAddress server(173,194,33,104); // Google +byte mac[] = { 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED }; +// if you don't want to use DNS (and reduce your sketch size) +// use the numeric IP instead of the name for the server: +//IPAddress server(74,125,232,128); // numeric IP for Google (no DNS) +char server[] = "www.google.com"; // name address for Google (using DNS) + +// Set the static IP address to use if the DHCP fails to assign +IPAddress ip(192,168,0,177); // Initialize the Ethernet client library // with the IP address and port of the server @@ -37,8 +44,8 @@ void setup() { if (Ethernet.begin(mac) == 0) { Serial.println("Failed to configure Ethernet using DHCP"); // no point in carrying on, so do nothing forevermore: - for(;;) - ; + // try to congifure using IP address instead of DHCP: + Ethernet.begin(mac, ip); } // give the Ethernet shield a second to initialize: delay(1000); @@ -48,7 +55,9 @@ void setup() { if (client.connect(server, 80)) { Serial.println("connected"); // Make a HTTP request: - client.println("GET /search?q=arduino HTTP/1.0"); + client.println("GET /search?q=arduino HTTP/1.1"); + client.println("Host: www.google.com"); + client.println("Connection: close"); client.println(); } else { @@ -73,8 +82,7 @@ void loop() client.stop(); // do nothing forevermore: - for(;;) - ; + while(true); } } diff --git a/libraries/WiFi/examples/WifiChatServer/WifiChatServer.ino b/libraries/WiFi/examples/WiFiChatServer/WiFiChatServer.ino similarity index 100% rename from libraries/WiFi/examples/WifiChatServer/WifiChatServer.ino rename to libraries/WiFi/examples/WiFiChatServer/WiFiChatServer.ino diff --git a/libraries/WiFi/examples/WifiPachubeClient/WifiPachubeClient.ino b/libraries/WiFi/examples/WiFiPachubeClient/WiFiPachubeClient.ino similarity index 100% rename from libraries/WiFi/examples/WifiPachubeClient/WifiPachubeClient.ino rename to libraries/WiFi/examples/WiFiPachubeClient/WiFiPachubeClient.ino diff --git a/libraries/WiFi/examples/WifiPachubeClientString/WifiPachubeClientString.ino b/libraries/WiFi/examples/WiFiPachubeClientString/WiFiPachubeClientString.ino similarity index 100% rename from libraries/WiFi/examples/WifiPachubeClientString/WifiPachubeClientString.ino rename to libraries/WiFi/examples/WiFiPachubeClientString/WiFiPachubeClientString.ino diff --git a/libraries/WiFi/examples/WifiTwitterClient/WifiTwitterClient.ino b/libraries/WiFi/examples/WiFiTwitterClient/WiFiTwitterClient.ino similarity index 98% rename from libraries/WiFi/examples/WifiTwitterClient/WifiTwitterClient.ino rename to libraries/WiFi/examples/WiFiTwitterClient/WiFiTwitterClient.ino index 3dc2c8d33..d500cfb9b 100644 --- a/libraries/WiFi/examples/WifiTwitterClient/WifiTwitterClient.ino +++ b/libraries/WiFi/examples/WiFiTwitterClient/WiFiTwitterClient.ino @@ -132,8 +132,8 @@ void connectToServer() { Serial.println("making HTTP request..."); // make HTTP GET request to twitter: client.println("GET /1/statuses/user_timeline.xml?screen_name=arduino HTTP/1.1"); - client.println("Host:api.twitter.com"); - client.println("Connection:close"); + client.println("Host: api.twitter.com"); + client.println("Connection: close"); client.println(); } // note the time of this connect attempt: diff --git a/libraries/WiFi/examples/WifiUdpSendReceiveString/WifiUdpSendReceiveString.ino b/libraries/WiFi/examples/WiFiUdpSendReceiveString/WiFiUdpSendReceiveString.ino similarity index 100% rename from libraries/WiFi/examples/WifiUdpSendReceiveString/WifiUdpSendReceiveString.ino rename to libraries/WiFi/examples/WiFiUdpSendReceiveString/WiFiUdpSendReceiveString.ino diff --git a/libraries/WiFi/examples/WifiWebClient/WifiWebClient.ino b/libraries/WiFi/examples/WiFiWebClient/WiFiWebClient.ino similarity index 92% rename from libraries/WiFi/examples/WifiWebClient/WifiWebClient.ino rename to libraries/WiFi/examples/WiFiWebClient/WiFiWebClient.ino index 17f44a3aa..310ec46aa 100644 --- a/libraries/WiFi/examples/WifiWebClient/WifiWebClient.ino +++ b/libraries/WiFi/examples/WiFiWebClient/WiFiWebClient.ino @@ -31,8 +31,8 @@ int keyIndex = 0; // your network key Index number (needed only for W int status = WL_IDLE_STATUS; // if you don't want to use DNS (and reduce your sketch size) // use the numeric IP instead of the name for the server: -IPAddress server(173,194,73,105); // numeric IP for Google (no DNS) -//char server[] = "www.google.com"; // name address for Google (using DNS) +//IPAddress server(74,125,232,128); // numeric IP for Google (no DNS) +char server[] = "www.google.com"; // name address for Google (using DNS) // Initialize the Ethernet client library // with the IP address and port of the server @@ -54,7 +54,7 @@ void setup() { } // attempt to connect to Wifi network: - while ( status != WL_CONNECTED) { + while (status != WL_CONNECTED) { Serial.print("Attempting to connect to SSID: "); Serial.println(ssid); // Connect to WPA/WPA2 network. Change this line if using open or WEP network: @@ -72,7 +72,7 @@ void setup() { Serial.println("connected to server"); // Make a HTTP request: client.println("GET /search?q=arduino HTTP/1.1"); - client.println("Host:www.google.com"); + client.println("Host: www.google.com"); client.println("Connection: close"); client.println(); } diff --git a/libraries/WiFi/examples/WifiWebClientRepeating/WifiWebClientRepeating.ino b/libraries/WiFi/examples/WiFiWebClientRepeating/WiFiWebClientRepeating.ino similarity index 100% rename from libraries/WiFi/examples/WifiWebClientRepeating/WifiWebClientRepeating.ino rename to libraries/WiFi/examples/WiFiWebClientRepeating/WiFiWebClientRepeating.ino diff --git a/libraries/WiFi/examples/WifiWebServer/WifiWebServer.ino b/libraries/WiFi/examples/WiFiWebServer/WiFiWebServer.ino similarity index 100% rename from libraries/WiFi/examples/WifiWebServer/WifiWebServer.ino rename to libraries/WiFi/examples/WiFiWebServer/WiFiWebServer.ino