Merge pull request #35 from FabLabWgtn/bugfixe

clean macosX, speed R/W, Try to port to 3.0

arduino_code/openKnitting_handMadepcb_v0_1/communication.h

@@ -13,11 +13,15 @@ class communication {
     endLines* myEndlines;
     solenoids* mysolenoids;
     unsigned long lastSendTimeStamp;
-    char receivedBin[201];
+    unsigned long lastRecieveTimeStamp;
+    char receivedBin[202];
     int dataSize;
     boolean dataReplace;
     byte footer;
     char lf;
+    boolean solenoidsAreOff;
+    boolean corruptMessage;
+
   public:
     String _status;
     communication() {
@@ -30,9 +34,12 @@ class communication {
       myEndlines = _myEndlines;
       mysolenoids = _mysolenoids;
       lastSendTimeStamp = millis();
-      dataSize = 201;
-      footer = 126;
+      lastRecieveTimeStamp = millis();
+      dataSize = 202;
+      footer = '&';
       dataReplace = false;
+      solenoidsAreOff = false;
+      corruptMessage = false;
       lf = '@';    // AT in ASCII
       Serial.setTimeout(10);
     }
@@ -97,25 +104,43 @@ class communication {
         Serial.println(lf);
         myEncoders->lastencoder1Pos = myEncoders->encoder1Pos;
       }
+      if (corruptMessage){
+        Serial.print("C"); // for corrupt
+        Serial.println(lf);
+        corruptMessage=false;
+      }
     }
 
     // recieve from processing
     void receiveAllLine() {
       while(Serial.available()) {
         if ( Serial.readBytesUntil(footer, receivedBin, dataSize)) {
-          dataReplace = true;
+          if (receivedBin[0]==lf){ // begin and end are here so ok
+            dataReplace = true;
+          }
+          else{
+            corruptMessage=true;
+            sendSerialToComputer();
+          }
         }
       }
       if (dataReplace) {
+        lastRecieveTimeStamp = millis();
         sendCurrentPixelArray();
         dataReplace = false;
+        solenoidsAreOff=false;
+      }
+      else if (((millis() - lastRecieveTimeStamp) > 50000) && (solenoidsAreOff==false)){ // release solenoid if nothing recieve after 50s
+        mysolenoids->setAllSolOff();
+        solenoidsAreOff=true;
       }
+
     }
 
     // send to processing
     void sendCurrentPixelArray() {
       Serial.println(lf);
-      for (int i = 0; i < 200; i++) {
+      for (int i = 1; i < 201; i++) {
         pixelBin[i] = receivedBin[i];
         Serial.print(pixelBin[i]);
       }

arduino_code/openKnitting_handMadepcb_v0_1/encoders.h

@@ -104,7 +104,7 @@ class encoders{
 
   //-------------------------------------------------------------------------
   boolean get8segmentEncoder(){
-     _8segmentEncoder = (digitalRead(encoder0PinC)==HIGH);
+     _8segmentEncoder = (digitalReadDirect(encoder0PinC)==HIGH);
      return _8segmentEncoder;
   }
 
@@ -114,9 +114,9 @@ class encoders{
     lastDirectionEncoders = directionEncoders;
     directionEncoders = 0;
 
-    if(digitalRead(encoder0PinA)== HIGH){ directionEncoders += 1;}
+    if(digitalReadDirect(encoder0PinA)== HIGH){ directionEncoders += 1;}
     else{ directionEncoders += 0;}
-    if(digitalRead(encoder0PinB)== HIGH){ directionEncoders +=3;}
+    if(digitalReadDirect(encoder0PinB)== HIGH){ directionEncoders +=3;}
     else{ directionEncoders +=5;}
 
     //last_8segmentEncoder = _8segmentEncoder;

arduino_code/openKnitting_handMadepcb_v0_1/knitic.h

@@ -11,6 +11,16 @@
 */
 #ifndef KNITIC_H_
 #define KNITIC_H_
+#include "arduino.h"
+
+inline void digitalWriteDirect(int pin, boolean val){
+  if(val) g_APinDescription[pin].pPort -> PIO_SODR = g_APinDescription[pin].ulPin;
+  else    g_APinDescription[pin].pPort -> PIO_CODR = g_APinDescription[pin].ulPin;
+}
+
+inline int digitalReadDirect(int pin){
+  return !!(g_APinDescription[pin].pPort -> PIO_PDSR & g_APinDescription[pin].ulPin);
+}
 
 #include "encoders.h"
 #include "sound_alerts.h"

arduino_code/openKnitting_handMadepcb_v0_1/openKnitting_handMadepcb_v0_1.ino

@@ -84,10 +84,6 @@ void loop() {
   mysolenoids.loop();
 #endif
 
-  // Set all solenoids OFF when end of line
-  if(myEncoders.encoder1Pos==0 || myEncoders.encoder1Pos==255  ){
-    mysolenoids.setAllSolOff();
-  }
   myCommunicator.sendSerialToComputer(); 
 }
 

arduino_code/openKnitting_handMadepcb_v0_1/solenoids.h

@@ -108,19 +108,17 @@ class solenoids{
         }
       }
 
-      if(currentStitchSetup>=(0-END_OF_LINE_OFFSET_R) && currentStitchSetup<(200+END_OF_LINE_OFFSET_L)){  //IF the head is within the switches....no. 200 is the left switch
+      if(currentStitchSetup>=0 && currentStitchSetup<200){  //IF the head is within the switches....no. 200 is the left switch
         currentPixState = pixelBin[currentStitchSetup];     //Pixel Bin is an array of 256 values. It pulls values from the Serial Port
-        if(solenoidstateOn[m_solenoidToSet] != (currentPixState==1) ){    //if the current solenoid is different from the pixelBin value
-          digitalWrite(amegaPinsArray[m_solenoidToSet], currentPixState); //the that state to the Indexed Solenoid
-          solenoidstateOn[m_solenoidToSet] = (currentPixState==1);        //update array of current solenoid States
-        }
+        digitalWriteDirect(amegaPinsArray[m_solenoidToSet], currentPixState); //the that state to the Indexed Solenoid
+        solenoidstateOn[m_solenoidToSet] = currentPixState;        //update array of current solenoid States
       }
     }
   }
 
   void setAllSolOff(){
     for(int i=0;i<16;i++){
-          digitalWrite(amegaPinsArray[i], LOW);
+          digitalWriteDirect(amegaPinsArray[i], LOW);
           solenoidstateOn[i] = false; 
     }
   }