diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/Makefile b/bacnet-stack/ports/bdk-atxx4-mstp/Makefile
index 37efb335..db7d1a0c 100644
--- a/bacnet-stack/ports/bdk-atxx4-mstp/Makefile
+++ b/bacnet-stack/ports/bdk-atxx4-mstp/Makefile
@@ -3,11 +3,18 @@
 ###############################################################################
 
 ## General Flags
+ifeq (${MCU},atmega1284p)
+MCU = atmega1284p
+AVRDUDE_MCU = m1284p
+LINT_MCU = __AVR_ATmega1284p__
+else
 MCU = atmega644p
 AVRDUDE_MCU = m644p
 # ATmega644 bootload is at word address 7000h, 7800h, 7C00h, or 7E00h
 # Double that value to get the byte address
 BOOTLOAD = 0xF800
+LINT_MCU = __AVR_ATmega644p__
+endif
 TARGET = bacnet
 ## Tools
 CC = avr-gcc
@@ -17,7 +24,6 @@ OBJDUMP = avr-objdump
 SIZE = avr-size
 AVRDUDE = avrdude
 LINT = splint
-LINT_MCU = __AVR_ATmega644p__
 
 SIZE_OPTIONS = -t
 #SIZE_OPTIONS = -C --mcu=${MCU}
@@ -30,11 +36,24 @@ SIZE_OPTIONS = -t
 # jtag2slow = Atmel JTAG ICE mkII, running at 19200 Bd
 # avrispmkII = AVR ISP MKII
 # avr109 = bootloader
-#AVRDUDE_PROGRAMMERID = avr109
-#AVRDUDE_PROGRAMMERID = jtag2fast
+ifeq (${JTAG},avr109)
+AVRDUDE_PROGRAMMERID = avr109
+endif
+ifeq (${JTAG},avrispmkII)
 #AVRDUDE_PROGRAMMERID = avrispmkII
+endif
+ifeq (${JTAG},dragon_isp)
 #AVRDUDE_PROGRAMMERID = dragon_isp
+endif
+ifeq (${JTAG},dragon_jtag)
 AVRDUDE_PROGRAMMERID = dragon_jtag
+endif
+ifeq (${JTAG},jtag2fast)
+AVRDUDE_PROGRAMMERID = jtag2fast
+endif
+ifndef JTAG
+AVRDUDE_PROGRAMMERID = jtag2fast
+endif
 #
 # port--serial or parallel port to which your
 # hardware programmer is attached
@@ -218,7 +237,9 @@ LDFLAGS = $(COMMON)
 #dead code removal
 #LDFLAGS += -Wl,-nostartfiles,-nostdlib
 LDFLAGS += -Wl,--gc-sections,-static
+ifneq (${MCU},atmega1284p)
 LDFLAGS += -Wl,--section-start=.bootloader=$(BOOTLOAD)
+endif
 LDFLAGS += -Wl,-Map=$(TARGET).map
 LDFLAGS += -Wl,-L.,-l$(TARGET)
 
diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/adc.c b/bacnet-stack/ports/bdk-atxx4-mstp/adc.c
index e8b59a6c..bdec4ad3 100644
--- a/bacnet-stack/ports/bdk-atxx4-mstp/adc.c
+++ b/bacnet-stack/ports/bdk-atxx4-mstp/adc.c
@@ -167,6 +167,5 @@ void adc_init(
        1 1 1 Timer/Counter1 Capture Event
      */
     ADCSRB = (0 << ADTS2) | (0 << ADTS1) | (0 << ADTS0);
-    /* Clear the Power Reduction bit */
-    BIT_CLEAR(PRR, PRADC);
+    power_adc_enable();
 }
diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/bacnet.aps b/bacnet-stack/ports/bdk-atxx4-mstp/bacnet.aps
index 5de4d5a3..11fa6d07 100644
--- a/bacnet-stack/ports/bdk-atxx4-mstp/bacnet.aps
+++ b/bacnet-stack/ports/bdk-atxx4-mstp/bacnet.aps
@@ -1 +1 @@
-<AVRStudio><MANAGEMENT><ProjectName>bacnet</ProjectName><Created>29-Apr-2009 08:16:53</Created><LastEdit>07-Oct-2010 10:30:19</LastEdit><ICON>241</ICON><ProjectType>0</ProjectType><Created>29-Apr-2009 08:16:53</Created><Version>4</Version><Build>4, 15, 0, 623</Build><ProjectTypeName>AVR GCC</ProjectTypeName></MANAGEMENT><CODE_CREATION><ObjectFile>bacnet.elf</ObjectFile><EntryFile></EntryFile><SaveFolder>D:\code\bacnet-stack\ports\bdk-atxx4-mstp\</SaveFolder></CODE_CREATION><DEBUG_TARGET><CURRENT_TARGET>JTAGICE mkII</CURRENT_TARGET><CURRENT_PART>ATmega644P.xml</CURRENT_PART><BREAKPOINTS></BREAKPOINTS><IO_EXPAND><HIDE>false</HIDE></IO_EXPAND><REGISTERNAMES><Register>R00</Register><Register>R01</Register><Register>R02</Register><Register>R03</Register><Register>R04</Register><Register>R05</Register><Register>R06</Register><Register>R07</Register><Register>R08</Register><Register>R09</Register><Register>R10</Register><Register>R11</Register><Register>R12</Register><Register>R13</Register><Register>R14</Register><Register>R15</Register><Register>R16</Register><Register>R17</Register><Register>R18</Register><Register>R19</Register><Register>R20</Register><Register>R21</Register><Register>R22</Register><Register>R23</Register><Register>R24</Register><Register>R25</Register><Register>R26</Register><Register>R27</Register><Register>R28</Register><Register>R29</Register><Register>R30</Register><Register>R31</Register></REGISTERNAMES><COM>Auto</COM><COMType>0</COMType><WATCHNUM>0</WATCHNUM><WATCHNAMES><Pane0><Variables>char_string</Variables><Variables>apdu</Variables><Variables>pkt</Variables></Pane0><Pane1></Pane1><Pane2></Pane2><Pane3></Pane3></WATCHNAMES><BreakOnTrcaeFull>0</BreakOnTrcaeFull></DEBUG_TARGET><Debugger><modules><module><map private="c:\avrdev\gcc\build-avr\gcc\" public="D:\code\bacnet-stack\ports\bdk-atxx4-mstp\"/></module></modules><Triggers></Triggers></Debugger><AVRGCCPLUGIN><FILES><SOURCEFILE>main.c</SOURCEFILE><SOURCEFILE>timer2.c</SOURCEFILE><SOURCEFILE>eeprom.c</SOURCEFILE><SOURCEFILE>init.c</SOURCEFILE><SOURCEFILE>input.c</SOURCEFILE><SOURCEFILE>led.c</SOURCEFILE><SOURCEFILE>rs485.c</SOURCEFILE><SOURCEFILE>seeprom.c</SOURCEFILE><SOURCEFILE>serial.c</SOURCEFILE><SOURCEFILE>stack.c</SOURCEFILE><SOURCEFILE>dlmstp.c</SOURCEFILE><SOURCEFILE>bo.c</SOURCEFILE><SOURCEFILE>bi.c</SOURCEFILE><SOURCEFILE>ai.c</SOURCEFILE><SOURCEFILE>device.c</SOURCEFILE><SOURCEFILE>watchdog.c</SOURCEFILE><SOURCEFILE>adc.c</SOURCEFILE><SOURCEFILE>bacnet.c</SOURCEFILE><SOURCEFILE>fuses.c</SOURCEFILE><SOURCEFILE>test.c</SOURCEFILE><SOURCEFILE>timer.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\demo\handler\noserv.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\demo\handler\s_iam.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\demo\handler\s_ihave.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\demo\handler\txbuf.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\demo\handler\h_dcc.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\demo\handler\h_npdu.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\demo\handler\h_rd.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\demo\handler\h_rp.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\demo\handler\h_rpm.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\demo\handler\h_whohas.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\demo\handler\h_whois.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\demo\handler\h_wp.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\src\reject.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\src\ringbuf.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\src\rp.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\src\rpm.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\src\whohas.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\src\whois.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\src\wp.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\src\abort.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\src\apdu.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\src\bacaddr.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\src\bacapp.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\src\bacdcode.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\src\bacerror.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\src\bacint.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\src\bacreal.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\src\bacstr.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\src\crc.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\src\dcc.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\src\fifo.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\src\iam.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\src\ihave.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\src\npdu.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\src\rd.c</SOURCEFILE><SOURCEFILE>D:\code\bacnet-stack\src\memcopy.c</SOURCEFILE><SOURCEFILE>av.c</SOURCEFILE><HEADERFILE>timer.h</HEADERFILE><HEADERFILE>eeprom.h</HEADERFILE><HEADERFILE>hardware.h</HEADERFILE><HEADERFILE>iar2gcc.h</HEADERFILE><HEADERFILE>init.h</HEADERFILE><HEADERFILE>input.h</HEADERFILE><HEADERFILE>led.h</HEADERFILE><HEADERFILE>nvdata.h</HEADERFILE><HEADERFILE>rs485.h</HEADERFILE><HEADERFILE>seeprom.h</HEADERFILE><HEADERFILE>serial.h</HEADERFILE><HEADERFILE>watchdog.h</HEADERFILE><HEADERFILE>adc.h</HEADERFILE><HEADERFILE>bacnet.h</HEADERFILE><HEADERFILE>stack.h</HEADERFILE><HEADERFILE>test.h</HEADERFILE><OTHERFILE>default\bacnet.lss</OTHERFILE><OTHERFILE>default\bacnet.map</OTHERFILE></FILES><CONFIGS><CONFIG><NAME>default</NAME><USESEXTERNALMAKEFILE>YES</USESEXTERNALMAKEFILE><EXTERNALMAKEFILE>Makefile</EXTERNALMAKEFILE><PART>atmega644p</PART><HEX>1</HEX><LIST>1</LIST><MAP>1</MAP><OUTPUTFILENAME>bacnet.elf</OUTPUTFILENAME><OUTPUTDIR>default\</OUTPUTDIR><ISDIRTY>0</ISDIRTY><OPTIONS><OPTION><FILE>D:\code\bacnet-stack\demo\handler\h_dcc.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\demo\handler\h_npdu.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\demo\handler\h_rd.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\demo\handler\h_rp.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\demo\handler\h_rpm.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\demo\handler\h_whohas.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\demo\handler\h_whois.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\demo\handler\h_wp.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\demo\handler\noserv.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\demo\handler\s_iam.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\demo\handler\s_ihave.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\demo\handler\txbuf.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\src\abort.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\src\apdu.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\src\bacaddr.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\src\bacapp.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\src\bacdcode.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\src\bacerror.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\src\bacint.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\src\bacreal.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\src\bacstr.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\src\crc.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\src\dcc.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\src\fifo.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\src\iam.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\src\ihave.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\src\memcopy.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\src\npdu.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\src\rd.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\src\reject.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\src\ringbuf.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\src\rp.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\src\rpm.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\src\whohas.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\src\whois.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>D:\code\bacnet-stack\src\wp.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>adc.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>ai.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>av.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>bacnet.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>bi.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>bo.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>device.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>dlmstp.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>eeprom.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>fuses.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>init.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>input.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>led.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>main.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>rs485.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>seeprom.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>serial.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>stack.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>test.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>timer.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>timer2.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>watchdog.c</FILE><OPTIONLIST></OPTIONLIST></OPTION></OPTIONS><INCDIRS><INCLUDE>.\</INCLUDE><INCLUDE>..\..\include\</INCLUDE></INCDIRS><LIBDIRS/><LIBS/><LINKOBJECTS/><OPTIONSFORALL>-Wall -gdwarf-2 -std=gnu99 -mcall-prologues -finline-functions-called-once -ffunction-sections -fdata-sections -Wstrict-prototypes -Wmissing-prototypes -DBACDL_MSTP -DMAX_APDU=128 -DBIG_ENDIAN=0 -DMAX_TSM_TRANSACTIONS=0 -DBACAPP_BOOLEAN -DBACAPP_REAL -DBACAPP_OBJECT_ID -DBACAPP_UNSIGNED -DBACAPP_ENUMERATED -DBACAPP_CHARACTER_STRING -DWRITE_PROPERTY -g                -DF_CPU=18432000UL  -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums</OPTIONSFORALL><LINKEROPTIONS>-Wl,--gc-sections,-static</LINKEROPTIONS><SEGMENTS/></CONFIG></CONFIGS><LASTCONFIG>default</LASTCONFIG><USES_WINAVR>1</USES_WINAVR><GCC_LOC>C:\WinAVR-20090313\bin\avr-gcc.exe</GCC_LOC><MAKE_LOC>C:\WinAVR-20090313\utils\bin\make.exe</MAKE_LOC></AVRGCCPLUGIN><IOView><usergroups/><sort sorted="0" column="0" ordername="1" orderaddress="1" ordergroup="1"/></IOView><Files><File00000><FileId>00000</FileId><FileName>main.c</FileName><Status>259</Status></File00000><File00001><FileId>00001</FileId><FileName>rs485.c</FileName><Status>258</Status></File00001><File00002><FileId>00002</FileId><FileName>bacnet.c</FileName><Status>258</Status></File00002><File00003><FileId>00003</FileId><FileName>device.c</FileName><Status>258</Status></File00003><File00004><FileId>00004</FileId><FileName>D:\code\bacnet-stack\src\fifo.c</FileName><Status>258</Status></File00004><File00005><FileId>00005</FileId><FileName>timer.c</FileName><Status>258</Status></File00005><File00006><FileId>00006</FileId><FileName>timer2.c</FileName><Status>258</Status></File00006><File00007><FileId>00007</FileId><FileName>hardware.h</FileName><Status>1</Status></File00007><File00008><FileId>00008</FileId><FileName>adc.c</FileName><Status>259</Status></File00008></Files><Events><Bookmarks></Bookmarks></Events><Trace><Filters></Filters></Trace></AVRStudio>
+<AVRStudio><MANAGEMENT><ProjectName>bacnet</ProjectName><Created>29-Apr-2009 08:16:53</Created><LastEdit>07-Oct-2010 10:30:19</LastEdit><ICON>241</ICON><ProjectType>0</ProjectType><Created>29-Apr-2009 08:16:53</Created><Version>4</Version><Build>4, 15, 0, 623</Build><ProjectTypeName>AVR GCC</ProjectTypeName></MANAGEMENT><CODE_CREATION><ObjectFile>bacnet.elf</ObjectFile><EntryFile></EntryFile><SaveFolder>C:\code\bacnet-stack\ports\bdk-atxx4-mstp\</SaveFolder></CODE_CREATION><DEBUG_TARGET><CURRENT_TARGET>JTAGICE mkII</CURRENT_TARGET><CURRENT_PART>ATmega644P.xml</CURRENT_PART><BREAKPOINTS></BREAKPOINTS><IO_EXPAND><HIDE>false</HIDE></IO_EXPAND><REGISTERNAMES><Register>R00</Register><Register>R01</Register><Register>R02</Register><Register>R03</Register><Register>R04</Register><Register>R05</Register><Register>R06</Register><Register>R07</Register><Register>R08</Register><Register>R09</Register><Register>R10</Register><Register>R11</Register><Register>R12</Register><Register>R13</Register><Register>R14</Register><Register>R15</Register><Register>R16</Register><Register>R17</Register><Register>R18</Register><Register>R19</Register><Register>R20</Register><Register>R21</Register><Register>R22</Register><Register>R23</Register><Register>R24</Register><Register>R25</Register><Register>R26</Register><Register>R27</Register><Register>R28</Register><Register>R29</Register><Register>R30</Register><Register>R31</Register></REGISTERNAMES><COM>Auto</COM><COMType>0</COMType><WATCHNUM>0</WATCHNUM><WATCHNAMES><Pane0><Variables>char_string</Variables><Variables>apdu</Variables><Variables>pkt</Variables></Pane0><Pane1></Pane1><Pane2></Pane2><Pane3></Pane3></WATCHNAMES><BreakOnTrcaeFull>0</BreakOnTrcaeFull></DEBUG_TARGET><Debugger><modules><module><map private="c:\avrdev\gcc\build-avr\gcc\" public="C:\code\bacnet-stack\ports\bdk-atxx4-mstp\"/></module></modules><Triggers></Triggers></Debugger><AVRGCCPLUGIN><FILES><SOURCEFILE>main.c</SOURCEFILE><SOURCEFILE>timer2.c</SOURCEFILE><SOURCEFILE>eeprom.c</SOURCEFILE><SOURCEFILE>init.c</SOURCEFILE><SOURCEFILE>input.c</SOURCEFILE><SOURCEFILE>led.c</SOURCEFILE><SOURCEFILE>rs485.c</SOURCEFILE><SOURCEFILE>seeprom.c</SOURCEFILE><SOURCEFILE>serial.c</SOURCEFILE><SOURCEFILE>stack.c</SOURCEFILE><SOURCEFILE>dlmstp.c</SOURCEFILE><SOURCEFILE>bo.c</SOURCEFILE><SOURCEFILE>bi.c</SOURCEFILE><SOURCEFILE>ai.c</SOURCEFILE><SOURCEFILE>device.c</SOURCEFILE><SOURCEFILE>watchdog.c</SOURCEFILE><SOURCEFILE>adc.c</SOURCEFILE><SOURCEFILE>bacnet.c</SOURCEFILE><SOURCEFILE>fuses.c</SOURCEFILE><SOURCEFILE>test.c</SOURCEFILE><SOURCEFILE>timer.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\demo\handler\noserv.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\demo\handler\s_iam.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\demo\handler\s_ihave.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\demo\handler\txbuf.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\demo\handler\h_dcc.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\demo\handler\h_npdu.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\demo\handler\h_rd.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\demo\handler\h_rp.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\demo\handler\h_rpm.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\demo\handler\h_whohas.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\demo\handler\h_whois.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\demo\handler\h_wp.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\reject.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\ringbuf.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\rp.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\rpm.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\whohas.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\whois.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\wp.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\abort.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\apdu.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\bacaddr.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\bacapp.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\bacdcode.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\bacerror.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\bacint.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\bacreal.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\bacstr.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\crc.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\dcc.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\fifo.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\iam.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\ihave.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\npdu.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\rd.c</SOURCEFILE><SOURCEFILE>C:\code\bacnet-stack\src\memcopy.c</SOURCEFILE><SOURCEFILE>av.c</SOURCEFILE><HEADERFILE>timer.h</HEADERFILE><HEADERFILE>eeprom.h</HEADERFILE><HEADERFILE>hardware.h</HEADERFILE><HEADERFILE>iar2gcc.h</HEADERFILE><HEADERFILE>init.h</HEADERFILE><HEADERFILE>input.h</HEADERFILE><HEADERFILE>led.h</HEADERFILE><HEADERFILE>nvdata.h</HEADERFILE><HEADERFILE>rs485.h</HEADERFILE><HEADERFILE>seeprom.h</HEADERFILE><HEADERFILE>serial.h</HEADERFILE><HEADERFILE>watchdog.h</HEADERFILE><HEADERFILE>adc.h</HEADERFILE><HEADERFILE>bacnet.h</HEADERFILE><HEADERFILE>stack.h</HEADERFILE><HEADERFILE>test.h</HEADERFILE><OTHERFILE>default\bacnet.lss</OTHERFILE><OTHERFILE>default\bacnet.map</OTHERFILE></FILES><CONFIGS><CONFIG><NAME>default</NAME><USESEXTERNALMAKEFILE>YES</USESEXTERNALMAKEFILE><EXTERNALMAKEFILE>Makefile</EXTERNALMAKEFILE><PART>atmega644p</PART><HEX>1</HEX><LIST>1</LIST><MAP>1</MAP><OUTPUTFILENAME>bacnet.elf</OUTPUTFILENAME><OUTPUTDIR>default\</OUTPUTDIR><ISDIRTY>0</ISDIRTY><OPTIONS><OPTION><FILE>C:\code\bacnet-stack\demo\handler\h_dcc.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\demo\handler\h_npdu.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\demo\handler\h_rd.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\demo\handler\h_rp.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\demo\handler\h_rpm.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\demo\handler\h_whohas.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\demo\handler\h_whois.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\demo\handler\h_wp.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\demo\handler\noserv.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\demo\handler\s_iam.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\demo\handler\s_ihave.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\demo\handler\txbuf.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\src\abort.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\src\apdu.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\src\bacaddr.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\src\bacapp.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\src\bacdcode.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\src\bacerror.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\src\bacint.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\src\bacreal.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\src\bacstr.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\src\crc.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\src\dcc.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\src\fifo.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\src\iam.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\src\ihave.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\src\memcopy.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\src\npdu.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\src\rd.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\src\reject.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\src\ringbuf.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\src\rp.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\src\rpm.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\src\whohas.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\src\whois.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>C:\code\bacnet-stack\src\wp.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>adc.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>ai.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>av.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>bacnet.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>bi.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>bo.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>device.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>dlmstp.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>eeprom.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>fuses.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>init.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>input.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>led.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>main.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>rs485.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>seeprom.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>serial.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>stack.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>test.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>timer.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>timer2.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>watchdog.c</FILE><OPTIONLIST></OPTIONLIST></OPTION></OPTIONS><INCDIRS><INCLUDE>.\</INCLUDE><INCLUDE>..\..\include\</INCLUDE></INCDIRS><LIBDIRS/><LIBS/><LINKOBJECTS/><OPTIONSFORALL>-Wall -gdwarf-2 -std=gnu99 -mcall-prologues -finline-functions-called-once -ffunction-sections -fdata-sections -Wstrict-prototypes -Wmissing-prototypes -DBACDL_MSTP -DMAX_APDU=128 -DBIG_ENDIAN=0 -DMAX_TSM_TRANSACTIONS=0 -DBACAPP_BOOLEAN -DBACAPP_REAL -DBACAPP_OBJECT_ID -DBACAPP_UNSIGNED -DBACAPP_ENUMERATED -DBACAPP_CHARACTER_STRING -DWRITE_PROPERTY -g                -DF_CPU=18432000UL  -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums</OPTIONSFORALL><LINKEROPTIONS>-Wl,--gc-sections,-static</LINKEROPTIONS><SEGMENTS/></CONFIG></CONFIGS><LASTCONFIG>default</LASTCONFIG><USES_WINAVR>1</USES_WINAVR><GCC_LOC>C:\WinAVR-20090313\bin\avr-gcc.exe</GCC_LOC><MAKE_LOC>C:\WinAVR-20090313\utils\bin\make.exe</MAKE_LOC></AVRGCCPLUGIN><IOView><usergroups/><sort sorted="0" column="0" ordername="1" orderaddress="1" ordergroup="1"/></IOView><Files><File00000><FileId>00000</FileId><FileName>main.c</FileName><Status>259</Status></File00000><File00001><FileId>00001</FileId><FileName>rs485.c</FileName><Status>258</Status></File00001><File00002><FileId>00002</FileId><FileName>bacnet.c</FileName><Status>258</Status></File00002><File00003><FileId>00003</FileId><FileName>device.c</FileName><Status>258</Status></File00003><File00004><FileId>00004</FileId><FileName>C:\code\bacnet-stack\src\fifo.c</FileName><Status>258</Status></File00004><File00005><FileId>00005</FileId><FileName>timer.c</FileName><Status>258</Status></File00005><File00006><FileId>00006</FileId><FileName>timer2.c</FileName><Status>258</Status></File00006><File00007><FileId>00007</FileId><FileName>hardware.h</FileName><Status>1</Status></File00007><File00008><FileId>00008</FileId><FileName>adc.c</FileName><Status>259</Status></File00008></Files><Events><Bookmarks></Bookmarks></Events><Trace><Filters></Filters></Trace></AVRStudio>
diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/hardware.h b/bacnet-stack/ports/bdk-atxx4-mstp/hardware.h
index 25e97c77..74b4ff83 100644
--- a/bacnet-stack/ports/bdk-atxx4-mstp/hardware.h
+++ b/bacnet-stack/ports/bdk-atxx4-mstp/hardware.h
@@ -39,8 +39,13 @@
 #if defined(__GNUC__)
 #include <avr/io.h>
 #include <avr/wdt.h>
-#if !defined(__AVR_ATmega644P__)
-#error Firmware is configured for ATmega644P only (-mmcu=atmega644p)
+#include <avr/power.h>
+#if defined(__AVR_ATmega644P__)
+/* defined for ATmega644p */
+#elif defined(__AVR_ATmega1284P__)
+/* defined for ATmega1284p */
+#else
+#error For ATmega644P or ATmega1284p only (-mmcu=atmega644p -mmcu=atmega1284p)
 #endif
 #endif
 
diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/input.c b/bacnet-stack/ports/bdk-atxx4-mstp/input.c
index c68e24c6..58932115 100644
--- a/bacnet-stack/ports/bdk-atxx4-mstp/input.c
+++ b/bacnet-stack/ports/bdk-atxx4-mstp/input.c
@@ -51,13 +51,13 @@ static void input_switch_workaround(
     BIT_SET(DDRA, DDA5);
     BIT_SET(DDRA, DDA6);
     /* turn off the outputs */
-    BIT_CLEAR(PORTA, PA0);
-    BIT_CLEAR(PORTA, PA1);
-    BIT_CLEAR(PORTA, PA2);
-    BIT_CLEAR(PORTA, PA3);
-    BIT_CLEAR(PORTA, PA4);
-    BIT_CLEAR(PORTA, PA5);
-    BIT_CLEAR(PORTA, PA6);
+    BIT_CLEAR(PORTA, PORTA0);
+    BIT_CLEAR(PORTA, PORTA1);
+    BIT_CLEAR(PORTA, PORTA2);
+    BIT_CLEAR(PORTA, PORTA3);
+    BIT_CLEAR(PORTA, PORTA4);
+    BIT_CLEAR(PORTA, PORTA5);
+    BIT_CLEAR(PORTA, PORTA6);
     /* configure the port pins for the switch - as inputs */
     BIT_CLEAR(DDRA, DDA0);
     BIT_CLEAR(DDRA, DDA1);
@@ -156,13 +156,13 @@ void input_init(
     BIT_CLEAR(DDRA, DDA5);
     BIT_CLEAR(DDRA, DDA6);
     /* activate the internal pull up resistors */
-    BIT_SET(PORTA, PA0);
-    BIT_SET(PORTA, PA1);
-    BIT_SET(PORTA, PA2);
-    BIT_SET(PORTA, PA3);
-    BIT_SET(PORTA, PA4);
-    BIT_SET(PORTA, PA5);
-    BIT_SET(PORTA, PA6);
+    BIT_SET(PORTA, PORTA0);
+    BIT_SET(PORTA, PORTA1);
+    BIT_SET(PORTA, PORTA2);
+    BIT_SET(PORTA, PORTA3);
+    BIT_SET(PORTA, PORTA4);
+    BIT_SET(PORTA, PORTA5);
+    BIT_SET(PORTA, PORTA6);
     /* configure the port pins for binary inputs */
     BIT_CLEAR(DDRB, DDB1);
     BIT_CLEAR(DDRB, DDB2);
diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/rs485.c b/bacnet-stack/ports/bdk-atxx4-mstp/rs485.c
index 34a67d2c..b1a6239f 100644
--- a/bacnet-stack/ports/bdk-atxx4-mstp/rs485.c
+++ b/bacnet-stack/ports/bdk-atxx4-mstp/rs485.c
@@ -310,8 +310,7 @@ static void rs485_usart_init(
     /* Set Character Size: UCSZn2 UCSZn1 UCSZn0 = 011 for 8-bit */
     /* Clock Polarity: UCPOLn = 0 when asynchronous mode is used. */
     UCSR0C = _BV(UCSZ01) | _BV(UCSZ00);
-    /* Clear Power Reduction */
-    BIT_CLEAR(PRR, PRUSART0);
+    power_usart0_enable();
 }
 
 /****************************************************************************
diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/serial.c b/bacnet-stack/ports/bdk-atxx4-mstp/serial.c
index 281517e3..f18bdd57 100644
--- a/bacnet-stack/ports/bdk-atxx4-mstp/serial.c
+++ b/bacnet-stack/ports/bdk-atxx4-mstp/serial.c
@@ -178,8 +178,7 @@ static void serial_usart_init(
     /* Set Character Size: UCSZn2 UCSZn1 UCSZn0 = 011 for 8-bit */
     /* Clock Polarity: UCPOLn = 0 when asynchronous mode is used. */
     UCSR1C = _BV(UCSZ11) | _BV(UCSZ10);
-    /* Clear Power Reduction */
-    BIT_CLEAR(PRR, PRUSART1);
+    power_usart1_enable();
 }
 
 void serial_init(
diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/timer2.c b/bacnet-stack/ports/bdk-atxx4-mstp/timer2.c
index 47c4032e..c25375fe 100644
--- a/bacnet-stack/ports/bdk-atxx4-mstp/timer2.c
+++ b/bacnet-stack/ports/bdk-atxx4-mstp/timer2.c
@@ -161,6 +161,5 @@ void timer_init(
     TCNT2 = TIMER2_COUNT;
     /* Enable the overflow interrupt */
     BIT_SET(TIMSK2, TOIE2);
-    /* Clear the Power Reduction Timer/Counter0 */
-    BIT_CLEAR(PRR, PRTIM2);
+    power_timer2_enable();
 }