feat: Kalico temperature chart override when mcu disconnected

Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>

Author: pedrolamas

src/components/widgets/system/McuInformationDialog.vue

@@ -1,7 +1,7 @@
 <template>
   <app-dialog
     v-model="open"
-    :title="$t('app.system_info.label.mcu_information', { mcu: mcu.name })"
+    :title="$t('app.system_info.label.mcu_information', { mcu: mcu.prettyName })"
     max-width="500"
     no-actions
   >

src/components/widgets/system/McuLoadChart.vue

@@ -41,7 +41,7 @@ export default class McuLoadChart extends Vue {
   readonly mcu!: MCU
 
   get chartData () {
-    return this.$typedState.charts[this.mcu.name] || []
+    return this.$typedState.charts[this.mcu.key] || []
   }
 
   get options () {

src/store/chart_helpers.ts

@@ -2,6 +2,7 @@ import type { Commit } from 'vuex'
 import type { RootState } from './types'
 import type { ChartData } from './charts/types'
 import type { KlipperPrinterMcuState, KlipperPrinterState, KlipperPrinterSystemStatsState } from './printer/types'
+import getMcusFromConfig from '@/util/get-klipper-mcus-from-config'
 
 export const handleMcuStatsChange = (payload: Partial<KlipperPrinterState>, state: RootState, commit: Commit) => {
   for (const key in payload) {
@@ -118,17 +119,31 @@ export const handleSystemStatsChange = (payload: Partial<KlipperPrinterState>, s
  * Every packet should contain an entry for all known sensors we want to track.
  */
 export const handleAddChartEntry = (retention: number, state: RootState, commit: Commit, getters: any) => {
+  const nonCriticalDisconnectedMcuNames = new Set(
+    getters.getNonCriticalDisconnectedMcuNames as string[])
+
   const configureChartEntry = () => {
     const chartData: ChartData = {
       date: new Date()
     }
 
     const keys: string[] = getters.getChartableSensors
 
-    keys.forEach((key) => {
+    for (const key of keys) {
       const sensor = state.printer.printer[key]
 
       if (sensor != null) {
+        if (nonCriticalDisconnectedMcuNames.size > 0) {
+          const config = state.printer.printer.configfile?.settings[key.toLowerCase()]
+
+          if (
+            config != null &&
+            getMcusFromConfig(config)?.some(mcu => nonCriticalDisconnectedMcuNames.has(mcu))
+          ) {
+            continue
+          }
+        }
+
         const temp = sensor.temperature
         const target = sensor.target
         const power = sensor.power
@@ -138,7 +153,7 @@ export const handleAddChartEntry = (retention: number, state: RootState, commit:
         if (power != null) chartData[`${key}#power`] = power
         if (speed != null) chartData[`${key}#speed`] = speed
       }
-    })
+    }
 
     return chartData
   }

src/store/helpers.ts

@@ -16,8 +16,7 @@ export const handleTrinamicDriversChange = (payload: Partial<KlipperPrinterState
       state.printer.printer?.[item]?.drv_status?.otpw == null &&
       state.config.uiSettings.warnings.warnOnStepperDriverOverheating
     ) {
-      const [, nameFromSplit] = item.split(' ', 2)
-      const name = nameFromSplit ?? item
+      const name = item.split(' ', 2).pop() || ''
 
       const klippyApp: KlippyApp = getters.getKlippyApp
 

src/store/printer/getters.ts

@@ -3,6 +3,7 @@ import type { GetterTree } from 'vuex'
 import type { RootState } from '../types'
 import type { PrinterState, Heater, Fan, Led, OutputPin, Sensor, RunoutSensor, KnownExtruder, MCU, Endstop, ExtruderStepper, Extruder, Stepper, ScrewsTiltAdjustScrew, ScrewsTiltAdjust, BedScrews, BedSize, GcodeCommands, TimeEstimates, KlippyApp, ExcludeObjectPart, KlipperPrinterConfig, BeaconModel, BedScrewsScrew, ExtruderKey, Probe } from './types'
 import getKlipperType from '@/util/get-klipper-type'
+import getMcusFromConfig from '@/util/get-klipper-mcus-from-config'
 import i18n from '@/plugins/i18n'
 import type { GcodeHelp } from '../console/types'
 import { Globals } from '@/globals'
@@ -334,9 +335,12 @@ export const getters = {
     for (const key of mcuKeys) {
       const config = state.printer.configfile.settings[key.toLowerCase()]
 
+      const name = key.split(' ', 2).pop() || ''
+
       mcus.push({
-        name: key,
+        name,
         prettyName: Vue.$filters.prettyCase(key),
+        key,
         ...state.printer[key],
         config,
       })
@@ -345,6 +349,20 @@ export const getters = {
     return mcus
   },
 
+  getNonCriticalDisconnectedMcuNames: (state, getters): string[] => {
+    const klippyApp: KlippyApp = getters.getKlippyApp
+
+    if (!klippyApp.isKalico) {
+      return []
+    }
+
+    const mcus: MCU[] = getters.getMcus
+
+    return mcus
+      .filter(mcu => mcu.non_critical_disconnected)
+      .map(mcu => mcu.name)
+  },
+
   getHasExtruder: (state) => {
     return state.printer.extruder != null
   },
@@ -745,7 +763,8 @@ export const getters = {
    * Return available temperature probes / sensors.
    */
   getSensors: (state, getters): Sensor[] => {
-    const klippyApp: KlippyApp = getters.getKlippyApp
+    const nonCriticalDisconnectedMcuNames = new Set(
+      getters.getNonCriticalDisconnectedMcuNames as string[])
 
     const sensors = Object.keys(state.printer)
       .filter(key => (
@@ -771,27 +790,13 @@ export const getters = {
           const color = Vue.$colorset.next(getKlipperType(key), key)
           const config = state.printer.configfile.settings[key.toLowerCase()]
 
-          const mcu = (
-            klippyApp.isKalico &&
+          const mcus = (
+            nonCriticalDisconnectedMcuNames.size > 0 &&
             config != null &&
-            (
-              (
-                'i2c_mcu' in config &&
-                config.i2c_mcu
-              ) ||
-              (
-                'sensor_mcu' in config &&
-                config.sensor_mcu
-              ) ||
-              (
-                'sensor_pin' in config &&
-                config.sensor_pin?.includes(':') &&
-                config.sensor_pin.split(':')[0]
-              )
-            )
+            getMcusFromConfig(config)
           )
 
-          const kalicoTemperatureOverride = mcu && mcu !== 'mcu' && state.printer[`mcu ${mcu}`]?.non_critical_disconnected
+          const kalicoTemperatureOverride = mcus && mcus.some(mcu => nonCriticalDisconnectedMcuNames.has(mcu))
             ? {
                 temperature: null
               }

src/store/printer/types.ts

@@ -1441,6 +1441,7 @@ export interface Stepper extends StepperType<KlipperPrinterExtruderSettings | Kl
 export interface MCU extends KlipperPrinterMcuState {
   name: string;
   prettyName: string;
+  key: string;
   config?: KlipperPrinterMcuSettings;
 }
 

src/util/get-klipper-mcus-from-config.ts

@@ -0,0 +1,53 @@
+const mcuKeys = [
+  'i2c_mcu',
+  'sensor_mcu',
+]
+
+const getMcusFromMcuKeyInConfig = (config: Record<string, any>): string[] | undefined => {
+  for (const key of mcuKeys) {
+    if (key in config) {
+      const value = config[key]
+
+      if (
+        typeof value === 'string' &&
+        value
+      ) {
+        return [value]
+      }
+    }
+  }
+}
+
+const getMcusFromPinKeyInConfig = (config: Record<string, any>): string[] | undefined => {
+  const mcus = new Set<string>()
+
+  const pinKeys = Object.keys(config)
+    .filter(key => (
+      key === 'pin' ||
+      key.endsWith('_pin')
+    ))
+
+  for (const key of pinKeys) {
+    const value = config[key]
+
+    if (
+      typeof value === 'string' &&
+      value.includes(':')
+    ) {
+      const mcu = value.split(':')[0]
+
+      if (mcu) {
+        mcus.add(mcu)
+      }
+    }
+  }
+
+  return [...mcus]
+}
+
+const getMcusFromConfig = (config: Record<string, any>): string[] | undefined => (
+  getMcusFromMcuKeyInConfig(config) ||
+  getMcusFromPinKeyInConfig(config)
+)
+
+export default getMcusFromConfig

src/views/System.vue

@@ -19,7 +19,7 @@
 
       <template v-for="mcu in mcus">
         <mcu-card
-          :key="mcu.name"
+          :key="mcu.key"
           :mcu="mcu"
           class="mb-2 mb-md-4"
         />