Fixed build problem and assigned pid 0x0110 to lilypad prototyping board

marshalltaylorSFE · marshalltaylorSFE · commit cce1e24b3296 · 2017-06-29T14:35:28.000-06:00
diff --git a/sparkfun/avr/boards.txt b/sparkfun/avr/boards.txt
@@ -352,9 +352,7 @@ atmega128rfa1.build.variant=rf128
 
 LilyPadProtoUSB.name=LilyPad Prototyping Board
 LilyPadProtoUSB.vid.0=0x1B4F
-LilyPadProtoUSB.pid.0=0x9207
-LilyPadProtoUSB.vid.1=0x1B4F
-LilyPadProtoUSB.pid.1=0x9208
+LilyPadProtoUSB.pid.0=0x0110
 
 LilyPadProtoUSB.upload.tool=avrdude
 LilyPadProtoUSB.upload.protocol=avr109
@@ -369,16 +367,16 @@ LilyPadProtoUSB.bootloader.tool=avrdude
 LilyPadProtoUSB.bootloader.low_fuses=0xff
 LilyPadProtoUSB.bootloader.high_fuses=0xd8
 LilyPadProtoUSB.bootloader.extended_fuses=0xce
-LilyPadProtoUSB.bootloader.file=caterina-LilyPadUSB/Caterina-LilyPadUSB.hex
+LilyPadProtoUSB.bootloader.file=caterina/Caterina-lilypadprototypingboard.hex
 LilyPadProtoUSB.bootloader.unlock_bits=0x3F
 LilyPadProtoUSB.bootloader.lock_bits=0x2F
 
 LilyPadProtoUSB.build.mcu=atmega32u4
 LilyPadProtoUSB.build.f_cpu=8000000L
 LilyPadProtoUSB.build.vid=0x1B4F
-LilyPadProtoUSB.build.pid=0x9208
-LilyPadProtoUSB.build.usb_product="LilyPad USB"
-LilyPadProtoUSB.build.board=AVR_LILYPAD_USB
-LilyPadProtoUSB.build.core=arduino
+LilyPadProtoUSB.build.pid=0x0110
+LilyPadProtoUSB.build.usb_product="LilyPad Prototyping Board"
+LilyPadProtoUSB.build.board=AVR_LILYPAD_PROTOTYPING_BOARD
+LilyPadProtoUSB.build.core=arduino:arduino
 LilyPadProtoUSB.build.variant=lilypadprototypingboard
 LilyPadProtoUSB.build.extra_flags={build.usb_flags}
diff --git a/sparkfun/avr/bootloaders/caterina/Caterina-lilypadprototypingboard.hex b/sparkfun/avr/bootloaders/caterina/Caterina-lilypadprototypingboard.hex
@@ -0,0 +1,259 @@
+:1070000055C000006EC000006CC000006AC00000E7
+:1070100068C0000066C0000064C0000062C00000DC
+:1070200060C000005EC00000FCC400005AC0000048
+:1070300058C0000056C0000054C0000052C00000FC
+:1070400050C000005DC000004CC000004AC00000FD
+:1070500048C0000046C0000044C0000042C000001C
+:1070600040C000003EC000003CC000003AC000002C
+:1070700038C0000036C0000034C0000032C000003C
+:1070800030C000002EC000002CC000002AC000004C
+:1070900028C0000026C0000024C0000022C000005C
+:1070A00020C000001EC000001CC0000011241FBE34
+:1070B000CFEFDAE0DEBFCDBF11E0A0E0B1E0E2E467
+:1070C000FFE702C005900D92A43BB107D9F711E08C
+:1070D000A4EBB1E001C01D92AD3CB107E1F74FD385
+:1070E0002EC78ECFF89410926F001092810081E02D
+:1070F00085BF15BE47985D9A289A0C9400000895A4
+:107100001F920F920FB60F9211242F938F939F937C
+:10711000EF93FF9310928500109284008091B40148
+:107120009091B501009741F001979093B50180933C
+:10713000B401892B09F45D9A8091B6019091B70151
+:10714000009741F001979093B7018093B601892B86
+:1071500009F4289A8091BA019091BB01019690930D
+:10716000BB018093BA01E0E0F0E0859194918F5FDC
+:107170009F4F49F08091B8019091B9010196909389
+:10718000B9018093B801FF91EF919F918F912F9159
+:107190000F900FBE0F901F90189584E08093E90028
+:1071A0000DC08091E8008B778093E80003C08EB318
+:1071B000882351F08091E80082FFF9CF8091E800A8
+:1071C00085FFEFCF8091F1000895982F83E08093A1
+:1071D000E9008091E80085FD0DC08091E8008E7780
+:1071E0008093E80003C08EB3882369F08091E800A3
+:1071F00080FFF9CF9093F1005D9884E690E0909342
+:10720000B5018093B40108954F925F926F927F927F
+:107210008F929F92AF92BF92CF92DF92EF92FF92A6
+:107220000F931F93CF93DF9384E08093E9008091C5
+:10723000E80082FF57C2289884E690E09093B70157
+:107240008093B601AADF182F853481F48CEA9DE083
+:107250009093B9018093B80107B600FCFDCFF9996E
+:10726000FECF81E180935700E89503C0843519F47F
+:1072700094DF8DE00DC28C34E1F38035D1F3843797
+:1072800021F484E4A2DF80E003C2813611F489E5B1
+:10729000FFC18134B1F481DF182F7FDF90E0880FC8
+:1072A000991FAA2797FDA095BA2F312F330F20E001
+:1072B000442737FD4095542F822B932BA42BB52BBD
+:1072C000B8C1803711F483E5E3C1833549F4C0E0E8
+:1072D000D1E089917ADF21E0C730D207D1F7D9C157
+:1072E000863521F481E371DF80E3D2C1833731F445
+:1072F00087E86BDF85E969DF8EE1CAC18536B9F4BD
+:10730000E0E0F0E093E085E090935700E89507B661
+:1073100000FCFDCF80935700E89507B600FCFDCF39
+:10732000E058FF4FA0E7E030FA0771F7A2CF8237AD
+:1073300039F4E1E0F0E089E0809357008491A8C13E
+:10734000863439F4E0E0F0E089E0809357008491DE
+:107350009FC18E3439F4E3E0F0E089E08093570078
+:10736000849196C1813539F4E2E0F0E089E08093C0
+:10737000570084918DC1823631F489E526DF80E0A3
+:1073800024DF80E885C1823419F0873609F0E5C032
+:107390001092B9011092B80100DF082FFEDEF82E1E
+:1073A000FCDE682E8554823008F071C1902F80E099
+:1073B000CF2DD0E0C82BD92B10926F00173609F0D3
+:1073C0004BC081E180935700E895DD24CC24C39421
+:1073D0003FC0E090BD01F090BE010091BF0110914F
+:1073E000C001B6E46B16D9F4ED2DF0E0EE29FF29CB
+:1073F000E4918E2FEADEDD2081F082E090E0A0E0D3
+:10740000B0E0E80EF91E0A1F1B1FE092BD01F092CA
+:10741000BE010093BF011093C001DC2418C0D80145
+:10742000C701B695A7959795879573D5CEDE82E06F
+:1074300090E0A0E0B0E0E80EF91E0A1F1B1FE092EA
+:10744000BD01F092BE010093BF011093C0012197CE
+:10745000209709F0BECF7DC08090BD019090BE0105
+:10746000A090BF01B090C00196E4691609F05DC01C
+:1074700083E0F40180935700E89507B600FCFDCF48
+:1074800054C0F6E46F1661F5772031F1E090BD014C
+:10749000F090BE010091BF011091C0017EDED82E98
+:1074A000CC24852D90E08C299D29F7010C01409278
+:1074B0005700E895112482E090E0A0E0B0E0E80EEB
+:1074C000F91E0A1F1B1FE092BD01F092BE0100933E
+:1074D000BF011093C00102C060DE582E742423C087
+:1074E000E090BD01F090BE010091BF011091C0017C
+:1074F00016950795F794E79450DE682FC70111D5CC
+:107500008091BD019091BE01A091BF01B091C001D9
+:107510000296A11DB11D8093BD019093BE01A09361
+:10752000BF01B093C001219704C05524772444249F
+:107530004394209709F0A5CF96E4691641F485E0BD
+:10754000F40180935700E89507B600FCFDCF8DE06D
+:107550003CDE82E080936F009CC0833471F4009124
+:10756000BD011091BE0119DE90E021E0F8010C018F
+:1075700020935700E89511247CCE833619F5E090CE
+:10758000BD01F090BE010091BF011091C00105DE68
+:10759000F701E16090E021E00C0120935700E895AD
+:1075A000112482E090E0A0E0B0E0E80EF91E0A1F8E
+:1075B0001B1FE092BD01F092BE010093BF0110932A
+:1075C000C00157CE8D3661F4E091BD01F091BE014E
+:1075D00085E080935700E89507B600FCFDCF49CEC3
+:1075E000823551F4E091BD01F091BE0105911491F5
+:1075F000812FEBDD802F4CC0843421F5E090BD015C
+:10760000F090BE010091BF011091C0011695079541
+:10761000F794E794C2DD682FC70183D48091BD0140
+:107620009091BE01A091BF01B091C0010296A11D31
+:10763000B11D8093BD019093BE01A093BF01B09393
+:10764000C00117CE843609F5E090BD01F090BE016F
+:107650000091BF011091C001D801C701B695A7954F
+:107660009795879556D4B1DD82E090E0A0E0B0E038
+:10767000E80EF91E0A1F1B1FE092BD01F092BE0129
+:107680000093BF011093C00104C08B3111F08FE350
+:107690009CDD83E08093E9009091E8008091E80010
+:1076A0008E778093E80095FF04C010C08EB38823C6
+:1076B000C9F08091E80080FFF9CF8091E8008E77D3
+:1076C0008093E80003C08EB3882361F08091E800C6
+:1076D00080FFF9CF84E08093E9008091E8008B7708
+:1076E0008093E800DF91CF911F910F91FF90EF9071
+:1076F000DF90CF90BF90AF909F908F907F906F90D2
+:107700005F904F9008959091C501892F8F778132B6
+:1077100049F58091C6018032A1F0813219F5913A84
+:1077200009F58091E800877F8093E8008CE091E084
+:1077300067E070E025D28091E8008B778093E800C5
+:107740000895913279F48091E800877F8093E80072
+:107750008CE091E067E070E077D28091E8008E776E
+:107760008093E800089582E061EC42E0D1D083E0AC
+:1077700061E842E1CDD084E060E842E1C9C01F93F6
+:10778000209100081092000844B714BE88E10FB69B
+:10779000F89480936000109260000FBE80E8E0E0F3
+:1077A000F0E00FB6F89480936100E09361000FBEA3
+:1077B00031E035BF92E095BF3F9A209A559A809369
+:1077C00061001092610047985D9A289A1092890092
+:1077D0008AEF8093880090936F0083E0809381000C
+:1077E000859194918F5F9F4F11F03093BC01942F3E
+:1077F00041FF19C0809109012817A9F08093000862
+:10780000789480911301882339F08091BA01909186
+:10781000BB0188579140C8F3F8941092000881E0AA
+:10782000809313010CC090FF04C08091BC01882399
+:1078300051F493FF09C080910901281729F0809124
+:10784000BC01882309F04EDCD4D078941092B901A1
+:107850001092B8011EEF20C0D7DC49D38091B80147
+:107860009091B901815A9F4010F0109213018091BC
+:10787000C1019091C20101969093C2018093C10110
+:10788000292F97FF03C0512F591B252F220F28178F
+:1078900010F4479801C0479A809113018823E1F6BC
+:1078A0008091E00081608093E0001CDC80E090E04B
+:1078B0001F910895FA01923049F0933061F09130B0
+:1078C000F9F484E191E022E130E01EC086E291E02B
+:1078D0002EE330E019C0882329F484E691E024E007
+:1078E00030E012C0813029F488E691E02EE130E0EA
+:1078F0000BC0823029F488E891E02AE230E004C02D
+:1079000080E090E020E030E091838083C901089519
+:107910008093E9008091EB0081608093EB001092EE
+:10792000ED006093EC004093ED008091EE00881F25
+:107930008827881F08958091C50188238CF403C08F
+:107940008EB38823B1F08091E80082FFF9CF809157
+:10795000E8008B778093E80008958EB3882349F080
+:107960008091E80080FFF9CF8091E8008E778093C6
+:10797000E8000895EF92FF920F931F9345D04CD0EB
+:1079800008ED10E0F80180818F7780838081806826
+:10799000808380818F7D808319BC1EBA1092C301C1
+:1079A00080EEE82EF12CF70180818B7F8083F80137
+:1079B00080818160808380E060E042E0A9DFE1EEC9
+:1079C000F0E080818E7F8083E2EEF0E08081816054
+:1079D0008083808188608083F70180818E7F8083AF
+:1079E000F8018081806180831F910F91FF90EF905B
+:1079F0000895E7EDF0E08081816080838AE482BFB2
+:107A000081E08093C401B6CFE8EDF0E080818E7F05
+:107A100080831092E20008951092DA001092E10043
+:107A200008951F920F920FB60F9211242F933F9338
+:107A30004F935F936F937F938F939F93AF93BF9376
+:107A4000EF93FF938091DA0080FF1AC08091D800F5
+:107A500080FF16C08091DA008E7F8093DA008091DB
+:107A6000D90080FF0AC019BC82E089BD09B400FEBC
+:107A7000FDCF81E08EBB3AD203C019BC1EBA36D20C
+:107A80008091E10080FF17C08091E20080FF13C069
+:107A90008091E2008E7F8093E2008091E20080611D
+:107AA0008093E2008091D80080628093D80019BC56
+:107AB00085E08EBB1BD28091E10084FF2BC08091BA
+:107AC000E20084FF27C019BC82E089BD09B400FE32
+:107AD000FDCF8091D8008F7D8093D8008091E10008
+:107AE0008F7E8093E1008091E2008F7E8093E200A0
+:107AF0008091E20081608093E2008091C30188233D
+:107B000031F48091E30087FD02C081E001C084E090
+:107B10008EBBECD18091E10083FF21C08091E20017
+:107B200083FF1DC08091E100877F8093E10082E0A8
+:107B30008EBB1092C3018091E1008E7F8093E100A3
+:107B40008091E2008E7F8093E2008091E20080616C
+:107B50008093E20080E060E042E0DADEC7D1FF918E
+:107B6000EF91BF91AF919F918F917F916F915F91B5
+:107B70004F913F912F910F900FBE0F901F9018952E
+:107B80009C014091CB015091CC014617570718F446
+:107B9000F90190E044C06115710511F0AB01F8CF17
+:107BA0008091E8008E778093E80040E050E0F0CFCD
+:107BB0008EB3882309F444C0853009F443C0809112
+:107BC000E80083FF02C081E008958091E80082FD13
+:107BD00031C08091E80080FF22C08091F300909135
+:107BE000F200782F60E0292F30E0262B372B07C0DA
+:107BF00081918093F100415050402F5F3F4F4115DC
+:107C0000510519F02830310598F390E028303105FE
+:107C100009F491E08091E8008E778093E8004115A7
+:107C2000510531F6992321F605C08EB3882341F022
+:107C3000853041F08091E80082FFF7CF80E0089521
+:107C400082E0089583E008959C016115710529F48F
+:107C50008091E8008B778093E800F90126C08EB30D
+:107C6000882391F1853091F18091E80083FF02C073
+:107C700081E008958091E80082FFF1CF06C08091F5
+:107C8000F10081936150704059F02091F300809190
+:107C9000F200322F20E090E0822B932B892B79F792
+:107CA0008091E8008B778093E80061157105B9F643
+:107CB00005C08EB3882341F0853041F08091E80003
+:107CC00080FFF7CF80E0089582E0089583E0089573
+:107CD0000F931F93DF93CF9300D0CDB7DEB7E5ECC2
+:107CE000F1E08091F100819381E0ED3CF807C9F764
+:107CF0000ADD8091E80083FFE4C08091C501909186
+:107D0000C601953009F46DC0963040F4913081F190
+:107D1000913070F0933009F0D4C02AC0983009F443
+:107D2000A3C0993009F4B2C0963009F0CAC07CC033
+:107D3000803809F4C6C0823809F0C3C08091C901F7
+:107D400087708093E9008091EB001092E900209108
+:107D5000E800277F2093E80090E025E0969587953E
+:107D60002A95E1F781708093F1001092F10087C0AD
+:107D7000882319F0823009F0A4C08F71823009F095
+:107D8000A0C08091C701882331F52091C9012770D7
+:107D900009F497C02093E9008091EB0080FF1BC09D
+:107DA000933021F48091EB00806213C08091EB004E
+:107DB00080618093EB0081E090E002C0880F991F02
+:107DC0002A95E2F78093EA001092EA008091EB0096
+:107DD00088608093EB001092E9008091E800877F33
+:107DE00051C0882309F06DC01091C7011F770FB7EC
+:107DF000F8948091E800877F8093E8009CDD809173
+:107E0000E80080FFFCCF8091E3008078812B809395
+:107E1000E30080688093E300112311F482E001C045
+:107E200083E08EBB0FBF4DC08058823008F049C040
+:107E30008091C7019091C8016091C901AE014F5F67
+:107E40005F4F38DDBC01009709F43BC08091E8002A
+:107E5000877F8093E80089819A8192DE8091E80093
+:107E60008B778093E8002DC0803859F58091E80029
+:107E7000877F8093E8008091C3018093F100809117
+:107E8000E8008E778093E80056DD1BC08823C9F494
+:107E90009091C7019230A8F48091E800877F809389
+:107EA000E8009093C30147DD8091C301882331F43A
+:107EB0008091E30087FD02C081E001C084E08EBBB9
+:107EC00052DC8091E80083FF0AC08091EB00806261
+:107ED0008093EB008091E800877F8093E8000F900B
+:107EE0000F90CF91DF911F910F91089508951F93E7
+:107EF0008EB3882361F01091E9001092E90080911F
+:107F0000E80083FF01C0E4DE17701093E9001F91C1
+:107F10000895F999FECF92BD81BDF89A992780B551
+:107F20000895262FF999FECF1FBA92BD81BD20BDBD
+:107F30000FB6F894FA9AF99A0FBE01960895F8943C
+:027F4000FFCF71
+:107F42004341544552494E41007700080000000069
+:107F52000000080112011001020000084F1B10016D
+:107F620001000201000109023E0002010080320903
+:107F72000400000102020100052400100104240291
+:107F8200040524060001070582030800FF09040115
+:107F920000020A0000000705040210000107058321
+:107FA20002100001040309041E035500530042009D
+:107FB200200049004F00200062006F006100720043
+:107FC20064002000200000002A03530070006100BA
+:107FD20072006B00460075006E00200045006C00C8
+:107FE20065006300740072006F006E006900630038
+:047FF2007300000018
+:040000030000700089
+:00000001FF
diff --git a/sparkfun/avr/bootloaders/caterina/Readme.txt b/sparkfun/avr/bootloaders/caterina/Readme.txt
@@ -1,6 +1,14 @@
 Notes on building the improved 32u4 Caterina bootloader:
 
 1. Must download LUFA-111009 and extract to this directory.
-2. The "build.txt" file and "program.txt" files can be renamed
+
+  This should be in a folder named LUFA-111009/
+
+2. Make sure avr-gcc is installed.  It make come with tools, but
+    if not maybe wingnu32 make, and core tools can be downloaded and used.
+
+3. Try using powershell if you get "...died before initialization" errors.
+  
+4. The "build.txt" file and "program.txt" files can be renamed
     to .bat files and run to build and program the boards listed
     herein (Windows only, unfortunately).
diff --git a/sparkfun/avr/bootloaders/caterina/build.txt b/sparkfun/avr/bootloaders/caterina/build.txt
@@ -18,4 +18,7 @@ make PID=0xF100 F_CPU=8000000
 copy Caterina.hex Caterina-fio.hex
 make clean
 make PID=0x920B F_CPU=16000000
-copy Caterina.hex Caterina-minibench.hex
+copy Caterina.hex Caterina-minibench.hex
+make clean
+make PID=0x0110 F_CPU=8000000
+copy Caterina.hex Caterina-lilypadprototypingboard.hex
