print SVN revision in log output

[bachelor-thesis/roomba_tests.git] / main.cc

diff --git a/main.cc b/main.cc
index ffe54bb..2363146 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -22,12 +22,9 @@
  * THE SOFTWARE.
  */
 
  * THE SOFTWARE.
  */
 

-//#include "main.h"
+#include "svnrevision.h"

 #include <iostream>
 #include <stdint.h>
 #include <iostream>
 #include <stdint.h>

-//#include <unistd.h>
-//#include "util/standalone_math.h"
-//#include "util/delegates/delegate.hpp"

 #include <external_interface/pc/pc_os_model.h>
 #include <external_interface/pc/pc_com_uart.h>
 #include <external_interface/pc/pc_timer.h>
 #include <external_interface/pc/pc_os_model.h>
 #include <external_interface/pc/pc_com_uart.h>
 #include <external_interface/pc/pc_timer.h>


@@ -136,14 +133,15 @@ void drive(Roomba& roomba, ControlledMotion& ctrl_motion) {
         + "Input travelled distance on y axis in mm:", deviation_y,
         numeric_limits<int>::min(), numeric_limits<int>::max(), 1, &ok);
       if(ok) {
         + "Input travelled distance on y axis in mm:", deviation_y,
         numeric_limits<int>::min(), numeric_limits<int>::max(), 1, &ok);
       if(ok) {

-        cout << "input_distance=" << input_distance << " velocity=" << velocity
-          << " internal_distance=" << roomba.distance() << " deviation_x="
-          << deviation_x << " deviation_y=" << deviation_y
-          << " encoder_ticks_left=" << sensor_data.left_encoder_counts
-          << " encoder_ticks_right=" << sensor_data.right_encoder_counts
-          << " batt_charge=" << sensor_data.charge << " batt_capacity="
-          << sensor_data.capacity << " batt_voltage=" << sensor_data.voltage
-          << " batt_current=" << sensor_data.current << endl;
+        cout << "svn=" << SVNREVISION << " input_distance=" << input_distance
+          << " velocity=" << velocity << " internal_distance="
+          << roomba.distance() << " deviation_x=" << deviation_x
+          << " deviation_y=" << deviation_y << " encoder_ticks_left="
+          << sensor_data.left_encoder_counts << " encoder_ticks_right="
+          << sensor_data.right_encoder_counts << " batt_charge="
+          << sensor_data.charge << " batt_capacity=" << sensor_data.capacity
+          << " batt_voltage=" << sensor_data.voltage << " batt_current="
+          << sensor_data.current << endl;

       } else {
         break;
       }
       } else {
         break;
       }