aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Eveland <zeveland@blacklabel-development.com>2011-09-08 15:40:41 -0400
committerZach Eveland <zeveland@blacklabel-development.com>2011-09-08 15:40:41 -0400
commit07e58f22c0faa88fb2d7b72360b74a4edf367ed4 (patch)
tree605320a9b041f26770cc4fd033fd907de1979d13
parent6cca25b8c43c123218bf67c66997df5d00e8523d (diff)
Revert "added Micro section to boards.txt. specified different bootloader hex files for Leonardo and Micro (differ only by PID). added PID entries to boards.txt"
This reverts commit 3b5122e13837eede7c10acf484efdee4d03e802d.
-rw-r--r--boards.txt22
-rw-r--r--bootloaders/diskloader/DiskLoader-Micro.hex100
-rw-r--r--bootloaders/diskloader/DiskLoader.hex (renamed from bootloaders/diskloader/DiskLoader-Leonardo.hex)4
3 files changed, 3 insertions, 123 deletions
diff --git a/boards.txt b/boards.txt
index 92c621b..10a74f1 100644
--- a/boards.txt
+++ b/boards.txt
@@ -8,33 +8,13 @@ leonardo.bootloader.low_fuses=0xde
leonardo.bootloader.high_fuses=0xd8
leonardo.bootloader.extended_fuses=0xf3
leonardo.bootloader.path=diskloader
-leonardo.bootloader.file=DiskLoader-Leonardo.hex
+leonardo.bootloader.file=DiskLoader.hex
leonardo.bootloader.unlock_bits=0x3F
leonardo.bootloader.lock_bits=0x0F
leonardo.build.mcu=atmega32u4
leonardo.build.f_cpu=16000000L
leonardo.build.core=arduino
leonardo.build.variant=leonardo
-leonardo.usb.pid=0x0034
-
-##############################################################
-
-micro.name=Arduino Micro
-micro.upload.protocol=arduino
-micro.upload.maximum_size=30720
-micro.upload.speed=1200
-micro.bootloader.low_fuses=0xde
-micro.bootloader.high_fuses=0xd8
-micro.bootloader.extended_fuses=0xf3
-micro.bootloader.path=diskloader
-micro.bootloader.file=DiskLoader-Micro.hex
-micro.bootloader.unlock_bits=0x3F
-micro.bootloader.lock_bits=0x0F
-micro.build.mcu=atmega32u4
-micro.build.f_cpu=16000000L
-micro.build.core=arduino
-micro.build.variant=leonardo
-micro.usb.pid=0x0035
##############################################################
diff --git a/bootloaders/diskloader/DiskLoader-Micro.hex b/bootloaders/diskloader/DiskLoader-Micro.hex
deleted file mode 100644
index dfcd4fe..0000000
--- a/bootloaders/diskloader/DiskLoader-Micro.hex
+++ /dev/null
@@ -1,100 +0,0 @@
-:1078000011241FBECFEFDAE0DEBFCDBFC3C0410100
-:1078100042144505560455026403740300001E9586
-:1078200087020110030000C18081C106C0FF0A0069
-:107830000CA10185037508150026FF00954009017C
-:107840008102954009029102C0040309041201005B
-:107850000202000040412335000001000001011236
-:10786000010002000000404123350000010000013A
-:1078700001090264000301008032080B00020202C9
-:1078800001000904000001020200000524001001AB
-:107890000524010101042402020524060001070554
-:1078A000810310004009040100020A0000000705DE
-:1078B00002024000000705830240000009040200A4
-:1078C0000103000000092101010001221E0007053B
-:1078D00084034000400020918A0130918B012F5F8A
-:1078E0003F4F30938B0120938A01832F9927982F44
-:1078F00087FD9095990F921710F447980895479A2D
-:10790000089581E08093E0001092E200EE27FF27C7
-:10791000099408950F931F93CF93DF93982FEB0152
-:10792000042F10E088E76030780730F411E083E03E
-:10793000FB0180935700E895892F68E071E0402FA4
-:10794000E2D0112311F107B600FCFDCF402F469580
-:10795000FE01A8E0B1E020E031E009C08D919D91E9
-:107960000C0130935700E895112432962F5F2417AD
-:10797000A8F385E0FE0180935700E89507B600FC68
-:10798000FDCF81E180935700E895DF91CF911F9162
-:107990000F910895769A289A47983F9A209A6E9A5E
-:1079A00090E8909361001092610081E885BF95BFD7
-:1079B00091D084E18093880180E180938901E0E0A7
-:1079C000F0E0859194918F5F9F4F19F081E0809353
-:1079D0008D01EE24FF24BB24B39421E0C22ED12CD0
-:1079E000DBD1082F8EE098E7FC01249131960296B6
-:1079F0004491201711F02223B9F710928F011092B1
-:107A00008E0182E068E071E07ED0013479F460910B
-:107A100008016058633028F0683111F064E001C05B
-:107A200063E0C62FD0E0CF5DD7480EC0063571F4B5
-:107A300080910801803311F011E022C080910A0189
-:107A4000C82FD0E0C25ED74811E022C0053721F42C
-:107A500013E0CEE1D8E71CC0053539F4E090080109
-:107A6000F0900901EE0CFF1C0AC0043631F482E0EC
-:107A7000B701409109014EDF02C0043721F010E048
-:107A8000C5E2D8E705C010910901E701E10EF11C3C
-:107A900083D18097B1F483E068E871E041E050E081
-:107AA00049D0112329F0412F50E083E8BE0142D094
-:107AB00083E469E871E041E050E03CD0013509F031
-:107AC0008FCFD0928F01C0928E01B0928D01EE24A3
-:107AD000FF2486CF10928F0110928E0110928C019C
-:107AE00010928D0181E08093D70080EA8093D800C6
-:107AF00082E189BD09B400FEFDCF80E98093D80002
-:107B00001092E0000895FB018093E9009BE60FC00E
-:107B10008091E80085FFFCCF28988091F100819347
-:107B20008091E80085FD02C09093E8004150442315
-:107B300079F70895982FFB01282F20728770809382
-:107B4000E9003AE315C08091E80085FFFCCF97FF7C
-:107B500002C0849101C080813196211180E0769825
-:107B60008093F1008091E80085FD02C03093E80029
-:107B7000415050408FEF4F3F580729F796FF03C001
-:107B80008AE38093E800089580919101813281F425
-:107B9000769820E030E003C080818093F100F90105
-:107BA000E050FF4F2F5F3F4F28303105A9F71FC02E
-:107BB0008032B9F48091E80082FFFCCF289820E061
-:107BC00030E003C08091F1008083F901E050FF4F65
-:107BD0002F5F3F4F28303105A9F78BEF8093E800E6
-:107BE00006C0823221F4809192018093070181E0E6
-:107BF000089520919301223201F1213079F480918E
-:107C0000960190919701089711F420939801809123
-:107C100098018823B1F5EFE5F8E735C0223021F46B
-:107C200084E6E1E7F8E70CC0233049F58091920142
-:107C3000882329F5E9E4F8E726C081E0EBE2F8E7DC
-:107C400090919601282F981708F4292F90E03EEF85
-:107C50008091E8008570E1F38091E80082FD0FC01B
-:107C60009F5F849176988093F100892F8F7311F430
-:107C70003093E8003196921758F381E0089580E040
-:107C80000895EDE4F8E78491DBCF1092E90080914C
-:107C9000E80083FF62C02898E0E9F1E003C080912A
-:107CA000F100819381E0E839F807C9F782EF80930A
-:107CB000E8008091900187FF05C08091E80080FF77
-:107CC000FCCF03C08EEF8093E80080919101853056
-:107CD00051F48091E80080FFFCCF80919201806890
-:107CE0008093E30033C08930E1F480919201809366
-:107CF0008C01E7E2F8E791E031E026E39093E900B8
-:107D00003093EB0084918093EC002093ED009F5F13
-:107D10003196953099F78EE78093EA001092EA0049
-:107D200015C0883031F480918C0176988093F100F1
-:107D30000DC0882321F476981092F10007C0863098
-:107D400011F457DF01C020DF882321F08EEF8093EC
-:107D5000E800089581E28093EB0008958091E100AE
-:107D60001092E100282F83FF0CC01092E90081E0FF
-:107D70008093EB001092EC0082E38093ED00109270
-:107D80008C0122FF08C080918D01882321F410927C
-:107D90008F0110928E0108951F9312E076DFDEDFCF
-:107DA0001093E9008091E80085FF0EC0289890911B
-:107DB000F1008091E80085FD03C08BE68093E80028
-:107DC000892F90E01F91089584E6000000000000D4
-:107DD00000008150D1F7289A769A80918E01909177
-:107DE0008F01019790938F0180938E0180918E0176
-:107DF00090918F01892B19F4769A289A82DD6BDD98
-:027E0000CDCFE4
-:087E020000E100000000000097
-:040000030000780081
-:00000001FF
diff --git a/bootloaders/diskloader/DiskLoader-Leonardo.hex b/bootloaders/diskloader/DiskLoader.hex
index dfcd4fe..7ca0c74 100644
--- a/bootloaders/diskloader/DiskLoader-Leonardo.hex
+++ b/bootloaders/diskloader/DiskLoader.hex
@@ -3,8 +3,8 @@
:1078200087020110030000C18081C106C0FF0A0069
:107830000CA10185037508150026FF00954009017C
:107840008102954009029102C0040309041201005B
-:107850000202000040412335000001000001011236
-:10786000010002000000404123350000010000013A
+:107850000202000040412334000001000001011237
+:10786000010002000000404123340000010000013B
:1078700001090264000301008032080B00020202C9
:1078800001000904000001020200000524001001AB
:107890000524010101042402020524060001070554