summaryrefslogtreecommitdiff
path: root/digital/asserv
diff options
context:
space:
mode:
Diffstat (limited to 'digital/asserv')
-rw-r--r--digital/asserv/src/asserv/Makefile2
-rw-r--r--digital/asserv/src/asserv/aux_traj.c (renamed from digital/asserv/src/asserv/aux.c)4
-rw-r--r--digital/asserv/src/asserv/aux_traj.h (renamed from digital/asserv/src/asserv/aux.h)8
-rw-r--r--digital/asserv/src/asserv/main.c2
-rw-r--r--digital/asserv/src/asserv/models.host.c2
-rw-r--r--digital/asserv/src/asserv/twi_proto.c2
6 files changed, 10 insertions, 10 deletions
diff --git a/digital/asserv/src/asserv/Makefile b/digital/asserv/src/asserv/Makefile
index 5c9bbc4c..197db5c9 100644
--- a/digital/asserv/src/asserv/Makefile
+++ b/digital/asserv/src/asserv/Makefile
@@ -1,7 +1,7 @@
BASE = ../../../avr
PROGS = asserv
asserv_SOURCES = main.c timer.avr.c \
- postrack.c traj.c aux.c cs.c \
+ postrack.c traj.c aux_traj.c cs.c \
twi_proto.c eeprom.avr.c seq.c \
simu.host.c models.host.c
MODULES = proto uart utils math/fixed twi spi \
diff --git a/digital/asserv/src/asserv/aux.c b/digital/asserv/src/asserv/aux_traj.c
index 5b942bd9..0b0bcbce 100644
--- a/digital/asserv/src/asserv/aux.c
+++ b/digital/asserv/src/asserv/aux_traj.c
@@ -1,4 +1,4 @@
-/* aux.c - Auxiliary motors commands. */
+/* aux_traj.c - Auxiliary motors commands. */
/* asserv - Position & speed motor control on AVR. {{{
*
* Copyright (C) 2008 Nicolas Schodet
@@ -23,7 +23,7 @@
*
* }}} */
#include "common.h"
-#include "aux.h"
+#include "aux_traj.h"
#include "modules/utils/utils.h"
#include "io.h"
diff --git a/digital/asserv/src/asserv/aux.h b/digital/asserv/src/asserv/aux_traj.h
index 6d2c583c..343d5dde 100644
--- a/digital/asserv/src/asserv/aux.h
+++ b/digital/asserv/src/asserv/aux_traj.h
@@ -1,6 +1,6 @@
-#ifndef aux_h
-#define aux_h
-/* aux.h */
+#ifndef aux_traj_h
+#define aux_traj_h
+/* aux_traj.h */
/* asserv - Position & speed motor control on AVR. {{{
*
* Copyright (C) 2008 Nicolas Schodet
@@ -100,4 +100,4 @@ aux_traj_update (void)
#endif /* !AC_ASSERV_AUX_NB */
-#endif /* aux_h */
+#endif /* aux_traj_h */
diff --git a/digital/asserv/src/asserv/main.c b/digital/asserv/src/asserv/main.c
index d7ee370f..500a56d1 100644
--- a/digital/asserv/src/asserv/main.c
+++ b/digital/asserv/src/asserv/main.c
@@ -36,7 +36,7 @@
#include "cs.h"
#include "postrack.h"
#include "traj.h"
-#include "aux.h"
+#include "aux_traj.h"
#include "seq.h"
diff --git a/digital/asserv/src/asserv/models.host.c b/digital/asserv/src/asserv/models.host.c
index d5c33eef..f7b28864 100644
--- a/digital/asserv/src/asserv/models.host.c
+++ b/digital/asserv/src/asserv/models.host.c
@@ -32,7 +32,7 @@
#include "models.host.h"
#include "simu.host.h"
-#include "aux.h"
+#include "aux_traj.h"
#include AC_ASSERV_CONTACTS_H
diff --git a/digital/asserv/src/asserv/twi_proto.c b/digital/asserv/src/asserv/twi_proto.c
index 3ebde309..f956ffad 100644
--- a/digital/asserv/src/asserv/twi_proto.c
+++ b/digital/asserv/src/asserv/twi_proto.c
@@ -33,7 +33,7 @@
#include "postrack.h"
#include "traj.h"
-#include "aux.h"
+#include "aux_traj.h"
#ifdef HOST
# include "simu.host.h"