From 4ae381bac1ccc07843128e93b65ccab9abca643e Mon Sep 17 00:00:00 2001 From: tseufl Date: Mon, 17 Oct 2016 11:00:25 +0200 Subject: [PATCH 1/6] configs: sim-axis readme typo Signed-off-by: Thoren Seufl --- configs/sim/axis/README | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/sim/axis/README b/configs/sim/axis/README index c2e63bb954a..8104f80e05c 100644 --- a/configs/sim/axis/README +++ b/configs/sim/axis/README @@ -5,12 +5,12 @@ The principal Axis gui sim ini files: axis.ini basic demo (in) axis_9axis.ini 9 axes axis_mm.ini basic demo (mm) -canterp demo for a non-gcode interpreter +canterp.ini demo for a non-gcode interpreter gantry.ini gantry demo gantry_mm.ini gantry demo (mm) histogram_demo.ini hal-histogram examples historical_lathe.ini configured with 3 joints (XYZ with Y unused) -ini_hal_demo ini hal pins demo +ini_hal_demo.ini ini hal pins demo lathe.ini lathe demo ldelta.ini linear delta robot ldelta_demo.ini linear delta with jog guis From d99216feba5fcae47cf942fdbf8e8684c4062816 Mon Sep 17 00:00:00 2001 From: tseufl Date: Mon, 17 Oct 2016 11:05:10 +0200 Subject: [PATCH 2/6] configs: sim-gmoccapy readme typo Signed-off-by: Thoren Seufl --- configs/sim/gmoccapy/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/sim/gmoccapy/README b/configs/sim/gmoccapy/README index 87acb77e9e8..1efcbab3b75 100644 --- a/configs/sim/gmoccapy/README +++ b/configs/sim/gmoccapy/README @@ -5,7 +5,7 @@ This screen is based of the design of moccagui, an GUI coded in FreePascal. gmoccapy is using Python instead. -gmoccapy is designed to bring the feel of industrial controls to linuxccn users, +gmoccapy is designed to bring the feel of industrial controls to LinuxCNC users, most controls can be used with a touch screen and also most are accesible through hal pins, so real hardware can be used. From beb680c23d8834bf5248179b2504e1230fc4bf79 Mon Sep 17 00:00:00 2001 From: tseufl Date: Mon, 17 Oct 2016 11:16:40 +0200 Subject: [PATCH 3/6] configs: sim-gscreen readme typo Signed-off-by: Thoren Seufl --- configs/sim/gscreen/README | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/configs/sim/gscreen/README b/configs/sim/gscreen/README index 206e47a7187..6ba7d163d8a 100644 --- a/configs/sim/gscreen/README +++ b/configs/sim/gscreen/README @@ -1,16 +1,15 @@ -Gscreen is a customizable operator screen for linuxcnc. +Gscreen is a customizable operator screen for LinuxCNC. Built with python, GLADE, and GTK Usable with touchscreens or a mouse. - These show the native look of Gscreen. +These show the native look of Gscreen. - -gscreen +gscreen.ini -Imperial milling screen, -includes optionnal gladevcp panels -gscreen_lathe +gscreen_lathe.ini -Imperial basic lathe -gscreen_mm +gscreen_mm.ini -Metric milling screen From 2e49ea296322554918e892d411c4e071e7328e80 Mon Sep 17 00:00:00 2001 From: tseufl Date: Mon, 17 Oct 2016 11:50:29 +0200 Subject: [PATCH 4/6] configs: sim-gscreen_custom readme reformatting Signed-off-by: Thoren Seufl --- configs/sim/gscreen/gscreen_custom/README | 39 ++++++++++++----------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/configs/sim/gscreen/gscreen_custom/README b/configs/sim/gscreen/gscreen_custom/README index 6b2f44c05c7..fc10181aadf 100644 --- a/configs/sim/gscreen/gscreen_custom/README +++ b/configs/sim/gscreen/gscreen_custom/README @@ -1,29 +1,32 @@ -Gscreen is a customizable operator screen for linuxcnc. +Gscreen is a customizable operator screen for LinuxCNC. Built with python, GLADE, and GTK Usable with touchscreens or a mouse. These show some custom looks of Gscreen. -gscreen_custom +9axis.ini -9 axis screen -gscreen_gaxis +gaxis_no_plot.ini +gscreen_gaxis.ini -A similar-to-AXIS demo -industrial - -Design influenced by Industrial CNC controls. - (System page unlock code is '123') - -tester - -Tester is used to load a GLADE file without -initializing anything beyond the window. -The glade file must be called tester.glade -The toplevel window must be called window1 -tester_handler.py is also a template of a -handler file for adding python code for more -sophisticated customizations. -If you run this without adding a GLADE file to -the folder, it will load a default gscreen file. - +industrial.ini +industrial_lathe.ini + -Design influenced by + Industrial CNC controls. + (System page unlock code is '123') + +tester.ini + -Tester is used to load a GLADE file without + initializing anything beyond the window. + The glade file must be called tester.glade + The toplevel window must be called window1 + tester_handler.py is also a template of a + handler file for adding python code for + more sophisticated customizations. + If you run this without adding a GLADE + file to the folder, it will load a default + gscreen file. From d4a480d3b3b1f48216c21f023c578fe771beb0ba Mon Sep 17 00:00:00 2001 From: tseufl Date: Mon, 17 Oct 2016 13:01:39 +0200 Subject: [PATCH 5/6] configs: sim-tklinuxcnc readme update/reformatting Signed-off-by: Thoren Seufl --- configs/sim/tklinuxcnc/README | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/configs/sim/tklinuxcnc/README b/configs/sim/tklinuxcnc/README index 6ebf91c4c83..16f58864c8d 100644 --- a/configs/sim/tklinuxcnc/README +++ b/configs/sim/tklinuxcnc/README @@ -1,10 +1,13 @@ Sim files using tklinuxcnc gui: -tklinuxcnc.ini - tcl/tk interface +delta.ini + -delta robot with linear joints servo_sim.ini - simulation for a servo machine + -simulation for a servo machine + +tklinuxcnc.ini + -tcl/tk interface tripod.ini - non-trivial kinematics machine + -non-trivial kinematics machine From d846735b735abf8099b03e552a7458b6345ed229 Mon Sep 17 00:00:00 2001 From: tseufl Date: Mon, 17 Oct 2016 13:59:32 +0200 Subject: [PATCH 6/6] configs: sim-tklinuxcnc readme missing l [L] added Signed-off-by: Thoren Seufl --- configs/sim/tklinuxcnc/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/sim/tklinuxcnc/README b/configs/sim/tklinuxcnc/README index 16f58864c8d..b8947ae5ec9 100644 --- a/configs/sim/tklinuxcnc/README +++ b/configs/sim/tklinuxcnc/README @@ -1,6 +1,6 @@ Sim files using tklinuxcnc gui: -delta.ini +ldelta.ini -delta robot with linear joints servo_sim.ini