new settings
This commit is contained in:
16
src/main.cpp
16
src/main.cpp
@@ -151,6 +151,12 @@ void extractTasmotaValues(const String& url, String values[6], int decimalPlaces
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// for (int i = 0; i < 6; i++) {
|
||||||
|
// Serial.println(String(values[i]));
|
||||||
|
// }
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
Serial.println("HTTP Fehler: " + String(httpResponseCode));
|
Serial.println("HTTP Fehler: " + String(httpResponseCode));
|
||||||
}
|
}
|
||||||
@@ -168,6 +174,8 @@ void connectToWiFi() {
|
|||||||
Serial.println("WLAN Verbindungsaufbau zu: " + String(ssidList[current_ap]));
|
Serial.println("WLAN Verbindungsaufbau zu: " + String(ssidList[current_ap]));
|
||||||
Serial.println("Passwort: " + String(passwordList[current_ap]));
|
Serial.println("Passwort: " + String(passwordList[current_ap]));
|
||||||
|
|
||||||
|
lcd.clear();
|
||||||
|
|
||||||
_lcd_display_text(0, "Bitte warten", "center");
|
_lcd_display_text(0, "Bitte warten", "center");
|
||||||
_lcd_display_text(1, "WLAN verbinden ", "left");
|
_lcd_display_text(1, "WLAN verbinden ", "left");
|
||||||
|
|
||||||
@@ -340,28 +348,28 @@ void loop() {
|
|||||||
case 1:
|
case 1:
|
||||||
if (tasmota_smr_ip_values[2] != tasmota_smr_ip_values_old[2] || isModeChanged == true) {
|
if (tasmota_smr_ip_values[2] != tasmota_smr_ip_values_old[2] || isModeChanged == true) {
|
||||||
isModeChanged = false;
|
isModeChanged = false;
|
||||||
_lcd_display_text(0, "1.8.0 (HT+NT):", "center");
|
_lcd_display_text(0, tasmota_smr_json_prefix_1_8_0_lcd_text.c_str(), "center");
|
||||||
update_180_values();
|
update_180_values();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
if (tasmota_smr_ip_values[3] != tasmota_smr_ip_values_old[3] || isModeChanged == true) {
|
if (tasmota_smr_ip_values[3] != tasmota_smr_ip_values_old[3] || isModeChanged == true) {
|
||||||
isModeChanged = false;
|
isModeChanged = false;
|
||||||
_lcd_display_text(0, "1.8.1 (HT):", "center");
|
_lcd_display_text(0, tasmota_smr_json_prefix_1_8_1_lcd_text.c_str(), "center");
|
||||||
update_181_values();
|
update_181_values();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 3:
|
case 3:
|
||||||
if (tasmota_smr_ip_values[4] != tasmota_smr_ip_values_old[4] || isModeChanged == true) {
|
if (tasmota_smr_ip_values[4] != tasmota_smr_ip_values_old[4] || isModeChanged == true) {
|
||||||
isModeChanged = false;
|
isModeChanged = false;
|
||||||
_lcd_display_text(0, "1.8.2 (NT):", "center");
|
_lcd_display_text(0, tasmota_smr_json_prefix_1_8_2_lcd_text.c_str(), "center");
|
||||||
update_182_values();
|
update_182_values();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 4:
|
case 4:
|
||||||
if (tasmota_smr_ip_values[5] != tasmota_smr_ip_values_old[5] || isModeChanged == true) {
|
if (tasmota_smr_ip_values[5] != tasmota_smr_ip_values_old[5] || isModeChanged == true) {
|
||||||
isModeChanged = false;
|
isModeChanged = false;
|
||||||
_lcd_display_text(0, "2.8.0 (Einsp.):", "center");
|
_lcd_display_text(0, tasmota_smr_json_prefix_2_8_0_lcd_text.c_str(), "center");
|
||||||
update_280_values();
|
update_280_values();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -22,26 +22,56 @@ const char* passwordList[] = {
|
|||||||
|
|
||||||
// ################## Tasmota Einstellungen ###################
|
// ################## Tasmota Einstellungen ###################
|
||||||
|
|
||||||
|
// ===================== Energiemessung =======================
|
||||||
|
|
||||||
|
|
||||||
// Zwischenstecker am Balkonkraftwerk
|
// Zwischenstecker am Balkonkraftwerk
|
||||||
String tasmota_plug_ip = "192.168.178.222";
|
String tasmota_plug_ip = "192.168.178.237";
|
||||||
String tasmota_plug_json_prefix_power = "Power";
|
String tasmota_plug_json_prefix_power = "Power";
|
||||||
|
|
||||||
// SmartMeterReader
|
// SmartMeterReader
|
||||||
String tasmota_smr_ip = "192.168.178.236";
|
String tasmota_smr_ip = "192.168.178.236";
|
||||||
String tasmota_smr_json_prefix_power = "Power";
|
String tasmota_smr_json_prefix_power = "Power";
|
||||||
String tasmota_smr_json_prefix_1_8_0 = "E_in_180";
|
|
||||||
String tasmota_smr_json_prefix_1_8_1 = "E_in_181";
|
|
||||||
String tasmota_smr_json_prefix_1_8_2 = "E_in_182";
|
|
||||||
String tasmota_smr_json_prefix_2_8_0 = "E_in_280";
|
|
||||||
|
|
||||||
|
|
||||||
|
// ================== Register-Einstellungen ==================
|
||||||
|
|
||||||
|
// ------------- 1.8.0 -------------
|
||||||
|
// Überschrift im Display, wenn das 1.8.0 Register angezeigt wird (LCD Display Zeile 1)
|
||||||
|
String tasmota_smr_json_prefix_1_8_0_lcd_text = "1.8.0 (HT+NT):";
|
||||||
|
// Tasmota Script JSON Prefix für das 1.8.0 Register (Wert in Zeile 2)
|
||||||
|
String tasmota_smr_json_prefix_1_8_0 = "E_in_180";
|
||||||
|
|
||||||
|
// ------------- 1.8.1 -------------
|
||||||
|
// Überschrift im Display, wenn das 1.8.1 Register angezeigt wird (LCD Display Zeile 1)
|
||||||
|
String tasmota_smr_json_prefix_1_8_1_lcd_text = "1.8.1 (NT):";
|
||||||
|
// Tasmota Script JSON Prefix für das 1.8.1 Register (Wert in Zeile 2)
|
||||||
|
String tasmota_smr_json_prefix_1_8_1 = "E_in_181";
|
||||||
|
|
||||||
|
// ------------- 1.8.2 -------------
|
||||||
|
// Überschrift im Display, wenn das 1.8.2 Register angezeigt wird (LCD Display Zeile 1)
|
||||||
|
String tasmota_smr_json_prefix_1_8_2_lcd_text = "1.8.2 (HT):";
|
||||||
|
// Tasmota Script JSON Prefix für das 1.8.2 Register (Wert in Zeile 2)
|
||||||
|
String tasmota_smr_json_prefix_1_8_2 = "E_in_182";
|
||||||
|
|
||||||
|
// ------------- 2.8.0 -------------
|
||||||
|
|
||||||
|
// Überschrift im Display, wenn das 2.8.0 Register angezeigt wird (LCD Display Zeile 1)
|
||||||
|
String tasmota_smr_json_prefix_2_8_0_lcd_text = "2.8.0 (Einsp.):";
|
||||||
|
// Tasmota Script JSON Prefix für das 2.8.0 Register (Wert in Zeile 2)
|
||||||
|
String tasmota_smr_json_prefix_2_8_0 = "E_out_280";
|
||||||
|
|
||||||
|
|
||||||
|
// ------- Nachkommastellen --------
|
||||||
// Anzahl Nachkommastellen bei den ausgelesenen Tasmota Werten
|
// Anzahl Nachkommastellen bei den ausgelesenen Tasmota Werten
|
||||||
// -1 = Alle / 0 = Keine / 2 = 2 Nachkommastellen
|
// -1 = Alle / 0 = Keine / 2 = 2 Nachkommastellen
|
||||||
int tasmota_decimalplaces = 2;
|
int tasmota_decimalplaces = 2;
|
||||||
|
|
||||||
|
|
||||||
// ################# Allgemeine Einstellungen #################
|
// ################# Allgemeine Einstellungen #################
|
||||||
|
|
||||||
// Aktualisierungsrate im Bildschirm aktuelle Leistung (in Millisekunden)
|
// Aktualisierungsrate im Bildschirm aktuelle Leistung (in Millisekunden)
|
||||||
unsigned long refreshrate_power = 2500;
|
unsigned long refreshrate_power = 3000;
|
||||||
|
|
||||||
// Aktualisierungsrate in den Bildschirmen der Verbrauchsdaten (in Millisekunden)
|
// Aktualisierungsrate in den Bildschirmen der Verbrauchsdaten (in Millisekunden)
|
||||||
unsigned long refreshrate_consumption = 15000;
|
unsigned long refreshrate_consumption = 15000;
|
||||||
@@ -49,4 +79,6 @@ unsigned long refreshrate_consumption = 15000;
|
|||||||
|
|
||||||
// ############################################################
|
// ############################################################
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#endif // SETTINGS_H
|
#endif // SETTINGS_H
|
||||||
Reference in New Issue
Block a user