lauchmelder/b15f
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix unwrapping of driver pointer

Browse source
This commit is contained in:
Robert Altner 2022-12-06 21:31:07 +01:00
parent c800ee85b2
commit 6e149606ba
4 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
control/examples/wrapper/main.c
View file

@ -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) {

2
control/src/drv/commit_hash.h
View file

@ -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

15
control/src/wrapper/b15f.cpp
View file

@ -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;
}

5
control/src/wrapper/b15f.h
View file

@ -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
}