Merge branch 'development'

.editorconfig

@@ -0,0 +1,9 @@
+# http://editorconfig.org
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true

.vscode/extensions.json

@@ -3,6 +3,7 @@
     // for the documentation about the extensions.json format
     "recommendations": [
         "DavidAnson.vscode-markdownlint",
+        "EditorConfig.EditorConfig",
         "Vue.volar",
         "Vue.vscode-typescript-vue-plugin",
         "platformio.platformio-ide"

include/Configuration.h

@@ -5,7 +5,7 @@
 #include <cstdint>
 
 #define CONFIG_FILENAME "/config.json"
-#define CONFIG_VERSION 0x00011a00 // 0.1.26 // make sure to clean all after change
+#define CONFIG_VERSION 0x00011b00 // 0.1.27 // make sure to clean all after change
 
 #define WIFI_MAX_SSID_STRLEN 32
 #define WIFI_MAX_PASSWORD_STRLEN 64
@@ -152,6 +152,7 @@ struct CONFIG_T {
         struct {
             int8_t PaLevel;
             uint32_t Frequency;
+            uint8_t CountryMode;
         } Cmt;
         bool VerboseLogging;
     } Dtu;
@@ -167,7 +168,10 @@ struct CONFIG_T {
         uint8_t Rotation;
         uint8_t Contrast;
         uint8_t Language;
-        uint32_t DiagramDuration;
+        struct {
+            uint32_t Duration;
+            uint8_t Mode;
+        } Diagram;
     } Display;
 
     struct {
@@ -256,4 +260,4 @@ class ConfigurationClass {
     INVERTER_CONFIG_T* getInverterConfig(const uint64_t serial);
 };
 
-extern ConfigurationClass Configuration;
+extern ConfigurationClass Configuration;

include/Display_Graphic.h

@@ -6,6 +6,14 @@
 #include <TaskSchedulerDeclarations.h>
 #include <U8g2lib.h>
 
+#define CHART_HEIGHT 20 // chart area hight in pixels
+#define CHART_WIDTH 47 // chart area width in pixels
+
+// Left-Upper position of diagram is drawn
+// (text of Y-axis is display left of that pos)
+#define CHART_POSX 80
+#define CHART_POSY 0
+
 enum DisplayType_t {
     None,
     PCD8544,
@@ -15,6 +23,13 @@ enum DisplayType_t {
     DisplayType_Max,
 };
 
+enum DiagramMode_t {
+    Off,
+    Small,
+    Fullscreen,
+    DisplayMode_Max,
+};
+
 class DisplayGraphicClass {
 public:
     DisplayGraphicClass();
@@ -25,6 +40,7 @@ class DisplayGraphicClass {
     void setStatus(const bool turnOn);
     void setOrientation(const uint8_t rotation = DISPLAY_ROTATION);
     void setLanguage(const uint8_t language);
+    void setDiagramMode(DiagramMode_t mode);
     void setStartupDisplay();
 
     DisplayGraphicDiagramClass& Diagram();
@@ -47,14 +63,15 @@ class DisplayGraphicClass {
     bool _displayTurnedOn;
 
     DisplayType_t _display_type = DisplayType_t::None;
+    DiagramMode_t _diagram_mode = DiagramMode_t::Off;
     uint8_t _display_language = DISPLAY_LANGUAGE;
     uint8_t _mExtra;
-    uint16_t _period = 1000;
-    uint16_t _interval = 60000; // interval at which to power save (milliseconds)
+    const uint16_t _period = 1000;
+    const uint16_t _interval = 60000; // interval at which to power save (milliseconds)
     uint32_t _previousMillis = 0;
     char _fmtText[32];
     bool _isLarge = false;
     uint8_t _lineOffsets[5];
 };
 
-extern DisplayGraphicClass Display;
+extern DisplayGraphicClass Display;

include/Display_Graphic_Diagram.h

@@ -5,36 +5,32 @@
 #include <U8g2lib.h>
 #include <array>
 
-#define CHART_HEIGHT 20 // chart area hight in pixels
-#define CHART_WIDTH 47 // chart area width in pixels
-
-// Left-Upper position of diagram is drawn
-// (text of Y-axis is display left of that pos)
-#define DIAG_POSX 80
-#define DIAG_POSY 0
+#define MAX_DATAPOINTS 128
 
 class DisplayGraphicDiagramClass {
 public:
     DisplayGraphicDiagramClass();
 
     void init(Scheduler& scheduler, U8G2* display);
-    void redraw(uint8_t screenSaverOffsetX);
+    void redraw(uint8_t screenSaverOffsetX, uint8_t xPos, uint8_t yPos, uint8_t width, uint8_t height, bool isFullscreen);
 
     void updatePeriod();
 
 private:
     void averageLoop();
     void dataPointLoop();
 
-    static uint32_t getSecondsPerDot();
+    uint32_t getSecondsPerDot();
 
     Task _averageTask;
     Task _dataPointTask;
 
     U8G2* _display = nullptr;
-    std::array<float, CHART_WIDTH> _graphValues = {};
+    std::array<float, MAX_DATAPOINTS> _graphValues = {};
     uint8_t _graphValuesCount = 0;
 
+    uint8_t _chartWidth = MAX_DATAPOINTS;
+
     float _iRunningAverage = 0;
     uint16_t _iRunningAverageCnt = 0;
 };

include/HttpPowerMeter.h

@@ -10,17 +10,24 @@ class HttpPowerMeterClass {
     void init();
     bool updateValues();
     float getPower(int8_t phase);
-    bool httpRequest(const char* url, Auth authType, const char* username, const char* password, const char* httpHeader, const char* httpValue, uint32_t timeout,
-        char* response, size_t responseSize, char* error, size_t errorSize);
-    float getFloatValueByJsonPath(const char* jsonString, const char* jsonPath, float &value);
+    char httpPowerMeterError[256];
+    bool queryPhase(int phase, const String& url, Auth authType, const char* username, const char* password, 
+        const char* httpHeader, const char* httpValue, uint32_t timeout, const char* jsonPath);
 
-private:
-     void extractUrlComponents(const String& url, String& protocol, String& hostname, String& uri);
-     void prepareRequest(uint32_t timeout, const char* httpHeader, const char* httpValue);
-     HTTPClient httpClient;
-     float power[POWERMETER_MAX_PHASES];
-     String sha256(const String& data);
-
+
+private:    
+    float power[POWERMETER_MAX_PHASES];
+    HTTPClient httpClient;
+    String httpResponse;
+    bool httpRequest(int phase, WiFiClient &wifiClient, const String& host, const String& uri, bool https, Auth authType, const char* username,
+           const char* password, const char* httpHeader, const char* httpValue, uint32_t timeout, const char* jsonPath);
+    void extractUrlComponents(const String& url, String& protocol, String& host, String& uri);
+    String extractParam(String& authReq, const String& param, const char delimit);
+    String getcNonce(const int len);
+    String getDigestAuth(String& authReq, const String& username, const String& password, const String& method, const String& uri, unsigned int counter);
+    bool tryGetFloatValueForPhase(int phase, int httpCode, const char* jsonPath);
+    void prepareRequest(uint32_t timeout, const char* httpHeader, const char* httpValue);    
+    String sha256(const String& data);    
 };
 
 extern HttpPowerMeterClass HttpPowerMeter;

include/WebApi_dtu.h

@@ -13,4 +13,5 @@ class WebApiDtuClass {
     void onDtuAdminPost(AsyncWebServerRequest* request);
 
     AsyncWebServer* _server;
-};
+    bool _performReload = false;
+};

include/WebApi_errors.h

@@ -15,6 +15,7 @@ enum WebApiError {
     DtuPollZero,
     DtuInvalidPowerLevel,
     DtuInvalidCmtFrequency,
+    DtuInvalidCmtCountry,
 
     ConfigBase = 3000,
     ConfigNotDeleted,
@@ -89,4 +90,4 @@ enum WebApiError {
 
     HardwareBase = 12000,
     HardwarePinMappingLength,
-};
+};

include/defaults.h

@@ -83,7 +83,8 @@
 #define DTU_POLL_INTERVAL 5U
 #define DTU_NRF_PA_LEVEL 0U
 #define DTU_CMT_PA_LEVEL 0
-#define DTU_CMT_FREQUENCY 865000U
+#define DTU_CMT_FREQUENCY 865000000U
+#define DTU_CMT_COUNTRY_MODE 0U
 
 #define MQTT_HASS_ENABLED false
 #define MQTT_HASS_EXPIRE true
@@ -99,9 +100,58 @@
 #define DISPLAY_CONTRAST 60U
 #define DISPLAY_LANGUAGE 0U
 #define DISPLAY_DIAGRAM_DURATION (10UL * 60UL * 60UL)
+#define DISPLAY_DIAGRAM_MODE 1U
 
 #define REACHABLE_THRESHOLD 2U
 
+#define MAX_INVERTER_LIMIT 2250
+#define VEDIRECT_ENABLED false
+#define VEDIRECT_VERBOSE_LOGGING false
+#define VEDIRECT_UPDATESONLY true
+
+#define POWERMETER_ENABLED false
+#define POWERMETER_INTERVAL 10
+#define POWERMETER_SOURCE 2
+#define POWERMETER_SDMBAUDRATE 9600
+#define POWERMETER_SDMADDRESS 1
+
+
+#define POWERLIMITER_ENABLED false
+#define POWERLIMITER_SOLAR_PASSTHROUGH_ENABLED true
+#define POWERLIMITER_SOLAR_PASSTHROUGH_LOSSES 3
+#define POWERLIMITER_BATTERY_DRAIN_STRATEGY 0
+#define POWERLIMITER_INTERVAL 10
+#define POWERLIMITER_IS_INVERTER_BEHIND_POWER_METER true
+#define POWERLIMITER_INVERTER_ID 0
+#define POWERLIMITER_INVERTER_CHANNEL_ID 0
+#define POWERLIMITER_TARGET_POWER_CONSUMPTION 0
+#define POWERLIMITER_TARGET_POWER_CONSUMPTION_HYSTERESIS 0
+#define POWERLIMITER_LOWER_POWER_LIMIT 10
+#define POWERLIMITER_UPPER_POWER_LIMIT 800
+#define POWERLIMITER_BATTERY_SOC_START_THRESHOLD 80
+#define POWERLIMITER_BATTERY_SOC_STOP_THRESHOLD 20
+#define POWERLIMITER_VOLTAGE_START_THRESHOLD 50.0
+#define POWERLIMITER_VOLTAGE_STOP_THRESHOLD 49.0
+#define POWERLIMITER_VOLTAGE_LOAD_CORRECTION_FACTOR 0.001
+#define POWERLIMITER_RESTART_HOUR -1
+#define POWERLIMITER_FULL_SOLAR_PASSTHROUGH_SOC 100
+#define POWERLIMITER_FULL_SOLAR_PASSTHROUGH_START_VOLTAGE 100.0
+#define POWERLIMITER_FULL_SOLAR_PASSTHROUGH_STOP_VOLTAGE 100.0
+
+#define BATTERY_ENABLED false
+#define BATTERY_PROVIDER 0 // Pylontech CAN receiver
+#define BATTERY_JKBMS_INTERFACE 0
+#define BATTERY_JKBMS_POLLING_INTERVAL 5
+
+#define HUAWEI_ENABLED false
+#define HUAWEI_CAN_CONTROLLER_FREQUENCY 8000000UL
+#define HUAWEI_AUTO_POWER_VOLTAGE_LIMIT 42.0
+#define HUAWEI_AUTO_POWER_ENABLE_VOLTAGE_LIMIT 42.0
+#define HUAWEI_AUTO_POWER_LOWER_POWER_LIMIT 150
+#define HUAWEI_AUTO_POWER_UPPER_POWER_LIMIT 2000
+
+#define VERBOSE_LOGGING true
+
 #define LED_BRIGHTNESS 100U
 
 #define MAX_INVERTER_LIMIT 2250
@@ -154,4 +204,4 @@
 
 #define LED_BRIGHTNESS 100U
 
-#define MAX_INVERTER_LIMIT 2250
+#define MAX_INVERTER_LIMIT 2250