Merge branch 'rob'

Author: aronhoff

Station/Station/Buggy.cs

@@ -204,6 +204,7 @@ public void onObstacle()
         public void onPathClear()
         {
             buggyAction("is now able to progress in section " + getSectionName());
+            go();
         }
         public void onBuggyParked()
         {
@@ -220,6 +221,8 @@ public void onBuggyParked()
                 else
                     buggyAction("parked! " + (lapsCompleted - 1) + " lap(s) completed!"); // Buggy 1 has to go an extra lap in 2-buggy mode
             }
+            if (direction == Direction.Clockwise)
+                Program.print("Challenge complete!", ConsoleColor.Yellow, ConsoleColor.Black);
         }
         public void onPingRecieved()
         {

Station/Station/Communications.cs

@@ -37,7 +37,7 @@ class Communications
 
         public Communications()
         {
-            port.PortName = "COM13";
+            port.PortName = "COM17";
             port.BaudRate = 9600;
             port.Open();
 
@@ -95,7 +95,7 @@ public bool send(int buggy_id, string command, Action offlineHandler = null)
             {
                 if (offlineHandler == null)
                 {
-                    Program.print(" Command " + command + " received after " + reps + " attempts");
+                    Program.print("Command " + command + " received after " + reps + " attempts");
                 }
                 return false;
             }

Station/Station/Program.cs

@@ -8,6 +8,7 @@ namespace Station
 {
     class Program
     {
+        public static bool inputOn = false;
         /// <summary>
         /// Only one thread can print at a time
         /// This can prevent potential interleaving output from different threads and buggies
@@ -28,8 +29,9 @@ class Program
 
         static void Main(string[] args)
         {
-            Console.WriteLine("Initialising...");
+            print("Initialising...", ConsoleColor.DarkYellow);
             Station station = new Station();
+            inputOn = true;
             while (true)
             {
                 string input = readInput();
@@ -38,7 +40,9 @@ static void Main(string[] args)
                     Environment.Exit(0);
                 if (input == "RESET")
                 {
+                    inputOn = false;
                     station.setUp();
+                    inputOn = true;
                     continue;
                 }
 
@@ -105,6 +109,8 @@ private static bool executeCommand(Station station, string command, int buggyID)
         /// </summary>
         private static void printInput()
         {
+            if (!inputOn)
+                return;
             clearInput();
             lock (printLock)
             {
@@ -213,16 +219,20 @@ public static void print(string message)
         /// Prints <c>message</c> with the specified background colour.
         /// Adds newline and redraws the input buffer
         /// </summary>
-        public static void print(string message, ConsoleColor? backgroundColor)
+        public static void print(string message,
+            ConsoleColor? backgroundColour,
+            ConsoleColor? foregroundColour = ConsoleColor.Gray)
         {
             lock (printLock)
             {
                 clearInput();
                 Console.CursorLeft = 0;
-                Console.BackgroundColor = backgroundColor ?? emptyColour;
+                Console.BackgroundColor = backgroundColour ?? emptyColour;
+                Console.ForegroundColor = foregroundColour ?? ConsoleColor.Gray;
                 Console.WriteLine(message);
                 printInput();
                 Console.BackgroundColor = emptyColour;
+                Console.ForegroundColor = ConsoleColor.Gray;
             }
         }
     }