controller/interpolator: allow homing when in manual state

nraynaud · Nov 25, 2015 · a0da592 · a0da592
1 parent 7fd37ae
commit a0da592
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/interpolator/main.c b/interpolator/main.c
@@ -127,6 +127,7 @@ static int startStep(step_t step) {
 int startHoming() {
     switch (cncMemory.state) {
         case READY:
+        case MANUAL_CONTROL:
             STM_EVAL_LEDOn(LED3);
             cncMemory.state = HOMING;
             return 1;

diff --git a/webapp/controllerEmber.js b/webapp/controllerEmber.js
@@ -89,7 +89,7 @@ require(['Ember', 'templates', 'cnc/ui/views', 'cnc/controller/CNCMachine'], fun
         isProgramRunnable: Ember.computed.and('canInterpolatorReceiveProgram', 'camCanSendProgram'),
         isNotProgramRunnable: Ember.computed.not('isProgramRunnable'),
         isProgramAbortable: createCurrentStateProperty('RUNNING_PROGRAM', 'PAUSED_PROGRAM', 'HOMING'),
-        isHomable: createCurrentStateProperty('READY'),
+        isHomable: createCurrentStateProperty('READY', 'MANUAL_CONTROL'),
         isBusy: createCurrentStateProperty('RUNNING_PROGRAM', 'HOMING'),
         isResumable: createCurrentStateProperty('PAUSED_PROGRAM'),
         spindleButtonLabel: function () {