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

working version of flashing ui

Browse source
This commit is contained in:
make-ing 2015-09-02 11:04:38 +02:00
parent f4e0801853
commit 28bf9364f6
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,6 +23,7 @@ $(function() {
self.isReady = ko.observable(undefined);
self.isLoading = ko.observable(undefined);
self.isLocked = ko.observable(undefined);
self.isFlashing = ko.observable(undefined);
self.extrusionAmount = ko.observable(undefined);
self.controls = ko.observableArray([]);
@ -90,6 +91,7 @@ $(function() {
self.isReady(data.flags.ready);
self.isLoading(data.flags.loading);
self.isLocked(data.flags.locked);
self.isFlashing(data.flags.flashing);
};
self.onEventSettingsUpdated = function (payload) {

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

@ -73,7 +73,7 @@
Mr Beam is flashing the Arduino with a new firmware.
Please do NOT power off the System during flashing!
</div>
<div data-bind="visible: !isLocked() ">
<div data-bind="visible: !isLocked() && !isFlashing ">
{{ _('Position') }}: <strong data-bind="text: laserPos"></strong>
<a href="#control_btns" style="margin-top: -5px;"
class="btn btn-xs pull-right"
@ -139,7 +139,7 @@
</div>
</div>
<div class="accordion-body collapse in" id="state_wrapper" data-bind="visible: !isErrorOrClosed() && loginState.isUser()">
<div class="accordion-body collapse in" id="state_wrapper" data-bind="visible: !isErrorOrClosed() && loginState.isUser() && !isFlashing() ">
<div class="accordion-inner">
{{ _('Machine State') }}: <strong data-bind="text: stateString"></strong><br>