Skip to content

Commit 91c255d

Browse files
committed
whb04b: Pass arguments properly
Fixes step 5/10 enable/disable
1 parent 6dd95e9 commit 91c255d

2 files changed

Lines changed: 12 additions & 7 deletions

File tree

src/hal/user_comps/xhc-whb04b-6/pendant.cc

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -586,6 +586,11 @@ void FeedRotaryButton::setStepMode(HandwheelStepmodes::Mode stepMode)
586586
update();
587587
}
588588
// ----------------------------------------------------------------------
589+
void FeedRotaryButton::setStepMode_5_10(bool enable)
590+
{
591+
mIsStepMode_5_10 = enable;
592+
}
593+
// ----------------------------------------------------------------------
589594
HandwheelStepmodes::Mode FeedRotaryButton::stepMode() const
590595
{
591596
return mStepMode;
@@ -1563,19 +1568,19 @@ void Pendant::dispatchAxisEventToHal(const KeyCode& axis, bool isActive)
15631568
}
15641569
}
15651570
// ----------------------------------------------------------------------
1566-
void Pendant::setLeadModeSpindle(bool /*enable*/)
1571+
void Pendant::setLeadModeSpindle(bool enable)
15671572
{
1568-
mIsLeadModeSpindle = true;
1573+
mIsLeadModeSpindle = enable;
15691574
}
15701575
// ----------------------------------------------------------------------
1571-
void Pendant::setLeadModeFeed(bool /*enable*/)
1576+
void Pendant::setLeadModeFeed(bool enable)
15721577
{
1573-
mIsLeadModeFeed = true;
1578+
mIsLeadModeFeed = enable;
15741579
}
15751580
// ----------------------------------------------------------------------
1576-
void Pendant::setStepMode_5_10(bool /*enable*/)
1581+
void Pendant::setStepMode_5_10(bool enable)
15771582
{
1578-
mIsStepMode_5_10 = true;
1583+
mCurrentButtonsState.feedButton().setStepMode_5_10(enable);
15791584
}
15801585
// ----------------------------------------------------------------------
15811586
Display::Display(const ButtonsState& currentButtonsState, Hal& hal, UsbOutPackageData& displayData) :

src/hal/user_comps/xhc-whb04b-6/pendant.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,7 @@ class FeedRotaryButton : public RotaryButton
393393
~FeedRotaryButton();
394394
virtual bool setKeyCode(const KeyCode& keyCode) override;
395395
void setStepMode(HandwheelStepmodes::Mode stepMode);
396+
void setStepMode_5_10(bool enable);
396397
HandwheelStepmodes::Mode stepMode() const;
397398
float stepSize() const;
398399
bool isPermitted() const override;
@@ -588,7 +589,6 @@ class Pendant : public KeyEventListener
588589
//! if in Lead mode: if true jog wheel changes the spindle speed, changes the feed override otherwise
589590
bool mIsLeadModeSpindle = false;
590591
bool mIsLeadModeFeed = false;
591-
bool mIsStepMode_5_10 = false;
592592

593593
// float mScale;
594594
// float mMaxVelocity;

0 commit comments

Comments
 (0)