From ef8c85a160e02ad93809794e6aa24a3c9c29ffa9 Mon Sep 17 00:00:00 2001 From: Felix Ruess Date: Sun, 30 Oct 2016 22:07:39 +0100 Subject: [PATCH] fix telemetry_intermcu after #1873 --- .../modules/telemetry/telemetry_intermcu.h | 7 ++++--- .../modules/telemetry/telemetry_intermcu_ap.c | 15 +-------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/sw/airborne/modules/telemetry/telemetry_intermcu.h b/sw/airborne/modules/telemetry/telemetry_intermcu.h index 342f4d4f1a9..3823098a0b4 100644 --- a/sw/airborne/modules/telemetry/telemetry_intermcu.h +++ b/sw/airborne/modules/telemetry/telemetry_intermcu.h @@ -30,8 +30,9 @@ #include "std.h" /* External functions */ -void telemetry_intermcu_init(void); -void telemetry_intermcu_periodic(void); -void telemetry_intermcu_on_msg(uint8_t msg_id, uint8_t* msg, uint8_t size); +extern void telemetry_intermcu_init(void); +extern void telemetry_intermcu_periodic(void); +extern void telemetry_intermcu_event(void); +extern void telemetry_intermcu_on_msg(uint8_t msg_id, uint8_t* msg, uint8_t size); #endif /* TELEMETRY_INTERMCU_H */ diff --git a/sw/airborne/modules/telemetry/telemetry_intermcu_ap.c b/sw/airborne/modules/telemetry/telemetry_intermcu_ap.c index 1ce1de18895..f4a188139c3 100644 --- a/sw/airborne/modules/telemetry/telemetry_intermcu_ap.c +++ b/sw/airborne/modules/telemetry/telemetry_intermcu_ap.c @@ -34,21 +34,8 @@ #include "subsystems/datalink/telemetry.h" #include "subsystems/datalink/datalink.h" -/* Default maximum telemetry message size */ -#ifndef TELEMERTY_INTERMCU_MSG_SIZE -#define TELEMERTY_INTERMCU_MSG_SIZE 128 -#endif - -/* Structure for handling telemetry over InterMCU */ -struct telemetry_intermcu_t { - struct link_device dev; ///< Device structure for communication - struct short_transport trans; ///< Transport without any extra encoding - uint8_t buf[TELEMERTY_INTERMCU_MSG_SIZE]; ///< Buffer for the messages - uint8_t buf_idx; ///< Index of the buffer -}; - /* Telemetry InterMCU throughput */ -static struct telemetry_intermcu_t telemetry_intermcu; +struct telemetry_intermcu_t telemetry_intermcu; /* Static functions */ static bool telemetry_intermcu_check_free_space(struct telemetry_intermcu_t *p, long *fd __attribute__((unused)), uint16_t len);