Switch to json auto deserialization, add some first PahoMQTT stuff

Author: flohoff

CMakeLists.txt

@@ -20,11 +20,12 @@ include_directories(${Boost_INCLUDE_DIRS})
 
 find_package(nlohmann_json 3.2.0 REQUIRED)
 find_package(PkgConfig)
+find_package(PahoMqttCpp REQUIRED)
 
 set(THREADS_HAVE_PTHREAD_ARG 1)
 find_package(Threads REQUIRED)
 
-add_executable(bsbd bsbd.cpp bus.cpp serial.cpp crc.cpp AddressMap.cpp vtype.cpp)
+add_executable(bsbd bsbd.cpp bus.cpp serial.cpp crc.cpp AddressMap.cpp vtype.cpp mqtt.cpp)
 target_include_directories(bsbd PRIVATE ${SERIAL_INCLUDE_DIRS})
-target_link_libraries(bsbd PRIVATE ${Boost_LIBRARIES} ${SERIAL_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT} nlohmann_json::nlohmann_json)
+target_link_libraries(bsbd PRIVATE ${Boost_LIBRARIES} ${SERIAL_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT} nlohmann_json::nlohmann_json PahoMqttCpp::paho-mqttpp3)
 

bsbd.cpp

@@ -6,10 +6,15 @@
 #include <nlohmann/json.hpp>
 #include <boost/program_options.hpp>
 
+#include <mqtt/async_client.h>
+
 #include "bus.h"
 #include "message.h"
 #include "vtype.h"
 #include "AddressMap.h"
+#include "mqtt.h"
+
+#include "config.h"
 
 namespace po = boost::program_options;
 
@@ -75,10 +80,13 @@ int main(int argc, char **argv) {
 	messageformat_parse(config["messageformat"].get<std::string>());
 	std::vector<Bus>	busses;
 
-	for(auto &busconfig : config["busses"]) {
-		std::cout << busconfig.dump() << std::endl;
+	auto mqttconfig=config["mqtt"].get<config::mqtt>();
+	auto mqtt=MQTT(mqttconfig);
+
+	for(auto &busconfigjson : config["busses"]) {
+		auto busconfig=busconfigjson.get<config::bus>();
 		Bus	newbus(busconfig);
 	}
 
 	std::cout << config.dump() << std::endl;
-}
+}

bus.cpp

@@ -1,14 +1,13 @@
 #include <iostream>
 
 #include "bus.h"
+#include "config.h"
 #include "frame.h"
 #include "message.h"
 
-Bus::Bus(json& busconfig) : busconfig(busconfig) {
+Bus::Bus(config::bus& config) : config(config) {
 	// FIXME - Parameter checking?
-	serial=new Serial(busconfig["device"].get<std::string>(),
-			busconfig["baudrate"].get<std::string>(),
-			busconfig["mode"].get<std::string>());
+	serial=new Serial(config.device, config.baudrate, config.mode);
 
 	reader=new std::thread(&Bus::Reader, this);
 }

bus.h

@@ -4,23 +4,19 @@
 #include <iostream>
 #include <thread>
 
-#include <nlohmann/json.hpp>
-
 #include "serial.h"
+#include "config.h"
 #include "message.h"
 
-using json = nlohmann::json;
-
 class Bus {
 	private:
 	Serial		*serial;
-	json& 		busconfig;
+	config::bus	config;
 	std::thread	*reader;
 
-
 	void Reader();
 	public:
-	Bus(json& busconfig);
+	Bus(config::bus& config);
 	~Bus();
 };
 

config.h

@@ -0,0 +1,26 @@
+
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#include <string>
+#include <nlohmann/json.hpp>
+
+namespace config {
+	class mqtt {
+		public:
+		std::string	broker;
+		NLOHMANN_DEFINE_TYPE_INTRUSIVE(mqtt, broker)
+	};
+	class bus {
+		public:
+		int	id;
+		std::string	device;
+		std::string	baudrate;
+		std::string	mode;
+		std::string	address;
+
+		NLOHMANN_DEFINE_TYPE_INTRUSIVE(bus, id, device, baudrate, mode, address)
+	};
+};
+
+#endif

config.json

@@ -1,7 +1,10 @@
 {
+	"mqtt": {
+		"broker": "nuc:1883"
+	},
 	"busses": [
 		{
-			"id": "1",
+			"id": 1,
 			"device": "/dev/ttyUSB0",
 			"baudrate": "4800",
 			"mode": "8o1",

messageformat.json

@@ -46,6 +46,16 @@
 			"type": "bit-anaus",
 			"access": "ro",
 			"name": "Trinkwasserstatus"
+		},
+		{
+			"address": "0x2d3d0574",
+			"name": "HK1 Betriebsart",
+			"type": "enum",
+			"enum": {
+				"0": "Schutzbetrieb",
+				"1": "Automatik",
+				"3": "Komfort"
+			}
 		}
 	]
 }

mqtt.cpp

@@ -0,0 +1,4 @@
+
+#include "mqtt.h"
+#include "config.h"
+

mqtt.h

@@ -0,0 +1,16 @@
+#ifndef MQTT_H
+#define MQTT_H
+
+#include "config.h"
+#include <iostream>
+
+class MQTT {
+	private:
+		config::mqtt	config;
+	public:
+		MQTT(config::mqtt& config) : config(config) {
+			std::cout << config.broker << std::endl;
+		}
+};
+
+#endif

vtype.cpp

@@ -64,6 +64,10 @@ class Bit : public Default {
 		}
 };
 
+class Enum : public Default {
+    public:
+        Enum(std::string name) : Default(name, this) {}
+};
 
 } // Namespace VT
 
@@ -74,3 +78,4 @@ static VT::Hexdump  hkinfo("hkinfo");
 static VT::DateTime datetime("datetime");
 static VT::Float    float3div64tempC("float3-div64-tempC", 3, "°C", 64);
 static VT::Bit      bitanaus("bit-anaus", 1, "an", "aus");
+static VT::Enum     enumlist("enum");