Compare commits

...

2 Commits

Author SHA1 Message Date
Gunnar Skjold
13bbc81b7f Clear debug config on setup if not already set 2021-09-23 20:56:24 +02:00
Gunnar Skjold
7412ba2697 Removed temp sensor update if no sensors were found 2021-09-23 20:30:22 +02:00
4 changed files with 23 additions and 15 deletions

View File

@@ -220,6 +220,7 @@ bool AmsConfiguration::getDebugConfig(DebugConfig& config) {
EEPROM.end();
return true;
} else {
clearDebug(config);
return false;
}
}
@@ -232,6 +233,12 @@ bool AmsConfiguration::setDebugConfig(DebugConfig& config) {
return ret;
}
void AmsConfiguration::clearDebug(DebugConfig& config) {
config.level = 5;
config.telnet = false;
config.serial = false;
}
bool AmsConfiguration::getDomoticzConfig(DomoticzConfig& config) {
if(hasConfig()) {
EEPROM.begin(EEPROM_SIZE);

View File

@@ -286,6 +286,7 @@ public:
bool getDebugConfig(DebugConfig&);
bool setDebugConfig(DebugConfig&);
void clearDebug(DebugConfig&);
bool pinUsed(uint8_t, GpioConfig&);

View File

@@ -129,15 +129,17 @@ bool HwTools::updateTemperatures() {
delay(10);
}
} else {
sensorApi->requestTemperatures();
if(sensorCount > 0) {
sensorApi->requestTemperatures();
for(int x = 0; x < sensorCount; x++) {
TempSensorData *data = tempSensors[x];
float t = sensorApi->getTempC(data->address);
data->lastRead = t;
if(t > -85) {
data->changed = data->lastValidRead != t;
data->lastValidRead = t;
for(int x = 0; x < sensorCount; x++) {
TempSensorData *data = tempSensors[x];
float t = sensorApi->getTempC(data->address);
data->lastRead = t;
if(t > -85) {
data->changed = data->lastValidRead != t;
data->lastValidRead = t;
}
}
}
}

View File

@@ -741,6 +741,9 @@ void AmsWebServer::handleSetup() {
} else {
SystemConfig sys { server.arg("board").toInt() };
DebugConfig debugConfig;
config->getDebugConfig(debugConfig);
config->clear();
config->clearGpio(*gpioConfig);
@@ -759,7 +762,6 @@ void AmsWebServer::handleSetup() {
gpioConfig->apPin = 0;
gpioConfig->ledPin = 2;
gpioConfig->ledInverted = true;
gpioConfig->tempSensorPin = 5;
gpioConfig->ledPinRed = 13;
gpioConfig->ledPinGreen = 14;
gpioConfig->ledRgbInverted = true;
@@ -777,7 +779,6 @@ void AmsWebServer::handleSetup() {
gpioConfig->apPin = 0;
gpioConfig->ledPin = 2;
gpioConfig->ledInverted = true;
gpioConfig->tempSensorPin = 5;
gpioConfig->ledPinRed = 13;
gpioConfig->ledPinGreen = 14;
gpioConfig->ledRgbInverted = true;
@@ -787,7 +788,6 @@ void AmsWebServer::handleSetup() {
gpioConfig->apPin = 0;
gpioConfig->ledPin = 2;
gpioConfig->ledInverted = true;
gpioConfig->tempSensorPin = 5;
gpioConfig->ledPinRed = 13;
gpioConfig->ledPinGreen = 14;
gpioConfig->ledRgbInverted = true;
@@ -797,7 +797,6 @@ void AmsWebServer::handleSetup() {
gpioConfig->apPin = 4;
gpioConfig->ledPin = 2;
gpioConfig->ledInverted = true;
gpioConfig->tempSensorPin = 14;
gpioConfig->vccMultiplier = 1100;
break;
case 100: // ESP8266
@@ -810,13 +809,11 @@ void AmsWebServer::handleSetup() {
gpioConfig->apPin = 4;
gpioConfig->ledPin = 5;
gpioConfig->ledInverted = true;
gpioConfig->tempSensorPin = 14;
break;
case 202: // Feather
gpioConfig->hanPin = 16;
gpioConfig->ledPin = 2;
gpioConfig->ledInverted = false;
gpioConfig->tempSensorPin = 14;
break;
case 203: // DevKitC
gpioConfig->hanPin = 16;
@@ -828,7 +825,6 @@ void AmsWebServer::handleSetup() {
gpioConfig->apPin = 0;
gpioConfig->ledPin = 2;
gpioConfig->ledInverted = false;
gpioConfig->tempSensorPin = 14;
break;
}
@@ -889,6 +885,8 @@ void AmsWebServer::handleSetup() {
success = false;
}
config->setDebugConfig(debugConfig);
if(success && config->save()) {
performRestart = true;
server.sendHeader("Location","/restart-wait");