andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 07:49:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

rename valid_gpio_list to available_gpios

Browse Source
This commit is contained in:
proddy
2025-11-23 20:06:26 +01:00
parent 44c7954ce7
commit a951afe205
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
interface/src/app/main/Sensors.tsx
View File

@@ -134,13 +134,13 @@ const Sensors = () => {
ts: [], ts: [],
as: [], as: [],
analog_enabled: false, analog_enabled: false,
valid_gpio_list: [] as number[], available_gpios: [] as number[],
platform: 'ESP32' platform: 'ESP32'
} }
}).onSuccess((event) => { }).onSuccess((event) => {
// store the first available GPIO in a ref // store the first available GPIO in a ref
if (event.data.valid_gpio_list.length > 0) { if (event.data.available_gpios.length > 0) {
firstAvailableGPIO.current = event.data.valid_gpio_list[0]; firstAvailableGPIO.current = event.data.available_gpios[0];
} }
}); });
@@ -585,7 +585,7 @@ const Sensors = () => {
onSave={onAnalogDialogSave} onSave={onAnalogDialogSave}
creating={creating} creating={creating}
selectedItem={selectedAnalogSensor} selectedItem={selectedAnalogSensor}
analogGPIOList={sensorData.valid_gpio_list} analogGPIOList={sensorData.available_gpios}
validator={analogSensorItemValidation(sensorData.as, selectedAnalogSensor)} validator={analogSensorItemValidation(sensorData.as, selectedAnalogSensor)}
/> />
)} )}

2
interface/src/app/main/types.ts
View File

@@ -111,7 +111,7 @@ export interface SensorData {
ts: TemperatureSensor[]; ts: TemperatureSensor[];
as: AnalogSensor[]; as: AnalogSensor[];
analog_enabled: boolean; analog_enabled: boolean;
valid_gpio_list: number[]; available_gpios: number[];
platform: string; platform: string;
} }

6
mock-api/restServer.ts
View File

@@ -1047,7 +1047,7 @@ const emsesp_sensordata = {
} }
], ],
analog_enabled: true, analog_enabled: true,
valid_gpio_list: [] as number[] available_gpios: [] as number[]
}; };
const activity = { const activity = {
@@ -4556,11 +4556,11 @@ router
...emsesp_sensordata.as.map((item) => item.g) ...emsesp_sensordata.as.map((item) => item.g)
]); ]);
emsesp_sensordata.valid_gpio_list = allGPIOs emsesp_sensordata.available_gpios = allGPIOs
.filter((gpio) => !usedGPIOs.has(gpio)) .filter((gpio) => !usedGPIOs.has(gpio))
.sort((a, b) => a - b); .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; return emsesp_sensordata;
}) })

4
src/core/system.h
View File

@@ -144,7 +144,7 @@ class System {
static bool saveSettings(const char * filename, const char * section, JsonObject input); static bool saveSettings(const char * filename, const char * section, JsonObject input);
static bool add_gpio(uint8_t pin, const char * source_name); 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 load_board_profile(std::vector<int8_t> & data, const std::string & board_profile);
static bool readCommand(const char * data); static bool readCommand(const char * data);
@@ -353,7 +353,7 @@ class System {
} }
#endif #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: private:
static uuid::log::Logger logger_; static uuid::log::Logger logger_;

6
src/web/WebDataService.cpp
View File

@@ -153,9 +153,9 @@ void WebDataService::sensor_data(AsyncWebServerRequest * request) {
root["platform"] = EMSESP_PLATFORM; root["platform"] = EMSESP_PLATFORM;
// send back a list of valid and unused GPIOs still available for use // send back a list of valid and unused GPIOs still available for use
JsonArray valid_gpio_list = root["valid_gpio_list"].to<JsonArray>(); JsonArray available_gpios = root["available_gpios"].to<JsonArray>();
for (const auto & gpio : EMSESP::system_.valid_gpio_list()) { for (const auto & gpio : EMSESP::system_.available_gpios()) {
valid_gpio_list.add(gpio); available_gpios.add(gpio);
} }
response->setLength(); response->setLength();