Changeset 80 for branches/follower/wiz810mj/src/demo/WizDemo3/WizDemo3.pde

Timestamp:

12/07/07 19:13:10 (13 months ago)

Author:

follower

Message:

Use new 'readMatch' routine to match start of the request to simplify state machine.

Files:

• branches/follower/wiz810mj/src/demo/WizDemo3/WizDemo3.pde (modified) (1 diff)

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

@@ -278 +278 @@
   while (getSn_SR(testSocket) == SOCK_ESTABLISHED) {
    while (getSn_RX_RSR(testSocket) > 0) {
-     theByte = readByte();
-     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')) {
+
+    if (state == STATE_G) {
+      if (readMatch("GET /")) {
+        state = STATE_READ;
+      } else {
+        state = STATE_ERR;
+      }
+    }
+        
+    if (state == STATE_READ) {
+     
+      theByte = readByte();
+      
+      if (theByte == '0') {        
        digitalWrite(PIN_LED, LOW);
        ledState = 0;
-       //state = STATE_END;
-       delay(100);    
-     } else if ((state == STATE_READ) && (theByte == '1')) {
+       delay(100);
+     } else if (theByte == '1') {
        digitalWrite(PIN_LED, HIGH);
        ledState = 1;
-       //state = STATE_END;
        delay(100);    
-     } else if (state == STATE_READ) {
+     } else {
        // It's not a valid byte.
        state = STATE_END;       
-     } else {
-       state = STATE_ERR;
      }
+
+    } else {
+      state = STATE_ERR;
+    }
       
      if ((state == STATE_ERR) || (state == STATE_END)) {