Merge branch 'devel' into fw4

This commit is contained in:
Oskar Weigl
2018-05-15 10:22:19 -07:00
10 changed files with 49 additions and 12 deletions
+1 -1
View File
@@ -130,7 +130,7 @@ bool Encoder::run_offset_calibration() {
static const float start_lock_duration = 1.0f;
static const float scan_omega = 4.0f * M_PI;
static const float scan_distance = 16.0f * M_PI;
static const int num_steps = scan_distance / scan_omega * current_meas_hz;
static const int num_steps = (int)(scan_distance / scan_omega * (float)current_meas_hz);
// Temporarily disable index search so it doesn't mess
// with the offset calibration