Merge branch 'master' into aron

Author: aronhoff

Buggy/Buggy.h

@@ -20,7 +20,7 @@ class Buggy {
   };
   ParkingState parkingState = NOT_PARKING;
   const unsigned int parking_overrideOffAt = 3000; // ms
-  const unsigned int parking_stopAt = 7000; // ms
+  const unsigned int parking_stopAt = 6500; // ms
 
   const CommTrans *comms;
   MotorControls *motor;

Buggy/UltraSonic.h

@@ -13,7 +13,8 @@ class UltraSonic {
   const unsigned short groundPin = 16;
   const unsigned short powerPin = 17;
   const unsigned short ultraPin = 18;
-  const unsigned long tresholdDistance = 15; // cm
+  const unsigned long tresholdDistance = 14; // cm 
+  //used 14 for buggy1 and 13 for buggy2
   const unsigned long pingInterval = 400; // ms
   /** Timestamp of the previous ping */
   unsigned long lastPingTime = 0; // ms

ChangeLog.txt

@@ -74,5 +74,15 @@ BY WHO: Rob, Aron
 FUNCTIONALITY ADDED: Optional LED lights
 BY WHO: Aron
 FUNCTIONALITY ADDED: Station uses regular expressions to interpret commands
+BY WHO: Aron
 
 FUNCTIONALITY FIXED: Improved detection of buggy going offline. Using `Task`s to handle commands in a separate thread pool
+BY WHO: Rob, Aron
+
+
+#WEEK 11
+
+FUNCTIONALITY FIXED: Code clarity and commenting
+BY WHO: Aron
+FUNCTIONALITY FIXED: Pins and timings
+BY WHO: Aron

Station/Station/Communications.cs

@@ -39,7 +39,7 @@ class Communications
 
         public Communications()
         {
-            port.PortName = "COM17";
+            port.PortName = "COM5";
             port.BaudRate = 9600;
             port.Open();