Commit from zer0 on branch b_zer0 (2009-06-29 22:28 CEST) =================================
fix uart on atmega 168 aversive modules/comm/uart/uart_defs.h 1.2.4.13 aversive modules/comm/uart/test/.config 1.13.4.11 ====================================== aversive/modules/comm/uart/uart_defs.h (1.2.4.12 -> 1.2.4.13) ====================================== @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Revision : $Id: uart_defs.h,v 1.2.4.12 2009-02-20 20:16:09 zer0 Exp $ + * Revision : $Id: uart_defs.h,v 1.2.4.13 2009-06-29 20:28:27 zer0 Exp $ * */ @@ -46,11 +46,21 @@ /* For arch with only one UART, we consider that UART0 = UART */ #if !defined(SIG_UART0_DATA) && !defined(SIG_USART0_DATA) +#if defined SIG_UART_DATA #define SIG_UART0_DATA SIG_UART_DATA +#elif defined SIG_USART_DATA +#define SIG_UART0_DATA SIG_USART_DATA #endif +#endif + #if !defined(SIG_UART0_RECV) && !defined(SIG_USART0_RECV) +#if defined SIG_UART_RECV #define SIG_UART0_RECV SIG_UART_RECV +#elif defined SIG_USART_RECV +#define SIG_UART0_RECV SIG_USART_RECV #endif +#endif + #ifndef UDR0 #define UDR0 UDR #endif ======================================= aversive/modules/comm/uart/test/.config (1.13.4.10 -> 1.13.4.11) ======================================= @@ -1,5 +1,5 @@ # -# Automatically generated make config: don't edit +# Automatically generated by make menuconfig: don't edit # # @@ -35,7 +35,7 @@ # CONFIG_MCU_ATMEGA162 is not set # CONFIG_MCU_ATMEGA163 is not set # CONFIG_MCU_ATMEGA165 is not set -# CONFIG_MCU_ATMEGA168 is not set +CONFIG_MCU_ATMEGA168=y # CONFIG_MCU_ATMEGA169 is not set # CONFIG_MCU_ATMEGA32 is not set # CONFIG_MCU_ATMEGA323 is not set @@ -44,10 +44,13 @@ # CONFIG_MCU_ATMEGA64 is not set # CONFIG_MCU_ATMEGA645 is not set # CONFIG_MCU_ATMEGA6450 is not set -CONFIG_MCU_ATMEGA128=y +# CONFIG_MCU_ATMEGA128 is not set +# CONFIG_MCU_ATMEGA1281 is not set # CONFIG_MCU_AT90CAN128 is not set # CONFIG_MCU_AT94K is not set # CONFIG_MCU_AT90S1200 is not set +# CONFIG_MCU_ATMEGA2560 is not set +# CONFIG_MCU_ATMEGA256 is not set CONFIG_QUARTZ=16000000 # @@ -60,6 +63,7 @@ # CONFIG_OPTM_S is not set CONFIG_MATH_LIB=y # CONFIG_FDEVOPEN_COMPAT is not set +# CONFIG_NO_PRINTF is not set # CONFIG_MINIMAL_PRINTF is not set CONFIG_STANDARD_PRINTF=y # CONFIG_ADVANCED_PRINTF is not set @@ -70,14 +74,11 @@ # # Base modules # - -# -# Enable math library in generation options to see all modules -# CONFIG_MODULE_CIRBUF=y # CONFIG_MODULE_CIRBUF_LARGE is not set # CONFIG_MODULE_FIXED_POINT is not set # CONFIG_MODULE_VECT2 is not set +# CONFIG_MODULE_GEOMETRY is not set # CONFIG_MODULE_SCHEDULER is not set # CONFIG_MODULE_SCHEDULER_CREATE_CONFIG is not set # CONFIG_MODULE_SCHEDULER_USE_TIMERS is not set @@ -85,16 +86,17 @@ # CONFIG_MODULE_SCHEDULER_MANUAL is not set # CONFIG_MODULE_TIME is not set # CONFIG_MODULE_TIME_CREATE_CONFIG is not set +# CONFIG_MODULE_TIME_EXT is not set +# CONFIG_MODULE_TIME_EXT_CREATE_CONFIG is not set # # Communication modules # - -# -# uart needs circular buffer, mf2 client may need scheduler -# CONFIG_MODULE_UART=y +# CONFIG_MODULE_UART_9BITS is not set CONFIG_MODULE_UART_CREATE_CONFIG=y +# CONFIG_MODULE_SPI is not set +# CONFIG_MODULE_SPI_CREATE_CONFIG is not set # CONFIG_MODULE_I2C is not set # CONFIG_MODULE_I2C_MASTER is not set # CONFIG_MODULE_I2C_MULTIMASTER is not set @@ -113,6 +115,7 @@ # CONFIG_MODULE_TIMER_DYNAMIC is not set # CONFIG_MODULE_PWM is not set # CONFIG_MODULE_PWM_CREATE_CONFIG is not set +# CONFIG_MODULE_PWM_NG is not set # CONFIG_MODULE_ADC is not set # CONFIG_MODULE_ADC_CREATE_CONFIG is not set @@ -126,6 +129,7 @@ # CONFIG_MODULE_RDLINE_KILL_BUF is not set # CONFIG_MODULE_RDLINE_HISTORY is not set # CONFIG_MODULE_PARSE is not set +# CONFIG_MODULE_PARSE_NO_FLOAT is not set # # External devices modules @@ -146,12 +150,14 @@ # CONFIG_MODULE_BRUSHLESS_3PHASE_DIGITAL_HALL_DOUBLE_CREATE_CONFIG is not set # -# Encoders +# Encoders (you need comm/spi for encoders_spi) # # CONFIG_MODULE_ENCODERS_MICROB is not set # CONFIG_MODULE_ENCODERS_MICROB_CREATE_CONFIG is not set # CONFIG_MODULE_ENCODERS_EIRBOT is not set # CONFIG_MODULE_ENCODERS_EIRBOT_CREATE_CONFIG is not set +# CONFIG_MODULE_ENCODERS_SPI is not set +# CONFIG_MODULE_ENCODERS_SPI_CREATE_CONFIG is not set # # Robot specific modules @@ -159,18 +165,16 @@ # CONFIG_MODULE_ROBOT_SYSTEM is not set # CONFIG_MODULE_ROBOT_SYSTEM_MOT_AND_EXT is not set # CONFIG_MODULE_POSITION_MANAGER is not set +# CONFIG_MODULE_COMPENSATE_CENTRIFUGAL_FORCE is not set # CONFIG_MODULE_TRAJECTORY_MANAGER is not set # CONFIG_MODULE_BLOCKING_DETECTION_MANAGER is not set # CONFIG_MODULE_OBSTACLE_AVOIDANCE is not set +# CONFIG_MODULE_OBSTACLE_AVOIDANCE_CREATE_CONFIG is not set # # Control system modules # # CONFIG_MODULE_CONTROL_SYSTEM_MANAGER is not set - -# -# Filters -# # CONFIG_MODULE_PID is not set # CONFIG_MODULE_PID_CREATE_CONFIG is not set # CONFIG_MODULE_RAMP is not set @@ -179,11 +183,13 @@ # CONFIG_MODULE_BIQUAD is not set # -# Crypto modules +# Radio devices # +# CONFIG_MODULE_CC2420 is not set +# CONFIG_MODULE_CC2420_CREATE_CONFIG is not set # -# Crypto modules depend on utils module +# Crypto modules # # CONFIG_MODULE_AES is not set # CONFIG_MODULE_AES_CTR is not set @@ -194,20 +200,12 @@ # # Encodings modules # - -# -# Encoding modules depend on utils module -# # CONFIG_MODULE_BASE64 is not set # CONFIG_MODULE_HAMMING is not set # # Debug modules # - -# -# Debug modules depend on utils module -# # CONFIG_MODULE_DIAGNOSTIC is not set # CONFIG_MODULE_DIAGNOSTIC_CREATE_CONFIG is not set # CONFIG_MODULE_ERROR is not set @@ -239,7 +237,9 @@ # CONFIG_AVRDUDE_PROG_BSD is not set # CONFIG_AVRDUDE_PROG_DAPA is not set # CONFIG_AVRDUDE_PROG_JTAG1 is not set +# CONFIG_AVRDUDE_PROG_AVR109 is not set CONFIG_AVRDUDE_PORT="/dev/parport0" +CONFIG_AVRDUDE_BAUDRATE=19200 # # Avarice @@ -248,3 +248,4 @@ CONFIG_AVARICE_DEBUG_PORT=1234 CONFIG_AVARICE_PROG_MKI=y # CONFIG_AVARICE_PROG_MKII is not set +# CONFIG_AVRDUDE_CHECK_SIGNATURE is not set _______________________________________________ Avr-list mailing list Avr-list@droids-corp.org CVSWEB : http://cvsweb.droids-corp.org/cgi-bin/viewcvs.cgi/aversive WIKI : http://wiki.droids-corp.org/index.php/Aversive DOXYGEN : http://zer0.droids-corp.org/doxygen_aversive/html/ BUGZILLA : http://bugzilla.droids-corp.org COMMIT LOGS : http://zer0.droids-corp.org/aversive_commitlog
