From 359f5fa7ca74e70044836c2d735c939fcea47aff Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Fri, 6 Apr 2012 21:59:42 +0200 Subject: digital/asserv: make misc.h and contacts.h overridable --- digital/asserv/src/asserv/aux.c | 2 +- digital/asserv/src/asserv/avrconfig.h | 4 ++++ digital/asserv/src/asserv/main.c | 2 +- digital/asserv/src/asserv/simu.host.c | 2 +- digital/asserv/src/asserv/traj.c | 2 +- digital/asserv/src/asserv/twi_proto.c | 2 -- 6 files changed, 8 insertions(+), 6 deletions(-) (limited to 'digital/asserv') diff --git a/digital/asserv/src/asserv/aux.c b/digital/asserv/src/asserv/aux.c index e4cce306..204f3fac 100644 --- a/digital/asserv/src/asserv/aux.c +++ b/digital/asserv/src/asserv/aux.c @@ -28,7 +28,7 @@ #include "modules/utils/utils.h" #include "io.h" -#include "contacts.h" +#include AC_ASSERV_CONTACTS_H #ifdef HOST # include "simu.host.h" diff --git a/digital/asserv/src/asserv/avrconfig.h b/digital/asserv/src/asserv/avrconfig.h index bf999e22..e09cd0a2 100644 --- a/digital/asserv/src/asserv/avrconfig.h +++ b/digital/asserv/src/asserv/avrconfig.h @@ -88,6 +88,10 @@ #define AC_ASSERV_AUX_NB 2 /** TWI address. */ #define AC_ASSERV_TWI_ADDRESS 4 +/** Header file misc.h. */ +#define AC_ASSERV_MISC_H "misc.h" +/** Header file contacts.h. */ +#define AC_ASSERV_CONTACTS_H "contacts.h" /* twi - TWI module. */ /** Driver to implement TWI: HARD, SOFT, or USI. */ diff --git a/digital/asserv/src/asserv/main.c b/digital/asserv/src/asserv/main.c index 68d4f48e..36cd2219 100644 --- a/digital/asserv/src/asserv/main.c +++ b/digital/asserv/src/asserv/main.c @@ -31,7 +31,7 @@ #include "modules/math/fixed/fixed.h" #include "io.h" -#include "misc.h" +#include AC_ASSERV_MISC_H #include "cs.h" #include "postrack.h" diff --git a/digital/asserv/src/asserv/simu.host.c b/digital/asserv/src/asserv/simu.host.c index 9029e002..04ade3aa 100644 --- a/digital/asserv/src/asserv/simu.host.c +++ b/digital/asserv/src/asserv/simu.host.c @@ -42,7 +42,7 @@ #include "cs.h" #include "aux.h" -#include "contacts.h" +#include AC_ASSERV_CONTACTS_H #include "models.host.h" diff --git a/digital/asserv/src/asserv/traj.c b/digital/asserv/src/asserv/traj.c index 67215514..ac81417e 100644 --- a/digital/asserv/src/asserv/traj.c +++ b/digital/asserv/src/asserv/traj.c @@ -35,7 +35,7 @@ #include "cs.h" #include "postrack.h" -#include "contacts.h" +#include AC_ASSERV_CONTACTS_H #ifdef HOST # include "simu.host.h" diff --git a/digital/asserv/src/asserv/twi_proto.c b/digital/asserv/src/asserv/twi_proto.c index c2931691..d466493f 100644 --- a/digital/asserv/src/asserv/twi_proto.c +++ b/digital/asserv/src/asserv/twi_proto.c @@ -31,8 +31,6 @@ #include "modules/twi/twi.h" #include "io.h" -#include "misc.h" - #include "postrack.h" #include "traj.h" #include "aux.h" -- cgit v1.2.3