Fixed bug Wrong Repair,Yellow and Red card detection

RoboCup-MSL · Feb 3, 2020 · ce5a068 · ce5a068
1 parent 4227c98
commit ce5a068
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/mslrb2015/StateMachine.pde b/mslrb2015/StateMachine.pde
@@ -271,9 +271,9 @@ static class StateMachine
 			else if(btnCurrent.isRed())
 			{
 				if(btnCurrent.isLeft())
-				teamA.newRedCard=btnOn;
+					teamA.newRedCard=btnOn;
 				else
-				teamB.newRedCard=btnOn;
+					teamB.newRedCard=btnOn;
 			}
 			else if(btnCurrent.isYellow())
 			{
@@ -282,9 +282,9 @@ static class StateMachine
 				t = teamB;
 
 				if (t.YellowCardCount==1)
-				t.newDoubleYellow = btnOn;
+					t.newDoubleYellow = btnOn;
 				else
-				t.newYellowCard = btnOn;
+					t.newYellowCard = btnOn;
 			}
 			else if(btnCurrent.isStop())
 			{

diff --git a/mslrb2015/enums.java b/mslrb2015/enums.java
@@ -71,7 +71,7 @@ public boolean isCommon()
 	//******************************************************************************************************
 	public boolean isLeft()
 	{
-		return value >= BTN_L_KICKOFF.value && value <= BTN_L_ISALIVE.value;
+		return value >= BTN_L_KICKOFF.value && value <= BTN_L_YELLOW.value;
 	}
 
 	//******************************************************************************************************