Skip to content

Commit a3e5b43

Browse files
GnevkoGnevko
authored
V-01-02-00
1 parent 4dcceed commit a3e5b43

8 files changed

+153
-100
lines changed

‎Config.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,5 @@
7676
*********************************************************/
7777
#define NUM_AUTO_SPEEDS 4
7878
#define QUICK_AUTO_SPEED_POSITION 3
79-
#define NUM_AUTO_SPEEDS_SYNC 17
79+
#define NUM_SYNC_SPEEDS 17
80+
#define QUICK_SYNC_SPEED_POSITION 14

‎GDisplay.cpp

+12-6
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ void GDisplay::displayHandWheelFactor(float _handWheelFactor)
176176
------>A0.08--------
177177
--------------------
178178
*/
179-
void GDisplay::displayAutoFeedSpeed(float _autoSpeed)
179+
void GDisplay::displayAutoSpeed(float _autoSpeed)
180180
{
181181
_lcd->setCursor(8, 2);
182182
_lcd->print(F("A"));
@@ -189,7 +189,7 @@ void GDisplay::displayAutoFeedSpeed(float _autoSpeed)
189189
------------>S0.08--
190190
--------------------
191191
*/
192-
void GDisplay::displayAutoFeedSyncSpeed(float _autoSyncSpeed)
192+
void GDisplay::displaySyncSpeed(float _autoSyncSpeed)
193193
{
194194
_lcd->setCursor(15, 2);
195195
_lcd->print(F("S"));
@@ -202,11 +202,14 @@ void GDisplay::displayAutoFeedSyncSpeed(float _autoSyncSpeed)
202202
--------------------
203203
>L 123.00-----------
204204
*/
205-
void GDisplay::displayLeftEndStop(float _leftStop)
205+
void GDisplay::displayLeftEndStop(float _leftStop, boolean isEnabled)
206206
{
207207
_lcd->setCursor(1, 3);
208208
_lcd->print(F("L"));
209-
displayNumber(_leftStop, 2, 3);
209+
if (isEnabled)
210+
displayNumber(_leftStop, 2, 3);
211+
else
212+
_lcd->print(F("-------"));
210213
}
211214

212215
/*
@@ -215,11 +218,14 @@ void GDisplay::displayLeftEndStop(float _leftStop)
215218
--------------------
216219
---------->R-123.00-
217220
*/
218-
void GDisplay::displayRightEndStop(float _rightStop)
221+
void GDisplay::displayRightEndStop(float _rightStop, boolean isEnabled)
219222
{
220223
_lcd->setCursor(12, 3);
221224
_lcd->print(F("R"));
222-
displayNumber(_rightStop, 13, 3);
225+
if (isEnabled)
226+
displayNumber(_rightStop, 13, 3);
227+
else
228+
_lcd->print(F("-------"));
223229
}
224230

225231
void GDisplay::displayNumber(float numberToDisplay, int cursorPos, int rowPos)

‎GDisplay.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ class GDisplay
2020
void displaySelectMode (byte zFeedAutoMode);
2121
void displaySpindleSpeed(float _speedToShow);
2222
void displayHandWheelFactor(float _handWheelFactor);
23-
void displayAutoFeedSpeed(float _autoSpeed);
24-
void displayAutoFeedSyncSpeed(float _autoSyncSpeed);
25-
void displayLeftEndStop(float _leftStop);
26-
void displayRightEndStop(float _rightStop);
23+
void displayAutoSpeed(float _autoSpeed);
24+
void displaySyncSpeed(float _autoSyncSpeed);
25+
void displayLeftEndStop(float _leftStop, boolean isEnabled);
26+
void displayRightEndStop(float _rightStop, boolean isEnabled);
2727
void displayMenuMark(int menuMode);
2828

2929
protected:

‎GJoystick.cpp

+22-6
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ void GJoystick::checkCurrentJoystickPosition(unsigned long timeNow) {
9191
zStepper.enable();
9292
display.displayMode(zStepper.getFeedMode(), zStepper.getFeedAutoMode(), zStepper.getDirection());
9393
display.displayHandWheelFactor(zHandWheel.getSpeed());
94-
display.displayAutoFeedSpeed(zStepper.getAutoSpeed());
95-
display.displayAutoFeedSyncSpeed(zStepper.getAutoSyncSpeed());
96-
display.displayLeftEndStop(zStepper.getLeftEndStopInMM());
97-
display.displayRightEndStop(zStepper.getRightEndStopInMM());
94+
display.displayAutoSpeed(zStepper.getAutoSpeed());
95+
display.displaySyncSpeed(zStepper.getSyncSpeed());
96+
display.displayLeftEndStop(zStepper.getLeftEndStopInMM(), zStepper.isLeftEndStopSet());
97+
display.displayRightEndStop(zStepper.getRightEndStopInMM(), zStepper.isRightEndStopSet());
9898
}
9999
}
100100

@@ -114,10 +114,18 @@ void GJoystick::checkCurrentJoystickPosition(unsigned long timeNow) {
114114
//zStepper.resetPosition();
115115
zStepper.setQuickAutoSpeed();
116116
zStepper.setSpeed(zStepper.getAutoSpeed());
117-
display.displayAutoFeedSpeed(zStepper.getAutoSpeed());
117+
display.displayAutoSpeed(zStepper.getAutoSpeed());
118118
//interrupts();
119119
}
120120
}
121+
else if (zStepper.getFeedMode() == AUTO_FEED_MODE && zStepper.getFeedAutoMode() == AUTO_FEED_MODE_SYNC)
122+
{
123+
if (!zStepper.getIsQuickSyncSpeed())
124+
{
125+
zStepper.setQuickSyncSpeed();
126+
display.displaySyncSpeed(zStepper.getSyncSpeed());
127+
}
128+
}
121129
}
122130
else
123131
{
@@ -130,10 +138,18 @@ void GJoystick::checkCurrentJoystickPosition(unsigned long timeNow) {
130138
//zStepper.resetPosition();
131139
zStepper.backToNormalAutoSpeed();
132140
zStepper.setSpeed(zStepper.getAutoSpeed());
133-
display.displayAutoFeedSpeed(zStepper.getAutoSpeed());
141+
display.displayAutoSpeed(zStepper.getAutoSpeed());
134142
//interrupts();
135143
}
136144
}
145+
else if (zStepper.getFeedMode() == AUTO_FEED_MODE && zStepper.getFeedAutoMode() == AUTO_FEED_MODE_SYNC)
146+
{
147+
if (zStepper.getIsQuickSyncSpeed())
148+
{
149+
zStepper.backToNormalSyncSpeed();
150+
display.displaySyncSpeed(zStepper.getSyncSpeed());
151+
}
152+
}
137153
}
138154

139155
if (nunchuk_cbutton() == HIGH)

‎GMenu.cpp

+27-18
Original file line numberDiff line numberDiff line change
@@ -38,25 +38,25 @@ void GMenu::checkMenu(unsigned long timeNow, int menuCounter)
3838
zStepper.resetPosition();
3939
zHandWheelEncoder.write(zStepper.distanceInHandWheelUnits());
4040
interrupts();
41-
display.displayAutoFeedSpeed(zStepper.getAutoSpeed());
41+
display.displayAutoSpeed(zStepper.getAutoSpeed());
4242
}
4343
// auto sync feed mode
4444
else if (_menuMode == MENU_Z_AUTOFEEDSPEEDSYNC)
4545
{
46-
zStepper.increaseAutoSyncSpeed();
46+
zStepper.increaseSyncSpeed();
4747
noInterrupts();
4848
zStepper.resetPosition();
4949
zHandWheelEncoder.write(zStepper.distanceInHandWheelUnits());
5050
interrupts();
51-
display.displayAutoFeedSyncSpeed(zStepper.getAutoSyncSpeed());
51+
display.displaySyncSpeed(zStepper.getSyncSpeed());
5252
}
5353
// set left stop
5454
else if (_menuMode == MENU_Z_LEFT_STOP)
5555
{
5656
noInterrupts();
5757
zStepper.setLeftEndStopInSteps(zStepper.getLeftEndStopInSteps() + (long) (0.1 / MM_PER_Z_STEP));
5858
interrupts();
59-
display.displayLeftEndStop(zStepper.getLeftEndStopInMM());
59+
display.displayLeftEndStop(zStepper.getLeftEndStopInMM(), zStepper.isLeftEndStopSet());
6060
}
6161
// set right stop
6262
else if (_menuMode == MENU_Z_RIGHT_STOP)
@@ -66,7 +66,7 @@ void GMenu::checkMenu(unsigned long timeNow, int menuCounter)
6666
if (zStepper.getRightEndStopInSteps() > 0)
6767
zStepper.setRightEndStopInSteps(0L);
6868
interrupts();
69-
display.displayRightEndStop(zStepper.getRightEndStopInMM());
69+
display.displayRightEndStop(zStepper.getRightEndStopInMM(), zStepper.isRightEndStopSet());
7070
}
7171
}
7272
else if (menuCounter < _menuOldCounter)
@@ -89,17 +89,17 @@ void GMenu::checkMenu(unsigned long timeNow, int menuCounter)
8989
zStepper.resetPosition();
9090
zHandWheelEncoder.write(zStepper.distanceInHandWheelUnits());
9191
interrupts();
92-
display.displayAutoFeedSpeed(zStepper.getAutoSpeed());
92+
display.displayAutoSpeed(zStepper.getAutoSpeed());
9393
}
9494
// auto sync feed mode
9595
else if (_menuMode == MENU_Z_AUTOFEEDSPEEDSYNC)
9696
{
97-
zStepper.decreaseAutoSyncSpeed();
97+
zStepper.decreaseSyncSpeed();
9898
noInterrupts();
9999
zStepper.resetPosition();
100100
zHandWheelEncoder.write(zStepper.distanceInHandWheelUnits());
101101
interrupts();
102-
display.displayAutoFeedSyncSpeed(zStepper.getAutoSyncSpeed());
102+
display.displaySyncSpeed(zStepper.getSyncSpeed());
103103
}
104104
// set left stop
105105
else if (_menuMode == MENU_Z_LEFT_STOP)
@@ -109,15 +109,15 @@ void GMenu::checkMenu(unsigned long timeNow, int menuCounter)
109109
if (zStepper.getLeftEndStopInSteps() < 0)
110110
zStepper.setLeftEndStopInSteps(0L);
111111
interrupts();
112-
display.displayLeftEndStop(zStepper.getLeftEndStopInMM());
112+
display.displayLeftEndStop(zStepper.getLeftEndStopInMM(), zStepper.isLeftEndStopSet());
113113
}
114114
// set right stop
115115
else if (_menuMode == MENU_Z_RIGHT_STOP)
116116
{
117117
noInterrupts();
118118
zStepper.setRightEndStopInSteps(zStepper.getRightEndStopInSteps() - (long) (0.1 / MM_PER_Z_STEP));
119119
interrupts();
120-
display.displayRightEndStop(zStepper.getRightEndStopInMM());
120+
display.displayRightEndStop(zStepper.getRightEndStopInMM(), zStepper.isRightEndStopSet());
121121
}
122122
}
123123
display.displayMenuMark(_menuMode);
@@ -162,18 +162,27 @@ void GMenu::menuDoubleClick()
162162
{
163163
zStepper.setCurrentPositionToRightEndStop();
164164
}
165-
else
166-
{
167-
zStepper.setEndStopsToZero();
168-
}
169-
display.displayRightEndStop(zStepper.getRightEndStopInMM());
170-
display.displayLeftEndStop(zStepper.getLeftEndStopInMM());
165+
display.displayLeftEndStop(zStepper.getLeftEndStopInMM(), zStepper.isLeftEndStopSet());
166+
display.displayRightEndStop(zStepper.getRightEndStopInMM(), zStepper.isRightEndStopSet());
171167
}
172168

173169
void GMenu::menuAttachDuringLongPress()
174170
{
175-
zStepper.changeFeedAutoMode();
176-
display.displaySelectMode(zStepper.getFeedAutoMode());
171+
if (_menuMode == MENU_Z_LEFT_STOP)
172+
{
173+
zStepper.disableLeftEndStop();
174+
display.displayLeftEndStop(zStepper.getLeftEndStopInMM(), zStepper.isLeftEndStopSet());
175+
}
176+
else if (_menuMode == MENU_Z_RIGHT_STOP)
177+
{
178+
zStepper.disableRightEndStop();
179+
display.displayRightEndStop(zStepper.getRightEndStopInMM(), zStepper.isRightEndStopSet());
180+
}
181+
else
182+
{
183+
zStepper.changeFeedAutoMode();
184+
display.displaySelectMode(zStepper.getFeedAutoMode());
185+
}
177186
delay(1000);
178187
}
179188

0 commit comments

Comments
 (0)