Display spindle angle relative to position when entering spindle angl…

…e display mode
kwackers · Jan 2, 2024 · 138fbb8 · 138fbb8
1 parent ea505c2
commit 138fbb8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/els-f280049c/UserInterface.cpp b/els-f280049c/UserInterface.cpp
@@ -218,7 +218,7 @@ void UserInterface :: loop( void )
     Uint16 currentRpm = core->getRPM();
 
     // read the current spindle position to keep this up to date
-    Uint16 currentSpindleAngle = encoder->getSpindleAngle();
+    Uint16 currentSpindleAngle = encoder->getSpindleAngle() + spindleAngleOffset % 3600;
 
     // display an override message, if there is one
     overrideMessage();
@@ -392,6 +392,9 @@ void UserInterface :: menuLoop( Uint16 currentRpm )
         // Spindle position / RPM
     case kShowPosition:     // init
         setMessage(showAngle ? &RPM : &POSITION);
+        if (showAngle) {
+            spindleAngleOffset = encoder->getSpindleAngle();
+        }
         this-menuState++;
         break;
     case kShowPosition+1:   // wait for keypress, either select this option, move to new or timeout

diff --git a/els-f280049c/UserInterface.h b/els-f280049c/UserInterface.h
@@ -63,6 +63,8 @@ class UserInterface
     const MESSAGE *message;
     Uint16 messageTime;
 
+    Uint16 spindleAngleOffset;
+
     const FEED_THREAD *loadFeedTable();
     LED_REG calculateLEDs();
     void setMessage(const MESSAGE *message);