From 258d7cb29a52b0fb07f71fa30d7cddd1e4f01fc0 Mon Sep 17 00:00:00 2001
From: Mathis Mensing <matmen@dreadful.tech>
Date: Thu, 19 May 2022 19:16:05 +0200
Subject: [PATCH 1/3] fix: printer max pos parsing

Signed-off-by: Mathis Mensing <matmen@dreadful.tech>
---
 .../timelapse/subsettings/CustomParkPositionSettings.vue      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/settings/timelapse/subsettings/CustomParkPositionSettings.vue b/src/components/settings/timelapse/subsettings/CustomParkPositionSettings.vue
index 6fbbf4f18e..08e190b997 100644
--- a/src/components/settings/timelapse/subsettings/CustomParkPositionSettings.vue
+++ b/src/components/settings/timelapse/subsettings/CustomParkPositionSettings.vue
@@ -100,11 +100,11 @@ export default class LayerMacroSettings extends Mixins(StateMixin) {
   }
 
   get printerMaxX () {
-    return this.$store.getters['printer/getPrinterConfig']().stepper_x?.position_max ?? Infinity
+    return +(this.$store.getters['printer/getPrinterConfig']().stepper_x?.position_max ?? Infinity)
   }
 
   get printerMaxY () {
-    return this.$store.getters['printer/getPrinterConfig']().stepper_y?.position_max ?? Infinity
+    return +(this.$store.getters['printer/getPrinterConfig']().stepper_y?.position_max ?? Infinity)
   }
 
   get settings (): TimelapseSettings {

From 3b86eee1878d638f9afa6bdf78c79da33edc941d Mon Sep 17 00:00:00 2001
From: Mathis Mensing <matmen@dreadful.tech>
Date: Thu, 19 May 2022 19:16:20 +0200
Subject: [PATCH 2/3] fix: numMax error string

Signed-off-by: Mathis Mensing <matmen@dreadful.tech>
---
 .../timelapse/subsettings/CustomParkPositionSettings.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/settings/timelapse/subsettings/CustomParkPositionSettings.vue b/src/components/settings/timelapse/subsettings/CustomParkPositionSettings.vue
index 08e190b997..1d34c1cdc1 100644
--- a/src/components/settings/timelapse/subsettings/CustomParkPositionSettings.vue
+++ b/src/components/settings/timelapse/subsettings/CustomParkPositionSettings.vue
@@ -64,7 +64,7 @@ export default class LayerMacroSettings extends Mixins(StateMixin) {
     numRequired: (v: number | string) => v !== '' || this.$t('app.general.simple_form.error.required'),
     validNum: (v: string) => !isNaN(+v) || this.$t('app.general.simple_form.error.invalid_number'),
     numMin: (min: number) => (v: number) => v >= min || this.$t('app.general.simple_form.error.min', { min }),
-    numMax: (max: number) => (v: number) => v <= max || this.$t('app.general.simple_form.error.min', { max })
+    numMax: (max: number) => (v: number) => v <= max || this.$t('app.general.simple_form.error.max', { max })
   }
 
   getCustomParkPosBlocked (axis: 'x' | 'y') {

From 6a518dcac0d3995c8906f3aa1922371a3e06c719 Mon Sep 17 00:00:00 2001
From: Mathis Mensing <matmen@dreadful.tech>
Date: Thu, 19 May 2022 19:18:58 +0200
Subject: [PATCH 3/3] fix: respect stepper position_min

Signed-off-by: Mathis Mensing <matmen@dreadful.tech>
---
 .../subsettings/CustomParkPositionSettings.vue       | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/components/settings/timelapse/subsettings/CustomParkPositionSettings.vue b/src/components/settings/timelapse/subsettings/CustomParkPositionSettings.vue
index 1d34c1cdc1..0e09e93726 100644
--- a/src/components/settings/timelapse/subsettings/CustomParkPositionSettings.vue
+++ b/src/components/settings/timelapse/subsettings/CustomParkPositionSettings.vue
@@ -8,7 +8,7 @@
       <v-text-field
         ref="parkPosXElement"
         :value="parkPosX"
-        :rules="[rules.numRequired, rules.validNum, rules.numMin(0), rules.numMax(printerMaxX)]"
+        :rules="[rules.numRequired, rules.validNum, rules.numMin(printerMinX), rules.numMax(printerMaxX)]"
         :disabled="getCustomParkPosBlocked('x')"
         :hide-details="parkPosXElement ? parkPosXElement.valid : true"
         filled
@@ -27,7 +27,7 @@
       <v-text-field
         ref="parkPosYElement"
         :value="parkPosY"
-        :rules="[rules.numRequired, rules.validNum, rules.numMin(0), rules.numMax(printerMaxY)]"
+        :rules="[rules.numRequired, rules.validNum, rules.numMin(printerMinY), rules.numMax(printerMaxY)]"
         :disabled="getCustomParkPosBlocked('y')"
         :hide-details="parkPosYElement ? parkPosYElement.valid : true"
         filled
@@ -99,10 +99,18 @@ export default class LayerMacroSettings extends Mixins(StateMixin) {
     }
   }
 
+  get printerMinX () {
+    return +(this.$store.getters['printer/getPrinterConfig']().stepper_x?.position_min ?? 0)
+  }
+
   get printerMaxX () {
     return +(this.$store.getters['printer/getPrinterConfig']().stepper_x?.position_max ?? Infinity)
   }
 
+  get printerMinY () {
+    return +(this.$store.getters['printer/getPrinterConfig']().stepper_y?.position_min ?? 0)
+  }
+
   get printerMaxY () {
     return +(this.$store.getters['printer/getPrinterConfig']().stepper_y?.position_max ?? Infinity)
   }