SW-4141 Component improvements

octoprint_mrbeam/static/js/app/view-models/settings/calibration/corner-calibration.js

@@ -380,6 +380,10 @@ $(function () {
                 });
             };
 
+            // home the device
+            self.workingArea.performHomingCycle("corner_calibration");
+
+            // generate markers
             self.calibration.simpleApiCommand(
                 "generate_calibration_markers_svg",
                 {},

octoprint_mrbeam/templates/calibration/user/view_corner_calibration.jinja2

@@ -22,10 +22,10 @@
         <li>{{ _('Focus the laser head on the material.') }}<br>
             <strong>{{ _('Note: ') }}</strong>{{ _('Even with the Height Extension installed, you must focus the laser head on the paper in the corners.') }}<br>
         <img class="focus_reminder" src="/plugin/mrbeam/static/img/focus_reminder.png"></li>
-        <li>{{ _('Home the laserhead.') }}<br>
-            <button class="btn btn-primary" data-bind="click: function() { workingArea.performHomingCycle('corner_calibration') }"><i class="icon-home"></i> {{ _('Homing Cycle') }}</button></li>
 
         <li>{{ _('Engrave the calibrations markers on your material by clicking on this button:') }}<br>
+        <strong>{{ _('Note: ') }}</strong> {{ _('Before the engraving of the calibration markers gets started, the laser head automatically moves to the home position.') }}<br>
+        {{ _('Please ensure that there is nothing in the working area except the material for the markers.') }}<br>
             <button class="btn btn-primary"
                     data-bind="click: engraveMarkers, enable: (!camera.state.isLocked() && !camera.state.isConnecting() && camera.state.isOperational())">
                 {{ _('Engrave Calibration Markers')  }}

octoprint_mrbeam/templates/ready_to_laser.jinja2

@@ -8,22 +8,22 @@
             <h3 data-bind='visible: cooling'>{{ _('Cooling') }}</h3>
         </div>
         <div class="modal-body" data-bind="visible: fan_not_connected">
-            <img src="/plugin/mrbeam/static/img/airfilter.jpg">
+            <img src="/plugin/mrbeam/static/img/air_filter/air_filter_not_connected.png">
             <h5>{{ _('Can not detect air filter system. Is it plugged in?') }}</h5>
         </div>
 
         <div class="modal-body" data-bind="visible: fan_not_on_external_power">
             <img src="/plugin/mrbeam/static/img/air_filter/af3-power-supply-missing.png">
-            <h5>{{ _("Air filter system doesn't see external power. Is it plugged in?") }}</h5>
+            <h5>{{ _("The Air Filter System can't recognise a power supply unit. Please make sure that it is plugged in.") }}</h5>
         </div>
 
         <div class="modal-body" data-bind="visible: lid_open">
-            <img src="/plugin/mrbeam/static/img/closelid.jpg">
+            <img src="/plugin/mrbeam/static/img/close_lid.png">
             <h5>{{ _('Please close the lid completely before we can proceed.') }}</h5>
         </div>
 
         <div class="modal-body" data-bind="visible: ready_to_laser">
-            <img src="/plugin/mrbeam/static/img/onebutton.jpg">
+            <img src="/plugin/mrbeam/static/img/onebutton.png">
             <h5>{{ _('Everything is ready to go.') }}</h5>
             <h5 data-bind="visible: jobTimeEstimationCalculated">
                 {{ _('Estimated duration') }}:
@@ -32,7 +32,7 @@
         </div>
 
         <div class="modal-body" data-bind="visible: paused() || ready_to_laser_state() === status.OK">
-            <img src="/plugin/mrbeam/static/img/onebutton.jpg">
+            <img src="/plugin/mrbeam/static/img/onebutton.png">
             <h5>{{ _('Everything is ready to go.') }}</h5>
         </div>