From a951afe205f208fa09c61fa174b7001e39e13b1d Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sun, 23 Nov 2025 20:06:26 +0100
Subject: [PATCH] rename valid_gpio_list to available_gpios

---
 interface/src/app/main/Sensors.tsx | 8 ++++----
 interface/src/app/main/types.ts    | 2 +-
 mock-api/restServer.ts             | 6 +++---
 src/core/system.h                  | 4 ++--
 src/web/WebDataService.cpp         | 6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/interface/src/app/main/Sensors.tsx b/interface/src/app/main/Sensors.tsx
index e6ed94d52..e79fb23c0 100644
--- a/interface/src/app/main/Sensors.tsx
+++ b/interface/src/app/main/Sensors.tsx
@@ -134,13 +134,13 @@ const Sensors = () => {
       ts: [],
       as: [],
       analog_enabled: false,
-      valid_gpio_list: [] as number[],
+      available_gpios: [] as number[],
       platform: 'ESP32'
     }
   }).onSuccess((event) => {
     // store the first available GPIO in a ref
-    if (event.data.valid_gpio_list.length > 0) {
-      firstAvailableGPIO.current = event.data.valid_gpio_list[0];
+    if (event.data.available_gpios.length > 0) {
+      firstAvailableGPIO.current = event.data.available_gpios[0];
     }
   });
 
@@ -585,7 +585,7 @@ const Sensors = () => {
           onSave={onAnalogDialogSave}
           creating={creating}
           selectedItem={selectedAnalogSensor}
-          analogGPIOList={sensorData.valid_gpio_list}
+          analogGPIOList={sensorData.available_gpios}
           validator={analogSensorItemValidation(sensorData.as, selectedAnalogSensor)}
         />
       )}
diff --git a/interface/src/app/main/types.ts b/interface/src/app/main/types.ts
index 9a762dc8c..2c55f1d0e 100644
--- a/interface/src/app/main/types.ts
+++ b/interface/src/app/main/types.ts
@@ -111,7 +111,7 @@ export interface SensorData {
   ts: TemperatureSensor[];
   as: AnalogSensor[];
   analog_enabled: boolean;
-  valid_gpio_list: number[];
+  available_gpios: number[];
   platform: string;
 }
 
diff --git a/mock-api/restServer.ts b/mock-api/restServer.ts
index ef641b1df..13de857cf 100644
--- a/mock-api/restServer.ts
+++ b/mock-api/restServer.ts
@@ -1047,7 +1047,7 @@ const emsesp_sensordata = {
     }
   ],
   analog_enabled: true,
-  valid_gpio_list: [] as number[]
+  available_gpios: [] as number[]
 };
 
 const activity = {
@@ -4556,11 +4556,11 @@ router
       ...emsesp_sensordata.as.map((item) => item.g)
     ]);
 
-    emsesp_sensordata.valid_gpio_list = allGPIOs
+    emsesp_sensordata.available_gpios = allGPIOs
       .filter((gpio) => !usedGPIOs.has(gpio))
       .sort((a, b) => a - b);
 
-    // console.log('valid_gpio_list', emsesp_sensordata.valid_gpio_list);
+    // console.log('available_gpios', emsesp_sensordata.available_gpios);
 
     return emsesp_sensordata;
   })
diff --git a/src/core/system.h b/src/core/system.h
index 51306de40..17a9596ba 100644
--- a/src/core/system.h
+++ b/src/core/system.h
@@ -144,7 +144,7 @@ class System {
     static bool saveSettings(const char * filename, const char * section, JsonObject input);
 
     static bool                 add_gpio(uint8_t pin, const char * source_name);
-    static std::vector<uint8_t> valid_gpio_list();
+    static std::vector<uint8_t> available_gpios();
     static bool                 load_board_profile(std::vector<int8_t> & data, const std::string & board_profile);
 
     static bool readCommand(const char * data);
@@ -353,7 +353,7 @@ class System {
     }
 #endif
 
-    static void remove_gpio(uint8_t pin); // remove a gpio from both valid and used lists
+    static void remove_gpio(uint8_t pin, bool also_system = false); // remove a gpio from both valid (optional) and used lists
 
   private:
     static uuid::log::Logger logger_;
diff --git a/src/web/WebDataService.cpp b/src/web/WebDataService.cpp
index d48505331..d932ec051 100644
--- a/src/web/WebDataService.cpp
+++ b/src/web/WebDataService.cpp
@@ -153,9 +153,9 @@ void WebDataService::sensor_data(AsyncWebServerRequest * request) {
     root["platform"]       = EMSESP_PLATFORM;
 
     // send back a list of valid and unused GPIOs still available for use
-    JsonArray valid_gpio_list = root["valid_gpio_list"].to<JsonArray>();
-    for (const auto & gpio : EMSESP::system_.valid_gpio_list()) {
-        valid_gpio_list.add(gpio);
+    JsonArray available_gpios = root["available_gpios"].to<JsonArray>();
+    for (const auto & gpio : EMSESP::system_.available_gpios()) {
+        available_gpios.add(gpio);
     }
 
     response->setLength();