Fixed MacOS issues with C2k distribution

bing1106 · Oct 28, 2014 · 2a19f81 · 2a19f81
1 parent 5eb949f
commit 2a19f81
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 23 deletions.
diff --git a/app/src/processing/app/debug/Compiler.java b/app/src/processing/app/debug/Compiler.java
@@ -120,16 +120,9 @@ public boolean compile(Sketch sketch,
     	Target t = Base.getTarget();
      	File rtsIncFolder;
      	File rtsLibFolder;
-    	if(Base.isLinux())
-    	{
-     	    rtsIncFolder = new File(new File(new File(t.getFolder(), "..//tools"), "c2000"), "include");
-     	    rtsLibFolder = new File(new File(new File(t.getFolder(), "..//tools"), "c2000"), "lib");
-    	}
-    	else
-    	{
-         	rtsIncFolder = new File(new File(new File(t.getFolder(), "..\\tools"), "c2000"), "include");
-         	rtsLibFolder = new File(new File(new File(t.getFolder(), "..\\tools"), "c2000"), "lib");
-    	}
+
+     	rtsIncFolder = new File(new File(new File(t.getFolder(), "..//tools"), "c2000"), "include");
+     	rtsLibFolder = new File(new File(new File(t.getFolder(), "..//tools"), "c2000"), "lib");
     	rtsIncPath = rtsIncFolder.getAbsolutePath();
     	rtsLibPath = rtsLibFolder.getAbsolutePath();
     }
@@ -405,16 +398,10 @@ else if( boardPreferences.get("build.mcu").equals("TMS320F28069"))
         baseCommandLinker.add("-l" + boardPreferences.get("build.rts"));
         if( boardPreferences.get("build.mcu").equals("TMS320F28027"))
         {
-        	if(Base.isLinux())
-        	{
-        		baseCommandLinker.add(corePath + "/f2802x_common/cmd/F28027.cmd");
-            	baseCommandLinker.add(corePath + "/f2802x_headers/cmd/F2802x_Headers_nonBIOS.cmd");
-        	}
-        	else
-        	{
-        		baseCommandLinker.add(corePath + "\\f2802x_common\\cmd\\F28027.cmd");
-        		baseCommandLinker.add(corePath + "\\f2802x_headers\\cmd\\F2802x_Headers_nonBIOS.cmd");
-        	}
+
+        	baseCommandLinker.add(corePath + "//f2802x_common//cmd//F28027.cmd");
+            baseCommandLinker.add(corePath + "//f2802x_headers//cmd//F2802x_Headers_nonBIOS.cmd");
+
         }
         else if( boardPreferences.get("build.mcu").equals("TMS320F28069"))
         {
@@ -772,7 +759,7 @@ private void execAsynchronouslyShell(List commandList) throws RunnerException {
     try {
         if(arch == "c2000")
         {
-        	if(Base.isLinux())
+        	if(Base.isLinux() || Base.isMacOS())
         	{
         	    String command_line = "";
         	    for(String str:command)

diff --git a/hardware/c2000/cores/c2000/wiring_analog.c b/hardware/c2000/cores/c2000/wiring_analog.c
@@ -33,7 +33,7 @@
 #include "pins_energia.h"
 
 #ifdef TMS320F28027
-#include "F2802x_common/include/F2802x_EPwm_defines.h"
+#include "f2802x_common/include/f2802x_epwm_defines.h"
 #elif defined(TMS320F28069)
 #include "F2806x_common/include/F2806x_EPwm_defines.h"
 #endif

diff --git a/hardware/c2000/cores/c2000/wiring_digital.c b/hardware/c2000/cores/c2000/wiring_digital.c
@@ -70,7 +70,7 @@ void pinMode(uint8_t pin, uint8_t mode)
     {
         //Digital Pins
 	    volatile uint32_t *dir;
-	    volatile uint32_t *sel;
+	    volatile uint8_t *sel;
 	    volatile uint32_t *pud;
 	    uint8_t port = digitalPinToPort(pin);
 	    dir = portDirRegister(port);