X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=scripts%2Fscan.pl;h=ec61fd5cfe17f277f1099d055431cd02a7e0f704;hb=bb93f2432b71bed8fed19472e014efa3a2063b68;hp=13fda835407ed309e532c1156da351afa6e83297;hpb=148d0dd6989f24ebc2964ed0a92f4c311890057a;p=Biblio-RFID.git

diff --git a/scripts/scan.pl b/scripts/scan.pl
index 13fda83..ec61fd5 100755
--- a/scripts/scan.pl
+++ b/scripts/scan.pl
@@ -5,31 +5,49 @@ use strict;
 
 use Data::Dump qw(dump);
 use Getopt::Long;
+use lib 'lib';
+use Biblio::RFID::Reader;
+use Biblio::RFID::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 = Biblio::RFID::Reader->new( $reader );
+$Biblio::RFID::debug = $debug;
 
-use lib 'lib';
+sub tag {
+	my $tag = shift;
+	return $tag
+		, " AFI: "
+		, uc unpack('H2', $rfid->afi($tag))
+		, " "
+		, dump( Biblio::RFID::RFID501->to_hash( $rfid->blocks($tag) ) )
+		, $/
+		;
+}
 
 do {
-	foreach my $reader ( '3M810', 'CPRM02' ) {
-		next if $only && $only ne $reader;
-		my $module = "RFID::Serial::$reader";
-		eval "use $module";
-		die $@ if $@;
-		my $rfid = $module->new( device => '/dev/ttyUSB0' );
-		my $visible = $rfid->scan;
-		foreach my $tag ( keys %$visible ) {
-		warn "XXX $tag";
-			print "$reader\t$tag\t", join('', @{ $visible->{$tag} }), $/;
-		}
-	}
+	my @visible = $rfid->tags(
+		enter => sub {
+			my $tag = shift;
+			print localtime()." enter ", tag($tag);
+
+		},
+		leave => sub {
+			my $tag = shift;
+			print localtime()." leave ", tag($tag);
+		},
+	);
+
+	warn localtime()." visible: ",join(' ',@visible),"\n";
+
+	sleep 1;
 
 } while $loop;