|
@ -43,7 +43,7 @@ class ZeroExport { |
|
|
|
|
|
|
|
|
return ((unsigned)(mCfg->total_power - mCfg->power_avg) >= mCfg->power_avg) ? ivPower + mCfg->total_power : ivPower - mCfg->total_power; |
|
|
return ((unsigned)(mCfg->total_power - mCfg->power_avg) >= mCfg->power_avg) ? ivPower + mCfg->total_power : ivPower - mCfg->total_power; |
|
|
} |
|
|
} |
|
|
|
|
|
//C2T2-B91B
|
|
|
private: |
|
|
private: |
|
|
HTTPClient httpClient; |
|
|
HTTPClient httpClient; |
|
|
|
|
|
|
|
@ -63,6 +63,10 @@ class ZeroExport { |
|
|
return false; |
|
|
return false; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if(String(mCfg->monitor_url).endsWith("data.json?node_id=1")){ |
|
|
|
|
|
httpClient.setAuthorization("admin", mCfg->tibber_pw); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
int httpCode = httpClient.GET(); |
|
|
int httpCode = httpClient.GET(); |
|
|
if (httpCode == HTTP_CODE_OK) |
|
|
if (httpCode == HTTP_CODE_OK) |
|
|
{ |
|
|
{ |
|
@ -85,6 +89,8 @@ class ZeroExport { |
|
|
mCfg->total_power = responseBody.substring(responseBody.indexOf(":"), index).toDouble(); |
|
|
mCfg->total_power = responseBody.substring(responseBody.indexOf(":"), index).toDouble(); |
|
|
} else if(json.containsKey(F("emeters"))) { |
|
|
} else if(json.containsKey(F("emeters"))) { |
|
|
mCfg->total_power = (double)json[F("total_power")]; |
|
|
mCfg->total_power = (double)json[F("total_power")]; |
|
|
|
|
|
} else if(String(mCfg->monitor_url).endsWith("data.json?node_id=1") ) { |
|
|
|
|
|
tibber_parse(); |
|
|
} else { |
|
|
} else { |
|
|
DPRINTLN(DBG_INFO, (F("ZeroExport() json error: cant find value in this query: ") + responseBody)); |
|
|
DPRINTLN(DBG_INFO, (F("ZeroExport() json error: cant find value in this query: ") + responseBody)); |
|
|
return false; |
|
|
return false; |
|
@ -99,6 +105,11 @@ class ZeroExport { |
|
|
return true; |
|
|
return true; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void tibber_parse() |
|
|
|
|
|
{ |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// private member variables
|
|
|
// private member variables
|
|
|
cfgzeroExport_t *mCfg; |
|
|
cfgzeroExport_t *mCfg; |
|
|
settings_t *mConfig; |
|
|
settings_t *mConfig; |
|
|