--- 3m-810.pl	2008/09/28 22:15:29	10
+++ 3m-810.pl	2008/10/03 12:31:58	18
@@ -39,6 +39,8 @@
 
 L<perl(1)>
 
+L<http://stackoverflow.com/questions/149617/how-could-i-guess-a-checksum-algorithm>
+
 =head1 AUTHOR
 
 Dobrica Pavlinusic <dpavlin@rot13.org> L<http://www.rot13.org/~dpavlin/>
@@ -102,26 +104,59 @@
 			die "wrong length $tl for $nr tags: ",dump( $tags ) if $tl =! $nr * 8;
 
 			my @tags;
-			push @tags, substr($tags, $_ * 8, 8) foreach ( 0 .. $nr - 1 );
+			push @tags, uc(unpack('H16', substr($tags, $_ * 8, 8))) foreach ( 0 .. $nr - 1 );
 			warn "## tags ",as_hex($tags), " [$tl] = ",dump( $tags ) if $debug;
-			print "seen $nr tags: ", join(',', map { unpack('H16', $_) } @tags ) , "\n";
+			print "seen $nr tags: ", join(',', @tags ) , "\n";
+
+			# XXX read first tag
+			read_tag( @tags );
+
 		}
 ) }
 
 ) foreach ( 1 .. 100 );
 
-cmd( 'D6 00  0D  02      E00401003123AA26   00   03     1CC4', 'read offset: 0 blocks: 3' );
+my $read_cached;
 
-#     D6 00  1F  02 00   E00401003123AA26   03   00 00   04 11 00 01   01 00   30 30 30 30   02 00   30 30 30 30    E5F4
-warn "D6 00  1F  02 00   E00401003123AA26   03   00 00   04 11 00 01   01 00   31 32 33 34   02 00   35 36 37 38    531F\n";
+sub read_tag {
+	my ( $tag ) = @_;
 
-cmd( 'D6 00  0D  02      E00401003123AA26   03   04     3970', 'read offset: 3 blocks: 4' );
+	print "read_tag $tag\n";
+	return if $read_cached->{ $tag }++;
 
-#     D6 00  25  02 00   E00401003123AA26   04                         03 00   30 30 00 00   04 00   00 00 00 00   
-#                                                                      05 00   00 00 00 00   06 00   00 00 00 00    B9BA
-warn "D6 00  25  02 00   E00401003123AA26   04                         03 00   39 30 31 32   04 00   33 34 35 36
-                                                                       05 00   00 00 00 00   06 00   00 00 00 00    524B\n";
-warn "D6 00  0F  FE  00 00  05 01   E00401003123AA26  941A ##### ready?\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", "$tag ready?", sub {
+dispatch(	"D6 00  1F  02 00   $tag   ", sub { # 03   00 00   04 11 00 01   01 00   31 32 33 34   02 00   35 36 37 38    531F\n";
+			my $rest = shift || die "no rest?";
+			warn "## DATA ", dump( $rest ) if $debug;
+			my $blocks = ord(substr($rest,0,1));
+			my @data;
+			foreach my $nr ( 0 .. $blocks - 1 ) {
+				my $block = substr( $rest, 1 + $nr * 6, 6 );
+				warn "## block ",as_hex( $block ) if $debug;
+				my $ord   = unpack('v',substr( $block, 0, 2 ));
+				die "got block $ord, expected block $nr from ",dump( $block ) if $ord != $nr;
+				my $data  = substr( $block, 2 );
+				die "data payload should be 4 bytes" if length($data) != 4;
+				warn sprintf "## tag %08s %02d %s |%-4s|\n", $tag, $ord, as_hex( $data ), $data;
+				$data[ $ord ] = $data;
+			}
+			$read_cached->{ $tag } = join('', @data);
+			print "DATA $tag ",dump( $read_cached->{ $tag } ), "\n";
+		})
+	});
+
+	#        D6 00  1F  02 00   $tag   03   00 00   04 11 00 01   01 00   30 30 30 30   02 00   30 30 30 30    E5F4
+if (0) {
+	cmd(    "D6 00  0D  02      $tag   03   04     3970", 'read offset: 3 blocks: 4' );
+
+	#        D6 00  25  02 00   $tag   04                         03 00   30 30 00 00   04 00   00 00 00 00   
+	#                           $tag                              05 00   00 00 00 00   06 00   00 00 00 00    B9BA
+	warn "?? D6 00  25  02 00   $tag   04                         03 00   39 30 31 32   04 00   ....\n";
+}
+	warn "?? D6 00  0F  FE  00 00  05 01   $tag  941A ##### ready?\n";
+
+}
 
 for ( 1 .. 3 ) {
 
@@ -153,7 +188,7 @@
 {
 	my $str=shift;
 	my $count = $port->write($str);
-	print "#> ", as_hex( $str ), "\t[$count]\n";
+	print "#> ", as_hex( $str ), "\t[$count]" if $debug;
 }
 
 sub as_hex {
@@ -219,16 +254,39 @@
 	}
 }
 
+use Digest::CRC;
+
+sub crcccitt {
+	my $bytes = shift;
+	my $crc = Digest::CRC->new(
+		# midified CCITT to xor with 0xffff instead of 0x0000
+		width => 16, init => 0xffff, xorout => 0xffff, refout => 0, poly => 0x1021, refin => 0,
+	) or die $!;
+	$crc->add( $bytes );
+	pack('n', $crc->digest);
+}
+
 # my $checksum = checksum( $bytes );
 # my $checksum = checksum( $bytes, $original_checksum );
 sub checksum {
 	my ( $bytes, $checksum ) = @_;
 
-	my $xor = $checksum; # FIXME
+	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);
+	}
 
 	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;
 	}
+	return $bytes . $checksum;
 }
 
 sub readchunk {
@@ -262,10 +320,9 @@
 sub str2bytes {
 	my $str = shift || confess "no str?";
 	my $b = $str;
-	$b =~ s/\s+(\S\S)(\S\S)+\s*/ $1 $2/;	# fix checksum
-	$b =~ s/\s+$//;
-	$b =~ s/\s+/\\x/g;
-	$b = '"\x' . $b . '"';
+	$b =~ s/\s+//g;
+	$b =~ s/(..)/\\x$1/g;
+	$b = "\"$b\"";
 	my $bytes = eval $b;
 	die $@ if $@;
 	warn "## str2bytes( $str ) => $b => ",as_hex($bytes) if $debug;
@@ -276,6 +333,9 @@
 	my ( $cmd, $cmd_desc, $expect, $expect_desc, $coderef ) = @_;
 	my $bytes = str2bytes( $cmd );
 
+	# fix checksum if needed
+	$bytes = checksum( substr( $bytes, 0, -2 ), substr( $bytes, -2, 2 ) );
+
 	warn ">> ", as_hex( $bytes ), "\t## $cmd_desc\n";
 	$assert->{send} = $cmd;
 	writechunk( $bytes );