diff --git a/Fred_bootloader/Fred_bootloader.atsuo b/Fred_bootloader/Fred_bootloader.atsuo
index f1338bb3e33f7d314fea66243f8bcdd6a1e1252a..e645b837ce49b0f39ece4857700b80bf5459d0b8 100644
Binary files a/Fred_bootloader/Fred_bootloader.atsuo and b/Fred_bootloader/Fred_bootloader.atsuo differ
diff --git a/Fred_bootloader/Fred_bootloader.cproj b/Fred_bootloader/Fred_bootloader.cproj
index fb8f8758afe47910dbccb82b9033e391d4f51db8..8c08130034f2117aed3a76c6659e676b6aa51373 100644
--- a/Fred_bootloader/Fred_bootloader.cproj
+++ b/Fred_bootloader/Fred_bootloader.cproj
@@ -133,82 +133,82 @@
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<ToolchainSettings>
<AvrGcc>
- <avrgcc.common.optimization.RelaxBranches>True</avrgcc.common.optimization.RelaxBranches>
- <avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
- <avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
- <avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
- <avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
- <avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
- <avrgcc.compiler.symbols.DefSymbols>
- <ListValues>
- <Value>NDEBUG</Value>
- <Value>BOARD=USER_BOARD</Value>
- <Value>IOPORT_XMEGA_COMPAT=1</Value>
- <Value>F_CPU=32000000UL</Value>
- </ListValues>
- </avrgcc.compiler.symbols.DefSymbols>
- <avrgcc.compiler.directories.IncludePaths>
- <ListValues>
- <Value>../common/applications/user_application/user_board/config</Value>
- <Value>../src/ASF/xmega/utils</Value>
- <Value>../src/config</Value>
- <Value>../src/ASF/common/boards</Value>
- <Value>../src/ASF/xmega/utils/preprocessor</Value>
- <Value>../src/ASF/common/utils</Value>
- <Value>../src</Value>
- <Value>../src/ASF/common/boards/user_board</Value>
- <Value>../src/ASF/xmega/drivers/cpu</Value>
- <Value>../src/ASF/xmega/drivers/nvm</Value>
- <Value>../src/ASF/xmega/drivers/pmic</Value>
- <Value>../src/ASF/xmega/drivers/wdt</Value>
- <Value>../src/ASF/common/services/clock</Value>
- <Value>../src/ASF/common/services/ioport</Value>
- <Value>../src/ASF/common/services/serial/xmega_usart</Value>
- <Value>../src/ASF/common/services/serial</Value>
- <Value>../src/ASF/xmega/drivers/usart</Value>
- <Value>../src/ASF/xmega/drivers/sleep</Value>
- <Value>../src/ASF/xmega/drivers/tc</Value>
- <Value>../src/ASF/common/services/sleepmgr</Value>
- </ListValues>
- </avrgcc.compiler.directories.IncludePaths>
- <avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
- <avrgcc.compiler.optimization.OtherFlags>-fdata-sections</avrgcc.compiler.optimization.OtherFlags>
- <avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
- <avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
- <avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
- <avrgcc.compiler.miscellaneous.OtherFlags>-std=gnu99 -fno-strict-aliasing -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -mrelax</avrgcc.compiler.miscellaneous.OtherFlags>
- <avrgcc.linker.libraries.Libraries>
- <ListValues>
- <Value>libm</Value>
- </ListValues>
- </avrgcc.linker.libraries.Libraries>
- <avrgcc.linker.miscellaneous.LinkerFlags>-Wl,--relax,-section-start=.text=0x20000</avrgcc.linker.miscellaneous.LinkerFlags>
- <avrgcc.assembler.general.AssemblerFlags>-mrelax -DBOARD=USER_BOARD</avrgcc.assembler.general.AssemblerFlags>
- <avrgcc.assembler.general.IncludePaths>
- <ListValues>
- <Value>../common/applications/user_application/user_board/config</Value>
- <Value>../src/ASF/xmega/utils</Value>
- <Value>../src/config</Value>
- <Value>../src/ASF/common/boards</Value>
- <Value>../src/ASF/xmega/utils/preprocessor</Value>
- <Value>../src/ASF/common/utils</Value>
- <Value>../src</Value>
- <Value>../src/ASF/common/boards/user_board</Value>
- <Value>../src/ASF/xmega/drivers/cpu</Value>
- <Value>../src/ASF/xmega/drivers/nvm</Value>
- <Value>../src/ASF/xmega/drivers/pmic</Value>
- <Value>../src/ASF/xmega/drivers/wdt</Value>
- <Value>../src/ASF/common/services/clock</Value>
- <Value>../src/ASF/common/services/ioport</Value>
- <Value>../src/ASF/common/services/serial/xmega_usart</Value>
- <Value>../src/ASF/common/services/serial</Value>
- <Value>../src/ASF/xmega/drivers/usart</Value>
- <Value>../src/ASF/xmega/drivers/sleep</Value>
- <Value>../src/ASF/xmega/drivers/tc</Value>
- <Value>../src/ASF/common/services/sleepmgr</Value>
- </ListValues>
- </avrgcc.assembler.general.IncludePaths>
- </AvrGcc>
+ <avrgcc.common.optimization.RelaxBranches>True</avrgcc.common.optimization.RelaxBranches>
+ <avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
+ <avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
+ <avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
+ <avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
+ <avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
+ <avrgcc.compiler.symbols.DefSymbols>
+ <ListValues>
+ <Value>NDEBUG</Value>
+ <Value>BOARD=USER_BOARD</Value>
+ <Value>IOPORT_XMEGA_COMPAT=1</Value>
+ <Value>F_CPU=32000000UL</Value>
+ </ListValues>
+ </avrgcc.compiler.symbols.DefSymbols>
+ <avrgcc.compiler.directories.IncludePaths>
+ <ListValues>
+ <Value>../common/applications/user_application/user_board/config</Value>
+ <Value>../src/ASF/xmega/utils</Value>
+ <Value>../src/config</Value>
+ <Value>../src/ASF/common/boards</Value>
+ <Value>../src/ASF/xmega/utils/preprocessor</Value>
+ <Value>../src/ASF/common/utils</Value>
+ <Value>../src</Value>
+ <Value>../src/ASF/common/boards/user_board</Value>
+ <Value>../src/ASF/xmega/drivers/cpu</Value>
+ <Value>../src/ASF/xmega/drivers/nvm</Value>
+ <Value>../src/ASF/xmega/drivers/pmic</Value>
+ <Value>../src/ASF/xmega/drivers/wdt</Value>
+ <Value>../src/ASF/common/services/clock</Value>
+ <Value>../src/ASF/common/services/ioport</Value>
+ <Value>../src/ASF/common/services/serial/xmega_usart</Value>
+ <Value>../src/ASF/common/services/serial</Value>
+ <Value>../src/ASF/xmega/drivers/usart</Value>
+ <Value>../src/ASF/xmega/drivers/sleep</Value>
+ <Value>../src/ASF/xmega/drivers/tc</Value>
+ <Value>../src/ASF/common/services/sleepmgr</Value>
+ </ListValues>
+ </avrgcc.compiler.directories.IncludePaths>
+ <avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
+ <avrgcc.compiler.optimization.OtherFlags>-fdata-sections</avrgcc.compiler.optimization.OtherFlags>
+ <avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
+ <avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
+ <avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
+ <avrgcc.compiler.miscellaneous.OtherFlags>-std=gnu99 -fno-strict-aliasing -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -mrelax</avrgcc.compiler.miscellaneous.OtherFlags>
+ <avrgcc.linker.libraries.Libraries>
+ <ListValues>
+ <Value>libm</Value>
+ </ListValues>
+ </avrgcc.linker.libraries.Libraries>
+ <avrgcc.linker.miscellaneous.LinkerFlags>-Wl,--relax,-section-start=.text=0x20000</avrgcc.linker.miscellaneous.LinkerFlags>
+ <avrgcc.assembler.general.AssemblerFlags>-mrelax -DBOARD=USER_BOARD</avrgcc.assembler.general.AssemblerFlags>
+ <avrgcc.assembler.general.IncludePaths>
+ <ListValues>
+ <Value>../common/applications/user_application/user_board/config</Value>
+ <Value>../src/ASF/xmega/utils</Value>
+ <Value>../src/config</Value>
+ <Value>../src/ASF/common/boards</Value>
+ <Value>../src/ASF/xmega/utils/preprocessor</Value>
+ <Value>../src/ASF/common/utils</Value>
+ <Value>../src</Value>
+ <Value>../src/ASF/common/boards/user_board</Value>
+ <Value>../src/ASF/xmega/drivers/cpu</Value>
+ <Value>../src/ASF/xmega/drivers/nvm</Value>
+ <Value>../src/ASF/xmega/drivers/pmic</Value>
+ <Value>../src/ASF/xmega/drivers/wdt</Value>
+ <Value>../src/ASF/common/services/clock</Value>
+ <Value>../src/ASF/common/services/ioport</Value>
+ <Value>../src/ASF/common/services/serial/xmega_usart</Value>
+ <Value>../src/ASF/common/services/serial</Value>
+ <Value>../src/ASF/xmega/drivers/usart</Value>
+ <Value>../src/ASF/xmega/drivers/sleep</Value>
+ <Value>../src/ASF/xmega/drivers/tc</Value>
+ <Value>../src/ASF/common/services/sleepmgr</Value>
+ </ListValues>
+ </avrgcc.assembler.general.IncludePaths>
+</AvrGcc>
</ToolchainSettings>
<PreBuildEvent>call "$(MSBuildProjectDirectory)\..\..\..\Automation\SubWCRev.exe" "$(MSBuildProjectDirectory)\src" "$(MSBuildProjectDirectory)\..\..\..\Automation\version.h.in" "$(MSBuildProjectDirectory)\src\version.h"
</PreBuildEvent>
diff --git a/Fred_bootloader/Release/Fred_bootloader.hex b/Fred_bootloader/Release/Fred_bootloader.hex
index 0de26c0c64da45581b062d373ad33b897af2cbf9..64bb0624d2f3ad2386968d9215b079e2de72db1e 100644
--- a/Fred_bootloader/Release/Fred_bootloader.hex
+++ b/Fred_bootloader/Release/Fred_bootloader.hex
@@ -32,22 +32,22 @@
:1001E0002EC000002CC000002AC0000028C0000063
:1001F00026C0000024C0000022C0000011241FBE41
:10020000CFEFCDBFDFE3DEBF01E00CBF10E2A0E027
-:10021000B0E2E0EDF0E202E00BBF02C007900D9209
+:10021000B0E2E6E2FBE102E00BBF02C007900D9204
:10022000A837B107D9F722E2A8E7B0E201C01D92D2
-:10023000AE3CB207E1F70F94F40C0D944410E0CEFD
+:10023000AE3CB207E1F70F94F40C0D946F0DE0CED5
:1002400082E391E0909307062FEF33EF41E02150D6
:1002500030404040E1F700C00000815099F7089518
:10026000E0EAF0E082818F7B98ED94BF82831CBE30
:10027000E0E0F0E01994909179209827909379200C
-:1002800008956AE58FEF97E00F947B0F2FEF87EECD
+:1002800008956AE58FEF97E00F944C0D2FEF87EEFE
:1002900093E0215080409040E1F700C000000895B5
-:1002A0008FEF97E00F946B0F91E08A3509F490E09F
+:1002A0008FEF97E00F943C0D91E08A3509F490E0D0
:1002B000892F089580EA9BE00F94FD0991E0209139
:1002C0007920821390E0892F089564E48FEF97E0FE
-:1002D0000D947B0FF12C10E080917B228130E9F0AE
+:1002D0000D944C0DF12C10E080917B228130E9F0DF
:1002E00038F0823009F43BC08330C1F7B9DFF4CF76
:1002F000D7DF81110EC087E090E20F94830B8FEF60
-:1003000097E00F946B0F682F80EA9BE00F94F5093C
+:1003000097E00F943C0D682F80EA9BE00F94F5096D
:10031000A7DF81E080937B22DFCF81E290E20F9420
:10032000830B80EA9BE00F94FD09C82F8230C9F748
:1003300080EA9BE00F94FD098093782061E080EAD9
@@ -72,7 +72,7 @@
:10046000143128F462E080EA9BE0BFD735CF63E027
:1004700080EA9BE0BAD782E490E20F94830B61E0BC
:1004800089E790E00F94900C27CF8FEF97E00F94BF
-:100490006B0F843431F08A3511F480E0089586358D
+:100490003C0D843431F08A3511F480E008958635BE
:1004A000E1F381E008951F920F920FB60F9211248D
:1004B0000BB60F922F933F934F935F936F937F935E
:1004C0008F939F93AF93BF93EF93FF93E091C222DB
@@ -328,7 +328,7 @@
:1014600087954C155D056E057F0508F497C0C81675
:10147000D906EA06FB0608F491C08C8182FD04C0FF
:10148000CC0CDD1CEE1CFF1CC501B401A7019601AC
-:10149000F0D28FEF90E0A0E0B0E019EF2817390705
+:10149000D1D28FEF90E0A0E0B0E019EF2817390724
:1014A0004A075B0758F0880F991FAA1FBB1F1D3FF3
:1014B0000CF481601F5F173089F74BC017FF49C0DC
:1014C000D701C60103E0880F991FAA1FBB1F0A9509
@@ -339,11 +339,11 @@
:10151000680D791D8A1D9B1DA701960118C09C01AD
:101520002D5F3F4FD701C60104C0880F991FAA1F26
:10153000BB1F2A95D2F79C01AD01BC01CD01969548
-:10154000879577956795680D791D8A1D9B1D91D2AA
+:10154000879577956795680D791D8A1D9B1D72D2C9
:101550001CC023E0210FD701C60104C0880F991FCA
:10156000AA1FBB1F2A95D2F79C01AD01BC01CD017A
:101570009695879577956795680D791D8A1D9B1DB2
-:1015800078D22150310941095109832F8F7012956A
+:1015800059D22150310941095109832F8F70129589
:10159000107F812B8F832E8381E001C080E0DF915B
:1015A000CF911F910F91FF90EF90DF90CF90BF9060
:1015B000AF909F908F9008950F931F93CF93DF93D9
@@ -394,10 +394,10 @@
:10188000C1F0D301C2010196A11DB11DC816D90630
:10189000EA06FB0671F4EB81FC813197EB83FC8354
:1018A000FFEFCF1ADF0AEF0AFF0AF10181911F0152
-:1018B0008A8349815A81C301B2012E83F6D3F2E0B3
+:1018B0008A8349815A81C301B2012E8321D1F2E08A
:1018C0004F0E511C611C711C015011092E81011514
:1018D000110509F0ACCF222319F078DF45E202C0F0
-:1018E00075DF44E2C501B401D1D332E0930EA11CEF
+:1018E00075DF44E2C501B401FCD032E0930EA11CC7
:1018F000B11C92CF2696CDBFDEBFDF91CF911F9155
:101900000F91FF90EF90DF90CF90BF90AF909F909E
:101910008F907F906F905F904F903F902F900895A1
@@ -413,125 +413,35 @@
:1019B00063E070E087E1BADF61E070E08AE1B6DF02
:1019C00060E070E08BE1B2DF60E070E08CE1AEDF00
:1019D00060E070E08DE1AADF60E070E08EE1A6DFFC
-:1019E00060E070E08CE2A2CF0F931F93CF93DF9360
-:1019F000CDB7DEB7DA95CDBFDEBFAADFB3DE00EA32
-:101A000010E0F8018281806498ED94BF828334DE17
-:101A100087E0F801828382818F77828311827894B4
-:101A200047DE0F94200181E0E0E0F6E087831F921B
-:101A300080E28F931F9280E18F9382E690E29F93E2
-:101A40008F938E010F5F1F4F1F930F9334D0C801E8
-:101A50005ADE0F946A010F943001CDBFDEBF80E0E3
-:101A600090E0D395CDBFDEBFDF91CF911F910F9155
-:101A70000895A1E21A2EAA1BBB1BFD010DC0AA1FCF
-:101A8000BB1FEE1FFF1FA217B307E407F50720F0E7
-:101A9000A21BB30BE40BF50B661F771F881F991F62
-:101AA0001A9469F760957095809590959B01AC01AB
-:101AB000BD01CF0108950F931F93CF93DF93CDB74F
-:101AC000DEB72E97CDBFDEBF0E891F8986E08C83DF
-:101AD00009831A838FEF9FE78D839E83AE01465E55
-:101AE0005F4F688D798DCE0101960DD0EF81F8851D
-:101AF000E00FF11F10822E96CDBFDEBFDF91CF9198
-:101B00001F910F9108952F923F924F925F926F9283
-:101B10007F928F929F92AF92BF92CF92DF92EF927D
-:101B2000FF920F931F93CF93DF93CDB7DEB72C9720
-:101B3000CDBFDEBF7C016B018A01FC0116821782DA
-:101B4000838181FFB0C1CE0101964C01F7019381E1
-:101B5000F60193FD859193FF81916F01882309F42C
-:101B60009EC1853239F493FD859193FF81916F0178
-:101B7000853221F4B70190E0F7D1E8CF512C312C18
-:101B800020E02032A0F48B3269F030F4803259F03A
-:101B9000833269F420612CC08D3239F0803339F4FE
-:101BA000216026C02260246023C0286021C027FD58
-:101BB00027C030ED380F3A3078F426FF06C0FAE03F
-:101BC0005F9E300D1124532E13C08AE0389E300DD5
-:101BD0001124332E20620CC08E3221F426FD5FC109
-:101BE000206406C08C3611F4206802C0883641F4A7
-:101BF000F60193FD859193FF81916F018111C1CF12
-:101C0000982F9F7D9554933028F40C5F1F4FFFE36E
-:101C1000F9830DC0833631F0833771F0833509F0D5
-:101C200057C021C0F801808189830E5F1F4F442473
-:101C30004394512C540114C03801F2E06F0E711C12
-:101C4000F801A080B18026FF03C0652D70E002C0BE
-:101C50006FEF7FEFC5012C877CD12C0183012C8590
-:101C60002F77222E16C03801F2E06F0E711CF8019A
-:101C7000A080B18026FF03C0652D70E002C06FEF29
-:101C80007FEFC5012C875AD12C012C852068222E8C
-:101C9000830123FC19C0832D90E048165906A0F457
-:101CA000B70180E290E060D13A94F5CFF50127FCCE
-:101CB000859127FE81915F01B70190E055D13110E8
-:101CC0003A94F1E04F1A51084114510479F7DEC0FB
-:101CD000843611F0893631F5F80127FF07C060819D
-:101CE0007181828193810C5F1F4F08C06081718177
-:101CF000882777FD8095982F0E5F1F4F2F76B22E85
-:101D000097FF09C090958095709561957F4F8F4F93
-:101D10009F4F2068B22E2AE030E0A40157D1A82EB0
-:101D2000A81843C0853729F42F7EB22E2AE030E070
-:101D300025C0F22FF97FBF2E8F36C1F018F48835F9
-:101D400079F0ADC0803719F0883721F0A8C02F2F67
-:101D50002061B22EB4FE0DC08B2D8460B82E09C058
-:101D600024FF0AC09F2F9660B92E06C028E030E0FD
-:101D700005C020E130E002C020E132E0F801B7FE0A
-:101D800007C060817181828193810C5F1F4F06C003
-:101D90006081718180E090E00E5F1F4FA40116D139
-:101DA000A82EA818FB2DFF77BF2EB6FE0BC02B2D3B
-:101DB0002E7FA51450F4B4FE0AC0B2FC08C02B2D2F
-:101DC0002E7E05C07A2C2B2D03C07A2C01C0752CD9
-:101DD00024FF0DC0FE01EA0DF11D8081803311F456
-:101DE000297E09C022FF06C07394739404C0822F19
-:101DF000867809F0739423FD12C020FF06C05A2C88
-:101E0000731418F4530C5718732C731460F4B7013F
-:101E100080E290E02C87A8D073942C85F6CF7314C1
-:101E200010F4371801C0312C24FF11C0B70180E332
-:101E300090E02C8799D02C8522FF16C021FF03C08B
-:101E400088E590E002C088E790E0B7010CC0822FDF
-:101E5000867851F021FD02C080E201C08BE227FDAF
-:101E60008DE2B70190E080D0A51430F4B70180E393
-:101E700090E07AD05A94F8CFAA94F401EA0DF11DBB
-:101E80008081B70190E070D0A110F6CF332009F423
-:101E90005DCEB70180E290E067D03A94F7CFF701CA
-:101EA0008681978102C08FEF9FEF2C96CDBFDEBF5A
-:101EB000DF91CF911F910F91FF90EF90DF90CF9026
-:101EC000BF90AF909F908F907F906F905F904F905A
-:101ED0003F902F90089503D0808199270895E0ECDA
-:101EE000F1E0378537FDFDCF348538603487FC015C
-:101EF000E050F04F0895262FE0ECF1E0378537FDF4
-:101F0000FDCF3485377F3487378531FF09C036E30D
-:101F1000328738ED34BF31E03387378537FDFDCF69
-:101F200033E33287808391831282248325E32287DF
-:101F300028ED31E024BF338701960895FC01059018
-:101F4000615070400110D8F7809590958E0F9F1FBB
-:101F50000895FC016150704001900110D8F7809500
-:101F600090958E0F9F1F08950F931F93CF93DF932C
-:101F7000182F092FEB018B8181FD03C08FEF9FEF9D
-:101F800020C082FF10C04E815F812C813D814217AD
-:101F900053077CF4E881F9819F012F5F3F4F28832D
-:101FA0003983108306C0E885F985812F1995892B1F
-:101FB00029F72E813F812F5F3F4F2E833F83812F53
-:101FC000902FDF91CF911F910F910895FA01AA27C9
-:101FD000283051F1203181F1E8946F936E7F6E5F6C
-:101FE0007F4F8F4F9F4FAF4FB1E03ED0B4E03CD01A
-:101FF000670F781F891F9A1FA11D680F791F8A1FFD
-:10200000911DA11D6A0F711D811D911DA11D20D063
-:1020100009F468943F912AE0269F11243019305D1D
-:102020003193DEF6CF010895462F4770405D41930E
-:10203000B3E00FD0C9F7F6CF462F4F70405D4A335B
-:1020400018F0495D31FD4052419302D0A9F7EACF23
-:10205000B4E0A6959795879577956795BA95C9F752
-:1020600000976105710508959B01AC010A2E069445
-:102070005795479537952795BA95C9F7620F731FFE
-:0C208000841F951FA01D0895F894FFCF49
-:10208C009BB78BBFFB018091CA014093CA017DE9CC
-:10209C0070933400E8958093CA019BBF08952091FA
-:1020AC00CF0127FDFCCF9BB78BBFFB018091CA01F1
-:1020BC0023E22093CA010A01E89511248093CA01F6
-:0420CC009BBF089519
-:1020D000802500000300005374617274696E6720EC
-:1020E0006170706C69636174696F6E2E2E2E0D0ABB
-:1020F0000057616974696E6720666F722066697245
-:102100006D776172652075706C6F61642E2E2E0D77
-:102110000A00526573657474696E672043505520D8
-:102120002D20746F6F206D616E79206572726F72F1
-:102130007300426F6F746C6F616465722056253254
-:08214000642E2532640D0A0033
+:1019E00060E070E08CE2A2CFCF93DF93B1DFBADE8C
+:1019F000C0EAD0E08A81806498ED94BF8A833CDE9F
+:101A000087E08A838A818F778A831982789450DE6F
+:101A10000F94200181E0E0E0F6E0878382E690E227
+:101A200072DE0F946A010F94300180E090E0DF9144
+:101A3000CF910895A1E21A2EAA1BBB1BFD010DC078
+:101A4000AA1FBB1FEE1FFF1FA217B307E407F5076E
+:101A500020F0A21BB30BE40BF50B661F771F881F4A
+:101A6000991F1A9469F760957095809590959B01E0
+:101A7000AC01BD01CF01089503D08081992708955D
+:101A8000E0ECF1E0378537FDFDCF348538603487F1
+:101A9000FC01E050F04F0895262FE0ECF1E037858F
+:101AA00037FDFDCF3485377F3487378531FF09C057
+:101AB00036E3328738ED34BF31E03387378537FD81
+:101AC000FDCF33E33287808391831282248325E321
+:101AD000228728ED31E024BF338701960895F894DA
+:021AE000FFCF36
+:101AE2009BB78BBFFB018091CA014093CA017DE97C
+:101AF20070933400E8958093CA019BBF08952091AA
+:101B0200CF0127FDFCCF9BB78BBFFB018091CA01A0
+:101B120023E22093CA010A01E89511248093CA01A5
+:041B22009BBF0895C8
+:101B2600802500000300005374617274696E67209B
+:101B36006170706C69636174696F6E2E2E2E0D0A6A
+:101B46000057616974696E6720666F7220666972F4
+:101B56006D776172652075706C6F61642E2E2E0D27
+:101B66000A00526573657474696E67204350552088
+:101B76002D20746F6F206D616E79206572726F72A1
+:101B86007300426F6F746C6F616465722073746169
+:081B9600727465642E0D0A0053
:0400000320000000D9
:00000001FF
diff --git a/Fred_bootloader/src/main.c b/Fred_bootloader/src/main.c
index e1847c164bda509f5dca7e5b3bd61c0961b6df71..f97043de2d75fa73ff2626b6aa7e06bee6530f47 100644
--- a/Fred_bootloader/src/main.c
+++ b/Fred_bootloader/src/main.c
@@ -56,8 +56,9 @@ int main (void)
welcome_led_blink();
ioport_toggle_pin(MMC_LED);
char message[256];
- sprintf(message,"Bootloader V%2d.%2d\r\n",SVN_REVISION_MAJOR,SVN_REVISION_MINOR);
- printString(message);
+ printString("Bootloader started.\r\n");
+ //sprintf(message,"Bootloader V%2d.%2d\r\n",SVN_REVISION_MAJOR,SVN_REVISION_MINOR);
+ //printString(message);
start_bootloader();
//reset processor
//ccp_write_io((void *)&RST.CTRL, RST_SWRST_bm);
diff --git a/Fred_bootloader/src/timer_lib.c b/Fred_bootloader/src/timer_lib.c
index 57833b98f49ffaedc6bb61e99a758edb89f47aeb..b16892278326028e7cc75ed735c8a164c5ca5fcd 100644
--- a/Fred_bootloader/src/timer_lib.c
+++ b/Fred_bootloader/src/timer_lib.c
@@ -72,6 +72,7 @@ static void tc_overflow_callback(void) //100 ms
static void tc_cca_callback(void) //10 ms
{
uint16_t tmp = tc_read_cc(&TCC0, TC_CCA);
+
tc_write_cc(&TCC0, TC_CCA, (tmp+PERIOD_10MS) % PERIOD_100MS);
}