timer: fix function definitions for uC having several output compare

[aversive.git] / config / config.in

diff --git a/config/config.in b/config/config.in
index 305cb79..500f69d 100644 (file)
--- a/config/config.in
+++ b/config/config.in
@@ -13,6 +13,7 @@ choice 'Avr type' "\
  AT90s2343 CONFIG_MCU_AT90S2343 \
  ATtiny22 CONFIG_MCU_ATTINY22 \
  ATtiny26 CONFIG_MCU_ATTINY26 \
+ ATtiny45 CONFIG_MCU_ATTINY45 \
  AT90s4414 CONFIG_MCU_AT90S4414 \
  AT90s4433 CONFIG_MCU_AT90S4433 \
  AT90s4434 CONFIG_MCU_AT90S4434 \
@@ -42,6 +43,7 @@ choice 'Avr type' "\
  ATmega32 CONFIG_MCU_ATMEGA32 \
  ATmega323 CONFIG_MCU_ATMEGA323 \
  ATmega325 CONFIG_MCU_ATMEGA325 \
+ ATmega328P CONFIG_MCU_ATMEGA328P \
  ATmega3250 CONFIG_MCU_ATMEGA3250 \
  ATmega64 CONFIG_MCU_ATMEGA64 \
  ATmega645 CONFIG_MCU_ATMEGA645 \
@@ -53,6 +55,9 @@ choice 'Avr type' "\
  AT90s1200 CONFIG_MCU_AT90S1200 \
  ATmega2560 CONFIG_MCU_ATMEGA2560 \
  ATmega256 CONFIG_MCU_ATMEGA256 \
+ ATxmega128A1 CONFIG_MCU_ATXMEGA128A1 \
+ ATmega168P CONFIG_MCU_ATMEGA168P \
+ ATmega1284P CONFIG_MCU_ATMEGA1284P \
 " ATmega128
 
 int 'Quartz Frequency (Hz)' CONFIG_QUARTZ '12000000'
@@ -157,6 +162,8 @@ choice 'Scheduler config' "use_timer_module CONFIG_MODULE_SCHEDULER_USE_TIMERS\
 
 fi
 
+bool 'Callout' CONFIG_MODULE_CALLOUT
+
 #### TIME
 dep_bool 'Time' CONFIG_MODULE_TIME \
        $CONFIG_MODULE_SCHEDULER
@@ -382,8 +389,7 @@ dep_bool '  |-- Compensate centrifugal force' CONFIG_MODULE_COMPENSATE_CENTRIFUG
 dep_bool 'Trajectory manager' CONFIG_MODULE_TRAJECTORY_MANAGER \
        $CONFIG_MODULE_POSITION_MANAGER \
        $CONFIG_MODULE_SCHEDULER \
-       $CONFIG_MODULE_VECT2 \
-       $CONFIG_MODULE_FIXED_POINT
+       $CONFIG_MODULE_VECT2
 
 #### BLOCKING DETECTION MANAGER
 bool 'Blocking detection manager' CONFIG_MODULE_BLOCKING_DETECTION_MANAGER
@@ -431,6 +437,14 @@ dep_bool 'CC2420 Radio Device (IEEE 802.15.4) (VERY EXPERIMENTAL)' CONFIG_MODULE
 dep_bool '  |-- Create Default CC2420 config' CONFIG_MODULE_CC2420_CREATE_CONFIG \
        $CONFIG_MODULE_CC2420
 
+bool 'Xbee Device' CONFIG_MODULE_XBEE
+
+dep_bool '  |-- Enable xbee stats' CONFIG_MODULE_XBEE_STATS \
+       $CONFIG_MODULE_XBEE
+
+dep_bool '  |-- Embed help strings in program memory' CONFIG_MODULE_XBEE_ATCMD_HELP \
+       $CONFIG_MODULE_XBEE
+
 endmenu # radio
 
 
@@ -524,12 +538,15 @@ choice 'Programmer type' "futurlec CONFIG_AVRDUDE_PROG_FUTURELEC\
  pavr CONFIG_AVRDUDE_PROG_PAVR\
  butterfly CONFIG_AVRDUDE_PROG_BUTTERFLY\
  avr910 CONFIG_AVRDUDE_PROG_AVR910\
+ avr911 CONFIG_AVRDUDE_PROG_AVR911\
  stk500 CONFIG_AVRDUDE_PROG_STK500\
  avrisp CONFIG_AVRDUDE_PROG_AVRISP\
  bsd CONFIG_AVRDUDE_PROG_BSD\
  dapa CONFIG_AVRDUDE_PROG_DAPA\
  jtag1 CONFIG_AVRDUDE_PROG_JTAG1\
  avr109 CONFIG_AVRDUDE_PROG_AVR109\
+ avrispmkii CONFIG_AVRDUDE_PROG_AVRISPMKII\
+ arduino CONFIG_AVRDUDE_PROG_ARDUINO\
 " stk200
 
 string 'Port device' CONFIG_AVRDUDE_PORT '/dev/parport0'