phidget_rfid 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bd085dc7bff0f4795a65b3b782dfb73425f836d
-  data.tar.gz: 13a7a824e52d5cf517b1c9ca79ec9ecf83f87fc3
+  metadata.gz: 5f540fa42d23fb177b3bae2479ac9f6db647d572
+  data.tar.gz: 9d7565c710aa1af6e6158e61057ce9a6f3c77566
 SHA512:
-  metadata.gz: bc6543af66cf7bbbca5c4d7904c637f2ce1c03e35c0062d2190789b6d5b4becf38434b7c5fea69ec1fc23f0792541cb3d30bba18d5a7d1671f6d5827278bf0a1
-  data.tar.gz: 0a89a8eeb24ff464ec5dbae77654085f136b4bbbcb31062091d512d86cd0dfef0df1d116dc8fa722a8eb1c177c2b9be921406d936d497c2bf66da7eedff99ee8
+  metadata.gz: 2fabdf786486dc5fcf1df49407946a520c01c4b1db00c2d11e707af712569b032e1bfb98fef2be438b8caed70ff8d2822882287287ee08b4aac1bdab4237b889
+  data.tar.gz: c4c8b6ea576635b6493231ce0f8e149220695449b96ccde98f338cf67c8924b037634aee4db36de66aff87480b3dc319538d2bf416240af6a6811f52b17274ff

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/README.md

@@ -4,12 +4,12 @@ This is a simple ruby program to work with the Phidget RFID in the console
 
 ## Installation:
 
-gem install phitdget_rfid
+gem install phidget_rfid
 
 
 ## Usage:
 ```
-phitdget_rfid
+phidget_rfid
 ```
 
 And then you can use the help command
@@ -27,4 +27,4 @@ RFID> help
       exit - Exit from program
    You can type "help <command>" for more info
    ------------------------------
-```
+```

data/lib/phidget_rfid/commands.rb

@@ -7,12 +7,12 @@ module PhidgetRfid
         private
         extend CLI::Task
         
-        @rfid
+        
 
         public
 
-        def initialize (rfid)
-          @rfid = rfid
+        def initialize (r)
+          @rfid_handler = r
         end
       
       
@@ -20,16 +20,25 @@ module PhidgetRfid
         desc 'Reads the value from the connected RFID tag'
 
         def read(params)
-            puts @rfid.read
+            puts @rfid_handler.read
         end
 
 
 
         usage 'Usage: write "string to write" <protocol> <lock>'
-        desc 'Writes the provided text into the RFID tag. Protocols: EM4100, ISO11785_FDX_B, PhidgetTAG, 1'
+        desc 'Writes the provided text into the RFID tag. Protocols: EM4100, ISO11785_FDX_B, PhidgetTAG, 1.\nHave in mind that if the TAG is blank you need to write it for the first time with the PhidgetTAG protocol'
+
 
         def write(params)
-            puts @rfid.write params[0] unless params.empty?
+            
+            if params.size == 1
+                puts @rfid_handler.write params[0]
+            elsif params.size == 2
+                puts @rfid_handler.write params[0], params[1]
+            elsif params.size == 3
+                
+                puts  @rfid_handler.write params[0], params[2], params[3]
+            end
         end
 
 
@@ -38,7 +47,7 @@ module PhidgetRfid
         desc 'Displays the current tag protocol'
 
         def protocol(params)
-            puts @rfid.protocol
+            puts @rfid_handler.protocol
         end
 
 
@@ -54,14 +63,14 @@ module PhidgetRfid
         desc 'Displays: reader id, serial number and state, Antenna and Led state. Library API version'
         
         def device(params)
-          puts @rfid.device
+          puts @rfid_handler.device
         end
         
         usage 'Usage: log'
         desc 'Shows the event log'
         
         def log(params)
-          puts @rfid.log
+          puts @rfid_handler.log
         end
 
 

data/lib/phidget_rfid/rfid_handler.rb

@@ -1,36 +1,36 @@
 module PhidgetRfid
   class RfidHandler
-    @rfid
+    @phidget
     @prompt
     @time
     attr_accessor :log
     
     def initialize()
-      @rfid = Phidgets::RFID.new
+      @phidget = Phidgets::RFID.new
       @time = Time.new
       @prompt = "at #{@time.strftime("%Y-%m-%d %H:%M:%S")} \033[0m"
       @log = ""
       
-      @rfid.on_detach  do |device, obj|
+      @phidget.on_detach  do |device, obj|
         @log.append "\n#{device.attributes.inspect} removed"
       end
       
-      @rfid.on_attach  do |device, obj|
-        @rfid.antenna = true
-        @rfid.led = false
+      @phidget.on_attach  do |device, obj|
+        @phidget.antenna = true
+        @phidget.led = false
       end
       
-      @rfid.on_error do |device, obj, code, description|
+      @phidget.on_error do |device, obj, code, description|
         @log << "\033[31m\nError #{code}: #{description} #{@prompt}" 
       end
       
-      @rfid.on_tag  do |device, tag, obj|
-        @rfid.led = true
+      @phidget.on_tag  do |device, tag, obj|
+        @phidget.led = true
         @log << "\n\033[32m[+] #{protocol} tag detected #{@prompt}" 
       end
       
-      @rfid.on_tag_lost do |device, tag, obj|
-        @rfid.led = false
+      @phidget.on_tag_lost do |device, tag, obj|
+        @phidget.led = false
         @log << "\n\033[33m[-] #{protocol} tag removed #{@prompt}"
       end
       
@@ -38,19 +38,28 @@ module PhidgetRfid
     end
     
     def protocol
-      if(@rfid.attached?)
-        @rfid.last_tag_protocol
+      if(@phidget.attached?)
+        @phidget.last_tag_protocol
       end
     end
     
     def read
-      if(@rfid.attached?)
-        @rfid.last_tag
+      if(@phidget.attached?)
+        @phidget.last_tag
       end
     end
     
-    def write(value, protocol = @rfid.last_tag_protocol, lock = false)
-      if(@rfid.attached?)
+    def write(value, protocol = nil, lock = false)
+      if (protocol == nil)
+        protocol = 
+          if @phidget.tag_present
+            @phidget.last_tag_protocol
+          else
+            "EM4100"
+          end
+      end
+
+      if(@phidget.attached?)
         p = protocol.to_sym
 
         if lock
@@ -58,19 +67,21 @@ module PhidgetRfid
           puts "Protocol: #{p}"
           puts "Are you sure you want to lock the RFID Tag? This will make it read-only (y/N)"
           r = gets.chomp
-          @rfid.write value, p, true if r == "y"
-
+          @phidget.write(value, p, true) if r == "y"
+        else
+          @phidget.write(value, p)
         end
 
+
       end
     end
     
     def device
       puts "Library Version: #{Phidgets::FFI.library_version}"
-      puts "Class: #{device.device_class}"
-      puts "Id: #{device.id}"
-      puts "Serial number: #{device.serial_number}"
-      puts "# Digital Outputs: #{device.outputs.size}"
+      puts "Class: #{@phidget.device_class}"
+      puts "Id: #{@phidget.id}"
+      puts "Serial number: #{@phidget.serial_number}"
+      puts "Digital Outputs: #{@phidget.outputs.size}"
     end
     
     

data/lib/phidget_rfid/version.rb

@@ -1,3 +1,3 @@
 module PhidgetRfid
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phidget_rfid
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Luis Fontes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-16 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler