Skip to content

Commit 1368535

Browse files
committed
More fixes for #272
1 parent 0a42e2a commit 1368535

File tree

3 files changed

+25
-5
lines changed

3 files changed

+25
-5
lines changed

it.baeyens.arduino.common/src/it/baeyens/arduino/common/ArduinoInstancePreferences.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ public static long getStoredPreferenceModificatonStamp() {
366366
return getGlobalLong(KEY_PREFERENCE_MODIFICATION_STAMP);
367367
}
368368

369-
public static void getStoredPreferenceModificatonStamp(long stamp) {
369+
public static void setStoredPreferenceModificatonStamp(long stamp) {
370370
setGlobalValue(KEY_PREFERENCE_MODIFICATION_STAMP, stamp);
371371
}
372372
}

it.baeyens.arduino.core/src/it/baeyens/arduino/ide/connector/ArduinoGetPreferences.java

+12-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ public class ArduinoGetPreferences {
3131
*/
3232
private static boolean arduinoIdeSupportsDumpFiles() {
3333
String IDEVersion = ArduinoInstancePreferences.getArduinoIDEVersion();
34-
if (IDEVersion.equalsIgnoreCase("nightly")) {
35-
return true;
36-
}
3734
if (IDEVersion.trim().split("\\.").length != 3)
3835
return false;
3936
if (IDEVersion.compareTo("1.6.4") > 0) {
@@ -55,6 +52,16 @@ private static boolean newerBoardsAvailable() {
5552
return (preferenceFile.lastModified() != storedPreferenceModificatonStamp);
5653
}
5754

55+
private static void storePreferenceModificationStamp() {
56+
57+
File preferenceFile = Common.getPreferenceFile();
58+
ArduinoInstancePreferences.setStoredPreferenceModificatonStamp(preferenceFile.lastModified());
59+
}
60+
61+
private static void emptyPreferenceModificationStamp() {
62+
ArduinoInstancePreferences.setStoredPreferenceModificatonStamp(-1);
63+
}
64+
5865
/**
5966
* loops through all the projects and finds all board ID's then for each boardID it will create a arduino ide preference dump file
6067
*/
@@ -133,10 +140,12 @@ public static boolean updateArduinoEnvironmentVariablesForAllProjectsIfNeeded()
133140
if (newerBoardsAvailable()) {
134141
deleteAllDumpFiles();
135142
generateDumpFiles(null);
143+
storePreferenceModificationStamp();
136144
return true;
137145
}
138146
return false;
139147
}
148+
emptyPreferenceModificationStamp();
140149
return deleteAllDumpFiles();
141150

142151
}

it.baeyens.arduino.core/src/it/baeyens/arduino/ui/ArduinoPreferencePage.java

+12-1
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,9 @@ public boolean performOk() {
179179
case "1.6.4":
180180
infoMessage = "Arduino IDE " + mArduinoIdeVersion.getStringValue() + " only works with Teensy.";
181181
break;
182+
case "1.6.5":
183+
infoMessage = "Arduino IDE " + mArduinoIdeVersion.getStringValue() + " is currently under test.";
184+
break;
182185
default:
183186
infoMessage = "You are using a version of the Arduino IDE that is unknow or newer than available at the release of this plugin.";
184187
infoMessage += "\nIf it is a newer version please feed back usage results to Jantje.";
@@ -191,8 +194,10 @@ public boolean performOk() {
191194
if (!showError(infoMessage)) {
192195
return false;
193196
}
194-
ArduinoGetPreferences.updateArduinoEnvironmentVariablesForAllProjectsIfNeeded();
197+
195198
super.performOk();
199+
mArduinoIdeVersion.store();
200+
ArduinoGetPreferences.updateArduinoEnvironmentVariablesForAllProjectsIfNeeded();
196201
setWorkSpacePathVariables();
197202

198203
// reset the previous selected values
@@ -326,4 +331,10 @@ private boolean testStatus() {
326331
return false;
327332
}
328333

334+
@Override
335+
protected void performApply() {
336+
mIsDirty = true;
337+
super.performApply();
338+
}
339+
329340
}

0 commit comments

Comments
 (0)