Revert "Make power button disable stepper drive and turn off control …

…panel. (#93)"

This reverts commit c956b26.

els-f280049c/Core.cpp

@@ -40,8 +40,6 @@ 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)
@@ -56,11 +54,6 @@ void Core :: setReverse(bool reverse)
     }
 }
 
-void Core :: setPowerOn(bool powerOn)
-{
-    this->powerOn = powerOn;
-    this->stepperDrive->setEnabled(powerOn);
-}
 
 
 

els-f280049c/Core.h

@@ -54,8 +54,6 @@ class Core
 
     int32 feedRatio(Uint32 count);
 
-    bool powerOn;
-
 public:
     Core( Encoder *encoder, StepperDrive *stepperDrive );
 
@@ -64,9 +62,6 @@ class Core
     Uint16 getRPM(void);
     bool isAlarm();
 
-    bool isPowerOn();
-    void setPowerOn(bool);
-
     void ISR( void );
 };
 
@@ -89,11 +84,6 @@ 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,8 +99,6 @@ class StepperDrive
     void incrementCurrentPosition(int32 increment);
     void setCurrentPosition(int32 position);
 
-    void setEnabled(bool);
-
     bool isAlarm();
 
     void ISR(void);
@@ -121,17 +119,6 @@ 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,8 +52,6 @@ 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;
@@ -68,8 +66,6 @@ UserInterface :: UserInterface(ControlPanel *controlPanel, Core *core, FeedTable
 
     this->keys.all = 0xff;
 
-    loadFeedTable();
-
     setMessage(&STARTUP_MESSAGE_1);
 }
 
@@ -79,23 +75,15 @@ const FEED_THREAD *UserInterface::loadFeedTable()
     return this->feedTable->current();
 }
 
-LED_REG UserInterface::calculateLEDs()
+LED_REG UserInterface::calculateLEDs(const FEED_THREAD *selectedFeed)
 {
     // get the LEDs for this feed
-    LED_REG leds = feedTable->current()->leds;
+    LED_REG leds = selectedFeed->leds;
 
-    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;
-    }
+    // and add a few of our own
+    leds.bit.POWER = 1;
+    leds.bit.REVERSE = this->reverse;
+    leds.bit.FORWARD = ! this->reverse;
 
     return leds;
 }
@@ -126,44 +114,45 @@ 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.POWER ) {
-            this->core->setPowerOn(!this->core->isPowerOn());
+        if( keys.bit.IN_MM )
+        {
+            this->metric = ! this->metric;
+            newFeed = loadFeedTable();
         }
-
-        // 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);
-            }
+        if( keys.bit.FEED_THREAD )
+        {
+            this->thread = ! this->thread;
+            newFeed = loadFeedTable();
+        }
+        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);
         }
     }
 
@@ -172,32 +161,35 @@ void UserInterface :: loop( void )
         {
 #endif // IGNORE_ALL_KEYS_WHEN_RUNNING
 
-        // 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());
-            }
+        // these keys can be operated when the machine is running
+        if( keys.bit.UP )
+        {
+            newFeed = feedTable->next();
+        }
+        if( keys.bit.DOWN )
+        {
+            newFeed = feedTable->previous();
         }
 
 #ifdef IGNORE_ALL_KEYS_WHEN_RUNNING
     }
 #endif // IGNORE_ALL_KEYS_WHEN_RUNNING
 
-    // update the control panel
-    controlPanel->setLEDs(calculateLEDs());
-    controlPanel->setValue(feedTable->current()->display);
-    controlPanel->setRPM(currentRpm);
+    // 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);
 
-    if( ! core->isPowerOn() )
-    {
-        controlPanel->setValue(VALUE_BLANK);
+        // update the core
+        core->setFeed(newFeed);
+        core->setReverse(this->reverse);
     }
 
+    // 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();
+    LED_REG calculateLEDs(const FEED_THREAD *selectedFeed);
     void setMessage(const MESSAGE *message);
     void overrideMessage( void );