Fixed game bug and added new pump functions

Author: Rishi Sharma

Drinking-Machine-Arduino-Code.ino

@@ -31,6 +31,7 @@ void setup() {
   Serial.begin(9600);
   Serial1.begin(9600);
   currentState = START_STATE;
+  // have to decide when to prime and clear pumps
 }
 
 enum stateMachine startState () {

libraries/GameControl/GameControl.cpp

@@ -21,13 +21,14 @@ bool GameControl::checkPlinko() {
   return false;
 }
 void GameControl::returnGameResult(int &a, int &b) {
+  Serial.println(readAsLowBin);
   switch (readAsLowBin) {
     case 0: a=4;b=0;break;
     case 1: a=3;b=1;break;
     case 2: a=0;b=0;break;
     case 3: a=2;b=2;break;
-    case 4: a=1;b=3;break;
-    case 5: a=0;b=0;break;
+    case 4: a=0;b=0;break;
+    case 5: a=1;b=3;break;
     case 6: a=0;b=4;break;
     default: a=0;b=0;break;
   }

libraries/PumpControl/PumpControl.cpp

@@ -9,17 +9,36 @@ PumpControl::PumpControl()
 }
 
 // 4 UNITS MAKE ONE TOTAL DRINK
+
+void PumpControl::primeA() {
+  digitalWrite(motorSetAFor, HIGH);
+	delay(FLOW_TOTAL_LENGTH_TIME_A);
+	digitalWrite(motorSetAFor, LOW);
+}
+void PumpControl::primeB() {
+  digitalWrite(motorSetBFor, HIGH);
+	delay(FLOW_TOTAL_LENGTH_TIME_B);
+	digitalWrite(motorSetBFor, LOW);
+}
+void PumpControl::clearA() {
+  digitalWrite(motorSetABack, HIGH);
+	delay(FLOW_TOTAL_LENGTH_TIME_A);
+	digitalWrite(motorSetABack, LOW);
+}
+void PumpControl::clearB() {
+  digitalWrite(motorSetBBack, HIGH);
+	delay(FLOW_TOTAL_LENGTH_TIME_B);
+	digitalWrite(motorSetBBack, LOW);
+}
 void PumpControl::dispense (int unitsOfA, int unitsOfB) {
 	if (unitsOfA != 0) {
 		digitalWrite(motorSetAFor, HIGH);
-		delay(FLOW_TOTAL_LENGTH_TIME_A);
 		delay(UNIT_OF_LIQUID_A * unitsOfA);
 		digitalWrite(motorSetAFor, LOW);
 		// can reverse here to clear pipe
 	}
 	if (unitsOfB != 0) {
 		digitalWrite(motorSetBFor, HIGH);
-		delay(FLOW_TOTAL_LENGTH_TIME_B);
 		delay(UNIT_OF_LIQUID_B * unitsOfB);
 		digitalWrite(motorSetBFor, LOW);
 		// can reverse here to clear pipe

libraries/PumpControl/PumpControl.h

@@ -5,15 +5,19 @@
 
 #define FLOW_TOTAL_LENGTH_TIME_A 1000
 #define FLOW_TOTAL_LENGTH_TIME_B 1000
-#define UNIT_OF_LIQUID_A 1
-#define UNIT_OF_LIQUID_B 1
+#define UNIT_OF_LIQUID_A 12500
+#define UNIT_OF_LIQUID_B 18518
 
 class PumpControl
 {
   public:
   PumpControl();
 
   // The methods
+  void primeA();
+  void primeB();
+  void clearA();
+  void clearB();
   void dispense(int unitsOfA, int unitsOfB);
 };
 #endif