# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1372304804 -28800
# Node ID a3de303afabf3179cba3ff304c80aeeafa584ca7
# Parent  bd9ce7e581ec148121a4520c80e2f318f1b02873
Add compiled bootloader

diff -r bd9ce7e581ec -r a3de303afabf ATmegaBOOT_168_pihelp.hex
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ATmegaBOOT_168_pihelp.hex	Thu Jun 27 11:46:44 2013 +0800
@@ -0,0 +1,237 @@
+:107800000C94343C0C94513C0C94513C0C94513CE1
+:107810000C94513C0C94513C0C94513C0C94513CB4
+:107820000C94513C0C94513C0C94513C0C94513CA4
+:107830000C94513C0C94513C0C94513C0C94513C94
+:107840000C94513C0C94513C0C94513C0C94513C84
+:107850000C94513C0C94513C0C94513C0C94513C74
+:107860000C94513C0C94513C11241FBECFEFD8E036
+:10787000DEBFCDBF11E0A0E0B1E0E4E9F6E802C070
+:1078800005900D92A230B107D9F712E0A2E0B1E065
+:1078900001C01D92AD30B107E1F70E94D63D0C94B6
+:1078A00048430C94003CCF92DF92EF92FF92CC249D
+:1078B000DD2476018091C00087FD17C00894C11CAB
+:1078C000D11CE11CF11C81E0C81680ECD80688EAC6
+:1078D000E80680E0F80670F3E0910201F091030100
+:1078E00009958091C00087FFE9CF2091C600822FC3
+:1078F0009091C00095FFFCCF2093C60021364CF438
+:10790000203314F0822F8053FF90EF90DF90CF90C0
+:107910000895822F8755FF90EF90DF90CF900895C4
+:10792000CF930E94533CC82F0E94533CC295C07F06
+:107930008C0FCF910895282F259525952595259570
+:10794000205D8F708A3074F0895A9091C00095FF45
+:10795000FCCF2093C6009091C00095FFFCCF809390
+:10796000C6000895805DF1CF9091C00095FFFCCFD7
+:107970008093C6000895CF92DF92EF92FF92CC24BD
+:10798000DD2476018091C00087FD17C00894C11CDA
+:10799000D11CE11CF11C81E0C81680ECD80688EAF5
+:1079A000E80680E0F80670F3E0910201F09103012F
+:1079B00009958091C00087FFE9CF8091C600FF90B4
+:1079C000EF90DF90CF900895CF92DF92EF92FF92E9
+:1079D000CF93C82F882311F1CC24DD247601809128
+:1079E000C00087FD17C00894C11CD11CE11CF11C0C
+:1079F00081E0C81680ECD80688EAE80680E0F80640
+:107A000070F3E0910201F091030109958091C000AB
+:107A100087FFE9CF8091C600C150F1F6CF91FF906A
+:107A2000EF90DF90CF900895CF92DF92EF92FF9288
+:107A3000CF93C82FCC24DD2476018091C00087FD30
+:107A400017C00894C11CD11CE11CF11C81E0C816B0
+:107A500080ECD80688EAE80680E0F80670F3E0914A
+:107A60000201F091030109958091C00087FFE9CFE1
+:107A70008091C600803269F0809104018F5F80930D
+:107A80000401853001F1CF91FF90EF90DF90CF900E
+:107A900008958091C00085FFFCCF84E18093C600EB
+:107AA0008091C00085FFFCCFC093C6008091C000CC
+:107AB00085FFFCCF80E18093C600CF91FF90EF90CF
+:107AC000DF90CF900895E0910201F09103010995B4
+:107AD000CF91FF90EF90DF90CF900895CF92DF92FB
+:107AE000EF92FF92CC24DD2476018091C00087FDC7
+:107AF00017C00894C11CD11CE11CF11C81E0C81600
+:107B000080ECD80688EAE80680E0F80670F3E09199
+:107B10000201F091030109958091C00087FFE9CF30
+:107B20008091C600803261F0809104018F5F809364
+:107B300004018530C1F0FF90EF90DF90CF90089561
+:107B40008091C00085FFFCCF84E18093C6008091C6
+:107B5000C00085FFFCCF80E18093C600FF90EF90CE
+:107B6000DF90CF900895E0910201F0910301099513
+:107B7000FF90EF90DF90CF90089515C02D9A2FEFD2
+:107B80003FE543E0215030404040E1F700C00000B5
+:107B90002D982FEF3FE543E0215030404040E1F782
+:107BA00000C000008150882349F70895000085E057
+:107BB0008093C4001092C50088E18093C10086E0E4
+:107BC0008093C2005098589A259ACC24DD247601DF
+:107BD00064E1962E70E1872EE1E47E2E8091C00054
+:107BE00087FD17C00894C11CD11CE11CF11C81E069
+:107BF000C81680ECD80688EAE80680E0F80670F33C
+:107C0000E0910201F091030109958091C00087FF86
+:107C1000E9CF8091C6008033B1F18133D1F1803456
+:107C200009F499C0813409F4DFC0823409F40FC12A
+:107C3000853409F435C1803531F1823521F1813542
+:107C400011F1853509F45EC1863509F4A6C1843683
+:107C500009F4F8C1843709F4FBC2853709F4E0C39D
+:107C6000863709F4EDC0809104018F5F8093040191
+:107C7000853009F43EC1CC24DD247601AFCF80915C
+:107C8000C600809307010E946E3DCC24DD2476015E
+:107C9000A5CFCC24DD2476018091C00087FD17C0DC
+:107CA0000894C11CD11CE11CF11CE1E0CE16E0ECF3
+:107CB000DE06E8EAEE06E0E0FE0670F3E09102017F
+:107CC000F091030109958091C00087FFE9CF809171
+:107CD000C600803241F68091C00085FFFCCF9092B3
+:107CE000C6008091C00085FFFCCF7092C6008091D5
+:107CF000C00085FFFCCF86E58093C6008091C00060
+:107D000085FFFCCF82E58093C6008091C00085FF8F
+:107D1000FCCF80E28093C6008091C00085FFFCCF3D
+:107D200089E48093C6008091C00085FFFCCF83E585
+:107D30008093C6008091C00085FFFCCF80E58093D2
+:107D4000C6008091C00085FFFCCF8092C600CC2485
+:107D5000DD24760143CFCC24DD2476018091C00060
+:107D600087FD17C00894C11CD11CE11CF11CF1E077
+:107D7000CF16F0ECDF06F8EAEF06F0E0FF0670F34E
+:107D8000E0910201F091030109958091C00087FF05
+:107D9000E9CF8091C600863808F475CFCC24DD2465
+:107DA00076018091C00087FD17C00894C11CD11CCA
+:107DB000E11CF11C81E0C81680ECD80688EAE806D0
+:107DC00080E0F80670F3E0910201F091030109955B
+:107DD0008091C00087FFE9CF8091C6000E946E3D70
+:107DE000CC24DD247601FACECC24DD2476018091EA
+:107DF000C00087FD17C00894C11CD11CE11CF11CF8
+:107E0000E1E0CE16E0ECDE06E8EAEE06E0E0FE0693
+:107E100070F3E0910201F091030109958091C00097
+:107E200087FFE9CF8091C600803809F4AFC0813860
+:107E300009F4FAC0823809F4FEC0883909F49FC0F9
+:107E400080E00E94143DCC24DD247601C7CE04E1FD
+:107E5000CC24DD2476018091C00087FD17C00894F2
+:107E6000C11CD11CE11CF11CF1E0CF16F0ECDF06C7
+:107E7000F8EAEF06F0E0FF0670F3E0910201F091FE
+:107E8000030109958091C00087FFE9CF8091C6006A
+:107E90000150F1F60E946E3DCC24DD2476019ECE89
+:107EA00005E0CC24DD2476018091C00087FD17C059
+:107EB0000894C11CD11CE11CF11C81E0C81680ECA7
+:107EC000D80688EAE80680E0F80670F3E09102013F
+:107ED000F091030109958091C00087FFE9CF80915F
+:107EE000C6000150F1F60E946E3DCC24DD247601DF
+:107EF00075CEE0910201F09103010995CC24DD24B7
+:107F000076016CCECC24DD2476018091C00087FD03
+:107F100017C00894C11CD11CE11CF11CE1E0CE1675
+:107F2000E0ECDE06E8EAEE06E0E0FE0670F3E09143
+:107F30000201F091030109958091C00087FFE9CF0C
+:107F40008091C60080930601CC24DD2476018091C7
+:107F5000C00087FD94CE0894C11CD11CE11CF11C0B
+:107F6000F1E0CF16F0ECDF06F8EAEF06F0E0FF06EE
+:107F700070F3E0910201F09103010995E8CF83E0ED
+:107F80000E94143DCC24DD24760128CE82E00E949C
+:107F9000143DCC24DD24760121CECC24DD247601D1
+:107FA0008091C00087FD17C00894C11CD11CE11C42
+:107FB000F11C81E0C81680ECD80688EAE80680E06B
+:107FC000F80670F3E0910201F091030109958091A8
+:107FD000C00087FFE9CF8091C600803309F468C2F2
+:107FE00003E0CC24DD2476018091C00087FD17C01A
+:107FF0000894C11CD11CE11CF11CE1E0CE16E0ECA0
+:10800000DE06E8EAEE06E0E0FE0670F3E09102012B
+:10801000F091030109958091C00087FFE9CF80911D
+:10802000C6000150F1F60CCF81E00E94143DCC2433
+:10803000DD247601D3CD80E10E94143DCC24DD24E3
+:108040007601CCCDCC24DD2476018091C00087FD63
+:1080500017C00894C11CD11CE11CF11CF1E0CF1623
+:10806000F0ECDF06F8EAEF06F0E0FF0670F3E091CF
+:108070000201F091030109958091C00087FFE9CFCB
+:108080008091C60080930902CC24DD247601809182
+:10809000C00087FD17C00894C11CD11CE11CF11C55
+:1080A00081E0C81680ECD80688EAE80680E0F80689
+:1080B00070F3E0910201F091030109958091C000F5
+:1080C00087FFE9CF8091C6008093080280910C025F
+:1080D0008E7F80930C02CC24DD2476018091C00039
+:1080E00087FD17C00894C11CD11CE11CF11CE1E004
+:1080F000CE16E0ECDE06E8EAEE06E0E0FE0670F3FF
+:10810000E0910201F091030109958091C00087FF81
+:10811000E9CF8091C600853429F480910C028160FA
+:1081200080930C028091080290910902009791F1CE
+:1081300058E0A52E51E0B52E00E010E0CC24DD245F
+:1081400076018091C00087FD17C00894C11CD11C26
+:10815000E11CF11CF1E0CF16F0ECDF06F8EAEF06C7
+:10816000F0E0FF0670F3E0910201F0910301099540
+:108170008091C00087FFE9CF8091C600F50181930F
+:108180005F010F5F1F4F809108029091090208174D
+:108190001907A0F2CC24DD2476018091C00087FD70
+:1081A00017C00894C11CD11CE11CF11CF1E0CF16D2
+:1081B000F0ECDF06F8EAEF06F0E0FF0670F3E0917E
+:1081C0000201F091030109958091C00087FFE9CF7A
+:1081D0008091C600803209F046CD80910C0280FF6C
+:1081E000DAC18091060190910701880F991F909341
+:1081F0000701809306014091080250910902411540
+:108200005105B1F0E8E0F1E020E030E0F999FECF6F
+:1082100092BD81BD619160BDFA9AF99A01969093E1
+:108220000701809306012F5F3F4F2417350770F336
+:108230008091C00085FFFCCF9092C6008091C00065
+:1082400085FFFCCF8092C600CC24DD247601C6CC0D
+:10825000CC24DD2476018091C00087FD17C00894EE
+:10826000C11CD11CE11CF11C81E0C81680ECD806B1
+:1082700088EAE80680E0F80670F3E0910201F091E8
+:10828000030109958091C00087FFE9CF8091C60066
+:1082900080930902CC24DD2476018091C00087FD03
+:1082A00017C00894C11CD11CE11CF11CE1E0CE16E2
+:1082B000E0ECDE06E8EAEE06E0E0FE0670F3E091B0
+:1082C0000201F091030109958091C00087FFE9CF79
+:1082D0008091C60080930802809106019091070169
+:1082E000880F991F9093070180930601CC24DD2409
+:1082F00076018091C00087FD17C00894C11CD11C75
+:10830000E11CF11CF1E0CF16F0ECDF06F8EAEF0615
+:10831000F0E0FF0670F3E0910201F091030109958E
+:108320008091C00087FFE9CF8091C600853409F4B1
+:108330002CC180910C028E7F80930C02CC24DD2412
+:1083400076018091C00087FD17C00894C11CD11C24
+:10835000E11CF11C81E0C81680ECD80688EAE8062A
+:1083600080E0F80670F3E0910201F09103010995B5
+:108370008091C00087FFE9CF8091C600803209F06C
+:108380007ACC8091C00085FFFCCF9092C6004091CE
+:1083900008025091090241155105F9F080E090E082
+:1083A00020910C02E0910601F0910701322F31700B
+:1083B00022703323D9F4222339F474916091C000E0
+:1083C00065FFFCCF7093C6003196F0930701E093F0
+:1083D000060101968417950760F38091C00085FD22
+:1083E000B4CC8091C00085FFF8CFAFCCF999FECF17
+:1083F000F2BDE1BDF89A70B56091C00065FFFCCF99
+:108400007093C6003196F0930701E0930601019640
+:108410008417950770F28091C00085FFE2CF95CC5C
+:10842000CC24DD2476018091C00087FD17C008941C
+:10843000C11CD11CE11CF11CE1E0CE16E0ECDE0613
+:10844000E8EAEE06E0E0FE0670F3E0910201F0914A
+:10845000030109958091C00087FFE9CF8091C60094
+:10846000803209F000CC8091C00085FFFCCF909253
+:10847000C6008091C00085FFFCCFFEE1F093C600EE
+:108480008091C00085FFFCCF85E98093C600809174
+:10849000C00085FFFCCFEFE0E093C6008091C000F4
+:1084A00085FFFCCF8092C600CC24DD24760196CBDC
+:1084B000CC24DD2476018091C00087FD17C008948C
+:1084C000C11CD11CE11CF11CE1E0CE16E0ECDE0683
+:1084D000E8EAEE06E0E0FE0670F3E0910201F091BA
+:1084E000030109958091C00087FFE9CF8091C60004
+:1084F000CC24DD2476018091C00087FD17C008944C
+:10850000C11CD11CE11CF11CF1E0CF16F0ECDF0620
+:10851000F8EAEF06F0E0FF0670F3E0910201F09157
+:10852000030109958091C00087FFE9CF0091C60043
+:10853000CC24DD2476018091C00087FD17C008940B
+:10854000C11CD11CE11CF11C81E0C81680ECD806CE
+:1085500088EAE80680E0F80670F3E0910201F09105
+:10856000030109958091C00087FFE9CF8091C60083
+:10857000002309F486C0013009F47CC08FE00E941A
+:10858000143DCC24DD24760129CB80910C0281603E
+:1085900080930C02D3CE80910701880F880B8170E5
+:1085A00080930B028091060190910701880F991F1B
+:1085B00090930701809306018091080280FF09C013
+:1085C000809108029091090201969093090280938C
+:1085D0000802F894F999FECF1127E0910601F09175
+:1085E0000701C8E0D1E080910802909109021030A3
+:1085F00091F40091570001700130D9F303E000932A
+:108600005700E8950091570001700130D9F301E15E
+:1086100000935700E8950990199000915700017058
+:108620000130D9F301E000935700E8951395103419
+:1086300098F011270091570001700130D9F305E03F
+:1086400000935700E8950091570001700130D9F36D
+:1086500001E100935700E8953296029709F0C7CFE1
+:10866000103011F00296E5CF11248091C00085FFF3
+:10867000DFCDE2CD85E90E94143DCC24DD247601D6
+:10868000ADCA8EE10E94143DCC24DD247601A6CA39
+:04869000F894FFCF8C
+:02869400800064
+:040000030000780081
+:00000001FF
diff -r bd9ce7e581ec -r a3de303afabf Makefile
--- a/Makefile	Thu Jun 27 11:40:35 2013 +0800
+++ b/Makefile	Thu Jun 27 11:46:44 2013 +0800
@@ -28,6 +28,7 @@
 SOURCE    = main.c
 SOURCE += $(SOURCE_CRYPTO) $(SOURCE_SD)
 LIBS       = 
+BOOTLOADER_HEX = ATmegaBOOT_168_pihelp.hex
 
 OBJECTS := $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(SOURCE)))
 
@@ -100,6 +101,12 @@
 flash:	all
 	$(AVRDUDE) -U flash:w:main.hex:i
 
+combined.hex: main.hex $(BOOTLOADER_HEX)
+	srec_cat main.hex -I $(BOOTLOADER_HEX) -I -o $@ -I
+
+combo: combined.hex
+	$(AVRDUDE) -U flash:w:combined.hex:i
+
 checkprog:	
 	$(AVRDUDE) -v