replaced ard-reset-leonardo with an update to ard-reset-arduino

which is now called from Arduino.mk with the --leonardo flag

removed some trailing whitespace

upped version string in Arduino.mk

arduino-mk/Arduino.mk

@@ -19,7 +19,7 @@
 #
 # Original Arduino adaptation by mellis, eighthave, oli.keller
 #
-# Current version: 0.10.5
+# Current version: 0.10.6
 #
 # Refer to HISTORY.md file for complete history of changes
 #
@@ -382,7 +382,7 @@ endif
 #
 ifndef RESET_CMD
     ifeq ($(BOARD_TAG),leonardo)
-       RESET_CMD = $(ARDMK_PATH)/ard-reset-leonardo \
+       RESET_CMD = $(ARDMK_PATH)/ard-reset-arduino --leonardo \
           $(ARD_RESET_OPTS) $(call get_arduino_port)
     else
        RESET_CMD = $(ARDMK_PATH)/ard-reset-arduino \

bin/ard-reset-arduino

@@ -17,6 +17,7 @@ GetOptions(\%Opt,
 	   "verbose!",
 	   "help!",
 	   "info!",
+	   "leonardo!",
 	  );
 
 if ($Opt{help} || $Opt{info})
@@ -32,6 +33,17 @@ foreach my $dev (@ARGV)
     my $p = Device::SerialPort->new($dev)
       or die "Unable to open $dev: $!\n";
 
+    if ($Opt{leonardo})
+    {
+        $p->baudrate(1200);
+        $p->write_settings;
+        $p->close;
+
+        print STDERR "Switching to 1200 baud on $dev\n"
+            if $Opt{verbose};
+    }
+    else
+    {
     my $dt = $Opt{period};
 
     print STDERR "Setting DTR high for ${dt}s on $dev\n"
@@ -42,6 +54,7 @@ foreach my $dev (@ARGV)
 
     $p->pulse_dtr_on($dt * 1000.0);
     }
+  }
 
 ## here endeth the main
 
@@ -62,6 +75,8 @@ ard-reset-arduino - Reset an Arduino
 
     $ ard-reset-arduino --verbose --period=0.1 /dev/cu.usb*
 
+    $ ard-reset-arduino --verbose --leonardo /dev/ttyUSB0
+
 =head1 DESCRIPTION
 
 To reset (most) Arduinos, it's enough to just pulse the DTR line.
@@ -82,6 +97,10 @@ Watch what's going on on STDERR.
 
 Specify the DTR pulse width in seconds.
 
+=item --leonardo
+
+Reset a Leonardo.
+
 =back
 
 =head1 BUGS AND LIMITATIONS

bin/ard-reset-leonardo

@@ -1,12 +0,0 @@
-#! /usr/bin/python
-
-import sys
-import serial
-
-ser = serial.Serial(sys.argv[1], 57600)
-ser.close()
-ser.open()
-ser.close()
-ser.setBaudrate(1200)
-ser.open()
-ser.close()