diff --git a/DSTAT-temp/src/max5443.c b/DSTAT-temp/src/max5443.c index f5a9ee57fbac0403fe60bfa6871920c8f5e3fe8f..21efaded753da8c94eb2b9ea7a2e99454254439e 100644 --- a/DSTAT-temp/src/max5443.c +++ b/DSTAT-temp/src/max5443.c @@ -7,7 +7,7 @@ #include -volatile uint16_t max5443_offset = 105; +volatile int16_t max5443_offset = 105; struct usart_spi_device spi_device_conf_c = { .id = IOPORT_CREATE_PIN(PORTC, 4) @@ -31,8 +31,13 @@ void max5443_set_voltage1(uint16_t dacindex){ // if (buffer.ui16 == dacindex) // return; - - buffer.ui16 = dacindex+max5443_offset; + + if (65535-dacindex < max5443_offset) + buffer.ui16 = 65535; + else if (dacindex < -1*max5443_offset) + buffer.ui16 = 0; + else + buffer.ui16 = dacindex+max5443_offset; irqflags_t flags; flags = cpu_irq_save(); diff --git a/DSTAT1.atsuo b/DSTAT1.atsuo index 8486ac1b10a7c166a918e4afc2d20a93653c87f2..24000e0c2147ce95fc226e40e7a827288f7f30d1 100644 Binary files a/DSTAT1.atsuo and b/DSTAT1.atsuo differ diff --git a/DSTAT1/DSTAT1.cproj b/DSTAT1/DSTAT1.cproj index 59fb5da108576b035dfde05588f34a4acb6f243b..1fb507fe30a9a1c3db4a51df5ae4b4df91c88ca6 100644 --- a/DSTAT1/DSTAT1.cproj +++ b/DSTAT1/DSTAT1.cproj @@ -10,111 +10,111 @@ 2.11.1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ATxmega256A3U xmegaa @@ -128,7 +128,7 @@ Native true false - + exception_table 0 PDI com.atmel.avrdbg.tool.avrdragon @@ -190,7 +190,7 @@ true true - + 0x20000000 2 @@ -202,133 +202,133 @@ True - True - True - True - True - False - - - BOARD=USER_BOARD - - - - - ../src - ../src/asf/common/applications/user_application/user_board - ../src/asf/common/boards - ../src/asf/common/boards/user_board - ../src/asf/common/utils - ../src/asf/xmega/utils - ../src/asf/xmega/utils/preprocessor - ../src/config - ../src/asf/common/services/usb/class/cdc/device - ../src/asf/xmega/drivers/cpu - ../src/asf/xmega/drivers/ioport - ../src/asf/xmega/drivers/nvm - ../src/asf/xmega/drivers/sleep - ../src/asf/common/services/clock - ../src/asf/common/services/delay - ../src/asf/common/services/sleepmgr - ../src/asf/common/services/usb - ../src/asf/common/services/usb/class/cdc - ../src/asf/common/services/usb/udc - ../src/asf/xmega/drivers/usb - ../src/asf/common/utils/stdio/stdio_usb - ../src/asf/xmega/drivers/spi - ../src/asf/common/services/spi/xmega_spi - ../src/asf/common/services/spi - ../src/asf/xmega/drivers/pmic - ../src/asf/xmega/drivers/tc - ../src/asf/xmega/drivers/rtc - ../src/asf/xmega/drivers/usart - - - Optimize more (-O2) - -fdata-sections - True - -Werror-implicit-function-declaration -Wmissing-prototypes -Wpointer-arith -Wstrict-prototypes -mrelax -std=gnu99 - - - BOARD=USER_BOARD - - - - - ../src - ../src/asf/common/applications/user_application/user_board - ../src/asf/common/boards - ../src/asf/common/boards/user_board - ../src/asf/common/utils - ../src/asf/xmega/utils - ../src/asf/xmega/utils/preprocessor - ../src/config - ../src/asf/common/services/usb/class/cdc/device - ../src/asf/xmega/drivers/cpu - ../src/asf/xmega/drivers/ioport - ../src/asf/xmega/drivers/nvm - ../src/asf/xmega/drivers/sleep - ../src/asf/common/services/clock - ../src/asf/common/services/delay - ../src/asf/common/services/sleepmgr - ../src/asf/common/services/usb - ../src/asf/common/services/usb/class/cdc - ../src/asf/common/services/usb/udc - ../src/asf/xmega/drivers/usb - ../src/asf/common/utils/stdio/stdio_usb - ../src/asf/xmega/drivers/spi - ../src/asf/common/services/spi/xmega_spi - ../src/asf/common/services/spi - ../src/asf/xmega/drivers/pmic - ../src/asf/xmega/drivers/tc - ../src/asf/xmega/drivers/rtc - ../src/avr-stl/include - ../src/asf/xmega/drivers/usart - - - Optimize more (-O2) - - - libprintf_flt.a - libc.a - libm - - - -Wl,-u,vfprintf -lm - - - ../src - ../src/asf/common/applications/user_application/user_board - ../src/asf/common/boards - ../src/asf/common/boards/user_board - ../src/asf/common/utils - ../src/asf/xmega/utils - ../src/asf/xmega/utils/preprocessor - ../src/config - ../src/asf/common/services/usb/class/cdc/device - ../src/asf/xmega/drivers/cpu - ../src/asf/xmega/drivers/ioport - ../src/asf/xmega/drivers/nvm - ../src/asf/xmega/drivers/sleep - ../src/asf/common/services/clock - ../src/asf/common/services/delay - ../src/asf/common/services/sleepmgr - ../src/asf/common/services/usb - ../src/asf/common/services/usb/class/cdc - ../src/asf/common/services/usb/udc - ../src/asf/xmega/drivers/usb - ../src/asf/common/utils/stdio/stdio_usb - ../src/asf/xmega/drivers/spi - ../src/asf/common/services/spi/xmega_spi - ../src/asf/common/services/spi - ../src/asf/xmega/drivers/pmic - ../src/asf/xmega/drivers/tc - ../src/asf/xmega/drivers/rtc - ../src/avr-stl/include - ../src/asf/xmega/drivers/usart - - - + True + True + True + True + False + + + BOARD=USER_BOARD + + + + + ../src + ../src/asf/common/applications/user_application/user_board + ../src/asf/common/boards + ../src/asf/common/boards/user_board + ../src/asf/common/utils + ../src/asf/xmega/utils + ../src/asf/xmega/utils/preprocessor + ../src/config + ../src/asf/common/services/usb/class/cdc/device + ../src/asf/xmega/drivers/cpu + ../src/asf/xmega/drivers/ioport + ../src/asf/xmega/drivers/nvm + ../src/asf/xmega/drivers/sleep + ../src/asf/common/services/clock + ../src/asf/common/services/delay + ../src/asf/common/services/sleepmgr + ../src/asf/common/services/usb + ../src/asf/common/services/usb/class/cdc + ../src/asf/common/services/usb/udc + ../src/asf/xmega/drivers/usb + ../src/asf/common/utils/stdio/stdio_usb + ../src/asf/xmega/drivers/spi + ../src/asf/common/services/spi/xmega_spi + ../src/asf/common/services/spi + ../src/asf/xmega/drivers/pmic + ../src/asf/xmega/drivers/tc + ../src/asf/xmega/drivers/rtc + ../src/asf/xmega/drivers/usart + + + Optimize more (-O2) + -fdata-sections + True + -Werror-implicit-function-declaration -Wmissing-prototypes -Wpointer-arith -Wstrict-prototypes -mrelax -std=gnu99 + + + BOARD=USER_BOARD + + + + + ../src + ../src/asf/common/applications/user_application/user_board + ../src/asf/common/boards + ../src/asf/common/boards/user_board + ../src/asf/common/utils + ../src/asf/xmega/utils + ../src/asf/xmega/utils/preprocessor + ../src/config + ../src/asf/common/services/usb/class/cdc/device + ../src/asf/xmega/drivers/cpu + ../src/asf/xmega/drivers/ioport + ../src/asf/xmega/drivers/nvm + ../src/asf/xmega/drivers/sleep + ../src/asf/common/services/clock + ../src/asf/common/services/delay + ../src/asf/common/services/sleepmgr + ../src/asf/common/services/usb + ../src/asf/common/services/usb/class/cdc + ../src/asf/common/services/usb/udc + ../src/asf/xmega/drivers/usb + ../src/asf/common/utils/stdio/stdio_usb + ../src/asf/xmega/drivers/spi + ../src/asf/common/services/spi/xmega_spi + ../src/asf/common/services/spi + ../src/asf/xmega/drivers/pmic + ../src/asf/xmega/drivers/tc + ../src/asf/xmega/drivers/rtc + ../src/avr-stl/include + ../src/asf/xmega/drivers/usart + + + Optimize more (-O2) + + + libprintf_flt.a + libc.a + libm + + + -Wl,-u,vfprintf -lm + + + ../src + ../src/asf/common/applications/user_application/user_board + ../src/asf/common/boards + ../src/asf/common/boards/user_board + ../src/asf/common/utils + ../src/asf/xmega/utils + ../src/asf/xmega/utils/preprocessor + ../src/config + ../src/asf/common/services/usb/class/cdc/device + ../src/asf/xmega/drivers/cpu + ../src/asf/xmega/drivers/ioport + ../src/asf/xmega/drivers/nvm + ../src/asf/xmega/drivers/sleep + ../src/asf/common/services/clock + ../src/asf/common/services/delay + ../src/asf/common/services/sleepmgr + ../src/asf/common/services/usb + ../src/asf/common/services/usb/class/cdc + ../src/asf/common/services/usb/udc + ../src/asf/xmega/drivers/usb + ../src/asf/common/utils/stdio/stdio_usb + ../src/asf/xmega/drivers/spi + ../src/asf/common/services/spi/xmega_spi + ../src/asf/common/services/spi + ../src/asf/xmega/drivers/pmic + ../src/asf/xmega/drivers/tc + ../src/asf/xmega/drivers/rtc + ../src/avr-stl/include + ../src/asf/xmega/drivers/usart + + + @@ -339,54 +339,54 @@ True - True - True - True - True - False - - - BOARD=USER_BOARD - - - - - ../src - ../src/asf/common/applications/user_application/user_board - ../src/asf/common/boards - ../src/asf/common/boards/user_board - ../src/asf/common/utils - ../src/asf/xmega/utils - ../src/asf/xmega/utils/preprocessor - ../src/config - ../src/asf/common/services/usb/class/cdc/device - ../src/asf/xmega/drivers/cpu - ../src/asf/xmega/drivers/ioport - ../src/asf/xmega/drivers/nvm - ../src/asf/xmega/drivers/sleep - ../src/asf/common/services/clock - ../src/asf/common/services/delay - ../src/asf/common/services/sleepmgr - ../src/asf/common/services/usb - ../src/asf/common/services/usb/class/cdc - ../src/asf/common/services/usb/udc - ../src/asf/xmega/drivers/usb - ../src/asf/common/utils/stdio/stdio_usb - ../src/asf/xmega/drivers/spi - ../src/asf/common/services/spi/xmega_spi - ../src/asf/common/services/spi - ../src/asf/xmega/drivers/pmic - ../src/asf/xmega/drivers/tc - ../src/asf/xmega/drivers/rtc - ../src/asf/xmega/drivers/usart - - - Optimize (-O1) - -fdata-sections - Maximum (-g3) - True - -Werror-implicit-function-declaration -Wmissing-prototypes -Wpointer-arith -Wstrict-prototypes -mrelax -std=gnu99 - + True + True + True + True + False + + + BOARD=USER_BOARD + + + + + ../src + ../src/asf/common/applications/user_application/user_board + ../src/asf/common/boards + ../src/asf/common/boards/user_board + ../src/asf/common/utils + ../src/asf/xmega/utils + ../src/asf/xmega/utils/preprocessor + ../src/config + ../src/asf/common/services/usb/class/cdc/device + ../src/asf/xmega/drivers/cpu + ../src/asf/xmega/drivers/ioport + ../src/asf/xmega/drivers/nvm + ../src/asf/xmega/drivers/sleep + ../src/asf/common/services/clock + ../src/asf/common/services/delay + ../src/asf/common/services/sleepmgr + ../src/asf/common/services/usb + ../src/asf/common/services/usb/class/cdc + ../src/asf/common/services/usb/udc + ../src/asf/xmega/drivers/usb + ../src/asf/common/utils/stdio/stdio_usb + ../src/asf/xmega/drivers/spi + ../src/asf/common/services/spi/xmega_spi + ../src/asf/common/services/spi + ../src/asf/xmega/drivers/pmic + ../src/asf/xmega/drivers/tc + ../src/asf/xmega/drivers/rtc + ../src/asf/xmega/drivers/usart + + + Optimize (-O1) + -fdata-sections + Maximum (-g3) + True + -Werror-implicit-function-declaration -Wmissing-prototypes -Wpointer-arith -Wstrict-prototypes -mrelax -std=gnu99 +