diff --git a/src/components/panels/Temperature/TemperaturePanelList.vue b/src/components/panels/Temperature/TemperaturePanelList.vue index c4eec5fd4..a4609b886 100644 --- a/src/components/panels/Temperature/TemperaturePanelList.vue +++ b/src/components/panels/Temperature/TemperaturePanelList.vue @@ -22,7 +22,15 @@ + + @@ -36,8 +44,11 @@ import Component from 'vue-class-component' import { Mixins } from 'vue-property-decorator' import BaseMixin from '@/components/mixins/base' +import TemperaturePanelListItemNevermore from '@/components/panels/Temperature/TemperaturePanelListItemNevermore.vue' -@Component +@Component({ + components: { TemperaturePanelListItemNevermore }, +}) export default class TemperaturePanelList extends Mixins(BaseMixin) { get available_heaters() { return this.$store.state.printer?.heaters?.available_heaters ?? [] @@ -65,6 +76,10 @@ 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 } @@ -87,8 +102,8 @@ export default class TemperaturePanelList extends Mixins(BaseMixin) { .sort(this.sortObjectName) } - get tempObjects() { - return [...this.filteredHeaters, ...this.temperature_fans, ...this.temperature_sensors] + get heaterObjects() { + return [...this.filteredHeaters, ...this.temperature_fans] } get settings() { diff --git a/src/components/panels/Temperature/TemperaturePanelListItemEdit.vue b/src/components/panels/Temperature/TemperaturePanelListItemEdit.vue index 275c26c8e..9ac501c7a 100644 --- a/src/components/panels/Temperature/TemperaturePanelListItemEdit.vue +++ b/src/components/panels/Temperature/TemperaturePanelListItemEdit.vue @@ -67,6 +67,7 @@ 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'] 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 new file mode 100644 index 000000000..65fd4c0b3 --- /dev/null +++ b/src/components/panels/Temperature/TemperaturePanelListItemNevermore.vue @@ -0,0 +1,110 @@ + + + + + diff --git a/src/components/panels/Temperature/TemperaturePanelListItemNevermoreValue.vue b/src/components/panels/Temperature/TemperaturePanelListItemNevermoreValue.vue new file mode 100644 index 000000000..e6968b54a --- /dev/null +++ b/src/components/panels/Temperature/TemperaturePanelListItemNevermoreValue.vue @@ -0,0 +1,141 @@ + + +