X-Git-Url: https://git.rohieb.name/bachelor-thesis/roomba_tests.git/blobdiff_plain/13ab1a8ad32b552adbf0f12b9eb4e62f044ca391..f6be7e61cd8ee3cfadf1d83c48a1b5b8d1628c0d:/main.cc diff --git a/main.cc b/main.cc index ffe54bb..2363146 100644 --- a/main.cc +++ b/main.cc @@ -22,12 +22,9 @@ * THE SOFTWARE. */ -//#include "main.h" +#include "svnrevision.h" #include #include -//#include -//#include "util/standalone_math.h" -//#include "util/delegates/delegate.hpp" #include #include #include @@ -136,14 +133,15 @@ void drive(Roomba& roomba, ControlledMotion& ctrl_motion) { + "Input travelled distance on y axis in mm:", deviation_y, numeric_limits::min(), numeric_limits::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; }