3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-07-18 00:37:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14 from DanielR92/patch-1

Browse source 
fix setup.html formular for tibber and fix tibber query and timer
This commit is contained in:
tictrick 2024-05-14 21:23:57 +02:00 • committed by GitHub
commit 255b0c6828
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/plugins/zeroExport/powermeter.h
View file

@ -103,8 +103,8 @@ class powermeter {
863.25 MHz - geht (ohne Tibber Probleme) => 3 & 4 Balken 863.25 MHz - geht (ohne Tibber Probleme) => 3 & 4 Balken
*/ */
case zeroExportPowermeterType_t::Tibber: case zeroExportPowermeterType_t::Tibber:
if(mCfg->groups[group].pm_refresh < 3) mCfg->groups[group].pm_refresh = 3;
result = getPowermeterWattsTibber(*mLog, group, &power); result = getPowermeterWattsTibber(*mLog, group, &power);
mPreviousTsp += 2000; // Zusätzliche Pause
break; break;
#endif #endif
#if defined(ZEROEXPORT_POWERMETER_SHRDZM) #if defined(ZEROEXPORT_POWERMETER_SHRDZM)
@ -114,15 +114,16 @@ class powermeter {
#endif #endif
} }
if (result) { //if (mMqtt->isConnected()) mMqtt->publish(String("zero/state/groups/" + String(group) + "/result").c_str(), String(ret).c_str(), false);
if (result)
{
bufferWrite(power, group); bufferWrite(power, group);
// MQTT - Powermeter // MQTT - Powermeter
// if (mCfg->debug) {
if (mMqtt->isConnected()) { if (mMqtt->isConnected()) {
mMqtt->publish(String("zero/state/groups/" + String(group) + "/powermeter/P").c_str(), String(ah::round1(power)).c_str(), false); mMqtt->publish(String("zero/state/groups/" + String(group) + "/powermeter/P").c_str(), String(ah::round1(power)).c_str(), false);
} }
// }
} }
} }
} }
@ -181,7 +182,7 @@ class powermeter {
} }
/** onMqttMessage /** onMqttMessage
* * This function is needed for all mqtt connections between ahoy and other devices.
*/ */
void onMqttMessage(JsonObject obj) { void onMqttMessage(JsonObject obj) {
String topic = String(obj["topic"]); String topic = String(obj["topic"]);
@ -198,6 +199,7 @@ class powermeter {
if (strcmp(mCfg->groups[group].pm_src, String(topic).c_str())) continue; if (strcmp(mCfg->groups[group].pm_src, String(topic).c_str())) continue;
float power = 0.0; float power = 0.0;
power = (uint16_t)obj["val"]; power = (uint16_t)obj["val"];
bufferWrite(power, group); bufferWrite(power, group);
@ -479,20 +481,19 @@ class powermeter {
{{0x01, 0x00, 0x02, 0x08, 0x00, 0xff}, &smlOBISWh, &_powerMeterExport}}; {{0x01, 0x00, 0x02, 0x08, 0x00, 0xff}, &smlOBISWh, &_powerMeterExport}};
bool getPowermeterWattsTibber(JsonObject logObj, uint8_t group, float *power) { bool getPowermeterWattsTibber(JsonObject logObj, uint8_t group, float *power) {
mPreviousTsp = mPreviousTsp + 2000; // Zusätzliche Pause
bool result = false; bool result = false;
logObj["mod"] = "getPowermeterWattsTibber"; logObj["mod"] = "getPowermeterWattsTibber";
String auth = mCfg->groups[group].pm_pass; String auth = mCfg->groups[group].pm_pass;
String url = String("http://") + mCfg->groups[group].pm_url + String("/") + String(mCfg->groups[group].pm_jsonPath); String url = String("http://") + mCfg->groups[group].pm_src + String("/") + String(mCfg->groups[group].pm_jsonPath);
setHeader(&http); setHeader(&http);
http.begin(url); http.begin(url);
http.addHeader("Authorization", "Basic " + auth); http.addHeader("Authorization", "Basic " + auth);
if (http.GET() == HTTP_CODE_OK && http.getSize() > 0) { if (http.GET() == HTTP_CODE_OK && http.getSize() > 0)
{
String myString = http.getString(); String myString = http.getString();
double readVal = 0; double readVal = 0;
unsigned char c; unsigned char c;

4
src/web/html/setup.html
View file

@ -1590,9 +1590,9 @@
divsToHide.childNodes[5].style.display = 'none'; divsToHide.childNodes[5].style.display = 'none';
divsToHide.childNodes[6].style.display = 'none'; divsToHide.childNodes[6].style.display = 'none';
} }
else if(value == "Tibber") { /*else if(value == "Tibber") {
divsToHide.childNodes[4].style.display = 'none'; divsToHide.childNodes[4].style.display = 'none';
} }*/
else if(value == "Shrdzm") { else if(value == "Shrdzm") {
divsToHide.childNodes[1].style.display = 'none'; divsToHide.childNodes[1].style.display = 'none';
divsToHide.childNodes[2].style.display = 'none'; divsToHide.childNodes[2].style.display = 'none';