From 35bbf80ba955bee9e432d4b2e11d479979599568 Mon Sep 17 00:00:00 2001
From: Zach Eveland <zeveland@blacklabel-development.com>
Date: Wed, 8 Feb 2012 01:16:56 -0500
Subject: adjusting descriptors - trying to prevent sketch and bootloader from
 grabbing different COM numbers on Windows

---
 bootloaders/caterina_LUFA/Caterina.hex  | 261 ++++++++++++++++----------------
 bootloaders/caterina_LUFA/Descriptors.c |   4 +-
 2 files changed, 132 insertions(+), 133 deletions(-)

(limited to 'bootloaders/caterina_LUFA')

diff --git a/bootloaders/caterina_LUFA/Caterina.hex b/bootloaders/caterina_LUFA/Caterina.hex
index fe12ee3..6835265 100644
--- a/bootloaders/caterina_LUFA/Caterina.hex
+++ b/bootloaders/caterina_LUFA/Caterina.hex
@@ -1,6 +1,6 @@
 :1070000055C000006EC000006CC000006AC00000E7
 :1070100068C0000066C0000064C0000062C00000DC
-:1070200060C000005EC00000CBC400005AC0000079
+:1070200060C000005EC00000C4C400005AC0000080
 :1070300058C0000056C0000054C0000052C00000FC
 :1070400050C0000078C000004CC000004AC00000E2
 :1070500048C0000046C0000044C0000042C000001C
@@ -9,10 +9,10 @@
 :1070800030C000002EC000002CC000002AC000004C
 :1070900028C0000026C0000024C0000022C000005C
 :1070A00020C000001EC000001CC0000011241FBE34
-:1070B000CFEFDAE0DEBFCDBF11E0A0E0B1E0E4EE5B
+:1070B000CFEFDAE0DEBFCDBF11E0A0E0B1E0E6ED5A
 :1070C000FEE702C005900D92A03CB107D9F711E090
 :1070D000A0ECB1E001C01D92A63DB107E1F78ED34F
-:1070E000FFC68ECFF89410926F001092810010921C
+:1070E000F8C68ECFF89410926F0010928100109223
 :1070F00085001092840081E085BF15BE47985D9A97
 :10710000289A0C94000008952091CA013091CB0177
 :107110002F5F3F4F3093CB012093CA01932F37FF4E
@@ -66,7 +66,7 @@
 :10741000FF29E4918E2FEBDEDD2081F082E090E009
 :10742000A0E0B0E0E80EF91E0A1F1B1FE092C601A3
 :10743000F092C7010093C8011093C901DC2418C061
-:10744000D801C701B695A7959795879533D5CFDE17
+:10744000D801C701B695A795979587952CD5CFDE1E
 :1074500082E090E0A0E0B0E0E80EF91E0A1F1B1FDA
 :10746000E092C601F092C7010093C8011093C901D0
 :107470002197209709F0BECF7DC08090C6019090E3
@@ -80,7 +80,7 @@
 :1074F0000093C8011093C90102C061DE582E7424A4
 :1075000023C0E090C601F090C7010091C80110911E
 :10751000C90116950795F794E79451DE682FC701C6
-:10752000D1D48091C6019091C701A091C801B091BA
+:10752000CAD48091C6019091C701A091C801B091C1
 :10753000C9010296A11DB11D8093C6019093C70198
 :10754000A093C801B093C901219704C055247724A2
 :1075500044244394209709F0A5CF96E4691641F49A
@@ -97,12 +97,12 @@
 :107600003DCE823551F4E091C601F091C70105915C
 :107610001491812FECDD802F4CC0843421F5E09053
 :10762000C601F090C7010091C8011091C9011695DB
-:107630000795F794E794C3DD682FC70143D4809181
+:107630000795F794E794C3DD682FC7013CD4809188
 :10764000C6019091C701A091C801B091C9010296ED
 :10765000A11DB11D8093C6019093C701A093C801DD
 :10766000B093C9010BCE843609F5E090C601F090C5
 :10767000C7010091C8011091C901D801C701B69591
-:10768000A7959795879516D4B2DD82E090E0A0E0AB
+:10768000A795979587950FD4B2DD82E090E0A0E0B2
 :10769000B0E0E80EF91E0A1F1B1FE092C601F0922F
 :1076A000C7010093C8011093C90104C08B3111F0C8
 :1076B0008FE39DDD83E08093E9009091E800809165
@@ -115,139 +115,138 @@
 :107720006F905F904F9008959091CE01892F8F7741
 :10773000813249F58091CF018032A1F0813219F573
 :10774000913A09F58091E800877F8093E8008AE00C
-:1077500091E067E070E0E5D18091E8008B7780935D
+:1077500091E067E070E0DED18091E8008B77809364
 :10776000E8000895913279F48091E800877F809352
-:10777000E8008AE091E067E070E037D28091E800AD
-:107780008E778093E800089582E061EC42E08FD02C
-:1077900083E061E842E18BD084E060E842E187C0A9
+:10777000E8008AE091E067E070E030D28091E800B4
+:107780008E778093E800089582E061EC42E088D033
+:1077900083E061E842E184D084E060E842E180C0B7
 :1077A00084B7877F84BF88E10FB6F8948093600028
 :1077B000109260000FBE20E880E090E00FB6F894D1
 :1077C00020936100809361000FBE81E085BF92E04D
 :1077D00095BF3F9A209A559AE1E6F0E02083108207
 :1077E00047985D9A289A109289008AEF80938800C2
-:1077F00090936F0083E080938100CAC088E10FB648
+:1077F00090936F0083E080938100C3C088E10FB64F
 :10780000F89480936000109260000FBEC9DF7894F6
-:107810000CC00CDD3DD38091C4019091C50181580D
+:107810000CC00CDD36D38091C4019091C501815814
 :107820009E4310F0109209016FDC809109018823BA
 :1078300081F78091E00081608093E00053DC80E07C
 :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
+:10785000F9F481E191E022E130E01EC083E291E0A1
+:107860002EE330E019C0882329F481E691E024E07A
+:1078700030E012C0813029F485E691E022E230E068
+:107880000BC0823029F485EA91E028E130E004C0A1
+:1078900080E090E020E030E091838083C90108958A
+:1078A0008093E9008091EB0081608093EB0010925F
+:1078B000ED006093EC004093ED008091EE00881F96
+:1078C0008827881F08958091CE0188238CF403C0F7
+:1078D0008EB38823B1F08091E80082FFF9CF8091C8
+:1078E000E8008B778093E80008958EB3882349F0F1
+:1078F0008091E80080FFF9CF8091E8008E77809337
+:10790000E8000895EF92FF920F931F9345D04CD05B
+:1079100008ED10E0F80180818F7780838081806896
+:10792000808380818F7D808319BC1EBA1092CC0128
+:1079300080EEE82EF12CF70180818B7F8083F801A7
+:1079400080818160808380E060E042E0A9DFE1EE39
+:10795000F0E080818E7F8083E2EEF0E080818160C4
+:107960008083808188608083F70180818E7F80831F
+:10797000F8018081806180831F910F91FF90EF90CB
+:107980000895E7EDF0E08081816080838AE482BF22
+:1079900081E08093CD01B6CFE8EDF0E080818E7F6D
+:1079A00080831092E20008951092DA001092E100B4
+:1079B00008951F920F920FB60F9211242F933F93A9
+:1079C0004F935F936F937F938F939F93AF93BF93E7
+:1079D000EF93FF938091DA0080FF1BC08091D80065
+:1079E00080FF17C08091DA008E7F8093DA0080914B
+:1079F000D90080FF0BC080E189BD82E189BD09B457
+:107A000000FEFDCF81E08EBB3BD203C019BC1EBA85
+:107A100037D28091E10080FF17C08091E20080FFA3
+:107A200013C08091E2008E7F8093E2008091E2009B
+:107A300080618093E2008091D80080628093D800BA
+:107A400019BC85E08EBB1CD28091E10084FF2CC064
+:107A50008091E20084FF28C080E189BD82E189BD78
+:107A600009B400FEFDCF8091D8008F7D8093D800AF
+:107A70008091E1008F7E8093E1008091E2008F7E13
+:107A80008093E2008091E20081608093E200809127
+:107A9000CC01882331F48091E30087FD02C081E0AE
+:107AA00001C084E08EBBECD18091E10083FF21C056
+:107AB0008091E20083FF1DC08091E100877F809369
+:107AC000E10082E08EBB1092CC018091E1008E7FBC
+:107AD0008093E1008091E2008E7F8093E2008091AC
+:107AE000E20080618093E20080E060E042E0D8DE66
+:107AF000C7D1FF91EF91BF91AF919F918F917F91EE
+:107B00006F915F914F913F912F910F900FBE0F900A
+:107B10001F9018959C014091D4015091D5014617B2
+:107B2000570718F4F90190E044C06115710511F090
+:107B3000AB01F8CF8091E8008E778093E80040E0B9
+:107B400050E0F0CF8EB3882309F444C0853009F4A7
+:107B500043C08091E80083FF02C081E008958091D6
+:107B6000E80082FD31C08091E80080FF22C0809152
+:107B7000F3009091F200782F60E0292F30E0262B5F
+:107B8000372B07C081918093F100415050402F5F07
+:107B90003F4F4115510519F02830310598F390E019
+:107BA0002830310509F491E08091E8008E778093C8
+:107BB000E8004115510531F6992321F605C08EB331
+:107BC000882341F0853041F08091E80082FFF7CFB3
+:107BD00080E0089582E0089583E008959C01611596
+:107BE000710529F48091E8008B778093E800F90112
+:107BF00026C08EB3882391F1853091F18091E80001
+:107C000083FF02C081E008958091E80082FFF1CFF8
+:107C100006C08091F10081936150704059F020912D
+:107C2000F3008091F200322F20E090E0822B932B22
+:107C3000892B79F78091E8008B778093E8006115B4
+:107C40007105B9F605C08EB3882341F0853041F047
+:107C50008091E80080FFF7CF80E0089582E00895EA
+:107C600083E008950F931F93DF93CF9300D0CDB798
+:107C7000DEB7EEECF1E08091F100819381E0E63D2A
+:107C8000F807C9F751DD8091E80083FFE4C08091D7
+:107C9000CE019091CF01953009F46DC0963040F43B
+:107CA000913081F1913070F0933009F0D4C02AC046
+:107CB000983009F4A3C0993009F4B2C0963009F0A5
+:107CC000CAC07CC0803809F4C6C0823809F0C3C07D
+:107CD0008091D20187708093E9008091EB0010922F
+:107CE000E9002091E800277F2093E80090E025E05C
+:107CF000969587952A95E1F781708093F10010920F
+:107D0000F10087C0882319F0823009F0A4C08F7178
+:107D1000823009F0A0C08091D001882331F52091F4
+:107D2000D201277009F497C02093E9008091EB00FD
+:107D300080FF1BC0933021F48091EB00806213C060
+:107D40008091EB0080618093EB0081E090E002C0C5
+:107D5000880F991F2A95E2F78093EA001092EA00B3
+:107D60008091EB0088608093EB001092E900809195
+:107D7000E800877F51C0882309F06DC01091D001C1
+:107D80001F770FB7F8948091E800877F8093E80011
+:107D90009ADD8091E80080FFFCCF8091E30080783D
+:107DA000812B8093E30080688093E300112311F41A
+:107DB00082E001C083E08EBB0FBF4DC0805882308F
+:107DC00008F049C08091D0019091D1016091D20119
+:107DD000AE014F5F5F4F36DDBC01009709F43BC039
+:107DE0008091E800877F8093E80089819A8192DE04
+:107DF0008091E8008B778093E8002DC0803859F59A
+:107E00008091E800877F8093E8008091CC01809387
+:107E1000F1008091E8008E778093E80054DD1BC06C
+:107E20008823C9F49091D0019230A8F48091E800A1
+:107E3000877F8093E8009093CC0145DD8091CC0151
+:107E4000882331F48091E30087FD02C081E001C006
+:107E500084E08EBB99DC8091E80083FF0AC08091AA
+:107E6000EB0080628093EB008091E800877F809335
+:107E7000E8000F900F90CF91DF911F910F9108951F
+:107E800008951F938EB3882361F01091E90010923A
+:107E9000E9008091E80083FF01C0E4DE17701093D1
+:107EA000E9001F910895F999FECF92BD81BDF89A1E
+:107EB000992780B50895262FF999FECF1FBA92BD54
+:107EC00081BD20BD0FB6F894FA9AF99A0FBE0196BB
+:067ED0000895F894FFCFB5
+:107ED6004341544552494E41000100000000000054
+:107EE60008120110010200000841230230010002BD
+:107EF60001000109023E000201008032090400006F
+:107F060001020201000524001001042402040524D4
+:107F1600060001070582030800FF09040100020AA2
+:107F26000000000705040210000107058302100087
+:107F3600010403090422034100720064007500690C
+:107F4600006E006F0020004C0065006F006E00613F
+:107F560000720064006F0000001A03300030003029
+:107F66000030003000300030003000310034003581
+:107F760000320000001803410072006400750069B9
+:107F8600006E006F0020004C004C00430000000013
 :040000030000700089
 :00000001FF
diff --git a/bootloaders/caterina_LUFA/Descriptors.c b/bootloaders/caterina_LUFA/Descriptors.c
index fb376c1..50b595a 100755
--- a/bootloaders/caterina_LUFA/Descriptors.c
+++ b/bootloaders/caterina_LUFA/Descriptors.c
@@ -54,12 +54,12 @@ const USB_Descriptor_Device_t DeviceDescriptor =
 	.Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,
 
 	.VendorID               = 0x2341,
-	.ProductID              = 0x3000,
+	.ProductID              = 0x3002,
 	.ReleaseNumber          = VERSION_BCD(00.01),
 
 	.ManufacturerStrIndex   = 0x02,
 	.ProductStrIndex        = 0x01,
-	.SerialNumStrIndex      = 0x03,
+	.SerialNumStrIndex      = NO_DESCRIPTOR,
 
 	.NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
 };
-- 
cgit v1.2.3-18-g5258