Add msp432e support to ino2cpp

energia · Jan 25, 2018 · 1ac16aa · 1ac16aa
1 parent 4d9dbb4
commit 1ac16aa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -73,6 +73,7 @@ public class Base {
     archMap.put("cc3200", "cc3200");
     archMap.put("cc3200emt", "cc3200emt");
     archMap.put("msp432", "msp432");
+    archMap.put("msp432e", "msp432e");
     archMap.put("cc2600emt", "cc2600emt");
   }
   static Platform platform;

diff --git a/app/src/processing/app/ino2cpp/java.mk b/app/src/processing/app/ino2cpp/java.mk
@@ -1,8 +1,8 @@
 # JDK specifies the JDK used to build the ino2cpp classes
-JDK ?= $(TOOLS)/vendors/oracle/jdk/jdk1.6.0_37/Linux
+JDK ?= /Library/Java/JavaVirtualMachines/jdk1.8.0_111.jdk/Contents/Home/
 
 # JVM_TARGET specifies the JVM version "targeted" by javac
-JVM_TARGET ?= 1.6
+JVM_TARGET ?= 1.8
 
 # JVM<target>_BOOTCLASSES specifies a target-specific rt.jar to build against
 #
@@ -20,6 +20,7 @@ JVM1.5_BOOTCLASSES ?= $(TOOLS)/vendors/oracle/jdk/1.5.0_22/Linux/jre/lib/rt.jar
 # set default for 1.6
 JVM1.6_BOOTCLASSES ?= $(TOOLS)/vendors/oracle/jdk/jdk1.6.0_37/Linux/jre/lib/rt.jar
 
+JVM1.8_BOOTCLASSES ?= /Library/Java/JavaVirtualMachines/jdk1.8.0_111.jdk/Contents/Home/jre/lib/rt.jar
 # check that the required variables are defined and reference existing files
 ifndef JVM$(JVM_TARGET)_BOOTCLASSES
     $(error JVM$(JVM_TARGET)_BOOTCLASSES must be defined to point to a $(JVM_TARGET) Java Runtime Environment's rt.jar)

diff --git a/app/src/processing/app/preproc/PdePreprocessor.java b/app/src/processing/app/preproc/PdePreprocessor.java
@@ -229,6 +229,7 @@ public int writePrefix(String program, String buildPath,
     // generate main.cpp (it depends on what's in the .ino files)
     if (Base.getArch() == "cc3200emt"
         || Base.getArch() == "msp432"
+        || Base.getArch() == "msp432e"
         || Base.getArch() == "cc2600emt") {
 
         String template = Preferences.get("preproc.main.template");