Skip to content

Commit caeaa45

Browse files
committed
sketch USB VID and PID values are passed in from boards.txt at compile time now. changed sketch PIDs to final values. also uncommented Micro section in boards.txt
1 parent d02e448 commit caeaa45

File tree

6 files changed

+31
-28
lines changed

6 files changed

+31
-28
lines changed

app/src/processing/app/debug/Compiler.java

+8-2
Original file line numberDiff line numberDiff line change
@@ -542,8 +542,10 @@ static private List getCommandCompilerS(String avrBasePath, List includePaths,
542542
"-g", // include debugging info (so errors include line numbers)
543543
"-assembler-with-cpp",
544544
"-mmcu=" + boardPreferences.get("build.mcu"),
545-
"-DF_CPU=" + boardPreferences.get("build.f_cpu"),
545+
"-DF_CPU=" + boardPreferences.get("build.f_cpu"),
546546
"-DARDUINO=" + Base.REVISION,
547+
"-DUSB_VID=" + boardPreferences.get("build.vid"),
548+
"-DUSB_PID=" + boardPreferences.get("build.pid"),
547549
}));
548550

549551
for (int i = 0; i < includePaths.size(); i++) {
@@ -571,7 +573,9 @@ static private List getCommandCompilerC(String avrBasePath, List includePaths,
571573
"-mmcu=" + boardPreferences.get("build.mcu"),
572574
"-DF_CPU=" + boardPreferences.get("build.f_cpu"),
573575
"-MMD", // output dependancy info
574-
"-DARDUINO=" + Base.REVISION,
576+
"-DUSB_VID=" + boardPreferences.get("build.vid"),
577+
"-DUSB_PID=" + boardPreferences.get("build.pid"),
578+
"-DARDUINO=" + Base.REVISION,
575579
}));
576580

577581
for (int i = 0; i < includePaths.size(); i++) {
@@ -602,6 +606,8 @@ static private List getCommandCompilerCPP(String avrBasePath,
602606
"-mmcu=" + boardPreferences.get("build.mcu"),
603607
"-DF_CPU=" + boardPreferences.get("build.f_cpu"),
604608
"-MMD", // output dependancy info
609+
"-DUSB_VID=" + boardPreferences.get("build.vid"),
610+
"-DUSB_PID=" + boardPreferences.get("build.pid"),
605611
"-DARDUINO=" + Base.REVISION,
606612
}));
607613

hardware/arduino/boards.txt

+21-16
Original file line numberDiff line numberDiff line change
@@ -155,31 +155,36 @@ leonardo.bootloader.low_fuses=0xff
155155
leonardo.bootloader.high_fuses=0xd8
156156
leonardo.bootloader.extended_fuses=0xcb
157157
leonardo.bootloader.path=caterina
158-
leonardo.bootloader.file=Caterina.hex
158+
leonardo.bootloader.file=Caterina-Leonardo.hex
159159
leonardo.bootloader.unlock_bits=0x3F
160160
leonardo.bootloader.lock_bits=0x2F
161161
leonardo.build.mcu=atmega32u4
162162
leonardo.build.f_cpu=16000000L
163+
leonardo.build.vid=0x2341
164+
leonardo.build.pid=0x8034
163165
leonardo.build.core=arduino
164166
leonardo.build.variant=leonardo
165167

166168
##############################################################
167169

168-
#micro.name=Arduino Micro
169-
#micro.upload.protocol=arduino
170-
#micro.upload.maximum_size=30720
171-
#micro.upload.speed=1200
172-
#micro.bootloader.low_fuses=0xde
173-
#micro.bootloader.high_fuses=0xda
174-
#micro.bootloader.extended_fuses=0xcb
175-
#micro.bootloader.path=caterina
176-
#micro.bootloader.file=Caterina-Micro.hex
177-
#micro.bootloader.unlock_bits=0x3F
178-
#micro.bootloader.lock_bits=0x2F
179-
#micro.build.mcu=atmega32u4
180-
#micro.build.f_cpu=16000000L
181-
#micro.build.core=arduino
182-
#micro.build.variant=micro
170+
micro.name=Arduino Micro
171+
micro.upload.protocol=avr109
172+
micro.upload.maximum_size=28672
173+
micro.upload.speed=57600
174+
micro.upload.disable_flushing=true
175+
micro.bootloader.low_fuses=0xff
176+
micro.bootloader.high_fuses=0xd8
177+
micro.bootloader.extended_fuses=0xcb
178+
micro.bootloader.path=caterina
179+
micro.bootloader.file=Caterina-Micro.hex
180+
micro.bootloader.unlock_bits=0x3F
181+
micro.bootloader.lock_bits=0x2F
182+
micro.build.mcu=atmega32u4
183+
micro.build.f_cpu=16000000L
184+
micro.build.vid=0x2341
185+
micro.build.pid=0x8035
186+
micro.build.core=arduino
187+
micro.build.variant=micro
183188

184189
##############################################################
185190

hardware/arduino/cores/arduino/USBCore.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ const u16 STRING_LANGUAGE[2] = {
5151

5252
const u16 STRING_IPRODUCT[17] = {
5353
(3<<8) | (2+2*16),
54-
#if USB_PID == USB_PID_LEONARDO
54+
#if USB_PID == 0x8034
5555
'A','r','d','u','i','n','o',' ','L','e','o','n','a','r','d','o'
56-
#elif USB_PID == USB_PID_MICRO
56+
#elif USB_PID == 0x8035
5757
'A','r','d','u','i','n','o',' ','M','i','c','r','o',' ',' ',' '
5858
#endif
5959
};

hardware/arduino/cores/arduino/USBDesc.h

-4
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,4 @@
6060

6161
#define IMANUFACTURER 1
6262
#define IPRODUCT 2
63-
#define USB_PID_LEONARDO 0x0801
64-
#define USB_PID_MICRO 0x0035
65-
#define USB_VID 0x2341 // arduino LLC vid
66-
#define USB_PID ARDUINO_MODEL_USB_PID
6763

hardware/arduino/variants/leonardo/pins_arduino.h

-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727

2828
#include <avr/pgmspace.h>
2929

30-
#define ARDUINO_MODEL_USB_PID 0x0801
31-
3230
#define TX_RX_LED_INIT DDRD |= (1<<5), DDRB |= (1<<0)
3331
#define TXLED0 PORTD |= (1<<5)
3432
#define TXLED1 PORTD &= ~(1<<5)

hardware/arduino/variants/micro/pins_arduino.h

-2
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,3 @@
2323
*/
2424

2525
#include "../leonardo/pins_arduino.h"
26-
#undef ARDUINO_MODEL_USB_PID
27-
#define ARDUINO_MODEL_USB_PID 0x0035

0 commit comments

Comments
 (0)