Added more debugging code. Also some changes after testing

This commit is contained in:
Gunnar Skjold
2020-09-04 07:25:11 +02:00
parent 4207216770
commit 17bd85ebd0
8 changed files with 89 additions and 17 deletions

View File

@@ -968,6 +968,7 @@ void AmsConfiguration::print(Print* debugger)
debugger->println("-----------------------------------------------");
debugger->printf("WiFi SSID: '%s'\r\n", this->getWifiSsid());
debugger->printf("WiFi Psk: '%s'\r\n", this->getWifiPassword());
delay(1);
if(strlen(getWifiIp()) > 0) {
debugger->printf("IP: '%s'\r\n", this->getWifiIp());
@@ -976,6 +977,7 @@ void AmsConfiguration::print(Print* debugger)
debugger->printf("Primary DNS: '%s'\r\n", this->getWifiDns1());
debugger->printf("Secondary DNS: '%s'\r\n", this->getWifiDns2());
}
delay(1);
debugger->printf("WiFi Host: '%s'\r\n", this->getWifiHostname());
@@ -992,6 +994,7 @@ void AmsConfiguration::print(Print* debugger)
}
debugger->printf("payload format: %i\r\n", this->getMqttPayloadFormat());
}
delay(1);
if (this->getAuthSecurity()) {
debugger->printf("WEB AUTH:\r\n");
@@ -1006,6 +1009,7 @@ void AmsConfiguration::print(Print* debugger)
debugger->printf("productionCapacity: %i\r\n", this->getProductionCapacity());
debugger->printf("Substitute missing: %s\r\n", this->isSubstituteMissing() ? "Yes" : "No");
Serial.flush();
delay(1);
debugger->printf("HAN pin: %i\r\n", this->getHanPin());
debugger->printf("LED pin: %i\r\n", this->getLedPin());
@@ -1017,6 +1021,7 @@ void AmsConfiguration::print(Print* debugger)
debugger->printf("AP pin: %i\r\n", this->getApPin());
debugger->printf("Temperature pin: %i\r\n", this->getTempSensorPin());
Serial.flush();
delay(1);
debugger->printf("Vcc pin: %i\r\n", this->getVccPin());
debugger->printf("Vcc multiplier: %f\r\n", this->getVccMultiplier());
@@ -1030,6 +1035,7 @@ void AmsConfiguration::print(Print* debugger)
debugger->printf("Domoticz VL3IDX: %i\r\n", this->getDomoVL3IDX());
debugger->printf("Domoticz CL1IDX: %i\r\n", this->getDomoCL1IDX());
}
delay(1);
debugger->printf("NTP: %s\r\n", this->isNtpEnable() ? "Yes" : "No");
if(this->isNtpEnable()) {
@@ -1038,6 +1044,7 @@ void AmsConfiguration::print(Print* debugger)
debugger->printf("NTP server: %s\r\n", this->getNtpServer());
debugger->printf("NTP DHCP: %s\r\n", this->isNtpDhcp() ? "Yes" : "No");
}
delay(1);
debugger->printf("Temp sensor count: %i\r\n", this->getTempSensorCount());

View File

@@ -122,6 +122,7 @@ void setup() {
config.setTempSensorPin(14);
#endif
}
delay(1);
hw.setLed(config.getLedPin(), config.isLedInverted());
hw.setLedRgb(config.getLedPinRed(), config.getLedPinGreen(), config.getLedPinBlue(), config.isLedRgbInverted());
@@ -157,6 +158,13 @@ void setup() {
Debug.setSerialEnabled(true);
#endif
}
delay(1);
uint8_t c = config.getTempSensorCount();
for(int i = 0; i < c; i++) {
TempSensorConfig* tsc = config.getTempSensorConfig(i);
hw.confTempSensor(tsc->address, tsc->name, tsc->common);
}
double vcc = hw.getVcc();
@@ -188,6 +196,7 @@ void setup() {
debugD("ESP8266 SPIFFS");
spiffs = SPIFFS.begin();
#endif
delay(1);
if(spiffs) {
bool flashed = false;
@@ -244,6 +253,7 @@ void setup() {
return;
}
}
delay(1);
if(config.hasConfig()) {
if(Debug.isActive(RemoteDebug::INFO)) config.print(&Debug);
@@ -325,9 +335,10 @@ void loop() {
hw.updateTemperatures();
lastTemperatureRead = now;
uint8_t c = hw.getTempSensorCount();
if(strlen(config.getMqttHost()) > 0) {
bool anyChanged = false;
uint8_t c = hw.getTempSensorCount();
for(int i = 0; i < c; i++) {
bool changed = false;
TempSensorData* data = hw.getTempSensorData(i);

View File

@@ -97,14 +97,12 @@ bool HwTools::updateTemperatures() {
oneWire = new OneWire(tempSensorPin);
sensorApi = new DallasTemperature(this->oneWire);
sensorApi->begin();
delay(50);
delay(100);
tempSensorInit = true;
DeviceAddress addr;
sensorApi->requestTemperatures();
int c = sensorApi->getDeviceCount();
//Serial.print("Sensors found: ");
//Serial.println(c);
for(int i = 0; i < c; i++) {
bool found = false;
sensorApi->getAddress(addr, i);

View File

@@ -135,9 +135,10 @@ void AmsWebServer::temperature() {
String html;
int c = hw->getTempSensorCount();
int num = 8;
int start = server.hasArg("start") && !server.arg("start").isEmpty() ? server.arg("start").toInt() : 0;
int end = min(start + 4, c);
int end = min(start + num, c);
for(int i = start; i < end; i++) {
TempSensorData* data = hw->getTempSensorData(i);
@@ -160,7 +161,7 @@ void AmsWebServer::temperature() {
html += "<div class=\"row\"><div class=\"col-6\">";
if(start > 0) {
html += "<a href=\"?start=";
html += String(start-4, DEC);
html += String(start-num, DEC);
html += "\" class=\"btn btn-sm btn-outline-secondary\">previous</a>";
}
html += "</div><div class=\"col-6 text-right\">";