@@ -893,16 +893,7 @@ public Map<String, String> getEnvVars() {
893
893
894
894
895
895
896
- Map <String , String > options = getOptions ();
897
896
898
- KeyValueTree rootData = myTxtFile .getData ();
899
- KeyValueTree menuData = rootData .getChild (getBoardID () + DOT + MENU );
900
- for (Entry <String , String > curOption : options .entrySet ()) {
901
- String menuID = curOption .getKey ();
902
- String SelectedMenuItemID = curOption .getValue ();
903
- KeyValueTree curSelectedMenuItem = menuData .getChild (menuID + DOT + SelectedMenuItemID );
904
- allVars .putAll (curSelectedMenuItem .toKeyValues (ERASE_START , false ));
905
- }
906
897
allVars .putAll (getEnvVarsConfig ());
907
898
allVars .put (ENV_KEY_JANTJE_BOARD_NAME , getBoardName ());
908
899
allVars .put (ENV_KEY_JANTJE_BOARDS_FILE , getReferencingBoardsFile ().toString ());
@@ -956,8 +947,20 @@ public Map<String, String> getEnvVars() {
956
947
}
957
948
}
958
949
950
+ // boards setiings not comming from menu selections
959
951
allVars .putAll (myTxtFile .getAllBoardEnvironVars (getBoardID ()));
960
952
953
+ // board settings from menu selections
954
+ Map <String , String > options = getOptions ();
955
+ KeyValueTree rootData = myTxtFile .getData ();
956
+ KeyValueTree menuData = rootData .getChild (getBoardID () + DOT + MENU );
957
+ for (Entry <String , String > curOption : options .entrySet ()) {
958
+ String menuID = curOption .getKey ();
959
+ String SelectedMenuItemID = curOption .getValue ();
960
+ KeyValueTree curSelectedMenuItem = menuData .getChild (menuID + DOT + SelectedMenuItemID );
961
+ allVars .putAll (curSelectedMenuItem .toKeyValues (ERASE_START , false ));
962
+ }
963
+
961
964
// add the stuff that comes with the plugin that is marked as post
962
965
allVars .putAll (pluginPostProcessingPlatformTxt .getAllEnvironVars (EMPTY ));
963
966
allVars .putAll (pluginPostProcessingBoardsTxt .getEnvVarsTxt ());
0 commit comments