Diff: ui.cpp

Revision:

14:5777377537a2

Parent:

12:172c448a359e

Child:

15:cf67f83d5409

--- a/ui.cpp	Sat Mar 03 00:53:06 2018 +0000
+++ b/ui.cpp	Sat Mar 03 02:14:40 2018 +0000
@@ -38,8 +38,20 @@
 //extern int time_passed;
 */
 
+extern int xR, yR, ObjectWidth, ObjectHeight, ObjectArea, SteeringError, DistanceError;
+extern int xRAvg, yRAvg, ObjectWidthAvg, ObjectHeightAvg, ObjectAreaAvg;
+extern Mutex cameraData_mutex;
 int16_t position;
 
+/******************************************************************************
+                           User interface 3
+******************************************************************************/
+void consoleUI(void){
+
+    //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", setpointR, setpointL, ObjectWidth, xR, SteeringError, DistanceError);       
+}
+
 
 
 /******************************************************************************
@@ -138,7 +150,7 @@
                            User interface 2
 ******************************************************************************/
 
-void consoleUI(void)
+void consoleUIold(void)
 {
      
     if (bluetooth.readable()) {
@@ -234,3 +246,5 @@
     //bluetooth.printf("\r\ne: %d, Pos: %d, dP: %d, xState: %d, u: %d, dT: %d", e, position, dPosition, xState, u, dTime);
     
 }
+
+