Skip to content

Commit b5bf9d7

Browse files
committed
Merge pull request #49 from Overdrivr/interface-improvements
Interfaces cleanup
2 parents bc8176b + 5876e4a commit b5bf9d7

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

drivers/c/base/driver.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
the driver has no more available data
1616
1717
*/
18-
int32_t read(void * buf, uint32_t sizeToRead)
18+
int32_t read(uint8_t * buf, uint32_t sizeToRead)
1919
{
2020
// Exemple
2121
/*
@@ -40,7 +40,7 @@ int32_t read(void * buf, uint32_t sizeToRead)
4040
@returns 0 if everything went well.
4141
4242
*/
43-
int32_t write(void * buf, uint32_t sizeToWrite)
43+
int32_t write(uint8_t * buf, uint32_t sizeToWrite)
4444
{
4545
// Exemple
4646
/*

drivers/cpp/arduino/Telemetry.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
#include "telemetry_core.h"
33
#include "HardwareSerial.h"
44

5-
int32_t read(void * buf, uint32_t sizeToRead)
5+
int32_t read(uint8_t * buf, uint32_t sizeToRead)
66
{
77
return Serial.readBytes((char*)(buf), sizeToRead);
88
}
99

10-
int32_t write(void * buf, uint32_t sizeToWrite)
10+
int32_t write(uint8_t * buf, uint32_t sizeToWrite)
1111
{
1212
Serial.write((char*)(buf),sizeToWrite);
1313
return 0;

drivers/cpp/base/Telemetry.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
the driver has no more available data
2020
2121
*/
22-
int32_t read(void * buf, uint32_t sizeToRead)
22+
int32_t read(uint8_t * buf, uint32_t sizeToRead)
2323
{
2424
// Exemple
2525
/*
@@ -44,7 +44,7 @@ int32_t read(void * buf, uint32_t sizeToRead)
4444
@returns 0 if everything went well.
4545
4646
*/
47-
int32_t write(void * buf, uint32_t sizeToWrite)
47+
int32_t write(uint8_t * buf, uint32_t sizeToWrite)
4848
{
4949
// Exemple
5050
/*

drivers/cpp/mbed/Telemetry.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
static BufferedSerial pc(USBTX, USBRX);
66

7-
int32_t read(void * buf, uint32_t sizeToRead)
7+
int32_t read(uint8_t * buf, uint32_t sizeToRead)
88
{
9-
*(uint8_t*)(buf) = pc.getc();
9+
buf[0] = pc.getc();
1010
return 1;
1111
}
1212

13-
int32_t write(void * buf, uint32_t sizeToWrite)
13+
int32_t write(uint8_t * buf, uint32_t sizeToWrite)
1414
{
15-
pc.write(buf,sizeToWrite);
15+
pc.write((void*)(buf),sizeToWrite);
1616
return 0;
1717
}
1818

src/telemetry/c/telemetry_core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ void subscribe(void (*callback)(TM_state* s, TM_msg* m), TM_state * s)
133133
userCallback = callback;
134134
}
135135

136-
void update_telemetry(float elapsedTime)
136+
void update_telemetry()
137137
{
138138
// If user forgot to define transport by calling init_telemetry, abort
139139
if(!transportPtr)

src/telemetry/headers/telemetry_core.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ void publish_f32(const char * topic, float msg);
3333
// second argument is a data structure that you can implement to access your program data inside the function
3434
void subscribe(void (*callback)(TM_state * s, TM_msg * m), TM_state * s);
3535

36-
void update_telemetry(float elapsedTime);
36+
void update_telemetry();
3737

3838
#endif

src/telemetry/headers/telemetry_utils.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ struct TM_msg {
3535
// Data structure for holding transport interface
3636
typedef struct TM_transport TM_transport;
3737
struct TM_transport {
38-
int32_t (*read)(void * buf, uint32_t sizeToRead);
38+
int32_t (*read)(uint8_t * buf, uint32_t sizeToRead);
3939
int32_t (*readable)();
40-
int32_t (*write)(void * buf, uint32_t sizeToWrite);
40+
int32_t (*write)(uint8_t * buf, uint32_t sizeToWrite);
4141
int32_t (*writeable)();
4242
};
4343

0 commit comments

Comments
 (0)