summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJérémy Dufour2008-03-28 02:02:35 +0100
committerJérémy Dufour2008-03-28 02:02:35 +0100
commit429c7e83ce696cec49bf008180b1d171abb82174 (patch)
tree03914fa81287ece04034ce8289e0b670aa7cbc96
parentb2f7ae8308ae0d4e3baaca34869b7e01f3432d0e (diff)
* digital/io/src
- fix includes (thanks to ni).
-rw-r--r--digital/io/src/asserv.c1
-rw-r--r--digital/io/src/asserv.h2
-rw-r--r--digital/io/src/eeprom.c2
-rw-r--r--digital/io/src/main.c1
-rw-r--r--digital/io/src/servo.c3
-rw-r--r--digital/io/src/sharp.c1
-rw-r--r--digital/io/src/sharp.h2
-rw-r--r--digital/io/src/switch.h2
-rw-r--r--digital/io/src/trap.c3
-rw-r--r--digital/io/src/trap.h1
10 files changed, 8 insertions, 10 deletions
diff --git a/digital/io/src/asserv.c b/digital/io/src/asserv.c
index 282a0541..3c79c135 100644
--- a/digital/io/src/asserv.c
+++ b/digital/io/src/asserv.c
@@ -23,6 +23,7 @@
*
* }}} */
+#include "common.h"
#include "asserv.h"
#include "modules/twi/twi.h" /* twi_* */
diff --git a/digital/io/src/asserv.h b/digital/io/src/asserv.h
index 021c88e7..005ae7a3 100644
--- a/digital/io/src/asserv.h
+++ b/digital/io/src/asserv.h
@@ -38,8 +38,6 @@
* ignored.
*/
-#include "common.h"
-
/**
* Initialize the asserv control module.
* This functions does not initialize the asserv board, but the underling
diff --git a/digital/io/src/eeprom.c b/digital/io/src/eeprom.c
index 1c17e60f..1a6dc4fa 100644
--- a/digital/io/src/eeprom.c
+++ b/digital/io/src/eeprom.c
@@ -23,10 +23,12 @@
*
* }}} */
+#include "common.h"
#include "eeprom.h"
#include "servo.h" /* SERVO_NUMBER */
#include "trap.h" /* trap_high_time_pos */
+
#include <avr/eeprom.h> /* eeprom_{read,write}_byte */
/**
diff --git a/digital/io/src/main.c b/digital/io/src/main.c
index f9c39931..7f0fc6eb 100644
--- a/digital/io/src/main.c
+++ b/digital/io/src/main.c
@@ -24,7 +24,6 @@
* }}} */
#include "common.h"
-#include "io.h"
#include "modules/uart/uart.h"
#include "modules/proto/proto.h"
#include "modules/utils/utils.h"
diff --git a/digital/io/src/servo.c b/digital/io/src/servo.c
index 5e131b87..0d2b2580 100644
--- a/digital/io/src/servo.c
+++ b/digital/io/src/servo.c
@@ -23,11 +23,12 @@
*
* }}} */
+#include "common.h"
#include "servo.h"
-#include "io.h" /* General defines of registers */
#include "modules/utils/utils.h" /* regv, set_bit */
#include "modules/utils/byte.h" /* v16_to_v8 */
+#include "io.h" /* General defines of registers */
/**
* @defgroup ServoConfig Servo module configuration variables and defines.
diff --git a/digital/io/src/sharp.c b/digital/io/src/sharp.c
index 1a3084a7..9f99087a 100644
--- a/digital/io/src/sharp.c
+++ b/digital/io/src/sharp.c
@@ -23,6 +23,7 @@
*
* }}} */
+#include "common.h"
#include "sharp.h"
#include "modules/adc/adc.h" /* ADC functions */
diff --git a/digital/io/src/sharp.h b/digital/io/src/sharp.h
index ef48969a..c3f64284 100644
--- a/digital/io/src/sharp.h
+++ b/digital/io/src/sharp.h
@@ -34,8 +34,6 @@
* it when calling the correct function.
*/
-#include "common.h" /* uint*_t */
-
/**
* Number of sharps.
*/
diff --git a/digital/io/src/switch.h b/digital/io/src/switch.h
index 3b4e060e..29e5a681 100644
--- a/digital/io/src/switch.h
+++ b/digital/io/src/switch.h
@@ -29,7 +29,7 @@
* @file Module to manage 'switchs'. For example, colors selector and jack.
*/
-#include "io.h"
+#include "io.h" /* PORT/PIN, bit_is_set */
#include "modules/utils/utils.h" /* set_bit */
/**
diff --git a/digital/io/src/trap.c b/digital/io/src/trap.c
index 01259d3c..a57147bc 100644
--- a/digital/io/src/trap.c
+++ b/digital/io/src/trap.c
@@ -23,10 +23,9 @@
*
* }}} */
+#include "common.h"
#include "trap.h"
-#include "servo.h" /* servo_* */
-
/**
* @todo
* - how to manage traps collision for the 3 and 4.
diff --git a/digital/io/src/trap.h b/digital/io/src/trap.h
index b6bd43af..f85c1d60 100644
--- a/digital/io/src/trap.h
+++ b/digital/io/src/trap.h
@@ -52,7 +52,6 @@
*/
#include "servo.h" /* SERVO_NUMBER */
-#include "common.h" /* uint8_t */
/**
* Trap high time values for the different positions (horizontal and