diff --git a/src/components/panels/Temperature/TemperaturePanelList.vue b/src/components/panels/Temperature/TemperaturePanelList.vue index a0b2b56c5..d7ed527f2 100644 --- a/src/components/panels/Temperature/TemperaturePanelList.vue +++ b/src/components/panels/Temperature/TemperaturePanelList.vue @@ -27,7 +27,9 @@ :object-name="objectName" :is-responsive-mobile="el.is.mobile ?? false" /> name === 'nevermore' || name.startsWith('nevermore ') + ) + } + get monitors() { return this.available_monitors.sort(this.sortObjectName) } @@ -83,10 +91,6 @@ export default class TemperaturePanelList extends Mixins(BaseMixin) { .sort(this.sortObjectName) } - get existsNevermoreFilter() { - return 'nevermore' in this.$store.state.printer - } - get hideMcuHostSensors(): boolean { return this.$store.state.gui.view.tempchart.hideMcuHostSensors ?? false } @@ -97,20 +101,24 @@ export default class TemperaturePanelList extends Mixins(BaseMixin) { get temperature_sensors() { return this.filterNamesAndSort(this.available_sensors).filter((fullName: string) => { - if (this.available_heaters.includes(fullName)) return false - if (this.temperature_fans.includes(fullName)) return false + if (this.available_heaters.includes(fullName)) return false + if (this.temperature_fans.includes(fullName)) return false - // hide MCU & Host sensors, if the function is enabled - if (this.hideMcuHostSensors && this.checkMcuHostSensor(fullName)) return false + // hide MCU & Host sensors, if the function is enabled + if (this.hideMcuHostSensors && this.checkMcuHostSensor(fullName)) return false return true - }) + }) } get heaterObjects() { return [...this.filteredHeaters, ...this.temperature_fans] } + get nevermoreObjects() { + return this.filterNamesAndSort(this.available_nevermores) + } + get settings() { return this.$store.state.printer?.configfile?.settings ?? {} } diff --git a/src/components/panels/Temperature/TemperaturePanelListItemEdit.vue b/src/components/panels/Temperature/TemperaturePanelListItemEdit.vue index 9ac501c7a..4ba16dfd7 100644 --- a/src/components/panels/Temperature/TemperaturePanelListItemEdit.vue +++ b/src/components/panels/Temperature/TemperaturePanelListItemEdit.vue @@ -67,7 +67,8 @@ export default class TemperaturePanelListItemEdit extends Mixins(BaseMixin) { get additionalValues() { if (this.objectName === 'z_thermal_adjust') return ['current_z_adjust'] - if (this.objectName === 'nevermore') return ['temperature', 'pressure', 'humidity', 'rpm'] + if (this.objectName === 'nevermore' || this.objectName.startsWith('nevermore ')) + return ['temperature', 'pressure', 'humidity', 'rpm'] return Object.keys(this.printerObjectAdditionalSensor).filter((key) => key !== 'temperature') } diff --git a/src/components/panels/Temperature/TemperaturePanelListItemNevermore.vue b/src/components/panels/Temperature/TemperaturePanelListItemNevermore.vue index 54679d6ec..003ac67fd 100644 --- a/src/components/panels/Temperature/TemperaturePanelListItemNevermore.vue +++ b/src/components/panels/Temperature/TemperaturePanelListItemNevermore.vue @@ -6,19 +6,19 @@ - Nevermore + {{ formatName }} {{ rpm }} RPM @@ -26,9 +26,9 @@