Changeset 90 for branches

Timestamp:

12/08/07 01:15:56 (13 months ago)

Author:

follower

Message:

Move network module initialisation into class.

Files:

• branches/follower/wiz810mj/src/demo/WizDemo4/WizDemo4.pde (modified) (4 diffs)

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

@@ -99 +99 @@
 /* ------ WIZ810MJ ------ */
 
-class Wiz810MJ {
+class Wiz810MjDevice {
   
   public:
-    Wiz810MJ(int resetPin);
+    Wiz810MjDevice(int resetPin);
   
   private:
+    void _init(void);
+    
     int _resetPin;  
 };
 
-Wiz810MJ::Wiz810MJ(int resetPin) {
+
+Wiz810MjDevice::Wiz810MjDevice(int resetPin) {
   // TODO: We should really allow the chip-select pin to be set here?
   //       Or require that it's defined. (Currently in the library file 'types.h'.)
   _resetPin = resetPin;
-}
-
-/* ----------------------- */
-
-
-// #define PIN_RESET 9 // WIZnet module /RESET
-
-#define PIN_RESET 8 // WIZnet module /RESET
-
-SOCKET testSocket;
-byte ip[6];
-
-
-void initModule() {
+  
+  _init();
+}
+
+
+void Wiz810MjDevice::_init(void) {
   /*
   
@@ -139 +134 @@
       seems not to be the case.)
    */   
-  pinMode(PIN_RESET, OUTPUT);
+  pinMode(_resetPin, OUTPUT);
   
   // We rely on the time between function calls to
   // be long enough for the chip to recognise the
   // reset.
-  digitalWrite(PIN_RESET, HIGH);
-  digitalWrite(PIN_RESET, LOW); // reset
-  digitalWrite(PIN_RESET, HIGH);
+  digitalWrite(_resetPin, HIGH);
+  digitalWrite(_resetPin, LOW); // reset
+  digitalWrite(_resetPin, HIGH);
   
   // Chip initialisation by driver
@@ -157 +152 @@
   // internally by the driver--even if the default chip
   // configuration is used.)
-  sysinit(0x55, 0x55);
-  
-}
+  sysinit(0x55, 0x55);  
+}
+
+/* ----------------------- */
+
+
+// #define PIN_RESET 9 // WIZnet module /RESET
+
+#define PIN_RESET 8 // WIZnet module /RESET
+
+SOCKET testSocket;
+byte ip[6];
+
 
 #define PIN_LED 2
@@ -169 +174 @@
   SPI.begin();    
   
-  initModule();
+  Wiz810MjDevice WIZ810MJ = Wiz810MjDevice(PIN_RESET);
 
   Serial.println("Test W5100 configuration...");