Merge pull request #1366 from fdm-monster/feat/3335-replace-emergency…

…-stop-with-alternative

fix: replace emergency stop with quick stop terminology

RELEASE_NOTES.MD

@@ -1,43 +1,51 @@
-# Client develop
+# Release notes
 
-# Client 07/05/2024 1.5.16
+## Client develop
+
+## Client 07/05/2024 1.5.17
+
+Fixes
+
+- Fix: replaced "Emergency Stop" terminology with "Quick Stop"
+
+## Client 07/05/2024 1.5.16
 
 Fixes
 
 - Bugfix: could not resume print job after pausing.
 - Bugfix: printer control dialog was empty after opening the second time, now it will load again.
 
-# Client 22/04/2024 1.5.15
+## Client 22/04/2024 1.5.15
 
 Fixes
 
 - fix: current MonsterPi version would be hidden on the Software Upgrade page.
 
-# Client 18/04/2024 1.5.14
+## Client 18/04/2024 1.5.14
 
 Fixes
 
 - fix: ZIP download would be corrupt sometimes. Ensure file downloaded as ArrayBuffer (instead of blob) and written as text/plain instead of text.
 
-# Client 18/04/2024 1.5.13
+## Client 18/04/2024 1.5.13
 
 Features:
 
 - Printer Create/Update: add URL and apiKey validation with feedback. When wanted force save can be used in case of failures.
 
-# Client 18/04/2024 1.5.12
+## Client 18/04/2024 1.5.12
 
 Fixes:
 
 - Settings: software upgrade page for client upgrades would not calculate ability to upgrade correctly (again). Now fixed.
 
-# Client 18/04/2024 1.5.11
+## Client 18/04/2024 1.5.11
 
 Fixes:
 
 - Settings: pre-upload file cleaning settings could not be saved and no message was shown. Now both those things are fixed.
 
-# Client 16/04/2024 1.5.10
+## Client 16/04/2024 1.5.10
 
 Features:
 
@@ -49,7 +57,7 @@ Changes:
 - Settings: The settings toolbars have been refactored: consistent icon, simpler titles and dark color
 - Settings: The settings navigation has been re-ordered and given separations
 
-# Client 13/04/2024 1.5.9
+## Client 13/04/2024 1.5.9
 
 Features:
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fdm-monster/client",
-  "version": "1.5.16",
+  "version": "1.5.17",
   "author": "David Zwart",
   "license": "AGPL-3.0-or-later",
   "repository": {

src/backend/custom-gcode.service.ts

@@ -3,8 +3,8 @@ import { ServerApi } from "@/backend/server.api";
 import { IdType } from "@/utils/id.type";
 
 export class CustomGcodeService extends BaseService {
-  static async postEmergencyM112Command(printerId: IdType) {
-    const path = ServerApi.sendEmergencyM112Route(printerId);
+  static async postQuickStopM112Command(printerId: IdType) {
+    const path = ServerApi.sendQuickStopM112Route(printerId);
 
     return await this.postApi(path);
   }

src/backend/server.api.ts

@@ -74,7 +74,7 @@ export class ServerApi {
     `${ServerApi.floorRoute}/selected-floor/${floorId}`;
   static addOrRemovePrinterFromFloorRoute = (id: IdType) =>
     `${ServerApi.getFloorRoute(id)}/printer`;
-  static sendEmergencyM112Route = (id: IdType) =>
+  static sendQuickStopM112Route = (id: IdType) =>
     `${ServerApi.customGCodeRoute}/send-emergency-m112/${id}`;
   static installFirmwareUpdatePluginRoute = (id: IdType) =>
     `${ServerApi.pluginFirmwareUpdateRoute}/${id}/install-firmware-update-plugin`;

src/components/Generic/Actions/PrinterEmergencyStopAction.vue

@@ -28,7 +28,7 @@ export default defineComponent({
   methods: {
     async clickEmergencyStop() {
       if (confirm("Are you sure to abort the print? Please reconnect after.")) {
-        await CustomGcodeService.postEmergencyM112Command(this.printer!.id);
+        await CustomGcodeService.postQuickStopM112Command(this.printer!.id);
       }
     },
   },

src/components/PrinterGrid/PrinterGridTile.vue

@@ -65,9 +65,9 @@
               <v-icon>settings</v-icon>
               &nbsp;Edit Printer
             </v-list-item>
-            <v-list-item :close-on-click="true" @click="clickEmergencyStop()">
+            <v-list-item :close-on-click="true" @click="clickQuickStop()">
               <v-icon>stop</v-icon>
-              &nbsp;Emergency stop
+              &nbsp;Quick Stop
             </v-list-item>
           </v-list>
         </v-menu>
@@ -84,7 +84,7 @@
             <v-icon>usb</v-icon>
           </v-btn>
 
-          <!-- Emergency stop button -->
+          <!-- Printer control button -->
           <v-tooltip
             v-if="hasPrinterControlFeature && printerStateStore.isPrinterOperational(printer?.id)"
             bottom
@@ -106,7 +106,7 @@
             </template>
           </v-tooltip>
 
-          <!-- Emergency stop button -->
+          <!-- Quick stop button -->
           <v-tooltip v-if="printerStateStore.isPrinterOperational(printer?.id)" bottom>
             <template v-slot:activator="{ on, attrs }">
               <v-btn
@@ -115,13 +115,13 @@
                 size="36"
                 v-bind="attrs"
                 v-on="on"
-                @click.prevent.stop="clickEmergencyStop()"
+                @click.prevent.stop="clickQuickStop()"
               >
                 <v-icon>dangerous</v-icon>
               </v-btn>
             </template>
             <template v-slot:default>
-              <span>Send an emergency stop, causing USB to be disconnected.</span>
+              <span>Send a quick stop GCode, causing the printer to cease immediately.</span>
             </template>
           </v-tooltip>
 
@@ -325,12 +325,10 @@ export default defineComponent({
       await controlDialog.openDialog({ printerId });
     };
 
-    const clickEmergencyStop = async () => {
+    const clickQuickStop = async () => {
       if (!printerId.value) return;
-      if (
-        confirm("Are you sure to abort the print in Emergency Stop mode? Please reconnect after.")
-      ) {
-        await CustomGcodeService.postEmergencyM112Command(printerId.value);
+      if (confirm("Are you sure to abort the print in Quick Stop mode? Please reconnect after.")) {
+        await CustomGcodeService.postQuickStopM112Command(printerId.value);
       }
     };
 
@@ -366,7 +364,7 @@ export default defineComponent({
       clickOpenPrinterControlDialog,
       clickOpenPrinterURL,
       clickOpenSettings,
-      clickEmergencyStop,
+      clickQuickStop,
       clickConnectUsb,
       selectOrUnplacePrinter,
     };