Refactor MessageFilter and MessageCallback

communication/message/include/main51message.h

@@ -0,0 +1,17 @@
+#ifndef __MAIN51MESSAGE_H_
+#define __MAIN51MESSAGE_H_
+
+#include "communication/message/include/message.h"
+#include "communication/include/communication.h"
+
+namespace icsneo {
+
+class Main51Message : public Message {
+public:
+	virtual ~Main51Message() = default;
+	Command command;
+};
+
+};
+
+#endif

communication/message/include/message.h

@@ -8,7 +8,7 @@ namespace icsneo {
 
 class Message {
 public:
-	virtual ~Message() {}
+	virtual ~Message() = default;
 	Network network;
 	std::vector<uint8_t> data;
 	uint64_t timestamp;

communication/message/include/serialnumbermessage.h

@@ -0,0 +1,24 @@
+#ifndef __SERIALNUMBERMESSAGE_H_
+#define __SERIALNUMBERMESSAGE_H_
+
+#include "communication/message/include/main51message.h"
+#include "communication/include/command.h"
+#include <string>
+
+namespace icsneo {
+
+// The response for Command::RequestSerialNumber
+class SerialNumberMessage : public Main51Message {
+public:
+	SerialNumberMessage() : Main51Message() { command = Command::RequestSerialNumber; }
+	virtual ~SerialNumberMessage() = default;
+	std::string deviceSerial;
+	uint8_t macAddress[6]; // This might be all zeros even if `hasMacAddress` is true
+	bool hasMacAddress = false; // The message might not actually be long enough to contain a MAC address, in which case we mark this
+	uint8_t pcbSerial[16];
+	bool hasPCBSerial = false;
+};
+
+};
+
+#endif