Merge pull request 'Microinverter Total Productions' (#13) from master into release

Reviewed-on: https://gitea.trabus322.eu/trabus322/hoymilesClient/pulls/13

README.md

@@ -1,8 +1,8 @@
 # Jenkins
 Link for jenkins builds with artifacts:
-  - [jenkins.trabus322.eu#freeBsd](https://jenkins.trabus322.eu/job/hoymilesClient/)
-    - [Executable](https://jenkins.trabus322.eu/job/hoymilesClient/lastSuccesfulBuild/artifact/build/hoymilesClient_exec)
+  - [jenkins.trabus322.eu#freeBsd](https://jenkins.trabus322.eu/job/hoymilesClient_freeBsd/)
+    - [Release executable](https://jenkins.trabus322.eu/job/hoymilesClient_freeBsd_release/lastSuccesfulBuild/artifact/build/hoymilesClient_exec)
   - [jenkins.trabus322.eu#linux](https://jenkins.trabus322.eu/job/hoymilesClient_linux/)
-    - [Executable](https://jenkins.trabus322.eu/job/hoymilesClient_linux/lastSuccesfulBuild/artifact/build/hoymilesClient_exec)
+    - [Release executable](https://jenkins.trabus322.eu/job/hoymilesClient_linux_release/lastSuccesfulBuild/artifact/build/hoymilesClient_exec)
   - [jenkins.trabus322.eu#windows](https://jenkins.trabus322.eu/job/hoymilesClient_windows/)
-    - [Executable](https://jenkins.trabus322.eu/job/hoymilesClient_windows/lastSuccessfulBuild/artifact/build/hoymilesClient_exec.exe)
+    - [Release executable](https://jenkins.trabus322.eu/job/hoymilesClient_windows_release/lastSuccessfulBuild/artifact/build/hoymilesClient_exec.exe)

inc/hoymiles/dtu.h

@@ -1,9 +1,9 @@
 #ifndef DTU_H
 #define DTU_H
 
-#include <vector>
 #include <memory>
 #include <string>
+#include <vector>
 
 #include "microinverter.h"
 #include "modbus.h"
@@ -18,7 +18,7 @@ class Dtu {
 
 	void populateMicroinverters();
 
-	std::pair<bool, Microinverter*> getMicroinverterBySerialNumber(long long serialNumber);
+	std::pair<Microinverter *, bool> getMicroinverterBySerialNumber(long long serialNumber);
 
       public:
 	Dtu(const char *ip_address, int port);
@@ -31,7 +31,7 @@ class Dtu {
 
 	// void printMicroinverters();
 
-	void printMicroinverters(std::vector<std::string> &parametersToGet, bool allParameters, std::vector<long long> &microinvertersToGet, bool shortNames);
+	void printMicroinverters(std::vector<std::string> &parametersToGet, bool allParameters, std::vector<long long> &microinvertersToGet, bool shortNames, bool printTodayProduction, bool printTotalProduction);
 
 	~Dtu();
 };

inc/hoymiles/port.h

@@ -12,16 +12,18 @@ class Port {
       private:
 	std::shared_ptr<class modbus> modbus;
 
-	uint16_t portStartAddress;
-
 	void populateParameters();
 
 	void fixCurrent();
 	bool currentFixed;
 
+	void increaseParametersAge();
+
       public:
 	Port(std::shared_ptr<class modbus> modbus, uint16_t portStartAddress);
 
+	uint16_t portStartAddress;
+
 	std::vector<std::shared_ptr<PortParameter>> parameters;
 
 	std::pair<std::shared_ptr<PortParameter>, bool> getParameterByName(std::string name);

src/hoymiles/dtu.cpp

@@ -44,9 +44,9 @@ void Dtu::populateMicroinverters() {
 		portParameterMicroinverterSerialNumber.updateValue(this->modbus, portStartAddress);
 		long long serialNumber = portParameterMicroinverterSerialNumber.getValue().first.i;
 
-		std::pair<bool, Microinverter *> getMicroinverterBySerialNumber = this->getMicroinverterBySerialNumber(serialNumber);
-		if (getMicroinverterBySerialNumber.first) {
-			getMicroinverterBySerialNumber.second->ports.push_back(port);
+		std::pair<Microinverter *, bool> getMicroinverterBySerialNumber = this->getMicroinverterBySerialNumber(serialNumber);
+		if (getMicroinverterBySerialNumber.second) {
+			getMicroinverterBySerialNumber.first->ports.push_back(port);
 		} else {
 			Microinverter microinverter{this->modbus, serialNumber};
 			this->microinverters.push_back(microinverter);
@@ -59,16 +59,16 @@ void Dtu::populateMicroinverters() {
 	}
 }
 
-std::pair<bool, Microinverter *> Dtu::getMicroinverterBySerialNumber(long long serialNumber) {
+std::pair<Microinverter *, bool> Dtu::getMicroinverterBySerialNumber(long long serialNumber) {
 	std::vector<Microinverter>::iterator microinvertersIterator = this->microinverters.begin();
 	while (microinvertersIterator != this->microinverters.end()) {
 		if (microinvertersIterator->serialNumber == serialNumber) {
-			return std::pair<bool, Microinverter *>(true, &*microinvertersIterator);
+			return std::pair<Microinverter *, bool>(&*microinvertersIterator, true);
 		} else {
 			microinvertersIterator++;
 		}
 	}
-	return std::pair<bool, Microinverter *>(false, &*microinvertersIterator);
+	return std::pair<Microinverter *, bool>(&*microinvertersIterator, false);
 }
 
 void Dtu::updateMicroinverters(std::vector<std::string> &parametersToGet, bool allParameters, std::vector<long long> &microinvertersToGet) {
@@ -82,15 +82,15 @@ void Dtu::updateMicroinverters(std::vector<std::string> &parametersToGet, bool a
 
 	std::vector<long long>::iterator microinvertersToGetIterator = microinvertersToGet.begin();
 	while (microinvertersToGetIterator != microinvertersToGet.end()) {
-		std::pair<bool, Microinverter *> microinverterPair = this->getMicroinverterBySerialNumber(*microinvertersToGetIterator);
-		if (microinverterPair.first) {
-			microinverterPair.second->updatePorts(parametersToGet, allParameters);
+		std::pair<Microinverter *, bool> microinverterPair = this->getMicroinverterBySerialNumber(*microinvertersToGetIterator);
+		if (microinverterPair.second) {
+			microinverterPair.first->updatePorts(parametersToGet, allParameters);
 		}
 		microinvertersToGetIterator++;
 	}
 }
 
-void Dtu::printMicroinverters(std::vector<std::string> &parametersToGet, bool allParameters, std::vector<long long> &microinvertersToGet, bool shortNames) {
+void Dtu::printMicroinverters(std::vector<std::string> &parametersToGet, bool allParameters, std::vector<long long> &microinvertersToGet, bool shortNames, bool printTodayProduction, bool printTotalProduction) {
 	if (microinvertersToGet.empty()) {
 		std::vector<Microinverter>::iterator microinvertersIterator = this->microinverters.begin();
 		while (microinvertersIterator != this->microinverters.end()) {
@@ -101,9 +101,16 @@ void Dtu::printMicroinverters(std::vector<std::string> &parametersToGet, bool al
 
 	std::vector<long long>::iterator microinvertersToGetIterator = microinvertersToGet.begin();
 	while (microinvertersToGetIterator != microinvertersToGet.end()) {
-		std::pair<bool, Microinverter *> microinverterPair = this->getMicroinverterBySerialNumber(*microinvertersToGetIterator);
-		if (microinverterPair.first) {
-			microinverterPair.second->printPorts(parametersToGet, allParameters, shortNames);
+		std::pair<Microinverter *, bool> microinverterPair = this->getMicroinverterBySerialNumber(*microinvertersToGetIterator);
+		if (microinverterPair.second) {
+			std::cout << "Microinverter: " << microinverterPair.first->serialNumber << std::endl;
+			if(printTodayProduction) {
+				std::cout << "TodayProduction: " << microinverterPair.first->getTodayProduction() << std::endl;
+			}
+			if(printTotalProduction) {
+				std::cout << "TotalProduction: " << microinverterPair.first->getTotalProduction() << std::endl;
+			}
+			microinverterPair.first->printPorts(parametersToGet, allParameters, shortNames);
 		}
 		microinvertersToGetIterator++;
 	}

src/hoymiles/microinverter.cpp

@@ -21,8 +21,6 @@ void Microinverter::updatePorts(std::vector<std::string> &parametersToGet, bool
 }
 
 void Microinverter::printPorts(std::vector<std::string> &parametersToGet, bool allParameters, bool shortNames) {
-	std::cout << "Microinverter: " << this->serialNumber << std::endl;
-
 	std::vector<Port>::iterator portsIterator = this->ports.begin();
 	while (portsIterator != this->ports.end()) {
 		portsIterator->printParameters(parametersToGet, allParameters, shortNames);
@@ -36,6 +34,9 @@ long long Microinverter::getTodayProduction() {
 
 	std::vector<Port>::iterator portsIterator = this->ports.begin();
 	while(portsIterator != this->ports.end()) {
+		if(portsIterator->getParameterByName("todayProduction").first->age > 0) {
+			portsIterator->getParameterByName("todayProduction").first->updateValue(this->modbus, portsIterator->portStartAddress);
+		}
 		result += portsIterator->getParameterByName("todayProduction").first->getValue().first.i;
 		portsIterator++;
 	}
@@ -48,8 +49,12 @@ long long Microinverter::getTotalProduction() {
 
 	std::vector<Port>::iterator portsIterator = this->ports.begin();
 	while(portsIterator != this->ports.end()) {
+		if(portsIterator->getParameterByName("totalProduction").first->age > 0) {
+			portsIterator->getParameterByName("totalProduction").first->updateValue(this->modbus, portsIterator->portStartAddress);
+		}
 		result += portsIterator->getParameterByName("totalProduction").first->getValue().first.i;
 		portsIterator++;
+		portsIterator++;
 	}
 
 	return result;

src/hoymiles/port.cpp

@@ -87,7 +87,17 @@ void Port::fixCurrent() {
 	}
 }
 
+void Port::increaseParametersAge() {
+	std::vector<std::shared_ptr<PortParameter>>::iterator parametersIterator = this->parameters.begin();
+	while(parametersIterator != this->parameters.end()) {
+		parametersIterator->get()->age++;
+		parametersIterator++;
+	}
+}
+
 void Port::updateParameters(std::vector<std::string> &parametersToGet, bool allParameters) {
+	this->increaseParametersAge();
+
 	if (allParameters && parametersToGet.size() < this->parameters.size()) {
 		std::vector<std::shared_ptr<PortParameter>>::iterator parametersIterator = this->parameters.begin();
 		while (parametersIterator != this->parameters.end()) {

src/main.cpp

@@ -19,7 +19,7 @@ int main(int argc, char **argv) {
 	signal(SIGTERM, sigHandler);
 	signal(SIGABRT, sigHandler);
 
-	std::string version{"v1.0sn"};
+	std::string version{"v1.0mt"};
 	std::cout << version << std::endl;
 
 	CLI::App hoymilesClient{"Client for DTU-Pro/DTU-ProS"};
@@ -40,19 +40,27 @@ int main(int argc, char **argv) {
 	std::string allParametersHelp{"Fetch all parameters"};
 	hoymilesClient.add_flag<bool>("-a,--all_parameters", allParameters, allParametersHelp)->group("Parameters");
 
+	bool shortNames = false;
+	std::string shortNamesHelp{"Print short parameter names"};
+	hoymilesClient.add_flag<bool>("-s,--short", shortNames, shortNamesHelp)->group("Parameters");
 
 	std::vector<long long> microinvertersToGet{};
 	std::string microinvertersToGetHelp{"List of microinverters to fetch, delimited by ','; if omitted, all are fetched"};
 	hoymilesClient.add_option<std::vector<long long>>("-m,--microinverters", microinvertersToGet, microinvertersToGetHelp)->delimiter(',')->group("Microinverters");
 
-	bool shortNames = false;
-	std::string shortNamesHelp{"Print short parameter names"};
-	hoymilesClient.add_flag<bool>("-s,--short", shortNames, shortNamesHelp)->group("Parameters");
+	bool microinvertersGetTodayProduction;
+	std::string microinvertersGetTodayProductionHelp{"Show today production for microinverters"};
+	hoymilesClient.add_flag<bool>("-t,--today_production", microinvertersGetTodayProduction, microinvertersGetTodayProductionHelp)->group("Microinverters");
+
+	bool microinvertersGetTotalProduction{};
+	std::string microinvertersGetTotalProductionHelp{"Show total production for microinverters"};
+	hoymilesClient.add_flag<bool>("-T,--total_production", microinvertersGetTotalProduction, microinvertersGetTotalProductionHelp)->group("Microinverters");
 
 	bool ignoreNotConnected = false;
 	std::string ignoreNotConnectedHelp{"Ignore conn_error"};
 	hoymilesClient.add_flag<bool>("-I,--ignore_conn_error", ignoreNotConnected, ignoreNotConnectedHelp)->group("Debug");
 
+
 	try {
 		hoymilesClient.parse(argc, argv);
 	} catch (const CLI::ParseError &e) {
@@ -71,7 +79,7 @@ int main(int argc, char **argv) {
 		endTime = std::chrono::high_resolution_clock::now();
 		std::cout << "DTU update time: " << std::chrono::duration_cast<std::chrono::milliseconds>(endTime - startTime).count() << "ms" << std::endl;
 
-		dtu.printMicroinverters(parametersToGet, allParameters, microinvertersToGet, shortNames);
+		dtu.printMicroinverters(parametersToGet, allParameters, microinvertersToGet, shortNames, microinvertersGetTodayProduction, microinvertersGetTotalProduction);
 		std::cout << std::endl;
 	}