--- 3m-810.pl	2009/04/06 13:10:40	29
+++ 3m-810.pl	2009/06/04 13:36:20	41
@@ -19,16 +19,23 @@
 	push @a, scalar localtime() if $a[0] =~ m{^info};
 
 	if ( ! defined $meteor_fh ) {
-		warn "# open connection to $meteor_server";
-		$meteor_fh = IO::Socket::INET->new(
-				PeerAddr => $meteor_server,
-				Timeout => 1,
-		) || warn "can't connect to meteor $meteor_server: $!"; # FIXME warn => die for production
-		$meteor_fh = 0; # don't try again
+		if ( $meteor_fh =
+				IO::Socket::INET->new(
+					PeerAddr => $meteor_server,
+					Timeout => 1,
+				)
+		) {
+			warn "# meteor connected to $meteor_server";
+		} else {
+			warn "can't connect to meteor $meteor_server: $!";
+			$meteor_fh = 0;
+		}
 	}
 
-	warn ">> meteor ",dump( @a );
-	print $meteor_fh "ADDMESSAGE test ",join('|',@a),"\n" if $meteor_fh;
+	if ( $meteor_fh ) {
+		warn ">> meteor ",dump( @a );
+		print $meteor_fh "ADDMESSAGE test ",join('|',@a),"\n"
+	}
 }
 
 my $debug = 0;
@@ -41,6 +48,11 @@
 my $handshake = "none";
 
 my $program_path = './program/';
+my $secure_path = './secure/';
+
+# 3M defaults: 8,4
+my $max_rfid_block = 16;
+my $read_blocks = 8;
 
 my $response = {
 	'd500090400110a0500027250'				=> 'version?',
@@ -101,6 +113,23 @@
 my $tags_data;
 my $visible_tags;
 
+my $item_type = {
+	1 => 'Book',
+	6 => 'CD/CD ROM',
+	2 => 'Magazine',
+	13 => 'Book with Audio Tape',
+	9 => 'Book with CD/CD ROM',
+	0 => 'Other',
+
+	5 => 'Video',
+	4 => 'Audio Tape',
+	3 => 'Bound Journal',
+	8 => 'Book with Diskette',
+	7 => 'Diskette',
+};
+
+warn "## known item type: ",dump( $item_type ) if $debug;
+
 my $port=new Device::SerialPort($device) || die "can't open serial port $device: $!\n";
 warn "using $device $handshake $baudrate $databits $parity $stopbits" if $debug;
 $handshake=$port->handshake($handshake);
@@ -190,6 +219,10 @@
 				meteor( 'write', $tag );
 				write_tag( $tag );
 		}
+		if ( -e "$secure_path/$tag" ) {
+				meteor( 'secure', $tag );
+				secure_tag( $tag );
+		}
 	}
 
 	foreach my $tag ( keys %$last_visible_tags ) {
@@ -206,6 +239,9 @@
 sub read_tag_data {
 	my ($start_block,$rest) = @_;
 	die "no rest?" unless $rest;
+
+	my $last_block = 0;
+
 	warn "## DATA [$start_block] ", dump( $rest ) if $debug;
 	my $tag = uc(unpack('H16',substr( $rest, 0, 8 )));
 	my $blocks = ord(substr($rest,8,1));
@@ -215,14 +251,19 @@
 		warn "## block ",as_hex( $block ) if $debug;
 		my $ord   = unpack('v',substr( $block, 0, 2 ));
 		my $expected_ord = $nr + $start_block;
-		die "got block $ord, expected block $expected_ord from ",dump( $block ) if $ord != $expected_ord;
+		warn "got block $ord, expected block $expected_ord from ",dump( $block ) if $ord != $expected_ord;
 		my $data  = substr( $block, 2 );
 		die "data payload should be 4 bytes" if length($data) != 4;
-		warn sprintf "## tag %9s %02d %s |%-4s|\n", $tag, $ord, as_hex( $data ), $data;
+		warn sprintf "## tag %9s %02d: %s |%-4s|\n", $tag, $ord, as_hex( $data ), $data;
 		$tag_data_block->{$tag}->[ $ord ] = $data;
+		$last_block = $ord;
 	}
 	$tags_data->{ $tag } = join('', @{ $tag_data_block->{$tag} });
-	print "DATA $tag ",dump( $tags_data ), "\n";
+
+	my $item_type_nr = ord(substr( $tags_data->{$tag}, 3, 1 ));
+	print "DATA $tag ",dump( $tags_data ), " item type: ", ( $item_type->{ $item_type_nr } || "UNKWOWN '$item_type_nr' in " . dump( $item_type ) ), "\n";
+
+	return $last_block;
 }
 
 sub read_tag {
@@ -232,23 +273,46 @@
 
 	print "read_tag $tag\n";
 
-	cmd(
-		"D6 00  0D  02      $tag   00   03     1CC4", "read $tag offset: 0 blocks: 3",
-		"D6 00  0F  FE  00 00  05 01   $tag    941A", sub {
-			print "FIXME: tag $tag ready?\n";
-		},
-		"D6 00  1F  02 00", sub { # $tag  03   00 00   04 11 00 01   01 00   31 32 33 34   02 00   35 36 37 38    531F\n";
-			read_tag_data( 0, @_ );
-		},
-	);
+	my $start_block = 0;
+
+	while ( $start_block < $max_rfid_block ) {
+
+		cmd(
+			 sprintf( "D6 00  0D  02      $tag   %02x   %02x     ffff", $start_block, $read_blocks ),
+				"read $tag offset: $start_block blocks: $read_blocks",
+			"D6 00  1F  02 00", sub { # $tag  03   00 00   04 11 00 01   01 00   31 32 33 34   02 00   35 36 37 38    531F\n";
+				$start_block = read_tag_data( $start_block, @_ );
+				warn "# read tag upto $start_block\n";
+			},
+			"D6 00  0F  FE  00 00  05 01   $tag    941A", sub {
+				print "FIXME: tag $tag ready? (expected block read instead)\n";
+			},
+		);
+
+	}
+
+	my $security;
 
 	cmd(
-		"D6 00  0D  02      $tag   03   04     3970", "read $tag offset: 3 blocks: 4",
-		"D6 00  25  02 00", sub { # $tag   04                         03 00   30 30 00 00   04 00   00 00 00 00   
-			read_tag_data( 3, @_ );
+		"D6 00 0B 0A $tag 1234", "check security $tag",
+		"D6 00 0D 0A 00", sub {
+			my $rest = shift;
+			my $from_tag;
+			( $from_tag, $security ) = ( substr($rest,0,8), substr($rest,8,1) );
+			die "security from other tag: ",as_hex( $from_tag ) if $from_tag ne str2bytes( $tag );
+			$security = as_hex( $security );
+			warn "# SECURITY $tag = $security\n";
 		}
 	);
 
+	my $data = $tags_data->{$tag} || die "no data for $tag";
+	my ( $u1, $set_item, $u2, $type, $content, $br_lib, $custom ) = unpack('C4Z16Nl>',$data);
+	my $set   = ( $set_item & 0xf0 ) >> 4;
+	my $total = ( $set_item & 0x0f );
+	my $branch  = $br_lib >> 20;
+	my $library = $br_lib & 0x000fffff;
+	print "TAG $tag [$u1] set: $set/$total [$u2] type: $type '$content' library: $library branch: $branch custom: $custom security: $security\n";
+
 }
 
 sub write_tag {
@@ -257,13 +321,36 @@
 	my $path = "$program_path/$tag";
 
 	my $data = read_file( $path );
+	my $hex_data;
+
+	if ( $data =~ s{^hex\s+}{} ) {
+		$hex_data = $data;
+		$hex_data =~ s{\s+}{}g;
+	} else {
+
+		$data .= "\0" x ( 4 - ( length($data) % 4 ) );
+
+		my $max_len = $max_rfid_block * 4;
+
+		if ( length($data) > $max_len ) {
+			$data = substr($data,0,$max_len);
+			warn "strip content to $max_len bytes\n";
+		}
+
+		$hex_data = unpack('H*', $data);
+	}
 
-	print "write_tag $tag = $data\n";
+	my $len = length($hex_data) / 2;
+	# pad to block size
+	$hex_data .= '00' x ( 4 - $len % 4 );
+	my $blocks = sprintf('%02x', length($hex_data) / 4);
+
+	print "write_tag $tag = ",dump( $data ), " [$len/$blocks] == $hex_data\n";
 
 	cmd(
-		"D6 00  26  04  $tag  00 06 00  04 11 00 01  61 61 61 61  62 62 62 62  63 63 63 63  64 64 64 64  00 00 00 00  FD3B", "write $tag",
-		"D6 00  0D  04 00  $tag  06  AFB1", sub { assert() },
-	) foreach ( 1 .. 3 ); # XXX 3M software does this three times!
+		"d6 00  ff  04  $tag  00 $blocks 00  $hex_data  ffff", "write $tag",
+		"d6 00  0d  04 00  $tag  $blocks  afb1", sub { assert() },
+	); # foreach ( 1 .. 3 ); # XXX 3m software does this three times!
 
 	my $to = $path;
 	$to .= '.' . time();
@@ -271,6 +358,25 @@
 	rename $path, $to;
 	print ">> $to\n";
 
+	delete $tags_data->{$tag};	# force re-read of tag
+}
+
+sub secure_tag {
+	my ($tag) = @_;
+
+	my $path = "$secure_path/$tag";
+	my $data = substr(read_file( $path ),0,2);
+
+	cmd(
+		"d6 00  0c  09  $tag $data 1234", "secure $tag -> $data",
+		"d6 00  0c  09 00  $tag  1234", sub { assert() },
+	);
+
+	my $to = $path;
+	$to .= '.' . time();
+
+	rename $path, $to;
+	print ">> $to\n";
 }
 
 exit;
@@ -305,6 +411,8 @@
 {
 	my $str=shift;
 	my $count = $port->write($str);
+	my $len = length($str);
+	die "wrong write length $count != $len in ",as_hex( $str ) if $count != $len;
 	print "#> ", as_hex( $str ), "\t[$count]\n" if $debug;
 }
 
@@ -343,6 +451,8 @@
 sub assert {
 	my ( $from, $to ) = @_;
 
+	return unless $assert->{expect};
+
 	$from ||= 0;
 	$to = length( $assert->{expect} ) if ! defined $to;
 
@@ -371,17 +481,17 @@
 sub checksum {
 	my ( $bytes, $checksum ) = @_;
 
-	my $xor = crcccitt( substr($bytes,1) );	# skip D6
-	warn "## checksum ",dump( $bytes, $xor, $checksum ) if $debug;
-
 	my $len = ord(substr($bytes,2,1));
 	my $len_real = length($bytes) - 1;
 
 	if ( $len_real != $len ) {
 		print "length wrong: $len_real != $len\n";
-		$bytes = substr($bytes,0,2) . chr($len_real) . substr($bytes,4);
+		$bytes = substr($bytes,0,2) . chr($len_real) . substr($bytes,3);
 	}
 
+	my $xor = crcccitt( substr($bytes,1) );	# skip D6
+	warn "## checksum ",dump( $bytes, $xor, $checksum ) if $debug;
+
 	if ( defined $checksum && $xor ne $checksum ) {
 		print "checksum doesn't match: ", as_hex($xor), " != ", as_hex($checksum), " data: ", as_hex($bytes), "\n";
 		return $bytes . $xor;
@@ -420,7 +530,7 @@
 	} sort { length($a) <=> length($b) } keys %$dispatch;
 	warn "?? payload dispatch to ",dump( $payload, $dispatch, $to ) if $debug;
 
-	if ( defined $to ) {
+	if ( defined $to && $payload ) {
 		my $rest = substr( $payload, length($to) );
 		warn "## DISPATCH payload to with rest", dump( $payload, $to, $rest ) if $debug;
 		$dispatch->{ $to }->( $rest );