pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added little gcode reference to the terminal tab.

Browse source
This commit is contained in:
Teja 2015-03-17 12:09:54 +01:00
parent 43a476ed1d
commit ef6ec7df4b
2 changed files with 127 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/octoprint/plugins/svgtogcode/static/css/svgtogcode.css
View file

@ -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;}
.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;
}

112
src/octoprint/plugins/svgtogcode/templates/override_index.jinja2
View file

@ -259,7 +259,11 @@
<div class="container-fluid">
<div class="row-fluid">
<div class="span4 accordion">
<div class="accordion-group" >
<div class="accordion-heading">
<a class="accordion-toggle" ><i class="icon-filter"></i> {{ _('Terminal filters') }}</a>
</div>
</div>
<label class="checkbox">
<input type="checkbox" id="terminal-autoscroll" data-bind="checked: autoscrollEnabled"> {{ _('Autoscroll') }}
</label>
@ -268,6 +272,112 @@
<input type="checkbox" data-bind="attr: { value: regex }, checked: $parent.activeFilters"> <span data-bind="text: name"></span>
</label>
</div>
<div class="accordion-group" >
<div class="accordion-heading">
<a class="accordion-toggle" data-toggle="collapse" href="#gcode_reference"><i class="icon-info-sign"></i> {{ _('GCode reference') }}</a>
</div>
</div>
<div id="gcode_reference">
<ul>
<li>
<span class="gcommand">G0</span>:
<span class="desc">rapid position move</span>
<div class="params">parameters: X,Y</div>
<div class="example">example: G0 X100 Y0</div>
</li>
<li>
<span class="gcommand">F</span>:
<span class="desc">set feedrate for G1,G2,G3</span>
<div class="params">parameters: value</div>
<div class="example">example: F300</div>
</li>
<li>
<span class="gcommand">G1</span>:
<span class="desc">work move, line</span>
<div class="params">parameters: X,Y,F</div>
<div class="example">example: G1 X100 Y0 F800</div>
</li>
<li>
<span class="gcommand">G2</span>:
<span class="desc">work move, arc clockwise</span>
<div class="params">parameters: X,Y,I,J,F</div>
<div class="example">example: G2 X10 Y10 I8 J5</div>
</li>
<li>
<span class="gcommand">G3</span>:
<span class="desc">work move, arc counterclockwise</span>
<div class="params">parameters: X,Y,I,J,F</div>
<div class="example">example: G3 X10 Y10 I8 J5</div>
</li>
<li>
<span class="gcommand">G4</span>:
<span class="desc">dwell</span>
<div class="params">parameters: P</div>
<div class="example">example: G4 P0.5</div>
</li>
<li>
<span class="gcommand">M3</span>:
<span class="desc">laser on</span>
<div class="params">parameters: S</div>
<div class="example">example: M3 S10</div>
</li>
<li>
<span class="gcommand">M5</span>:
<span class="desc">laser off</span>
<div class="params">parameters: -</div>
<div class="example">example: M5</div>
</li>
<li>
<span class="gcommand">M8</span>:
<span class="desc">fan on</span>
<div class="params">parameters: -</div>
<div class="example">example: M8</div>
</li>
<li>
<span class="gcommand">M9</span>:
<span class="desc">fan off</span>
<div class="params">parameters: -</div>
<div class="example">example: M9</div>
</li>
<li>
<span class="gcommand">M2</span>:
<span class="desc">machine off</span>
<div class="params">parameters: -</div>
<div class="example">example: M2</div>
</li>
<li>
<span class="gcommand">G90</span>:
<span class="desc">absolute coordinate mode</span>
<div class="params">parameters: -</div>
<div class="example">example: G90</div>
</li>
<li>
<span class="gcommand">G91</span>:
<span class="desc">relative coordinate mode</span>
<div class="params">parameters: -</div>
<div class="example">example: G91</div>
</li>
<li>
<span class="gcommand">G92</span>:
<span class="desc">set coordinate origin</span>
<div class="params">parameters: X,Y</div>
<div class="example">example: G92 X0 Y0</div>
</li>
<li>
<span class="gcommand">G20</span>:
<span class="desc">set units to inches</span>
<div class="params">parameters: -</div>
<div class="example">example: G20</div>
</li>
<li>
<span class="gcommand">G21</span>:
<span class="desc">set units to millimeters</span>
<div class="params">parameters: -</div>
<div class="example">example: G21</div>
</li>
</ul>
</div>
</div>
<div class="span8 ">