Skip to content

Commit 657d1c9

Browse files
authored
Merge pull request #3335 from hansu/gmoccapy-3-5-0
Gmoccapy 3.5.0 - new features
2 parents 1b61c58 + a624bec commit 657d1c9

46 files changed

Lines changed: 2411 additions & 653 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

configs/sim/gmoccapy/gmoccapy.ini

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ MAX_FEED_OVERRIDE = 1.5
2525
MAX_SPINDLE_OVERRIDE = 1.2
2626
MIN_SPINDLE_OVERRIDE = 0.5
2727

28-
# The following are not relevant for this machine, added here to suppress warinings.
29-
DEFAULT_ANGULAR_VELOCITY = 360
30-
MIN_ANGULAR_VELOCITY = 0.1
31-
MAX_ANGULAR_VELOCITY = 3600
32-
3328
# Initial value for spindle speed
3429
DEFAULT_SPINDLE_SPEED = 450
3530

configs/sim/gmoccapy/gmoccapy_postgui.hal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ unlinkp iocontrol.0.tool-changed
1616
unlinkp iocontrol.0.tool-prep-number
1717

1818
#net tool-change gmoccapy.toolchange-change <= iocontrol.0.tool-change
19-
#net tool-changed gmoccapy.toolchange-changed <= iocontrol.0.tool-changed
19+
#net tool-changed gmoccapy.toolchange-changed => iocontrol.0.tool-changed
2020
#net tool-prep-number gmoccapy.toolchange-number <= iocontrol.0.tool-prep-number
2121

2222
net tool-change-loop iocontrol.0.tool-change => iocontrol.0.tool-changed

configs/sim/gmoccapy/lathe_configs/gmoccapy_postgui.hal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ unlinkp iocontrol.0.tool-changed
1616
unlinkp iocontrol.0.tool-prep-number
1717

1818
net tool-change gmoccapy.toolchange-change <= iocontrol.0.tool-change
19-
net tool-changed gmoccapy.toolchange-changed <= iocontrol.0.tool-changed
19+
net tool-changed gmoccapy.toolchange-changed => iocontrol.0.tool-changed
2020
net tool-prep-number gmoccapy.toolchange-number <= iocontrol.0.tool-prep-number
2121

2222
net tooloffset-x gmoccapy.tooloffset-x <= motion.tooloffset.x

configs/sim/gmoccapy/macros/go_to_position.ngc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
; Testfile go to position
2-
; will jog the machine to a position to give
3-
2+
; will jog the machine to a given position
43
; the image path must be relative from your config dir or absolute, "~" is allowed
54
(IMAGE, ./macros/images/goto_x_y_z.png)
65

@@ -19,7 +18,7 @@ G90
1918
;#2 = <Y-Pos>
2019
;#3 = <Z-Pos>
2120

22-
(DBG, Will now move machine to X = #1 , Y = #2 , Z = #3)
21+
(DEBUG, Will now move machine to X = #1 , Y = #2 , Z = #3)
2322
G0 X #1 Y #2 Z #3
2423

2524
O<go_to_position> endsub

configs/sim/gmoccapy/macros/halo_world.ngc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; Testfile I am Lost
1+
; Testfile "hello world"
22
; will just give messages
33

44
O<halo_world> sub
@@ -15,8 +15,7 @@ G90
1515
G0 X10
1616

1717
(MSG, Hallo Welt)
18-
(MSG, halo world)
19-
(MSG, why does this apeera as an error?)
18+
(MSG, hello world)
2019

2120
G0X-10
2221

configs/sim/gmoccapy/macros/i_am_lost.ngc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
; Testfile I am Lost
2-
; will jog to machine cero and set all axis to cero
2+
; will jog to machine zero and set all axis to zero
33

44
; the image path must be relative from your config dir or absolute, "~" is allowed
55
(IMAGE, ./macros/images/i_am_lost.png)
@@ -15,9 +15,9 @@ G49
1515
G80
1616
G90
1717

18-
(MSG, Will now move to machine cero)
18+
(MSG, Will now move to machine zero)
1919
G53 G0 X0 Y0 Z0
20-
(MSG, will now set all axis to cero)
20+
(MSG, will now set all axis to zero)
2121
G10 L20 P0 X0 Y0 Z0
2222
(MSG, all done)
2323

configs/sim/gmoccapy/macros/increment.ngc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
; Testfile I am Lost
2-
; will jog to machine cero and set all axis to cero
1+
; Testfile "increment"
2+
; will move the machine in relative coordinates
33

44
O<increment> sub
55

configs/sim/gmoccapy/macros/jog_around.ngc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; Testfile I am Lost
1+
; Testfile "Jog around"
22
; will just jog a little bit around
33

44
O<jog_around> sub

configs/sim/gmoccapy/macros/macro_0.ngc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ G90
1616
;#2 = <Y-Pos>
1717
;#3 = <Z-Pos>
1818

19-
(DBG, Will now move machine to X = #1 , Y = #2 , Z = #3)
19+
(DEBUG, Will now move machine to X = #1 , Y = #2 , Z = #3)
2020
G0 X #1 Y #2 Z #3
2121

2222
O<macro_0> endsub

configs/sim/gmoccapy/macros/macro_1.ngc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ G90
1616
;#2 = <Y-Pos>
1717
;#3 = <Z-Pos>
1818

19-
(DBG, Will now move machine to X = #1 , Y = #2 , Z = #3)
19+
(DEBUG, Will now move machine to X = #1 , Y = #2 , Z = #3)
2020
G0 X #1 Y #2 Z #3
2121

2222
O<macro_1> endsub

0 commit comments

Comments
 (0)