1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-01 12:24:14 +01:00

Renamed compiler.warning_flags pref to compiler.warning_level

Provided a default value for compiler.warning_flags
Releasing avr core 1.6.5
This commit is contained in:
Federico Fissore 2015-04-24 09:06:30 +02:00
parent 871bc172d0
commit d805fb4e1f
5 changed files with 53 additions and 5 deletions

View File

@ -379,7 +379,7 @@ public class Preferences {
box.add(label); box.add(label);
WarningItem[] warningItems = new WarningItem[]{new WarningItem("none", _("None")), new WarningItem("default", _("Default")), new WarningItem("more", _("More")), new WarningItem("all", _("All")), }; WarningItem[] warningItems = new WarningItem[]{new WarningItem("none", _("None")), new WarningItem("default", _("Default")), new WarningItem("more", _("More")), new WarningItem("all", _("All")), };
comboWarnings = new JComboBox(warningItems); comboWarnings = new JComboBox(warningItems);
String currentWarningLevel = PreferencesData.get("compiler.warning_flags", "none"); String currentWarningLevel = PreferencesData.get("compiler.warning_level", "none");
for (WarningItem item : warningItems) { for (WarningItem item : warningItems) {
if (currentWarningLevel.equals(item.getValue())) { if (currentWarningLevel.equals(item.getValue())) {
comboWarnings.setSelectedItem(item); comboWarnings.setSelectedItem(item);
@ -771,7 +771,7 @@ public class Preferences {
PreferencesData.set("editor.languages.current", newLanguage.isoCode); PreferencesData.set("editor.languages.current", newLanguage.isoCode);
WarningItem warningItem = (WarningItem) comboWarnings.getSelectedItem(); WarningItem warningItem = (WarningItem) comboWarnings.getSelectedItem();
PreferencesData.set("compiler.warning_flags", warningItem.getValue()); PreferencesData.set("compiler.warning_level", warningItem.getValue());
Preferences.set("proxy.http.server", proxyHTTPServer.getText()); Preferences.set("proxy.http.server", proxyHTTPServer.getText());
try { try {

View File

@ -903,8 +903,8 @@ public class Compiler implements MessageConsumer {
} }
private void setupWarningFlags(PreferencesMap dict) { private void setupWarningFlags(PreferencesMap dict) {
if (dict.containsKey("compiler.warning_flags")) { if (dict.containsKey("compiler.warning_level")) {
String key = "compiler.warning_flags." + dict.get("compiler.warning_flags"); String key = "compiler.warning_flags." + dict.get("compiler.warning_level");
dict.put("compiler.warning_flags", dict.get(key)); dict.put("compiler.warning_flags", dict.get(key));
} else { } else {
dict.put("compiler.warning_flags", dict.get("compiler.warning_flags.none")); dict.put("compiler.warning_flags", dict.get("compiler.warning_flags.none"));

View File

@ -144,6 +144,52 @@
} }
] ]
}, },
{
"name": "Arduino AVR Boards",
"architecture": "avr",
"version": "1.6.5",
"category": "Arduino",
"help": {
"online": "http://arduino.cc/en/Reference/HomePage"
},
"url": "http://downloads.arduino.cc/cores/avr-1.6.5.tar.bz2",
"archiveFileName": "avr-1.6.5.tar.bz2",
"checksum": "SHA-256:c72d890aa605add677634c6b25ebc3b2ed9e44c38805b95c47eab17a1ca72db6",
"size": "4876957",
"boards": [
{"name": "Arduino Yún"},
{"name": "Arduino Uno"},
{"name": "Arduino Diecimila"},
{"name": "Arduino Nano"},
{"name": "Arduino Mega"},
{"name": "Arduino MegaADK"},
{"name": "Arduino Leonardo"},
{"name": "Arduino Micro"},
{"name": "Arduino Esplora"},
{"name": "Arduino Mini"},
{"name": "Arduino Ethernet"},
{"name": "Arduino Fio"},
{"name": "Arduino BT"},
{"name": "Arduino LilyPadUSB"},
{"name": "Arduino Lilypad"},
{"name": "Arduino Pro"},
{"name": "Arduino ATMegaNG"},
{"name": "Arduino Robot Control"},
{"name": "Arduino Robot Motor"}
],
"toolsDependencies": [
{
"packager": "arduino",
"name": "avr-gcc",
"version": "4.8.1-arduino5"
},
{
"packager": "arduino",
"name": "avrdude",
"version": "6.0.1-arduino5"
}
]
},
{ {
"name": "Arduino SAM Boards (32-bits ARM Cortex-M3)", "name": "Arduino SAM Boards (32-bits ARM Cortex-M3)",
"architecture": "sam", "architecture": "sam",

View File

@ -6,11 +6,12 @@
# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
name=Arduino AVR Boards name=Arduino AVR Boards
version=1.6.4 version=1.6.5
# AVR compile variables # AVR compile variables
# --------------------- # ---------------------
compiler.warning_flags=-w
compiler.warning_flags.none=-w compiler.warning_flags.none=-w
compiler.warning_flags.default= compiler.warning_flags.default=
compiler.warning_flags.more=-Wall compiler.warning_flags.more=-Wall

View File

@ -11,6 +11,7 @@ version=1.6.3
# SAM3 compile variables # SAM3 compile variables
# ---------------------- # ----------------------
compiler.warning_flags=-w
compiler.warning_flags.none=-w compiler.warning_flags.none=-w
compiler.warning_flags.default= compiler.warning_flags.default=
compiler.warning_flags.more=-Wall compiler.warning_flags.more=-Wall