Skip to content

Commit 1d84e4d

Browse files
committed
Merge remote-tracking branch 'origin/2.9'
* origin/2.9: hm2 oneshot: change logical or to bitwise or fix "filtertest" python g-code generators Change BASE os.environ to LINUXCNC_HOME sample configs: remove a stray `duh`? switch all sample config `[FILTER]py` from `python` to `python3` fix a race in communication between Task and Motion motion: fix indentation & comment, no behavior change debian: Change QtVCP dependencies from recommended to required
2 parents 9560f81 + fa57dc6 commit 1d84e4d

202 files changed

Lines changed: 260 additions & 246 deletions

File tree

Some content is hidden

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

configs/by_interface/mesa/hm2-servo/3x20-small.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ PROGRAM_EXTENSION = .py Python Script
3333
png = image-to-gcode
3434
gif = image-to-gcode
3535
jpg = image-to-gcode
36-
py = python
36+
py = python3
3737

3838
[RS274NGC]
3939
# File containing interpreter variables

configs/by_interface/mesa/hm2-servo/4i65.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ PROGRAM_EXTENSION = .py Python Script
3333
png = image-to-gcode
3434
gif = image-to-gcode
3535
jpg = image-to-gcode
36-
py = python
36+
py = python3
3737

3838
[RS274NGC]
3939
# File containing interpreter variables

configs/by_interface/mesa/hm2-servo/4i68.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ PROGRAM_EXTENSION = .py Python Script
3333
png = image-to-gcode
3434
gif = image-to-gcode
3535
jpg = image-to-gcode
36-
py = python
36+
py = python3
3737

3838
[RS274NGC]
3939
# File containing interpreter variables

configs/by_interface/mesa/hm2-servo/5i20.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ PROGRAM_EXTENSION = .py Python Script
3333
png = image-to-gcode
3434
gif = image-to-gcode
3535
jpg = image-to-gcode
36-
py = python
36+
py = python3
3737

3838
[RS274NGC]
3939
# File containing interpreter variables

configs/by_interface/mesa/hm2-servo/5i22-big.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ PROGRAM_EXTENSION = .py Python Script
3333
png = image-to-gcode
3434
gif = image-to-gcode
3535
jpg = image-to-gcode
36-
py = python
36+
py = python3
3737

3838
[RS274NGC]
3939
# File containing interpreter variables

configs/by_interface/mesa/hm2-servo/5i22-small.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ PROGRAM_EXTENSION = .py Python Script
3333
png = image-to-gcode
3434
gif = image-to-gcode
3535
jpg = image-to-gcode
36-
py = python
36+
py = python3
3737

3838
[RS274NGC]
3939
# File containing interpreter variables

configs/by_interface/mesa/hm2-servo/5i23.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ PROGRAM_EXTENSION = .py Python Script
3333
png = image-to-gcode
3434
gif = image-to-gcode
3535
jpg = image-to-gcode
36-
py = python
36+
py = python3
3737

3838
[RS274NGC]
3939
# File containing interpreter variables

configs/by_interface/mesa/hm2-servo/7i43-big.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ PROGRAM_EXTENSION = .py Python Script
3333
png = image-to-gcode
3434
gif = image-to-gcode
3535
jpg = image-to-gcode
36-
py = python
36+
py = python3
3737

3838
[RS274NGC]
3939
# File containing interpreter variables

configs/by_interface/mesa/hm2-servo/7i43-small.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ PROGRAM_EXTENSION = .py Python Script
3333
png = image-to-gcode
3434
gif = image-to-gcode
3535
jpg = image-to-gcode
36-
py = python
36+
py = python3
3737

3838
[RS274NGC]
3939
# File containing interpreter variables

configs/by_interface/mesa/hm2-servo/7i90.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ PROGRAM_EXTENSION = .py Python Script
3333
png = image-to-gcode
3434
gif = image-to-gcode
3535
jpg = image-to-gcode
36-
py = python
36+
py = python3
3737

3838
[RS274NGC]
3939
# File containing interpreter variables

0 commit comments

Comments
 (0)