Commit from zer0 (2007-06-12 11:56 CEST) ---------------- add config file for example2
+ aversive projects/example2/.config 1.1 ---------------------------------- aversive/projects/example2/.config (1.1) ---------------------------------- *************** *** 0 **** --- 1,212 ---- + # + # Automatically generated by make menuconfig: don't edit + # + + # + # Hardware + # + # CONFIG_MCU_AT90S2313 is not set + # CONFIG_MCU_AT90S2323 is not set + # CONFIG_MCU_AT90S3333 is not set + # CONFIG_MCU_AT90S2343 is not set + # CONFIG_MCU_ATTINY22 is not set + # CONFIG_MCU_ATTINY26 is not set + # CONFIG_MCU_AT90S4414 is not set + # CONFIG_MCU_AT90S4433 is not set + # CONFIG_MCU_AT90S4434 is not set + # CONFIG_MCU_AT90S8515 is not set + # CONFIG_MCU_AT90S8534 is not set + # CONFIG_MCU_AT90S8535 is not set + # CONFIG_MCU_AT86RF401 is not set + # CONFIG_MCU_ATMEGA103 is not set + # CONFIG_MCU_ATMEGA603 is not set + # CONFIG_MCU_AT43USB320 is not set + # CONFIG_MCU_AT43USB355 is not set + # CONFIG_MCU_AT76C711 is not set + # CONFIG_MCU_ATMEGA8 is not set + # CONFIG_MCU_ATMEGA48 is not set + # CONFIG_MCU_ATMEGA88 is not set + # CONFIG_MCU_ATMEGA8515 is not set + # CONFIG_MCU_ATMEGA8535 is not set + # CONFIG_MCU_ATTINY13 is not set + # CONFIG_MCU_ATTINY2313 is not set + # CONFIG_MCU_ATMEGA16 is not set + # CONFIG_MCU_ATMEGA161 is not set + # 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_ATMEGA169 is not set + # CONFIG_MCU_ATMEGA32 is not set + # CONFIG_MCU_ATMEGA323 is not set + # CONFIG_MCU_ATMEGA325 is not set + # CONFIG_MCU_ATMEGA3250 is not set + # CONFIG_MCU_ATMEGA64 is not set + # CONFIG_MCU_ATMEGA645 is not set + # CONFIG_MCU_ATMEGA6450 is not set + CONFIG_MCU_ATMEGA128=y + # CONFIG_MCU_AT90CAN128 is not set + # CONFIG_MCU_AT94K is not set + # CONFIG_MCU_AT90S1200 is not set + CONFIG_QUARTZ=12000000 + + # + # Generation options + # + # CONFIG_OPTM_0 is not set + # CONFIG_OPTM_1 is not set + # CONFIG_OPTM_2 is not set + # CONFIG_OPTM_3 is not set + CONFIG_OPTM_S=y + CONFIG_MATH_LIB=y + # CONFIG_FDEVOPEN_COMPAT is not set + # CONFIG_MINIMAL_PRINTF is not set + CONFIG_STANDARD_PRINTF=y + # CONFIG_ADVANCED_PRINTF is not set + CONFIG_FORMAT_IHEX=y + # CONFIG_FORMAT_SREC is not set + # CONFIG_FORMAT_BINARY is not set + + # + # Base modules + # + # CONFIG_MODULE_FIXED_POINT is not set + # CONFIG_MODULE_VECT2 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 + # CONFIG_MODULE_TIME is not set + # CONFIG_MODULE_TIME_CREATE_CONFIG is not set + + # + # Communication modules + # + CONFIG_MODULE_UART=y + CONFIG_MODULE_UART_CREATE_CONFIG=y + # CONFIG_MODULE_I2C is not set + # CONFIG_MODULE_I2C_MASTER is not set + # CONFIG_MODULE_I2C_MULTIMASTER is not set + # CONFIG_MODULE_I2C_CREATE_CONFIG is not set + # CONFIG_MODULE_MF2_CLIENT is not set + # CONFIG_MODULE_MF2_CLIENT_USE_SCHEDULER is not set + # CONFIG_MODULE_MF2_CLIENT_CREATE_CONFIG is not set + # CONFIG_MODULE_MF2_SERVER is not set + # CONFIG_MODULE_MF2_SERVER_CREATE_CONFIG is not set + + # + # Hardware modules + # + # CONFIG_MODULE_TIMER is not set + # CONFIG_MODULE_TIMER_CREATE_CONFIG is not set + # CONFIG_MODULE_TIMER_DYNAMIC is not set + # CONFIG_MODULE_PWM is not set + # CONFIG_MODULE_PWM_CREATE_CONFIG is not set + # CONFIG_MODULE_ADC is not set + # CONFIG_MODULE_ADC_CREATE_CONFIG is not set + + # + # IHM modules + # + # CONFIG_MODULE_MENU is not set + + # + # External devices modules + # + # CONFIG_MODULE_LCD is not set + # CONFIG_MODULE_LCD_CREATE_CONFIG is not set + # CONFIG_MODULE_MULTISERVO is not set + # CONFIG_MODULE_MULTISERVO_CREATE_CONFIG is not set + + # + # Brushless motor drivers (you should enable pwm modules to see all) + # + # CONFIG_MODULE_BRUSHLESS_3PHASE_DIGITAL_HALL is not set + # CONFIG_MODULE_BRUSHLESS_3PHASE_DIGITAL_HALL_CREATE_CONFIG is not set + # CONFIG_MODULE_BRUSHLESS_3PHASE_DIGITAL_HALL_DOUBLE is not set + # CONFIG_MODULE_BRUSHLESS_3PHASE_DIGITAL_HALL_DOUBLE_CREATE_CONFIG is not set + + # + # Encoders + # + # 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 + + # + # Robot specific modules + # + # CONFIG_MODULE_ROBOT_SYSTEM is not set + # CONFIG_MODULE_POSITION_MANAGER is not set + # CONFIG_MODULE_TRAJECTORY_MANAGER is not set + + # + # Control system modules + # + # CONFIG_MODULE_CONTROL_SYSTEM_MANAGER is not set + # CONFIG_MODULE_PID is not set + # CONFIG_MODULE_RAMP is not set + # CONFIG_MODULE_QUADRAMP is not set + # CONFIG_MODULE_QUADRAMP_DERIVATE is not set + # CONFIG_MODULE_BIQUAD is not set + # CONFIG_MODULE_QUADRAMP_DERIVATE is not set + # CONFIG_MODULE_BIQUAD is not set + + # + # Crypto modules + # + # CONFIG_MODULE_AES is not set + # CONFIG_MODULE_AES_CTR is not set + # CONFIG_MODULE_MD5 is not set + # CONFIG_MODULE_MD5_HMAC is not set + # CONFIG_MODULE_RC4 is not set + + # + # Encodings modules + # + # CONFIG_MODULE_BASE64 is not set + # CONFIG_MODULE_HAMMING is not set + + # + # Debug modules + # + # CONFIG_MODULE_DIAGNOSTIC is not set + # CONFIG_MODULE_DIAGNOSTIC_CREATE_CONFIG is not set + CONFIG_MODULE_ERROR=y + CONFIG_MODULE_ERROR_CREATE_CONFIG=y + + # + # Programmer options + # + CONFIG_AVRDUDE=y + # CONFIG_AVARICE is not set + + # + # Avrdude + # + # CONFIG_AVRDUDE_PROG_FUTURELEC is not set + # CONFIG_AVRDUDE_PROG_ABCMINI is not set + # CONFIG_AVRDUDE_PROG_PICOWEB is not set + # CONFIG_AVRDUDE_PROG_SP12 is not set + # CONFIG_AVRDUDE_PROG_ALF is not set + # CONFIG_AVRDUDE_PROG_BASCOM is not set + # CONFIG_AVRDUDE_PROG_DT006 is not set + # CONFIG_AVRDUDE_PROG_PONY_STK200 is not set + CONFIG_AVRDUDE_PROG_STK200=y + # CONFIG_AVRDUDE_PROG_PAVR is not set + # CONFIG_AVRDUDE_PROG_BUTTERFLY is not set + # CONFIG_AVRDUDE_PROG_AVR910 is not set + # CONFIG_AVRDUDE_PROG_STK500 is not set + # CONFIG_AVRDUDE_PROG_AVRISP is not set + # CONFIG_AVRDUDE_PROG_BSD is not set + # CONFIG_AVRDUDE_PROG_DAPA is not set + # CONFIG_AVRDUDE_PROG_JTAG1 is not set + CONFIG_AVRDUDE_PORT="/dev/parport0" + + # + # Avarice + # + CONFIG_AVARICE_PORT="/dev/ttyS0" + CONFIG_AVARICE_DEBUG_PORT=1234 + CONFIG_AVARICE_PROG_MKI=y + # CONFIG_AVARICE_PROG_MKII is not set Commit from zer0 (2007-06-12 12:01 CEST) ---------------- update configs aversive modules/base/math/fixed_point/test/.config 1.11 aversive modules/base/math/vect2/test/.config 1.10 aversive modules/base/scheduler/test/.config 1.11 aversive modules/comm/uart/test/.config 1.18 aversive modules/crypto/test/.config 1.6 aversive modules/debug/diagnostic/test/.config 1.15 aversive modules/debug/error/test/.config 1.12 aversive modules/devices/control_system/control_system_manager/test/.config 1.11 aversive modules/devices/control_system/filters/pid/test/.config 1.11 aversive modules/devices/control_system/filters/quadramp/test/.config 1.11 aversive modules/devices/ihm/lcd/test/.config 1.11 aversive modules/devices/robot/robot_system/test/.config 1.10 aversive modules/devices/servo/multiservo/test/.config 1.10 aversive modules/encoding/base64/test/.config 1.8 aversive modules/encoding/hamming/test/.config 1.6 aversive modules/hardware/adc/test/.config 1.9 aversive modules/hardware/pwm/test/.config 1.8 aversive modules/hardware/timer/test/.config 1.5 aversive modules/ihm/menu/test/.config 1.10 aversive projects/example1/.config 1.7 aversive projects/example2/.config 1.2 --------------------------------------------------- aversive/modules/base/math/fixed_point/test/.config (1.10 -> 1.11) --------------------------------------------------- *************** *** 161,166 **** --- 161,168 ---- # CONFIG_MODULE_QUADRAMP is not set # CONFIG_MODULE_QUADRAMP_DERIVATE is not set # CONFIG_MODULE_BIQUAD is not set + # CONFIG_MODULE_QUADRAMP_DERIVATE is not set + # CONFIG_MODULE_BIQUAD is not set # # Crypto modules --------------------------------------------- aversive/modules/base/math/vect2/test/.config (1.9 -> 1.10) --------------------------------------------- *************** *** 161,166 **** --- 161,168 ---- # CONFIG_MODULE_QUADRAMP is not set # CONFIG_MODULE_QUADRAMP_DERIVATE is not set # CONFIG_MODULE_BIQUAD is not set + # CONFIG_MODULE_QUADRAMP_DERIVATE is not set + # CONFIG_MODULE_BIQUAD is not set # # Crypto modules -------------------------------------------- aversive/modules/base/scheduler/test/.config (1.10 -> 1.11) -------------------------------------------- *************** *** 1,5 **** # ! # Automatically generated by make menuconfig: don't edit # # --- 1,5 ---- # ! # Automatically generated make config: don't edit # # *************** *** 70,75 **** --- 70,79 ---- # # Base modules # + + # + # Enable math library in generation options to see all modules + # # CONFIG_MODULE_FIXED_POINT is not set # CONFIG_MODULE_VECT2 is not set CONFIG_MODULE_SCHEDULER=y *************** *** 81,86 **** --- 85,94 ---- # # Communication modules # + + # + # mf2 client may need scheduler + # CONFIG_MODULE_UART=y # CONFIG_MODULE_UART_CREATE_CONFIG is not set # CONFIG_MODULE_I2C is not set *************** *** 144,158 **** --- 152,176 ---- # Control system modules # # CONFIG_MODULE_CONTROL_SYSTEM_MANAGER is not set + + # + # Filters + # # CONFIG_MODULE_PID is not set # CONFIG_MODULE_RAMP is not set # CONFIG_MODULE_QUADRAMP is not set # CONFIG_MODULE_QUADRAMP_DERIVATE is not set # CONFIG_MODULE_BIQUAD is not set + # CONFIG_MODULE_QUADRAMP_DERIVATE is not set + # CONFIG_MODULE_BIQUAD is not set # # Crypto modules # + + # + # Crypto modules depend on utils module + # # CONFIG_MODULE_AES is not set # CONFIG_MODULE_AES_CTR is not set # CONFIG_MODULE_MD5 is not set *************** *** 162,173 **** --- 180,199 ---- # # 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=y --------------------------------------- aversive/modules/comm/uart/test/.config (1.17 -> 1.18) --------------------------------------- *************** *** 161,166 **** --- 161,168 ---- # CONFIG_MODULE_QUADRAMP is not set # CONFIG_MODULE_QUADRAMP_DERIVATE is not set # CONFIG_MODULE_BIQUAD is not set + # CONFIG_MODULE_QUADRAMP_DERIVATE is not set + # CONFIG_MODULE_BIQUAD is not set # # Crypto modules ------------------------------------ aversive/modules/crypto/test/.config (1.5 -> 1.6) ------------------------------------ *************** *** 161,166 **** --- 161,168 ---- # CONFIG_MODULE_QUADRAMP is not set # CONFIG_MODULE_QUADRAMP_DERIVATE is not set # CONFIG_MODULE_BIQUAD is not set + # CONFIG_MODULE_QUADRAMP_DERIVATE is not set + # CONFIG_MODULE_BIQUAD is not set # # Crypto modules ---------------------------------------------- aversive/modules/debug/diagnostic/test/.config (1.14 -> 1.15) ---------------------------------------------- *************** *** 160,165 **** --- 160,167 ---- # CONFIG_MODULE_QUADRAMP is not set # CONFIG_MODULE_QUADRAMP_DERIVATE is not set # CONFIG_MODULE_BIQUAD is not set + # CONFIG_MODULE_QUADRAMP_DERIVATE is not set + # CONFIG_MODULE_BIQUAD is not set # # Crypto modules ----------------------------------------- aversive/modules/debug/error/test/.config (1.11 -> 1.12) ----------------------------------------- *************** *** 161,166 **** --- 161,168 ---- # CONFIG_MODULE_QUADRAMP is not set # CONFIG_MODULE_QUADRAMP_DERIVATE is not set # CONFIG_MODULE_BIQUAD is not set + # CONFIG_MODULE_QUADRAMP_DERIVATE is not set + # CONFIG_MODULE_BIQUAD is not set # # Crypto modules --------------------------------------------------------------------------- aversive/modules/devices/control_system/control_system_manager/test/.config (1.10 -> 1.11) --------------------------------------------------------------------------- *************** *** 161,166 **** --- 161,168 ---- CONFIG_MODULE_QUADRAMP=y # CONFIG_MODULE_QUADRAMP_DERIVATE is not set # CONFIG_MODULE_BIQUAD is not set + # CONFIG_MODULE_QUADRAMP_DERIVATE is not set + # CONFIG_MODULE_BIQUAD is not set # # Crypto modules ---------------------------------------------------------------- aversive/modules/devices/control_system/filters/pid/test/.config (1.10 -> 1.11) ---------------------------------------------------------------- *************** *** 161,166 **** --- 161,168 ---- # CONFIG_MODULE_QUADRAMP is not set # CONFIG_MODULE_QUADRAMP_DERIVATE is not set # CONFIG_MODULE_BIQUAD is not set + # CONFIG_MODULE_QUADRAMP_DERIVATE is not set + # CONFIG_MODULE_BIQUAD is not set # # Crypto modules --------------------------------------------------------------------- aversive/modules/devices/control_system/filters/quadramp/test/.config (1.10 -> 1.11) --------------------------------------------------------------------- *************** *** 161,166 **** --- 161,168 ---- CONFIG_MODULE_QUADRAMP=y # CONFIG_MODULE_QUADRAMP_DERIVATE is not set # CONFIG_MODULE_BIQUAD is not set + # CONFIG_MODULE_QUADRAMP_DERIVATE is not set + # CONFIG_MODULE_BIQUAD is not set # # Crypto modules --------------------------------------------- aversive/modules/devices/ihm/lcd/test/.config (1.10 -> 1.11) --------------------------------------------- *************** *** 161,166 **** --- 161,168 ---- # CONFIG_MODULE_QUADRAMP is not set # CONFIG_MODULE_QUADRAMP_DERIVATE is not set # CONFIG_MODULE_BIQUAD is not set + # CONFIG_MODULE_QUADRAMP_DERIVATE is not set + # CONFIG_MODULE_BIQUAD is not set # # Crypto modules -------------------------------------------------------- aversive/modules/devices/robot/robot_system/test/.config (1.9 -> 1.10) -------------------------------------------------------- *************** *** 161,166 **** --- 161,168 ---- # CONFIG_MODULE_QUADRAMP is not set # CONFIG_MODULE_QUADRAMP_DERIVATE is not set # CONFIG_MODULE_BIQUAD is not set + # CONFIG_MODULE_QUADRAMP_DERIVATE is not set + # CONFIG_MODULE_BIQUAD is not set # # Crypto modules ------------------------------------------------------ aversive/modules/devices/servo/multiservo/test/.config (1.9 -> 1.10) ------------------------------------------------------ *************** *** 161,166 **** --- 161,168 ---- # CONFIG_MODULE_QUADRAMP is not set # CONFIG_MODULE_QUADRAMP_DERIVATE is not set # CONFIG_MODULE_BIQUAD is not set + # CONFIG_MODULE_QUADRAMP_DERIVATE is not set + # CONFIG_MODULE_BIQUAD is not set # # Crypto modules --------------------------------------------- aversive/modules/encoding/base64/test/.config (1.7 -> 1.8) --------------------------------------------- *************** *** 161,166 **** --- 161,168 ---- # CONFIG_MODULE_QUADRAMP is not set # CONFIG_MODULE_QUADRAMP_DERIVATE is not set # CONFIG_MODULE_BIQUAD is not set + # CONFIG_MODULE_QUADRAMP_DERIVATE is not set + # CONFIG_MODULE_BIQUAD is not set # # Crypto modules ---------------------------------------------- aversive/modules/encoding/hamming/test/.config (1.5 -> 1.6) ---------------------------------------------- *************** *** 161,166 **** --- 161,168 ---- # CONFIG_MODULE_QUADRAMP is not set # CONFIG_MODULE_QUADRAMP_DERIVATE is not set # CONFIG_MODULE_BIQUAD is not set + # CONFIG_MODULE_QUADRAMP_DERIVATE is not set + # CONFIG_MODULE_BIQUAD is not set # # Crypto modules ------------------------------------------ aversive/modules/hardware/adc/test/.config (1.8 -> 1.9) ------------------------------------------ *************** *** 104,113 **** # # Hardware modules # - - # - # Hardware modules depend on utils module - # # CONFIG_MODULE_TIMER is not set # CONFIG_MODULE_TIMER_CREATE_CONFIG is not set # CONFIG_MODULE_TIMER_DYNAMIC is not set --- 104,109 ---- *************** *** 165,170 **** --- 161,168 ---- # CONFIG_MODULE_QUADRAMP is not set # CONFIG_MODULE_QUADRAMP_DERIVATE is not set # CONFIG_MODULE_BIQUAD is not set + # CONFIG_MODULE_QUADRAMP_DERIVATE is not set + # CONFIG_MODULE_BIQUAD is not set # # Crypto modules ------------------------------------------ aversive/modules/hardware/pwm/test/.config (1.7 -> 1.8) ------------------------------------------ *************** *** 161,166 **** --- 161,168 ---- # CONFIG_MODULE_QUADRAMP is not set # CONFIG_MODULE_QUADRAMP_DERIVATE is not set # CONFIG_MODULE_BIQUAD is not set + # CONFIG_MODULE_QUADRAMP_DERIVATE is not set + # CONFIG_MODULE_BIQUAD is not set # # Crypto modules -------------------------------------------- aversive/modules/hardware/timer/test/.config (1.4 -> 1.5) -------------------------------------------- *************** *** 161,166 **** --- 161,168 ---- # CONFIG_MODULE_QUADRAMP is not set # CONFIG_MODULE_QUADRAMP_DERIVATE is not set # CONFIG_MODULE_BIQUAD is not set + # CONFIG_MODULE_QUADRAMP_DERIVATE is not set + # CONFIG_MODULE_BIQUAD is not set # # Crypto modules -------------------------------------- aversive/modules/ihm/menu/test/.config (1.9 -> 1.10) -------------------------------------- *************** *** 161,166 **** --- 161,168 ---- # CONFIG_MODULE_QUADRAMP is not set # CONFIG_MODULE_QUADRAMP_DERIVATE is not set # CONFIG_MODULE_BIQUAD is not set + # CONFIG_MODULE_QUADRAMP_DERIVATE is not set + # CONFIG_MODULE_BIQUAD is not set # # Crypto modules ---------------------------------- aversive/projects/example1/.config (1.6 -> 1.7) ---------------------------------- *************** *** 161,166 **** --- 161,168 ---- # CONFIG_MODULE_QUADRAMP is not set # CONFIG_MODULE_QUADRAMP_DERIVATE is not set # CONFIG_MODULE_BIQUAD is not set + # CONFIG_MODULE_QUADRAMP_DERIVATE is not set + # CONFIG_MODULE_BIQUAD is not set # # Crypto modules ---------------------------------- aversive/projects/example2/.config (1.1 -> 1.2) ---------------------------------- *************** *** 1,5 **** # ! # Automatically generated by make menuconfig: don't edit # # --- 1,5 ---- # ! # Automatically generated make config: don't edit # # *************** *** 70,75 **** --- 70,79 ---- # # Base modules # + + # + # Enable math library in generation options to see all modules + # # CONFIG_MODULE_FIXED_POINT is not set # CONFIG_MODULE_VECT2 is not set # CONFIG_MODULE_SCHEDULER is not set *************** *** 81,86 **** --- 85,94 ---- # # Communication modules # + + # + # mf2 client may need scheduler + # CONFIG_MODULE_UART=y CONFIG_MODULE_UART_CREATE_CONFIG=y # CONFIG_MODULE_I2C is not set *************** *** 144,149 **** --- 152,161 ---- # Control system modules # # CONFIG_MODULE_CONTROL_SYSTEM_MANAGER is not set + + # + # Filters + # # CONFIG_MODULE_PID is not set # CONFIG_MODULE_RAMP is not set # CONFIG_MODULE_QUADRAMP is not set *************** *** 155,160 **** --- 167,176 ---- # # Crypto modules # + + # + # Crypto modules depend on utils module + # # CONFIG_MODULE_AES is not set # CONFIG_MODULE_AES_CTR is not set # CONFIG_MODULE_MD5 is not set *************** *** 164,175 **** --- 180,199 ---- # # 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=y Commit from zer0 on branch b_zer0 (2007-06-12 18:18 CEST) --------------------------------- optimize integer sqrt() function aversive modules/devices/control_system/filters/quadramp/quadramp.c 1.4.4.4 aversive modules/base/math/fixed_point/f16_sqrt.c 1.5.4.2 aversive modules/base/math/fixed_point/f32_sqrt.c 1.5.4.2 aversive modules/base/math/fixed_point/f64_sqrt.c 1.5.4.2 aversive modules/base/math/fixed_point/test/main.c 1.5.4.2 ------------------------------------------------------------------- aversive/modules/devices/control_system/filters/quadramp/quadramp.c (1.4.4.3 -> 1.4.4.4) ------------------------------------------------------------------- *************** *** 15,21 **** * 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: quadramp.c,v 1.4.4.3 2007-05-23 17:18:13 zer0 Exp $ * */ --- 15,21 ---- * 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: quadramp.c,v 1.4.4.4 2007-06-12 16:18:43 zer0 Exp $ * */ *************** *** 24,53 **** #include <aversive.h> #include <quadramp.h> ! /* could be optimized... */ ! static inline uint32_t u32_sqrt(uint32_t x) ! { ! uint32_t root=0x8000; ! uint32_t mask=0x8000; ! while(mask) { ! if( root*root < x ) { ! mask >>= 1; ! root |= mask; ! } ! else if ( root*root > x ) { ! root &= ~(mask); ! mask >>= 1; ! root |= mask; ! continue; ! } ! else ! break; ! } ! return root; } ! inline void quadramp_init(struct quadramp_filter * q) { uint8_t flags; IRQ_LOCK(flags); --- 24,46 ---- #include <aversive.h> #include <quadramp.h> ! #define NEXT(n, i) (((n) + (i)/(n)) >> 1) ! static uint32_t u32_sqrt(uint32_t number) { ! uint32_t n = 1; ! uint32_t n1 = NEXT(n, number); ! ! while(ABS(n1 - n) > 1) { ! n = n1; ! n1 = NEXT(n, number); ! } ! while((n1*n1) > number) { ! n1 -= 1; ! } ! return n1; } ! void quadramp_init(struct quadramp_filter * q) { uint8_t flags; IRQ_LOCK(flags); *************** *** 62,68 **** IRQ_UNLOCK(flags); } ! inline void quadramp_set_2nd_order_vars(struct quadramp_filter * q, uint32_t var_2nd_ord_pos, uint32_t var_2nd_ord_neg) { uint8_t flags; IRQ_LOCK(flags); --- 55,61 ---- IRQ_UNLOCK(flags); } ! void quadramp_set_2nd_order_vars(struct quadramp_filter * q, uint32_t var_2nd_ord_pos, uint32_t var_2nd_ord_neg) { uint8_t flags; IRQ_LOCK(flags); *************** *** 71,77 **** IRQ_UNLOCK(flags); } ! inline void quadramp_set_1st_order_vars(struct quadramp_filter * q, uint32_t var_1st_ord_pos, uint32_t var_1st_ord_neg) { uint8_t flags; IRQ_LOCK(flags); --- 64,70 ---- IRQ_UNLOCK(flags); } ! void quadramp_set_1st_order_vars(struct quadramp_filter * q, uint32_t var_1st_ord_pos, uint32_t var_1st_ord_neg) { uint8_t flags; IRQ_LOCK(flags); ------------------------------------------------- aversive/modules/base/math/fixed_point/f16_sqrt.c (1.5.4.1 -> 1.5.4.2) ------------------------------------------------- *************** *** 15,21 **** * 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: f16_sqrt.c,v 1.5.4.1 2006-11-26 21:06:01 zer0 Exp $ * */ --- 15,21 ---- * 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: f16_sqrt.c,v 1.5.4.2 2007-06-12 16:18:43 zer0 Exp $ * */ *************** *** 24,52 **** #include <s16_to_f16.h> ! /* could be optimized... */ ! static inline uint16_t u16_sqrt(uint16_t x) ! { ! uint16_t root=0x80; ! uint16_t mask=0x80; ! while(mask) { ! if( root*root < x ) { ! mask >>= 1; ! root |= mask; ! } ! else if ( root*root > x ) { ! root &= ~(mask); ! mask >>= 1; ! root |= mask; ! continue; ! } ! else ! break; ! } ! return root; } f16 f16_sqrt(f16 f) { uint16_t a,b,c,d; --- 24,46 ---- #include <s16_to_f16.h> ! #define NEXT(n, i) (((n) + (i)/(n)) >> 1) ! static uint16_t u16_sqrt(uint16_t number) { ! uint16_t n = 1; ! uint16_t n1 = NEXT(n, number); ! ! while(ABS(n1 - n) > 1) { ! n = n1; ! n1 = NEXT(n, number); ! } ! while((n1*n1) > number) { ! n1 -= 1; ! } ! return n1; } + f16 f16_sqrt(f16 f) { uint16_t a,b,c,d; ------------------------------------------------- aversive/modules/base/math/fixed_point/f32_sqrt.c (1.5.4.1 -> 1.5.4.2) ------------------------------------------------- *************** *** 15,21 **** * 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: f32_sqrt.c,v 1.5.4.1 2006-11-26 21:06:01 zer0 Exp $ * */ --- 15,21 ---- * 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: f32_sqrt.c,v 1.5.4.2 2007-06-12 16:18:43 zer0 Exp $ * */ *************** *** 23,49 **** #include <f32.h> #include <s32_to_f32.h> ! /* could be optimized... */ ! static inline uint32_t u32_sqrt(uint32_t x) ! { ! uint32_t root=0x8000; ! uint32_t mask=0x8000; ! while(mask) { ! if( root*root < x ) { ! mask >>= 1; ! root |= mask; ! } ! else if ( root*root > x ) { ! root &= ~(mask); ! mask >>= 1; ! root |= mask; ! continue; ! } ! else ! break; ! } ! return root; } f32 f32_sqrt(f32 f) --- 23,42 ---- #include <f32.h> #include <s32_to_f32.h> ! #define NEXT(n, i) (((n) + (i)/(n)) >> 1) ! static uint32_t u32_sqrt(uint32_t number) { ! uint32_t n = 1; ! uint32_t n1 = NEXT(n, number); ! ! while(ABS(n1 - n) > 1) { ! n = n1; ! n1 = NEXT(n, number); ! } ! while((n1*n1) > number) { ! n1 -= 1; ! } ! return n1; } f32 f32_sqrt(f32 f) ------------------------------------------------- aversive/modules/base/math/fixed_point/f64_sqrt.c (1.5.4.1 -> 1.5.4.2) ------------------------------------------------- *************** *** 15,21 **** * 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: f64_sqrt.c,v 1.5.4.1 2006-11-26 21:06:01 zer0 Exp $ * */ --- 15,21 ---- * 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: f64_sqrt.c,v 1.5.4.2 2007-06-12 16:18:43 zer0 Exp $ * */ *************** *** 23,49 **** #include <f64.h> #include <s64_to_f64.h> ! /* could be optimized... */ ! static inline uint64_t u64_sqrt(uint64_t x) ! { ! uint64_t root=0x80000000; ! uint64_t mask=0x80000000; ! while(mask) { ! if( root*root < x ) { ! mask >>= 1; ! root |= mask; ! } ! else if ( root*root > x ) { ! root &= ~(mask); ! mask >>= 1; ! root |= mask; ! continue; ! } ! else ! break; ! } ! return root; } f64 f64_sqrt(f64 f) --- 23,42 ---- #include <f64.h> #include <s64_to_f64.h> ! #define NEXT(n, i) (((n) + (i)/(n)) >> 1) ! static uint64_t u64_sqrt(uint64_t number) { ! uint64_t n = 1; ! uint64_t n1 = NEXT(n, number); ! ! while(ABS(n1 - n) > 1) { ! n = n1; ! n1 = NEXT(n, number); ! } ! while((n1*n1) > number) { ! n1 -= 1; ! } ! return n1; } f64 f64_sqrt(f64 f) -------------------------------------------------- aversive/modules/base/math/fixed_point/test/main.c (1.5.4.1 -> 1.5.4.2) -------------------------------------------------- *************** *** 15,21 **** * 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: main.c,v 1.5.4.1 2006-11-26 21:06:01 zer0 Exp $ * */ --- 15,21 ---- * 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: main.c,v 1.5.4.2 2007-06-12 16:18:43 zer0 Exp $ * */ *************** *** 99,104 **** --- 99,105 ---- printf("*** SQRT\n\n"); printf("Result is "); f64_print(f64_sqrt(a)); + f64_sqrt(a); printf("\nResult should be %f\n\n", sqrt(A)); printf("Result is "); f64_print(f64_sqrt(b)); _______________________________________________ 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