nfclib 0.0.128 → 0.0.136

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9aa76f9d24205d6d1be2c84a17d72f90181b5772
-  data.tar.gz: 1784f373e270807a65f1ed3b28a60181f141e35d
+  metadata.gz: 3dd7616b9d33ec7f2cbccda0a98f61f88bb4c2be
+  data.tar.gz: 9580f9caa21caaedb64fcdb4422f8be9b1b20e19
 SHA512:
-  metadata.gz: 509197bfc7bf3deaf94dabc5b27eb9b7c271a19f957e6854388f5fd9c76c56885a558165789dc40f96a07501dba60ae7dd3883f4f259c6bacf537d0123fa744a
-  data.tar.gz: 939e608a5a176e1dc364f884691c94029d78cef622bbb1e88a14d15de4e75f417c28099be0238bae0533c8ad9b24e3eb52fdbbad2da069b2d4f6626830875a4e
+  metadata.gz: d3f87ff89ad122a248a161379e10703e78d323215980681e6e755d54e30b5cadae9b4ecdf8b91df7e04de072cbf162e3fe9940a3512070b0e8de80db5c357831
+  data.tar.gz: 6b0c01c300fdaf803a46e1d49a48f6830785fd5b08cdf71bfd44d96c611627ad3dc60d5f8e7b8d015fdbef3cf9391faf7e76542b7dfd53ef9a044b0df1d4d94a

data/ext/nfclib.c

@@ -8,6 +8,9 @@
 #include <ctype.h>
 #include "nfclib.h"
 
+#define DEBUG 0
+#define COMMAND 0
+#define DATA 1
 void (**nfc_what_happens_if)(nfc_reader* x) = NULL;
 int what_happens_len;
 int what_happens_max_len;
@@ -57,7 +60,7 @@ void* nfc_reader_on_tag(nfc_reader* x,void (*y)(nfc_reader*)){
 /* # }}}*/
 
 /* nfc_reader_init # {{{ */
-nfc_reader* nfc_reader_init(const char* name, int mem_len) {
+nfc_reader* nfc_reader_init(const char* name) {
   nfc_reader* xptr;
   nfc_reader x;
   int len = strlen(name);
@@ -91,10 +94,6 @@ nfc_reader* nfc_reader_init(const char* name, int mem_len) {
   x.what_happens_len = 0;
   x.what_happens_max_len = 0;
   x.nfc_what_happens_if=NULL;
-  x.tag_mem_max_len = mem_len;
-  x.tag_mem_len = 0;
-  x.tag_mem_block_len = 4 ;
-  x.tag_mem = (unsigned char*) malloc(sizeof(unsigned char)*(mem_len*((x.tag_mem_block_len)+1))) ;
   xptr = malloc(sizeof(nfc_reader)*1);
   *xptr = x;
   return xptr;
@@ -106,104 +105,88 @@ void* nfc_reader_do(void* y){
     nfc_reader* x= y;
     int write_pos = 0;
     int i;
+    int command_modus = COMMAND;
     int j=0;
     int limit = -1;
     int len = x->command_len;
     int read_bytes;
     int b_read =0;
-    int tries = 0;
-    int max_tries = 2;
     unsigned char bcc = 0;
-    unsigned char ucmd [50];
     fd_set set;
     int written_bytes;
     struct timeval timeout;
     timeout.tv_sec=1;
     timeout.tv_usec=0;
-    for(i=0;i<len;i++){
-      if(isalpha((x->command)[i])){
-        ucmd[j++] = (x->command)[i];
-      }
-      if(isdigit((x->command)[i])){
-        int temp = (x->command)[i++] - '0';
-        while(i<len && isdigit((x->command)[i])){
-          temp *= 10;
-          temp += (x->command)[i++] - '0';
-        }
-        if(temp>255) 
-          byebye("Adresse zu groß");
-        ucmd[j++] = temp;
-        if(i==len)
-          break;
-      }
-    }
+    uint8_t* cmd_ptr = x->command;
     /*CLEAR */
     written_bytes = write(x->fh,"\0",1);
-    ucmd[j] = '\0';
     x->write_puffer[write_pos++] = 2;
     x->write_puffer[write_pos++] = 255;
-    x->write_puffer[write_pos++] = ustrlen(ucmd);
-    for(i=0;i<ustrlen(ucmd);i++)
-      x->write_puffer[write_pos++] = ucmd[i];
-    for(i=1;i<(len)+3;i++) 
+    x->write_puffer[write_pos++] = len;
+    for(i=0;i<len;i++){
+      if(isspace(cmd_ptr[i])){
+        command_modus=DATA;
+        (x->write_puffer)[2]--;
+        continue;
+      }
+      if(command_modus==COMMAND)
+        x->write_puffer[write_pos++] = cmd_ptr[i];
+      else{
+        char temp[3];
+        temp[0]=cmd_ptr[i++];
+        temp[1]=cmd_ptr[i];
+        temp[2]='\0';
+        (x->write_puffer)[2]--;
+        long digi = strtol(temp,NULL,16); 
+        x->write_puffer[write_pos++] = digi;
+      }
+    }
+    for(i=1;i<((x->write_puffer)[2])+3;i++) 
       bcc ^= x->write_puffer[i];
     x->write_puffer[write_pos++] = bcc;
     x->write_puffer[write_pos++] = 3;
-/*    for(i=0;i<write_pos;i++)
+#if DEBUG
+    for(i=0;i<write_pos;i++)
       fprintf(stderr,"written: %d\n",(x->write_puffer)[i]);
-*/    
-    
-    for(tries=0;tries<max_tries;){
-      written_bytes = write(x->fh,x->write_puffer,write_pos);
-      if(written_bytes != write_pos){
-        fprintf(stderr,"Error while writing\n");
-        return y;
-      }
-      j=0;
-      while(1){
-        /* INITIALIZE FD READ SET */
-        FD_ZERO (&set);
-        FD_SET (x->fh,&set);
-        
-        if(select(FD_SETSIZE,&set,NULL,NULL,&timeout)>0){
-          if((read_bytes=read(x->fh,x->read_puffer,37))>0){
-            for(i=0;i<read_bytes;i++,j++)
-              (x->reddit)[j] = (x->read_puffer)[i];
-            
-            if(j>2 && limit==-1) limit=(x->reddit)[2]+5;
-            b_read+=read_bytes;
-          }
-          if(b_read==limit) {
-            x->reddit_len = b_read;
-            tries=max_tries;
-            break;
-          }
-          if(limit!=-1 && b_read>limit){
-            /*
-            fprintf(stdout,"Error. Read too many bytes\n");
-            */
-            x->reddit_len = 0;
-            break;
-          }
-        }
-        else{
-  /*        
-          int ii= 0;
-          fprintf(stderr,"Read Bytes: %d\n",b_read);
-          fprintf(stderr,"Expected: %d\n",limit);
+#endif    
+    written_bytes = write(x->fh,x->write_puffer,write_pos);
+    if(written_bytes != write_pos){
+      fprintf(stderr,"Error while writing\n");
+      return y;
+    }
+    j=0;
+    while(1){
+      /* INITIALIZE FD READ SET */
+      FD_ZERO (&set);
+      FD_SET (x->fh,&set);
+      
+      if(select(FD_SETSIZE,&set,NULL,NULL,&timeout)>0){
+        if((read_bytes=read(x->fh,x->read_puffer,37))>0){
+          for(i=0;i<read_bytes;i++,j++)
+            (x->reddit)[j] = (x->read_puffer)[i];
           
-          for(ii=0;ii<b_read;ii++)
-            fprintf(stderr,"Read: %d\n",(x->reddit)[ii]);
-          fprintf(stdout,"Could not catch the correct length of the answer\n");
-  */
+          if(j>2 && limit==-1) limit=(x->reddit)[2]+5;
+          b_read+=read_bytes;
+        }
+        if(b_read==limit) {
+          x->reddit_len = b_read;
+          break;
+        }
+        if(limit!=-1 && b_read>limit){
+          /*
+          fprintf(stdout,"Error. Read too many bytes\n");
+          */
           x->reddit_len = 0;
           break;
         }
       }
-      tries++;
-      if(nfc_what_happens_if!=NULL)
-        nfc_what_happens_if[(0)](x);
+      else{
+        x->reddit_len = 0;
+        break;
+      }
     }
+    if(nfc_what_happens_if!=NULL)
+      nfc_what_happens_if[(0)](x);
     return y;  /*Bessere Returns; */
 }
 /*  # }}}*/
@@ -288,93 +271,6 @@ void* nfc_reader_read(void *y){
   }
 }
 /* # }}}*/
-/* # {{{  nfc_reader_read_mem */
-void nfc_reader_read_mem(nfc_reader* x){
-
-  int i,count;
-  unsigned char* tag_mems= x->tag_mem;
-  char str[10];
-  x->tag_mem[0] ='\0';
-  nfc_set_cmd(x,"s");
-  nfc_reader_do(x);
-  nfc_reader_do(x);
-  for(i=4;i<8;i++){
-/*  for(i=4;i<(x->tag_mem_max_len);i++){ */
-    x->reddit_len = 0;
-    while((x->reddit_len)==0){
-      sprintf(str,"r%d",i);
-      nfc_set_cmd(x,str);
-      nfc_reader_do(x);
-/*      
-      fprintf(stdout,"READ_MEM: %d\n",x->reddit_len);
-*/      
-      if((x->reddit_len)==(5+(x->tag_mem_block_len))){
-        int j;
-        int hex;
-        char test[9];
-        char temp[3];
-        char* ptemp = &(temp[0]);
-        char* p_test= &(test[0]);
-        if((x->reddit)[6] == 0) break;
-        for(j=3;j<((x->reddit_len)-2);j++){
-/*          fprintf(stdout,"%02x ",(x->reddit)[j]);
-*/
-          sprintf(ptemp,"%02x",(x->reddit)[j]);
-          if(j==3){
-            strcpy(p_test,ptemp);
-            if(i==4) strcpy((x->tag_mem),ptemp);
-            else strcat(tag_mems,ptemp);
-            tag_mems+=4;
-            *tag_mems='\0';
-            tag_mems++;
-          }
-          else{
-            strcat(p_test,ptemp);
-            strcat(tag_mems,ptemp);
-            tag_mems+=4;
-            *tag_mems='\0';
-            tag_mems++;
-          }
-        }
-/*        
-        hex = (int)strtol(p_test,NULL,16);
-        fprintf(stdout,"%s\n",p_test);
-        fprintf(stdout,"%d\n",hex);
-        fprintf(stdout,"\n");
-*/
-      }
-/*
-      if((x->nfc_what_happens_if)!=NULL){
-        for(count=0;count<(x->what_happens_len);count++)
-          (x->nfc_what_happens_if)[(count)](x);
-      }
-*/
-      if((x->reddit_len)==0 || (x->reddit_len)==6){
-        nfc_set_cmd(x,"s");
-        nfc_reader_do(x);
-        x->reddit_len = 0;
-      }
-    }
-    if((x->reddit)[6] == 0) break;
-
-  }
-  
-  for(i=0;i<(x->tag_mem_max_len);i+=((x->tag_mem_block_len)+1)){
-    if((x->tag_mem)[i]=='\0') break;
-/*
-    else {
-      fprintf(stdout,"String: %s",(x->tag_mem));
-      fprintf(stdout,"HUCH: %c \n",(x->tag_mem)[5]);
-      fprintf(stdout,"HUCH: %c \n",(x->tag_mem)[10]);
-      fprintf(stdout,"\n");
-    }
-*/
-  }
-  sleep(1);
-  nfc_set_cmd(x,"dp");
-  nfc_reader_do(x);
-}
-/* # }}}  */
 
 /* nfc_reader_1_read # {{{ */
 void* nfc_reader_1_read(void *y){
@@ -442,8 +338,6 @@ int nfc_reader_destroy(nfc_reader* x){
       free(x->nfc_port);
     if((x->nfc_what_happens_if) != NULL)
       free((x->nfc_what_happens_if));
-    if((x->tag_mem)!=NULL)
-      free(x->tag_mem);
     free(x);
   }
   return 0;

data/ext/nfclib.h

@@ -14,10 +14,6 @@ typedef struct nfc_struct{
   uint8_t write_puffer[100];
   uint8_t* reddit;
   int reddit_len;
-  unsigned char* tag_mem;
-  int tag_mem_max_len;
-  int tag_mem_len;
-  int tag_mem_block_len;
   uint8_t command[100];
   int command_len;
   int what_happens_len;
@@ -28,7 +24,7 @@ typedef struct nfc_struct{
 
 void* nfc_reader_on_tag(nfc_reader* x,void (*y)(nfc_reader*));
 
-nfc_reader* nfc_reader_init(const char* name,int mem_len);
+nfc_reader* nfc_reader_init(const char* name);
 int nfc_reader_stop_poll(nfc_reader*);
 int nfc_reader_poll( nfc_reader*);
 int nfc_reader_destroy(nfc_reader* x);
@@ -39,5 +35,4 @@ void set_cmd(nfc_reader *x,char * y);
 int ustrlen(unsigned char* str);
 int nfc_set_cmd(nfc_reader* x,char* str);
 void* nfc_reader_1_read(void *y);
-void nfc_reader_read_mem(nfc_reader* x);
 #endif /* NFCLIB_H */

data/ext/rathalos.c

@@ -0,0 +1,89 @@
+#include "nfclib.h"
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+void my_nfc_func1(nfc_reader* x) {
+  int i;
+  fprintf(stdout,"Hex...\n");
+  for(i=0;i<x->reddit_len;i++)
+    fprintf(stdout,"%x\t",(x->reddit)[i]);
+  fprintf(stdout,"\n");
+
+return;
+}
+void my_nfc_func2(nfc_reader* x) {
+  int i;
+  fprintf(stdout,"Character...\n");
+  for(i=0;i<x->reddit_len;i++)
+    fprintf(stdout,"%c\t",(x->reddit)[i]);
+  fprintf(stdout,"\n");
+
+return;
+}
+void my_nfc_func3(nfc_reader* x) {
+  int i;
+  fprintf(stdout,"Dezimal Zahlen...\n");
+  for(i=0;i<x->reddit_len;i++)
+    fprintf(stdout,"%d\t",(x->reddit)[i]);
+  fprintf(stdout,"\n");
+
+return;
+}
+void my_nfc_func4(nfc_reader* x) {
+  fprintf(stdout,"ALLE_DURCH\n");
+return;
+}
+
+void* cancel_thread(void* y){
+  nfc_reader *x = y;
+  int ret;
+  sleep(30);
+  ret= nfc_reader_stop_poll(x);
+  if(!ret)
+    fprintf(stdout,"Killed Poll.\n");
+  else
+    fprintf(stdout,"Couldn't kill Poll\n");
+  return NULL;
+}
+
+int main(int argc,char *argv[]) {
+
+  nfc_reader* x;  
+  int rc,i,j;
+  if(argc < 2)
+    byebye("Please set a command as first parameter (-n if you dont want to send a command)\nList of useful commands:\nv....gets Version\nvs Data.... Sets Version (255 255 for Firmware Version)\nb.... Gets Serialnumber\nre Adress.... Read EEPROM (Look at manual for specific addresses and values)\nwe Adress.... Write EEPROM\ndp.... Lower Polling Mode\ndd.... Lower Detection Mode\nx.... Reset\n-n...Do nothing\n");
+ 
+    x = nfc_reader_init("/dev/ttyUSB0");
+   
+    nfc_set_cmd(x,argv[1]);
+    if(strcmp(argv[1],"-n"))
+      nfc_reader_do(x);
+    fprintf(stdout,"Und was kam zurueck: \n");
+    for(i=0;i<x->reddit_len;i++)
+    fprintf(stdout,"%x\t",(x->reddit)[i]);
+    fprintf(stdout,"\n");
+    for(i=0;i<x->reddit_len;i++)
+    fprintf(stdout,"%c\t",(x->reddit)[i]);
+    fprintf(stdout,"\n");
+    for(i=0;i<x->reddit_len;i++)
+    fprintf(stdout,"%d\t",(x->reddit)[i]);
+    fprintf(stdout,"\n");
+    
+    nfc_reader_on_tag(x,&my_nfc_func1);
+    nfc_reader_on_tag(x,&my_nfc_func2);
+    nfc_reader_on_tag(x,&my_nfc_func3);
+    nfc_reader_on_tag(x,&my_nfc_func4);
+/*
+    
+   
+    rc = pthread_create(&thread2,NULL,&cancel_thread,x);
+    if(rc!=0)
+      byebye("Could not create thread\n");
+
+    nfc_reader_poll(x);
+    pthread_join(thread2,NULL); 
+*/
+    nfc_reader_destroy(x);
+  return 0;
+}

data/lib/nfc.rb

@@ -6,7 +6,7 @@ module NFC
     ffi_lib ::File.dirname(__FILE__) + '/nfclib.so'
     callback :on_tag_callback, [:pointer], :void
     attach_function :nfc_reader_on_tag, [:pointer,:on_tag_callback], :pointer
-    attach_function :nfc_reader_init, [:string,:int], :pointer
+    attach_function :nfc_reader_init, [:string], :pointer
     attach_function :nfc_reader_poll, [:pointer], :int
     attach_function :nfc_reader_stop_poll, [:pointer], :int
     attach_function :nfc_reader_destroy, [:pointer], :int
@@ -43,28 +43,48 @@ module NFC
     end
 
     def hex
-      @res.map{|e| e.to_s(16) }
+    #  @res.map{|e| e.to_s(16) }
+      @res.map{|e| "%02x" % e }.join
     end
     def dec
       @res
     end
+    def zero #{{{
+      checker = true
+      @res.each do |x|
+        if x!=0
+          checker = false
+        end
+      end
+      checker
+    end #}}}
+
+    def high #{{{
+      checker = true
+      @res.each do |x|
+        if x!=255
+          checker = false
+        end
+      end
+      checker
+    end #}}}
+
+    @res
   end #}}}
 
   class Reader
     attr_reader :reader
-    attr_accessor :serialnr 
-    def initialize(tty = "/dev/ttyUSB0",mem_len=36) #{{{
-      @reader = NFC.nfc_reader_init(tty,mem_len)
+    attr_reader :serialnr 
+    def initialize(tty = "/dev/ttyUSB0") #{{{
+      @reader = NFC.nfc_reader_init(tty)
       @thread = nil
       @serialnr = nil
       command('x')
 
-      begin
-        @serialnr = command('b')
-      end while @serialnr == nil
-      p "SERIAL"
-      p @serialnr
-      p '-' * 24
+ #     begin
+ #       @serialnr = command('b')
+ #     end while @serialnr == nil
+ #     @serialnr = @serialnr.unpack("C*").map{|e| "%02x" % e}.join
       Signal::trap("INT") do
         puts 'stopping...'
         stop_poll
@@ -76,7 +96,12 @@ module NFC
       obj = Struct.new(@reader)
       NFC.nfc_set_cmd(@reader,cmd)
       NFC.nfc_reader_do(@reader)
-      obj[:reddit].read_string(obj[:reddit_len])[3..-3] 
+      if (obj[:reddit].read_string(obj[:reddit_len])[3..-3]== nil)
+        temp = nil
+      else
+        temp=Result.new(obj[:reddit].read_string(obj[:reddit_len])[3..-3])
+      end
+      temp
     end #}}}
 
     def command_print(cmd) #{{{

data/nfclib.gemspec

@@ -1,14 +1,15 @@
 Gem::Specification.new do |s|
   s.name = 'nfclib'
-  s.version = '0.0.128'
+  s.version = '0.0.136'
   s.date = '2014-08-05'
   s.summary ="NFC-Reader Library."
   s.description ="Executes command and gets results in c, everthing else ruby-yo"
   s.authors = ["Florian Stertz"]
   s.email = ['florian.stertz@gmail.com']
-  s.files = Dir['ext/extconf.rb'] + Dir['lib/nfc.rb'] + ['nfclib.gemspec','README.md'] + Dir['ext/nfclib.c'] + Dir['ext/nfclib.h']
+  s.files = Dir['ext/extconf.rb'] + Dir['lib/nfc.rb'] + ['nfclib.gemspec','README.md'] + Dir['ext/nfclib.c'] + Dir['ext/nfclib.h'] + Dir['ext/rathalos.c']
   s.platform = Gem::Platform::RUBY
   s.require_paths = ['lib']
   s.extensions = Dir['ext/extconf.rb']
   s.homepage = 'https://github.com/Triarier/lagiacrus'
+  s.add_runtime_dependency 'ffi', '>=1.9.10', '~>1.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nfclib
 version: !ruby/object:Gem::Version
-  version: 0.0.128
+  version: 0.0.136
 platform: ruby
 authors:
 - Florian Stertz
@@ -9,7 +9,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2014-08-05 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.9.10
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.9.10
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
 description: Executes command and gets results in c, everthing else ruby-yo
 email:
 - florian.stertz@gmail.com
@@ -22,6 +42,7 @@ files:
 - ext/extconf.rb
 - ext/nfclib.c
 - ext/nfclib.h
+- ext/rathalos.c
 - lib/nfc.rb
 - nfclib.gemspec
 homepage: https://github.com/Triarier/lagiacrus
@@ -43,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: NFC-Reader Library.