1.0.6 Firmware release. More Github cleanup.

src/py/bbctrl/Ctrl.py

@@ -101,6 +101,7 @@ class Ctrl(object):
     def configure(self):
         # Indirectly configures state via calls to config() and the AVR
         self.config.reload()
+        self.state.init()
 
 
     def ready(self):

src/py/bbctrl/Mach.py

@@ -51,6 +51,10 @@ axis_homing_procedure = '''
 '''
 
 stall_homing_procedure = '''
+  G91 G1 %(axis)s [#<_%(axis)s_zero_backoff> * -1] F[#<_%(axis)s_search_velocity>]
+  G4 250
+  G91 G1 %(axis)s [#<_%(axis)s_zero_backoff>] F[#<_%(axis)s_search_velocity>]
+  G4 250
   G28.2 %(axis)s0 F[#<_%(axis)s_search_velocity>]
   G38.6 %(axis)s[#<_%(axis)s_home_travel>]
   G91 G1 G53 %(axis)s[#<_%(axis)s_zero_backoff>] F100

src/py/bbctrl/Planner.py

@@ -82,6 +82,7 @@ class Planner():
     def get_config(self, mdi, with_limits):
         state = self.ctrl.state
         config = self.ctrl.config
+        is_pwm = config.get('tool-type') == 'PWM Spindle'
 
         cfg = {
             # NOTE Must get current units not configured default units
@@ -89,7 +90,7 @@ class Planner():
             'max-vel':   state.get_axis_vector('vm', 1000),
             'max-accel': state.get_axis_vector('am', 1000000),
             'max-jerk':  state.get_axis_vector('jm', 1000000),
-            'rapid-auto-off':  config.get('rapid-auto-off'),
+            'rapid-auto-off':  config.get('rapid-auto-off') and is_pwm,
             'max-blend-error': config.get('max-deviation'),
             'max-merge-error': config.get('max-deviation'),
             'junction-accel':  config.get('junction-accel'),

src/py/bbctrl/State.py

@@ -73,14 +73,25 @@ class State(object):
             self.set_callback(str(i) + 'latch_velocity',
                               lambda name, i = i: self.motor_latch_velocity(i))
 
-        self.set_callback('metric', lambda name: 1 if self.is_metric() else 0)
-        self.set_callback('imperial', lambda name: 0 if self.is_metric() else 1)
+        #self.set_callback('metric', lambda name: 1 if self.is_metric() else 0)
+        #self.set_callback('imperial', lambda name: 0 if self.is_metric() else 1)
 
         self.reset()
         self.load_files()
 
 
-    def is_metric(self): return self.get('units', 'METRIC') == 'METRIC'
+    #def is_metric(self): return self.get('units', 'METRIC') == 'METRIC'
+
+    def init(self):
+        # Init machine units
+        metric = self.ctrl.config.get('units', 'METRIC').upper() == 'METRIC'
+        self.log.info('INIT Metric %d' % metric)
+        if not 'metric' in self.vars: self.set('metric', metric)
+        if not 'imperial' in self.vars: self.set('imperial', not metric)
+        #Bit diameter for probing
+        diameter = self.ctrl.config.get('probe-diameter',6.35)
+        self.log.info('INIT Diameter %f' % diameter)
+        self.set('bitDiameter',diameter)
 
 
     def reset(self):

src/py/bbctrl/http

@@ -1 +0,0 @@
-../../../build/http/

src/py/bbctrl/http

@@ -0,0 +1 @@
+../../../build/http/