terminal fixed
This commit is contained in:
Teja
parent
44671cfb40
commit
867895ab81
5 changed files with 10 additions and 1084 deletions
|
|
@ -1,649 +0,0 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title data-bind="text: title">Mr Beam</title>
|
||||
|
||||
<link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}">
|
||||
<link rel="apple-touch-icon" sizes="114x114" href="{{ url_for('static', filename='img/apple-touch-icon-114x114.png') }}">
|
||||
<link rel="apple-touch-icon" sizes="144x144" href="{{ url_for('static', filename='img/apple-touch-icon-144x144.png') }}">
|
||||
|
||||
{% include 'stylesheets.jinja2' %}
|
||||
{% include 'initscript.jinja2' %}
|
||||
</head>
|
||||
<body>
|
||||
<div class="container octoprint-container">
|
||||
<nav class="navbar navbar-default navbar-fixed-top" role="navigation" id="navbar">
|
||||
<div class="container">
|
||||
<div class="navbar-header brand" style="min-width: 272px;">
|
||||
<a class="navbar-brand" href="#">
|
||||
<img alt="Mr Beam Logo" src="{{ url_for('static', filename='img/mr-typo-red_x120.png') }}">
|
||||
</a>
|
||||
</div>
|
||||
<ul class="nav nav-pills">
|
||||
<li class="active"><a href="#workingarea" data-toggle="tab" id="wa_tab_btn">working area</a></li>
|
||||
<li><a href="#designlib" data-toggle="tab">design library</a></li>
|
||||
<li><a href="#focus" data-toggle="tab">focus</a></li>
|
||||
<li><a href="#term" data-toggle="tab">terminal</a></li>
|
||||
|
||||
{% for data in navbarEntries %}
|
||||
{% if "custom_bindings" not in data or data["custom_bindings"] %}<!-- ko allowBindings: false -->{% endif %}
|
||||
<li id="{{ data._div }}"
|
||||
{% if "data_bind" in data %}data-bind="{{ data.data_bind }}"{% endif %}
|
||||
{% if "classes" in data %}class="{{ data.classes|join(' ') }}"{% endif %}
|
||||
{% if "styles" in data %}style="{{ data.styles|join(', ') }}"{% endif %}
|
||||
>
|
||||
{% include data.template ignore missing %}
|
||||
</li>
|
||||
{% if "custom_bindings" not in data or data["custom_bindings"] %}<!-- /ko -->{% endif %}
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
<div class="span12 tabbable" id="mrbeam-tabs">
|
||||
<div class="tab-content">
|
||||
<div class="tab-pane active" id="workingarea">
|
||||
<div class="container-fluid">
|
||||
<div class="row-fluid">
|
||||
<div class="span4 accordion">
|
||||
|
||||
<div class="accordion-group" id="state_accordion">
|
||||
<div class="accordion-heading">
|
||||
<a class="accordion-toggle" data-toggle="collapse" href="#statusbox"><i class="icon-info-sign"></i> {{ _('State') }}</a>
|
||||
</div>
|
||||
<div id="statusbox">
|
||||
|
||||
<div id="control" class="accordion-inner" data-bind="visible: (isReady() || isLocked()) && !isPrinting() ">
|
||||
<div data-bind="visible: isLocked ">
|
||||
Mr Beam is in a locked state as it does not know its position.
|
||||
First remove any objects blocking the gantry's travel range.
|
||||
Then do a homing cycle.
|
||||
<div style='text-align: center; padding:.5em;'>
|
||||
|
||||
<div class='btn-group'>
|
||||
<button class="btn btn-default" data-bind="enable: isLocked() && loginState.isUser(), click: function() { $root.sendHomeCommand(['x', 'y']) }"><i class="icon-home"> Homing Cycle</i></button>
|
||||
<!--<button class="btn btn-default" data-bind="enable: isLocked() && loginState.isUser(), click: function() { $root.sendHomeCommand(['x', 'y']) }"><i class="icon-unlock">Unlock</i></button>-->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div data-bind="visible: !isLocked() ">
|
||||
{{ _('Position') }}: <strong data-bind="text: laserPos"></strong>
|
||||
<a href="#control_btns" style="margin-top: -5px;"
|
||||
class="btn btn-xs pull-right"
|
||||
data-toggle="collapse" aria-expanded="false">
|
||||
<i class="icon-move sr-only"></i>
|
||||
<span class="caret"></span>
|
||||
</a>
|
||||
|
||||
<div class="clearfix"></div>
|
||||
<div class="collapse" id="control_btns">
|
||||
|
||||
<div class="jog-panel" id="control_xyaxis">
|
||||
XY-Axes
|
||||
<div>
|
||||
<button class="btn box" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendJogCommand('y',1) }"><i class="icon-arrow-up"></i></button>
|
||||
</div>
|
||||
<div>
|
||||
<button class="btn box pull-left" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendJogCommand('x',-1) }"><i class="icon-arrow-left"></i></button>
|
||||
<button class="btn box pull-left" data-bind="enable: (isOperational() || isLocked()) && !isPrinting() && loginState.isUser(), click: function() { $root.sendHomeCommand(['x', 'y']) }"><i class="icon-home"></i></button>
|
||||
<button class="btn box pull-left" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendJogCommand('x',1) }"><i class="icon-arrow-right"></i></button>
|
||||
</div>
|
||||
<div>
|
||||
<button class="btn box" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendJogCommand('y',-1) }"><i class="icon-arrow-down"></i></button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="jog-panel" id="control_zaxis">
|
||||
<div data-bind="visible: showZAxis">
|
||||
Z-Axis
|
||||
<div class="btn-group-vertical" role="group" aria-label="z-axis control">
|
||||
<button class="btn" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendJogCommand('z',1) }"><i class="icon-arrow-up"></i></button>
|
||||
<!--<button class="btn box" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendHomeCommand(['z']) }"><i class="icon-home"></i></button>-->
|
||||
<button class="btn" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendJogCommand('z',-1) }"><i class="icon-arrow-down"></i></button>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<button id="set_coordinate_origin_btn" class="btn" data-bind="click: setCoordinateOrigin" title="set coordinate origin"><i class="icon-screenshot"></i></button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="clearfix"></div>
|
||||
|
||||
Jog distance: <span data-bind="text: jogDistanceInMM">10</span>mm
|
||||
<div class="distance">
|
||||
<input type="text" id="jogDistance" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="accordion-body collapse in" id="connection" data-bind="visible: (isErrorOrClosed() || isConnecting()) && loginState.isUser()">
|
||||
<div class="accordion-inner">
|
||||
<label for="connection_ports" data-bind="css: {disabled: !isErrorOrClosed()}, enable: isErrorOrClosed() && loginState.isUser()">{{ _('Serial Port') }}</label>
|
||||
<select id="connection_ports" data-bind="options: portOptions, optionsCaption: 'AUTO', value: selectedPort, css: {disabled: !isErrorOrClosed()}, enable: isErrorOrClosed() && loginState.isUser()"></select>
|
||||
<label for="connection_baudrates" data-bind="css: {disabled: !isErrorOrClosed()}, enable: isErrorOrClosed() && loginState.isUser()">{{ _('Baudrate') }}</label>
|
||||
<select id="connection_baudrates" data-bind="options: baudrateOptions, optionsCaption: 'AUTO', value: selectedBaudrate, css: {disabled: !isErrorOrClosed()}, enable: isErrorOrClosed() && loginState.isUser()"></select>
|
||||
<!-- <label class="checkbox">
|
||||
<input type="checkbox" id="connection_save" data-bind="checked: saveSettings, css: {disabled: !isErrorOrClosed()}, enable: isErrorOrClosed() && loginState.isUser()"> {{ _('Save connection settings') }}
|
||||
</label>-->
|
||||
<label class="checkbox">
|
||||
<input type="checkbox" id="connection_autoconnect" data-bind="checked: settings.serial_autoconnect, css: {disabled: !isErrorOrClosed()}, enable: isErrorOrClosed() && loginState.isUser()"> {{ _('Auto-connect on server startup') }}
|
||||
</label>
|
||||
<button class="btn btn-block" id="printer_connect" data-bind="click: connect, text: buttonText(), enable: loginState.isUser()">{{ _('Connect') }}</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="accordion-body collapse in" id="state" data-bind="visible: !isErrorOrClosed() && loginState.isUser()">
|
||||
<div class="accordion-inner">
|
||||
{{ _('Machine State') }}: <strong data-bind="text: stateString"></strong><br>
|
||||
|
||||
<div data-bind="visible: !isLocked() && !isConnecting()">
|
||||
|
||||
<!--
|
||||
{{ _('File') }}: <strong data-bind="text: filename"></strong> <strong data-bind="visible: sd">(SD)</strong><br>
|
||||
{{ _('Timelapse') }}: <strong data-bind="text: timelapseString"></strong><br>
|
||||
-->
|
||||
{{ _('Approx. Total Job Time') }}: <strong data-bind="text: estimatedPrintTimeString"></strong><br>
|
||||
<div class="progress" data-bind="visible: isPrinting()">
|
||||
<div class="bar" id="job_progressBar" data-bind="style: { width: progressString() + '%' }">{{ _('Processed') }} : <strong data-bind="text: byteString"></strong></div>
|
||||
</div>
|
||||
<!-- {{ _('Print Time') }}: <strong data-bind="text: printTimeString"></strong><br>
|
||||
{{ _('Print Time Left') }}: <strong data-bind="text: printTimeLeftString"></strong><br>-->
|
||||
|
||||
|
||||
<div class="row-fluid print-control" style="display: none;" data-bind="visible: loginState.isUser">
|
||||
<button class="btn btn-danger span4" data-bind="click: conversion.show_conversion_dialog, enable: isOperational() && isReady() && !isPrinting() && loginState.isUser() && !workingArea.working_area_empty(), attr: {title: titlePrintButton}" id="job_print">
|
||||
<i class="icon-white" data-bind="css: {'icon-fire': !isPaused(), 'icon-undo': isPaused(), 'wobble': isPrinting()}"></i> <span data-bind="text: (isPaused() ? '{{ _('Restart') }}' : '{{ _('Laser') }}')">{{ _('Laser') }}</span>
|
||||
</button>
|
||||
<button class="btn span4" id="job_pause" data-bind="click: pause, enable: isOperational() && (isPrinting() || isPaused()) && loginState.isUser(), css: {active: isPaused()}, attr: {title: titlePauseButton}"><i data-bind="css: {'icon-pause': !isPaused(), 'icon-play': isPaused()}"></i> <span data-bind="visible: !isPaused()">{{ _('Pause') }}</span><span data-bind="visible: isPaused()">{{ _('Resume') }}</span></button>
|
||||
<button class="btn span4" id="job_cancel" data-bind="click: cancel, enable: isOperational() && (isPrinting() || isPaused()) && loginState.isUser()" title="{{ _('Cancels the job') }}"><i class="icon-stop"></i> {{ _('Cancel') }}</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div data-bind="visible: loginState.isUser" id="connection_accordion"></div>
|
||||
|
||||
|
||||
|
||||
<div class="accordion-group" id="working_area_files">
|
||||
<div class="" data-bind="visible: !working_area_empty()">
|
||||
<div class="accordion-heading">
|
||||
<a class="accordion-toggle" data-toggle="collapse" href="#wa_filelist"><i class="icon-list"></i> {{ _('Files') }}</a>
|
||||
<a class="pull-right btn btn-small" data-bind="click: clear" style="margin-right: 1em; margin-top: 4px;" ><i class="icon-remove-sign"></i> {{ _('Clear') }}</a>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="accordion-body collapse in overflow_visible" id="wa_filelist">
|
||||
<div class="accordion-inner">
|
||||
<div class="gcode_files" data-bind="slimScrolledForeach: placedDesigns">
|
||||
<div class="entry" data-bind="attr: { id: $data.id }, template: { name: $root.templateFor($data), data: $data }"></div>
|
||||
</div>
|
||||
|
||||
<script type="text/html" id="wa_template_machinecode">
|
||||
<div class="file_list_entry">
|
||||
<div class="title muted" data-bind="text: name" style="color:#ADADAD;"></div>
|
||||
<div class="btn-group action-buttons pull-right">
|
||||
<div class="btn btn-mini" data-bind="click: function(){ $root.removeGcode($data); }"><i class="icon-remove" title="{{ _('Remove') }}"></i></div>
|
||||
</div>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
<script type="text/html" id="wa_template_model_svg">
|
||||
<div class="file_list_entry">
|
||||
<div class="title muted pull-left" data-bind="text: name"></div>
|
||||
<div class="btn-group action-buttons pull-right">
|
||||
<div class="btn btn-mini" data-bind="click: function() { $root.toggleTransformHandles($data); }"><i class="icon-move" title="{{ _('Transform') }}"></i></div>
|
||||
<div class="btn btn-mini" data-bind="click: function() { $root.removeSVG($data); }"><i class="icon-remove" title="{{ _('Remove') }}"></i></div>
|
||||
</div>
|
||||
<div class="detail_information" >
|
||||
<div class="local_transformation muted">
|
||||
<i class="icon-move" title="{{ _('translation') }}"></i>
|
||||
<span class="translation" >0,0</span>
|
||||
<i class="icon-resize-full" title="{{ _('scale') }}"></i>
|
||||
<span class="scale" >100%</span>
|
||||
<i class="icon-repeat" title="{{ _('rotation') }}"></i>
|
||||
<span class="rotation" >0°</span>
|
||||
|
||||
</div>
|
||||
<div class="misfit_warning" >
|
||||
<i class="icon-exclamation-sign" style="color:red;" title="{{ _('exceeds working area') }}"> Design exceeds the working area.</i>
|
||||
<a href="#" data-bind="click: function(){ $root.fitSVG($data) } ">Make it fit</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<!-- end sidebar -->
|
||||
|
||||
<div class="span8">
|
||||
<svg id="area_preview" class="workingarea"
|
||||
data-bind="style: {
|
||||
backgroundPosition: crosshairX()+'px'+' '+crosshairY()+'px',
|
||||
width: workingAreaWidthPx()+'px',
|
||||
height: workingAreaHeightPx()+'px'
|
||||
}
|
||||
">
|
||||
<g id="scaleGroup" data-bind="attr: { transform: scaleMatrix() }">
|
||||
<rect data-bind="click: move_laser"
|
||||
id="coordGrid" x="0" y="0" width="0" height="0"
|
||||
stroke="none" fill="none"></rect>
|
||||
<text
|
||||
xml:space="preserve"
|
||||
data-bind="visible: working_area_empty"
|
||||
style="font-size:64px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#DDDDDD;fill-opacity:1;stroke:none;font-family:DIN-BoldAlternate;-inkscape-font-specification:DIN-BoldAlternate Bold"
|
||||
x="396.81018"
|
||||
y="552.36218"
|
||||
id="add_designs_hint"
|
||||
>
|
||||
<tspan
|
||||
id="tspan2987" x="368.571426" y="532.36218"
|
||||
style="text-anchor:middle;text-align:center">add designs via </tspan>
|
||||
<tspan
|
||||
x="500" y="592.36218" id="tspan2989"
|
||||
style="text-anchor:middle;text-align:center">the design library </tspan>
|
||||
<tspan
|
||||
x="568.571426" y="652.36218" id="tspan2993"
|
||||
style="text-anchor:middle;text-align:center">or drag 'n' drop </tspan>
|
||||
<tspan
|
||||
x="368.571426" y="712.36218" id="tspan2991"
|
||||
style="text-anchor:middle;text-align:center" /></text>
|
||||
<g id="userContent" data-bind="visible: !state.isPrinting() && !state.isPaused()"></g>
|
||||
<g id="placedGcodes" data-bind="visible: !state.isPrinting() && !state.isPaused(), attr: { transform: scaleMatrixMMtoDisplay() }"></g>
|
||||
<g id="gCodePreview" data-bind="visible: state.isPrinting() || state.isPaused(), attr: { transform: scaleMatrixMMtoDisplay() }"></g>
|
||||
</g>
|
||||
</svg>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="tab-pane" id="term">
|
||||
|
||||
<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>
|
||||
<div data-bind="foreach: filters">
|
||||
<label class="checkbox">
|
||||
<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 ">
|
||||
|
||||
<pre id="terminal-output" class="pre-scrollable"></pre>
|
||||
<div class="input-append" style="display: none;" data-bind="visible: loginState.isUser">
|
||||
<input type="text" id="terminal-command" style="width:88%;" data-bind="value: command, event: { keyup: function(d,e) { return handleKeyUp(e); }, keydown: function(d,e) { return handleKeyDown(e); } }, enable: (isOperational() || isLocked()) && loginState.isUser()">
|
||||
<button class="btn" type="button" id="terminal-send" data-bind="click: sendCommandWithSafetyPopup, enable: (isOperational() || isLocked()) && loginState.isUser()">{{ _('Send') }}</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="tab-pane" id="designlib">
|
||||
<div class="container-fluid">
|
||||
<div class="row-fluid" id="files_accordion">
|
||||
<div class="span4">
|
||||
<ol>
|
||||
<li>Add designs to your working area with the <i class="icon-ok"></i>-button</li>
|
||||
<li>Afterwards switch back to the working area</li>
|
||||
|
||||
</ol>
|
||||
<div class="">
|
||||
<div class="accordion-heading">
|
||||
<span class="accordion-toggle" ><i class="icon-list"></i> {{ _('Files') }}</span>
|
||||
<!--<a class="accordion-toggle" data-toggle="collapse" href="#files_search" style="text-decoration: none;"><i class="icon-search dropdown-toggle"></i><span class="caret" style="margin: .5em;"></span></a>-->
|
||||
|
||||
</div>
|
||||
|
||||
<div id="files_search" class="">
|
||||
<form class="form-search">
|
||||
<input type="text" style="width:90%;" class="input-block search-query" data-bind="value: searchQuery, valueUpdate: 'input'" placeholder="{{ _('Search...') }}">
|
||||
</form>
|
||||
</div>
|
||||
<ul class="file_list_filter">
|
||||
<li><a href="#" data-bind="click: function() { $root.listHelper.changeSorting('name'); }"><i class="icon-ok" data-bind="style: {visibility: listHelper.currentSorting() == 'name' ? 'visible' : 'hidden'}"></i> {{ _('Sort by name') }} ({{ _('ascending') }})</a></li>
|
||||
<li><a href="#" data-bind="click: function() { $root.listHelper.changeSorting('upload'); }"><i class="icon-ok" data-bind="style: {visibility: listHelper.currentSorting() == 'upload' ? 'visible' : 'hidden'}"></i> {{ _('Sort by upload date') }} ({{ _('descending') }})</a></li>
|
||||
<li><a href="#" data-bind="click: function() { $root.listHelper.changeSorting('size'); }"><i class="icon-ok" data-bind="style: {visibility: listHelper.currentSorting() == 'size' ? 'visible' : 'hidden'}"></i> {{ _('Sort by file size') }} ({{ _('descending') }})</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="#" data-bind="click: function() { $root.listHelper.toggleFilter('machinecode'); }"><i class="icon-ok" data-bind="style: {visibility: _.contains(listHelper.currentFilters(), 'machinecode') ? 'visible' : 'hidden'}"></i> {{ _('Only show GCode files') }}</a></li>
|
||||
<li><a href="#" data-bind="click: function() { $root.listHelper.toggleFilter('model'); }"><i class="icon-ok" data-bind="style: {visibility: _.contains(listHelper.currentFilters(), 'model') ? 'visible' : 'hidden'}"></i> {{ _('Only show design files') }}</a></li>
|
||||
<li class="divider"></li>
|
||||
</ul>
|
||||
<div class="muted text-right">
|
||||
<small>{{ _('Free') }}: <span data-bind="text: freeSpaceString"></span></small>
|
||||
</div>
|
||||
<div style="display: none;" data-bind="visible: loginState.isUser">
|
||||
<div class="row-fluid upload-buttons">
|
||||
|
||||
<span class="btn btn-primary fileinput-button span12" data-bind="css: {disabled: !$root.loginState.isUser()}" style="margin-bottom: 10px">
|
||||
<i class="icon-upload-alt icon-white"></i>
|
||||
<span>{{ _('Upload') }}</span>
|
||||
<input id="gcode_upload" type="file" name="file" class="fileinput-button" data-bind="enable: loginState.isUser()">
|
||||
</span>
|
||||
</div>
|
||||
<div id="gcode_upload_progress" class="progress" style="width: 100%;">
|
||||
<div class="bar" style="width: 0%"></div>
|
||||
</div>
|
||||
<div>
|
||||
<small>{{ _('Hint: You can also drag and drop files on this page to upload them.') }}</small>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="span8">
|
||||
<div class="designlib" >
|
||||
<div class="" >
|
||||
|
||||
<div id="files">
|
||||
<div class="accordion-inner">
|
||||
|
||||
<div class="gcode_files" data-bind="slimScrolledForeach: listHelper.paginatedItems" >
|
||||
<div class="entry" data-bind="attr: { id: $root.getEntryId($data) }, template: { name: $root.templateFor($data), data: $data }"></div>
|
||||
</div>
|
||||
|
||||
<script type="text/html" id="files_template_machinecode">
|
||||
<div class="file_list_entry">
|
||||
<i class="icon-cog file_list_icon file_list_entry_gcode"></i>
|
||||
<div class="title muted dropdown" >
|
||||
<a type="button" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
|
||||
<span data-bind="css: $root.getSuccessClass($data), style: { 'font-weight': $root.listHelper.isSelected($data) ? 'bold' : 'normal' }, text: name"></span>
|
||||
<span class="caret"></span>
|
||||
</a>
|
||||
<ul class="dropdown-menu" role="menu">
|
||||
<li><a class="" data-bind="attr: {href: $root.downloadLink($data), css: {disabled: !$root.downloadLink($data)}}"><i class="icon-download-alt" title="{{ _('Download') }}"></i> {{ _('Download') }}</a></li>
|
||||
<li><a class="" data-bind="click: function() { if ($root.enableRemove($data)) { $root.removeFile($data); } else { return; } }, css: {disabled: !$root.enableRemove($data)}"><i class="icon-trash" title="{{ _('Remove') }}"></i> {{ _('Remove') }}</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="uploaded">{{ _('Created') }}: <span data-bind="text: formatTimeAgo(date)"></span></div>
|
||||
<div class="size">{{ _('Size') }}: <span data-bind="text: formatSize(size)"></span></div>
|
||||
<div class="additionalInfo hide" data-bind="html: $root.getAdditionalData($data)"></div>
|
||||
<div class="btn-group action-buttons">
|
||||
<!-- <a class="btn btn-mini" data-bind="attr: {href: $root.downloadLink($data), css: {disabled: !$root.downloadLink($data)}}"><i class="icon-download-alt" title="{{ _('Download') }}"></i></a>
|
||||
<a class="btn btn-mini" data-bind="click: function() { if ($root.enableRemove($data)) { $root.removeFile($data); } else { return; } }, css: {disabled: !$root.enableRemove($data)}"><i class="icon-trash" title="{{ _('Remove') }}"></i></a>-->
|
||||
<div class="btn" data-bind="click: function() { if(!$root.workingArea.isPlaced($data)){ $root.workingArea.placeGcode($data); } }, css: {disabled: $root.workingArea.isPlaced($data)}"><i class="icon-ok" title="{{ _('Use') }}">Add</i></div>
|
||||
</div>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
<script type="text/html" id="files_template_model_svg">
|
||||
<div class="file_list_entry">
|
||||
<i class="icon-picture file_list_icon"></i>
|
||||
<div class="title muted dropdown" >
|
||||
<a type="button" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
|
||||
<span data-bind="text: name"></span>
|
||||
<span class="caret"></span>
|
||||
</a>
|
||||
<ul class="dropdown-menu" role="menu">
|
||||
<li>
|
||||
<a class="" data-bind="attr: {href: $root.downloadLink($data), css: {disabled: !$root.downloadLink($data)}}"><i class="icon-download-alt" title="{{ _('Download') }}"></i> {{ _('Download') }}</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="" data-bind="click: function() { if ($root.enableRemove($data)) { $root.removeFile($data); } else { return; } }, css: {disabled: !$root.enableRemove($data)}"><i class="icon-trash" title="{{ _('Remove') }}"></i> {{ _('Remove') }}</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="uploaded">{{ _('Uploaded') }}: <span data-bind="text: formatTimeAgo(date)"></span></div>
|
||||
<div class="size">{{ _('Size') }}: <span data-bind="text: formatSize(size)"></span></div>
|
||||
<div class="btn-group action-buttons">
|
||||
<!-- <a class="btn btn-mini" data-bind="attr: {href: $root.downloadLink($data), css: {disabled: !$root.downloadLink($data)}}"><i class="icon-download-alt" title="{{ _('Download') }}"></i></a>
|
||||
<div class="btn btn-mini" data-bind="click: function() { if ($root.enableRemove($data)) { $root.removeFile($data); } else { return; } }, css: {disabled: !$root.enableRemove($data)}"><i class="icon-trash" title="{{ _('Remove') }}"></i></div>-->
|
||||
<div class="btn" data-bind="click: function() { if(!$root.workingArea.isPlaced($data)){ $root.workingArea.placeSVG($data); } }, css: {disabled: $root.workingArea.isPlaced($data)}"><i class="icon-ok" title="{{ _('Use') }}">Add</i></div>
|
||||
</div>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
<script type="text/html" id="files_template_folder">
|
||||
<div class="title" data-bind="text: name"></div>
|
||||
</script>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="tab-pane" id="focus">
|
||||
<div class="container-fluid">
|
||||
<div class="row-fluid">
|
||||
<div class="span4">
|
||||
<ul class="focus_steps">
|
||||
<li>1. Place your material on the working area</li>
|
||||
<li>2. Move the laser over the material</li>
|
||||
<li>3. Put on your safety glasses</li>
|
||||
<li>4. Turn the laser safety switch to on</li>
|
||||
<li>→ Now enable the focus mode</li>
|
||||
<li>5. Adjust the focus until the laser beam is as small as possible</li>
|
||||
<li>→ Disable the focus mode. </li>
|
||||
</ul>
|
||||
<div style="text-align:center">
|
||||
<div class="btn-group" role="group" aria-label="focus mode control" style="">
|
||||
<button id="btn_focus_on" class="btn btn-danger" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: focus_on ">{{ _('Enable Focus') }}</button>
|
||||
<button id="btn_focus_off" class="btn btn-default" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: focus_off ">{{ _('Disable Focus') }}</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div style="text-align:center" data-bind="visible: showZAxis">
|
||||
<div class="jog-panel" id="control_zaxis_focus">
|
||||
|
||||
Z-Axis
|
||||
<div class="btn-group-vertical" role="group" aria-label="z-axis control">
|
||||
<button class="btn box" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendJogCommand('z',1) }"><i class="icon-arrow-up"></i></button>
|
||||
<button class="btn box" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendJogCommand('z',-1) }"><i class="icon-arrow-down"></i></button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="span8">
|
||||
<div class="focus" id="focus_description">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="tab-pane" id="gcode">
|
||||
<div class="container-fluid">
|
||||
<div class="row-fluid">
|
||||
{% include 'tabs/gcodeviewer.jinja2' %}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="tab-pane" id="settings">
|
||||
<div class="container-fluid">
|
||||
<div class="row-fluid">
|
||||
|
||||
<div class="settings" >
|
||||
{% include 'dialogs/settings.jinja2' %}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
<!------->
|
||||
|
||||
<!------>
|
||||
|
||||
<footer class="footer">
|
||||
<ul class="pull-left muted">
|
||||
<li><small>{{ _('Version') }}: <span class="version">{{ display_version }}</span></small></li>
|
||||
</ul>
|
||||
<ul class="pull-right">
|
||||
<li><a href="http://www.mr-beam.org" target="_blank"><i class="icon-home"></i> {{ _('Homepage') }}</a></li>
|
||||
<li><a href="https://github.com/mrbeam/OctoPrint/" target="_blank"><i class="icon-download"></i> {{ _('Sourcecode') }}</a></li>
|
||||
<li><a href="https://wiki.mr-beam.org" target="_blank"><i class="icon-book"></i> {{ _('Documentation') }}</a></li>
|
||||
<li><a href="https://github.com/mrbeam/OctoPrint/issues" target="_blank"><i class="icon-flag"></i> {{ _('Bugs and Requests') }}</a></li>
|
||||
</ul>
|
||||
</footer>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<!-- Plugin template files -->
|
||||
{% if templatePlugins %}
|
||||
{% for plugin_name in templatePlugins %}
|
||||
{% include plugin_name+".jinja2" ignore missing %}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
<!-- End plugin template files -->
|
||||
|
||||
|
||||
<!-- Dialogs -->
|
||||
{% include 'dialogs/confirmation.jinja2' %}
|
||||
{% include 'dialogs/firstrun.jinja2' %}
|
||||
{#% include 'dialogs/settings.jinja2' %#}
|
||||
{% include 'dialogs/slicing.jinja2' %}
|
||||
<!-- End of dialogs -->
|
||||
|
||||
<!-- Overlays -->
|
||||
{% include 'overlays/dragndrop.jinja2' %}
|
||||
{% include 'overlays/offline.jinja2' %}
|
||||
<!-- End of overlays -->
|
||||
|
||||
<!-- Generic plugin template files -->
|
||||
{% for data in genericEntries %}
|
||||
{% include data.template ignore missing %}
|
||||
{% endfor %}
|
||||
<!-- End of generic plugin template files -->
|
||||
|
||||
{% include 'javascripts.jinja2' %}
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -875,394 +875,6 @@ class Printer(PrinterInterface, comm.MachineComPrintCallback):
|
|||
self._stateMonitor.setWorkPosition(WPosString)
|
||||
self._stateMonitor.setMachinePosition(MPosString)
|
||||
|
||||
|
||||
|
||||
#<<<<<<< HEAD
|
||||
|
||||
|
||||
#
|
||||
#
|
||||
# def home(self, axes):
|
||||
# if(settings().getBoolean(["feature", "grbl"])):
|
||||
# self.commands(["$H", "G92X0Y0Z0", "G90", "G21"])
|
||||
# else:
|
||||
# self.commands(["G91", "G28 %s" % " ".join(map(lambda x: "%s0" % x.upper(), axes)), "G90"])
|
||||
#
|
||||
# def extrude(self, amount):
|
||||
# printer_profile = self._printerProfileManager.get_current_or_default()
|
||||
# extrusion_speed = printer_profile["axes"]["e"]["speed"]
|
||||
# self.commands(["G91", "G1 E%s F%d" % (amount, extrusion_speed), "G90"])
|
||||
#
|
||||
# def changeTool(self, tool):
|
||||
# try:
|
||||
# toolNum = int(tool[len("tool"):])
|
||||
# self.command("T%d" % toolNum)
|
||||
# except ValueError:
|
||||
# pass
|
||||
#
|
||||
# def setTemperature(self, type, value):
|
||||
# if type.startswith("tool"):
|
||||
# printer_profile = self._printerProfileManager.get_current_or_default()
|
||||
# extruder_count = printer_profile["extruder"]["count"]
|
||||
# if extruder_count > 1:
|
||||
# try:
|
||||
# toolNum = int(type[len("tool"):])
|
||||
# self.command("M104 T%d S%f" % (toolNum, value))
|
||||
# except ValueError:
|
||||
# pass
|
||||
# else:
|
||||
# self.command("M104 S%f" % value)
|
||||
# elif type == "bed":
|
||||
# self.command("M140 S%f" % value)
|
||||
#
|
||||
# def setTemperatureOffset(self, offsets={}):
|
||||
# if self._comm is None:
|
||||
# return
|
||||
#
|
||||
# tool, bed = self._comm.getOffsets()
|
||||
#
|
||||
# validatedOffsets = {}
|
||||
#
|
||||
# for key in offsets:
|
||||
# value = offsets[key]
|
||||
# if key == "bed":
|
||||
# bed = value
|
||||
# validatedOffsets[key] = value
|
||||
# elif key.startswith("tool"):
|
||||
# try:
|
||||
# toolNum = int(key[len("tool"):])
|
||||
# tool[toolNum] = value
|
||||
# validatedOffsets[key] = value
|
||||
# except ValueError:
|
||||
# pass
|
||||
#
|
||||
# self._comm.setTemperatureOffset(tool, bed)
|
||||
# self._stateMonitor.setTempOffsets(validatedOffsets)
|
||||
#
|
||||
# def selectFile(self, filename, sd, printAfterSelect=False):
|
||||
# if self._comm is None or (self._comm.isBusy() or self._comm.isStreaming()):
|
||||
# self._logger.info("Cannot load file: printer not connected or currently busy")
|
||||
# return
|
||||
#
|
||||
# self._printAfterSelect = printAfterSelect
|
||||
# self._comm.selectFile(filename, sd)
|
||||
# self._setProgressData(0, None, None, None)
|
||||
# self._setCurrentZ(None)
|
||||
#
|
||||
# def unselectFile(self):
|
||||
# if self._comm is not None and (self._comm.isBusy() or self._comm.isStreaming()):
|
||||
# return
|
||||
#
|
||||
# self._comm.unselectFile()
|
||||
# self._setProgressData(0, None, None, None)
|
||||
# self._setCurrentZ(None)
|
||||
#
|
||||
# def startPrint(self):
|
||||
# """
|
||||
# Starts the currently loaded print job.
|
||||
# Only starts if the printer is connected and operational, not currently printing and a printjob is loaded
|
||||
# """
|
||||
# if self._comm is None or not self._comm.isOperational() or self._comm.isPrinting():
|
||||
# return
|
||||
# if self._selectedFile is None:
|
||||
# return
|
||||
#
|
||||
# self._timeEstimationData = TimeEstimationHelper()
|
||||
# self._lastProgressReport = None
|
||||
# self._setCurrentZ(None)
|
||||
# self._comm.startPrint()
|
||||
# self._addPositionData(None, None)
|
||||
#
|
||||
|
||||
#
|
||||
# def togglePausePrint(self):
|
||||
# """
|
||||
# Pause the current printjob.
|
||||
# """
|
||||
# if self._comm is None:
|
||||
# return
|
||||
#
|
||||
# self._comm.setPause(not self._comm.isPaused())
|
||||
#
|
||||
# def cancelPrint(self, disableMotorsAndHeater=True):
|
||||
# """
|
||||
# Cancel the current printjob.
|
||||
# """
|
||||
# if self._comm is None:
|
||||
# return
|
||||
#
|
||||
# self._comm.cancelPrint()
|
||||
#
|
||||
# if disableMotorsAndHeater:
|
||||
# printer_profile = self._printerProfileManager.get_current_or_default()
|
||||
# extruder_count = printer_profile["extruder"]["count"]
|
||||
#
|
||||
# # disable motors, switch off hotends, bed and fan
|
||||
# #commands = ["M84"]
|
||||
# #commands.extend(map(lambda x: "M104 T%d S0" % x, range(extruder_count)))
|
||||
# #commands.extend(["M140 S0", "M106 S0"])
|
||||
# commands = ["M05", "G0X0Y0", "M09"]
|
||||
# self.commands(commands)
|
||||
#
|
||||
# # reset progress, height, print time
|
||||
# self._setCurrentZ(None)
|
||||
# self._setProgressData(None, None, None, None)
|
||||
#
|
||||
# # mark print as failure
|
||||
# if self._selectedFile is not None:
|
||||
# self._fileManager.log_print(FileDestinations.SDCARD if self._selectedFile["sd"] else FileDestinations.LOCAL, self._selectedFile["filename"], time.time(), self._comm.getPrintTime(), False, self._printerProfileManager.get_current_or_default()["id"])
|
||||
# payload = {
|
||||
# "file": self._selectedFile["filename"],
|
||||
# "origin": FileDestinations.LOCAL
|
||||
# }
|
||||
# if self._selectedFile["sd"]:
|
||||
# payload["origin"] = FileDestinations.SDCARD
|
||||
# eventManager().fire(Events.PRINT_FAILED, payload)
|
||||
#
|
||||
# #~~ state monitoring
|
||||
#
|
||||
# def _setCurrentZ(self, currentZ):
|
||||
# self._currentZ = currentZ
|
||||
# self._stateMonitor.setCurrentZ(self._currentZ)
|
||||
#
|
||||
# def _setState(self, state):
|
||||
# self._state = state
|
||||
# self._stateMonitor.setState({"text": self.getStateString(), "flags": self._getStateFlags()})
|
||||
#
|
||||
# def _addLog(self, log):
|
||||
# self._log.append(log)
|
||||
# self._stateMonitor.addLog(log)
|
||||
#
|
||||
# def _addMessage(self, message):
|
||||
# self._messages.append(message)
|
||||
# self._stateMonitor.addMessage(message)
|
||||
#
|
||||
# def _estimateTotalPrintTime(self, progress, printTime):
|
||||
# if not progress or not printTime or not self._timeEstimationData:
|
||||
# #self._estimationLogger.info("{progress};{printTime};;;;".format(**locals()))
|
||||
# return None
|
||||
#
|
||||
# else:
|
||||
# newEstimate = printTime / progress
|
||||
# self._timeEstimationData.update(newEstimate)
|
||||
#
|
||||
# result = None
|
||||
# if self._timeEstimationData.is_stable():
|
||||
# result = self._timeEstimationData.average_total_rolling
|
||||
#
|
||||
# #averageTotal = self._timeEstimationData.average_total
|
||||
# #averageTotalRolling = self._timeEstimationData.average_total_rolling
|
||||
# #averageDistance = self._timeEstimationData.average_distance
|
||||
#
|
||||
# #self._estimationLogger.info("{progress};{printTime};{newEstimate};{averageTotal};{averageTotalRolling};{averageDistance}".format(**locals()))
|
||||
#
|
||||
# return result
|
||||
#
|
||||
# def _setProgressData(self, progress, filepos, printTime, cleanedPrintTime):
|
||||
# estimatedTotalPrintTime = self._estimateTotalPrintTime(progress, cleanedPrintTime)
|
||||
# statisticalTotalPrintTime = None
|
||||
# totalPrintTime = estimatedTotalPrintTime
|
||||
#
|
||||
# if self._selectedFile and "estimatedPrintTime" in self._selectedFile and self._selectedFile["estimatedPrintTime"]:
|
||||
# statisticalTotalPrintTime = self._selectedFile["estimatedPrintTime"]
|
||||
# if progress and cleanedPrintTime:
|
||||
# if estimatedTotalPrintTime is None:
|
||||
# totalPrintTime = statisticalTotalPrintTime
|
||||
# else:
|
||||
# if progress < 0.5:
|
||||
# sub_progress = progress * 2
|
||||
# else:
|
||||
# sub_progress = 1.0
|
||||
# totalPrintTime = (1 - sub_progress) * statisticalTotalPrintTime + sub_progress * estimatedTotalPrintTime
|
||||
#
|
||||
# #self._printTimeLogger.info("{progress};{cleanedPrintTime};{estimatedTotalPrintTime};{statisticalTotalPrintTime};{totalPrintTime}".format(**locals()))
|
||||
#
|
||||
# self._progress = progress
|
||||
# self._printTime = printTime
|
||||
# self._printTimeLeft = totalPrintTime - cleanedPrintTime if (totalPrintTime is not None and cleanedPrintTime is not None) else None
|
||||
#
|
||||
# self._stateMonitor.setProgress({
|
||||
# "completion": self._progress * 100 if self._progress is not None else None,
|
||||
# "filepos": filepos,
|
||||
# "printTime": int(self._printTime) if self._printTime is not None else None,
|
||||
# "printTimeLeft": int(self._printTimeLeft) if self._printTimeLeft is not None else None
|
||||
# })
|
||||
#
|
||||
# if progress:
|
||||
# progress_int = int(progress * 100)
|
||||
# if self._lastProgressReport != progress_int:
|
||||
# self._lastProgressReport = progress_int
|
||||
# self._reportPrintProgressToPlugins(progress_int)
|
||||
#
|
||||
#
|
||||
# def _addTemperatureData(self, temp, bedTemp):
|
||||
# currentTimeUtc = int(time.time())
|
||||
#
|
||||
# data = {
|
||||
# "time": currentTimeUtc
|
||||
# }
|
||||
# for tool in temp.keys():
|
||||
# data["tool%d" % tool] = {
|
||||
# "actual": temp[tool][0],
|
||||
# "target": temp[tool][1]
|
||||
# }
|
||||
# if bedTemp is not None and isinstance(bedTemp, tuple):
|
||||
# data["bed"] = {
|
||||
# "actual": bedTemp[0],
|
||||
# "target": bedTemp[1]
|
||||
# }
|
||||
#
|
||||
# self._temps.append(data)
|
||||
#
|
||||
# self._temp = temp
|
||||
# self._bedTemp = bedTemp
|
||||
#
|
||||
# self._stateMonitor.addTemperature(data)
|
||||
#
|
||||
# def _setJobData(self, filename, filesize, sd):
|
||||
# if filename is not None:
|
||||
# self._selectedFile = {
|
||||
# "filename": filename,
|
||||
# "filesize": filesize,
|
||||
# "sd": sd,
|
||||
# "estimatedPrintTime": None
|
||||
# }
|
||||
# else:
|
||||
# self._selectedFile = None
|
||||
# self._stateMonitor.setJobData({
|
||||
# "file": {
|
||||
# "name": None,
|
||||
# "origin": None,
|
||||
# "size": None,
|
||||
# "date": None
|
||||
# },
|
||||
# "estimatedPrintTime": None,
|
||||
# "averagePrintTime": None,
|
||||
# "lastPrintTime": None,
|
||||
# "filament": None,
|
||||
# })
|
||||
# return
|
||||
#
|
||||
# estimatedPrintTime = None
|
||||
# lastPrintTime = None
|
||||
# averagePrintTime = None
|
||||
# date = None
|
||||
# filament = None
|
||||
# if filename:
|
||||
# # Use a string for mtime because it could be float and the
|
||||
# # javascript needs to exact match
|
||||
# if not sd:
|
||||
# date = int(os.stat(filename).st_ctime)
|
||||
#
|
||||
# try:
|
||||
# fileData = self._fileManager.get_metadata(FileDestinations.SDCARD if sd else FileDestinations.LOCAL, filename)
|
||||
# except:
|
||||
# fileData = None
|
||||
# if fileData is not None:
|
||||
# if "analysis" in fileData:
|
||||
# if estimatedPrintTime is None and "estimatedPrintTime" in fileData["analysis"]:
|
||||
# estimatedPrintTime = fileData["analysis"]["estimatedPrintTime"]
|
||||
# if "filament" in fileData["analysis"].keys():
|
||||
# filament = fileData["analysis"]["filament"]
|
||||
# if "statistics" in fileData:
|
||||
# printer_profile = self._printerProfileManager.get_current_or_default()["id"]
|
||||
# if "averagePrintTime" in fileData["statistics"] and printer_profile in fileData["statistics"]["averagePrintTime"]:
|
||||
# averagePrintTime = fileData["statistics"]["averagePrintTime"][printer_profile]
|
||||
# if "lastPrintTime" in fileData["statistics"] and printer_profile in fileData["statistics"]["lastPrintTime"]:
|
||||
# lastPrintTime = fileData["statistics"]["lastPrintTime"][printer_profile]
|
||||
#
|
||||
# if averagePrintTime is not None:
|
||||
# self._selectedFile["estimatedPrintTime"] = averagePrintTime
|
||||
# elif estimatedPrintTime is not None:
|
||||
# # TODO apply factor which first needs to be tracked!
|
||||
# self._selectedFile["estimatedPrintTime"] = estimatedPrintTime
|
||||
#
|
||||
# self._stateMonitor.setJobData({
|
||||
# "file": {
|
||||
# "name": os.path.basename(filename) if filename is not None else None,
|
||||
# "origin": FileDestinations.SDCARD if sd else FileDestinations.LOCAL,
|
||||
# "size": filesize,
|
||||
# "date": date
|
||||
# },
|
||||
# "estimatedPrintTime": estimatedPrintTime,
|
||||
# "averagePrintTime": averagePrintTime,
|
||||
# "lastPrintTime": lastPrintTime,
|
||||
# "filament": filament,
|
||||
# })
|
||||
#
|
||||
# def _sendInitialStateUpdate(self, callback):
|
||||
# try:
|
||||
# data = self._stateMonitor.getCurrentData()
|
||||
# data.update({
|
||||
# "temps": list(self._temps),
|
||||
# "logs": list(self._log),
|
||||
# "messages": list(self._messages)
|
||||
# })
|
||||
# callback.sendHistoryData(data)
|
||||
# except Exception, err:
|
||||
# import sys
|
||||
# sys.stderr.write("ERROR: %s\n" % str(err))
|
||||
# pass
|
||||
#
|
||||
# def _getStateFlags(self):
|
||||
# return {
|
||||
# "operational": self.isOperational(),
|
||||
# "locked": self.isLocked(),
|
||||
# "printing": self.isPrinting(),
|
||||
# "closedOrError": self.isClosedOrError(),
|
||||
# "error": self.isError(),
|
||||
# "paused": self.isPaused(),
|
||||
# "ready": self.isReady(),
|
||||
# "sdReady": self.isSdReady()
|
||||
# }
|
||||
#
|
||||
# #~~ callbacks triggered from self._comm
|
||||
#
|
||||
# def mcLog(self, message):
|
||||
# """
|
||||
# Callback method for the comm object, called upon log output.
|
||||
# #"""
|
||||
# self._addLog(message)
|
||||
#
|
||||
# def mcTempUpdate(self, temp, bedTemp):
|
||||
# self._addTemperatureData(temp, bedTemp)
|
||||
#
|
||||
|
||||
#
|
||||
# def mcStateChange(self, state):
|
||||
# """
|
||||
# Callback method for the comm object, called if the connection state changes.
|
||||
# #"""
|
||||
# oldState = self._state
|
||||
#
|
||||
# # forward relevant state changes to gcode manager
|
||||
# if self._comm is not None and oldState == self._comm.STATE_PRINTING:
|
||||
# if self._selectedFile is not None:
|
||||
# if state == self._comm.STATE_OPERATIONAL:
|
||||
# self._fileManager.log_print(FileDestinations.SDCARD if self._selectedFile["sd"] else FileDestinations.LOCAL, self._selectedFile["filename"], time.time(), self._comm.getPrintTime(), True, self._printerProfileManager.get_current_or_default()["id"])
|
||||
# elif state == self._comm.STATE_CLOSED or state == self._comm.STATE_ERROR or state == self._comm.STATE_CLOSED_WITH_ERROR:
|
||||
# self._fileManager.log_print(FileDestinations.SDCARD if self._selectedFile["sd"] else FileDestinations.LOCAL, self._selectedFile["filename"], time.time(), self._comm.getPrintTime(), False, self._printerProfileManager.get_current_or_default()["id"])
|
||||
# self._analysisQueue.resume() # printing done, put those cpu cycles to good use
|
||||
# elif self._comm is not None and state == self._comm.STATE_PRINTING:
|
||||
# self._analysisQueue.pause() # do not analyse files while printing
|
||||
#
|
||||
# self._setState(state)
|
||||
#
|
||||
# def mcMessage(self, message):
|
||||
# """
|
||||
# Callback method for the comm object, called upon message exchanges via serial.
|
||||
# Stores the message in the message buffer, truncates buffer to the last 300 lines.
|
||||
# #"""
|
||||
# self._addMessage(message)
|
||||
#
|
||||
# def mcProgress(self):
|
||||
# """
|
||||
# Callback method for the comm object, called upon any change in progress of the printjob.
|
||||
# Triggers storage of new values for printTime, printTimeLeft and the current progress.
|
||||
# #"""
|
||||
#
|
||||
# self._setProgressData(self._comm.getPrintProgress(), self._comm.getPrintFilepos(), self._comm.getPrintTime(), self._comm.getCleanedPrintTime())
|
||||
#=======
|
||||
|
||||
class StateMonitor(object):
|
||||
def __init__(self, interval=0.5, on_update=None, on_add_temperature=None, on_add_log=None, on_add_message=None):
|
||||
|
|
|
|||
|
|
@ -1,9 +1,6 @@
|
|||
//<<<<<<< HEAD
|
||||
//function TerminalViewModel(loginStateViewModel, settingsViewModel) {
|
||||
// var self = this;
|
||||
//
|
||||
// self.loginState = loginStateViewModel;
|
||||
// self.settings = settingsViewModel;
|
||||
|
||||
//
|
||||
// self.log = [];
|
||||
//
|
||||
|
|
@ -31,10 +28,7 @@
|
|||
// self.updateOutput();
|
||||
// });
|
||||
//
|
||||
// self.fromCurrentData = function(data) {
|
||||
// self._processStateData(data.state);
|
||||
// self._processCurrentLogData(data.logs);
|
||||
// };
|
||||
|
||||
//
|
||||
// self.fromHistoryData = function(data) {
|
||||
// self._processStateData(data.state);
|
||||
|
|
@ -54,16 +48,7 @@
|
|||
// self.updateOutput();
|
||||
// };
|
||||
//
|
||||
// self._processStateData = function(data) {
|
||||
// self.isErrorOrClosed(data.flags.closedOrError);
|
||||
// self.isOperational(data.flags.operational);
|
||||
// self.isLocked(data.flags.locked);
|
||||
// self.isPaused(data.flags.paused);
|
||||
// self.isPrinting(data.flags.printing);
|
||||
// self.isError(data.flags.error);
|
||||
// self.isReady(data.flags.ready);
|
||||
// self.isLoading(data.flags.loading);
|
||||
// };
|
||||
|
||||
//
|
||||
// self.updateFilterRegex = function() {
|
||||
// var filterRegexStr = self.activeFilters().join("|").trim();
|
||||
|
|
@ -93,21 +78,7 @@
|
|||
// };
|
||||
//
|
||||
|
||||
//
|
||||
// self.sendCommand = function() {
|
||||
// var command = self.command();
|
||||
// if (!command) {
|
||||
// return;
|
||||
// }
|
||||
//
|
||||
// //var re = /^([gmt][0-9]+)(\s.*)?/;
|
||||
// var re = /^([gmtfs][0-9]+|\$[cinhgx#$]|[?~!])(.*)?/; // grbl style
|
||||
// var commandMatch = command.match(re);
|
||||
// if (commandMatch != null) {
|
||||
// command = commandMatch[1].toUpperCase() + ((commandMatch[2] !== undefined) ? commandMatch[2].toUpperCase() : "");
|
||||
// }
|
||||
//
|
||||
// if (command) {
|
||||
|
||||
//=======
|
||||
$(function() {
|
||||
function TerminalViewModel(parameters) {
|
||||
|
|
@ -264,12 +235,14 @@ $(function() {
|
|||
return;
|
||||
}
|
||||
|
||||
var re = /^([gmt][0-9]+)(\s.*)?/;
|
||||
// var re = /^([gmt][0-9]+)(\s.*)?/;
|
||||
var re = /^([gmtfs][0-9]+|\$[cinhgx#$]|[?~!])(.*)?/; // grbl style
|
||||
var commandMatch = command.match(re);
|
||||
if (commandMatch != null) {
|
||||
command = commandMatch[1].toUpperCase() + ((commandMatch[2] !== undefined) ? commandMatch[2] : "");
|
||||
command = commandMatch[1].toUpperCase() + ((commandMatch[2] !== undefined) ? commandMatch[2].toUpperCase() : "");
|
||||
}
|
||||
|
||||
|
||||
if (command) {
|
||||
$.ajax({
|
||||
url: API_BASEURL + "printer/command",
|
||||
|
|
@ -323,19 +296,13 @@ $(function() {
|
|||
|
||||
self.handleKeyUp = function(event) {
|
||||
if (event.keyCode == 13) {
|
||||
self.sendCommand();
|
||||
self.sendCommandWithSafetyPopup();
|
||||
}
|
||||
|
||||
// do not prevent default action
|
||||
return true;
|
||||
};
|
||||
|
||||
//<<<<<<< HEAD
|
||||
// self.handleKeyUp = function(event) {
|
||||
// if (event.keyCode == 13) {
|
||||
// self.sendCommandWithSafetyPopup();
|
||||
// }
|
||||
//=======
|
||||
self.onAfterTabChange = function(current, previous) {
|
||||
if (current != "#term") {
|
||||
return;
|
||||
|
|
@ -344,7 +311,6 @@ $(function() {
|
|||
self.scrollToEnd();
|
||||
}
|
||||
};
|
||||
//>>>>>>> upstream/maintenance
|
||||
|
||||
self.sendCommandWithSafetyPopup = function () {
|
||||
var command = self.command().split(' ').join('');
|
||||
|
|
@ -352,7 +318,6 @@ $(function() {
|
|||
return;
|
||||
}
|
||||
|
||||
console.log(command);
|
||||
var parts = command.match(/^(M3|M03)(S[0-9.]+)?/i);
|
||||
if (parts !== null) {
|
||||
|
||||
|
|
|
|||
|
|
@ -399,8 +399,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="span8 ">
|
||||
|
||||
<pre id="terminal-output" class="pre-scrollable"></pre>
|
||||
<pre id="terminal-output" class="pre-scrollable" data-bind="foreach: displayedLines"><span data-bind="text: line, css: {muted: type == 'filtered'}"></span><br></pre>
|
||||
<div class="input-append" style="display: none;" data-bind="visible: loginState.isUser">
|
||||
<input type="text" id="terminal-command" style="width:88%;" data-bind="value: command, event: { keyup: function(d,e) { return handleKeyUp(e); }, keydown: function(d,e) { return handleKeyDown(e); } }, enable: (isOperational() || isLocked()) && loginState.isUser()">
|
||||
<button class="btn" type="button" id="terminal-send" data-bind="click: sendCommandWithSafetyPopup, enable: (isOperational() || isLocked()) && loginState.isUser()">{{ _('Send') }}</button>
|
||||
|
|
|
|||
|
|
@ -1098,7 +1098,6 @@ class MachineCom(object):
|
|||
self._log("Connection closed, closing down monitor")
|
||||
|
||||
def _openSerial(self):
|
||||
print('_openSerial')
|
||||
if self._port == 'AUTO':
|
||||
self._changeState(self.STATE_DETECT_SERIAL)
|
||||
programmer = stk500v2.Stk500v2()
|
||||
|
|
|
|||
Loading…
Reference in a new issue