Made basic output of values, slow but starting to be actually functional

inc/hoymiles/dtu.h

@@ -26,6 +26,8 @@ class Dtu {
 
 	void updateMicroinverters();
 
+	void printMicroinverters();
+
 	~Dtu();
 };
 

inc/hoymiles/microinverter.h

@@ -29,6 +29,8 @@ class Microinverter {
 	void updatePort(int i);
 
 	Port getPort(int i);
+
+	void printPorts();
 };
 
 #endif

inc/hoymiles/port.h

@@ -19,14 +19,16 @@ class Port {
 
 	uint16_t portStartAddress;
 
-	std::vector<std::shared_ptr<PortParameter>> parameters;
-
 	void populateParameters();
 
       public:
 	Port(std::shared_ptr<modbus_t*> modbus_context, std::mutex *modbus_context_mutex, uint16_t portStartAddress);
 
+	std::vector<std::shared_ptr<PortParameter>> parameters;
+
 	void updateParameters();
+
+	void printParameters();
 };
 
 #endif

src/hoymiles/dtu.cpp

@@ -84,7 +84,17 @@ void Dtu::updateMicroinverters() {
 
 	std::vector<std::thread>::iterator updateThreadsIterator = updateThreads.begin();
 	while(updateThreadsIterator != updateThreads.end()) {
-		updateThreadsIterator->join();
+		updateThreadsIterator->join();		updateThreadsIterator++;
-		updateThreadsIterator++;
+	}
+	std::cout << std::endl;
+}
+
+void Dtu::printMicroinverters() {
+	std::cout << "DTU:" << std::endl;
+	std::vector<Microinverter>::iterator microinvertersIterator = this->microinverters.begin();
+	while(microinvertersIterator != this->microinverters.end()) {
+		microinvertersIterator->printPorts();
+		std::cout << std::endl;
+		microinvertersIterator++;
 	}
 }

src/hoymiles/microinverter.cpp

@@ -1,4 +1,6 @@
 #include <thread>
+#include <iostream>
+#include <memory>
 
 #include "modbus.h"
 
@@ -27,3 +29,14 @@ void Microinverter::updatePorts() {
 		updateThreadsIterator++;
 	}
 }
+
+void Microinverter::printPorts() {
+	std::cout << "Microinverter: " << this->serialNumber << std::endl;
+
+	std::vector<Port>::iterator portsIterator = this->ports.begin();
+	while(portsIterator != this->ports.end()) {
+		portsIterator->printParameters();
+		std::cout << std::endl;
+		portsIterator++;
+	}
+}

src/hoymiles/port.cpp

@@ -55,6 +55,18 @@ void Port::updateParameters() {
 	while (parametersIterator != this->parameters.end()) {
 		parametersIterator->get()->updateValue(this->modbus_context, this->modbus_context_mutex, this->portStartAddress);
 		parametersIterator++;
-		break;
+	}
+}
+
+void Port::printParameters() {
+	std::vector<std::shared_ptr<PortParameter>>::iterator parametersIterator = this->parameters.begin();
+
+	if(parametersIterator != this->parameters.end()) {
+		std::cout << "|";
+	}
+
+	while(parametersIterator != this->parameters.end()) {
+		std::cout << " " << parametersIterator->get()->name << ": " << parametersIterator->get()->getOutputValue() << " |";
+		parametersIterator++;
 	}
 }

src/hoymiles/portParameters/portParameters.cpp

@@ -25,6 +25,9 @@ PortParameterPortNumber::PortParameterPortNumber() : PortParameterInt("portNumbe
 void PortParameterPortNumber::setValueFromRegisters(uint16_t *readArray, int registerCount) {
 	if (registerCount > 0) {
 		this->value.i = readArray[0];
+		std::stringstream valueStringStream;
+		valueStringStream << std::hex << this->value.i;
+		this->value.i = valueStringStream.str().at(0) - '0';
 	}
 }
 

src/hoymiles/portParameters/portParametersGeneric.cpp

@@ -60,7 +60,8 @@ void PortParameterFloat::setValueFromRegisters(uint16_t *readArray, int register
 }
 
 std::string PortParameterFloat::getOutputValue() {
-	return std::to_string(this->value.f);
+	std::string separator{"_age"};
+	return std::to_string(this->value.f).append(separator.append(std::to_string(this->age)));
 }
 
 PortParameterInt::PortParameterInt(std::string name, uint16_t parameterAddressOffset, int registerSize) : PortParameter(name, parameterAddressOffset, registerSize) {
@@ -81,5 +82,6 @@ void PortParameterInt::setValueFromRegisters(uint16_t *readArray, int registerCo
 }
 
 std::string PortParameterInt::getOutputValue() {
-	return std::to_string(this->value.i);
+	std::string separator{"_age"};
+	return std::to_string(this->value.i).append(separator.append(std::to_string(this->age)));
 }

src/main.cpp

@@ -14,13 +14,14 @@ int main(){
     auto startTime = std::chrono::high_resolution_clock::now();
     Dtu dtu {ip_address.c_str(), port};
     auto endTime = std::chrono::high_resolution_clock::now();
-    std::cout << "Construction time: " << std::chrono::duration_cast<std::chrono::seconds>(endTime - startTime).count() << "s" << std::endl;
+    std::cout << "Construction time: " << std::chrono::duration_cast<std::chrono::milliseconds>(endTime - startTime).count() << "ms" << std::endl;
 
     while(true) {
         auto startTime = std::chrono::high_resolution_clock::now();
         dtu.updateMicroinverters();
         auto endTime = std::chrono::high_resolution_clock::now();
-        std::cout << "Update time: " << std::chrono::duration_cast<std::chrono::seconds>(endTime - startTime).count() << "s" << std::endl;
+        std::cout << "Update time: " << std::chrono::duration_cast<std::chrono::milliseconds>(endTime - startTime).count() << "ms" << std::endl;
+        dtu.printMicroinverters();
     }
 
     return 0;