Pulled branch develop to main

.gitignore

@@ -1,10 +1,11 @@
-*.dta
-PV_Manager.json
-Project_Default.xml
-.idea
-__pycache__
-venv
-const.py
-evs.cfg
-Literature
-Logo
+*.dta
+PV_Manager.json
+Project_Default.xml
+.idea
+__pycache__
+venv
+const.py
+evs.cfg
+Literature
+Logo
+evsGUI.ini

.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Python Debugger: Current File",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${file}",
+            "console": "integratedTerminal"
+        }
+    ]
+}

LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2022 Klaus Mezger
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2022 Klaus Mezger
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

PV_Manager.json

@@ -1,14 +1,14 @@
 {
     "manual": {
-        "currentSet": 10,
-        "chargeLimit": 81.0,
-        "3_phases": false,
+        "currentSet": 12,
+        "chargeLimit": 90.0,
+        "3_phases": true,
         "phaseSet": true
     },
     "pv": {
         "max_1_Ph_current": 15,
         "min_3_Ph_current": 8,
-        "chargeLimit": 82.0,
+        "chargeLimit": 97.0,
         "allow_3_phases": true
     }
 }

README.md

@@ -1,7 +1,5 @@
 # EV-SmartCharge 'EVS-1'
 
-**This file and project are under construction**
-
 ## Purpose
 
 A smart EV vehicle charging solution using as much of free solar power as available.  
@@ -56,4 +54,4 @@ This software may be reused and adapted by respecting the MIT License. This proj
 
 ### Manual Charge Settings
 
-![](Images/Popup_ManualSettings.png)
+![](Images/Popup_ManualSettings.png)

Schedule.csv

@@ -0,0 +1,5 @@
+Day [1 … 7],From [hh:mm:ss],To [hh:mm:ss],Retry[min],Job
+0,12:00,14:30,8,0:HP_CHECK_ACTIVATION
+0,17:00,17:30,0,1:HP_RESET
+0,18:00,18:59,9,2:HP_GET_FORECAST
+0,00:00,23:59,10,3:HP_LOG

SysData.h

@@ -0,0 +1,69 @@
+/*
+ * AnalyzeWeather.h
+ *
+ *  Created on: 02.03.2018
+ *      Author: Klaus
+ */
+
+#ifndef SYSDATA_H_
+#define SYSDATA_H_
+
+#define DEBUG_PRINT
+
+//== constants
+#define MAX_PATH                256
+#define MAX_PARAMS              80
+#define PARAM_LINE_LEN          81
+
+
+#include <time.h>
+#include "version.h"
+
+typedef struct {
+    /* weatherdata from ini file*/
+    char strKeyUTC[100];      //JSON key
+    char strKeyURL[150];      //JSON key
+    char strKeyClouds[24];    //JSON key
+    char strKeyTemp[24];      //JSON key
+    char strKeySolar[24];     //JSON key
+    char strKeySolarPower[24];//JSON key
+    char weatherServer[80];
+    char weatherAPI[200];
+    int maxClouds;            //maximum clouds for using PV
+
+    /* PV data from ini file */
+    char solarServer[80];
+    char solarAPI[200];
+    char strPV_URL[150];
+    float minPower;           //minimum solar power for heating boiler
+
+    /* Boiler Limits from ini file*/
+    int boilerDayHigh;
+    int boilerDayLow;
+    int boilerNightHigh;
+    int boilerNightLow;
+    int boilerDayIndex;    //CAN ID
+    int boilerNightIndex;  //CAN ID
+
+    /* directories */
+    char logfilePath[MAX_PATH];   //from ini file
+    char workingPath[MAX_PATH];   //from program
+
+    /* weather data read from weather server */
+    time_t currentUTC;
+    int currentClouds;
+    float currentTemp;
+    time_t forecastUTC;
+    int forecastClouds;
+    float forecastTemp;
+
+    /* PV data read from PV cloud server */
+    float actualPower;        //from solar Edge
+
+    /* PV results */
+    int useSolarPower;  //true: actually enough solar power
+    int forecastSun;    //true: expecting enough solar power
+ }sSysControl_t;
+
+
+#endif /* SYSDATA_H_ */