read_afi

[Biblio-RFID.git] / lib / RFID / Serial / 3M810.pm

diff --git a/lib/RFID/Serial/3M810.pm b/lib/RFID/Serial/3M810.pm
index 67b1168..334ffcb 100644 (file)
--- a/lib/RFID/Serial/3M810.pm
+++ b/lib/RFID/Serial/3M810.pm
@@ -3,6 +3,7 @@ package RFID::Serial::3M810;
 use base 'RFID::Serial';
 use RFID::Serial;
 
+use Data::Dump qw(dump);
 use Carp qw(confess);
 use Time::HiRes;
 use Digest::CRC;
@@ -61,16 +62,27 @@ sub cmd {
 
        my $r_len = $port->read(3);
 
-       while ( ! $r_len ) {
+       while ( length($r_len) < 3 ) {
                wait_device;
-               $r_len = $port->read(3);
+               $r_len = $port->read( 3 - length($r_len) );
        }
 
        wait_device;
 
        my $len = ord( substr($r_len,2,1) );
        $data = $port->read( $len );
-       warn "<< ", as_hex($r_len,$data)," $len\n";
+
+       while ( length($data) < $len ) {
+               warn "# short read ", length($data), " < $len\n";
+               wait_device;
+               $data .= $port->read( $len - length($data) );
+       }
+
+       warn "<< ", as_hex($r_len,$data),
+               ' | ',
+               substr($data,-2,2) eq checksum(substr($r_len,1).substr($data,0,-2)) ? 'OK' : 'ERROR',
+               " $len bytes\n";
+
 
        $coderef->( $data ) if $coderef;
 
@@ -96,7 +108,7 @@ cmd(
        my $data = shift;
        my $rest = assert $data => '04 00 11';
        my $hw_ver = join('.', unpack('CCCC', $rest));
-       print "hardware version $hw_ver\n";
+       warn "# 3M 810 hardware version $hw_ver\n";
 });
 
 cmd(
@@ -105,9 +117,15 @@ cmd(
 )});
 }
 
+=head2 inventory
+
+  my @tags = inventory;
+
+=cut
+
 sub inventory {
 
-       my $inventory;
+       my @tags;
 
 cmd( 'FE  00 05', 'scan for tags', sub {
        my $data = shift;
@@ -122,14 +140,88 @@ cmd( 'FE  00 05', 'scan for tags', sub {
                die "wrong length $tl for $nr tags: ",dump( $tags ) if $tl =! $nr * 8;
 
                foreach ( 0 .. $nr - 1 ) {
-                       my $tag = uc(unpack('H16', substr($tags, $_ * 8, 8)));
-                       $invetory->{$tag}++;
+                       push @tags, hex_tag substr($tags, $_ * 8, 8);
                }
        }
 
 });
 
-       return $invetory;
+       warn "# tags ",dump @tags;
+       return @tags;
+}
+
+
+# 3M defaults: 8,4
+# cards 16, stickers: 8
+my $max_rfid_block = 8;
+my $blocks = 8;
+
+sub _matched {
+       my ( $data, $hex ) = @_;
+       my $b = hex2bytes $hex;
+       my $l = length($b);
+       if ( substr($data,0,$l) eq $b ) {
+               warn "_matched $hex [$l] in ",as_hex($data);
+               return substr($data,$l);
+       }
+}
+
+sub read_blocks {
+       my $tag = shift || confess "no tag?";
+       $tag = shift if ref($tag);
+
+       my $tag_blocks;
+       my $start = 0;
+       cmd(
+                sprintf( "02 $tag %02x %02x", $start, $blocks ) => "read_blocks $tag $start/$blocks", sub {
+                       my $data = shift;
+                       if ( my $rest = _matched $data => '02 00' ) {
+
+                               my $tag = hex_tag substr($rest,0,8);
+                               my $blocks = ord(substr($rest,8,1));
+                               warn "# response from $tag $blocks blocks ",as_hex substr($rest,9);
+                               foreach ( 1 .. $blocks ) {
+                                       my $pos = ( $_ - 1 ) * 6 + 9;
+                                       my $nr = unpack('v', substr($rest,$pos,2));
+                                       my $payload = substr($rest,$pos+2,4);
+                                       warn "## pos $pos block $nr ",as_hex($payload), $/;
+                                       $tag_blocks->{$tag}->[$nr] = $payload;
+                               }
+                       } elsif ( my $rest = _matched $data => 'FE 00 00 05 01' ) {
+                               warn "FIXME ready? ",as_hex $test;
+                       } elsif ( my $rest = _matched $data => '02 06' ) {
+                               warn "ERROR ",as_hex($rest);
+                       } else {
+                               warn "FIXME unsuported ",as_hex($rest);
+                       }
+       });
+
+       warn "# tag_blocks ",dump($tag_blocks);
+       return $tag_blocks;
+}
+
+sub read_afi {
+       my $tag = shift;
+       $tag = shift if ref $tag;
+
+       cmd(
+               "0A $tag", "read_afi $tag", sub {
+               my $data = shift;
+
+               if ( my $rest = _matched $data => '0A 00' ) {
+
+                       my $tag = hex_tag substr($rest,0,8);
+                       my $afi = substr($rest,8,1);
+
+                       warn "# SECURITY ", hex_tag($tag), " AFI: ", as_hex($afi);
+
+                       return $afi;
+               } elsif ( my $rest = _matched $data => '0A 06' ) {
+                       warn "ERROR reading security from $tag ", as_hex($data);
+               } else {
+                       warn "IGNORED ",as_hex($data);
+               }
+       });
 }
 
 1