Skip to content

Commit d9a0602

Browse files
author
Eric Jennings
committed
Updates to 256RFR2 board settings
1 parent 7eb3998 commit d9a0602

File tree

8 files changed

+444
-292
lines changed

8 files changed

+444
-292
lines changed

atmega16u2/lufa-100807/Bootloaders/arduino-usbdfu/makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ F_CLOCK = $(F_CPU)
9797
#
9898
# Note that the bootloader size and start address given in AVRStudio is in words and not
9999
# bytes, and so will need to be doubled to obtain the byte address needed by AVR-GCC.
100-
BOOT_START = 0x1000
100+
BOOT_START = 0x3000
101101

102102

103103
# Output format. (can be srec, ihex, binary)

atmega16u2/lufa-100807/Projects/arduino-usbserial/makefile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
# versions of either avrdude or dfu-programmer, we specify a dummy
6464
# part; AT90USB82 which is close enough in memory size and organization
6565
MCU = atmega16u2
66-
MCU_AVRDUDE = at90usb162
66+
MCU_AVRDUDE = atmega16u2
6767
MCU_DFU = atmega16u2
6868
#MCU = atmega16u2
6969
#MCU_AVRDUDE = usb162
@@ -375,7 +375,7 @@ LDFLAGS += $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB)
375375
AVRDUDE_PROGRAMMER = avrispmkii
376376

377377
# Fuse settings for Arduino Uno DFU bootloader project
378-
AVRDUDE_FUSES = -U efuse:w:0xF4:m -U hfuse:w:0xD9:m -U lfuse:w:0xFF:m
378+
AVRDUDE_FUSES = -U efuse:w:0xF4:m -U hfuse:w:0xD9:m -U lfuse:w:0xEF:m
379379

380380
# Lock settings for Arduino Uno DFU bootloader project
381381
AVRDUDE_LOCK = -U lock:w:0x0F:m
@@ -384,6 +384,7 @@ AVRDUDE_LOCK = -U lock:w:0x0F:m
384384
AVRDUDE_PORT = usb
385385

386386
AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex
387+
AVRDUDE_WRITE_FUSES = $(AVRDUDE_FUSES)
387388
#AVRDUDE_WRITE_EEPROM = -U eeprom:w:$(TARGET).eep
388389

389390

@@ -394,14 +395,14 @@ AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex
394395

395396
# Uncomment the following if you do /not/ wish a verification to be
396397
# performed after programming the device.
397-
#AVRDUDE_NO_VERIFY = -V
398+
AVRDUDE_NO_VERIFY = -V
398399

399400
# Increase verbosity level. Please use this when submitting bug
400401
# reports about avrdude. See <http://savannah.nongnu.org/projects/avrdude>
401402
# to submit bug reports.
402-
#AVRDUDE_VERBOSE = -v -v
403+
AVRDUDE_VERBOSE = -v -v
403404

404-
AVRDUDE_FORCE = -F
405+
#AVRDUDE_FORCE = -F
405406

406407
AVRDUDE_FLAGS = -p $(MCU_AVRDUDE) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER)
407408
AVRDUDE_FLAGS += $(AVRDUDE_NO_VERIFY)
@@ -584,6 +585,9 @@ gccversion :
584585
program: $(TARGET).hex $(TARGET).eep
585586
$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM) $(AVRDUDE_FUSES) $(AVRDUDE_LOCK)
586587

588+
fuses: $(TARGET).hex $(TARGET).eep
589+
$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_FUSES) $(AVRDUDE_LOCK)
590+
587591
flip: $(TARGET).hex
588592
batchisp -hardware usb -device $(MCU_DFU) -operation erase f
589593
batchisp -hardware usb -device $(MCU_DFU) -operation loadbuffer $(TARGET).hex program

hardware/pinoccio/avr/boards.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ pinoccio.cpu=atmega256rfr2
55
pinoccio.upload.tool=avrdude
66
pinoccio.upload.protocol=stk500v2
77
pinoccio.upload.maximum_size=253952
8-
pinoccio.upload.speed=57600
8+
pinoccio.upload.speed=115200
99

1010
pinoccio.bootloader.tool=avrdude
11-
pinoccio.bootloader.low_fuses=0xF7
11+
pinoccio.bootloader.low_fuses=0xFF
1212
pinoccio.bootloader.high_fuses=0xD0
13-
pinoccio.bootloader.extended_fuses=0xF0
13+
pinoccio.bootloader.extended_fuses=0xFE
1414
pinoccio.bootloader.path=stk500v2
1515
pinoccio.bootloader.file=stk500boot_v2_pinoccio.hex
1616
pinoccio.bootloader.unlock_bits=0x3F
Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
:020000021000EC
2+
:10F000000C9490F80C94AFF80C94AFF80C94AFF803
3+
:10F010000C94AFF80C94AFF80C94AFF80C94AFF8D4
4+
:10F020000C94AFF80C94AFF80C94AFF80C94AFF8C4
5+
:10F030000C94AFF80C94AFF80C94AFF80C94AFF8B4
6+
:10F040000C94AFF80C94AFF80C94AFF80C94AFF8A4
7+
:10F050000C94AFF80C94AFF80C94AFF80C94AFF894
8+
:10F060000C94AFF80C94AFF80C94AFF80C94AFF884
9+
:10F070000C94AFF80C94AFF80C94AFF80C94AFF874
10+
:10F080000C94AFF80C94AFF80C94AFF80C94AFF864
11+
:10F090000C94AFF80C94AFF80C94AFF80C94AFF854
12+
:10F0A0000C94AFF80C94AFF80C94AFF80C94AFF844
13+
:10F0B0000C94AFF80C94AFF80C94AFF80C94AFF834
14+
:10F0C0000C94AFF80C94AFF80C94AFF80C94AFF824
15+
:10F0D0000C94AFF80C94AFF80C94AFF80C94AFF814
16+
:10F0E0000C94AFF80C94AFF80C94AFF80C94AFF804
17+
:10F0F0000C94AFF80C94AFF80C94AFF80C94AFF8F4
18+
:10F100000C94AFF80C94AFF80C94AFF80C94AFF8E3
19+
:10F110000C94AFF80C94AFF80C94AFF80C94AFF8D3
20+
:10F1200011241FBECFEFD1E4DEBFCDBF12E0A0E0BF
21+
:10F13000B2E0E4E6F8EF01E00BBF02C007900D92E9
22+
:10F14000A230B107D9F713E0A2E0B2E001C01D92EE
23+
:10F15000AD30B107E1F70E94BEF90C9430FC0C947D
24+
:10F1600000F890910502913019F0923041F0089525
25+
:10F170009091C00095FFFCCF8093C60008959091B8
26+
:10F18000C80095FFFCCF8093CE000895CF93982FB1
27+
:10F190009595959595959595905D8F70C82F8A302A
28+
:10F1A00044F4C05D892F0E94B1F88C2FCF910C944C
29+
:10F1B000B1F8C95A892F0E94B1F88C2FCF910C94C5
30+
:10F1C000B1F8CF92DF92EF92FF92809105028130E9
31+
:10F1D00061F1823031F080E0FF90EF90DF90CF90CE
32+
:10F1E0000895C12CD12C76018091C80087FD16C0EE
33+
:10F1F0008FEFC81AD80AE80AF80A81E4C81682E430
34+
:10F20000D8068FE0E806F10478F3E0910202F0916D
35+
:10F21000030209958091C80087FFEACF8091CE0054
36+
:10F22000FF90EF90DF90CF900895C12CD12C760104
37+
:10F230008091C00087FD16C08FEFC81AD80AE80A6F
38+
:10F24000F80A81E4C81682E4D8068FE0E806F104E3
39+
:10F2500078F3E0910202F091030209958091C000D9
40+
:10F2600087FFEACF8091C600FF90EF90DF90CF90AC
41+
:10F270000895CF930E94E1F8C82F0E94B1F8C136DB
42+
:10F2800034F4C0330CF0C0538C2FCF910895C75580
43+
:10F290008C2FCF910895CF930E9439F9C82F0E94E7
44+
:10F2A00039F990E1C99F800D1124CF9108952091E3
45+
:10F2B0000502815060F0213059F02230D1F7909151
46+
:10F2C000C80097FFFCCF9091CE008150A0F7089521
47+
:10F2D0009091C00097FFFCCF9091C600EACFCF93EA
48+
:10F2E000C82F0E94E1F8803279F0809104028F5F8C
49+
:10F2F00080930402853011F0CF910895E0910202CD
50+
:10F30000F0910302CF91099484E10E94B1F88C2F0F
51+
:10F310000E94B1F880E1CF910C94B1F80E94E1F81D
52+
:10F32000803269F0809104028F5F809304028530FF
53+
:10F3300009F00895E0910202F0910302099484E13A
54+
:10F340000E94B1F880E10C94B1F815C02E9A2FEF0D
55+
:10F3500031EE94E0215030409040E1F700C00000D1
56+
:10F360002E982FEF31EE94E0215030409040E1F79D
57+
:10F3700000C0000081508111E9CF0895000081E0B4
58+
:10F3800080930502E0E0F0E0E49180E18093C40026
59+
:10F390001092C5001092C00086E08093C20088E100
60+
:10F3A0008093C1006898709A269A82E02E9A2FEF77
61+
:10F3B00031EE94E0215030409040E1F700C0000071
62+
:10F3C0002E98EFEFF1EE24E0E150F0402040E1F71D
63+
:10F3D00000C00000982F81509111E8CF0E94E1F801
64+
:10F3E0008033B1F18133B9F1803409F454C08134F0
65+
:10F3F00009F45AC0823409F469C0853409F46CC038
66+
:10F40000803531F1823521F1813511F1853509F4ED
67+
:10F4100069C0863509F471C0843609F477C0843731
68+
:10F4200009F4DDC0853709F438C1863709F44AC0CC
69+
:10F43000809104028F5F80930402853079F6E09119
70+
:10F440000202F091030209950E94E1F8803351F61F
71+
:10F450000E948EF9C3CF0E94E1F8803249F784E11F
72+
:10F460000E94B1F881E40E94B1F886E50E94B1F8EB
73+
:10F4700082E50E94B1F880E20E94B1F889E40E941E
74+
:10F48000B1F883E50E94B1F880E50E94B1F880E10F
75+
:10F490000E94B1F8A3CF0E94E1F88638C8F20E941A
76+
:10F4A000E1F80E948EF99ACF0E94E1F8803809F4C1
77+
:10F4B0001DC1813809F416C1823809F41BC188398D
78+
:10F4C00009F400C180E00E946FF988CF84E10E94B6
79+
:10F4D00057F90E948EF982CF85E00E9457F90E9469
80+
:10F4E0008EF97CCF0E94E1F8809306020E94E1F839
81+
:10F4F000809307020E948EF971CF0E94E1F8803359
82+
:10F5000009F4E4C083E00E9457F9DCCF0E94E1F8DF
83+
:10F51000809309030E94E1F88093080380910C0313
84+
:10F520008E7F80930C030E94E1F8853409F4F8C0C3
85+
:10F530008091080390910903892BA1F068E0E62EE1
86+
:10F5400062E0F62E00E010E00E94E1F8F7018193FE
87+
:10F550007F010F5F1F4F80910803909109030817E7
88+
:10F56000190790F30E94E1F8803209F061CF809191
89+
:10F570000C0380FFE5C08091060290910702880F7E
90+
:10F58000991F9093070280930602209108033091FF
91+
:10F590000903232BE9F048E0E42E42E0F42E00E0DA
92+
:10F5A00010E0F70161917F010E9422FC8091060228
93+
:10F5B00090910702019690930702809306020F5FD5
94+
:10F5C0001F4F20910803309109030217130748F3D6
95+
:10F5D00084E10E94B1F880E10E94B1F8FFCE0E9460
96+
:10F5E000E1F8809309030E94E1F880930803809179
97+
:10F5F00006029091070220910C0397FD9DC02D7F7C
98+
:10F6000020930C03880F991F9093070280930602A2
99+
:10F610000E94E1F8853409F489C080910C038E7F43
100+
:10F6200080930C030E94E1F8803209F0D7CE84E188
101+
:10F630000E94B1F88091080390910903892B09F485
102+
:10F640003DC000E010E0809106029091070216C0D4
103+
:10F65000FC0184910E94B1F880910602909107020A
104+
:10F66000019690930702809306020F5F1F4F20912F
105+
:10F670000803309109030217130700F520910C03CA
106+
:10F6800020FD3CC021FFE4CFA0E0B0E01196ABBF6D
107+
:10F69000FC0187910E94B1F8DFCF0E94E1F880322F
108+
:10F6A00009F0C6CE84E10E94B1F88EE10E94B1F863
109+
:10F6B00087EA0E94B1F881E00E94B1F880E10E94DF
110+
:10F6C000B1F88CCE83E00E946FF988CE0E94E1F8F9
111+
:10F6D0000E94E1F8182F0E94E1F8112309F4A2C05A
112+
:10F6E0001130D1F081E00E946FF978CE82E00E9463
113+
:10F6F0006FF974CE80E10E946FF970CE0E941AFCFF
114+
:10F700000E94B1F8809106029091070201969093B1
115+
:10F71000070280930602A9CF87EA0E946FF95ECEA6
116+
:10F7200080910C03816080930C0302CF80910C03C5
117+
:10F73000816080930C0376CF226020930C0362CF0C
118+
:10F740008091070287FD72C010920B0380E08BBF8F
119+
:10F750008091060290910702880F991F90930702EB
120+
:10F76000809306028091080380FF09C080910803FE
121+
:10F770009091090301969093090380930803F894EC
122+
:10F78000F999FECF1127E0910602F0910702C8E037
123+
:10F79000D2E08091080390910903103091F4009118
124+
:10F7A000570001700130D9F303E000935700E8954A
125+
:10F7B0000091570001700130D9F301E10093570027
126+
:10F7C000E895099019900091570001700130D9F324
127+
:10F7D00001E000935700E8951395103898F0112731
128+
:10F7E0000091570001700130D9F305E000935700F4
129+
:10F7F000E8950091570001700130D9F301E10093C1
130+
:10F800005700E8953296029709F0C7CF103011F0F3
131+
:10F810000296E5CF112484E10E94B1F880E10E94B4
132+
:10F82000B1F8DCCD8EE10E946FF9D8CD81E08093F4
133+
:10F830000B038DCFF999FECF92BD81BDF89A992720
134+
:10F8400080B50895262FF999FECF1FBA92BD81BDCC
135+
:10F8500020BD0FB6F894FA9AF99A0FBE0196089552
136+
:04F86000F894FFCF4A
137+
:02F86400800022
138+
:040000031000F000F9
139+
:00000001FF

hardware/pinoccio/avr/bootloaders/stk500v2/Makefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ AVRDUDE_PROGRAMMER = avrisp2
215215
AVRDUDE_PORT = usb # programmer connected to serial device
216216

217217
AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex
218+
AVRDUDE_WRITE_FUSES = -U lfuse:w:0xFF:m -U hfuse:w:0xD0:m -U efuse:w:0xFE:m
218219
#AVRDUDE_WRITE_EEPROM = -U eeprom:w:$(TARGET).eep
219220

220221

@@ -225,14 +226,14 @@ AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex
225226

226227
# Uncomment the following if you do /not/ wish a verification to be
227228
# performed after programming the device.
228-
#AVRDUDE_NO_VERIFY = -V
229+
AVRDUDE_NO_VERIFY = -V
229230

230231
# Increase verbosity level. Please use this when submitting bug
231232
# reports about avrdude. See <http://savannah.nongnu.org/projects/avrdude>
232233
# to submit bug reports.
233234
AVRDUDE_VERBOSE = -v -v
234235

235-
AVRDUDE_FLAGS = -b 115200 -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER)
236+
AVRDUDE_FLAGS = -D -b 115200 -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER)
236237
AVRDUDE_FLAGS += $(AVRDUDE_NO_VERIFY)
237238
AVRDUDE_FLAGS += $(AVRDUDE_VERBOSE)
238239
AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER)
@@ -399,14 +400,15 @@ penguino: begin gccversion sizebefore build sizeafter end
399400
pinoccio: MCU = atmega256rfr2
400401
pinoccio: F_CPU = 16000000
401402
pinoccio: BOOTLOADER_ADDRESS = 3E000
402-
pinoccio: CFLAGS += -D_PINOCCIO_256RFR2_ -DBAUDRATE=57600
403+
pinoccio: CFLAGS += -D_PINOCCIO_256RFR2_ -DBAUDRATE=115200
403404
pinoccio: begin gccversion sizebefore build sizeafter end
404-
mv $(TARGET).hex stk500boot_v2_pinoccio.hex
405+
cp $(TARGET).hex stk500boot_v2_pinoccio.hex
405406

406407
# Program the device.
407408
pinoccio_program: MCU = atmega256rfr2
409+
pinoccio_program: F_CPU = 16000000
408410
pinoccio_program: $(TARGET).hex $(TARGET).eep
409-
$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)
411+
$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM) $(AVRDUDE_WRITE_FUSES)
410412

411413
# Default target.
412414
all: begin gccversion sizebefore build sizeafter end

hardware/pinoccio/avr/bootloaders/stk500v2/stk500boot.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ Description: add timeout feature like previous Wiring bootloader
135135
*/
136136
#define REMOVE_PROGRAM_LOCK_BIT_SUPPORT // disable program lock bits
137137
//#define REMOVE_BOOTLOADER_LED // no LED to show active bootloader
138-
#define REMOVE_CMD_SPI_MULTI // disable processing of SPI_MULTI commands, Remark this line for AVRDUDE <Worapoht>
138+
//#define REMOVE_CMD_SPI_MULTI // disable processing of SPI_MULTI commands, Remark this line for AVRDUDE <Worapoht>
139139
//
140140

141141

@@ -192,7 +192,7 @@ Description: add timeout feature like previous Wiring bootloader
192192
#define PROGLED_PORT PORTB
193193
#define PROGLED_DDR DDRB
194194
#define PROGLED_PIN PINB6
195-
#define UART_BAUDRATE_DOUBLE_SPEED 0
195+
//#define UART_BAUDRATE_DOUBLE_SPEED 0
196196
#elif defined( _BOARD_ROBOTX_ )
197197
#define PROGLED_PORT PORTB
198198
#define PROGLED_DDR DDRB

0 commit comments

Comments
 (0)