Merge remote branch 'upstream/master'

Author: Mark Sproul

app/lib/RXTXcomm.jar

@@ -41,9 +41,9 @@
  * files and images, etc) that comes from that.
  */
 public class Base {
-  public static final int REVISION = 20;
+  public static final int REVISION = 21;
   /** This might be replaced by main() if there's a lib/version.txt file. */
-  static String VERSION_NAME = "0020";
+  static String VERSION_NAME = "0021";
   /** Set true if this a proper release rather than a numbered revision. */
   static public boolean RELEASE = false;
 

app/src/processing/app/Base.java

@@ -315,7 +315,7 @@
 
   <target name="linux-run" depends="linux-build" 
 	  description="Run Linux version">
-    <exec executable="linux/work/arduino" dir="linux/work" spawn="false"/>
+    <exec executable="./arduino" dir="linux/work" spawn="false"/>
   </target>
 
   <target name="linux-dist" depends="linux-build" 

build/build.xml

@@ -7,11 +7,11 @@
 
     <!-- all these need to change for new releases -->
     <key>CFBundleGetInfoString</key>
-    <string>0019</string>
+    <string>0021</string>
     <key>CFBundleVersion</key>
-    <string>0019</string>
+    <string>0021</string>
     <key>CFBundleShortVersionString</key>
-    <string>0020</string>
+    <string>0021</string>
     <!-- now stop changing things and get outta here -->
 
     <key>CFBundleAllowMixedLocalizations</key>

build/macosx/template.app/Contents/Info.plist

@@ -1,3 +1,17 @@
+ARDUINO 0021 - 2010.10.02
+
+* Modifying VID / PID combination in 8U2 firmwares.
+* Fixing analogWrite() bug on pins 9 and 10 (Arduino Uno).
+* Patched RXTX to include /dev/ttyACM* on Linux.
+
+ARDUINO 0020 - 2010.09.27
+
+* Added support for the Arduino Uno and Arduino Mega 2560.
+* Including ATmega8U2 firmware used by Uno and Mega 2560.
+* Including source code to optiboot bootloader used by the Uno.
+* Including source code to the stk500v2 bootloader used by Mega 2560.
+* New application icon (by ToDo).
+
 ARDUINO 0019 - 2010.09.03
 
 [core / libraries]

build/shared/revisions.txt

@@ -189,6 +189,8 @@ void init()
 	// this is better for motors as it ensures an even waveform
 	// note, however, that fast pwm mode can achieve a frequency of up
 	// 8 MHz (with a 16 MHz clock) at 50% duty cycle
+        
+        TCCR1B = 0;
 
 	// set timer 1 prescale factor to 64
 	sbi(TCCR1B, CS11);

hardware/arduino/cores/arduino/wiring.c

@@ -1,4 +1,4 @@
-0020 arduino
+0021 arduino
 
 Fix Linux make.sh, etc. scripts
 Test on Linux.