Skip to content

Commit 54ccc18

Browse files
authored
Merge pull request #2383 from hansu/gmoccapy-3-4-2-1
Gmoccapy 3.4.2.1
2 parents 3ee1703 + e2d136a commit 54ccc18

15 files changed

Lines changed: 2509 additions & 2739 deletions

File tree

configs/sim/gmoccapy/lathe_configs/gmoccapy_lathe.pref

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,6 @@ offset_axis_r = 50.0
7676
radius offset_axis_x = 0
7777
use_toolmeasurement = False
7878
kbd_height = 250
79-
icon_theme = None
79+
icon_theme = classic
8080
hide_tooltips = False
8181

configs/sim/gmoccapy/lathe_configs/lathe.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ MAX_SPINDLE_OVERRIDE = 1.2
2424
MIN_SPINDLE_OVERRIDE = .5
2525

2626
# Prefix to be used
27-
PROGRAM_PREFIX = ../../nc_files/:.
27+
PROGRAM_PREFIX = ../../nc_files/
2828

2929
# Introductory graphic
3030
INTRO_GRAPHIC = linuxcnc.gif

configs/sim/gmoccapy/lathe_configs/lathe_macros.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ MIN_SPINDLE_OVERRIDE = .5
2525

2626

2727
# Prefix to be used
28-
PROGRAM_PREFIX = ../../nc_files/:./
28+
PROGRAM_PREFIX = ../../nc_files/
2929

3030
# Introductory graphic
3131
INTRO_GRAPHIC = linuxcnc.gif

configs/sim/gmoccapy/non_trivial_kinematics/Gantry/gantry_mm.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ DISPLAY = gmoccapy
99
CYCLE_TIME = 0.200
1010
POSITION_OFFSET = RELATIVE
1111
POSITION_FEEDBACK = ACTUAL
12-
PROGRAM_PREFIX = ../../nc_files/
12+
PROGRAM_PREFIX = ../../../nc_files/
1313
INTRO_GRAPHIC = linuxcnc.gif
1414
INTRO_TIME = 5
1515

configs/sim/gmoccapy/non_trivial_kinematics/scara/scara.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ CYCLE_TIME = 0.200
1010
POSITION_OFFSET = RELATIVE
1111
POSITION_FEEDBACK = ACTUAL
1212
MAX_FEED_OVERRIDE = 2.0
13-
PROGRAM_PREFIX = ../../nc_files/
13+
PROGRAM_PREFIX = ../../../nc_files/
1414
INTRO_GRAPHIC = linuxcnc.gif
1515
INTRO_TIME = 5
1616
MIN_SPINDLE_OVERRIDE = 0.25

configs/sim/gmoccapy/non_trivial_kinematics/table-rotary-tilting/xyzac-trt.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ DISPLAY = gmoccapy
1010
POSITION_OFFSET = RELATIVE
1111
POSITION_FEEDBACK = ACTUAL
1212
MAX_FEED_OVERRIDE = 2
13-
PROGRAM_PREFIX = ../../nc_files
13+
PROGRAM_PREFIX = ../../../nc_files
1414
INTRO_GRAPHIC = emc2.gif
1515
INTRO_TIME = 1
1616

-19.8 KB
Loading
-19.8 KB
Loading
1.05 KB
Loading
10.4 KB
Loading

0 commit comments

Comments
 (0)