3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-06-10 06:31:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Powermeter modify getHeader

Browse source
This commit is contained in:
Patrick Amrhein 2024-05-20 22:09:40 +02:00
parent 0d45d3e4b5
commit 13d59237c0
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,7 +46,8 @@ class powermeter {
* @param *log * @param *log
* @returns void * @returns void
*/ */
bool setup(zeroExport_t *cfg, PubMqttType *mqtt, JsonObject *log) { bool setup(IApp *app, zeroExport_t *cfg, PubMqttType *mqtt, JsonObject *log) {
mApp = app;
mCfg = cfg; mCfg = cfg;
mMqtt = mqtt; mMqtt = mqtt;
mLog = log; mLog = log;
@ -277,6 +278,7 @@ class powermeter {
zeroExport_t *mCfg; zeroExport_t *mCfg;
PubMqttType *mMqtt = nullptr; PubMqttType *mMqtt = nullptr;
JsonObject *mLog; JsonObject *mLog;
IApp *mApp = nullptr;
unsigned long mPreviousTsp = millis(); unsigned long mPreviousTsp = millis();
@ -291,8 +293,9 @@ class powermeter {
*/ */
void setHeader(HTTPClient *h) { void setHeader(HTTPClient *h) {
h->setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS); h->setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
h->setUserAgent("Ahoy-Agent"); /// h->setUserAgent("Ahoy-Agent");
// TODO: Ahoy-0.8.850024-zero /// // TODO: Ahoy-0.8.850024-zero
h->setUserAgent(mApp->getVersion());
h->setConnectTimeout(500); h->setConnectTimeout(500);
h->setTimeout(1000); h->setTimeout(1000);
h->addHeader("Content-Type", "application/json"); h->addHeader("Content-Type", "application/json");

4
src/plugins/zeroExport/zeroExport.h
View file

@ -47,7 +47,7 @@ class ZeroExport {
mApi = api; mApi = api;
mMqtt = mqtt; mMqtt = mqtt;
mIsInitialized = mPowermeter.setup(mCfg, mqtt, &mLog); mIsInitialized = mPowermeter.setup(mApp, mCfg, mqtt, &mLog);
} }
/** loop /** loop
@ -106,7 +106,7 @@ class ZeroExport {
return; return;
} }
uint16_t groupPower = 0; uint16_t groupPower = 0;
uint16_t groupLimit = 0; uint16_t groupLimit = 0;
for (uint8_t inv = 0; inv < ZEROEXPORT_GROUP_MAX_INVERTERS; inv++) { for (uint8_t inv = 0; inv < ZEROEXPORT_GROUP_MAX_INVERTERS; inv++) {