Skip to content

Commit 3d558d2

Browse files
committed
fix for #273 plus typo fix plus uppercase for architecture
1 parent 728756d commit 3d558d2

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ private static void generateDumpFiles(IProgressMonitor monitor) {
7878
String ArchitectureName = Common.getBuildEnvironmentVariable(project, ArduinoConst.ENV_KEY_JANTJE_ARCITECTURE_ID, "");
7979
if (boardName.isEmpty() || PackageName.isEmpty() || ArchitectureName.isEmpty()) {
8080
Common.log(new Status(IStatus.WARNING, ArduinoConst.CORE_PLUGIN_ID, "Skipping project \"" + project.getName()
81-
+ "\" due to missin configuration."));
81+
+ "\" due to missing configuration."));
8282
} else {
8383
boardsSet.add(PackageName + ":" + ArchitectureName + ":" + boardName);
8484
}

it.baeyens.arduino.core/src/it/baeyens/arduino/tools/ArduinoHelpers.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -554,10 +554,11 @@ private static void setTheEnvironmentVariablesSetTheDefaults(IContributedEnviron
554554
// End of Teensy specific settings
555555

556556
if (architecture.equals("avr")) {
557-
Common.setBuildEnvironmentVariable(contribEnv, confDesc, ENV_KEY_compiler_path, makeEnvironmentVar("A.HARDWARE.PATH") + "/tools/avr/bin/");
557+
Common.setBuildEnvironmentVariable(contribEnv, confDesc, ENV_KEY_compiler_path, makeEnvironmentVar(ENV_KEY_HARDWARE_PATH)
558+
+ "/tools/avr/bin/");
558559
} else if (architecture.equals("sam") || architecture.equals("mtk")) {
559560
Common.setBuildEnvironmentVariable(contribEnv, confDesc, ENV_KEY_build_system_path, makeEnvironmentVar(ENV_KEY_PLATFORM_PATH) + "/system");
560-
Common.setBuildEnvironmentVariable(contribEnv, confDesc, ENV_KEY_build_generic_path, makeEnvironmentVar("A.HARDWARE.PATH")
561+
Common.setBuildEnvironmentVariable(contribEnv, confDesc, ENV_KEY_build_generic_path, makeEnvironmentVar(ENV_KEY_HARDWARE_PATH)
561562
+ "/tools/g++_arm_none_eabi/arm-none-eabi/bin");
562563
}
563564

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ public String getArchitecture() {
497497
if (architecture.contains(".")) {
498498
architecture = platformFile.removeLastSegments(2).lastSegment();
499499
}
500-
return architecture;
500+
return architecture.toUpperCase();
501501
}
502502

503503
public String getBoardID() {

0 commit comments

Comments
 (0)