From 88134559015a55741344841320ef2f0a64f03b85 Mon Sep 17 00:00:00 2001
From: Geoffrey Frogeye <geoffrey@frogeye.fr>
Date: Wed, 9 May 2018 10:10:04 +0200
Subject: [PATCH] Update code Arduino

Robotech again
---
 arduino/arduino.ino  | 31 +++++++++++++++++++------------
 raspberrypi/Makefile |  2 +-
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/arduino/arduino.ino b/arduino/arduino.ino
index 5f5994f..c202a7b 100644
--- a/arduino/arduino.ino
+++ b/arduino/arduino.ino
@@ -13,7 +13,8 @@ Servo servoPoussoir;
 int pinservoLoquet = 7;
 int pinservoPositionBalle = 8;
 int pinservoPoussoir = 6;
-int relai = 10;
+int relai_IN1 = 9;
+int relai_IN2 = 10;
 int pos_initial = 512;
 int pos_max = 960;
 int pos_min = 40;
@@ -27,7 +28,8 @@ void setup()
     servoLoquet.attach(pinservoLoquet);
     servoPositionBalle.attach(pinservoPositionBalle);
     servoPoussoir.attach(pinservoPoussoir);
-    pinMode(relai, OUTPUT);
+    pinMode(relai_IN1, OUTPUT);
+    pinMode(relai_IN2, OUTPUT);
 }
 
 void barilletUnCran()
@@ -74,40 +76,45 @@ void loop()
             break;
         case 'A': // Position attente balle
             servoPositionBalle.write(70);
-            //delay(2000);
+            delay(500);
             break;
         case 'V': // Position évacuation balle
             servoPositionBalle.write(0);
-            //delay(2000);
-            break;
-        case 'J': // Position éjection balle
-            servoPositionBalle.write(180);
-            //delay(2000);
+           delay(500);
             break;
         case 'O': // Pousser balle
             // Position basse
             servoPoussoir.write(0);
-            delay(1000);
+            //delay(500);
             // Position haute
             servoPoussoir.write(120);
             delay(1000);
             break;
         case 'B': // Tourner barillet d'un cran
             barilletUnCran();
+            delay(500);
             break;
         case 'H': // Tourner de deux crans
             barilletDeuxCrans();
+            delay(500);
             break;
         case 'R': // Reset barillet
             // ax12a.setEndless(ID, OFF);
             ax12a.setEndless(ID, ON);
             ax12a.turn(ID, LEFT, 0);
+            ax12a.setEndless(ID, OFF);
+            ax12a.move(ID, pos_initial);
+            delay(500);
             break;
         case 'T': // Propulsion on
-            digitalWrite(relai, HIGH);
+            digitalWrite(relai_IN1, HIGH);
+            digitalWrite(relai_IN2, LOW);
+            //delay(4000);
             break;
         case 'U': // Propulsion off
-            digitalWrite(relai, LOW);
+            digitalWrite(relai_IN1, LOW);
+            digitalWrite(relai_IN2, HIGH);
+            //delay(4000);
             break;
         case 'P': // Ping
             break;
@@ -122,4 +129,4 @@ void loop()
             Serial.write(lettre);
         }
     }
-}
+}
diff --git a/raspberrypi/Makefile b/raspberrypi/Makefile
index 43c924d..60b6187 100644
--- a/raspberrypi/Makefile
+++ b/raspberrypi/Makefile
@@ -97,7 +97,7 @@ upgrade-overlays: sshconf
 # ARDUINO
 upgrade-arduino:
 	make -C ../arduino/
-	scp -F sshconf -q "../arduino/principal.hex" principal:/tmp/principal.hex
+	scp -F sshconf -q "../arduino/build/main.hex" principal:/tmp/principal.hex
 	ssh -F sshconf principal "avrdude -p atmega2560 -P /dev/ttyACM0 -c stk500 -D -U flash:w:/tmp/principal.hex"
 
 # FPGA