Skip to content

Commit d805fb4

Browse files
author
Federico Fissore
committed
Renamed compiler.warning_flags pref to compiler.warning_level
Provided a default value for compiler.warning_flags Releasing avr core 1.6.5
1 parent 871bc17 commit d805fb4

File tree

5 files changed

+53
-5
lines changed

5 files changed

+53
-5
lines changed

app/src/processing/app/Preferences.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ public void actionPerformed(ActionEvent e) {
379379
box.add(label);
380380
WarningItem[] warningItems = new WarningItem[]{new WarningItem("none", _("None")), new WarningItem("default", _("Default")), new WarningItem("more", _("More")), new WarningItem("all", _("All")), };
381381
comboWarnings = new JComboBox(warningItems);
382-
String currentWarningLevel = PreferencesData.get("compiler.warning_flags", "none");
382+
String currentWarningLevel = PreferencesData.get("compiler.warning_level", "none");
383383
for (WarningItem item : warningItems) {
384384
if (currentWarningLevel.equals(item.getValue())) {
385385
comboWarnings.setSelectedItem(item);
@@ -771,7 +771,7 @@ protected void applyFrame() {
771771
PreferencesData.set("editor.languages.current", newLanguage.isoCode);
772772

773773
WarningItem warningItem = (WarningItem) comboWarnings.getSelectedItem();
774-
PreferencesData.set("compiler.warning_flags", warningItem.getValue());
774+
PreferencesData.set("compiler.warning_level", warningItem.getValue());
775775

776776
Preferences.set("proxy.http.server", proxyHTTPServer.getText());
777777
try {

arduino-core/src/processing/app/debug/Compiler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -903,8 +903,8 @@ private String[] getCommandCompilerByRecipe(List<File> includeFolders, File sour
903903
}
904904

905905
private void setupWarningFlags(PreferencesMap dict) {
906-
if (dict.containsKey("compiler.warning_flags")) {
907-
String key = "compiler.warning_flags." + dict.get("compiler.warning_flags");
906+
if (dict.containsKey("compiler.warning_level")) {
907+
String key = "compiler.warning_flags." + dict.get("compiler.warning_level");
908908
dict.put("compiler.warning_flags", dict.get(key));
909909
} else {
910910
dict.put("compiler.warning_flags", dict.get("compiler.warning_flags.none"));

build/shared/bundled_package_index.json

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,52 @@
144144
}
145145
]
146146
},
147+
{
148+
"name": "Arduino AVR Boards",
149+
"architecture": "avr",
150+
"version": "1.6.5",
151+
"category": "Arduino",
152+
"help": {
153+
"online": "http://arduino.cc/en/Reference/HomePage"
154+
},
155+
"url": "http://downloads.arduino.cc/cores/avr-1.6.5.tar.bz2",
156+
"archiveFileName": "avr-1.6.5.tar.bz2",
157+
"checksum": "SHA-256:c72d890aa605add677634c6b25ebc3b2ed9e44c38805b95c47eab17a1ca72db6",
158+
"size": "4876957",
159+
"boards": [
160+
{"name": "Arduino Yún"},
161+
{"name": "Arduino Uno"},
162+
{"name": "Arduino Diecimila"},
163+
{"name": "Arduino Nano"},
164+
{"name": "Arduino Mega"},
165+
{"name": "Arduino MegaADK"},
166+
{"name": "Arduino Leonardo"},
167+
{"name": "Arduino Micro"},
168+
{"name": "Arduino Esplora"},
169+
{"name": "Arduino Mini"},
170+
{"name": "Arduino Ethernet"},
171+
{"name": "Arduino Fio"},
172+
{"name": "Arduino BT"},
173+
{"name": "Arduino LilyPadUSB"},
174+
{"name": "Arduino Lilypad"},
175+
{"name": "Arduino Pro"},
176+
{"name": "Arduino ATMegaNG"},
177+
{"name": "Arduino Robot Control"},
178+
{"name": "Arduino Robot Motor"}
179+
],
180+
"toolsDependencies": [
181+
{
182+
"packager": "arduino",
183+
"name": "avr-gcc",
184+
"version": "4.8.1-arduino5"
185+
},
186+
{
187+
"packager": "arduino",
188+
"name": "avrdude",
189+
"version": "6.0.1-arduino5"
190+
}
191+
]
192+
},
147193
{
148194
"name": "Arduino SAM Boards (32-bits ARM Cortex-M3)",
149195
"architecture": "sam",

hardware/arduino/avr/platform.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
77

88
name=Arduino AVR Boards
9-
version=1.6.4
9+
version=1.6.5
1010

1111
# AVR compile variables
1212
# ---------------------
1313

14+
compiler.warning_flags=-w
1415
compiler.warning_flags.none=-w
1516
compiler.warning_flags.default=
1617
compiler.warning_flags.more=-Wall

hardware/arduino/sam/platform.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ version=1.6.3
1111
# SAM3 compile variables
1212
# ----------------------
1313

14+
compiler.warning_flags=-w
1415
compiler.warning_flags.none=-w
1516
compiler.warning_flags.default=
1617
compiler.warning_flags.more=-Wall

0 commit comments

Comments
 (0)