Version 3.6.2-beta.1

Refined bed/chamber grouping: If a bed/chamber heater has diverging
state/active/standby values, tools are no longer displayed as a group
Active/standby controls for single bed/chamber groups use first heater's
taget values

Author: chrishamm

package.json

@@ -1,6 +1,6 @@
 {
    "name": "duetwebcontrol",
-   "version": "3.6.1",
+   "version": "3.6.2-beta.1",
    "author": "Christian Hammacher <christian@duet3d.com> (https://www.duet3d.com)",
    "homepage": "https://forum.duet3d.com/category/27/duet-web-control",
    "license": "GPL-3.0",

src/components/inputs/ControlInput.vue

@@ -89,7 +89,25 @@ export default Vue.extend({
 			const activeOrStandby = this.active ? "active" : "standby";
 			switch (this.type) {
 				case "all":
-					// not applicable
+					if (this.controlBeds) {
+						for (const bedHeaterIndex of store.state.machine.model.heat.bedHeaters) {
+							if (bedHeaterIndex >= 0 && bedHeaterIndex < store.state.machine.model.heat.heaters.length) {
+								const heater = store.state.machine.model.heat.heaters[bedHeaterIndex];
+								if (heater !== null) {
+									return heater[activeOrStandby];
+								}
+							}
+						}
+					} else if (this.controlChambers) {
+						for (const chamberHeaterIndex of store.state.machine.model.heat.chamberHeaters) {
+							if (chamberHeaterIndex >= 0 && chamberHeaterIndex < store.state.machine.model.heat.heaters.length) {
+								const heater = store.state.machine.model.heat.heaters[chamberHeaterIndex];
+								if (heater !== null) {
+									return heater[activeOrStandby];
+								}
+							}
+						}
+					}
 					break;
 
 				case "tool":

src/components/panels/ToolsPanel/ControlList/HeaterRows.vue

@@ -155,7 +155,42 @@ const emit = defineEmits<{
 const disabled = computed<boolean>(() => store.getters["uiFrozen"] || [MachineStatus.pausing, MachineStatus.processing, MachineStatus.resuming].includes(store.state.machine.model.state.status));
 
 // Settings
-const singleControl = computed(() => (props.type === "bed") ? store.state.machine.settings.singleBedControl : store.state.machine.settings.singleChamberControl);
+const singleControl = computed(() => {
+    if (props.type === "bed" && store.state.machine.settings.singleBedControl) {
+        let state: HeaterState | null, active: number | null = null, standby: number | null = null;
+        for (const heaterIndex of store.state.machine.model.heat.bedHeaters) {
+            if (heaterIndex >= 0 && heaterIndex < store.state.machine.model.heat.heaters.length) {
+                const heater = store.state.machine.model.heat.heaters[heaterIndex];
+                if (heater !== null) {
+                    state ??= heater.state;
+                    active ??= heater.active;
+                    standby ??= heater.standby;
+                    if (heater.state === state || heater.active !== active || heater.standby !== standby) {
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    } else if (props.type === "chamber" && store.state.machine.settings.singleChamberControl) {
+        let state: HeaterState | null, active: number | null = null, standby: number | null = null;
+        for (const heaterIndex of store.state.machine.model.heat.chamberHeaters) {
+            if (heaterIndex >= 0 && heaterIndex < store.state.machine.model.heat.heaters.length) {
+                const heater = store.state.machine.model.heat.heaters[heaterIndex];
+                if (heater !== null) {
+                    state ??= heater.state;
+                    active ??= heater.active;
+                    standby ??= heater.standby;
+                    if (heater.state === state || heater.active !== active || heater.standby !== standby) {
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    }
+    return false;
+});
 
 // Heater abstraction
 const heaterItems = computed(() => {

src/plugins/imports.ts

@@ -9,7 +9,7 @@ export default initCollection(DwcPlugin, [
         id: "GCodeViewer",
         name: "G-Code Viewer",
         author: "Juan Rosario",
-        version: "3.6.1",
+        version: "3.6.2-beta.1",
         loadDwcResources: () => import(
             /* webpackChunkName: "GCodeViewer" */
             "./GCodeViewer/index"
@@ -19,7 +19,7 @@ export default initCollection(DwcPlugin, [
         id: "HeightMap",
         name: "Height Map",
         author: "Duet3D Ltd",
-        version: "3.6.1",
+        version: "3.6.2-beta.1",
         loadDwcResources: () => import(
             /* webpackChunkName: "HeightMap" */
             "./HeightMap/index"
@@ -29,7 +29,7 @@ export default initCollection(DwcPlugin, [
         id: "InputShaping",
         name: "Input Shaping",
         author: "Duet3D Ltd",
-        version: "3.6.1",
+        version: "3.6.2-beta.1",
         loadDwcResources: () => import(
             /* webpackChunkName: "InputShaping" */
             "./InputShaping/index"
@@ -39,7 +39,7 @@ export default initCollection(DwcPlugin, [
         id: "ObjectModelBrowser",
         name: "Object Model Browser",
         author: "Duet3D Ltd",
-        version: "3.6.1",
+        version: "3.6.2-beta.1",
         loadDwcResources: () => import(
             /* webpackChunkName: "ObjectModelBrowser" */
             "./ObjectModelBrowser/index"
@@ -49,7 +49,7 @@ export default initCollection(DwcPlugin, [
         id: "OnScreenKeyboard",
         name: "On-Screen Keyboard",
         author: "Duet3D Ltd",
-        version: "3.6.1",
+        version: "3.6.2-beta.1",
         loadDwcResources: () => import(
             /* webpackChunkName: "OnScreenKeyboard" */
             "./OnScreenKeyboard/index"