Merge pull request #3 from Sijisu/master

Finalizing coilDriver code

code/arduino/coilDriver/coilDriver.ino

@@ -1,7 +1,18 @@
 #include <SoftwareSerial.h>
 
+#define coil1pin 10
+#define coil2pin 12
+#define coil3pin 11
+
+#define swSerialRX 4
+#define swSerialTX 5
+
+#define sensor1pin 4
+#define sensor2pin 3
+#define sensor3pin 2
+
 int impulsDelay = 1;
-int impulsLenght = 100;
+int impulsLength = 5;
 int potValue = 1;
 
 unsigned long previouscoil2trigger = 0;
@@ -11,21 +22,30 @@ unsigned long lastdisplaywrite = 0;
 
 int ballspeed = 0;
 
-SoftwareSerial mySerial(4, 5); // RX, TX
+SoftwareSerial mySerial(swSerialRX, swSerialTX); // RX, TX
 
 void setup() {
-  // put your setup code here, to run once:
-  pinMode(7,OUTPUT);
-  pinMode(8,OUTPUT);
-  pinMode(9,OUTPUT);
-  digitalWrite(9,HIGH);
-  digitalWrite(8,HIGH);
-  digitalWrite(7,HIGH);
-  pinMode(2,INPUT_PULLUP);
-  pinMode(3,INPUT_PULLUP);
-  pinMode(10,INPUT_PULLUP);
-  //attachInterrupt(digitalPinToInterrupt(2), impuls1, FALLING);
-  //attachInterrupt(digitalPinToInterrupt(3), impuls2, FALLING);
+
+  // coil triggers
+  
+  pinMode(coil1pin,OUTPUT);
+  pinMode(coil2pin,OUTPUT);
+  pinMode(coil3pin,OUTPUT);
+
+  // pulling them HIGH
+  
+  digitalWrite(coil1pin,HIGH);
+  digitalWrite(coil2pin,HIGH);
+  digitalWrite(coil3pin,HIGH);
+
+  // ball sensors
+  
+  pinMode(sensor1pin,INPUT_PULLUP);
+  pinMode(sensor2pin,INPUT_PULLUP);
+  pinMode(sensor3pin,INPUT_PULLUP);
+
+  // preparing Serial connections
+
   Serial.begin(9600);
   Serial.flush();
   mySerial.begin(4800);
@@ -33,40 +53,42 @@ void setup() {
 }
 
 void loop() {
-  // put your main code here, to run repeatedly:
   unsigned long currentMillis = millis();
+  // getting the pulse length from the pot
   potValue = analogRead(A0);
-  impulsLenght = map(potValue, 0, 1023, 0, 100);
+  impulsLength = map(potValue, 0, 1023, 0, 100);
+  // sending data to the displayDriver every 1s
   if (currentMillis - lastdisplaywrite >= 1000) {
     lastdisplaywrite = currentMillis;
-    mySerial.print(impulsLenght);
+    mySerial.print(impulsLength);
     mySerial.print(",");
     mySerial.print(lastcoil2trigger-previouscoil2trigger);
     mySerial.print('\n');
   }
-  if (digitalRead(2)) {
+  // checking if ball detected, if yes then fire the pulse
+  if (digitalRead(sensor1pin)) {
     impuls1();
-  } else if (digitalRead(3)) {
+  } else if (digitalRead(sensor2pin)) {
     impuls2();
-  } else if (digitalRead(10)) {
+  } else if (digitalRead(sensor3pin)) {
     impuls3();
   }
 }
 
 void impuls1() {
     delay(impulsDelay);
-    digitalWrite(7, LOW);
-    delay(impulsLenght);
-    digitalWrite(7, HIGH);
+    digitalWrite(coil1pin, LOW);
+    delay(impulsLength);
+    digitalWrite(coil1pin, HIGH);
     Serial.println(millis());
     delay(50);
 }
 
 void impuls2() {
     delay(impulsDelay);
-    digitalWrite(8, LOW);
-    delay(impulsLenght);
-    digitalWrite(8, HIGH);
+    digitalWrite(coil2pin, LOW);
+    delay(impulsLength);
+    digitalWrite(coil2pin, HIGH);
     Serial.println(millis());
     delay(50);
     previouscoil2trigger = lastcoil2trigger;
@@ -75,9 +97,9 @@ void impuls2() {
 
 void impuls3() {
     delay(impulsDelay);
-    digitalWrite(9, LOW);
-    delay(impulsLenght);
-    digitalWrite(9, HIGH);
+    digitalWrite(coil3pin, LOW);
+    delay(impulsLength);
+    digitalWrite(coil3pin, HIGH);
     Serial.println(millis());
     delay(50);
 }