Initial changes for v2.3

lib/AmsData/include/AmsData.h

@@ -1,8 +1,15 @@
+/**
+ * @copyright Utilitech AS 2023
+ * License: Fair Source
+ * 
+ */
+
 #ifndef _AMSDATA_H
 #define _AMSDATA_H
 
 #include "Arduino.h"
 #include <Timezone.h>
+#include "OBIScodes.h"
 
 enum AmsType {
     AmsTypeAutodetect = 0x00,
@@ -21,6 +28,7 @@ public:
     AmsData();
 
     void apply(AmsData& other);
+    void apply(const OBIS_code_t obis, double value);
 
     uint64_t getLastUpdateMillis();
 
@@ -68,6 +76,7 @@ public:
 
     bool isThreePhase();
     bool isTwoPhase();
+    bool isCounterEstimated();
 
     int8_t getLastError();
     void setLastError(int8_t);

lib/AmsData/include/AmsMqttHandler.h

@@ -1,37 +0,0 @@
-#ifndef _AMSMQTTHANDLER_H
-#define _AMSMQTTHANDLER_H
-
-#include "Arduino.h"
-#include <MQTT.h>
-#include "AmsData.h"
-#include "AmsConfiguration.h"
-#include "EnergyAccounting.h"
-#include "HwTools.h"
-#include "EntsoeApi.h"
-
-#if defined(ESP32)
-#include <esp_task_wdt.h>
-#endif
-
-class AmsMqttHandler {
-public:
-    AmsMqttHandler(MQTTClient* mqtt, char* buf) {
-        this->mqtt = mqtt;
-        this->json = buf;
-    };
-    virtual ~AmsMqttHandler() {};
-
-    virtual bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea, EntsoeApi* eapi);
-    virtual bool publishTemperatures(AmsConfiguration*, HwTools*);
-    virtual bool publishPrices(EntsoeApi* eapi);
-    virtual bool publishSystem(HwTools*, EntsoeApi*, EnergyAccounting*);
-
-protected:
-    MQTTClient* mqtt;
-    char* json;
-    uint16_t BufferSize = 2048;
-
-    bool loop();
-};
-
-#endif

lib/AmsData/include/OBIScodes.h

@@ -0,0 +1,79 @@
+/**
+ * @copyright Utilitech AS 2023
+ * License: Fair Source
+ * 
+ */
+
+#ifndef _OBISCODES_H
+#define _OBISCODES_H
+
+#include "lwip/def.h"
+
+#define OBIS_MEDIUM_ABSTRACT 0
+#define OBIS_MEDIUM_ELECTRICITY 1
+
+#define OBIS_CHAN_0 0
+#define OBIS_CHAN_1 1
+
+#define OBIS_RANGE_NA 0xFF
+
+struct OBIS_head_t {
+    uint8_t medium;
+    uint8_t channel;
+} __attribute__((packed));
+
+struct OBIS_code_t {
+    uint8_t sensor;
+    uint8_t gr;
+    uint8_t tariff;
+} __attribute__((packed));
+
+struct OBIS_t {
+    OBIS_head_t head;
+    OBIS_code_t code;
+    uint8_t range;
+} __attribute__((packed));
+
+
+const OBIS_code_t OBIS_NULL PROGMEM =                  {   0,   0,   0 };
+
+const OBIS_code_t OBIS_VERSION PROGMEM =               {   0,   2, 129 };
+const OBIS_code_t OBIS_METER_MODEL PROGMEM =           {  96,   1,   1 };
+const OBIS_code_t OBIS_METER_MODEL_2 PROGMEM =         {  96,   1,   7 };
+const OBIS_code_t OBIS_METER_ID PROGMEM =              {  96,   1,   0 };
+const OBIS_code_t OBIS_METER_ID_2 PROGMEM =            {   0,   0,   5 };
+const OBIS_code_t OBIS_METER_TIMESTAMP PROGMEM =       {   1,   0,   0 };
+
+const OBIS_code_t OBIS_ACTIVE_IMPORT PROGMEM =         {   1,   7,   0 };
+const OBIS_code_t OBIS_ACTIVE_IMPORT_COUNT PROGMEM =   {   1,   8,   0 };
+const OBIS_code_t OBIS_ACTIVE_EXPORT PROGMEM =         {   2,   7,   0 };
+const OBIS_code_t OBIS_ACTIVE_EXPORT_COUNT PROGMEM =   {   2,   8,   0 };
+const OBIS_code_t OBIS_REACTIVE_IMPORT PROGMEM =       {   3,   7,   0 };
+const OBIS_code_t OBIS_REACTIVE_IMPORT_COUNT PROGMEM = {   3,   8,   0 };
+const OBIS_code_t OBIS_REACTIVE_EXPORT PROGMEM =       {   4,   7,   0 };
+const OBIS_code_t OBIS_REACTIVE_EXPORT_COUNT PROGMEM = {   4,   8,   0 };
+
+const OBIS_code_t OBIS_POWER_FACTOR PROGMEM =          {  13,   7,   0 };
+
+const OBIS_code_t OBIS_ACTIVE_IMPORT_L1 PROGMEM =      {  21,   7,   0 };
+const OBIS_code_t OBIS_ACTIVE_EXPORT_L1 PROGMEM =      {  22,   7,   0 };
+
+const OBIS_code_t OBIS_CURRENT_L1 PROGMEM =            {  31,   7,   0 };
+const OBIS_code_t OBIS_VOLTAGE_L1 PROGMEM =            {  32,   7,   0 };
+const OBIS_code_t OBIS_POWER_FACTOR_L1 PROGMEM =       {  33,   7,   0 };
+
+const OBIS_code_t OBIS_ACTIVE_IMPORT_L2 PROGMEM =      {  41,   7,   0 };
+const OBIS_code_t OBIS_ACTIVE_EXPORT_L2 PROGMEM =      {  42,   7,   0 };
+
+const OBIS_code_t OBIS_CURRENT_L2 PROGMEM =            {  51,   7,   0 };
+const OBIS_code_t OBIS_VOLTAGE_L2 PROGMEM =            {  52,   7,   0 };
+const OBIS_code_t OBIS_POWER_FACTOR_L2 PROGMEM =       {  53,   7,   0 };
+
+const OBIS_code_t OBIS_ACTIVE_IMPORT_L3 PROGMEM =      {  61,   7,   0 };
+const OBIS_code_t OBIS_ACTIVE_EXPORT_L3 PROGMEM =      {  62,   7,   0 };
+
+const OBIS_code_t OBIS_CURRENT_L3 PROGMEM =            {  71,   7,   0 };
+const OBIS_code_t OBIS_VOLTAGE_L3 PROGMEM =            {  72,   7,   0 };
+const OBIS_code_t OBIS_POWER_FACTOR_L3 PROGMEM =       {  73,   7,   0 };
+
+#endif