6b425d96b0
* PowerMeter: gracefully handle non-float MQTT values * PowerMeter: update _lastPowerMeterUpdate conservatively update the timestampt only if the topic actually matched any subscription and if the value could be parsed as a float. * PowerMeter: unsubscribe before subscribing * PowerMeter: organize subscriptions in a map this allows for a slightly more elegant code and reduced amount of code overall. * PowerMeter: clean up header * move private methods to private section of class declaration. * remove unused member variable.
77 lines
1.8 KiB
C++
77 lines
1.8 KiB
C++
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
#pragma once
|
|
|
|
#include "Configuration.h"
|
|
#include <espMqttClient.h>
|
|
#include <Arduino.h>
|
|
#include <map>
|
|
#include <list>
|
|
#include "SDM.h"
|
|
#include "sml.h"
|
|
|
|
#ifndef SDM_RX_PIN
|
|
#define SDM_RX_PIN 13
|
|
#endif
|
|
|
|
#ifndef SDM_TX_PIN
|
|
#define SDM_TX_PIN 32
|
|
#endif
|
|
|
|
#ifndef SML_RX_PIN
|
|
#define SML_RX_PIN 35
|
|
#endif
|
|
|
|
typedef struct {
|
|
const unsigned char OBIS[6];
|
|
void (*Fn)(double&);
|
|
float* Arg;
|
|
} OBISHandler;
|
|
|
|
class PowerMeterClass {
|
|
public:
|
|
enum SOURCE {
|
|
SOURCE_MQTT = 0,
|
|
SOURCE_SDM1PH = 1,
|
|
SOURCE_SDM3PH = 2,
|
|
SOURCE_HTTP = 3,
|
|
SOURCE_SML = 4
|
|
};
|
|
void init();
|
|
void loop();
|
|
float getPowerTotal(bool forceUpdate = true);
|
|
uint32_t getLastPowerMeterUpdate();
|
|
|
|
private:
|
|
void mqtt();
|
|
|
|
void onMqttMessage(const espMqttClientTypes::MessageProperties& properties,
|
|
const char* topic, const uint8_t* payload, size_t len, size_t index, size_t total);
|
|
|
|
bool _verboseLogging = true;
|
|
uint32_t _lastPowerMeterCheck;
|
|
// Used in Power limiter for safety check
|
|
uint32_t _lastPowerMeterUpdate;
|
|
|
|
float _powerMeter1Power = 0.0;
|
|
float _powerMeter2Power = 0.0;
|
|
float _powerMeter3Power = 0.0;
|
|
float _powerMeter1Voltage = 0.0;
|
|
float _powerMeter2Voltage = 0.0;
|
|
float _powerMeter3Voltage = 0.0;
|
|
float _powerMeterImport = 0.0;
|
|
float _powerMeterExport = 0.0;
|
|
|
|
std::map<String, float*> _mqttSubscriptions;
|
|
|
|
void readPowerMeter();
|
|
|
|
bool smlReadLoop();
|
|
const std::list<OBISHandler> smlHandlerList{
|
|
{{0x01, 0x00, 0x10, 0x07, 0x00, 0xff}, &smlOBISW, &_powerMeter1Power},
|
|
{{0x01, 0x00, 0x01, 0x08, 0x00, 0xff}, &smlOBISWh, &_powerMeterImport},
|
|
{{0x01, 0x00, 0x02, 0x08, 0x00, 0xff}, &smlOBISWh, &_powerMeterExport}
|
|
};
|
|
};
|
|
|
|
extern PowerMeterClass PowerMeter;
|