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

diff --git a/scripts/scan.pl b/scripts/scan.pl
index 572864e..d2e18b9 100755
--- a/scripts/scan.pl
+++ b/scripts/scan.pl
@@ -5,40 +5,67 @@ 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;
+my $log;
 
 GetOptions(
-	'loop!'   => \$loop,
-	'only=s', => \$only,
+	'loop!'     => \$loop,
+	'reader=s', => \$reader,
+	'debug+'    => \$debug,
+	'log=s'     => \$log,
 ) || 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 = Biblio::RFID::Reader->new( $reader );
+$Biblio::RFID::debug = $debug;
+
+sub tag {
+	my $tag = shift;
+	return $tag
+		, " AFI: "
+		, uc unpack('H2', $rfid->afi($tag))
+		, " "
+		, dump( $rfid->to_hash( $tag ) )
+		, $/
+		;
 }
 
-use lib 'lib';
+my $saved;
+
+sub iso_date {
+	my @t = localtime(time);
+	return sprintf "%04d-%02d-%02dT%02d:%02d:%02d", $t[5]+1900,$t[4]+1,$t[3],$t[2],$t[1],$t[0];
+}
+
+sub log_tag {
+	my $tag = shift;
+	return if $saved->{tag} or ! $log;
+	my $hash = $rfid->to_hash( $tag );
+	open(my $fh, '>>', $log) || die "$log: $!";
+	print $fh iso_date,",$tag,", $hash->{content}, "\n";
+	close($fh);
+}
 
 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 iso_date," reader ", $rfid->from_reader($tag), " enter ", tag($tag);
+			log_tag $tag;
+		},
+		leave => sub {
+			my $tag = shift;
+			print iso_date," leave ", tag($tag);
+		},
+	);
+
+	warn iso_date," visible: ",join(' ',@visible),"\n";
+
+	sleep 1;
 
 } while $loop;