From 3191583476d18cf8813b65aad6fd9491191c6c61 Mon Sep 17 00:00:00 2001 From: Zach Eveland Date: Tue, 7 Feb 2012 23:52:55 -0500 Subject: changed Caterina descriptors - Arduino LLC VID, new PID, manufacturer string, and serial number --- bootloaders/caterina_LUFA/Caterina.hex | 343 ++++++++++++++++---------------- bootloaders/caterina_LUFA/Descriptors.c | 36 +++- 2 files changed, 203 insertions(+), 176 deletions(-) (limited to 'bootloaders') diff --git a/bootloaders/caterina_LUFA/Caterina.hex b/bootloaders/caterina_LUFA/Caterina.hex index 5da8582..fe12ee3 100644 --- a/bootloaders/caterina_LUFA/Caterina.hex +++ b/bootloaders/caterina_LUFA/Caterina.hex @@ -1,6 +1,6 @@ :1070000055C000006EC000006CC000006AC00000E7 :1070100068C0000066C0000064C0000062C00000DC -:1070200060C000005EC00000BBC400005AC0000089 +:1070200060C000005EC00000CBC400005AC0000079 :1070300058C0000056C0000054C0000052C00000FC :1070400050C0000078C000004CC000004AC00000E2 :1070500048C0000046C0000044C0000042C000001C @@ -9,22 +9,22 @@ :1070800030C000002EC000002CC000002AC000004C :1070900028C0000026C0000024C0000022C000005C :1070A00020C000001EC000001CC0000011241FBE34 -:1070B000CFEFDAE0DEBFCDBF11E0A0E0B1E0E4EC5D -:1070C000FEE702C005900D92AE38B107D9F711E086 -:1070D000AEE8B1E001C01D92A43AB107E1F78ED34A -:1070E000EFC68ECFF89410926F001092810010922C +:1070B000CFEFDAE0DEBFCDBF11E0A0E0B1E0E4EE5B +:1070C000FEE702C005900D92A03CB107D9F711E090 +:1070D000A0ECB1E001C01D92A63DB107E1F78ED34F +:1070E000FFC68ECFF89410926F001092810010921C :1070F00085001092840081E085BF15BE47985D9A97 -:10710000289A0C94000008952091980130919901DB -:107110002F5F3F4F3093990120939801932F37FFB2 +:10710000289A0C94000008952091CA013091CB0177 +:107110002F5F3F4F3093CB012093CA01932F37FF4E :1071200003C08EEF831B982F990F921710F4479886 :107130000895479A08951F920F920FB60F92112447 :107140002F938F939F93EF93FF931092850010924C -:10715000840080918E0190918F01009741F00197FA -:1071600090938F0180938E01892B09F45D9A809111 -:10717000900190919101009741F0019790939101B6 -:1071800080939001892B09F4289AE0E0F0E0859142 -:1071900094918F5F9F4F49F080919201909193015C -:1071A00001969093930180939201FF91EF919F91AB +:1071500084008091C0019091C101009741F0019796 +:107160009093C1018093C001892B09F45D9A8091AD +:10717000C2019091C301009741F001979093C30120 +:107180008093C201892B09F4289AE0E0F0E0859110 +:1071900094918F5F9F4F49F08091C4019091C501F8 +:1071A00001969093C5018093C401FF91EF919F9147 :1071B0008F912F910F900FBE0F901F90189584E024 :1071C0008093E9000DC08091E8008B778093E80000 :1071D00003C08EB3882351F08091E80082FFF9CF7D @@ -32,11 +32,11 @@ :1071F00083E08093E9008091E80085FD0DC08091D7 :10720000E8008E778093E80003C08EB3882369F08E :107210008091E80080FFF9CF9093F1005D9884E6BB -:1072200090E090938F0180938E0108954F925F922A +:1072200090E09093C1018093C00108954F925F92C6 :107230006F927F928F929F92AF92BF92CF92DF9286 :10724000EF92FF920F931F93CF93DF9384E080938D :10725000E9008091E80082FF56C2289884E690E019 -:107260009093910180939001AADF182F853419F42F +:107260009093C3018093C201AADF182F853419F4CB :107270001092090103C0843519F4A1DF8DE019C211 :107280008C34E1F38035D1F3843721F484E4AFDF2B :1072900080E00FC2813611F489E50BC28134B1F46C @@ -57,54 +57,54 @@ :107380005700849196C1813539F4E2E0F0E089E05C :107390008093570084918DC1823631F489E527DFCF :1073A00080E025DF80E885C1823419F0873609F056 -:1073B000E5C0109293011092920101DF082FFFDEC9 +:1073B000E5C01092C5011092C40101DF082FFFDE65 :1073C000F82EFDDE682E8554823008F071C1902FB2 :1073D00080E0CF2DD0E0C82BD92B10926F0017364C :1073E00009F04BC081E180935700E895DD24CC245F -:1073F000C3943FC0E0909401F090950100919601F4 -:1074000010919701B6E46B16D9F4ED2DF0E0EE295A +:1073F000C3943FC0E090C601F090C7010091C8015E +:107400001091C901B6E46B16D9F4ED2DF0E0EE2928 :10741000FF29E4918E2FEBDEDD2081F082E090E009 -:10742000A0E0B0E0E80EF91E0A1F1B1FE0929401D5 -:10743000F09295010093960110939701DC2418C0F7 -:10744000D801C701B695A7959795879523D5CFDE27 +:10742000A0E0B0E0E80EF91E0A1F1B1FE092C601A3 +:10743000F092C7010093C8011093C901DC2418C061 +:10744000D801C701B695A7959795879533D5CFDE17 :1074500082E090E0A0E0B0E0E80EF91E0A1F1B1FDA -:10746000E0929401F0929501009396011093970198 -:107470002197209709F0BECF7DC080909401909015 -:107480009501A0909601B090970196E4691609F0D5 +:10746000E092C601F092C7010093C8011093C901D0 +:107470002197209709F0BECF7DC08090C6019090E3 +:10748000C701A090C801B090C90196E4691609F03F :107490005DC083E0F40180935700E89507B600FCD7 :1074A000FDCF54C0F6E46F1661F5772031F1E0901E -:1074B0009401F090950100919601109197017FDE63 +:1074B000C601F090C7010091C8011091C9017FDE9B :1074C000D82ECC24852D90E08C299D29F7010C0124 :1074D00040925700E895112482E090E0A0E0B0E0EF -:1074E000E80EF91E0A1F1B1FE0929401F09295010D -:1074F000009396011093970102C061DE582E742408 -:1075000023C0E0909401F0909501009196011091B4 -:10751000970116950795F794E79451DE682FC701F8 -:10752000C1D48091940190919501A0919601B09160 -:1075300097010296A11DB11D80939401909395012E -:10754000A0939601B0939701219704C05524772406 +:1074E000E80EF91E0A1F1B1FE092C601F092C701A9 +:1074F0000093C8011093C90102C061DE582E7424A4 +:1075000023C0E090C601F090C7010091C80110911E +:10751000C90116950795F794E79451DE682FC701C6 +:10752000D1D48091C6019091C701A091C801B091BA +:10753000C9010296A11DB11D8093C6019093C70198 +:10754000A093C801B093C901219704C055247724A2 :1075500044244394209709F0A5CF96E4691641F49A :1075600085E0F40180935700E89507B600FCFDCF55 :107570008DE03DDE82E080936F009CC0833471F427 -:1075800000919401109195011ADE90E021E0F8013C +:107580000091C6011091C7011ADE90E021E0F801D8 :107590000C0120935700E895112470CE833619F51D -:1075A000E0909401F090950100919601109197015F +:1075A000E090C601F090C7010091C8011091C90197 :1075B00006DEF701E16090E021E00C012093570026 :1075C000E895112482E090E0A0E0B0E0E80EF91E1A -:1075D0000A1F1B1FE0929401F092950100939601FF -:1075E000109397014BCE8D3661F4E0919401F091A8 -:1075F000950185E080935700E89507B600FCFDCF24 -:107600003DCE823551F4E0919401F09195010591C0 +:1075D0000A1F1B1FE092C601F092C7010093C80169 +:1075E0001093C9014BCE8D3661F4E091C601F09144 +:1075F000C70185E080935700E89507B600FCFDCFF2 +:107600003DCE823551F4E091C601F091C70105915C :107610001491812FECDD802F4CC0843421F5E09053 -:107620009401F090950100919601109197011695A3 -:107630000795F794E794C3DD682FC70133D4809191 -:10764000940190919501A0919601B09197010296B5 -:10765000A11DB11D8093940190939501A093960173 -:10766000B09397010BCE843609F5E0909401F09029 -:1076700095010091960110919701D801C701B69527 -:10768000A7959795879506D4B2DD82E090E0A0E0BB -:10769000B0E0E80EF91E0A1F1B1FE0929401F09261 -:1076A0009501009396011093970104C08B3111F05E +:10762000C601F090C7010091C8011091C9011695DB +:107630000795F794E794C3DD682FC70143D4809181 +:10764000C6019091C701A091C801B091C9010296ED +:10765000A11DB11D8093C6019093C701A093C801DD +:10766000B093C9010BCE843609F5E090C601F090C5 +:10767000C7010091C8011091C901D801C701B69591 +:10768000A7959795879516D4B2DD82E090E0A0E0AB +:10769000B0E0E80EF91E0A1F1B1FE092C601F0922F +:1076A000C7010093C8011093C90104C08B3111F0C8 :1076B0008FE39DDD83E08093E9009091E800809165 :1076C000E8008E778093E80095FF04C010C08EB369 :1076D0008823C9F08091E80080FFF9CF8091E8000D @@ -112,137 +112,142 @@ :1076F000E80080FFF9CF84E08093E9008091E80002 :107700008B778093E800DF91CF911F910F91FF90CD :10771000EF90DF90CF90BF90AF909F908F907F9031 -:107720006F905F904F90089590919C01892F8F7773 -:10773000813249F580919D018032A1F0813219F5A5 +:107720006F905F904F9008959091CE01892F8F7741 +:10773000813249F58091CF018032A1F0813219F573 :10774000913A09F58091E800877F8093E8008AE00C -:1077500091E067E070E0D5D18091E8008B7780936D +:1077500091E067E070E0E5D18091E8008B7780935D :10776000E8000895913279F48091E800877F809352 -:10777000E8008AE091E067E070E027D28091E800BD -:107780008E778093E800089582E061EC42E07FD03C -:1077900083E061E842E17BD084E060E842E177C0C9 +:10777000E8008AE091E067E070E037D28091E800AD +:107780008E778093E800089582E061EC42E08FD02C +:1077900083E061E842E18BD084E060E842E187C0A9 :1077A00084B7877F84BF88E10FB6F8948093600028 :1077B000109260000FBE20E880E090E00FB6F894D1 :1077C00020936100809361000FBE81E085BF92E04D :1077D00095BF3F9A209A559AE1E6F0E02083108207 :1077E00047985D9A289A109289008AEF80938800C2 -:1077F00090936F0083E080938100BAC088E10FB658 +:1077F00090936F0083E080938100CAC088E10FB648 :10780000F89480936000109260000FBEC9DF7894F6 -:107810000CC00CDD2DD38091920190919301815881 +:107810000CC00CDD3DD38091C4019091C50181580D :107820009E4310F0109209016FDC809109018823BA :1078300081F78091E00081608093E00053DC80E07C -:1078400090E00895FA01923071F0933089F0913010 -:1078500029F481E191E022E130E015C080E090E080 -:1078600020E030E010C083E291E02EE330E00BC076 -:10787000882329F481E691E024E030E004C085E625 -:1078800091E026E230E091838083C90108958093DE -:10789000E9008091EB0081608093EB001092ED0095 -:1078A0006093EC004093ED008091EE00881F8827E4 -:1078B000881F089580919C0188238CF403C08EB3A7 -:1078C0008823B1F08091E80082FFF9CF8091E80031 -:1078D0008B778093E80008958EB3882349F08091D8 -:1078E000E80080FFF9CF8091E8008E778093E80070 -:1078F0000895EF92FF920F931F9345D04CD008ED5F -:1079000010E0F80180818F77808380818068808398 -:1079100080818F7D808319BC1EBA10929A0180EEFF -:10792000E82EF12CF70180818B7F8083F801808124 -:107930008160808380E060E042E0A9DFE1EEF0E07A -:1079400080818E7F8083E2EEF0E0808181608083A1 -:10795000808188608083F70180818E7F8083F80139 -:107960008081806180831F910F91FF90EF90089537 -:10797000E7EDF0E08081816080838AE482BF81E06E -:1079800080939B01B6CFE8EDF0E080818E7F80830D -:107990001092E20008951092DA001092E10008952A -:1079A0001F920F920FB60F9211242F933F934F9374 -:1079B0005F936F937F938F939F93AF93BF93EF9357 -:1079C000FF938091DA0080FF1BC08091D80080FF78 -:1079D00017C08091DA008E7F8093DA008091D90001 -:1079E00080FF0BC080E189BD82E189BD09B400FE42 -:1079F000FDCF81E08EBB3BD203C019BC1EBA37D28B -:107A00008091E10080FF17C08091E20080FF13C0E9 -:107A10008091E2008E7F8093E2008091E20080619D -:107A20008093E2008091D80080628093D80019BCD6 -:107A300085E08EBB1CD28091E10084FF2CC0809138 -:107A4000E20084FF28C080E189BD82E189BD09B4DC -:107A500000FEFDCF8091D8008F7D8093D80080916B -:107A6000E1008F7E8093E1008091E2008F7E809321 -:107A7000E2008091E20081608093E20080919A01AF -:107A8000882331F48091E30087FD02C081E001C0CA -:107A900084E08EBBECD18091E10083FF21C0809116 -:107AA000E20083FF1DC08091E100877F8093E100A9 -:107AB00082E08EBB10929A018091E1008E7F8093CC -:107AC000E1008091E2008E7F8093E2008091E200ED -:107AD00080618093E20080E060E042E0D8DEC7D1C0 -:107AE000FF91EF91BF91AF919F918F917F916F9196 -:107AF0005F914F913F912F910F900FBE0F901F906C -:107B000018959C014091A2015091A3014617570777 -:107B100018F4F90190E044C06115710511F0AB0152 -:107B2000F8CF8091E8008E778093E80040E050E045 -:107B3000F0CF8EB3882309F444C0853009F443C0E4 -:107B40008091E80083FF02C081E008958091E80001 -:107B500082FD31C08091E80080FF22C08091F30057 -:107B60009091F200782F60E0292F30E0262B372B00 -:107B700007C081918093F100415050402F5F3F4FEB -:107B80004115510519F02830310598F390E028305F -:107B9000310509F491E08091E8008E778093E80048 -:107BA0004115510531F6992321F605C08EB388237E -:107BB00041F0853041F08091E80082FFF7CF80E00E -:107BC000089582E0089583E008959C016115710590 -:107BD00029F48091E8008B778093E800F90126C0B2 -:107BE0008EB3882391F1853091F18091E80083FF75 -:107BF00002C081E008958091E80082FFF1CF06C0C5 -:107C00008091F10081936150704059F02091F30010 -:107C10008091F200322F20E090E0822B932B892B71 -:107C200079F78091E8008B778093E8006115710502 -:107C3000B9F605C08EB3882341F0853041F08091BC -:107C4000E80080FFF7CF80E0089582E0089583E0A8 -:107C500008950F931F93DF93CF9300D0CDB7DEB776 -:107C6000ECE9F1E08091F100819381E0E43AF807DA -:107C7000C9F75ADD8091E80083FFE4C080919C0140 -:107C800090919D01953009F46DC0963040F491308B -:107C900081F1913070F0933009F0D4C02AC098304F -:107CA00009F4A3C0993009F4B2C0963009F0CAC0F3 -:107CB0007CC0803809F4C6C0823809F0C3C0809106 -:107CC000A00187708093E9008091EB001092E90099 -:107CD0002091E800277F2093E80090E025E096952A -:107CE00087952A95E1F781708093F1001092F10059 -:107CF00087C0882319F0823009F0A4C08F718230C8 -:107D000009F0A0C080919E01882331F52091A00147 -:107D1000277009F497C02093E9008091EB0080FF61 -:107D20001BC0933021F48091EB00806213C08091DE -:107D3000EB0080618093EB0081E090E002C0880F4F -:107D4000991F2A95E2F78093EA001092EA00809149 -:107D5000EB0088608093EB001092E9008091E800CE -:107D6000877F51C0882309F06DC010919E011F7755 -:107D70000FB7F8948091E800877F8093E8009ADD40 -:107D80008091E80080FFFCCF8091E3008078812B18 -:107D90008093E30080688093E300112311F482E074 -:107DA00001C083E08EBB0FBF4DC08058823008F009 -:107DB00049C080919E0190919F016091A001AE0108 -:107DC0004F5F5F4F3FDDBC01009709F43BC08091DE -:107DD000E800877F8093E80089819A8192DE809114 -:107DE000E8008B778093E8002DC0803859F58091AA -:107DF000E800877F8093E80080919A018093F100EA -:107E00008091E8008E778093E80054DD1BC08823C2 -:107E1000C9F490919E019230A8F48091E800877F88 -:107E20008093E80090939A0145DD80919A01882320 -:107E300031F48091E30087FD02C081E001C084E05D -:107E40008EBBA2DC8091E80083FF0AC08091EB002A -:107E500080628093EB008091E800877F8093E80048 -:107E60000F900F90CF91DF911F910F91089508957A -:107E70001F938EB3882361F01091E9001092E900FE -:107E80008091E80083FF01C0E4DE17701093E900E1 -:107E90001F910895F999FECF92BD81BDF89A992757 -:107EA00080B50895262FF999FECF1FBA92BD81BDE6 -:107EB00020BD0FB6F894FA9AF99A0FBE019608956C -:047EC000F894FFCF64 -:107EC4004341544552494E41000100000000000066 -:107ED400081201100102000008EB034A200100000F -:107EE40001000109023E0002010080320904000081 -:107EF40001020201000524001001042402040524E7 -:107F0400060001070582030800FF09040100020AB4 -:107F14000000000705040210000107058302100099 -:107F240001040309042603410056005200200043C3 -:107F34000044004300200042006F006F0074006C96 -:0E7F4400006F00610064006500720000000024 +:1078400090E00895FA01923049F0933061F0913060 +:1078500031F581E191E022E130E025C083E291E061 +:107860002EE330E020C0882329F481E691E024E073 +:1078700030E019C0813029F485E691E022E230E061 +:1078800012C0833029F489E891E02AE130E00BC08E +:10789000823029F485EA91E028E130E004C080E0FC +:1078A00090E020E030E091838083C90108958093C7 +:1078B000E9008091EB0081608093EB001092ED0075 +:1078C0006093EC004093ED008091EE00881F8827C4 +:1078D000881F08958091CE0188238CF403C08EB355 +:1078E0008823B1F08091E80082FFF9CF8091E80011 +:1078F0008B778093E80008958EB3882349F08091B8 +:10790000E80080FFF9CF8091E8008E778093E8004F +:107910000895EF92FF920F931F9345D04CD008ED3E +:1079200010E0F80180818F77808380818068808378 +:1079300080818F7D808319BC1EBA1092CC0180EEAD +:10794000E82EF12CF70180818B7F8083F801808104 +:107950008160808380E060E042E0A9DFE1EEF0E05A +:1079600080818E7F8083E2EEF0E080818160808381 +:10797000808188608083F70180818E7F8083F80119 +:107980008081806180831F910F91FF90EF90089517 +:10799000E7EDF0E08081816080838AE482BF81E04E +:1079A0008093CD01B6CFE8EDF0E080818E7F8083BB +:1079B0001092E20008951092DA001092E10008950A +:1079C0001F920F920FB60F9211242F933F934F9354 +:1079D0005F936F937F938F939F93AF93BF93EF9337 +:1079E000FF938091DA0080FF1BC08091D80080FF58 +:1079F00017C08091DA008E7F8093DA008091D900E1 +:107A000080FF0BC080E189BD82E189BD09B400FE21 +:107A1000FDCF81E08EBB3BD203C019BC1EBA37D26A +:107A20008091E10080FF17C08091E20080FF13C0C9 +:107A30008091E2008E7F8093E2008091E20080617D +:107A40008093E2008091D80080628093D80019BCB6 +:107A500085E08EBB1CD28091E10084FF2CC0809118 +:107A6000E20084FF28C080E189BD82E189BD09B4BC +:107A700000FEFDCF8091D8008F7D8093D80080914B +:107A8000E1008F7E8093E1008091E2008F7E809301 +:107A9000E2008091E20081608093E2008091CC015D +:107AA000882331F48091E30087FD02C081E001C0AA +:107AB00084E08EBBECD18091E10083FF21C08091F6 +:107AC000E20083FF1DC08091E100877F8093E10089 +:107AD00082E08EBB1092CC018091E1008E7F80937A +:107AE000E1008091E2008E7F8093E2008091E200CD +:107AF00080618093E20080E060E042E0D8DEC7D1A0 +:107B0000FF91EF91BF91AF919F918F917F916F9175 +:107B10005F914F913F912F910F900FBE0F901F904B +:107B200018959C014091D4015091D50146175707F3 +:107B300018F4F90190E044C06115710511F0AB0132 +:107B4000F8CF8091E8008E778093E80040E050E025 +:107B5000F0CF8EB3882309F444C0853009F443C0C4 +:107B60008091E80083FF02C081E008958091E800E1 +:107B700082FD31C08091E80080FF22C08091F30037 +:107B80009091F200782F60E0292F30E0262B372BE0 +:107B900007C081918093F100415050402F5F3F4FCB +:107BA0004115510519F02830310598F390E028303F +:107BB000310509F491E08091E8008E778093E80028 +:107BC0004115510531F6992321F605C08EB388235E +:107BD00041F0853041F08091E80082FFF7CF80E0EE +:107BE000089582E0089583E008959C016115710570 +:107BF00029F48091E8008B778093E800F90126C092 +:107C00008EB3882391F1853091F18091E80083FF54 +:107C100002C081E008958091E80082FFF1CF06C0A4 +:107C20008091F10081936150704059F02091F300F0 +:107C30008091F200322F20E090E0822B932B892B51 +:107C400079F78091E8008B778093E80061157105E2 +:107C5000B9F605C08EB3882341F0853041F080919C +:107C6000E80080FFF7CF80E0089582E0089583E088 +:107C700008950F931F93DF93CF9300D0CDB7DEB756 +:107C8000EEECF1E08091F100819381E0E63DF807B0 +:107C9000C9F74ADD8091E80083FFE4C08091CE01FE +:107CA0009091CF01953009F46DC0963040F4913039 +:107CB00081F1913070F0933009F0D4C02AC098302F +:107CC00009F4A3C0993009F4B2C0963009F0CAC0D3 +:107CD0007CC0803809F4C6C0823809F0C3C08091E6 +:107CE000D20187708093E9008091EB001092E90047 +:107CF0002091E800277F2093E80090E025E096950A +:107D000087952A95E1F781708093F1001092F10038 +:107D100087C0882319F0823009F0A4C08F718230A7 +:107D200009F0A0C08091D001882331F52091D201C3 +:107D3000277009F497C02093E9008091EB0080FF41 +:107D40001BC0933021F48091EB00806213C08091BE +:107D5000EB0080618093EB0081E090E002C0880F2F +:107D6000991F2A95E2F78093EA001092EA00809129 +:107D7000EB0088608093EB001092E9008091E800AE +:107D8000877F51C0882309F06DC01091D0011F7703 +:107D90000FB7F8948091E800877F8093E8009ADD20 +:107DA0008091E80080FFFCCF8091E3008078812BF8 +:107DB0008093E30080688093E300112311F482E054 +:107DC00001C083E08EBB0FBF4DC08058823008F0E9 +:107DD00049C08091D0019091D1016091D201AE0152 +:107DE0004F5F5F4F2FDDBC01009709F43BC08091CE +:107DF000E800877F8093E80089819A8192DE8091F4 +:107E0000E8008B778093E8002DC0803859F5809189 +:107E1000E800877F8093E8008091CC018093F10097 +:107E20008091E8008E778093E80054DD1BC08823A2 +:107E3000C9F49091D0019230A8F48091E800877F36 +:107E40008093E8009093CC0145DD8091CC0188239C +:107E500031F48091E30087FD02C081E001C084E03D +:107E60008EBB92DC8091E80083FF0AC08091EB001A +:107E700080628093EB008091E800877F8093E80028 +:107E80000F900F90CF91DF911F910F91089508955A +:107E90001F938EB3882361F01091E9001092E900DE +:107EA0008091E80083FF01C0E4DE17701093E900C1 +:107EB0001F910895F999FECF92BD81BDF89A992737 +:107EC00080B50895262FF999FECF1FBA92BD81BDC6 +:107ED00020BD0FB6F894FA9AF99A0FBE019608954C +:047EE000F894FFCF44 +:107EE4004341544552494E41000100000000000046 +:107EF40008120110010200000841230030010002B1 +:107F040001030109023E000201008032090400005D +:107F140001020201000524001001042402040524C6 +:107F2400060001070582030800FF09040100020A94 +:107F34000000000705040210000107058302100079 +:107F440001040309042203410072006400750069FE +:107F5400006E006F0020004C0065006F006E006131 +:107F640000720064006F0000001A0330003000301B +:107F74000030003000300030003000310034003573 +:107F840000320000001803410072006400750069AB +:107F9400006E006F0020004C004C00430000000005 :040000030000700089 :00000001FF diff --git a/bootloaders/caterina_LUFA/Descriptors.c b/bootloaders/caterina_LUFA/Descriptors.c index a3ca700..fb376c1 100755 --- a/bootloaders/caterina_LUFA/Descriptors.c +++ b/bootloaders/caterina_LUFA/Descriptors.c @@ -53,13 +53,13 @@ const USB_Descriptor_Device_t DeviceDescriptor = .Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE, - .VendorID = 0x03EB, - .ProductID = 0x204A, + .VendorID = 0x2341, + .ProductID = 0x3000, .ReleaseNumber = VERSION_BCD(00.01), - .ManufacturerStrIndex = NO_DESCRIPTOR, + .ManufacturerStrIndex = 0x02, .ProductStrIndex = 0x01, - .SerialNumStrIndex = NO_DESCRIPTOR, + .SerialNumStrIndex = 0x03, .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS }; @@ -191,9 +191,23 @@ const USB_Descriptor_String_t LanguageString = */ const USB_Descriptor_String_t ProductString = { - .Header = {.Size = USB_STRING_LEN(18), .Type = DTYPE_String}, + .Header = {.Size = USB_STRING_LEN(16), .Type = DTYPE_String}, - .UnicodeString = L"AVR CDC Bootloader" + .UnicodeString = L"Arduino Leonardo" +}; + +const USB_Descriptor_String_t SerialNumString = +{ + .Header = {.Size = USB_STRING_LEN(12), .Type = DTYPE_String}, + + .UnicodeString = L"000000001452" +}; + +const USB_Descriptor_String_t ManufNameString = +{ + .Header = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String}, + + .UnicodeString = L"Arduino LLC" }; /** This function is called by the library when in device mode, and must be overridden (see LUFA library "USB Descriptors" @@ -228,10 +242,18 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, Address = &LanguageString; Size = LanguageString.Header.Size; } - else + else if (DescriptorNumber == DeviceDescriptor.ProductStrIndex) { Address = &ProductString; Size = ProductString.Header.Size; + } else if (DescriptorNumber == DeviceDescriptor.SerialNumStrIndex) + { + Address = &SerialNumString; + Size = SerialNumString.Header.Size; + } else if (DescriptorNumber == DeviceDescriptor.ManufacturerStrIndex) + { + Address = &ManufNameString; + Size = ManufNameString.Header.Size; } break; -- cgit v1.2.3-18-g5258