From ef6ec7df4b963b52a3d60d32e4ef1909992168a1 Mon Sep 17 00:00:00 2001 From: Teja Date: Tue, 17 Mar 2015 12:09:54 +0100 Subject: [PATCH] added little gcode reference to the terminal tab. --- .../svgtogcode/static/css/svgtogcode.css | 17 ++- .../templates/override_index.jinja2 | 112 +++++++++++++++++- 2 files changed, 127 insertions(+), 2 deletions(-) diff --git a/src/octoprint/plugins/svgtogcode/static/css/svgtogcode.css b/src/octoprint/plugins/svgtogcode/static/css/svgtogcode.css index af899387..aa204597 100644 --- a/src/octoprint/plugins/svgtogcode/static/css/svgtogcode.css +++ b/src/octoprint/plugins/svgtogcode/static/css/svgtogcode.css @@ -1,2 +1,17 @@ table th.settings_plugin_svgtogcode_profiles_key,table td.settings_plugin_svgtogcode_profiles_key{text-overflow:ellipsis;text-align:left;width:200px}table th.settings_plugin_svgtogcode_profiles_name,table td.settings_plugin_svgtogcode_profiles_name{text-overflow:ellipsis;text-align:left}table th.settings_plugin_svgtogcode_profiles_actions,table td.settings_plugin_svgtogcode_profiles_actions{text-align:center;width:100px}table th.settings_plugin_svgtogcode_profiles_actions a,table td.settings_plugin_svgtogcode_profiles_actions a{text-decoration:none;color:#000}table th.settings_plugin_svgtogcode_profiles_actions a.disabled,table td.settings_plugin_svgtogcode_profiles_actions a.disabled{color:#ccc;cursor:default} -.slider_manual_input {margin-left: 1.5em; width: 2.5em;} \ No newline at end of file +.slider_manual_input {margin-left: 1.5em; width: 2.5em;} + +#gcode_reference .gcommand { + font-weight: bold; +} +#gcode_reference .example { + font-style: italic; +} + +#gcode_reference ul { + margin-left: 0; +} +#gcode_reference ul li { + list-style: none; + margin-bottom: 1em; +} \ No newline at end of file diff --git a/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2 b/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2 index a82fc124..599b92ef 100644 --- a/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2 +++ b/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2 @@ -259,7 +259,11 @@
- +
+
+ {{ _('Terminal filters') }} +
+
@@ -268,6 +272,112 @@
+ +
+
+ {{ _('GCode reference') }} +
+
+
+
    +
  • + G0: + rapid position move +
    parameters: X,Y
    +
    example: G0 X100 Y0
    +
    • +
  • + F: + set feedrate for G1,G2,G3 +
    parameters: value
    +
    example: F300
    +
    • +
  • + G1: + work move, line +
    parameters: X,Y,F
    +
    example: G1 X100 Y0 F800
    +
    • +
  • + G2: + work move, arc clockwise +
    parameters: X,Y,I,J,F
    +
    example: G2 X10 Y10 I8 J5
    +
    • +
  • + G3: + work move, arc counterclockwise +
    parameters: X,Y,I,J,F
    +
    example: G3 X10 Y10 I8 J5
    +
    • +
  • + G4: + dwell +
    parameters: P
    +
    example: G4 P0.5
    +
    • +
  • + M3: + laser on +
    parameters: S
    +
    example: M3 S10
    +
    • +
  • + M5: + laser off +
    parameters: -
    +
    example: M5
    +
    • +
  • + M8: + fan on +
    parameters: -
    +
    example: M8
    +
    • +
  • + M9: + fan off +
    parameters: -
    +
    example: M9
    +
    • +
  • + M2: + machine off +
    parameters: -
    +
    example: M2
    +
    • +
  • + G90: + absolute coordinate mode +
    parameters: -
    +
    example: G90
    +
    • +
  • + G91: + relative coordinate mode +
    parameters: -
    +
    example: G91
    +
    • +
  • + G92: + set coordinate origin +
    parameters: X,Y
    +
    example: G92 X0 Y0
    +
    • +
  • + G20: + set units to inches +
    parameters: -
    +
    example: G20
    +
    • +
  • + G21: + set units to millimeters +
    parameters: -
    +
    example: G21
    +
    • +
+