From 380e0132b55844c4b4e6ed8c173a0f063b41a5d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergi=20Hern=C3=A1ndez?= <shernand@iri.upc.edu>
Date: Sun, 3 Apr 2016 20:34:36 +0000
Subject: [PATCH] Added the extern C preprocessor command to the bioloid_math
header.
---
include/bioloid_math.h | 8 ++++++++
include/motion_manager.h | 1 -
src/bioloid_dyn_master_servos.c | 1 -
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/include/bioloid_math.h b/include/bioloid_math.h
index fb47cbd..089624e 100755
--- a/include/bioloid_math.h
+++ b/include/bioloid_math.h
@@ -1,6 +1,10 @@
#ifndef _BIOLOID_MATH_H
#define _BIOLOID_MATH_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include "stm32f4xx.h"
#define PI 3.14159
@@ -59,4 +63,8 @@ uint8_t matrix3d_inverse(TMatrix3D *org, TMatrix3D *inv);
void matrix3d_set_transform(TMatrix3D *matrix, TPoint3D *point, TVector3D *vector);
void matrix3d_mult(TMatrix3D *dst,TMatrix3D *a,TMatrix3D *b);
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/include/motion_manager.h b/include/motion_manager.h
index ce7a580..3046c95 100644
--- a/include/motion_manager.h
+++ b/include/motion_manager.h
@@ -88,7 +88,6 @@ void manager_set_offset(uint8_t servo_id,int8_t offset);
inline int16_t manager_get_cw_angle_limit(uint8_t servo_id);
inline int16_t manager_get_ccw_angle_limit(uint8_t servo_id);
// motion modules handling
-//void manager_add_module(
// operation functions
uint8_t manager_in_range(unsigned short int address, unsigned short int length);
void manager_process_write_cmd(unsigned short int address,unsigned short int length,unsigned char *data);
diff --git a/src/bioloid_dyn_master_servos.c b/src/bioloid_dyn_master_servos.c
index c4c3d4f..f758f1c 100755
--- a/src/bioloid_dyn_master_servos.c
+++ b/src/bioloid_dyn_master_servos.c
@@ -1,7 +1,6 @@
#include "bioloid_dyn_master_servos.h"
#include "bioloid_time.h"
#include "usart1.h"
-#include "gpio.h"
#define ENABLE_RX_EN_GPIO_CLK __GPIOA_CLK_ENABLE()
#define RX_EN_PIN GPIO_PIN_8
--
GitLab