rawhid 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f864ececa0852d9cd49c85bd6083ed763f4f1d86
-  data.tar.gz: 6717fde14ea698e27ae14c01c992bb20a729ce03
+  metadata.gz: 6687a92269d84106c45e377dc80e608509ca0ded
+  data.tar.gz: 2b780571990dde4bad71c010a38b682918fd70c2
 SHA512:
-  metadata.gz: 6461914cc74daff2a07c52c69ee1d4314aca19d2287280c5b4df8a3da635b738a848e10272c5d4f3888cfd61ba51dbd73a0d7c2e5bd13a2a9568c86ebd983fa7
-  data.tar.gz: 8469b76678ef69ec201845c96d8b77f29b86441aaf4fde37f4aa9553762cd89b955a6d48f29a1913123b7c26be2a4085cfc4323549aa0b651148ebe3ba687d21
+  metadata.gz: aa031a1b89150e4d4d0522c5f52971e9a61b7dfaeba58ea9fdc0afea1493297a9d2fa2fd56716ae7f31f14016b14d47e77db40a765bf34a5b14e4c4b29807ecb
+  data.tar.gz: df77c46ca12185600d029d3630bec5325d4139c41f877e744aff562b84b531f0c6a1e886b57d515603d010380144a5c4d03f7dbdf31e1a45a70bf5beee945019

data/Rakefile

@@ -1,4 +1,4 @@
 require "bundler/gem_tasks"
 require "rake/extensiontask"
 task :default => :spec
-Rake::ExtensionTask.new 'rawhid'
+Rake::ExtensionTask.new 'teensy_rawhid'

data/ext/teensy_rawhid/teensy_rawhid.c

@@ -14,7 +14,7 @@ VALUE RawHIDError;
 VALUE RawHID_new(VALUE class, VALUE vendorId, VALUE productId) {
   void    *dev = NULL;
   int      vId = NUM2INT(vendorId);
-  int      pId = NUM2INT(pId);
+  int      pId = NUM2INT(productId);
   int      devices_opened = rawhid_open(1, &dev, vId, pId, -1, -1);
   if(devices_opened == 0 || dev == NULL) {
     rb_raise(RawHIDError, "Unable to open device");
@@ -38,9 +38,6 @@ VALUE RawHID_send(int argc, VALUE *argv, VALUE class) {
     return INT2NUM(0);
   }
   int sent = rawhid_send(dev, buf, len, timeout);
-  if(sent == -1) {
-    rb_raise(RawHIDError, "Error sending data to device");
-  }
   return INT2NUM(sent);
 }
 
@@ -66,8 +63,8 @@ VALUE RawHID_recv(int argc, VALUE *argv, VALUE class) {
   }
   int received = rawhid_recv(dev, buf, len, timeout);
   
-  if(received == -1) {
-    rb_raise(RawHIDError, "Error receiving data from device");
+  if(received < 0) {
+    return INT2NUM(received);
   }
   data = rb_str_new(buf, received);
   return data;
@@ -78,8 +75,8 @@ void Init_teensy_rawhid() {
   RawHIDError = rb_define_class_under(RawHID, "RawHIDError", rb_eRuntimeError);
   
   rb_define_singleton_method(RawHID, "new", RawHID_new, 2);
-  rb_define_method(RawHID, "send", RawHID_send, -1);
-  rb_define_method(RawHID, "recv", RawHID_recv, -1);
+  rb_define_method(RawHID, "raw_send", RawHID_send, -1);
+  rb_define_method(RawHID, "raw_recv", RawHID_recv, -1);
   
 }
 

data/lib/rawhid.rb

@@ -1,2 +1,34 @@
 require "rawhid/version"
 require "teensy_rawhid"
+
+class RawHID
+  class RawHIDError
+    def initialize(msg, error_code=nil)
+      @code = error_code
+      super msg
+    end
+    attr_accessor :code
+  end
+  private :raw_send, :raw_recv
+  
+  def send(data, timeout=0)
+    if Array === data
+      data = data.map(&:chr).join
+    end
+    ret = raw_send(data, timeout)
+    if ret > 0
+      ret
+    else
+      raise RawHIDError.new("Failed sending data", ret)
+    end
+  end
+  
+  def recv(len, timeout)
+    ret = raw_recv(len, timeout)
+    if String === data
+      return ret
+    else
+      raise RawHIDError.new("Failed receiving data", ret)
+    end
+  end
+end

data/lib/rawhid/version.rb

@@ -1,3 +1,3 @@
 class RawHID
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rawhid
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Leo P.