From 811e431b916f2ab6212734ae80755e6aab4f8c6a Mon Sep 17 00:00:00 2001
From: Siegfried Kienzle <siegfried.kienzle@gmx.de>
Date: Tue, 25 Apr 2017 13:40:20 +0200
Subject: [PATCH] remove some bugs

---
 project/gpio.c  |  2 ++
 project/gpio.h  |  3 ---
 project/motor.c | 50 +++++++++++++++----------------------------------
 3 files changed, 17 insertions(+), 38 deletions(-)

diff --git a/project/gpio.c b/project/gpio.c
index c6bf660..02a7215 100644
--- a/project/gpio.c
+++ b/project/gpio.c
@@ -5,6 +5,8 @@
 #include<string.h>
 #include "gpio.h"
 
+#define BASEPATH "/sys/class/gpio/"
+#define GPIO_FOLDER "gpio%s/"
 
 void writeFile(char *filename, char *buffer, size_t count)
 {
diff --git a/project/gpio.h b/project/gpio.h
index 9c5cae6..08d9c41 100644
--- a/project/gpio.h
+++ b/project/gpio.h
@@ -1,9 +1,6 @@
 #ifndef GPIO_H_   
 #define GPIO_H_
 
-#define BASEPATH "/sys/class/gpio/"
-#define GPIO_FOLDER "gpio%s/"
-
 void writeFile(char *filename, char *buffer, size_t count);
 void registerPin(char *pin);
 void freePin(char *pin);
diff --git a/project/motor.c b/project/motor.c
index fcdf181..d8de3a0 100755
--- a/project/motor.c
+++ b/project/motor.c
@@ -14,29 +14,27 @@
 #define MOTOR_ON 1
 #define MOTOR_OFF 0
 
-bool motor_rechts_forward_on = false;
-bool motor_rechts_reverse_on = false;
-bool motor_links_forward_on = false;
-bool motor_links_reverse_on = false;
+bool motor_rechts_on = false;
+bool motor_links_on = false;
 
 void forward(int motorNumber)
 {
 	if(motorNumber == 1)
 	{
 		writeOutput(PIN_MOTOR_RECHTS_FORWARD, MOTOR_ON);		
-		motor_rechts_forward_on = true;
+		motor_rechts_on = true;
 	}
 	else if(motorNumber == 2)
 	{
 		writeOutput(PIN_MOTOR_LINKS_FORWARD, MOTOR_ON);
-		motor_links_forward_on = true;
+		motor_links_on = true;
 	}
 	else if(motorNumber == 3)
 	{
 		writeOutput(PIN_MOTOR_RECHTS_FORWARD, MOTOR_ON);
 		writeOutput(PIN_MOTOR_LINKS_FORWARD, MOTOR_ON);
-		motor_rechts_forward_on = true;
-		motor_links_forward_on = true;
+		motor_rechts_on = true;
+		motor_links_on = true;
 	}		
 }
 
@@ -45,44 +43,36 @@ void reverse(int motorNumber)
 	if(motorNumber == 1)
 	{
 		writeOutput(PIN_MOTOR_RECHTS_REVERSE, MOTOR_ON);
-		motor_rechts_reverse_on = true;
+		motor_rechts_on = true;
 	}
 	else if(motorNumber == 2)
 	{
 		writeOutput(PIN_MOTOR_LINKS_REVERSE, MOTOR_ON);
-		motor_links_reverse_on = true;
+		motor_links_on = true;
 	}
 	else if(motorNumber == 3)
 	{
 		writeOutput(PIN_MOTOR_RECHTS_REVERSE, MOTOR_ON);
 		writeOutput(PIN_MOTOR_LINKS_REVERSE, MOTOR_ON);
-		motor_rechts_reverse_on = true;
-		motor_links_reverse_on = true;
+		motor_rechts_on = true;
+		motor_links_on = true;
 		
 	}
 }
 
 void stopMotor(int motorNumber)
 {
-	if(motorNumber == 1 && motor_rechts_forward_on)
+	if(motorNumber == 1 && motor_rechts_on)
 	{
 		writeOutput(PIN_MOTOR_RECHTS_FORWARD, MOTOR_OFF);
-		motor_rechts_forward_on = false;
+		writeOutput(PIN_MOTOR_RECHTS_REVERSE, MOTOR_OFF);
+		motor_rechts_on = false;
 	}
-	else if(motorNumber == 2 && motor_links_forward_on)
+	else if(motorNumber == 2 && motor_links_on)
 	{
 		writeOutput(PIN_MOTOR_LINKS_FORWARD, MOTOR_OFF);
-		motor_links_forward_on = false;
-	}
-	else if(motorNumber == 3 && motor_rechts_reverse_on)
-	{
-		writeOutput(PIN_MOTOR_RECHTS_REVERSE, MOTOR_OFF);
-		motor_rechts_reverse_on = false;
-	}
-	else if(motorNumber == 4 && motor_links_reverse_on)
-	{
 		writeOutput(PIN_MOTOR_LINKS_REVERSE, MOTOR_OFF);
-		motor_links_reverse_on = false;
+		motor_links_on = false;
 	}
 	
 }
@@ -132,16 +122,6 @@ int main(int argc, char* argv[])
 			//motor_links_forward stop
 			stopMotor(2);
 		}
-		else if(strcmp(argv[1],"8")==0)
-		{
-			//motor_rechts_reverse stop
-			stopMotor(3);
-		}
-		else if(strcmp(argv[1],"9")==0)
-		{
-			//motor_links_reverse stop
-			stopMotor(4);
-		}
 		else if(strcmp(argv[1],"0")==0)
 		{
 			freePin(PIN_MOTOR_RECHTS_FORWARD);