Skip to content

Commit bd9330b

Browse files
damellisdamellis
committed
Allowing only a single platform per platforms.txt / folder.
1 parent fcbbf8f commit bd9330b

File tree

96 files changed

+6
-69
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+6
-69
lines changed

‎app/src/processing/app/debug/Target.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public Target(String name, File folder) {
6565

6666
}
6767

68-
File platformsFile = new File(folder,"platforms.txt");
68+
File platformsFile = new File(folder,"platform.txt");
6969
try
7070
{
7171
if(platformsFile.exists()){
@@ -74,9 +74,10 @@ public Target(String name, File folder) {
7474
for(Object k : platformPreferences.keySet())
7575
{
7676
String key=(String) k;
77-
String platform=key.substring(0,key.indexOf('.'));
77+
//String platform=key.substring(0,key.indexOf('.'));
78+
String platform=folder.getName();
7879
if (!platforms.containsKey(platform)) platforms.put(platform, new HashMap());
79-
((Map) platforms.get(platform)).put(key.substring(key.indexOf('.') + 1),platformPreferences.get(key));
80+
((Map) platforms.get(platform)).put(key,platformPreferences.get(key));
8081
}
8182
}
8283
} catch (Exception e) {

‎build/shared/lib/preferences.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,11 @@ run.present.exclusive.macosx = true
238238

239239
# ARDUINO PREFERENCES
240240
board = uno
241-
target = arduino
241+
target = avr
242242
platform = avr
243243
software=ARDUINO
244244

245-
programmer = arduino:avrispmkii
245+
programmer = avr:avrispmkii
246246

247247
upload.using = bootloader
248248

‎hardware/arduino/platforms.txt

Lines changed: 0 additions & 64 deletions
This file was deleted.

‎hardware/arduino/boards.txt renamed to ‎hardware/avr/boards.txt

File renamed without changes.

‎hardware/arduino/bootloaders/atmega/ATmegaBOOT_168.c renamed to ‎hardware/avr/bootloaders/atmega/ATmegaBOOT_168.c

File renamed without changes.

‎hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_atmega1280.hex renamed to ‎hardware/avr/bootloaders/atmega/ATmegaBOOT_168_atmega1280.hex

File renamed without changes.

‎hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_atmega328.hex renamed to ‎hardware/avr/bootloaders/atmega/ATmegaBOOT_168_atmega328.hex

File renamed without changes.

‎hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex renamed to ‎hardware/avr/bootloaders/atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex

File renamed without changes.

‎hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_diecimila.hex renamed to ‎hardware/avr/bootloaders/atmega/ATmegaBOOT_168_diecimila.hex

File renamed without changes.

‎hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_ng.hex renamed to ‎hardware/avr/bootloaders/atmega/ATmegaBOOT_168_ng.hex

File renamed without changes.

‎hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_pro_8MHz.hex renamed to ‎hardware/avr/bootloaders/atmega/ATmegaBOOT_168_pro_8MHz.hex

File renamed without changes.

‎hardware/arduino/bootloaders/atmega/Makefile renamed to ‎hardware/avr/bootloaders/atmega/Makefile

File renamed without changes.

‎hardware/arduino/bootloaders/atmega8/ATmegaBOOT.c renamed to ‎hardware/avr/bootloaders/atmega8/ATmegaBOOT.c

File renamed without changes.

‎hardware/arduino/bootloaders/atmega8/ATmegaBOOT.hex renamed to ‎hardware/avr/bootloaders/atmega8/ATmegaBOOT.hex

File renamed without changes.

‎hardware/arduino/bootloaders/atmega8/Makefile renamed to ‎hardware/avr/bootloaders/atmega8/Makefile

File renamed without changes.

‎hardware/arduino/bootloaders/bt/ATmegaBOOT_168.c renamed to ‎hardware/avr/bootloaders/bt/ATmegaBOOT_168.c

File renamed without changes.

‎hardware/arduino/bootloaders/bt/ATmegaBOOT_168.hex renamed to ‎hardware/avr/bootloaders/bt/ATmegaBOOT_168.hex

File renamed without changes.

‎hardware/arduino/bootloaders/bt/ATmegaBOOT_168_atmega328_bt.hex renamed to ‎hardware/avr/bootloaders/bt/ATmegaBOOT_168_atmega328_bt.hex

File renamed without changes.

‎hardware/arduino/bootloaders/bt/Makefile renamed to ‎hardware/avr/bootloaders/bt/Makefile

File renamed without changes.

‎hardware/arduino/bootloaders/lilypad/LilyPadBOOT_168.hex renamed to ‎hardware/avr/bootloaders/lilypad/LilyPadBOOT_168.hex

File renamed without changes.

‎hardware/arduino/bootloaders/lilypad/src/ATmegaBOOT.c renamed to ‎hardware/avr/bootloaders/lilypad/src/ATmegaBOOT.c

File renamed without changes.

‎hardware/arduino/bootloaders/lilypad/src/Makefile renamed to ‎hardware/avr/bootloaders/lilypad/src/Makefile

File renamed without changes.

‎hardware/arduino/bootloaders/optiboot/Makefile renamed to ‎hardware/avr/bootloaders/optiboot/Makefile

File renamed without changes.

‎hardware/arduino/bootloaders/optiboot/makeall renamed to ‎hardware/avr/bootloaders/optiboot/makeall

File renamed without changes.

‎hardware/arduino/bootloaders/optiboot/optiboot.c renamed to ‎hardware/avr/bootloaders/optiboot/optiboot.c

File renamed without changes.

‎hardware/arduino/bootloaders/optiboot/optiboot_atmega328.hex renamed to ‎hardware/avr/bootloaders/optiboot/optiboot_atmega328.hex

File renamed without changes.

‎hardware/arduino/bootloaders/optiboot/optiboot_atmega328.lst renamed to ‎hardware/avr/bootloaders/optiboot/optiboot_atmega328.lst

File renamed without changes.

‎hardware/arduino/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.hex renamed to ‎hardware/avr/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.hex

File renamed without changes.

‎hardware/arduino/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.lst renamed to ‎hardware/avr/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.lst

File renamed without changes.

‎hardware/arduino/bootloaders/optiboot/optiboot_diecimila.hex renamed to ‎hardware/avr/bootloaders/optiboot/optiboot_diecimila.hex

File renamed without changes.

‎hardware/arduino/bootloaders/optiboot/optiboot_diecimila.lst renamed to ‎hardware/avr/bootloaders/optiboot/optiboot_diecimila.lst

File renamed without changes.

‎hardware/arduino/bootloaders/optiboot/optiboot_lilypad.hex renamed to ‎hardware/avr/bootloaders/optiboot/optiboot_lilypad.hex

File renamed without changes.

‎hardware/arduino/bootloaders/optiboot/optiboot_lilypad.lst renamed to ‎hardware/avr/bootloaders/optiboot/optiboot_lilypad.lst

File renamed without changes.

‎hardware/arduino/bootloaders/optiboot/optiboot_lilypad_resonator.hex renamed to ‎hardware/avr/bootloaders/optiboot/optiboot_lilypad_resonator.hex

File renamed without changes.

‎hardware/arduino/bootloaders/optiboot/optiboot_lilypad_resonator.lst renamed to ‎hardware/avr/bootloaders/optiboot/optiboot_lilypad_resonator.lst

File renamed without changes.

‎hardware/arduino/bootloaders/optiboot/optiboot_luminet.hex renamed to ‎hardware/avr/bootloaders/optiboot/optiboot_luminet.hex

File renamed without changes.

‎hardware/arduino/bootloaders/optiboot/optiboot_luminet.lst renamed to ‎hardware/avr/bootloaders/optiboot/optiboot_luminet.lst

File renamed without changes.

‎hardware/arduino/bootloaders/optiboot/optiboot_pro_16MHz.hex renamed to ‎hardware/avr/bootloaders/optiboot/optiboot_pro_16MHz.hex

File renamed without changes.

‎hardware/arduino/bootloaders/optiboot/optiboot_pro_16MHz.lst renamed to ‎hardware/avr/bootloaders/optiboot/optiboot_pro_16MHz.lst

File renamed without changes.

‎hardware/arduino/bootloaders/optiboot/optiboot_pro_20mhz.hex renamed to ‎hardware/avr/bootloaders/optiboot/optiboot_pro_20mhz.hex

File renamed without changes.

‎hardware/arduino/bootloaders/optiboot/optiboot_pro_20mhz.lst renamed to ‎hardware/avr/bootloaders/optiboot/optiboot_pro_20mhz.lst

File renamed without changes.

‎hardware/arduino/bootloaders/optiboot/optiboot_pro_8MHz.hex renamed to ‎hardware/avr/bootloaders/optiboot/optiboot_pro_8MHz.hex

File renamed without changes.

‎hardware/arduino/bootloaders/optiboot/optiboot_pro_8MHz.lst renamed to ‎hardware/avr/bootloaders/optiboot/optiboot_pro_8MHz.lst

File renamed without changes.

‎hardware/arduino/bootloaders/stk500v2/License.txt renamed to ‎hardware/avr/bootloaders/stk500v2/License.txt

File renamed without changes.

‎hardware/arduino/bootloaders/stk500v2/Makefile renamed to ‎hardware/avr/bootloaders/stk500v2/Makefile

File renamed without changes.

‎hardware/arduino/bootloaders/stk500v2/STK500V2.pnproj renamed to ‎hardware/avr/bootloaders/stk500v2/STK500V2.pnproj

File renamed without changes.

‎hardware/arduino/bootloaders/stk500v2/STK500V2.pnps renamed to ‎hardware/avr/bootloaders/stk500v2/STK500V2.pnps

File renamed without changes.

‎hardware/arduino/bootloaders/stk500v2/avrinterruptnames.h renamed to ‎hardware/avr/bootloaders/stk500v2/avrinterruptnames.h

File renamed without changes.

‎hardware/arduino/bootloaders/stk500v2/command.h renamed to ‎hardware/avr/bootloaders/stk500v2/command.h

File renamed without changes.

‎hardware/arduino/bootloaders/stk500v2/stk500boot.c renamed to ‎hardware/avr/bootloaders/stk500v2/stk500boot.c

File renamed without changes.

‎hardware/arduino/bootloaders/stk500v2/stk500boot.ppg renamed to ‎hardware/avr/bootloaders/stk500v2/stk500boot.ppg

File renamed without changes.

‎hardware/arduino/bootloaders/stk500v2/stk500boot_v2_mega2560.hex renamed to ‎hardware/avr/bootloaders/stk500v2/stk500boot_v2_mega2560.hex

File renamed without changes.

‎hardware/arduino/cores/arduino/Arduino.h renamed to ‎hardware/avr/cores/arduino/Arduino.h

File renamed without changes.

‎hardware/arduino/cores/arduino/HardwareSerial.cpp renamed to ‎hardware/avr/cores/arduino/HardwareSerial.cpp

File renamed without changes.

‎hardware/arduino/cores/arduino/HardwareSerial.h renamed to ‎hardware/avr/cores/arduino/HardwareSerial.h

File renamed without changes.

‎hardware/arduino/cores/arduino/Print.cpp renamed to ‎hardware/avr/cores/arduino/Print.cpp

File renamed without changes.

‎hardware/arduino/cores/arduino/Print.h renamed to ‎hardware/avr/cores/arduino/Print.h

File renamed without changes.

‎hardware/arduino/cores/arduino/Printable.h renamed to ‎hardware/avr/cores/arduino/Printable.h

File renamed without changes.

‎hardware/arduino/cores/arduino/Stream.h renamed to ‎hardware/avr/cores/arduino/Stream.h

File renamed without changes.

‎hardware/arduino/cores/arduino/Tone.cpp renamed to ‎hardware/avr/cores/arduino/Tone.cpp

File renamed without changes.

‎hardware/arduino/cores/arduino/WCharacter.h renamed to ‎hardware/avr/cores/arduino/WCharacter.h

File renamed without changes.

‎hardware/arduino/cores/arduino/WInterrupts.c renamed to ‎hardware/avr/cores/arduino/WInterrupts.c

File renamed without changes.

‎hardware/arduino/cores/arduino/WMath.cpp renamed to ‎hardware/avr/cores/arduino/WMath.cpp

File renamed without changes.

‎hardware/arduino/cores/arduino/WString.cpp renamed to ‎hardware/avr/cores/arduino/WString.cpp

File renamed without changes.

‎hardware/arduino/cores/arduino/WString.h renamed to ‎hardware/avr/cores/arduino/WString.h

File renamed without changes.

‎hardware/arduino/cores/arduino/binary.h renamed to ‎hardware/avr/cores/arduino/binary.h

File renamed without changes.

‎hardware/arduino/cores/arduino/main.cpp renamed to ‎hardware/avr/cores/arduino/main.cpp

File renamed without changes.

‎hardware/arduino/cores/arduino/wiring.c renamed to ‎hardware/avr/cores/arduino/wiring.c

File renamed without changes.

‎hardware/arduino/cores/arduino/wiring_analog.c renamed to ‎hardware/avr/cores/arduino/wiring_analog.c

File renamed without changes.

‎hardware/arduino/cores/arduino/wiring_digital.c renamed to ‎hardware/avr/cores/arduino/wiring_digital.c

File renamed without changes.

‎hardware/arduino/cores/arduino/wiring_private.h renamed to ‎hardware/avr/cores/arduino/wiring_private.h

File renamed without changes.

‎hardware/arduino/cores/arduino/wiring_pulse.c renamed to ‎hardware/avr/cores/arduino/wiring_pulse.c

File renamed without changes.

‎hardware/arduino/cores/arduino/wiring_shift.c renamed to ‎hardware/avr/cores/arduino/wiring_shift.c

File renamed without changes.

‎hardware/arduino/firmwares/MEGA-dfu_and_usbserial_combined.hex renamed to ‎hardware/avr/firmwares/MEGA-dfu_and_usbserial_combined.hex

File renamed without changes.

‎hardware/arduino/firmwares/README.txt renamed to ‎hardware/avr/firmwares/README.txt

File renamed without changes.

‎hardware/arduino/firmwares/UNO-dfu_and_usbserial_combined.hex renamed to ‎hardware/avr/firmwares/UNO-dfu_and_usbserial_combined.hex

File renamed without changes.

‎hardware/arduino/firmwares/arduino-usbdfu/Arduino-usbdfu.c renamed to ‎hardware/avr/firmwares/arduino-usbdfu/Arduino-usbdfu.c

File renamed without changes.

‎hardware/arduino/firmwares/arduino-usbdfu/Arduino-usbdfu.h renamed to ‎hardware/avr/firmwares/arduino-usbdfu/Arduino-usbdfu.h

File renamed without changes.

‎hardware/arduino/firmwares/arduino-usbdfu/Board/LEDs.h renamed to ‎hardware/avr/firmwares/arduino-usbdfu/Board/LEDs.h

File renamed without changes.

‎hardware/arduino/firmwares/arduino-usbdfu/Descriptors.c renamed to ‎hardware/avr/firmwares/arduino-usbdfu/Descriptors.c

File renamed without changes.

‎hardware/arduino/firmwares/arduino-usbdfu/Descriptors.h renamed to ‎hardware/avr/firmwares/arduino-usbdfu/Descriptors.h

File renamed without changes.

‎hardware/arduino/firmwares/arduino-usbdfu/makefile renamed to ‎hardware/avr/firmwares/arduino-usbdfu/makefile

File renamed without changes.

‎hardware/arduino/firmwares/arduino-usbdfu/readme.txt renamed to ‎hardware/avr/firmwares/arduino-usbdfu/readme.txt

File renamed without changes.

‎hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial-mega.hex renamed to ‎hardware/avr/firmwares/arduino-usbserial/Arduino-usbserial-mega.hex

File renamed without changes.

‎hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial-uno.hex renamed to ‎hardware/avr/firmwares/arduino-usbserial/Arduino-usbserial-uno.hex

File renamed without changes.

‎hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial.c renamed to ‎hardware/avr/firmwares/arduino-usbserial/Arduino-usbserial.c

File renamed without changes.

‎hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial.h renamed to ‎hardware/avr/firmwares/arduino-usbserial/Arduino-usbserial.h

File renamed without changes.

‎hardware/arduino/firmwares/arduino-usbserial/Board/LEDs.h renamed to ‎hardware/avr/firmwares/arduino-usbserial/Board/LEDs.h

File renamed without changes.

‎hardware/arduino/firmwares/arduino-usbserial/Descriptors.c renamed to ‎hardware/avr/firmwares/arduino-usbserial/Descriptors.c

File renamed without changes.

‎hardware/arduino/firmwares/arduino-usbserial/Descriptors.h renamed to ‎hardware/avr/firmwares/arduino-usbserial/Descriptors.h

File renamed without changes.

‎hardware/arduino/firmwares/arduino-usbserial/Lib/LightweightRingBuff.h renamed to ‎hardware/avr/firmwares/arduino-usbserial/Lib/LightweightRingBuff.h

File renamed without changes.

‎hardware/arduino/firmwares/arduino-usbserial/makefile renamed to ‎hardware/avr/firmwares/arduino-usbserial/makefile

File renamed without changes.

‎hardware/arduino/firmwares/arduino-usbserial/readme.txt renamed to ‎hardware/avr/firmwares/arduino-usbserial/readme.txt

File renamed without changes.

‎hardware/arduino/pins/mega/pins_arduino.h renamed to ‎hardware/avr/pins/mega/pins_arduino.h

File renamed without changes.

‎hardware/arduino/pins/standard/pins_arduino.h renamed to ‎hardware/avr/pins/standard/pins_arduino.h

File renamed without changes.

‎hardware/arduino/programmers.txt renamed to ‎hardware/avr/programmers.txt

File renamed without changes.

0 commit comments

Comments
 (0)