✨ Show 'Printer locked' message

Closes #50
cp2004 · Nov 13, 2021 · 73f400a · 73f400a
1 parent 9f9e8aa
commit 73f400a
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 2 deletions.
diff --git a/octoprint_eeprom_marlin/__init__.py b/octoprint_eeprom_marlin/__init__.py
@@ -207,6 +207,12 @@ def comm_protocol_gcode_received(self, comm, line, *args, **kwargs):
  self.collecting_eeprom = False
  self.collecting_stats = False
 
+ elif "printer locked" in line.lower():
+ self._logger.info("Printer locked, aborting data collection")
+ self.send_message("locked", {})
+ self.collecting_eeprom = False
+ self.collecting_stats = False
+
  if self.collecting_eeprom:
  parsed = self._parser.parse_eeprom_data(line)
  if parsed:

diff --git a/octoprint_eeprom_marlin/static/css/eeprom_marlin.css b/octoprint_eeprom_marlin/static/css/eeprom_marlin.css
diff --git a/octoprint_eeprom_marlin/static/css/eeprom_marlin.css.map b/octoprint_eeprom_marlin/static/css/eeprom_marlin.css.map
diff --git a/octoprint_eeprom_marlin/static/js/eeprom_marlin.js b/octoprint_eeprom_marlin/static/js/eeprom_marlin.js
@@ -204,6 +204,9 @@ $(function () {
  self.initialLoad = ko.observable(true);
  self.saving = ko.observable(false);
  self.unsaved = ko.observable(false);
+
+ self.printer_locked = ko.observable(false);
+
  self.enable_fields = ko.pureComputed(function () {
  return (
  !self.loading() &&
@@ -455,6 +458,11 @@ $(function () {
  self.info_from_json(data.data);
  self.stats_from_json(data.data.stats);
  self.loading(false);
+ self.printer_locked(false);
+ }
+ if (data.type === "locked") {
+ self.loading(false);
+ self.printer_locked(true);
  }
  };
 

diff --git a/octoprint_eeprom_marlin/static/scss/eeprom_marlin.scss b/octoprint_eeprom_marlin/static/scss/eeprom_marlin.scss
@@ -158,6 +158,12 @@ $touchUI_icon: "\f14b";
  .eeprom-checkbox {
  margin-top: -3px;
  }
+
+ .eeprom-locked {
+ p {
+ text-align: center;
+ }
+ }
 }
 
 #plugin_eeprom_marlin_backup_upload {

diff --git a/octoprint_eeprom_marlin/templates/alerts/printer_locked.jinja2 b/octoprint_eeprom_marlin/templates/alerts/printer_locked.jinja2
@@ -0,0 +1,13 @@
+<div class="alert alert-block eeprom-locked" data-bind="visible: printer_locked">
+ <p>
+ <i class="fas fa-2x fa-lock"></i>
+ </p>
+ <p>
+ <strong>
+ {{ _("Looks like the printer is locked") }}
+ </strong>
+ </p>
+ <p>
+ {{ _("Unlock the printer to use the EEPROM editor") }}
+ </p>
+</div>
diff --git a/octoprint_eeprom_marlin/templates/eeprom_marlin_tab.jinja2 b/octoprint_eeprom_marlin/templates/eeprom_marlin_tab.jinja2
@@ -33,6 +33,7 @@
 <div class="row-fluid eeprom-alerts">
  <div class="span12">
  {% include "alerts/printer.jinja2" %}
+ {% include "alerts/printer_locked.jinja2" %}
  </div>
 </div>
 <div id="eeprom_tab_data" class="collapse in" data-bind="visible: !initialLoad() && info.is_marlin() && info.name().length > 0">

diff --git a/octoprint_eeprom_marlin/templates/overlays/not_connected.jinja2 b/octoprint_eeprom_marlin/templates/overlays/not_connected.jinja2
@@ -12,6 +12,6 @@
  </strong>
  </p>
  <p>
- {{ ("Connect to the printer to edit it's configuration.") }}
+ {{ _("Connect to the printer to edit it's configuration.") }}
  </p>
 </div>