Wrapped message rewrite

BURT_proto.h

@@ -15,9 +15,10 @@ class BurtProto {
 		static bool decodeRaw(const uint8_t* buffer, int length, const pb_msgdesc_t* fields, void* message);
 
 		template<typename T>
-		static T decode(const uint8_t* buffer, int length, const pb_msgdesc_t* fields) {
+		static std::optional<T> decode(const uint8_t* buffer, int length, const pb_msgdesc_t* fields) {
 			T result;
-			decodeRaw(buffer, length, fields, &result);
+			if(!decodeRaw(buffer, length, fields, &result))
+				return std::nullopt;
 			return result;
 		}
 };

BURT_serial.cpp

@@ -1,39 +1,73 @@
 #include "BURT_serial.h"
 #include "BURT_proto.h"
+#include "version.pb.h"
 
-BurtSerial::BurtSerial(Device device, ProtoHandler onMessage, const pb_msgdesc_t* descriptor, int length) :
+BurtSerial::BurtSerial(Device device, ProtoHandler onMessage, const pb_msgdesc_t* descriptor, int length, Version version, bool receipt = false) :
 	device(device),
 	onMessage(onMessage),
 	descriptor(descriptor),
-	length(length)
+	length(length),
+	version(version),
+	receipt(receipt),
 	{ }
 
-bool isResetCode(uint8_t* buffer, int length) {
-	return length >= 4
-		&& buffer[0] == 0
-		&& buffer[1] == 0
-		&& buffer[2] == 0
-		&& buffer[3] == 0;
-}
+// bool isResetCode(uint8_t* buffer, int length) {
+// 	return length >= 4
+// 		&& buffer[0] == 0
+// 		&& buffer[1] == 0
+// 		&& buffer[2] == 0
+// 		&& buffer[3] == 0;
+// }
 
 void BurtSerial::update() {
 	int length = Serial.available();
 	if (length == 0) return;
 	uint8_t input[length];
 	int receivedLength = Serial.readBytes((char*) input, length);
 
-	if (!isConnected) {
+	if (!isConnected){
 		tryConnect(input, length);
-	} else if (isResetCode(input, receivedLength)) {
-		// This is our special "reset" code. Respond with 1111
-		uint8_t response[4] = {0x01, 0x01, 0x01, 0x01};
-		Serial.write(response, 4);
-		isConnected = false;
-	} else {
-		onMessage(input, length);
 	}
+
+	// NO CHECK 
+	WrappedMessage msg = BurtProto::decode<WrappedMessage>(input, length, WrappedMessage_fields);
+
+	if(msg.version.major != this->version.major)
+	{
+
+		// Send back invalid version message?
+	}
+
+	switch(msg.type)
+	{
+		case MessageType::HEARTBEAT:
+			// check sender validity?
+			break;
+		case MessageType::DISCONNECT:
+			uint8_t response[4] = {0x01, 0x01, 0x01, 0x01};
+			//Serial.write(response, 4);
+			BurtSerial::send(response)
+			isConnected = false;
+			break;
+		case MessageType::COMMAND:
+			// what special thing we do here other than onMessage(input,length) lil bro
+			// break;
+		default:
+			onMessage(input, length);
+
+	}
+
+	// } else if (isResetCode(input, receivedLength)) {
+	// 	// This is our special "reset" code. Respond with 1111
+	// 	uint8_t response[4] = {0x01, 0x01, 0x01, 0x01};
+	// 	Serial.write(response, 4);
+	// 	isConnected = false;
+	// } else {
+	// 	onMessage(input, length);
+	// }
 }
 
+// CHANGE THIS
 void BurtSerial::tryConnect(uint8_t* input, int length) {
 	// Parse as an incoming Connect request
 	Connect connect = BurtProto::decode<Connect>(input, length, Connect_fields);
@@ -63,6 +97,11 @@ void BurtSerial::tryConnect(uint8_t* input, int length) {
  * @return Returns `true` if the entire message is sent successfully, `false` otherwise.
  */
 bool BurtSerial::send(const void* message) {
+
+	// Wrap it to wrapped message
+	BurtProto::encode()
+
+	// 
 	if (!isConnected) return false;
 
 	uint8_t* buffer = new uint8_t[length];
@@ -72,3 +111,8 @@ bool BurtSerial::send(const void* message) {
 	delete[] buffer;
 	return encodedLength == sentLength;
 }
+
+bool BurtSerial:sendLogMessage(BurtLog message){
+
+	return true;
+}

BURT_serial.h

@@ -3,20 +3,25 @@
 #include <Arduino.h>
 
 #include "BURT_proto.h"
+#include "version.pb.h"
 
 class BurtSerial {
 	public: 
 		bool isConnected = false;
 
-		BurtSerial(Device device, ProtoHandler onMessage, const pb_msgdesc_t* descriptor, int length);
+		BurtSerial(Device device, ProtoHandler onMessage, const pb_msgdesc_t* descriptor, int length, Version version);
 		void setup() { /* No setup needed */ }
 		void update();
 		bool send(const void* message);
+		void decode();
+		bool sendLogMessage(BurtLog message);
+		bool receipt;
 
 	private: 
 		void tryConnect(uint8_t* input, int length);
 		Device device;
 		ProtoHandler onMessage;
 		const pb_msgdesc_t* descriptor;
 		int length;
+		Version version;
 };

version.pb.c

@@ -0,0 +1,12 @@
+/* Automatically generated nanopb constant definitions */
+/* Generated by nanopb-0.4.9 */
+
+#include "version.pb.h"
+#if PB_PROTO_HEADER_VERSION != 40
+#error Regenerate this file with the current version of nanopb generator.
+#endif
+
+PB_BIND(Version, Version, AUTO)
+
+
+

version.pb.h

@@ -0,0 +1,51 @@
+/* Automatically generated nanopb header */
+/* Generated by nanopb-0.4.9 */
+
+#ifndef PB_VERSION_PB_H_INCLUDED
+#define PB_VERSION_PB_H_INCLUDED
+#include "pb.h"
+
+#if PB_PROTO_HEADER_VERSION != 40
+#error Regenerate this file with the current version of nanopb generator.
+#endif
+
+/* Struct definitions */
+typedef struct _Version {
+    int32_t major;
+    int32_t minor;
+} Version;
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Initializer values for message structs */
+#define Version_init_default                     {0, 0}
+#define Version_init_zero                        {0, 0}
+
+/* Field tags (for use in manual encoding/decoding) */
+#define Version_major_tag                        1
+#define Version_minor_tag                        2
+
+/* Struct field encoding specification for nanopb */
+#define Version_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, INT32,    major,             1) \
+X(a, STATIC,   SINGULAR, INT32,    minor,             2)
+#define Version_CALLBACK NULL
+#define Version_DEFAULT NULL
+
+extern const pb_msgdesc_t Version_msg;
+
+/* Defines for backwards compatibility with code written before nanopb-0.4.0 */
+#define Version_fields &Version_msg
+
+/* Maximum encoded size of messages (where known) */
+#define VERSION_PB_H_MAX_SIZE                    Version_size
+#define Version_size                             22
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif