mirror of
https://github.com/Laxilef/OTGateway.git
synced 2025-12-25 17:43:35 +05:00
Compare commits
2 Commits
fcf7d61ca5
...
6a9bd9673a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6a9bd9673a | ||
|
|
5aea80e630 |
@@ -119,7 +119,10 @@ protected:
|
||||
}
|
||||
|
||||
void cleanDallasInstances() {
|
||||
for (auto& [gpio, instance] : this->dallasInstances) {
|
||||
// for (auto& [gpio, instance] : this->dallasInstances) {
|
||||
auto it = this->dallasInstances.begin();
|
||||
while (it != this->dallasInstances.end()) {
|
||||
auto gpio = it->first;
|
||||
bool instanceUsed = false;
|
||||
|
||||
for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
|
||||
@@ -135,8 +138,8 @@ protected:
|
||||
}
|
||||
}
|
||||
|
||||
if (!instanceUsed) {;
|
||||
this->dallasInstances.erase(gpio);
|
||||
if (!instanceUsed) {
|
||||
it = this->dallasInstances.erase(it);
|
||||
this->owInstances.erase(gpio);
|
||||
this->dallasSearchTime.erase(gpio);
|
||||
this->dallasPolling.erase(gpio);
|
||||
@@ -145,6 +148,8 @@ protected:
|
||||
Log.sinfoln(FPSTR(L_SENSORS_DALLAS), F("Stopped on GPIO %hhu"), gpio);
|
||||
continue;
|
||||
}
|
||||
|
||||
it++;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -152,14 +152,14 @@ struct Settings {
|
||||
Sensors::Settings sensorsSettings[SENSORS_AMOUNT] = {
|
||||
{
|
||||
false,
|
||||
"Indoor temp",
|
||||
"Outdoor temp",
|
||||
Sensors::Purpose::OUTDOOR_TEMP,
|
||||
Sensors::Type::DALLAS_TEMP,
|
||||
DEFAULT_SENSOR_OUTDOOR_GPIO
|
||||
},
|
||||
{
|
||||
false,
|
||||
"Outdoor temp",
|
||||
"Indoor temp",
|
||||
Sensors::Purpose::INDOOR_TEMP,
|
||||
Sensors::Type::DALLAS_TEMP,
|
||||
DEFAULT_SENSOR_INDOOR_GPIO
|
||||
|
||||
Reference in New Issue
Block a user