make Panel display workspace coordiantes not machine coordinates

Smoothieware · Mar 31, 2016 · cf5db0a · cf5db0a
1 parent 96df833
commit cf5db0a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/modules/utils/panel/screens/WatchScreen.cpp b/src/modules/utils/panel/screens/WatchScreen.cpp
@@ -202,7 +202,11 @@ float WatchScreen::get_current_speed()
 
 void WatchScreen::get_current_pos(float *cp)
 {
-    THEKERNEL->robot->get_axis_position(cp);
+    Robot::wcs_t mpos= THEKERNEL->robot->get_axis_position();
+    Robot::wcs_t pos= THEKERNEL->robot->mcs2wcs(mpos);
+    cp[0]= THEKERNEL->robot->from_millimeters(std::get<X_AXIS>(pos));
+    cp[1]= THEKERNEL->robot->from_millimeters(std::get<Y_AXIS>(pos));
+    cp[2]= THEKERNEL->robot->from_millimeters(std::get<Z_AXIS>(pos));
 }
 
 void WatchScreen::get_sd_play_info()