Merge branch 'master' of https://github.com/chipKIT32/chipKIT32-MAX

app/src/processing/app/Base.java

@@ -54,9 +54,9 @@ public class Base {
   static Logger logger = Logger.getLogger(Base.class.getName());
 
 
-  public static final int REVISION = 23;
+  public static final int REVISION = 150;
   /** This might be replaced by main() if there's a lib/version.txt file. */
-  static String VERSION_NAME = "0023";
+  static String VERSION_NAME = "0150";
   /** Set true if this a proper release rather than a numbered revision. */
   static public boolean RELEASE = false;
 

build/build.xml

@@ -201,7 +201,7 @@
       </filterchain>
     </loadfile>
     <!-- <echo message="base revision is ${revision.base}." /> -->
-
+    <echo message="revision.base: ${revision.base} compared to revision ${revision}" />
     <condition property="revision.correct">
       <!-- Using contains because I can't figure out how to get rid of the
 	   LF in revision.base. Please file a bug if you have a fix. -->
@@ -314,13 +314,11 @@
 	  <gunzip src="macosx/template.dmg.gz" dest="macosx/working.dmg" />
 		-->
     <mkdir dir="macosx/working_dir" />
-    <!--
 	  <copy todir="macosx/working_dir">
 		  <fileset dir="macosx/work">
 			  <exclude name="**/mpideTestSuite/**" />
 		  </fileset>
     </copy>
-    -->
 	  <copy file="macosx/dist/FTDIUSBSerialDriver_v2_2_18.dmg" todir="macosx/working_dir" />
 
 
@@ -915,33 +913,16 @@ Description: chipKIT MPIDE Development environment
 
     <unzip dest="windows/work" src="windows/jre.zip" overwrite="false"/>
 
-    <!--
-    <zip basedir="windows/work"
-	 prefix="mpide-${version}"
-	 destfile="windows/mpide-${version}.zip" />
-    <zip basedir="windows/work"
-	 prefix="mpide-${version}"
-	 destfile="windows/mpide-${version}-expert.zip"
-	 excludes="java/**" />
-    -->
-
     <zip destfile="windows/mpide-${version}.zip">
       <zipfileset dir="windows/work"
 		  prefix="mpide-${version}" />
     </zip>
 
-    <zip destfile="windows/mpide-${version}-expert.zip">
-      <zipfileset dir="windows/work"
-		  prefix="mpide-${version}"
-		  excludes="java/**" />
-    </zip>
-
     <echo>
       =======================================================
       mpide for Windows was built. Grab the archive from
 
       windows/mpide-${version}.zip
-      windows/mpide-${version}-expert.zip
       =======================================================
     </echo>
   </target>

build/shared/examples/1.Basics/Blink/Blink.pde

@@ -1,14 +1,17 @@
 /*
   Blink
   Turns on an LED on for one second, then off for one second, repeatedly.
- 
+
   This example code is in the public domain.
  */
+#if !defined(PIN_LED1)
+  #define PIN_LED1 13
+#endif
 
-void setup() {                
+void setup() {
   // initialize the digital pin as an output.
   // Pin PIN_LED1 has an LED connected on most Arduino and compatible boards:
-  pinMode(PIN_LED1, OUTPUT);     
+  pinMode(PIN_LED1, OUTPUT);
 }
 
 void loop() {

build/upload.properties

@@ -1,8 +1,8 @@
-#Tue, 19 Aug 2014 18:38:28 -0700
+#Thu, 20 Aug 2015 17:37:53 -0700
 aws.access_key=
 aws.secret_key=
 
 extension=dmg
 
-uploadversion=0023-macosx-20140819-test
+uploadversion=0150-macosx-20150820