From 8d1761f0097a1d74173f717ed009e840fdc42d43 Mon Sep 17 00:00:00 2001
From: mlafauci <mlafauci@metodo2.it>
Date: Sat, 30 Apr 2011 07:48:10 +0200
Subject: [PATCH] Cleaning the code

---
 .../wifi_Server_example_WPA.pde               | 20 ++----
 WiFi/utility/spi_drv.cpp                      | 65 +++++--------------
 WiFi/utility/spi_drv.h                        |  9 ++-
 WiFi/utility/wifi_drv.cpp                     |  6 +-
 WiFi/utility/wifi_spi.h                       |  1 -
 5 files changed, 29 insertions(+), 72 deletions(-)

diff --git a/WiFi/examples/wifi_Server_example_WPA/wifi_Server_example_WPA.pde b/WiFi/examples/wifi_Server_example_WPA/wifi_Server_example_WPA.pde
index e9b27b15d..a3a5c8b0d 100644
--- a/WiFi/examples/wifi_Server_example_WPA/wifi_Server_example_WPA.pde
+++ b/WiFi/examples/wifi_Server_example_WPA/wifi_Server_example_WPA.pde
@@ -119,10 +119,12 @@ void setup()
 {
   Serial.begin(9600);
   Serial.println("*** Start WiFi example ***");
-  delay(3000);
   
   WiFi.begin();
   
+  // Wait for initialize WiFi
+  delay(3000);
+  
   scanNetworks();
 
   int _status = startWiFiWpa();
@@ -156,27 +158,13 @@ void loop()
   {
       byte _status = 0;
       Client client = server.available(&_status);
-      //delay(2000);
       if (client) {
             if (!gotAMessage) {
               Serial.println("\nWe have a new client\n");
               client.println("Hello, client!"); 
               gotAMessage = true;
             }
-/*            
-    // read the bytes incoming from the client:
-    char thisChar = client.read();
-    // echo the bytes back to the client:
-    server.write(thisChar);
-    // echo the bytes to the server as well:
-    Serial.print(thisChar);
-    */
-    /*
-        Serial.print("Status: ");
-        Serial.println(_status, 16);
-        delay(2000);       
-      */  
-      
+    
       static byte idx = 0;
 
         while (client.available())
diff --git a/WiFi/utility/spi_drv.cpp b/WiFi/utility/spi_drv.cpp
index c48ce8ba9..bd7dd16a1 100644
--- a/WiFi/utility/spi_drv.cpp
+++ b/WiFi/utility/spi_drv.cpp
@@ -42,6 +42,7 @@ void SpiDrv::begin()
 	  // the SS pin MUST be kept as OUTPUT.
 	  SPCR |= _BV(MSTR);
 	  SPCR |= _BV(SPE);
+	  //SPSR |= _BV(SPI2X);
 }
 
 void SpiDrv::end() {
@@ -76,48 +77,29 @@ int SpiDrv::waitSpiChar(unsigned char waitChar)
     unsigned char _readChar = 0;
     do{
         _readChar = readChar(); //get data byte
-        if (_readChar == WAIT_CMD)
-        {
-            delayMicroseconds(WAIT_CHAR_DELAY);
-        }else if (_readChar == ERR_CMD)
+        if (_readChar == ERR_CMD)
         {
+        	WARN("Err cmd received\n");
         	return -1;
-        }else
-        {
-            delayMicroseconds(TIMEOUT_CHAR_DELAY);
         }
-//        else if (_readChar != waitChar)
-//        {
-//            Serial.println(_readChar,16);
-//        }
     }while((timeout-- > 0) && (_readChar != waitChar));
-
-    if ((_readChar != waitChar)&&(timeout >=0))
-    {
-        INFO1("*C*");
-        Serial.println(_readChar,16);
-    }else if (timeout == 0)
-    {
-        INFO1("*T*");
-    }
-
     return  (_readChar == waitChar);
 }
 
-int SpiDrv::waitSpiChar(char waitChar, char* readChar)
-{
-    int timeout = TIMEOUT_CHAR;
-    do{
-        *readChar = spiTransfer(DUMMY_DATA); //get data byte
-        if (*readChar == WAIT_CMD)
-        {
-            INFO1("WAIT");
-            delayMicroseconds(WAIT_CHAR_DELAY);
-        }
-    }while((timeout-- > 0) && (*readChar != waitChar));
-
-    return  (*readChar == waitChar);
-}
+//int SpiDrv::waitSpiChar(char waitChar, char* readChar)
+//{
+//    int timeout = TIMEOUT_CHAR;
+//    do{
+//        *readChar = spiTransfer(DUMMY_DATA); //get data byte
+//        if (*readChar == WAIT_CMD)
+//        {
+//            INFO1("WAIT");
+//            delayMicroseconds(WAIT_CHAR_DELAY);
+//        }
+//    }while((timeout-- > 0) && (*readChar != waitChar));
+//
+//    return  (*readChar == waitChar);
+//}
 
 
 int SpiDrv::readAndCheckChar(char checkChar, char* readChar)
@@ -153,22 +135,11 @@ char SpiDrv::readChar()
             return 0;                                   \
         }else                                           \
 
-bool SpiDrv::waitSlaveReady()
-{
-	return (digitalRead(SLAVEREADY) == LOW);
-}
+#define waitSlaveReady() (digitalRead(SLAVEREADY) == LOW)
 
 void SpiDrv::waitForSlaveReady()
 {
-#if 0
-	int count = 0;
-	while (!waitSlaveReady() && (++count<TIMEOUT_READY_SLAVE))
-	{
-		delayMicroseconds(1);
-	}
-#else
 	while (!waitSlaveReady());
-#endif
 }
 
 int SpiDrv::waitResponseCmd(uint8_t cmd, uint8_t numParam, uint8_t* param, uint8_t* param_len)
diff --git a/WiFi/utility/spi_drv.h b/WiFi/utility/spi_drv.h
index 0b0871572..0d5ba916a 100644
--- a/WiFi/utility/spi_drv.h
+++ b/WiFi/utility/spi_drv.h
@@ -5,9 +5,9 @@
 #include "wifi_spi.h"
 
 #define WAIT_CHAR_DELAY 100
-#define TIMEOUT_CHAR_DELAY 10
+#define TIMEOUT_CHAR_DELAY 1 //10
 #define TIMEOUT_READY_SLAVE    1000
-#define SPI_TX_DELAY 5
+#define SPI_TX_DELAY 1
 #define SPI_START_CMD_DELAY 10
 
 
@@ -18,8 +18,7 @@
 
 #define WAIT_FOR_SLAVE_SELECT()	 \
 	SpiDrv::waitForSlaveReady(); \
-	SpiDrv::spiSlaveSelect(); \
-    delayMicroseconds(SPI_TX_DELAY);
+	SpiDrv::spiSlaveSelect();
 
 
 
@@ -43,7 +42,7 @@ public:
 
     static void waitForSlaveReady();
 
-    static int waitSpiChar(char waitChar, char* readChar);
+    //static int waitSpiChar(char waitChar, char* readChar);
 
     static int waitSpiChar(unsigned char waitChar);
     
diff --git a/WiFi/utility/wifi_drv.cpp b/WiFi/utility/wifi_drv.cpp
index 13cadc7f3..a979659a6 100644
--- a/WiFi/utility/wifi_drv.cpp
+++ b/WiFi/utility/wifi_drv.cpp
@@ -302,10 +302,10 @@ uint8_t WiFiDrv::scanNetworks()
 	WAIT_FOR_SLAVE_SELECT();
 
     // Send Command
-    SpiDrv::sendCmd(SCAN_NETWORKS, PARAM_NUMS_1);
+    SpiDrv::sendCmd(SCAN_NETWORKS, PARAM_NUMS_0);
 
-    uint8_t _dummy = DUMMY_DATA;
-    SpiDrv::sendParam(&_dummy, 1, LAST_PARAM);
+//    uint8_t _dummy = DUMMY_DATA;
+//    SpiDrv::sendParam(&_dummy, 1, LAST_PARAM);
 
     //Wait the reply elaboration
     SpiDrv::waitForSlaveReady();
diff --git a/WiFi/utility/wifi_spi.h b/WiFi/utility/wifi_spi.h
index c4e573366..4f0b30855 100644
--- a/WiFi/utility/wifi_spi.h
+++ b/WiFi/utility/wifi_spi.h
@@ -16,7 +16,6 @@
 #define NO_SOCKET_AVAIL     255
 
 #define START_CMD   0xE0
-#define WAIT_CMD   	0xE1
 #define END_CMD     0xEE
 #define ERR_CMD   	0xEF