pigpio 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fa3d31d3fb44ea838005f5a56348e48e5716cbd
-  data.tar.gz: da12abb9a3d79848a8bd90c522b28640332528e2
+  metadata.gz: 030a9cfb8449fc59b223cd96371aa249dbc86876
+  data.tar.gz: 8e6aabca541f968cacfa06a08f79739bbc1807a2
 SHA512:
-  metadata.gz: 92e28c29a0cc4a88f175d7960ad509356f2aa7b5fd99b6a8a1bf1c03b568ef34ea7df67f17eda4a4bcdaf9f7374095bcd79409ee1931de6f92727637d4bc0c00
-  data.tar.gz: 9b5e95b0514e08aeb557743274958f7c25c446403b16a56140248922c30e87032a0e0010fe0fb25d0e95eec6a59f1cfb7b4c2fc68ea77b0d406299f3bf0c80a4
+  metadata.gz: e79ff833f0475fc2e817f56250def1d4a8d474fce3015ba9a77cb8412f707968e9720825aa686d54dfd2a7db004a0ad1d1fa74c7d55e6ca1a883bd7b1663dd19
+  data.tar.gz: e07c2ce1196b00ea32be4fcfc5fe420f10b5a18b3c13b4ed92044c12ae2401904f581d1efebc0b5f670c75454a2a1d7f96d759d94404e24001ad2014a6ac6e9e

data/README.md

@@ -63,6 +63,8 @@ $ ruby example_led.rb
 
 More sample for this circuit. : [Hare](./example/simple/readme.md)
 
+More sample for other circuit. : [Hare](./example/readme.md)
+
 More document : [GitHub Pages](https://nak1114.github.io/ruby-extension-pigpio/)
 
 ## Development

data/ext/pigpio/pigpio.c

@@ -7,6 +7,7 @@
 static VALUE cCallbackID;
 static VALUE cNativeQueue;
 static VALUE cCallbackError;
+static VALUE cBuffer;
 
 typedef struct{
    uint32_t tick;
@@ -2359,18 +2360,16 @@ associated with handle and writes them to buf.
 . .
      pi: >=0 (as returned by [*pigpio_start*]).
  handle: >=0, as returned by a call to [*serial_open*].
-    buf: an array to receive the read data.
   count: the maximum number of bytes to read.
 . .
 
-Returns the number of bytes read (>=0) if OK, otherwise PI_BAD_HANDLE,
+Returns to buf.ret_code attribute the number of bytes read (>=0) if OK, otherwise PI_BAD_HANDLE,
 PI_BAD_PARAM, PI_SER_READ_NO_DATA, or PI_SER_WRITE_FAILED.
 
-If no data is ready zero is returned.
+The received data is get by the buf.to_s method.
 
 :call-seq:
- serial_read(Integer pi,Integer handle, Integer count) -> Integer (When onError)
- serial_read(Integer pi,Integer handle, Integer count) -> String buf (When Success)
+ serial_read(Integer pi,Integer handle, Integer count) -> Pigpio::Buffer buf
 
 See also: {pigpio site}[http://abyz.me.uk/rpi/pigpio/pdif2.html#serial_read]
 */
@@ -2378,7 +2377,9 @@ VALUE pigpio_rbfn_serial_read(VALUE self, VALUE pi, VALUE handle, VALUE count){
   unsigned countc=NUM2UINT(count);
   VALUE buf=rb_str_new("",countc);//#<Encoding:ASCII-8BIT>;
   int ret=serial_read(NUM2INT(pi), NUM2UINT(handle), (void*)StringValuePtr(buf), countc);
-  return (ret < 0)?INT2NUM(ret):rb_str_resize(buf,ret);
+  return rb_funcall((VALUE)cBuffer, rb_intern("new"), 2,INT2NUM(ret),rb_str_resize(buf,ret));
+
+  //return (ret < 0)?INT2NUM(ret):rb_str_resize(buf,ret);
   //if(ret < 0){buf=Qnil;}
   //return rb_ary_new_from_args(2,buf,INT2NUM(ret));
 }
@@ -2436,13 +2437,14 @@ bit bang serial cyclic buffer to the buffer starting at buf.
 . .
         pi: >=0 (as returned by [*pigpio_start*]).
  user_gpio: 0-31, previously opened with [*bb_serial_read_open*].
-       buf: an array to receive the read bytes.
    bufSize: >=0
 . .
 
-Returns the number of bytes copied if OK, otherwise PI_BAD_USER_GPIO
+Returns to buf.ret_code attribute the number of bytes copied if OK, otherwise PI_BAD_USER_GPIO
 or PI_NOT_SERIAL_GPIO.
 
+The received data is get by the buf.to_s method.
+
 The bytes returned for each character depend upon the number of
 data bits [*data_bits*] specified in the [*bb_serial_read_open*] command.
 
@@ -2451,8 +2453,7 @@ data bits [*data_bits*] specified in the [*bb_serial_read_open*] command.
 * For [*data_bits*] 17-32 there will be four bytes per character.
 
 :call-seq:
- bb_serial_read(Integer pi,Integer user_gpio, Integer bufSize) -> Integer (When onError)
- bb_serial_read(Integer pi,Integer user_gpio, Integer bufSize) -> String  (When Success)
+ bb_serial_read(Integer pi,Integer user_gpio, Integer bufSize) -> Pigpio::Buffer buf
 
 See also: {pigpio site}[http://abyz.me.uk/rpi/pigpio/pdif2.html#bb_serial_read]
 */
@@ -2460,7 +2461,8 @@ VALUE pigpio_rbfn_bb_serial_read(VALUE self, VALUE pi, VALUE user_gpio, VALUE bu
   size_t countc=NUM2SIZET(bufSize);
   VALUE buf=rb_str_new("",countc);//#<Encoding:ASCII-8BIT>;
   int ret=bb_serial_read(NUM2INT(pi), NUM2UINT(user_gpio), (void*)StringValuePtr(buf), countc);
-  return (ret < 0)?INT2NUM(ret):rb_str_resize(buf,ret);
+  return rb_funcall((VALUE)cBuffer, rb_intern("new"), 2,INT2NUM(ret),rb_str_resize(buf,ret));
+  //return (ret < 0)?INT2NUM(ret):rb_str_resize(buf,ret);
   //if(ret < 0){buf=Qnil;}
   //return rb_ary_new_from_args(2,buf,INT2NUM(ret));
 }
@@ -3702,9 +3704,6 @@ This class has some constances for pigpio library.
 */
 void Init_pigpio(void){
   VALUE cPulse,cBscXfer,cNativeQueue;
-/*
-This class has some constances for pigpio library.
-*/
   VALUE cPigpio = rb_define_class("Pigpio", rb_cObject);
   /*
   This module is a ruby binding to pigpio library.
@@ -3864,4 +3863,10 @@ This class has some constances for pigpio library.
   */
   cCallbackError = rb_define_class_under(cPigpio,"CallbackError", rb_eException);
     rb_gc_register_address(&cCallbackError);
+
+  /*
+  The class of Rx buffer.
+  */
+  cBuffer = rb_define_class_under(cPigpio,"Buffer", rb_cString);
+    rb_gc_register_address(&cBuffer);
 }

data/lib/pigpio.rb

@@ -1,5 +1,6 @@
 require "pigpio/version"
 require "pigpio/constant"
+require "pigpio/buffer"
 require "pigpio/pigpio"
 require "pigpio/gpio"
 require "pigpio/user_gpio"

data/lib/pigpio/buffer.rb

@@ -0,0 +1,12 @@
+class Pigpio
+  class Buffer < String
+    attr_reader :ret_code
+    def initialize(ret_code,str=nil)
+      super(str)
+      @ret_code=ret_code
+    end
+    def valid?
+      @ret_code>=0
+    end
+  end
+end

data/lib/pigpio/version.rb

@@ -1,3 +1,3 @@
 class Pigpio
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pigpio
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - nak1114
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-17 00:00:00.000000000 Z
+date: 2019-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,6 +95,7 @@ files:
 - lib/pigpio/bit_bang_serial.rb
 - lib/pigpio/bit_bang_serial_rx.rb
 - lib/pigpio/bit_bang_serial_tx.rb
+- lib/pigpio/buffer.rb
 - lib/pigpio/constant.rb
 - lib/pigpio/gpio.rb
 - lib/pigpio/i2c.rb