Skip to content

Commit 0932268

Browse files
committed
Test for update_ini
1 parent c007641 commit 0932268

File tree

3 files changed

+295
-93
lines changed

3 files changed

+295
-93
lines changed

configs/sim/gmoccapy/gmoccapy.ini

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ CYCLE_TIME = 100
2222

2323
# Values that will be allowed for override, 1.0 = 100%
2424
MAX_FEED_OVERRIDE = 1.5
25-
MIN_SPINDLE_0_OVERRIDE = 0.5
26-
MAX_SPINDLE_0_OVERRIDE = 1.2
25+
MIN_SPINDLE_OVERRIDE = 0.5
26+
MAX_SPINDLE_OVERRIDE = 1.2
2727

2828
# Spindle start speed
29-
DEFAULT_SPINDLE_0_SPEED = 450
29+
DEFAULT_SPINDLE_SPEED = 450
3030
# Scaling of spindle speed bar
31-
MIN_SPINDLE_0_SPEED = 0
32-
MAX_SPINDLE_0_SPEED = 3000
31+
MIN_SPINDLE_SPEED = 0
32+
MAX_SPINDLE_SPEED = 3000
3333

3434
# The following are not used, added here to suppress warnings (from qt_istat/logger).
3535
DEFAULT_LINEAR_VELOCITY = 35

scripts/linuxcnc.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ function GetFromIniEx {
519519

520520
# 2.1.5 check version
521521
GetFromIni VERSION EMC
522-
if [ "$retval" != "1.1" ]; then
522+
if [ "$retval" != "1.2" ]; then
523523
if [ -z "$DISPLAY" ]; then
524524
echo "INI file [EMC]VERSION indicates update is needed, but the update GUI can't run without an X display"
525525
exit 1

0 commit comments

Comments
 (0)