summaryrefslogtreecommitdiff
path: root/digital/dev2/src
diff options
context:
space:
mode:
authorNicolas Schodet2012-03-21 00:46:03 +0100
committerNicolas Schodet2012-03-21 18:56:51 +0100
commit1e7c8a8a9811c45091e6c471482086113f059f40 (patch)
treed7faa80dd162799c394ec23925cc53b6dbff008e /digital/dev2/src
parent0feb542a8cf7630a5d442387727414f5251aad83 (diff)
parentdcb79f383269440ec2c5a54b6d7792fbb0110d5a (diff)
Merge branch 'master' into efrei-robotique
Conflicts: digital/mimot/src/dirty/aux.c digital/mimot/src/dirty/aux.h digital/mimot/src/dirty/contacts.h digital/mimot/src/dirty/main.c digital/mimot/src/dirty/models.host.c digital/mimot/src/dirty/twi_proto.c digital/mimot/tools/mimot/init.py
Diffstat (limited to 'digital/dev2/src')
-rw-r--r--digital/dev2/src/usb_gpio/avrconfig.h1
-rw-r--r--digital/dev2/src/usb_serial_isp/avrconfig.h1
-rw-r--r--digital/dev2/src/usb_twi/avrconfig.h1
3 files changed, 3 insertions, 0 deletions
diff --git a/digital/dev2/src/usb_gpio/avrconfig.h b/digital/dev2/src/usb_gpio/avrconfig.h
index 0a90876d..eb780e77 100644
--- a/digital/dev2/src/usb_gpio/avrconfig.h
+++ b/digital/dev2/src/usb_gpio/avrconfig.h
@@ -28,6 +28,7 @@
/* utils */
/** AVR Frequency : 1000000, 1843200, 2000000, 3686400, 4000000, 7372800,
* 8000000, 11059200, 14745600, 16000000, 18432000, 20000000. */
+#error "please check frequency"
#define AC_FREQ 8000000
/* usb */
diff --git a/digital/dev2/src/usb_serial_isp/avrconfig.h b/digital/dev2/src/usb_serial_isp/avrconfig.h
index 1dfd63d2..60ddf99b 100644
--- a/digital/dev2/src/usb_serial_isp/avrconfig.h
+++ b/digital/dev2/src/usb_serial_isp/avrconfig.h
@@ -28,6 +28,7 @@
/* utils */
/** AVR Frequency : 1000000, 1843200, 2000000, 3686400, 4000000, 7372800,
* 8000000, 11059200, 14745600, 16000000, 18432000, 20000000. */
+#error "please check frequency"
#define AC_FREQ 8000000
/* uart - UART module. */
diff --git a/digital/dev2/src/usb_twi/avrconfig.h b/digital/dev2/src/usb_twi/avrconfig.h
index 5c2d92ce..83482f75 100644
--- a/digital/dev2/src/usb_twi/avrconfig.h
+++ b/digital/dev2/src/usb_twi/avrconfig.h
@@ -28,6 +28,7 @@
/* utils */
/** AVR Frequency : 1000000, 1843200, 2000000, 3686400, 4000000, 7372800,
* 8000000, 11059200, 14745600, 16000000, 18432000, 20000000. */
+#error "please check frequency"
#define AC_FREQ 8000000
/* twi - TWI module. */