Made BurtSerial.send easier

BinghamtonRover · May 21, 2024 · 4fc82b0 · 4fc82b0
1 parent dab44d6
commit 4fc82b0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/BURT_serial.cpp b/BURT_serial.cpp
@@ -1,9 +1,11 @@
 #include "BURT_serial.h"
 #include "BURT_proto.h"
 
-BurtSerial::BurtSerial(Device device, ProtoHandler onMessage) : 
+BurtSerial::BurtSerial(Device device, ProtoHandler onMessage, const pb_msgdesc_t* descriptor, int length) :
 	device(device),
-	onMessage(onMessage)
+	onMessage(onMessage),
+	descriptor(descriptor),
+	length(length)
 	{ }
 
 bool isResetCode(uint8_t* buffer, int length) {
@@ -60,11 +62,11 @@ void BurtSerial::tryConnect(uint8_t* input, int length) {
  * @param length The maximum length of the encoded message. Use the generated MessageName_size.
  * @return Returns `true` if the entire message is sent successfully, `false` otherwise.
  */
-bool BurtSerial::send(const pb_msgdesc_t* fields, const void* message, int length) {
+bool BurtSerial::send(const void* message) {
 	if (!isConnected) return false;
 
 	uint8_t* buffer = new uint8_t[length];
-	int encodedLength = BurtProto::encode(buffer, fields, message);
+	int encodedLength = BurtProto::encode(buffer, descriptor, message);
 
 	int sentLength = Serial.write(buffer, encodedLength);
 	delete[] buffer;

diff --git a/BURT_serial.h b/BURT_serial.h
@@ -8,13 +8,15 @@ class BurtSerial {
 	public: 
 		bool isConnected = false;
 
-		BurtSerial(Device device, ProtoHandler onMessage);
+		BurtSerial(Device device, ProtoHandler onMessage, const pb_msgdesc_t* descriptor, int length);
 		void setup() { /* No setup needed */ }
 		void update();
-		bool send(const pb_msgdesc_t* fields, const void* message, int length);
+		bool send(const void* message);
 
 	private: 
 		void tryConnect(uint8_t* input, int length);
 		Device device;
 		ProtoHandler onMessage;
+		const pb_msgdesc_t* descriptor;
+		int length;
 };