Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'remotes/triddle/master'
- Loading branch information
Showing
8 changed files
with
211 additions
and
597 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,94 +1,84 @@ | ||
| package Device::Firmdata::Role::IO::DeviceSerial; | ||
|
|
||
| use Moose::Role; | ||
| use Device::SerialPort; | ||
| use Symbol qw(gensym); | ||
|
|
||
| with 'Device::Firmdata::Role::IO'; | ||
|
|
||
| has driver => ( is => 'ro', isa => 'Device::SerialPort', required => 1, builder => 'build_driver', lazy => 1 ); | ||
|
|
||
| sub build_portName { | ||
| my ($self) = @_; | ||
|
|
||
| opendir my $dir, "/dev" or die $!; | ||
| my @modems = grep /^cu\.usbmodem/, readdir $dir; | ||
|
|
||
| die "Can't find a modem in /dev ...\n" if @modems < 1; | ||
| die "Don't know which modem to use: @modems\n" if @modems > 1; | ||
|
|
||
| return "/dev/$modems[0]"; | ||
| } | ||
|
|
||
|
|
||
| sub build_driver { | ||
| my ($self) = @_; | ||
|
|
||
| my $driver = Device::SerialPort->new($self->portName()); | ||
| $driver->debug(1); | ||
|
|
||
| #$driver->datatype("raw"); | ||
| $driver->baudrate(57600) or die "Could not set baud: $^E"; | ||
| $driver->databits(8); | ||
| $driver->parity('none') or die "Could not set parity: $^E"; | ||
| $driver->stopbits(1) or die "Could not set stopbits: $^E"; | ||
|
|
||
| $driver->stty_echo(0); | ||
|
|
||
| # Block indefinitely. | ||
| $driver->read_const_time(0); | ||
| $driver->read_char_time(0); | ||
|
|
||
| $driver->write_settings(); | ||
|
|
||
| return $driver; | ||
| } | ||
|
|
||
| sub read { | ||
| my ($self, $bytes) = @_; | ||
|
|
||
| # Device::SerialPort is often returning short strings, and I'm not | ||
| # sure why. It was more expedient to work around that here. | ||
|
|
||
| my $done_buf = ""; | ||
|
|
||
| my $done = 0; | ||
| while ($done < $bytes) { | ||
| my ($bytesRead, $buf) = $self->driver->read($bytes - $done); | ||
| die "Could not read: $!" if $bytesRead < 0; | ||
|
|
||
| if ($done + $bytesRead > $bytes) { | ||
| die "Device::SerialPort is a bastard ($done + $bytesRead > $bytes)"; | ||
| } | ||
|
|
||
| $done_buf .= $buf; | ||
| $done += $bytesRead; | ||
| } | ||
|
|
||
| if (0) { | ||
| use bytes; | ||
| my $ascii = $done_buf; | ||
| $ascii =~ s/([^ -~])/sprintf '\x{%02x}', ord($1)/eg; | ||
| warn "<<< $done ($ascii)\n"; | ||
| } | ||
|
|
||
| return $done_buf; | ||
| } | ||
|
|
||
| sub write { | ||
| my ($self, $content) = @_; | ||
|
|
||
| use bytes; | ||
| my $length = length($content); | ||
| my $written; | ||
|
|
||
| $written = $self->driver->write($content); | ||
|
|
||
| if ($written != $length) { | ||
| die "tried to write $length bytes but only wrote $written: $!"; | ||
| } | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| package Device::Firmdata::Role::IO::DeviceSerial; | ||
|
|
||
| use Moose::Role; | ||
| use Device::SerialPort; | ||
| use Symbol qw(gensym); | ||
|
|
||
| with 'Device::Firmdata::Role::IO'; | ||
|
|
||
| has driver => ( is => 'ro', isa => 'Device::SerialPort', required => 1, builder => 'build_driver', lazy => 1 ); | ||
|
|
||
| sub build_portName { | ||
| my ($self) = @_; | ||
|
|
||
| opendir my $dir, "/dev" or die $!; | ||
| my @modems = grep /^cu\.usbmodem/, readdir $dir; | ||
|
|
||
| die "Can't find a modem in /dev ...\n" if @modems < 1; | ||
| die "Don't know which modem to use: @modems\n" if @modems > 1; | ||
|
|
||
| return "/dev/$modems[0]"; | ||
| } | ||
|
|
||
|
|
||
| sub build_driver { | ||
| my ($self) = @_; | ||
|
|
||
| my $driver = Device::SerialPort->new($self->portName()); | ||
| $driver->debug(1); | ||
|
|
||
| #$driver->datatype("raw"); | ||
| $driver->baudrate(57600) or die "Could not set baud: $^E"; | ||
| $driver->databits(8); | ||
| $driver->parity('none') or die "Could not set parity: $^E"; | ||
| $driver->stopbits(1) or die "Could not set stopbits: $^E"; | ||
|
|
||
| $driver->stty_echo(0); | ||
|
|
||
| $driver->read_const_time(10000); | ||
| $driver->read_char_time(0); | ||
|
|
||
| $driver->write_settings(); | ||
|
|
||
| return $driver; | ||
| } | ||
|
|
||
| sub read { | ||
| my ($self, $bytes) = @_; | ||
| my $buf; | ||
|
|
||
| while(1) { | ||
| my ($bytesRead); | ||
|
|
||
| ($bytesRead, $buf) = $self->driver->read($bytes); | ||
|
|
||
| next if $bytesRead == 0; | ||
|
|
||
| if ($bytesRead != $bytes) { | ||
| die "Tried to read $bytes bytes but only got $bytesRead"; | ||
| } | ||
|
|
||
| last; | ||
| } | ||
|
|
||
| return $buf; | ||
|
|
||
| } | ||
|
|
||
| sub write { | ||
| my ($self, $content) = @_; | ||
|
|
||
| use bytes; | ||
| my $length = length($content); | ||
| my $written; | ||
|
|
||
| $written = $self->driver->write($content); | ||
|
|
||
| if ($written != $length) { | ||
| die "tried to write $length bytes but only wrote $written: $!"; | ||
| } | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| 1; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| package Device::Firmdata::Role::IO::Serial; | ||
|
|
||
| use Moose::Role; | ||
|
|
||
| with 'Device::Firmdata::Role::IO'; | ||
|
|
||
| has fh => ( is => 'ro', isa => 'GlobRef', required => 1, lazy => 1, builder => 'build_fh' ); | ||
|
|
||
| sub build_fh { | ||
| my ($self) = @_; | ||
| my $path = $self->portName; | ||
| my $fh; | ||
|
|
||
| die "Could not open $path for read/write" unless open($fh, '+>', $path); | ||
|
|
||
| return $fh; | ||
| } | ||
|
|
||
| sub read { | ||
| my ($self, $wantBytes) = @_; | ||
| my $bytesLeft = $wantBytes; | ||
| my $readBytes = 0; | ||
| my $outputBuf; | ||
|
|
||
| while($bytesLeft > 0) { | ||
| my $readBuf; | ||
| my $bytesRead = sysread($self->fh, $readBuf, $bytesLeft); | ||
|
|
||
| if ($bytesRead == -1) { | ||
| die "Could not read from fh: $!"; | ||
| } | ||
|
|
||
| $bytesLeft -= $bytesRead; | ||
|
|
||
| $outputBuf .= $readBuf; | ||
| } | ||
|
|
||
| if ($bytesLeft < 0) { | ||
| die "read too much data"; | ||
| } | ||
|
|
||
| return $outputBuf; | ||
| } | ||
|
|
||
| sub write { | ||
| my ($self, $content) = @_; | ||
| my $length = length($content); | ||
| my $bytesLeft = length($content); | ||
|
|
||
| while($bytesLeft > 0) { | ||
| my $bytesSent = syswrite($self->fh, $content, $bytesLeft, $length - $bytesLeft); | ||
|
|
||
| if ($bytesSent == -1) { | ||
| die "could not write to fh: $!"; | ||
| } | ||
|
|
||
| $bytesLeft -= $bytesSent; | ||
| } | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| 1; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,4 +8,4 @@ | |
|
|
||
| my $firmdata = Device::Firmdata->new(config => { @ARGV } ); | ||
|
|
||
| $firmdata->run; | ||
| $firmdata->run; | ||