ECE4333 - 2018 - Ahmed & Brandon / Mbed OS ManualControlFinal

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependencies:   TPixy-Interface

Fork of MbedOS_Robot_Team by ECE4333 - 2018 - Ahmed & Brandon

Diff: ui.cpp

Revision:
24:e88753f090b8
Parent:
15:cf67f83d5409
--- a/ui.cpp	Sun Mar 11 00:37:58 2018 +0000
+++ b/ui.cpp	Tue Apr 03 16:00:10 2018 +0000
@@ -14,6 +14,7 @@
 #include "WatchdogThread.h"
 #include "ui.h"
 #include "CameraThread.h"
+#include "PiControlThread.h"
 
 Serial bluetooth(p9,p10); // Define the bluetooth channel and IO pins
 Serial pc(USBTX, USBRX); // Pins (tx, rx) for PC serial channel
@@ -38,7 +39,7 @@
 void consoleUI(void){
 
     cameraData_mutex.lock();
-    bluetooth.printf("\r\nsetpointR: %d   setpointL: %d    ObjectWidth: %d     ObjectXcoordinate: %d   SteeringError: %d   DistanceError: %d", setpointR, setpointL, ObjectWidth, xR, SteeringError, DistanceError);    
+    bluetooth.printf("\r\nsetpointR: %d   setpointL: %d    ObjectWidth: %d     ObjectXcoordinate: %d   SteeringError: %d   DistanceError: %d    U_right: %d     U_left: %d", setpointR, setpointL, ObjectWidth, xR, SteeringError, DistanceError, U_right, U_left);    
     cameraData_mutex.unlock();
     //bluetooth.printf("\r\nsetpointR: %d   setpointL: %d    ObjectWidth: %d     ObjectXcoordinate: %d   SteeringError: %d   DistanceError: %d", setpointR, setpointL, ObjectWidth, xR, SteeringError, DistanceError);