Skip to content

Commit 18a8fa0

Browse files
authored
IEP-1758 GH #1451: On Windows the ESP-IDF Manager is not compatible with latest version of EIM (#1452)
* fix: avoid crash with new eim version * fix: changing the condition to greater then
1 parent aacc821 commit 18a8fa0

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

bundles/com.espressif.idf.core/src/com/espressif/idf/core/tools/EimConstants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ public interface EimConstants
2727

2828
String USER_EIM_DIR = Paths.get(System.getProperty("user.home"), ".espressif", "eim_gui").toString(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
2929

30-
String EIM_JSON_VALID_VERSION = "1.0"; //$NON-NLS-1$
30+
String EIM_JSON_VALID_VERSION = "2.0"; //$NON-NLS-1$
3131
}

bundles/com.espressif.idf.core/src/com/espressif/idf/core/tools/EimIdfConfiguratinParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ private void load() throws IOException, EimVersionMismatchException
4040
eimJson = gson.fromJson(fileReader, EimJson.class);
4141
}
4242

43-
if (!eimJson.getVersion().equals(EimConstants.EIM_JSON_VALID_VERSION))
43+
if (Double.parseDouble(eimJson.getVersion()) > Double.parseDouble(EimConstants.EIM_JSON_VALID_VERSION))
4444
{
45-
throw new EimVersionMismatchException(EimConstants.EIM_JSON_VALID_VERSION,eimJson.getVersion());
45+
throw new EimVersionMismatchException(EimConstants.EIM_JSON_VALID_VERSION, eimJson.getVersion());
4646
}
4747
}
4848

0 commit comments

Comments
 (0)