X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=blobdiff_plain;f=config%2Fconfig.in;h=8cf30f3e38cbb0ac8ba51a4bdb0f454ee44b970a;hp=583b736466921f0442deacb1c9fabb41618dbe59;hb=HEAD;hpb=ccc6954bb046671b9e28c5806db5121c1eef49c0

diff --git a/config/config.in b/config/config.in
index 583b736..8cf30f3 100644
--- 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'
@@ -131,6 +136,9 @@ dep_bool 'Vect2 lib' CONFIG_MODULE_VECT2 \
 dep_bool 'Geometry lib' CONFIG_MODULE_GEOMETRY \
 	$CONFIG_MATH_LIB
 
+#### Hostsim
+bool 'Hostsim' CONFIG_MODULE_HOSTSIM
+
 #### SCHEDULER
 bool 'Scheduler' CONFIG_MODULE_SCHEDULER
 
@@ -154,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
@@ -357,10 +367,12 @@ dep_bool '  |-- Create Default encoders_spi config' CONFIG_MODULE_ENCODERS_SPI_C
 endmenu # (encoders)
 
 mainmenu_option next_comment
-comment 'Robot specific modules'
+comment 'Robot specific modules (fixed point lib may be needed)'
 
 #### ROBOT_SYSTEM
-dep_bool 'Robot System' CONFIG_MODULE_ROBOT_SYSTEM \
+bool 'Robot System' CONFIG_MODULE_ROBOT_SYSTEM
+
+dep_bool 'Use fixed point lib' CONFIG_MODULE_ROBOT_SYSTEM_USE_F64 \
 	$CONFIG_MODULE_FIXED_POINT
 
 dep_bool '  |-- Allow motor and external encoders' CONFIG_MODULE_ROBOT_SYSTEM_MOT_AND_EXT \
@@ -377,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
@@ -426,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
 
 
@@ -507,24 +526,100 @@ choice 'Programmer' "avrdude CONFIG_AVRDUDE\
 mainmenu_option next_comment
 comment 'Avrdude'
 
-choice 'Programmer type' "futurlec CONFIG_AVRDUDE_PROG_FUTURELEC\
+choice 'Programmer type' "2232HIO CONFIG_AVRDUDE_PROG_2232HIO\
+ 4232h CONFIG_AVRDUDE_PROG_4232H\
+ 89isp CONFIG_AVRDUDE_PROG_89ISP\
  abcmini CONFIG_AVRDUDE_PROG_ABCMINI\
- picoweb CONFIG_AVRDUDE_PROG_PICOWEB\
- sp12 CONFIG_AVRDUDE_PROG_SP12\
  alf CONFIG_AVRDUDE_PROG_ALF\
- bascom CONFIG_AVRDUDE_PROG_BASCOM\
- dt006 CONFIG_AVRDUDE_PROG_DT006\
- pony-stk200 CONFIG_AVRDUDE_PROG_PONY_STK200\
- stk200 CONFIG_AVRDUDE_PROG_STK200\
- pavr CONFIG_AVRDUDE_PROG_PAVR\
- butterfly CONFIG_AVRDUDE_PROG_BUTTERFLY\
+ arduino CONFIG_AVRDUDE_PROG_ARDUINO\
+ arduino-ft232r CONFIG_AVRDUDE_PROG_ARDUINO_FT232R\
+ atisp CONFIG_AVRDUDE_PROG_ATISP\
+ atmelice CONFIG_AVRDUDE_PROG_ATMELICE\
+ atmelice_dw CONFIG_AVRDUDE_PROG_ATMELICE_DW\
+ atmelice_isp CONFIG_AVRDUDE_PROG_ATMELICE_ISP\
+ atmelice_pdi CONFIG_AVRDUDE_PROG_ATMELICE_PDI\
+ avr109 CONFIG_AVRDUDE_PROG_AVR109\
  avr910 CONFIG_AVRDUDE_PROG_AVR910\
- stk500 CONFIG_AVRDUDE_PROG_STK500\
+ avr911 CONFIG_AVRDUDE_PROG_AVR911\
+ avrftdi CONFIG_AVRDUDE_PROG_AVRFTDI\
  avrisp CONFIG_AVRDUDE_PROG_AVRISP\
+ avrisp2 CONFIG_AVRDUDE_PROG_AVRISP2\
+ avrispmkII CONFIG_AVRDUDE_PROG_AVRISPMKII\
+ avrispv2 CONFIG_AVRDUDE_PROG_AVRISPV2\
+ bascom CONFIG_AVRDUDE_PROG_BASCOM\
+ blaster CONFIG_AVRDUDE_PROG_BLASTER\
  bsd CONFIG_AVRDUDE_PROG_BSD\
+ buspirate CONFIG_AVRDUDE_PROG_BUSPIRATE\
+ buspirate_bb CONFIG_AVRDUDE_PROG_BUSPIRATE_BB\
+ butterfly CONFIG_AVRDUDE_PROG_BUTTERFLY\
+ butterfly_mk CONFIG_AVRDUDE_PROG_BUTTERFLY_MK\
+ bwmega CONFIG_AVRDUDE_PROG_BWMEGA\
+ C232HM CONFIG_AVRDUDE_PROG_C232HM\
+ c2n232i CONFIG_AVRDUDE_PROG_C2N232I\
  dapa CONFIG_AVRDUDE_PROG_DAPA\
+ dasa CONFIG_AVRDUDE_PROG_DASA\
+ dasa3 CONFIG_AVRDUDE_PROG_DASA3\
+ diecimila CONFIG_AVRDUDE_PROG_DIECIMILA\
+ dragon_dw CONFIG_AVRDUDE_PROG_DRAGON_DW\
+ dragon_hvsp CONFIG_AVRDUDE_PROG_DRAGON_HVSP\
+ dragon_isp CONFIG_AVRDUDE_PROG_DRAGON_ISP\
+ dragon_jtag CONFIG_AVRDUDE_PROG_DRAGON_JTAG\
+ dragon_pdi CONFIG_AVRDUDE_PROG_DRAGON_PDI\
+ dragon_pp CONFIG_AVRDUDE_PROG_DRAGON_PP\
+ dt006 CONFIG_AVRDUDE_PROG_DT006\
+ ere-isp-avr CONFIG_AVRDUDE_PROG_ERE_ISP_AVR\
+ flip1 CONFIG_AVRDUDE_PROG_FLIP1\
+ flip2 CONFIG_AVRDUDE_PROG_FLIP2\
+ frank-stk200 CONFIG_AVRDUDE_PROG_FRANK_STK200\
+ ft232r CONFIG_AVRDUDE_PROG_FT232R\
+ ft245r CONFIG_AVRDUDE_PROG_FT245R\
+ futurlec CONFIG_AVRDUDE_PROG_FUTURELEC\
  jtag1 CONFIG_AVRDUDE_PROG_JTAG1\
- avr109 CONFIG_AVRDUDE_PROG_AVR109\
+ jtag1slow CONFIG_AVRDUDE_PROG_JTAG1SLOW\
+ jtag2 CONFIG_AVRDUDE_PROG_JTAG2\
+ jtag2avr32 CONFIG_AVRDUDE_PROG_JTAG2AVR32\
+ jtag2dw CONFIG_AVRDUDE_PROG_JTAG2DW\
+ jtag2fast CONFIG_AVRDUDE_PROG_JTAG2FAST\
+ jtag2isp CONFIG_AVRDUDE_PROG_JTAG2ISP\
+ jtag2pdi CONFIG_AVRDUDE_PROG_JTAG2PDI\
+ jtag2slow CONFIG_AVRDUDE_PROG_JTAG2SLOW\
+ jtag3 CONFIG_AVRDUDE_PROG_JTAG3\
+ jtag3dw CONFIG_AVRDUDE_PROG_JTAG3DW\
+ jtag3isp CONFIG_AVRDUDE_PROG_JTAG3ISP\
+ jtag3pdi CONFIG_AVRDUDE_PROG_JTAG3PDI\
+ jtagkey CONFIG_AVRDUDE_PROG_JTAGKEY\
+ jtagmkI CONFIG_AVRDUDE_PROG_JTAGMKI\
+ jtagmkII CONFIG_AVRDUDE_PROG_JTAGMKII\
+ jtagmkII_avr32 CONFIG_AVRDUDE_PROG_JTAGMKII_AVR32\
+ lm3s811 CONFIG_AVRDUDE_PROG_LM3S811\
+ mib510 CONFIG_AVRDUDE_PROG_MIB510\
+ mkbutterfly CONFIG_AVRDUDE_PROG_MKBUTTERFLY\
+ nibobee CONFIG_AVRDUDE_PROG_NIBOBEE\
+ o-link CONFIG_AVRDUDE_PROG_O_LINK\
+ openmoko CONFIG_AVRDUDE_PROG_OPENMOKO\
+ pavr CONFIG_AVRDUDE_PROG_PAVR\
+ pickit2 CONFIG_AVRDUDE_PROG_PICKIT2\
+ picoweb CONFIG_AVRDUDE_PROG_PICOWEB\
+ pony-stk200 CONFIG_AVRDUDE_PROG_PONY_STK200\
+ ponyser CONFIG_AVRDUDE_PROG_PONYSER\
+ siprog CONFIG_AVRDUDE_PROG_SIPROG\
+ sp12 CONFIG_AVRDUDE_PROG_SP12\
+ stk200 CONFIG_AVRDUDE_PROG_STK200\
+ stk500 CONFIG_AVRDUDE_PROG_STK500\
+ stk500hvsp CONFIG_AVRDUDE_PROG_STK500HVSP\
+ stk500pp CONFIG_AVRDUDE_PROG_STK500PP\
+ stk500v1 CONFIG_AVRDUDE_PROG_STK500V1\
+ stk500v2 CONFIG_AVRDUDE_PROG_STK500V2\
+ stk600 CONFIG_AVRDUDE_PROG_STK600\
+ stk600hvsp CONFIG_AVRDUDE_PROG_STK600HVSP\
+ stk600pp CONFIG_AVRDUDE_PROG_STK600PP\
+ UM232H CONFIG_AVRDUDE_PROG_UM232H\
+ usbasp CONFIG_AVRDUDE_PROG_USBASP\
+ usbasp-clone CONFIG_AVRDUDE_PROG_USBASP_CLONE\
+ usbtiny CONFIG_AVRDUDE_PROG_USBTINY\
+ wiring CONFIG_AVRDUDE_PROG_WIRING\
+ xil CONFIG_AVRDUDE_PROG_XIL\
+ xplainedpro CONFIG_AVRDUDE_PROG_XPLAINEDPRO\
 " stk200
 
 string 'Port device' CONFIG_AVRDUDE_PORT '/dev/parport0'
@@ -541,7 +636,8 @@ string 'Port device' CONFIG_AVARICE_PORT '/dev/ttyS0'
 int 'Debug TCP Port' CONFIG_AVARICE_DEBUG_PORT '1234'
 
 choice 'Programmer type' "mkI CONFIG_AVARICE_PROG_MKI\
- mkII CONFIG_AVARICE_PROG_MKII
+ mkII CONFIG_AVARICE_PROG_MKII\
+ dragon CONFIG_AVARICE_PROG_DRAGON
 " mkI
 
 endmenu