Skip to content

Commit

Permalink
Merge remote-tracking branch 'tseufl/tseufl-fix/configs/sim/2.8-typo-…
Browse files Browse the repository at this point in the history
…update'
  • Loading branch information
SebKuzminsky committed Oct 30, 2016
2 parents 90b66dc + d846735 commit 265b8b5
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 31 deletions.
4 changes: 2 additions & 2 deletions configs/sim/axis/README
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/sim/gmoccapy/README
Expand Up @@ -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.

Expand Down
11 changes: 5 additions & 6 deletions 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
39 changes: 21 additions & 18 deletions 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.

11 changes: 7 additions & 4 deletions configs/sim/tklinuxcnc/README
@@ -1,10 +1,13 @@
Sim files using tklinuxcnc gui:

tklinuxcnc.ini
tcl/tk interface
ldelta.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

0 comments on commit 265b8b5

Please sign in to comment.