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.).

git-svn-id: svn+ssh://oldsvn/home/mlalondesvn/svn/cral@72 3ee9b42a-b53c-0410-a25e-f0b6218d5d5b
17 years ago · 504380217e
parent 580cf788fe
commit 504380217e
1 changed files with 124 additions and 125 deletions
--- a/branches/follower/wiz810mj/src/demo/WizDemo2/WizDemo2.pde
+++ b/branches/follower/wiz810mj/src/demo/WizDemo2/WizDemo2.pde
@ -37,7 +37,7 @@
 */

 #include <WIZ810MJ.h>
-#include <SPrint/staticPrint.h>
+


 // Define SPI-related pins
@ -131,41 +131,41 @@ void initModule() {
 #define PIN_LED 2

 void setup () {
-  Serial.begin(19200);
-  SPrintln("Setup enter...");
+  Serial.begin(9600);
+  Serial.println("Setup enter...");

  configureSPI();    
  
  initModule();

-  SPrintln("Test W5100 configuration...");    
+  Serial.println("Test W5100 configuration...");        
  
-  byte config_gateway[] = {192,168,0.1};
-  byte config_subnet_mask[] = {255,255,0,0};
+  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);
  setSUBR(config_subnet_mask);
  setSHAR(config_mac_address); 
  setSIPR(config_ip_address);
   
-  SPrintln("End test W5100 configuration...");    
+  Serial.println("End test W5100 configuration...");        
    
        
-  SPrintln("Test W5100 driver code...");
+  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...");
  
 }

@ -173,7 +173,7 @@ void sendPrompt(uint8_t *buffer) { // {Socket targetSocket, ) {

  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);
 }
@ -181,39 +181,38 @@ void sendPrompt(uint8_t *buffer) { // {Socket targetSocket, ) {
 void sendBanner(uint8_t *buffer, int ledState) { // {Socket targetSocket, ) {

  //strcpy((char *) buffer, "Content-Type: text/plain\n\nfoo!\n");
-  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");
+  if (ledState) {
   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';     
  }

-  SPrint("send result: "); 
+  Serial.print("send result: "); 
  Serial.println(send(testSocket, buffer, strlen((char *)buffer)), DEC);
 }


 void loop() {
-  SPrintln("Test W5100 socket...");
+  Serial.println("Test W5100 socket...");
  
-  SPrint("Create socket result: "); 
+  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
    }
  }
  
-  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) {
    delay(500);
@ -223,7 +222,7 @@ void loop() {

  getSn_DIPR(testSocket, ip);
  
-  SPrint("Destination IP read (last digit): ");
+  Serial.print("Destination IP read (last digit): ");
  Serial.println(ip[3], DEC);

  
@ -289,7 +288,7 @@ void loop() {
     }
      
     if ((state == STATE_ERR) || (state == STATE_END)) {
-     SPrintln("");
+       Serial.println("");
       break;
     }
       
@ -299,14 +298,14 @@ void loop() {
    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.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);
    
-  //SPrint("send result: "); 
+    //Serial.print("send result: "); 
    //Serial.println(send(testSocket, bytesReceived, dataLength), DEC);
    
    //sendPrompt(bytesReceived);
@ -318,10 +317,10 @@ void loop() {
   break;
 }

-  close(testSocket);
  disconnect(testSocket);
+  close(testSocket);
                    
-  SPrintln("End test W5100 socket...");    
+  Serial.println("End test W5100 socket...");