From 52673ca927ed94c540cb7aedc7930b55ebc9fdc2 Mon Sep 17 00:00:00 2001
From: nonokirby <82886780+nonokirby@users.noreply.github.com>
Date: Wed, 22 Apr 2026 11:24:08 -0400
Subject: [PATCH] Fix adaptive weather presets layout

---
 .../tools/device_settings_layout.json         | 85 +++++++++++++++----
 1 file changed, 69 insertions(+), 16 deletions(-)

diff --git a/starpilot/system/the_pond/assets/components/tools/device_settings_layout.json b/starpilot/system/the_pond/assets/components/tools/device_settings_layout.json
index 37284dca4..5085852f7 100644
--- a/starpilot/system/the_pond/assets/components/tools/device_settings_layout.json
+++ b/starpilot/system/the_pond/assets/components/tools/device_settings_layout.json
@@ -1087,8 +1087,18 @@
         "description": "Automatically adjust driving behavior based on real-time weather. Helps maintain comfort and safety in low visibility, rain, or snow.",
         "data_type": "bool",
         "ui_type": "toggle",
+        "is_parent_toggle": true
         "parent_key": "QOLLongitudinal"
       },
+      {
+        "key": "LowVisiblityWeather",
+        "label": "Low Visibility (fog)",
+        "description": "Customise settings for driving in low visibility situations",
+        "data_type": "bool",
+        "ui_type": "toggle",
+        "is_parent_toggle": true,
+        "parent_key": "WeatherPresets"
+      },
       {
         "key": "IncreaseFollowingLowVisibility",
         "label": "Increase Following Distance by:",
@@ -1097,7 +1107,8 @@
         "ui_type": "numeric",
         "min": 0.0,
         "max": 3.0,
-        "step": 0.01
+        "step": 0.01,
+        "parent_key": "LowVisiblityWeather"
       },
       {
         "key": "IncreasedStoppedDistanceLowVisibility",
@@ -1106,7 +1117,8 @@
         "data_type": "float",
         "ui_type": "numeric",
         "min": 0.0,
-        "max": 10.0
+        "max": 10.0,
+        "parent_key": "LowVisiblityWeather"
       },
       {
         "key": "ReduceAccelerationLowVisibility",
@@ -1116,7 +1128,8 @@
         "ui_type": "numeric",
         "min": 0.0,
         "max": 99.0,
-        "step": 1.0
+        "step": 1.0,
+        "parent_key": "LowVisiblityWeather"
       },
       {
         "key": "ReduceLateralAccelerationLowVisibility",
@@ -1126,7 +1139,17 @@
         "ui_type": "numeric",
         "min": 0.0,
         "max": 99.0,
-        "step": 1.0
+        "step": 1.0,
+        "parent_key": "LowVisiblityWeather"
+      },
+      {
+        "key": "RainWeather",
+        "label": "Light/Medium Rain",
+        "description": "Customise settings for driving in light & medium rain",
+        "data_type": "bool",
+        "ui_type": "toggle",
+        "is_parent_toggle": true,
+        "parent_key": "WeatherPresets"
       },
       {
         "key": "IncreaseFollowingRain",
@@ -1136,7 +1159,8 @@
         "ui_type": "numeric",
         "min": 0.0,
         "max": 3.0,
-        "step": 0.01
+        "step": 0.01,
+        "parent_key": "RainWeather"
       },
       {
         "key": "IncreasedStoppedDistanceRain",
@@ -1145,7 +1169,8 @@
         "data_type": "float",
         "ui_type": "numeric",
         "min": 0.0,
-        "max": 10.0
+        "max": 10.0,
+        "parent_key": "RainWeather"
       },
       {
         "key": "ReduceAccelerationRain",
@@ -1155,7 +1180,8 @@
         "ui_type": "numeric",
         "min": 0.0,
         "max": 99.0,
-        "step": 1.0
+        "step": 1.0,
+        "parent_key": "RainWeather"
       },
       {
         "key": "ReduceLateralAccelerationRain",
@@ -1165,7 +1191,17 @@
         "ui_type": "numeric",
         "min": 0.0,
         "max": 99.0,
-        "step": 1.0
+        "step": 1.0,
+        "parent_key": "RainWeather"
+      },
+      {
+        "key": "HeavyRainWeather",
+        "label": "Heavy Rain",
+        "description": "Customise settings for driving in heavy rain",
+        "data_type": "bool",
+        "ui_type": "toggle",
+        "is_parent_toggle": true,
+        "parent_key": "WeatherPresets"
       },
       {
         "key": "IncreaseFollowingRainStorm",
@@ -1175,7 +1211,8 @@
         "ui_type": "numeric",
         "min": 0.0,
         "max": 3.0,
-        "step": 0.01
+        "step": 0.01,
+        "parent_key": "HeavyRainWeather"
       },
       {
         "key": "IncreasedStoppedDistanceRainStorm",
@@ -1184,7 +1221,8 @@
         "data_type": "float",
         "ui_type": "numeric",
         "min": 0.0,
-        "max": 10.0
+        "max": 10.0,
+        "parent_key": "HeavyRainWeather"
       },
       {
         "key": "ReduceAccelerationRainStorm",
@@ -1194,7 +1232,8 @@
         "ui_type": "numeric",
         "min": 0.0,
         "max": 99.0,
-        "step": 1.0
+        "step": 1.0,
+        "parent_key": "HeavyRainWeather"
       },
       {
         "key": "ReduceLateralAccelerationRainStorm",
@@ -1204,7 +1243,17 @@
         "ui_type": "numeric",
         "min": 0.0,
         "max": 99.0,
-        "step": 1.0
+        "step": 1.0,
+        "parent_key": "HeavyRainWeather"
+      },
+      {
+        "key": "SnowWeather",
+        "label": "Snow",
+        "description": "Customise settings for driving in snow",
+        "data_type": "bool",
+        "ui_type": "toggle",
+        "is_parent_toggle": true,
+        "parent_key": "WeatherPresets"
       },
       {
         "key": "IncreaseFollowingSnow",
@@ -1214,7 +1263,8 @@
         "ui_type": "numeric",
         "min": 0.0,
         "max": 3.0,
-        "step": 0.01
+        "step": 0.01,
+        "parent_key": "SnowWeather"
       },
       {
         "key": "IncreasedStoppedDistanceSnow",
@@ -1223,7 +1273,8 @@
         "data_type": "float",
         "ui_type": "numeric",
         "min": 0.0,
-        "max": 10.0
+        "max": 10.0,
+        "parent_key": "SnowWeather"
       },
       {
         "key": "ReduceAccelerationSnow",
@@ -1233,7 +1284,8 @@
         "ui_type": "numeric",
         "min": 0.0,
         "max": 99.0,
-        "step": 1.0
+        "step": 1.0,
+        "parent_key": "SnowWeather"
       },
       {
         "key": "ReduceLateralAccelerationSnow",
@@ -1243,7 +1295,8 @@
         "ui_type": "numeric",
         "min": 0.0,
         "max": 99.0,
-        "step": 1.0
+        "step": 1.0,
+        "parent_key": "SnowWeather"
       },
       {
         "key": "SpeedLimitController",