prepared for rumpus-v2 hardware

Author: fd0

Makefile

@@ -69,6 +69,11 @@ fuses-atmega168-unzap:
 	$(AVRDUDE) $(AVRDUDE_FLAGS) -c $(ISP_PROG) -P $(ISP_DEV) -U lfuse:w:0xe7:m -U hfuse:w:0xd5:m -U efuse:w:0x00:m
 	echo "sck 0.2" | $(AVRDUDE) $(AVRDUDE_FLAGS) -c $(ISP_PROG) -P $(ISP_DEV) -F -u -t
 
+fuses-atmega168-rumpus:
+	echo "sck 5" | $(AVRDUDE) $(AVRDUDE_FLAGS) -c $(ISP_PROG) -P $(ISP_DEV) -F -u -t
+	$(AVRDUDE) $(AVRDUDE_FLAGS) -c $(ISP_PROG) -P $(ISP_DEV) -U lfuse:w:0xe7:m -U efuse:w:0x00:m
+	echo "sck 0.2" | $(AVRDUDE) $(AVRDUDE_FLAGS) -c $(ISP_PROG) -P $(ISP_DEV) -F -u -t
+
 bootstrap: fuses-atmega168-unzap install lock
 
 .PHONY: clean clean-$(TARGET) clean-uploadtest

bin/usbload-v0.2-rumpus.elf

@@ -1,129 +1,130 @@
-:103800000C942D1C0C94E31E040309041C03770084
+:103800000C942D1C0C94EC1E040309041C0377007B
 :10381000770077002E00660069007300630068007F
 :103820006C002E00640065000E035500530042003A
 :1038300061007300700012011001FF000008C01643
 :10384000DC050001010200010902120001010080F3
 :103850003209040000000000000011241FBECFEF59
-:10386000D4E0DEBFCDBF11E0A0E0B1E0EEEDFFE3BC
+:10386000D4E0DEBFCDBF11E0A0E0B1E0ECEEFFE3BD
 :1038700002C005900D92A630B107D9F711E0A6E07D
-:10388000B1E001C01D92AA33B107E1F70E945B1CB1
-:103890000C94ED1F0C94001CF89481E085BF15BEBC
+:10388000B1E001C01D92AB33B107E1F70E945B1CB0
+:103890000C94001C0C94001CF89481E085BF15BEAC
 :1038A000E898209828981092690017B81AB818B8A4
 :1038B0001BB80C94000084B78E7F823031F0E0E0BA
-:1038C000F0E0E491EF3F09F063C214BE10921D01D5
-:1038D00080E387B980E188B981E085BF82E085BF58
-:1038E000789480916900836080936900E89AE898F1
-:1038F0002098289820E040E050E0CA010197F1F7B5
-:103900002F5F2632D1F7209A289AE89A02E370E1D5
-:10391000F72E68E2862E68E3962E5CE0652E58E36B
-:10392000752E48E0442E48E3542E38E4232E38E325
-:10393000332E26E3C22E28E3D22E96E0A92E91E064
-:10394000B92E83E0E82E90912001935097FD76C127
-:1039500080911C01ACE0B0E0A81BB109AC5DBE4F8A
-:1039600080911B018D3209F0F5C0983009F064C1D7
-:1039700023EC20930B016AE56093000110920A0189
-:103980003C91832F807611962C911197882309F40E
-:103990006CC0B0921F01A0921E01253021F410923C
-:1039A000060191E0C3C0213011F4459849C022308E
-:1039B00029F4459A81E080931D0142C0233009F02B
-:1039C0003DC010920601109207011092080110925A
-:1039D000090112968C911297803361F41496EC9140
-:1039E0001497F0E0E370F070EE5FFE4F80818093FB
-:1039F00009019BC08C3A09F098C013968C911397DB
-:103A0000803809F092C0109219011092180180E0DC
-:103A100090E00BC007B600FCFDCFF894FC01E092EB
-:103A20005700E895789480589F4FE8E380309E07D0
-:103A300088F3909319018093180177C0243010F413
-:103A400090E074C012968D919C91139790931901F8
-:103A50008093180116968C911697809316012093E7
-:103A60001A0137FD69C02FEF69C012968C91129729
-:103A700010921401222331F41092150124E131E057
-:103A800092E04EC0253019F48093210146C02630C3
-:103A9000A1F513968C911397813029F4D0921F01D0
-:103AA000C0921E0106C0823031F430921F01209274
-:103AB0001E0192E11EC08330D9F412968C911297A8
-:103AC000882331F450921F0140921E0194E011C0EE
-:103AD000813031F470921F0160921E019CE109C097
-:103AE000823031F490921F0180921E019EE001C04D
-:103AF00090E0F0E4F0930A0119C0283019F423E2B1
-:103B000031E009C0293019F48093230106C02A301E
-:103B100021F424E131E091E003C024E131E090E0C0
-:103B200030931F0120931E0101C094E017968C91E1
-:103B30001797882339F00AC016962C9180E8809355
-:103B40000A0105C016962C91291708F0292F2093F9
-:103B5000010172C080910A0187FF6EC08091160139
-:103B6000292F891708F4282F821B80931601809132
-:103B70001A018830F1F4FD0117C0308180911801DD
-:103B80009091190101969093190180931801019762
-:103B9000F999FECF31961FBA92BD81BD30BD0FB6E7
-:103BA000F894FA9AF99A0FBE8E2F8A1B821728F37F
-:103BB0003AC0522F5695515040E0F8942091180188
-:103BC000309119018D919D9161E00C01F901609393
-:103BD0005700E89511247894B9016E5F7F4F862FC6
-:103BE00090E08F779070892B31F0809116018823B7
-:103BF00091F4451781F4F89485E0F901809357001A
-:103C0000E895789407B600FCFDCFF894E1E1E093E5
-:103C10005700E895789470931901609318014F5FED
-:103C2000541708F0CACF88B18F2588B98091160142
-:103C3000882311F41092010110922001809100015B
-:103C400084FF86C0809101018F3F09F481C0182F45
-:103C5000893008F018E0811B8093010180910B01ED
-:103C600098E8892780930B01112309F45EC08091A5
-:103C70000A0187FF34C080911601811708F4182FBC
-:103C8000811B80931601ACE0B1E0412F50E04A0F58
-:103C90005B1F1CC080911A012091180130911901FD
-:103CA000873039F4F999FECF32BD21BDF89A80B53D
-:103CB00002C0F90184918C93119680911801909122
-:103CC000190101969093190180931801A417B50763
-:103CD00009F788B18F2588B91930A0F526C0209141
-:103CE0001E0130911F0186FF0DC0ACE0B1E080E005
-:103CF00090E0F901E80FF91FE491ED930196181790
-:103D0000C1F708C0D901912FECE0F1E08D918193CA
-:103D10009150E1F71150812F90E01F5F0196820FC3
-:103D2000931F90931F0180931E01612F8CE091E0FF
-:103D30000E94DF1E612F6C5F6C3041F08FEF80932B
-:103D4000010104C08FEF809301016EE160930001D7
-:103D50009AE089B1847131F49150D9F71092210120
-:103D600010921701219621F488B18F2588B901504E
-:103D700080911D01882341F4002309F0E4CD809156
-:103D80001701882309F0DFCD80E090E00197F1F77B
-:103D90000E944C1CA82FB92F80E090E041E050EA2F
-:103DA00060956F5F58F42D9138EF8227979587952E
-:103DB00010F0842795273F5FC8F3F3CF0895EADF1B
-:103DC0008D939D930895CF93CFB7CF93DF934C9B63
-:103DD000FECF4C9B11C04C9B0FC04C9B0DC04C9B0D
-:103DE0000BC04C9B09C04C9B07C04C9B05C04C9B17
-:103DF00003C04C9B01C081C06F93C0911C01DD27A3
-:103E0000CC5DDE4F2F9320E400C065E04C9B03C0E7
-:103E10002F916F91DECF0F931F934F9345E55F93E3
-:103E200055E53F933BE014E009B104712EC06A955B
-:103E3000C9F03150D8F109B1047101130BC00894D5
-:103E40002795299320E4555500F46A9569F701E018
-:103E500069B10BC0102F66E02695299320E45555D3
-:103E600018F3E2CF0FEF69B10000162F455500F0AF
-:103E7000404066E014710030E2F221F0000009B128
-:103E8000047103C009B10471A9F0011309C00894B9
-:103E9000279568F200C06A95A9F700E069B1E5CFFF
-:103EA000102F66E0269528F20000ECCF11E01CBB35
-:103EB000002717C03B503195C31BD04011E01CBBFD
-:103EC0000881033CF9F00B34E9F0209117011981C6
-:103ED000110F1213EDCF093651F10D3211F0013EE1
-:103EE00039F7009322013F915F914F911F910F91FC
-:103EF0002F916F91CCB3C0FD6ACFDF91CF91CFBF2F
-:103F0000CF91189500912201002369F310912001AF
-:103F1000112329F534302AF13093200100931B013D
-:103F200010911C013BE0311B30931C011AC0009121
-:103F300020010130A4F40AE53091000134FD12C0E3
-:103F400000930001CBE0D1E011C0052710E000C0D4
-:103F50000BB919C0052710E0221F00C01DC04AE59B
-:103F600002C032ED432FC4E1D0E032E01AB1146157
-:103F70005C9A0BB11AB954E120E869E420FF0527E7
-:103F80000BB92795179500C000001C3FF0F6669509
-:103F9000A8F7A1F720FF05270BB927951795000073
-:103FA0001C3FC0F629913A9541F70B7E10912101F3
-:103FB000110F0BB9C651D04011F01093170111E049
-:103FC0001CBB00611AB11B7E402F4B7E55E05A95F9
-:0E3FD000F1F70BB91AB94BB986CFF894FFCFB1
-:063FDE005AFF1E940600CC
+:1038C000F0E0E491EF3F09F06CC214BE10921D01CC
+:1038D00080E187B988B988E08AB981E085BF82E054
+:1038E00085BF789480916900836080936900E89A2D
+:1038F000E8982098289820E040E050E0CA0101971D
+:10390000F1F72F5F2632D1F7209A289AE89A82E3BE
+:1039100080931E016CE0262E312C00E158E2652ECA
+:1039200058E3752E4CE0442E48E3542E38E0E32E45
+:1039300038E3F32E28E4C22E28E3D22E96E3A92EF4
+:1039400098E3B92E86E0882E81E0982E909121018F
+:10395000935097FD79C180911C01D101A81BB10939
+:10396000AB5DBE4F80911B018D3209F0F9C09830DC
+:1039700009F068C123EC20930B016AE56093000114
+:1039800010920A013C91832F807611962C91119709
+:10399000882309F470C09092200180921F01253085
+:1039A00039F4109206018FEF80931E0191E0C4C09C
+:1039B000213011F45B9A4AC0223029F45B9881E0EF
+:1039C00080931D0143C0233009F03EC010920601D0
+:1039D00010920701109208011092090112968C9121
+:1039E0001297803361F41496EC911497F0E0E37031
+:1039F000F070EE5FFE4F8081809309019CC08C3A8D
+:103A000009F099C013968C911397803809F093C0F0
+:103A1000109219011092180180E090E00CC007B6D6
+:103A200000FCFDCFF89423E0FC0120935700E895BB
+:103A3000789480589F4F68E38030960780F3909386
+:103A400019018093180177C0243010F490E074C0FD
+:103A500012968D919C911397909319018093180160
+:103A600016968C9116978093160120931A0137FDB4
+:103A700069C02FEF69C012968C91129710921401B1
+:103A8000222331F41092150124E131E092E04EC07E
+:103A9000253019F48093220146C02630A1F51396F3
+:103AA0008C911397813029F4B0922001A0921F01CC
+:103AB00006C0823031F4D0922001C0921F0192E101
+:103AC0001EC08330D9F412968C911297882331F45A
+:103AD000F0922001E0921F0194E011C0813031F496
+:103AE0005092200140921F019CE109C0823031F4C4
+:103AF0007092200160921F019EE001C090E080E47E
+:103B000080930A0119C0283019F424E231E009C079
+:103B1000293019F48093240106C02A3021F424E1CD
+:103B200031E091E003C024E131E090E030932001E6
+:103B300020931F0101C094E017968C91179788235A
+:103B400039F00AC016962C9180E880930A0105C0CE
+:103B500016962C91291708F0292F2093010172C085
+:103B600080910A0187FF6EC080911601292F891765
+:103B700008F4282F821B8093160180911A01883047
+:103B8000F1F4FD0117C03081809118019091190165
+:103B9000019690931901809318010197F999FECF2E
+:103BA00031961FBA92BD81BD30BD0FB6F894FA9A16
+:103BB000F99A0FBE8E2F8A1B821728F33AC0522F14
+:103BC0005695515040E0F894209118013091190118
+:103BD0008D919D9161E00C01F90160935700E8958A
+:103BE00011247894B9016E5F7F4F862F90E08F7714
+:103BF0009070892B31F080911601882391F445173C
+:103C000081F4F89485E0F90180935700E895789461
+:103C100007B600FCFDCFF894E1E1E0935700E8958A
+:103C2000789470931901609318014F5F541708F04E
+:103C3000CACF88B1802788B980911601882311F4F2
+:103C400010920101109221018091000184FF86C031
+:103C5000809101018F3F09F481C0182F893008F04D
+:103C600018E0811B8093010180910B0198E889275E
+:103C700080930B01112309F45EC080910A0187FF34
+:103C800034C080911601811708F4182F811B80938E
+:103C90001601ACE0B1E0412F50E04A0F5B1F1CC0A1
+:103CA00080911A012091180130911901873039F45F
+:103CB000F999FECF32BD21BDF89A80B502C0F90155
+:103CC00084918C931196809118019091190101961D
+:103CD0009093190180931801A417B50709F788B1CB
+:103CE000802788B91930A0F526C020911F01309196
+:103CF000200186FF0DC0ACE0B1E080E090E0F9016A
+:103D0000E80FF91FE491ED9301961817C1F708C069
+:103D1000D901912FECE0F1E08D9181939150E1F781
+:103D20001150812F90E01F5F0196820F931F909397
+:103D3000200180931F01612F8CE091E00E94E81E1A
+:103D4000612F6C5F6C3041F08FEF8093010104C0F4
+:103D50008FEF809301016EE1609300019AE089B1D9
+:103D6000847131F49150D9F7109222011092170109
+:103D7000219651F488B1802788B980911E018F3F28
+:103D800019F0815080931E0180911D01882329F430
+:103D900080911E01882309F0D9CD80E090E0019741
+:103DA000F1F70E944C1CA82FB92F80E090E041E071
+:103DB00050EA60956F5F58F42D9138EF8227979500
+:103DC000879510F0842795273F5FC8F3F3CF0895B8
+:103DD000EADF8D939D930895CF93CFB7CF93DF9371
+:103DE0004C9BFECF4C9B11C04C9B0FC04C9B0DC0FD
+:103DF0004C9B0BC04C9B09C04C9B07C04C9B05C007
+:103E00004C9B03C04C9B01C081C06F93C0911C01AF
+:103E1000DD27CB5DDE4F2F9320E400C065E04C9B97
+:103E200003C02F916F91DECF0F931F934F9345E502
+:103E30005F9355E53F933BE014E009B104712EC058
+:103E40006A95C9F03150D8F109B1047101130BC062
+:103E500008942795299320E4555500F46A9569F74D
+:103E600001E069B10BC0102F66E02695299320E48C
+:103E7000555518F3E2CF0FEF69B10000162F4555E5
+:103E800000F0404066E014710030E2F221F00000E2
+:103E900009B1047103C009B10471A9F0011309C08B
+:103EA0000894279568F200C06A95A9F700E069B107
+:103EB000E5CF102F66E0269528F20000ECCF11E048
+:103EC0001CBB002717C03B503195C31BD04011E0ED
+:103ED0001CBB0881033CF9F00B34E9F02091170179
+:103EE0001981110F1213EDCF093651F10D3211F076
+:103EF000013E39F7009323013F915F914F911F914C
+:103F00000F912F916F91CCB3C0FD6ACFDF91CF910C
+:103F1000CFBFCF91189500912301002369F3109131
+:103F20002101112329F534302AF130932101009326
+:103F30001B0110911C013BE0311B30931C011AC086
+:103F4000009121010130A4F40AE53091000134FD13
+:103F500012C000930001CBE0D1E011C0052710E0B2
+:103F600000C00BB919C0052710E0221F00C01DC0FA
+:103F70004AE502C032ED432FC4E1D0E032E01AB18D
+:103F800014615C9A0BB11AB954E120E869E420FF8E
+:103F900005270BB92795179500C000001C3FF0F6C8
+:103FA0006695A8F7A1F720FF05270BB92795179568
+:103FB00000001C3FC0F629913A9541F70B7E109105
+:103FC0002201110F0BB9C651D04011F01093170107
+:103FD00011E01CBB00611AB11B7E402F4B7E55E0E7
+:0C3FE0005A95F1F70BB91AB94BB986CF0E
+:063FEC005AFF1E940600BE
 :0400000300003800C1
 :00000001FF

bin/usbload-v0.2-rumpus.hex

@@ -145,10 +145,10 @@ usbMsgLen_t usbFunctionSetup(uchar data[8])
         timeout = 255;
     } else if (req->bRequest == USBASP_FUNC_CONNECT) {
         /* turn on led */
-        PORTC &= ~_BV(PC5);
+        PORTD |= _BV(PD3);
     } else if (req->bRequest == USBASP_FUNC_DISCONNECT) {
         /* turn off led */
-        PORTC |= _BV(PC5);
+        PORTD &= ~_BV(PD3);
         request_exit = 1;
     /* catch query for the devicecode, chip erase and eeprom byte requests */
     } else if (req->bRequest == USBASP_FUNC_TRANSMIT) {
@@ -338,8 +338,9 @@ int __attribute__ ((noreturn,OS_main)) main(void)
     request_exit = 0;
 
     /* init led pins (led1 and led2) */
-    DDRC = _BV(PC4) | _BV(PC5);
+    DDRC = _BV(PC4);
     PORTC = _BV(PC4);
+    DDRD = _BV(PD3);
 
     /* move interrupts to boot section */
     MCUCR = (1 << IVCE);