Make power button disable stepper drive and turn off control panel.

els-f280049c/Core.cpp

@@ -40,6 +40,8 @@ Core :: Core( Encoder *encoder, StepperDrive *stepperDrive )
     this->previousSpindlePosition = 0;
     this->previousFeedDirection = 0;
     this->previousFeed = NULL;
+
+    this->powerOn = true; // default to power on
 }
 
 void Core :: setReverse(bool reverse)
@@ -54,6 +56,11 @@ void Core :: setReverse(bool reverse)
     }
 }
 
+void Core :: setPowerOn(bool powerOn)
+{
+    this->powerOn = powerOn;
+    this->stepperDrive->setEnabled(powerOn);
+}
 
 
 

els-f280049c/Core.h

@@ -54,6 +54,8 @@ class Core
 
     int32 feedRatio(Uint32 count);
 
+    bool powerOn;
+
 public:
     Core( Encoder *encoder, StepperDrive *stepperDrive );
 
@@ -62,6 +64,9 @@ class Core
     Uint16 getRPM(void);
     bool isAlarm();
 
+    bool isPowerOn();
+    void setPowerOn(bool);
+
     void ISR( void );
 };
 
@@ -84,6 +89,11 @@ inline bool Core :: isAlarm()
     return this->stepperDrive->isAlarm();
 }
 
+inline bool Core :: isPowerOn()
+{
+    return this->powerOn;
+}
+
 inline int32 Core :: feedRatio(Uint32 count)
 {
 #ifdef USE_FLOATING_POINT

els-f280049c/StepperDrive.h

@@ -99,6 +99,8 @@ class StepperDrive
     void incrementCurrentPosition(int32 increment);
     void setCurrentPosition(int32 position);
 
+    void setEnabled(bool);
+
     bool isAlarm();
 
     void ISR(void);
@@ -119,6 +121,17 @@ inline void StepperDrive :: setCurrentPosition(int32 position)
     this->currentPosition = position;
 }
 
+inline void StepperDrive :: setEnabled(bool enabled)
+{
+    if( enabled ) {
+        GPIO_SET_ENABLE;
+    }
+    else
+    {
+        GPIO_CLEAR_ENABLE;
+    }
+}
+
 inline bool StepperDrive :: isAlarm()
 {
 #ifdef USE_ALARM_PIN

els-f280049c/UserInterface.cpp

@@ -52,6 +52,8 @@ const MESSAGE SETTINGS_MESSAGE_1 =
  .next = &SETTINGS_MESSAGE_2
 };
 
+const Uint16 VALUE_BLANK[4] = { BLANK, BLANK, BLANK, BLANK };
+
 UserInterface :: UserInterface(ControlPanel *controlPanel, Core *core, FeedTableFactory *feedTableFactory)
 {
     this->controlPanel = controlPanel;
@@ -66,6 +68,8 @@ UserInterface :: UserInterface(ControlPanel *controlPanel, Core *core, FeedTable
 
     this->keys.all = 0xff;
 
+    loadFeedTable();
+
     setMessage(&STARTUP_MESSAGE_1);
 }
 
@@ -75,15 +79,23 @@ const FEED_THREAD *UserInterface::loadFeedTable()
     return this->feedTable->current();
 }
 
-LED_REG UserInterface::calculateLEDs(const FEED_THREAD *selectedFeed)
+LED_REG UserInterface::calculateLEDs()
 {
     // get the LEDs for this feed
-    LED_REG leds = selectedFeed->leds;
+    LED_REG leds = feedTable->current()->leds;
 
-    // and add a few of our own
-    leds.bit.POWER = 1;
-    leds.bit.REVERSE = this->reverse;
-    leds.bit.FORWARD = ! this->reverse;
+    if( this->core->isPowerOn() )
+    {
+        // and add a few of our own
+        leds.bit.POWER = 1;
+        leds.bit.REVERSE = this->reverse;
+        leds.bit.FORWARD = ! this->reverse;
+    }
+    else
+    {
+        // power is off
+        leds.all = 0;
+    }
 
     return leds;
 }
@@ -114,45 +126,44 @@ void UserInterface :: overrideMessage( void )
 
 void UserInterface :: loop( void )
 {
-    const FEED_THREAD *newFeed = NULL;
-
     // read the RPM up front so we can use it to make decisions
     Uint16 currentRpm = core->getRPM();
 
     // display an override message, if there is one
     overrideMessage();
 
-    // just in case, initialize the first time through
-    if( feedTable == NULL ) {
-        newFeed = loadFeedTable();
-    }
-
     // read keypresses from the control panel
     keys = controlPanel->getKeys();
 
     // respond to keypresses
     if( currentRpm == 0 )
     {
         // these keys should only be sensitive when the machine is stopped
-        if( keys.bit.IN_MM )
-        {
-            this->metric = ! this->metric;
-            newFeed = loadFeedTable();
-        }
-        if( keys.bit.FEED_THREAD )
-        {
-            this->thread = ! this->thread;
-            newFeed = loadFeedTable();
+        if( keys.bit.POWER ) {
+            this->core->setPowerOn(!this->core->isPowerOn());
         }
-        if( keys.bit.FWD_REV )
-        {
-            this->reverse = ! this->reverse;
-            // feed table hasn't changed, but we need to trigger an update
-            newFeed = loadFeedTable();
-        }
-        if( keys.bit.SET )
-        {
-            setMessage(&SETTINGS_MESSAGE_1);
+
+        // these should only work when the power is on
+        if( this->core->isPowerOn() ) {
+            if( keys.bit.IN_MM )
+            {
+                this->metric = ! this->metric;
+                core->setFeed(loadFeedTable());
+            }
+            if( keys.bit.FEED_THREAD )
+            {
+                this->thread = ! this->thread;
+                core->setFeed(loadFeedTable());
+            }
+            if( keys.bit.FWD_REV )
+            {
+                this->reverse = ! this->reverse;
+                core->setReverse(this->reverse);
+            }
+            if( keys.bit.SET )
+            {
+                setMessage(&SETTINGS_MESSAGE_1);
+            }
         }
     }
 
@@ -161,35 +172,32 @@ void UserInterface :: loop( void )
         {
 #endif // IGNORE_ALL_KEYS_WHEN_RUNNING
 
-        // these keys can be operated when the machine is running
-        if( keys.bit.UP )
-        {
-            newFeed = feedTable->next();
-        }
-        if( keys.bit.DOWN )
-        {
-            newFeed = feedTable->previous();
+        // these should only work when the power is on
+        if( this->core->isPowerOn() ) {
+            // these keys can be operated when the machine is running
+            if( keys.bit.UP )
+            {
+                core->setFeed(feedTable->next());
+            }
+            if( keys.bit.DOWN )
+            {
+                core->setFeed(feedTable->previous());
+            }
         }
 
 #ifdef IGNORE_ALL_KEYS_WHEN_RUNNING
     }
 #endif // IGNORE_ALL_KEYS_WHEN_RUNNING
 
-    // if we have changed the feed
-    if( newFeed != NULL ) {
-        // update the display
-        LED_REG leds = this->calculateLEDs(newFeed);
-        controlPanel->setLEDs(leds);
-        controlPanel->setValue(newFeed->display);
+    // update the control panel
+    controlPanel->setLEDs(calculateLEDs());
+    controlPanel->setValue(feedTable->current()->display);
+    controlPanel->setRPM(currentRpm);
 
-        // update the core
-        core->setFeed(newFeed);
-        core->setReverse(this->reverse);
+    if( ! core->isPowerOn() )
+    {
+        controlPanel->setValue(VALUE_BLANK);
     }
 
-    // update the RPM display
-    controlPanel->setRPM(currentRpm);
-
-    // write data out to the display
     controlPanel->refresh();
 }

els-f280049c/UserInterface.h

@@ -57,7 +57,7 @@ class UserInterface
     Uint16 messageTime;
 
     const FEED_THREAD *loadFeedTable();
-    LED_REG calculateLEDs(const FEED_THREAD *selectedFeed);
+    LED_REG calculateLEDs();
     void setMessage(const MESSAGE *message);
     void overrideMessage( void );