pigpio 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01a1c4e0c688be24b237155ef8958a86515efae4
-  data.tar.gz: 31044e1d6f588ea3f45edb2fb3dc575508caa9da
+  metadata.gz: ae7b18135589bcb43797bce679c5d1a4ec093f51
+  data.tar.gz: a49b60e57149655c2242612994dadb348a86648d
 SHA512:
-  metadata.gz: d5be365ff9e98fad14a67ba8922f3450cf23093a27d1443b9e09547e20a8cc7d4cc28c2259f03c1ea6762559fd2ae896388d821641e6cab7ed9085cdcd17fb53
-  data.tar.gz: 1eaff222417c95031107ee21b7723a6caf2655b7f6f9275ff6483c58b27046b6e516fdf9535146062b4d73907ae7588095a027c1b1f3bf38f6aa1c0e2523952a
+  metadata.gz: ec4005fd2cc6357b47ea11a92149a3892c87a474f55ee51997bbe7ff626dd81189b64155409b5921269b99e093b570cf0108fe4c3cc86b7053ad85396da7dbb1
+  data.tar.gz: 01cdfa852106e01722161e337834c5d446f6cff73757549b9d8748acd9e01dfc9b6c776400bccc729950c28decfe208ffba9226f5689ab24b4fe0f1ccc467ca4

data/check.txt

@@ -1,15 +1,15 @@
 o	"pigpio_start",      
 o	"pigpio_stop",       
-	"set_mode",          
-	"get_mode",          
-	"set_pull_up_down",  
-	"gpio_read",         
-	"gpio_write",        
+-	"set_mode",          
+-	"get_mode",          
+-	"set_pull_up_down",  
+-	"gpio_read",         
+-	"gpio_write",        
 o	"time_time",         
 o	"pigpio_error",      
 o	"pigpiod_if_version",
 	"set_watchdog",         
-	"set_glitch_filter",    
+-	"set_glitch_filter",    
 	"set_noise_filter",     
 o	"get_current_tick",     
 o	"get_hardware_revision",
@@ -34,15 +34,15 @@ o	"get_pigpio_version",
 	"wave_get_high_cbs",    
 	"wave_get_max_cbs",     
 	"gpio_trigger",         
-	"set_PWM_dutycycle",    
-	"get_PWM_dutycycle",    
-	"set_PWM_range",        
-	"get_PWM_range",        
-	"get_PWM_real_range",   
-	"set_PWM_frequency",    
-	"get_PWM_frequency",    
-	"set_servo_pulsewidth", 
-	"get_servo_pulsewidth", 
+-	"set_PWM_dutycycle",    
+-	"get_PWM_dutycycle",    
+-	"set_PWM_range",        
+-	"get_PWM_range",        
+-	"get_PWM_real_range",   
+-	"set_PWM_frequency",    
+-	"get_PWM_frequency",    
+-	"set_servo_pulsewidth", 
+-	"get_servo_pulsewidth", 
 	"notify_open",          
 	"notify_begin",         
 	"notify_pause",         
@@ -57,9 +57,9 @@ o	"get_pigpio_version",
 	"hardware_PWM",         
 	"wave_add_generic",        
 	"wave_add_serial",         
-	"wave_chain",              
-	"callback",                
-	"callback_cancel",         
+o	"wave_chain",              
+-	"callback",                
+-	"callback_cancel",         
 	"wait_for_edge",           
 	"event_callback",          
 	"event_callback_cancel",   

data/example/simple/readme.md

@@ -4,6 +4,17 @@
 
 ![board_image](./board.svg)
 
+## GPIO sample
+
+[Script is here.](./led.rb)
+
+LED will light 3 times.
+
+```sh
+$ sudo pigpiod
+$ ruby led.rb
+```
+
 ## PWM sample
 
 [Script is here.](./pwm.rb)
@@ -25,3 +36,14 @@ LED will light, while you release the button.
 $ sudo pigpiod
 $ ruby callback.rb
 ```
+
+## WAVE sample
+
+[Script is here.](./wave.rb)
+
+LED will light 3 times.
+
+```sh
+$ sudo pigpiod
+$ ruby wave.rb
+```

data/example/simple/wave.rb

@@ -0,0 +1,24 @@
+require "pigpio"
+include Pigpio::Constant
+pi=Pigpio.new()
+unless pi.connect
+  exit -1
+end
+
+led=pi.gpio(4)
+led.mode=PI_OUTPUT
+led.pud=PI_PUD_OFF
+
+wave=pi.wave
+wave.add_new
+wave.add_generic([
+  wave.pulse(0x10,0x00,1000000),
+  wave.pulse(0x00,0x10,1000000),
+])
+wid=wave.create
+wave.chain([255,0,wid,255,1,3,0])
+while wave.tx_busy
+  sleep 0.1
+end
+wave.clear
+

data/ext/pigpio/pigpio.c

@@ -130,6 +130,9 @@ void pigpio_rbst_callback_id_dmark(void* _self){
 }
 void pigpio_rbst_callback_id_dfree(void* _self){
   callback_id_t *self=(callback_id_t *)_self;
+  if(self->id >= 0){
+    (*(self->cancel))(self->id);
+  }
   xfree(self);
   return;
 }
@@ -1387,11 +1390,31 @@ The code is currently dimensioned to support a chain with roughly
 
 
 :call-seq:
- wave_chain(Integer pi, [Integer] buf) -> Integer
+ wave_chain(Integer pi, Object buf) -> Integer
+
+The arg buf is binary stirng or integer array.
 
 See also: {pigpio site}[http://abyz.me.uk/rpi/pigpio/pdif2.html#wave_chain]
 */
 VALUE pigpio_rbfn_wave_chain(VALUE self,VALUE pi, VALUE buf){
+  VALUE rbuf;
+  int ret;
+  switch (TYPE(buf)) {
+  case T_STRING:
+    rbuf=buf;
+    break;
+  case T_ARRAY:
+    rbuf=rb_funcall((VALUE)buf, rb_intern("pack"), 1,rb_str_new2("c*"));
+    break;
+  case T_FIXNUM:
+  default:
+    rb_raise(rb_eTypeError, "not valid value");
+    break;
+  }
+  ret=wave_chain(NUM2INT(pi),StringValuePtr(rbuf), RSTRING_LEN(rbuf));
+  RB_GC_GUARD(rbuf);
+  return INT2NUM(ret);
+/*
   unsigned bufSize=rb_array_len(buf);
   char bufc[bufSize];
   unsigned i;
@@ -1399,6 +1422,7 @@ VALUE pigpio_rbfn_wave_chain(VALUE self,VALUE pi, VALUE buf){
     bufc[i]=(char)FIX2INT(rb_ary_entry(buf,i));
   }
   return INT2NUM( wave_chain(NUM2INT(pi),bufc, bufSize));
+*/
 }
 /*
 This function returns the id of the waveform currently being
@@ -1432,12 +1456,12 @@ transmitted.
 Returns 1 if a waveform is currently being transmitted, otherwise 0.
 
 :call-seq:
- wave_tx_busy(Integer pi) -> Integer
+ wave_tx_busy(Integer pi) -> Boolean
 
 See also: {pigpio site}[http://abyz.me.uk/rpi/pigpio/pdif2.html#wave_tx_busy]
 */
 VALUE pigpio_rbfn_wave_tx_busy(VALUE self,VALUE pi){
-  return INT2NUM(wave_tx_busy(NUM2INT(pi)));
+  return wave_tx_busy(NUM2INT(pi)) ? Qtrue : Qfalse ;
 }
 /*
 This function stops the transmission of the current waveform.

data/lib/pigpio.rb

@@ -5,6 +5,7 @@ require "pigpio/gpio"
 require "pigpio/user_gpio"
 require "pigpio/pwm"
 require "pigpio/bank"
+require "pigpio/wave"
 
 class Pigpio
   def initialize(addr=nil,port=nil,&blk)
@@ -40,5 +41,8 @@ class Pigpio
   def gpio(gpio)
     (gpio<32 ? UserGPIO : GPIO).new(@pi,gpio)
   end
+  def wave()
+    Wave.new(@pi)
+  end
   
 end

data/lib/pigpio/version.rb

@@ -1,3 +1,3 @@
 class Pigpio
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/pigpio/wave.rb

@@ -0,0 +1,78 @@
+class Pigpio
+  class Wave
+    def initialize(pi)
+      @pi=pi
+      IF.wave_clear(pi)
+    end
+    def clear
+      IF.wave_clear(@pi)
+    end
+    def add_new
+      IF.wave_add_new(@pi)
+    end
+    def add_generic(pulses)
+      IF.wave_add_generic(@pi,pulses)
+    end
+    def add_serial(user_gpio,baud,data_bits,stop_bits,offset,str)
+      IF.wave_add_serial(@pi,user_gpio,baud,data_bits,stop_bits,offset,str)
+    end
+    def create
+      IF.wave_create(@pi)
+    end
+    def delete(id)
+      IF.wave_delete(@pi,id)
+    end
+    def send_once(id)
+      IF.wave_delete(@pi,id)
+    end
+    def send_repeat(id)
+      IF.wave_delete(@pi,id)
+    end
+    def send_using_mode(id,mode)
+      IF.wave_delete(@pi,id,mode)
+    end
+    def chain(buf)
+      IF.wave_chain(@pi,buf)
+    end
+    def tx_at
+      IF.wave_tx_at(@pi)
+    end
+    def tx_busy
+      IF.wave_tx_busy(@pi)
+    end
+    def tx_stop
+      IF.wave_tx_stop(@pi)
+    end
+    def micros
+      IF.wave_get_micros(@pi)
+    end
+    def high_micros
+      IF.wave_get_high_micros(@pi)
+    end
+    def max_micros
+      IF.wave_get_max_micros(@pi)
+    end
+    def pulses
+      IF.wave_get_pulses(@pi)
+    end
+    def high_pulses
+      IF.wave_get_high_pulses(@pi)
+    end
+    def max_pulses
+      IF.wave_get_max_pulses(@pi)
+    end
+    def cbs
+      IF.wave_get_cbs(@pi)
+    end
+    def high_cbs
+      IF.wave_get_high_cbs(@pi)
+    end
+    def max_cbs
+      IF.wave_get_max_cbs(@pi)
+    end
+    def pulse(on,off,tick)
+      Pulse.make(on,off,tick)
+    end
+        
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pigpio
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - nak1114
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-21 00:00:00.000000000 Z
+date: 2019-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -93,6 +93,7 @@ files:
 - example/simple/led.rb
 - example/simple/pwm.rb
 - example/simple/readme.md
+- example/simple/wave.rb
 - ext/pigpio/extconf.rb
 - ext/pigpio/pigpio.c
 - lib/pigpio.rb
@@ -102,6 +103,7 @@ files:
 - lib/pigpio/pwm.rb
 - lib/pigpio/user_gpio.rb
 - lib/pigpio/version.rb
+- lib/pigpio/wave.rb
 - pigpio.gemspec
 homepage: http://www.github.com/nak1114/ruby-extension-pigpio
 licenses: