X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=scripts%2Fscan.pl;h=5d3fe3c23ac0d27cf41042dadfc3e2448a8eb965;hb=9d7698d4ac2b5fc73df2d40a5413f0e190d61b4c;hp=572864efb7d86d43fd8baffcf0dafa06c449187e;hpb=90500f732ecab1f13b8cb9b994156c0793520da3;p=Biblio-RFID.git

diff --git a/scripts/scan.pl b/scripts/scan.pl
index 572864e..5d3fe3c 100755
--- a/scripts/scan.pl
+++ b/scripts/scan.pl
@@ -5,40 +5,47 @@ use strict;
 
 use Data::Dump qw(dump);
 use Getopt::Long;
+use lib 'lib';
+use RFID::Biblio::Reader;
+use RFID::Biblio::RFID501;
 
 my $loop = 0;
-my $only;
+my $reader;
+my $debug = 0;
 
 GetOptions(
-	'loop!'   => \$loop,
-	'only=s', => \$only,
+	'loop!'     => \$loop,
+	'reader=s', => \$reader,
+	'debug+'    => \$debug,
 ) || die $!;
 
-my @readers = ( '3M810', 'CPRM02' );
-my @rfid;
-
-foreach my $reader ( @readers ) {
-	next if $only && $only ne $reader;
-	my $module = "RFID::Serial::$reader";
-	eval "use $module";
-	die $@ if $@;
-	if ( my $rfid = $module->new( device => '/dev/ttyUSB0' ) ) {
-		push @rfid, $rfid;
-		warn "# added $module\n";
-	} else {
-		warn "# ignored $module\n";
-	}
+my $rfid = RFID::Biblio::Reader->new( $reader );
+$RFID::Biblio::debug = $debug;
+
+sub tag {
+	my $tag = shift;
+	return $tag
+		, " AFI: "
+		, uc unpack('H2', $rfid->afi($tag))
+		, " "
+		, dump( RFID::Biblio::RFID501->to_hash( $rfid->blocks($tag) ) )
+		, $/
+		;
 }
 
-use lib 'lib';
-
 do {
-	foreach my $rfid ( @rfid ) {
-		my $visible = $rfid->scan;
-		foreach my $tag ( keys %$visible ) {
-		warn "XXX $tag";
-			print ref($rfid),"\t$tag\t", join('', @{ $visible->{$tag} }), $/;
-		}
-	}
+	my @visible = $rfid->tags(
+		enter => sub {
+			my $tag = shift;
+			print localtime." enter $tag ", tag($tag);
+
+		},
+		leave => sub {
+			my $tag = shift;
+			print localtime." leave $tag ", tag($tag);
+		},
+	);
+
+	warn localtime." visible: ",join(' ',@visible),"\n";
 
 } while $loop;