CreatBot/CreatBotMainsail
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: fix typo in adding new heaters/temperature_fans to chart dataset (#918)

Browse Source 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
This commit is contained in:
Stefan Dej 2022-06-19 12:20:23 +02:00 committed by GitHub
parent 642d5a0cb5
commit b5c92cbcab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/store/printer/tempHistory/actions.ts
View File

@ -26,6 +26,7 @@ export const actions: ActionTree<PrinterTempHistoryState, RootState> = {
dispatch('reset') dispatch('reset')
const now = new Date() const now = new Date()
const allHeaters = rootGetters['printer/getAvailableHeaters'] ?? []
const allSensors = rootGetters['printer/getAvailableSensors'] ?? [] const allSensors = rootGetters['printer/getAvailableSensors'] ?? []
const maxHistory = rootGetters['printer/tempHistory/getTemperatureStoreSize'] const maxHistory = rootGetters['printer/tempHistory/getTemperatureStoreSize']
@ -62,18 +63,18 @@ export const actions: ActionTree<PrinterTempHistoryState, RootState> = {
const addValues: { const addValues: {
temperatures: number[] temperatures: number[]
targets?: number[] targets?: number[]
power?: number[] powers?: number[]
speed?: number[] speeds?: number[]
} = { } = {
temperatures: Array(maxHistory).fill(0), temperatures: Array(maxHistory).fill(0),
} }
if (['heater_bed', 'heater_generic'].includes(sensorType) || sensorType.startsWith('extruder')) { if (allHeaters.includes(key)) {
addValues.targets = Array(maxHistory).fill(0) addValues.targets = Array(maxHistory).fill(0)
addValues.power = Array(maxHistory).fill(0) addValues.powers = Array(maxHistory).fill(0)
} else if (['temperature_fan'].includes(sensorType)) { } else if (['temperature_fan'].includes(sensorType)) {
addValues.targets = Array(maxHistory).fill(0) addValues.targets = Array(maxHistory).fill(0)
addValues.speed = Array(maxHistory).fill(0) addValues.speeds = Array(maxHistory).fill(0)
} }
importData[key] = { ...addValues } importData[key] = { ...addValues }

20
src/store/printer/tempHistory/getters.ts
View File

@ -20,16 +20,20 @@ export const getters: GetterTree<PrinterTempHistoryState, RootState> = {
getSerieNames: (state) => (name: string) => { getSerieNames: (state) => (name: string) => {
const output: string[] = [] const output: string[] = []
const seriesKeys = state.series
.map((serie: PrinterTempHistoryStateSerie) => serie.name)
.filter((serieName) => serieName.startsWith(name))
if (state.series.findIndex((serie: PrinterTempHistoryStateSerie) => serie.name === name) !== -1) { seriesKeys.forEach((seriesKey) => {
output.push('temperature') if (seriesKey === name) {
} output.push('temperature')
return
}
state.series if (seriesKey.startsWith(name + '-')) {
.filter((serie: PrinterTempHistoryStateSerie) => serie.name.startsWith(name + '-')) output.push(seriesKey.slice(name.length + 1))
.forEach((serie) => { }
output.push(serie.name.substr(name.length + 1)) })
})
return output return output
}, },