Keep units state between runs

diff --git a/src/py/bbctrl/Planner.py b/src/py/bbctrl/Planner.py
index fb86186a372f4357e3102839756def3be54aaa14..65b841754d2430aa2e6e9221992be328eb86939f 100644 (file)
--- a/src/py/bbctrl/Planner.py
+++ b/src/py/bbctrl/Planner.py
@@ -65,7 +65,8 @@ class Planner():
         config = self.ctrl.config
 
         cfg = {
-            'default-units': state.get('units', 'METRIC'),
+            # NOTE Must get current units not configured default units
+            'default-units': 'METRIC' if state.get('metric') else 'IMPERIAL',
             'max-vel':   state.get_axis_vector('vm', 1000),
             'max-accel': state.get_axis_vector('am', 1000000),
             'max-jerk':  state.get_axis_vector('jm', 1000000),

diff --git a/src/py/bbctrl/State.py b/src/py/bbctrl/State.py
index 071558935dfb124397c8cc0b1e6f3b26b3cac59a..b8fb7dd03cde30d2ce49b71f3f6ff85b52c10b7a 100644 (file)
--- a/src/py/bbctrl/State.py
+++ b/src/py/bbctrl/State.py
@@ -78,8 +78,7 @@ class State(object):
         self.reset()
 
 
-    def is_metric(self):
-        return self.ctrl.config.get('units', 'METRIC') == 'METRIC'
+    def is_metric(self): return self.get('units', 'METRIC') == 'METRIC'
 
 
     def reset(self):