/[RFID]/3m-810.pl
This is repository of my old source code which isn't updated any more. Go to git.rot13.org for current projects!
ViewVC logotype

Diff of /3m-810.pl

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 7 by dpavlin, Sun Sep 28 18:19:37 2008 UTC revision 8 by dpavlin, Sun Sep 28 22:10:55 2008 UTC
# Line 103  dispatch( Line 103  dispatch(
103    
104                          my @tags;                          my @tags;
105                          push @tags, substr($tags, $_ * 8, 8) foreach ( 0 .. $nr - 1 );                          push @tags, substr($tags, $_ * 8, 8) foreach ( 0 .. $nr - 1 );
106                          warn "## tags ",as_hex($tags), " [$tl] = ",dump( $tags );                          warn "## tags ",as_hex($tags), " [$tl] = ",dump( $tags ) if $debug;
107                          print "seen $nr tags: ", join(',', map { unpack('H16', $_) } @tags ) , "\n";                          print "seen $nr tags: ", join(',', map { unpack('H16', $_) } @tags ) , "\n";
108                  }                  }
109  ) }  ) }
# Line 161  sub as_hex { Line 161  sub as_hex {
161          foreach my $str ( @_ ) {          foreach my $str ( @_ ) {
162                  my $hex = unpack( 'H*', $str );                  my $hex = unpack( 'H*', $str );
163                  $hex =~ s/(..)/$1 /g if length( $str ) > 2;                  $hex =~ s/(..)/$1 /g if length( $str ) > 2;
164                    $hex =~ s/\s+$//;
165                  push @out, $hex;                  push @out, $hex;
166          }          }
167          return join('  ', @out);          return join(' | ', @out);
168  }  }
169    
170  sub read_bytes {  sub read_bytes {
# Line 218  sub dispatch { Line 219  sub dispatch {
219          }          }
220  }  }
221    
222    # my $checksum = checksum( $bytes );
223    # my $checksum = checksum( $bytes, $original_checksum );
224    sub checksum {
225            my ( $bytes, $checksum ) = @_;
226            my $xor = 0;
227    
228            if ( defined $checksum && $xor ne $checksum ) {
229                    printf "checksum doesn't match: %04x != %04x data: %s\n", $xor, $checksum;
230            }
231    }
232    
233  sub readchunk {  sub readchunk {
234          my ( $parser ) = @_;          my ( $parser ) = @_;
235    
# Line 228  sub readchunk { Line 240  sub readchunk {
240          my $length = read_bytes( 1, 'length' );          my $length = read_bytes( 1, 'length' );
241          my $len = ord($length);          my $len = ord($length);
242          my $data = read_bytes( $len, 'data' );          my $data = read_bytes( $len, 'data' );
         my ( $cmd ) = unpack('C', $data );  
243    
244          my $payload  = substr( $data, 0, -2 );          my $payload  = substr( $data, 0, -2 );
245          my $payload_len = length($data);          my $payload_len = length($data);
246          warn "## payload too short $payload_len != $len\n" if $payload_len != $len;          warn "## payload too short $payload_len != $len\n" if $payload_len != $len;
247    
248          my $checksum = substr( $data, -2, 2 );          my $checksum = substr( $data, -2, 2 );
249          # FIXME check checksum          checksum( $header . $length . $payload, $checksum );
250    
251          print "<< ",as_hex( $header ), " [$len] ", as_hex( $payload ), "checksum: ", as_hex( $checksum ),"\n";          print "<< ",as_hex( $header ), " [$len] ", as_hex( $payload ), " | sum: ",as_hex($checksum),"\n";
252    
253          $assert->{len}      = $len;          $assert->{len}      = $len;
254          $assert->{payload}  = $payload;          $assert->{payload}  = $payload;
         $assert->{checksum} = $checksum;  
255    
256          $parser->( $len, $payload, $checksum ) if $parser && ref($parser) eq 'CODE';          $parser->( $len, $payload ) if $parser && ref($parser) eq 'CODE';
257    
258          return $data;          return $data;
259  }  }

Legend:
Removed from v.7  
changed lines
  Added in v.8

  ViewVC Help
Powered by ViewVC 1.1.26