/[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 5 by dpavlin, Sun Sep 28 18:13:21 2008 UTC revision 10 by dpavlin, Sun Sep 28 22:15:29 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 153  sub writechunk Line 153  sub writechunk
153  {  {
154          my $str=shift;          my $str=shift;
155          my $count = $port->write($str);          my $count = $port->write($str);
156          print ">> ", as_hex( $str ), "\t[$count]\n";          print "#> ", as_hex( $str ), "\t[$count]\n";
157  }  }
158    
159  sub as_hex {  sub as_hex {
# 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 206  sub dispatch { Line 207  sub dispatch {
207          my $patt = substr( str2bytes($pattern), 3 ); # just payload          my $patt = substr( str2bytes($pattern), 3 ); # just payload
208          my $l = length($patt);          my $l = length($patt);
209          my $p = substr( $assert->{payload}, 0, $l );          my $p = substr( $assert->{payload}, 0, $l );
210          warn "## dispatch pattern $pattern [$l] ",dump( $patt, $p );          warn "## dispatch pattern $pattern [$l] ",dump( $patt, $p ) if $debug;
211    
212          if ( $assert->{payload} eq $assert->{expect} ) {          if ( $assert->{payload} eq $assert->{expect} ) {
213                  warn "## no dispatch, payload expected\n";                  warn "## no dispatch, payload expected" if $debug;
214          } elsif ( $p eq $patt ) {          } elsif ( $p eq $patt ) {
215                  # if matched call with rest of payload                  # if matched call with rest of payload
216                  $coderef->( substr( $assert->{payload}, $l ) );                  $coderef->( substr( $assert->{payload}, $l ) );
217          } else {          } else {
218                  warn "## dispatch ignored\n";                  warn "## dispatch ignored" if $debug;
219            }
220    }
221    
222    # my $checksum = checksum( $bytes );
223    # my $checksum = checksum( $bytes, $original_checksum );
224    sub checksum {
225            my ( $bytes, $checksum ) = @_;
226    
227            my $xor = $checksum; # FIXME
228    
229            if ( defined $checksum && $xor ne $checksum ) {
230                    print "checksum doesn't match: ", as_hex($xor), " != ", as_hex($checksum), " data: ", as_hex($bytes), "\n";
231          }          }
232  }  }
233    
# Line 228  sub readchunk { Line 241  sub readchunk {
241          my $length = read_bytes( 1, 'length' );          my $length = read_bytes( 1, 'length' );
242          my $len = ord($length);          my $len = ord($length);
243          my $data = read_bytes( $len, 'data' );          my $data = read_bytes( $len, 'data' );
         my ( $cmd ) = unpack('C', $data );  
244    
245          my $payload  = substr( $data, 0, -2 );          my $payload  = substr( $data, 0, -2 );
246          my $payload_len = length($data);          my $payload_len = length($data);
247          warn "## payload too short $payload_len != $len\n" if $payload_len != $len;          warn "## payload too short $payload_len != $len\n" if $payload_len != $len;
248    
249          my $checksum = substr( $data, -2, 2 );          my $checksum = substr( $data, -2, 2 );
250          # FIXME check checksum          checksum( $header . $length . $payload, $checksum );
251    
252          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";
253    
254          $assert->{len}      = $len;          $assert->{len}      = $len;
255          $assert->{payload}  = $payload;          $assert->{payload}  = $payload;
         $assert->{checksum} = $checksum;  
256    
257          $parser->( $len, $payload, $checksum ) if $parser && ref($parser) eq 'CODE';          $parser->( $len, $payload ) if $parser && ref($parser) eq 'CODE';
258    
259          return $data;          return $data;
260  }  }
Legend:
Removed from v.5  
changed lines
  Added in v.10
  ViewVC Help
Powered by ViewVC 1.1.26