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

flashing visualization fixed. uploaded up to date grbl version.

Browse source
This commit is contained in:
Teja 2015-09-04 11:14:41 +02:00
parent 1c018ec277
commit 010e2cfa92
5 changed files with 1787 additions and 1788 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3565
grbl.hex
View file

File diff suppressed because it is too large Load diff

2
src/octoprint/static/js/app/viewmodels/connection.js
View file

@ -36,7 +36,7 @@ $(function() {
self.isError = ko.observable(undefined);
self.isReady = ko.observable(undefined);
self.isLoading = ko.observable(undefined);
self.isFlashing = ko.observable(undefined);
self.isFlashing = ko.observable(false);
self.buttonText = ko.computed(function() {
if (self.isErrorOrClosed())

2
src/octoprint/static/js/app/viewmodels/control.js
View file

@ -23,7 +23,7 @@ $(function() {
self.isReady = ko.observable(undefined);
self.isLoading = ko.observable(undefined);
self.isLocked = ko.observable(undefined);
self.isFlashing = ko.observable(undefined);
self.isFlashing = ko.observable(false);
self.extrusionAmount = ko.observable(undefined);
self.controls = ko.observableArray([]);

4
src/octoprint/templates/mrbeam_index.jinja2
View file

@ -69,7 +69,7 @@
</div>
</div>
</div>
<div data-bind="visible: isFlashing ">
<div data-bind="visible: isFlashing() ">
Firmware update in progress
<div id="flashing_progress" class="progress progress-striped active" style="width: 100%;">
<div class="bar" style="width: 100%;"></div>
@ -128,7 +128,7 @@
</div>
<div class="accordion-body in" id="connection_wrapper"
data-bind="visible: !isFlashing && isErrorOrClosed() && loginState.isUser()">
data-bind="visible: !isFlashing() && isErrorOrClosed() && 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>

2
src/octoprint/util/grblVersionRequirement.yml
View file

@ -1 +1 @@
{dirty: true, git: b35ae73, grbl: 0.9g, lastConnect: null, minor: ''}
{dirty: true, git: 694fb26, grbl: 0.9g, lastConnect: null, minor: ''}