Changeset 72 for branches/follower/wiz810mj/src/demo

Timestamp:

12/07/07 04:40:54 (13 months ago)

Author:

follower

Message:

Now we've copied xSmurf's PROGMEM and other changes to his branch we'll back them out from here for now as they require SPrint from cral which we don't yet supply by default (this caused problems for people trying out the code in its current state.).

Files:

• branches/follower/wiz810mj/src/demo/WizDemo2/WizDemo2.pde (modified) (13 diffs)

branches/follower/wiz810mj/src/demo/WizDemo2/WizDemo2.pde

@@ -5 +5 @@
   See:
 
-   <http://code.rancidbacon.com/LearningAboutArduinoWIZ810MJ>   
+     <http://code.rancidbacon.com/LearningAboutArduinoWIZ810MJ>     
 
   Current features:
   
-    * Initial W5100 driver port:
-   
-      + new-style network configuration
+      * Initial W5100 driver port:
+     
+          + new-style network configuration
+          
+          + socket creation/listening/closing
+          
+          + Sending/Receiving okay
+          
+          + example "echo" server (no longer)
+          
+          + example "web server" with LED flash.
+
+      * Terrible hacked-together code
+
+  Author:
+
+     follower@rancidbacon.com
       
-      + socket creation/listening/closing
-      
-      + Sending/Receiving okay
-      
-      + example "echo" server (no longer)
-      
-      + example "web server" with LED flash.
-
-    * Terrible hacked-together code
-
-  Author:
-
-   follower@rancidbacon.com
-    
   License:
-  
-   LGPL
-   
+    
+     LGPL
+     
   Version:
   
-   20071106-0005+
-   
+     20071106-0005+
+     
 */
 
 #include <WIZ810MJ.h>
-#include <SPrint/staticPrint.h>
+
 
 
@@ -57 +57 @@
   /*
 
-   Configure pins and registers required for SPI communication.
+     Configure pins and registers required for SPI communication.
   
   */
@@ -70 +70 @@
   
   /*
-   Configure SPI Control Register (SPCR) (All values initially 0)
-    Bit  Description
-    7  SPI Interrupt Enable    -- disable  (SPIE --> 0)
-    6  SPI Enable        -- enable   (SPE  --> 1)
-    5  Data Order        -- MSB 1st  (DORD --> 0) (Slave specific)
-    4  Master/Slave Select     -- master   (MSTR --> 1)
-    3  Clock Polarity      --      (CPOL --> 0) (Slave specific) ("Mode")
-    2  Clock Phase         --      (CPHA --> 0) (Slave specific)
-    1  SPI Clock Rate Select 1 -- }      (SPR1 --> 0) 
-    0  SPI Clock Rate Select 0 -- } fOSC/4 (SPR0 --> 0) ("Fastest" but see SPI2X in SPSR)
+     Configure SPI Control Register (SPCR) (All values initially 0)
+      Bit  Description
+        7  SPI Interrupt Enable    -- disable  (SPIE --> 0)
+        6  SPI Enable              -- enable   (SPE  --> 1)
+        5  Data Order              -- MSB 1st  (DORD --> 0) (Slave specific)
+        4  Master/Slave Select     -- master   (MSTR --> 1)
+        3  Clock Polarity          --          (CPOL --> 0) (Slave specific) ("Mode")
+        2  Clock Phase             --          (CPHA --> 0) (Slave specific)
+        1  SPI Clock Rate Select 1 -- }        (SPR1 --> 0) 
+        0  SPI Clock Rate Select 0 -- } fOSC/4 (SPR0 --> 0) ("Fastest" but see SPI2X in SPSR)
   */
   SPCR = (1<<SPE)| (1<<MSTR);
@@ -96 +96 @@
   /*
   
-   Initialise the WIZ810MJ module and driver.
-   
+     Initialise the WIZ810MJ module and driver.
+     
    */
 
   /*
-   Initialise the W5100 chip
-   
-   (Originally I thought it was possible for the chip
-    to function without a hardware reset but it
-    seems not to be the case.)
-   */ 
+     Initialise the W5100 chip
+     
+     (Originally I thought it was possible for the chip
+      to function without a hardware reset but it
+      seems not to be the case.)
+   */   
   pinMode(PIN_RESET, OUTPUT);
   
@@ -132 +132 @@
 
 void setup () {
-  Serial.begin(19200);
-  SPrintln("Setup enter...");
-
-  configureSPI();  
+  Serial.begin(9600);
+  Serial.println("Setup enter...");
+
+  configureSPI();    
   
   initModule();
 
-  SPrintln("Test W5100 configuration...");    
-  
-  byte config_gateway[] = {192,168,0.1};
-  byte config_subnet_mask[] = {255,255,0,0};
+  Serial.println("Test W5100 configuration...");        
+  
+  byte config_gateway[] = {192,168,2,101};
+  byte config_subnet_mask[] = {255,255,255,0};
   byte config_mac_address[] = {0x02,0xDE,0xAD,0xBE,0xEF,0x00};
-  byte config_ip_address[] = {192,168,0,69};
+  byte config_ip_address[] = {192,168,2,105};
    
   setGAR(config_gateway);
@@ -151 +151 @@
   setSIPR(config_ip_address);
    
-  SPrintln("End test W5100 configuration...");    
-  
-    
-  SPrintln("Test W5100 driver code...");
+  Serial.println("End test W5100 configuration...");        
+    
+        
+  Serial.println("Test W5100 driver code...");
   
   getGAR(ip);
   
-  SPrint("Gateway IP read (first digit): ");
+  Serial.print("Gateway IP read (first digit): ");
   Serial.println(ip[0], DEC);
 
-  SPrintln("End test W5100 driver code...");
+  Serial.println("End test W5100 driver code...");        
 
   pinMode(PIN_LED, OUTPUT);
   digitalWrite(PIN_LED, HIGH);
   
-  SPrintln("Setup exit...");
+  Serial.println("Setup exit...");
   
 }
@@ -174 +174 @@
   strcpy((char *) buffer, "w00t!> ");
 
-  SPrint("send result: "); 
+  Serial.print("send result: "); 
   //Serial.println(send(testSocket, buffer, 6), DEC);
   Serial.println(send(testSocket, buffer, strlen((char *)buffer)), DEC);
@@ -182 +182 @@
 
   //strcpy((char *) buffer, "Content-Type: text/plain\n\nfoo!\n");
+  strcpy((char *) buffer, "HTTP/1.1 200 OK\n\rContent-Type: text/html\n\r\n\r<html><body bgcolor='#000000'>foo!</body></html>\n\r");
   if (ledState) {
-  strcpy((char *) buffer, "HTTP/1.1 200 OK\n\rContent-Type: text/html\n\r\n\r<html><body bgcolor='#000000'>foo!</body></html>\n\r");
    buffer[66] = 'F'; 
   } else {
-  strcpy((char *) buffer, "HTTP/1.1 200 OK\n\rContent-Type: text/html\n\r\n\r<html><body bgcolor='#000000'>bar!</body></html>\n\r");
-   buffer[68] = 'F';   
+   buffer[68] = 'F';     
   }
-  
-  SPrint("send result: "); 
+
+  Serial.print("send result: "); 
   Serial.println(send(testSocket, buffer, strlen((char *)buffer)), DEC);
 }
@@ -196 +195 @@
 
 void loop() {
-  SPrintln("Test W5100 socket...");
-  
-  SPrint("Create socket result: "); 
+  Serial.println("Test W5100 socket...");
+  
+  Serial.print("Create socket result: "); 
   Serial.println(socket(testSocket, Sn_MR_TCP, 80, 0), DEC);
 
-  SPrint("Socket status: ");   
+  Serial.print("Socket status: ");   
   Serial.println(IINCHIP_READ(Sn_SR(testSocket)), HEX);
   
   if (IINCHIP_READ(Sn_SR(testSocket)) == SOCK_CLOSED) {
-    SPrintln("Socket still closed, waiting...");
+    Serial.println("Socket still closed, waiting...");
     while (IINCHIP_READ(Sn_SR(testSocket)) == SOCK_CLOSED) {
       //pass
@@ -211 +210 @@
   }
   
-  SPrint("Listen on socket result: ");
+  Serial.print("Listen on socket result: "); 
   Serial.println(listen(testSocket), DEC);
-  
-  SPrintln("Waiting for connection..."); 
+
+  Serial.println("Waiting for connection..."); 
 
   while (getSn_SR(testSocket) == SOCK_LISTEN) {
@@ -224 +223 @@
   getSn_DIPR(testSocket, ip);
   
-  SPrint("Destination IP read (last digit): ");
+  Serial.print("Destination IP read (last digit): ");
   Serial.println(ip[3], DEC);
 
@@ -258 +257 @@
   while (getSn_SR(testSocket) == SOCK_ESTABLISHED) {
    while (getSn_RX_RSR(testSocket) > 0) {
-   recv(testSocket, bytesReceived, 1);
-   theByte = bytesReceived[0];
-   //Serial.print(bytesReceived[0], BYTE);
-   Serial.print(theByte, BYTE);
-   if ((state == STATE_G) && (theByte == 'G')) {
-    state = STATE_E;
-   } else if ((state == STATE_E) && (theByte == 'E')) {
-     state = STATE_T;
-   } else if ((state == STATE_T) && (theByte == 'T')) {
-     state = STATE_SPACE;
-   } else if ((state == STATE_SPACE) && (theByte == ' ')) {
-     state = STATE_SLASH;
-   } else if ((state == STATE_SLASH) && (theByte == '/')) {
-    state = STATE_READ;
-   } else if ((state == STATE_READ) && (theByte == '0')) {
-     digitalWrite(PIN_LED, LOW);
-     ledState = 0;
-     //state = STATE_END;
-     delay(100);    
-   } else if ((state == STATE_READ) && (theByte == '1')) {
-     digitalWrite(PIN_LED, HIGH);
-     ledState = 1;
-     //state = STATE_END;
-     delay(100);    
-   } else if (state == STATE_READ) {
-     // It's not a valid byte.
-     state = STATE_END;   
-   } else {
-     state = STATE_ERR;
-   }
-    
-   if ((state == STATE_ERR) || (state == STATE_END)) {
-     SPrintln("");
-     break;
-   }
-     
-   /*
-  dataLength = getSn_RX_RSR(testSocket);
-  
-  if (dataLength >= MAX_RX_BUFFER_SIZE) { // TODO: blah, blah...
-    dataLength = MAX_RX_BUFFER_SIZE-1;
-  }
-  // SPrint("dataLength: "); Serial.println(dataLength, HEX);
-  //SPrint("recv result: "); 
-  //Serial.println(recv(testSocket, bytesReceived, dataLength), DEC); // NOTE: Throws away unread portion? No?
-  recv(testSocket, bytesReceived, dataLength); // TODO: Return length?
-  bytesReceived[dataLength]=0x00;
-  Serial.print((char *)bytesReceived);
-  
-  //SPrint("send result: "); 
-  //Serial.println(send(testSocket, bytesReceived, dataLength), DEC);
-  
-  //sendPrompt(bytesReceived);
-  */
-  
+     recv(testSocket, bytesReceived, 1);
+     theByte = bytesReceived[0];
+     //Serial.print(bytesReceived[0], BYTE);
+     Serial.print(theByte, BYTE);
+     if ((state == STATE_G) && (theByte == 'G')) {
+       state = STATE_E;
+     } else if ((state == STATE_E) && (theByte == 'E')) {
+       state = STATE_T;       
+     } else if ((state == STATE_T) && (theByte == 'T')) {
+       state = STATE_SPACE;       
+     } else if ((state == STATE_SPACE) && (theByte == ' ')) {
+       state = STATE_SLASH;       
+     } else if ((state == STATE_SLASH) && (theByte == '/')) {
+       state = STATE_READ;       
+     } else if ((state == STATE_READ) && (theByte == '0')) {
+       digitalWrite(PIN_LED, LOW);
+       ledState = 0;
+       //state = STATE_END;
+       delay(100);    
+     } else if ((state == STATE_READ) && (theByte == '1')) {
+       digitalWrite(PIN_LED, HIGH);
+       ledState = 1;
+       //state = STATE_END;
+       delay(100);    
+     } else if (state == STATE_READ) {
+       // It's not a valid byte.
+       state = STATE_END;       
+     } else {
+       state = STATE_ERR;
+     }
+      
+     if ((state == STATE_ERR) || (state == STATE_END)) {
+       Serial.println("");
+       break;
+     }
+       
+     /*
+    dataLength = getSn_RX_RSR(testSocket);
+    
+    if (dataLength >= MAX_RX_BUFFER_SIZE) { // TODO: blah, blah...
+      dataLength = MAX_RX_BUFFER_SIZE-1;
+    }
+    // Serial.print("dataLength: "); Serial.println(dataLength, HEX);
+    //Serial.print("recv result: "); 
+    //Serial.println(recv(testSocket, bytesReceived, dataLength), DEC); // NOTE: Throws away unread portion? No?
+    recv(testSocket, bytesReceived, dataLength); // TODO: Return length?
+    bytesReceived[dataLength]=0x00;
+    Serial.print((char *)bytesReceived);
+    
+    //Serial.print("send result: "); 
+    //Serial.println(send(testSocket, bytesReceived, dataLength), DEC);
+    
+    //sendPrompt(bytesReceived);
+    */
+    
    }
    sendBanner(bytesToSend, ledState);
@@ -318 +317 @@
    break;
  }
-  
+
+  disconnect(testSocket);
   close(testSocket);
-  disconnect(testSocket);
-          
-  SPrintln("End test W5100 socket...");    
-
-  
-  
-}
-
+                    
+  Serial.println("End test W5100 socket...");        
+
+  
+  
+}
+