From 77b40e6bbaa294499256a7958f41459f0c35c986 Mon Sep 17 00:00:00 2001
From: Zach Eveland <zeveland@blacklabel-development.com>
Date: Tue, 10 Jan 2012 17:04:32 -0500
Subject: [PATCH] reenabled HID to force Leonardo bootloader to enumerate as a
 composite device

---
 .../caterina/Caterina-Leonardo.hex            | 226 +++++++++---------
 .../bootloaders/caterina/src/Platform.h       |   2 +-
 2 files changed, 115 insertions(+), 113 deletions(-)

diff --git a/hardware/arduino/bootloaders/caterina/Caterina-Leonardo.hex b/hardware/arduino/bootloaders/caterina/Caterina-Leonardo.hex
index 95ca57b21..c882f7f95 100644
--- a/hardware/arduino/bootloaders/caterina/Caterina-Leonardo.hex
+++ b/hardware/arduino/bootloaders/caterina/Caterina-Leonardo.hex
@@ -1,115 +1,117 @@
-:1078000011241FBECFEFDAE0DEBFCDBFF5C04101CE
+:1078000011241FBECFEFDAE0DEBFCDBF02C14101C0
 :1078100042144505560455026403740300001E9586
-:1078200087020110030000C1808106C0FF0A000C1E
-:10783000A10185037508150026FF00954009018107
-:1078400002954009029102C0040309041A033000A2
-:1078500030003000300030003000300030003100A7
-:1078600037003000310038034100720064007500B9
-:1078700069006E006F0020004C0065006F006E0014
-:107880006100720064006F00200062006F006F00F2
-:1078900074006C006F0061006400650072001803E2
-:1078A000410072006400750069006E006F002000E6
-:1078B0004C004C0043001201000202000040412332
-:1078C000300000010002030109024B0002010080A8
-:1078D00032080B000202020100090400000102024A
-:1078E0000000052400100105240101010424020206
-:1078F000052406000107058103100040090401006A
-:10790000020A00000007050202400000070583028A
-:107910004000000020918A0130918B012C5F3F4F85
-:1079200030938B0120938A01C901892F992786956D
-:10793000982F803418F08FE7891B982F990F921792
-:1079400010F447980895479A08955D9A289A81E01F
-:107950008093E0001092E200EE27FF27099408953B
-:1079600028E088E190E00FB6F894A8958093600035
-:107970000FBE20936000FFCF0F931F93CF93DF9331
-:10798000982FEB01042F10E088E76030780730F47F
-:1079900011E083E0FB0180935700E895892F68E0B0
-:1079A00071E0402F06D1112311F107B600FCFDCF85
-:1079B000402F4695FE01A8E0B1E020E031E009C08B
-:1079C0008D919D910C0130935700E89511243296CA
-:1079D0002F5F2417A8F385E0FE0180935700E895F8
-:1079E00007B600FCFDCF81E180935700E895DF9159
-:1079F000CF911F910F91089584B794B7977F94BF4B
-:107A000098E10FB6F89490936000109260000FBE5A
-:107A10005D9A289A479883FF08C0E0E0F0E08591DE
-:107A200094918F5F9F4F09F090DF3F9A209A559A6B
-:107A300090E8909361001092610081E885BF95BF46
-:107A40009FD084E18093880180E180938901E0E008
-:107A5000F0E0859194918F5F9F4F19F081E08093C2
-:107A60008F01EE24FF24BB24B39454EFC52E51E0C4
-:107A7000D52E0DD2082F8EE098E7FC012491319687
-:107A800002964491201711F02223B9F71092910128
-:107A90001092900182E068E071E08BD0013479F4BB
-:107AA000609108016058633028F0683111F064E09B
-:107AB00001C063E0C62FD0E0CF5DD7480EC00635C9
-:107AC00071F480910801803311F011E022C080919F
-:107AD0000A01C82FD0E0C25ED74811E022C00537A6
-:107AE00021F413E0CEE1D8E71CC0053539F4E0906D
-:107AF0000801F0900901EE0CFF1C0AC0043631F4B5
-:107B000082E0B7014091090137DF02C0043721F05C
-:107B100010E0C5E2D8E705C010910901E701E10EC8
-:107B2000F11CB5D18097B1F483E068E871E041E0E1
-:107B300050E059D0112329F0412F50E083E8BE01D5
-:107B400052D083E469E871E041E050E04CD0013567
-:107B500009F08FCFD0929101C0929001B0928F0125
-:107B6000EE24FF2486CFFC01289884E680938D01C3
-:107B700004C08091F100819361506623D1F708958C
-:107B8000109291011092900110928E0110928F012B
-:107B900081E08093D70080EA8093D80082E189BD9C
-:107BA00009B400FEFDCF80E98093D8001092E00078
-:107BB0000895FB018093E90024E69BE611C08091C3
-:107BC000E80085FFFCCF289820938D018091F1007B
-:107BD00081938091E80085FD02C09093E8004150B8
-:107BE000442369F70895982FFB01282F207287708E
-:107BF0008093E90064E63AE317C08091E80085FFCE
-:107C0000FCCF97FF02C0849101C080813196211181
-:107C100080E05D9860938C018093F1008091E80092
-:107C200085FD02C03093E800415050408FEF4F3F38
-:107C3000580719F796FF03C08AE38093E800089578
-:107C400080919301813299F45D9884E680938C0150
-:107C500020E030E003C080818093F100F901E05022
-:107C6000FF4F2F5F3F4F28303105A9F714C08032F6
-:107C700061F48091E80082FFFCCF80E091E067E052
-:107C800072DF8BEF8093E80006C0823221F480918E
-:107C900094018093070181E00895809195018232DB
-:107CA00019F420E030E024C0813019F426EB38E7E5
-:107CB0001FC0823029F48BE490E028EC38E71BC029
-:107CC000833009F048C080919401882319F428E496
-:107CD00038E70EC0823019F426E638E709C0833051
-:107CE00019F42CE438E704C08130A9F52EE938E70F
-:107CF000F901849190E04091980150919901BC0163
-:107D00004817590708F4BA0190918C0140E050E0FF
-:107D1000AEEF8091E8008570E1F38091E80082FD8C
-:107D200016C0F901E40FF51F4F5F5F4FE4915D98B6
-:107D3000E093F100842F8F7311F4A093E80094E690
-:107D40004617570730F390938C0181E00895909384
-:107D50008C0180E0089580E008951092E900809100
-:107D6000E80083FF61C082E991E068E0FCDE82EF19
-:107D70008093E8008091920187FF05C08091E80020
-:107D800080FFFCCF03C08EEF8093E80080919301C9
-:107D9000853051F48091E80080FFFCCF8091940100
-:107DA00080688093E30039C08930E1F480919401C8
-:107DB00080938E01E7E2F8E791E031E026E39093CB
-:107DC000E9003093EB0084918093EC002093ED0068
-:107DD0009F5F3196943099F78EE78093EA00109276
-:107DE000EA001BC0883049F490918E015D9884E6CA
-:107DF00080938C019093F10010C0882339F45D9832
-:107E000084E680938C011092F10007C0863011F453
-:107E100044DF01C015DF882321F08EEF8093E80056
-:107E2000089581E28093EB0008958091E100109223
-:107E3000E100282F83FF0CC01092E90081E08093BD
-:107E4000EB001092EC0082E38093ED0010928E0123
-:107E500022FF1CC080918C01882331F081508093D7
-:107E60008C01882309F45D9A80918D01882331F07B
-:107E7000815080938D01882309F4289A80918F0185
-:107E8000882321F4109291011092900108951F937C
-:107E9000CF93DF9312E0C0E9D1E05FDFC6DF10933C
-:107EA000E9008091E80085FF13C0289884E680935C
-:107EB0008D019091F1008091E80085FD03C08BE673
-:107EC0008093E800892F90E0DF91CF911F91089572
-:107ED00080919001909191010197909391018093ED
-:107EE00090018091900190919101892B09F438DDE6
-:0A7EF000CE010197F1F70EDDD0CFAF
-:087EFA0000E10000000000009F
+:1078200087020110030000C18081C106C0FF0A0069
+:107830000CA10185037508150026FF00954009017C
+:107840008102954009029102C0040309041A033021
+:1078500000300030003000300030003000300031A7
+:1078600000370030003100380341007200640075B9
+:107870000069006E006F0020004C0065006F006E14
+:10788000006100720064006F00200062006F006FF2
+:107890000074006C006F00610064006500720018E5
+:1078A00003410072006400750069006E006F0020E3
+:1078B000004C004C00430012010002020000404155
+:1078C00023300000010002030109026400030100EB
+:1078D0008032080B000202020100090400000102CC
+:1078E0000200000524001001052401010104240206
+:1078F0000205240600010705810310004009040168
+:1079000000020A000000070502024000000705838C
+:1079100002400000090402000103000000092101E7
+:10792000010001221E000705840340004000209151
+:107930008A0130918B012C5F3F4F30938B01209354
+:107940008A01C901892F99278695982F803418F0CC
+:107950008FE7891B982F990F921710F44798089575
+:10796000479A08955D9A289A81E08093E0001092EA
+:10797000E200EE27FF270994089528E088E190E0CF
+:107980000FB6F894A895809360000FBE2093600016
+:10799000FFCF0F931F93CF93DF93982FEB01042F0B
+:1079A00010E088E76030780730F411E083E0FB01F5
+:1079B00080935700E895892F68E071E0402F06D149
+:1079C000112311F107B600FCFDCF402F4695FE01B3
+:1079D000A8E0B1E020E031E009C08D919D910C015B
+:1079E00030935700E895112432962F5F2417A8F39F
+:1079F00085E0FE0180935700E89507B600FCFDCFB7
+:107A000081E180935700E895DF91CF911F910F910D
+:107A1000089584B794B7977F94BF98E10FB6F89410
+:107A200090936000109260000FBE5D9A289A47986C
+:107A300083FF08C0E0E0F0E0859194918F5F9F4F55
+:107A400009F090DF3F9A209A559A90E89093610050
+:107A50001092610081E885BF95BF9FD084E180933B
+:107A6000880180E180938901E0E0F0E085919491C4
+:107A70008F5F9F4F19F081E080938F01EE24FF24E8
+:107A8000BB24B39454EFC52E51E0D52E10D2082F4D
+:107A90008EE098E7FC0124913196029644912017DC
+:107AA00011F02223B9F7109291011092900182E017
+:107AB00068E071E08BD0013479F46091080160587E
+:107AC000633028F0683111F064E001C063E0C62F34
+:107AD000D0E0CF5DD7480EC0063571F48091080123
+:107AE000803311F011E022C080910A01C82FD0E04C
+:107AF000C25ED74811E022C0053721F413E0CEE181
+:107B0000D8E71CC0053539F4E0900801F090090170
+:107B1000EE0CFF1C0AC0043631F482E0B70140913C
+:107B2000090137DF02C0043721F010E0C5E2D8E7D1
+:107B300005C010910901E701E10EF11CB8D1809751
+:107B4000B1F483E068E871E041E050E059D01123DE
+:107B500029F0412F50E083E8BE0152D083E469E868
+:107B600071E041E050E04CD0013509F08FCFD09268
+:107B70009101C0929001B0928F01EE24FF2486CF34
+:107B8000FC01289884E680938D0104C08091F10067
+:107B9000819361506623D1F708951092910110925C
+:107BA000900110928E0110928F0181E08093D70096
+:107BB00080EA8093D80082E189BD09B400FEFDCF40
+:107BC00080E98093D8001092E0000895FB01809333
+:107BD000E90024E69BE611C08091E80085FFFCCF18
+:107BE000289820938D018091F10081938091E80085
+:107BF00085FD02C09093E8004150442369F7089541
+:107C0000982FFB01282F207287708093E90064E68B
+:107C10003AE317C08091E80085FFFCCF97FF02C0D0
+:107C2000849101C080813196211180E05D9860933C
+:107C30008C018093F1008091E80085FD02C03093B3
+:107C4000E800415050408FEF4F3F580719F796FF1B
+:107C500003C08AE38093E800089580919301813204
+:107C600099F45D9884E680938C0120E030E003C0B5
+:107C700080818093F100F901E050FF4F2F5F3F4F6B
+:107C800028303105A9F714C0803261F48091E800F2
+:107C900082FFFCCF80E091E067E072DF8BEF8093A2
+:107CA000E80006C0823221F480919401809307019C
+:107CB00081E0089580919501823219F1813009F4B3
+:107CC00056C0823029F484E690E029EC38E71DC0E4
+:107CD000833009F04AC080919401882319F429E483
+:107CE00038E747C0823019F427E638E742C08330CE
+:107CF00019F42DE438E73DC08130B9F52FE938E7B4
+:107D000038C082E090E02BE238E740919801509132
+:107D10009901BC014817590708F4BA0190918C01E8
+:107D200040E050E0AEEF8091E8008570E1F3809193
+:107D3000E80082FD16C0F901E40FF51F4F5F5F4FA9
+:107D4000E4915D98E093F100842F8F7311F4A09378
+:107D5000E80094E64617570730F390938C0181E0D2
+:107D6000089590938C0180E0089580E0089527EBBA
+:107D700038E7F901849190E0C8CF1092E900809132
+:107D8000E80083FF61C082E991E068E0F9DE82EFFC
+:107D90008093E8008091920187FF05C08091E80000
+:107DA00080FFFCCF03C08EEF8093E80080919301A9
+:107DB000853051F48091E80080FFFCCF80919401E0
+:107DC00080688093E30039C08930E1F480919401A8
+:107DD00080938E01E7E2F8E791E031E026E39093AB
+:107DE000E9003093EB0084918093EC002093ED0048
+:107DF0009F5F3196953099F78EE78093EA00109255
+:107E0000EA001BC0883049F490918E015D9884E6A9
+:107E100080938C019093F10010C0882339F45D9811
+:107E200084E680938C011092F10007C0863011F433
+:107E300041DF01C012DF882321F08EEF8093E8003C
+:107E4000089581E28093EB0008958091E100109203
+:107E5000E100282F83FF0CC01092E90081E080939D
+:107E6000EB001092EC0082E38093ED0010928E0103
+:107E700022FF1CC080918C01882331F081508093B7
+:107E80008C01882309F45D9A80918D01882331F05B
+:107E9000815080938D01882309F4289A80918F0165
+:107EA000882321F4109291011092900108951F935C
+:107EB000CF93DF9312E0C0E9D1E05FDFC6DF10931C
+:107EC000E9008091E80085FF13C0289884E680933C
+:107ED0008D019091F1008091E80085FD03C08BE653
+:107EE0008093E800892F90E0DF91CF911F91089552
+:107EF00080919001909191010197909391018093CD
+:107F000090018091900190919101892B09F435DDC8
+:0A7F1000CE010197F1F70BDDD0CF91
+:087F1A0000E10000000000007E
 :040000030000780081
 :00000001FF
diff --git a/hardware/arduino/bootloaders/caterina/src/Platform.h b/hardware/arduino/bootloaders/caterina/src/Platform.h
index 9d18e8059..37c26de8a 100644
--- a/hardware/arduino/bootloaders/caterina/src/Platform.h
+++ b/hardware/arduino/bootloaders/caterina/src/Platform.h
@@ -41,7 +41,7 @@ void Program(uint8_t ep, uint16_t page, uint8_t count);
 /* HID is not fully-supported in the bootloader - can be enabled
    for testing, but note the descriptor report and other parts are 
    not complete */
-//#define HID_ENABLED		
+#define HID_ENABLED		
 
 #include "USBCore.h"
 #include "USBDesc.h"