dominic/Arduino-Makefile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

removed some trailing whitespace

upped version string in Arduino.mk
This commit is contained in:
Simon John 2013-06-14 11:10:12 +02:00
parent 9b38631d61
commit c798eb26ea
3 changed files with 41 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arduino-mk/Arduino.mk
View file

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

19
bin/ard-reset-arduino
View file

@ -17,6 +17,7 @@ GetOptions(\%Opt,
"verbose!", "verbose!",
"help!", "help!",
"info!", "info!",
"leonardo!",
); );
if ($Opt{help} || $Opt{info}) if ($Opt{help} || $Opt{info})
@ -32,6 +33,17 @@ foreach my $dev (@ARGV)
my $p = Device::SerialPort->new($dev) my $p = Device::SerialPort->new($dev)
or die "Unable to open $dev: $!\n"; 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}; my $dt = $Opt{period};
print STDERR "Setting DTR high for ${dt}s on $dev\n" print STDERR "Setting DTR high for ${dt}s on $dev\n"
@ -41,6 +53,7 @@ foreach my $dev (@ARGV)
unless $dt > 0.0; unless $dt > 0.0;
$p->pulse_dtr_on($dt * 1000.0); $p->pulse_dtr_on($dt * 1000.0);
}
} }
## here endeth the main ## 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 --period=0.1 /dev/cu.usb*
$ ard-reset-arduino --verbose --leonardo /dev/ttyUSB0
=head1 DESCRIPTION =head1 DESCRIPTION
To reset (most) Arduinos, it's enough to just pulse the DTR line. 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. Specify the DTR pulse width in seconds.
=item --leonardo
Reset a Leonardo.
=back =back
=head1 BUGS AND LIMITATIONS =head1 BUGS AND LIMITATIONS

12
bin/ard-reset-leonardo
View file

@ -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()