From 27dc7bbb691e115954472e32486701cb1f185199 Mon Sep 17 00:00:00 2001 From: Sanaa Hamel Date: Fri, 23 Jun 2023 10:28:33 -0400 Subject: [PATCH 1/4] fix handling of sensors w/ non-lowercase type --- src/store/printer/getters.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/store/printer/getters.ts b/src/store/printer/getters.ts index 5a4359a771..291f35f3ca 100644 --- a/src/store/printer/getters.ts +++ b/src/store/printer/getters.ts @@ -564,7 +564,7 @@ export const getters: GetterTree = { let output: Fan | Led | OutputPin = { ...state.printer[pin], - ...getters.getExtraSensorData(config?.sensor_type?.toLowerCase(), name), + ...getters.getExtraSensorData(config?.sensor_type, name), config: { ...config }, name, prettyName, @@ -620,7 +620,7 @@ export const getters: GetterTree = { groups[name] = { ...state.printer[item], - ...getters.getExtraSensorData(config?.sensor_type?.toLowerCase(), name), + ...getters.getExtraSensorData(config?.sensor_type, name), config: { ...config }, minTemp: config?.min_temp ?? null, maxTemp: config?.max_temp ?? null, @@ -646,7 +646,7 @@ export const getters: GetterTree = { 'aht10' ] - if (supportedSensors.includes(sensorType)) { + if (supportedSensors.includes(sensorType?.toLowerCase())) { const sensor = state.printer[`${sensorType} ${name}`] if (sensor) { From 1af448e5b7cca3bd5384bee45bbfc0165805c533 Mon Sep 17 00:00:00 2001 From: Sanaa Hamel Date: Fri, 23 Jun 2023 10:29:02 -0400 Subject: [PATCH 2/4] add support for Nevermore sensors --- src/store/printer/getters.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/store/printer/getters.ts b/src/store/printer/getters.ts index 291f35f3ca..00a8c7c335 100644 --- a/src/store/printer/getters.ts +++ b/src/store/printer/getters.ts @@ -641,9 +641,10 @@ export const getters: GetterTree = { getExtraSensorData: (state) => (sensorType: string, name: string) => { const supportedSensors = [ + 'aht10', 'bme280', 'htu21d', - 'aht10' + 'nevermoresensor', ] if (supportedSensors.includes(sensorType?.toLowerCase())) { From d2e45df2b6607e7c10167cee935c54b8e118bdcd Mon Sep 17 00:00:00 2001 From: Sanaa Hamel Date: Fri, 23 Jun 2023 10:44:39 -0400 Subject: [PATCH 3/4] style: keep linter happy --- src/store/printer/getters.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/printer/getters.ts b/src/store/printer/getters.ts index 00a8c7c335..03f85c9fcb 100644 --- a/src/store/printer/getters.ts +++ b/src/store/printer/getters.ts @@ -644,7 +644,7 @@ export const getters: GetterTree = { 'aht10', 'bme280', 'htu21d', - 'nevermoresensor', + 'nevermoresensor' ] if (supportedSensors.includes(sensorType?.toLowerCase())) { From 00c79e81d3ed8bac9e27daf0f288e258d73056ea Mon Sep 17 00:00:00 2001 From: Pedro Lamas Date: Wed, 20 Mar 2024 17:00:08 +0000 Subject: [PATCH 4/4] refactor: revert string case changes The proposed changes caused a miss in the printer state on line 709 --- src/store/printer/getters.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/store/printer/getters.ts b/src/store/printer/getters.ts index f082cf0aaf..5ebf42aecd 100644 --- a/src/store/printer/getters.ts +++ b/src/store/printer/getters.ts @@ -621,7 +621,7 @@ export const getters: GetterTree = { let output: Fan | Led | OutputPin = { ...state.printer[pin], - ...getters.getExtraSensorData(config?.sensor_type, name), + ...getters.getExtraSensorData(config?.sensor_type?.toLowerCase(), name), config: { ...config }, name, prettyName, @@ -678,7 +678,7 @@ export const getters: GetterTree = { groups[name] = { ...state.printer[item], - ...getters.getExtraSensorData(config?.sensor_type, name), + ...getters.getExtraSensorData(config?.sensor_type?.toLowerCase(), name), config: { ...config }, minTemp: config?.min_temp ?? null, maxTemp: config?.max_temp ?? null, @@ -705,7 +705,7 @@ export const getters: GetterTree = { 'nevermoresensor' ] - if (supportedSensors.includes(sensorType?.toLowerCase())) { + if (supportedSensors.includes(sensorType)) { const sensor = state.printer[`${sensorType} ${name}`] if (sensor) {