From 6e149606ba45410a28bb0d8b69c4a65d55b3fcaf Mon Sep 17 00:00:00 2001
From: Robert Altner <robert.altner@stud.htwk-leipzig.de>
Date: Tue, 6 Dec 2022 21:31:07 +0100
Subject: [PATCH] fix unwrapping of driver pointer

---
 control/examples/wrapper/main.c | 10 +++++++---
 control/src/drv/commit_hash.h   |  2 +-
 control/src/wrapper/b15f.cpp    | 15 ++++++++++-----
 control/src/wrapper/b15f.h      |  5 +++--
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/control/examples/wrapper/main.c b/control/examples/wrapper/main.c
index dbdf9c7..aded556 100644
--- a/control/examples/wrapper/main.c
+++ b/control/examples/wrapper/main.c
@@ -1,4 +1,4 @@
-#include "b15f/wrapper/b15f.h"
+#include "../src/wrapper/b15f.h"
 #include <stdio.h>
 
 int main() {
@@ -10,7 +10,11 @@ int main() {
 		return -1;
 	}
 
-	uint8_t dip = read_dip_switch(instance, NULL, 0);
+	uint8_t dip;
+	if (read_dip_switch(instance, &dip, buf, sizeof(buf)) != 0) {
+		fprintf(stderr, "%s\n", buf);
+		return -1;
+	}
 
 	printf("DIP switch reads: ");
 	for(uint8_t mask = 1; mask != 0; mask <<= 1) {
@@ -19,4 +23,4 @@ int main() {
 	printf("\n");
 
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/control/src/drv/commit_hash.h b/control/src/drv/commit_hash.h
index b8791b9..c59cebf 100644
--- a/control/src/drv/commit_hash.h
+++ b/control/src/drv/commit_hash.h
@@ -1,4 +1,4 @@
 #ifndef COMMIT_HASH_H
 #define COMMIT_HASH_H
-const char COMMIT_HASH[] = "ac85394396b3757b39c81e6010b1d0b76442f74c";
+const char COMMIT_HASH[] = "c800ee85b25be2880be304bbb9b6a05f66efcd36";
 #endif // COMMIT_HASH_H
diff --git a/control/src/wrapper/b15f.cpp b/control/src/wrapper/b15f.cpp
index 1f7105a..fb54d40 100644
--- a/control/src/wrapper/b15f.cpp
+++ b/control/src/wrapper/b15f.cpp
@@ -2,9 +2,9 @@
 #include "../drv/b15f.h"
 
 #define wrap(x) reinterpret_cast<b15f_t>(x)
-#define unwrap(x) reinterpret_cast<B15F&>(x)
+#define unwrap(x) (*(reinterpret_cast<B15F*>(x)))
 
-#define default_catch catch(DriverException& e) {\
+#define default_catch catch(std::exception& e) {\
 	if (err) { \
 		strncpy(err, e.what(), len); \
 	} \
@@ -28,10 +28,15 @@ int reconnect(b15f_t drv, char* err, size_t len) {
 	return -1;
 }
 
-uint8_t read_dip_switch(b15f_t drv, char* err, size_t len) {
+int read_dip_switch(b15f_t drv, uint8_t* data, char* err, size_t len) {
+	if (data == NULL) {
+		return -EINVAL;
+	}
+
 	try {
-		return unwrap(drv).readDipSwitch();
+		*data = unwrap(drv).readDipSwitch();
+		return 0;
 	} default_catch;
 
-	return 0;
+	return -1;
 }
\ No newline at end of file
diff --git a/control/src/wrapper/b15f.h b/control/src/wrapper/b15f.h
index 7813f8f..474ac89 100644
--- a/control/src/wrapper/b15f.h
+++ b/control/src/wrapper/b15f.h
@@ -33,11 +33,12 @@ extern "C" {
 	 * @brief Reads the values of the DIP switch
 	 * 
 	 * @param drv Instance of the B15 driver
+	 * @param data Variable to store switch state in
 	 * @param err Error buffer
 	 * @param len Size of the error buffer
-	 * @return uint8_t values of the DIP switch as a bitfield
+	 * @return int 0 on success
 	 */
-	uint8_t read_dip_switch(b15f_t drv, char* err, size_t len);
+	int read_dip_switch(b15f_t drv, uint8_t* data, char* err, size_t len);
 
 #ifdef __cplusplus
 }