Funny action

INTechSenpai · Mar 29, 2017 · d7902ce · d7902ce
1 parent 553ee22
commit d7902ce
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 1 deletion.
diff --git a/pc/src/robot/Robot.java b/pc/src/robot/Robot.java
@@ -134,7 +134,12 @@ public void rearme() throws InterruptedException
 	public void traverseBascule() throws InterruptedException
 	{
 		bloque("traverseBascule");
-	}	
+	}
+
+	public void funnyAction() throws InterruptedException
+	{
+		bloque("funnyAction");
+	}
 
 	/**
 	 * Géré par le capteur de jauge

diff --git a/pc/src/serie/BufferOutgoingOrder.java b/pc/src/serie/BufferOutgoingOrder.java
@@ -214,6 +214,17 @@ public synchronized Ticket ouvreFilet()
 		return t;
 	}
 
+	/**
+	 * Active la funny action
+	 * @return
+	 */
+	public Ticket funnyAction() {
+		Ticket t = new Ticket();
+		bufferBassePriorite.add(new Order(OutOrder.FUNNY_ACTION, t));
+		notify();
+		return t;
+	}
+
 	/**
 	 * Ferme le filet
 	 */

diff --git a/pc/src/serie/SerialProtocol.java b/pc/src/serie/SerialProtocol.java
@@ -52,6 +52,7 @@ public enum OutOrder
 		REARM_LEFT_SIDE(0x44, Type.LONG),
 		EJECT_RIGHT_SIDE(0x45, Type.LONG),
 		REARM_RIGHT_SIDE(0x46, Type.LONG),
+		FUNNY_ACTION(0x47, Type.LONG),
 
 		ASK_COLOR(0x59, Type.SHORT),
 		PING(0x5A, Type.SHORT),

diff --git a/pc/src/tests/lowlevel/JUnit_Robot.java b/pc/src/tests/lowlevel/JUnit_Robot.java
@@ -166,6 +166,7 @@ public void test_actionneurs() throws Exception
 		robot.ouvreFilet();
 		robot.fermeFilet();
 		robot.traverseBascule();
+		robot.funnyAction();
 	}
 
 	/**

diff --git a/pc/src/tests/lowlevel/JUnit_Serie.java b/pc/src/tests/lowlevel/JUnit_Serie.java
@@ -152,5 +152,6 @@ public void test_actionneurs() throws Exception
 		Thread.sleep(2000);
 		data.traverseBascule();
 		Thread.sleep(2000);
+		data.funnyAction();
 	}
 }