pigpio 0.1.4 → 0.1.5

data/example/simple/callback.rb

@@ -0,0 +1,23 @@
+require "pigpio"
+include Pigpio::Constant
+pi=Pigpio.new()
+unless pi.connect
+  exit -1
+end
+counter=0
+led=pi.gpio(4)
+led.mode=PI_OUTPUT
+led.pud=PI_PUD_OFF
+
+button=pi.gpio(17)
+button.mode=PI_INPUT
+button.pud=PI_PUD_UP
+button.glitch_filter(30)
+button.callback(EITHER_EDGE){|tick,level|
+  led.write level
+  counter+=1
+}
+
+while(counter<10)do
+end
+led.write 0

data/example/simple/pwm.rb

@@ -0,0 +1,21 @@
+require "pigpio"
+include Pigpio::Constant
+pi=Pigpio.new()
+unless pi.connect
+  exit -1
+end
+pin=pi.gpio(4)
+pin.mode=PI_OUTPUT
+pin.pud=PI_PUD_OFF
+pwm=pin.pwm
+
+button=pi.gpio(17)
+button.mode=PI_INPUT
+button.pud=PI_PUD_UP
+
+i=128
+while true do
+  i=(i+1)%256   if button.read == 0
+  pwm.dutycycle= i
+  sleep 0.01
+end

data/example/simple/readme.md

@@ -0,0 +1,27 @@
+# Simple IO sample
+
+## Board
+
+![board_image](./board.svg)
+
+## PWM sample
+
+[Script is here.](./pwm.rb)
+
+LED brightness will increase while you press the button.
+
+```sh
+$ ruby pwm.rb
+```
+
+## Callback sample
+
+[Script is here.](./callback.rb)
+
+not work, now.
+
+LED will light, while you press the button.
+
+```sh
+$ ruby callback.rb
+```

data/ext/pigpio/pigpio.c

@@ -6,20 +6,103 @@
 static VALUE cCallbackID;
 static VALUE cCallbackError;
 
+typedef struct{
+  unsigned level;
+   uint32_t tick;
+} callback_item_t;
+
+#define PG_EXT_CALLBACK_BUF_SIZE (128)
+typedef struct{
+  volatile callback_item_t buf[ PG_EXT_CALLBACK_BUF_SIZE ];
+  volatile callback_item_t* volatile read;
+  volatile callback_item_t* volatile write;
+  volatile int flag_overflow;
+} callback_queue_t;
+
+
+
+typedef struct{
+  callback_queue_t*queue;
+} callback_pqueue_t;
+void pigpio_rbst_callback_que_dfree(void* _self){
+  callback_pqueue_t *self=(callback_pqueue_t *)_self;
+  if(self->queue!=NULL)free(self->queue);
+  xfree(self);
+  return;
+}
+size_t pigpio_rbst_callback_que_dsize(const void *_self){
+  return sizeof(callback_pqueue_t)+sizeof(callback_queue_t);
+}
+const rb_data_type_t callback_pqueue_type = { //https://gist.github.com/yugui/87ef6964d8a76794be6f
+    "struct@callback_pqueue",{NULL,pigpio_rbst_callback_que_dfree,pigpio_rbst_callback_que_dsize,{0,0}},0,NULL,0
+};
+/*
+Constructor of Pigpio::NativeQueue class
+*/
+VALUE pigpio_rbst_callback_pqueue_make(VALUE self){
+  VALUE obj;
+  callback_pqueue_t *st;
+  callback_queue_t *queue;
+  obj = TypedData_Make_Struct(self, callback_pqueue_t, &callback_pqueue_type, st);
+  st->queue=queue=malloc(sizeof(callback_queue_t));
+  queue->read=queue->buf;
+  queue->write=queue->buf;
+  queue->flag_overflow=0;
+  return obj;
+}
+/*
+Get a data from FIFO Queue.
+*/
+VALUE pigpio_rbst_callback_pqueue_pop(VALUE self){
+  callback_pqueue_t *st=TypedData_Get_Struct2(self,callback_pqueue_t,&callback_pqueue_type);
+  callback_queue_t *queue=st->queue;
+  volatile callback_item_t *cur=queue->read;
+  VALUE ret;
+  struct timeval t;
+  t.tv_usec=100000;
+  if(queue->flag_overflow!=0){
+    rb_raise(cCallbackError,"Overflow NativeQueue.\n");
+  }
+  while(cur==queue->write){
+    rb_thread_wait_for(t);
+  }
+  ret=rb_ary_new_from_args(2,ULONG2NUM(cur->tick),UINT2NUM(cur->level));
+  queue->read=(cur==queue->buf+(PG_EXT_CALLBACK_BUF_SIZE-1)) ? queue->buf : (cur+1) ;
+  return(ret);
+}
+/*
+Set a data to FIFO Queue.
+*/
+void pigpio_rbstn_callback_pqueue_push(callback_queue_t *queue,unsigned level, uint32_t tick){
+  volatile callback_item_t *cur=queue->write;
+  cur->tick=tick;
+  cur->level=level;
+  cur=(cur==queue->buf+(PG_EXT_CALLBACK_BUF_SIZE-1)) ? queue->buf : (cur+1) ;
+  if(cur==queue->read){
+    queue->flag_overflow=1;
+  }else{
+    queue->write=cur;
+  }
+  return;
+}
 
 typedef int (*cancel_t)(unsigned);
 typedef struct{
   int id;
-  VALUE proc;
+  VALUE queue;
+  VALUE thread;
   cancel_t cancel;
 } callback_id_t;
+
 void pigpio_rbst_callback_id_dmark(void* _self){
   callback_id_t *self=(callback_id_t *)_self;
-  rb_gc_mark(self->proc);
+  rb_gc_mark(self->queue);
+  rb_gc_mark(self->thread);
 }
 void pigpio_rbst_callback_id_dfree(void* _self){
   callback_id_t *self=(callback_id_t *)_self;
   xfree(self);
+  return;
 }
 size_t pigpio_rbst_callback_id_dsize(const void *_self){
   return sizeof(callback_id_t);
@@ -32,17 +115,19 @@ const rb_data_type_t callback_id_data_type = { //https://gist.github.com/yugui/8
       {0,0}
     },0,NULL,0
 };
-VALUE pigpio_rbst_callback_id_make_inner(int id,VALUE proc,cancel_t cancel){
+VALUE pigpio_rbst_callback_id_make_inner(int id,cancel_t cancel,VALUE queue,VALUE thread){
   VALUE obj;
   callback_id_t *st;
   obj = TypedData_Make_Struct(cCallbackID, callback_id_t, &callback_id_data_type, st);
   st->id=id;
-  st->proc=proc;
+  st->queue=queue;
+  st->thread=thread;
   st->cancel=cancel;
+
   return obj;
 }
 /*
-get callback id.return Integer.
+Get callback id.R eturn Integer.
 */
 VALUE pigpio_rbst_callback_id_r_id(VALUE self){
   callback_id_t *st=TypedData_Get_Struct2(self,callback_id_t,&callback_id_data_type);
@@ -60,9 +145,25 @@ See also: {pigpio site event_callback_cancel}[http://abyz.me.uk/rpi/pigpio/pdif2
 See also: {pigpio site callback_cancel}[http://abyz.me.uk/rpi/pigpio/pdif2.html#callback_cancel]
 */
 VALUE pigpio_rbst_callback_id_cancel(VALUE self){
+  int id;
   callback_id_t *st=TypedData_Get_Struct2(self,callback_id_t,&callback_id_data_type);
-  if(st->id<0){return INT2NUM(pigif_callback_not_found);}
-  return INT2NUM((*(st->cancel))(st->id));
+  id=st->id;
+  if(id<0){return INT2NUM(pigif_callback_not_found);}
+  if(st->thread!=Qnil){
+    rb_funcall((VALUE)st->thread, rb_intern("kill"), 0);
+  }
+  st->id=-1;
+  st->thread=Qnil;
+  st->queue=Qnil;
+  return INT2NUM((*(st->cancel))(id));
+}
+void pigpio_rbbk_CBFuncEx(int pi, unsigned user_gpio, unsigned level, uint32_t tick, void *queue){
+  pigpio_rbstn_callback_pqueue_push((callback_queue_t *)queue,level,tick);
+  return;
+}
+void pigpio_rbbk_evtCBFuncEx(int pi, unsigned event, uint32_t tick, void *callee_proc){
+  (rb_funcall((VALUE)callee_proc, rb_intern("call"), 2,ULONG2NUM(tick),UINT2NUM(event)));
+  return;
 }
 
 const rb_data_type_t bsc_xfer_data_type = { //https://gist.github.com/yugui/87ef6964d8a76794be6f
@@ -144,14 +245,6 @@ VALUE pigpio_rbst_gpioPulse_make(VALUE self,VALUE gpioOn,VALUE gpioOff,VALUE usD
   st->usDelay=NUM2ULONG(usDelay);
   return obj;
 }
-void pigpio_rbbk_CBFuncEx(int pi, unsigned user_gpio, unsigned level, uint32_t tick, void *userdata){
-  (rb_funcall((VALUE)userdata, rb_intern("call"), 3,ULONG2NUM(tick),UINT2NUM(level),UINT2NUM(user_gpio)));
-  return;
-}
-void pigpio_rbbk_evtCBFuncEx(int pi, unsigned event, uint32_t tick, void *userdata){
-  (rb_funcall((VALUE)userdata, rb_intern("call"), 2,ULONG2NUM(tick),UINT2NUM(event)));
-  return;
-}
 
 /*
 Connect to the pigpio daemon.  Reserving command and
@@ -1899,13 +1992,13 @@ If you call this method without a block, this method raises an Pigpio::CallbackE
 
 See also: {pigpio site}[http://abyz.me.uk/rpi/pigpio/pdif2.html#callback_ex]
 */
-VALUE pigpio_rbfn_callback(int argc, VALUE *argv, VALUE self){
+VALUE pigpio_rbfn_callback(VALUE self,VALUE pi, VALUE user_gpio, VALUE edge, VALUE queue, VALUE thread){
   int id;
-  VALUE pi; VALUE user_gpio; VALUE edge; VALUE userdata;
-  rb_scan_args(argc,argv,"3&",&pi,&user_gpio,&edge,&userdata);
-  if(NIL_P(userdata)){rb_raise(cCallbackError,"No callback block.\n");}
-  id=( callback_ex(NUM2INT(pi), NUM2UINT(user_gpio), NUM2UINT(edge), pigpio_rbbk_CBFuncEx, (void*)userdata));
-  return pigpio_rbst_callback_id_make_inner(id,userdata,callback_cancel);
+  callback_pqueue_t *st=TypedData_Get_Struct2(queue,callback_pqueue_t,&callback_pqueue_type);
+
+  //if(NIL_P(callee_proc)){rb_raise(cCallbackError,"No callback block.\n");}
+  id=callback_ex(NUM2INT(pi), NUM2UINT(user_gpio), NUM2UINT(edge), pigpio_rbbk_CBFuncEx, (void*)st->queue);
+  return pigpio_rbst_callback_id_make_inner(id,callback_cancel,queue,thread);
 }
 /*
 This function cancels a callback identified by its id.
@@ -1921,8 +2014,8 @@ The function returns 0 if OK, otherwise pigif_callback_not_found.
 
 See also: {pigpio site}[http://abyz.me.uk/rpi/pigpio/pdif2.html#callback_cancel]
 */
-VALUE pigpio_rbfn_callback_cancel(VALUE self,VALUE callback_id){
-  return INT2NUM( callback_cancel(NUM2UINT(callback_id)));
+VALUE pigpio_rbfn_callback_cancel(VALUE self,VALUE callback){
+  return INT2NUM( callback_cancel(NUM2UINT(callback)));
 }
 /*
 This function waits for an edge on the GPIO for up to timeout
@@ -1976,11 +2069,10 @@ See also: {pigpio site}[http://abyz.me.uk/rpi/pigpio/pdif2.html#event_callback_e
 */
 VALUE pigpio_rbfn_event_callback(int argc, VALUE *argv, VALUE self){
   int id;
-  VALUE pi; VALUE event; VALUE userdata;
-  rb_scan_args(argc,argv,"2&",&pi,&event,&userdata);
-  if(NIL_P(userdata)){rb_raise(cCallbackError,"No callback block.\n");}
-  id=( event_callback_ex(NUM2INT(pi), NUM2UINT(event), pigpio_rbbk_evtCBFuncEx, (void *)userdata));
-  return pigpio_rbst_callback_id_make_inner(id,userdata,event_callback_cancel);
+  VALUE pi; VALUE event; VALUE queue; VALUE thread;
+  rb_scan_args(argc,argv,"4",&pi,&event,&queue,&thread);
+  id=event_callback_ex(NUM2INT(pi), NUM2UINT(event), pigpio_rbbk_evtCBFuncEx, (void *)queue);
+  return pigpio_rbst_callback_id_make_inner(id,event_callback_cancel,queue,thread);
 }
 /*
 This function cancels an event callback identified by its id.
@@ -3514,7 +3606,7 @@ VALUE pigpio_rbfn_bsc_i2c(VALUE self, VALUE pi, VALUE i2c_addr, VALUE bscxfer){
 This class has some constances for pigpio library.
 */
 void Init_pigpio(void){
-  VALUE cPulse,cBscXfer;
+  VALUE cPulse,cBscXfer,cNativeQueue;
 /*
 This class has some constances for pigpio library.
 */
@@ -3583,7 +3675,7 @@ This class has some constances for pigpio library.
     rb_define_singleton_method(cAPI, "wave_add_generic",        pigpio_rbfn_wave_add_generic,         2);
     rb_define_singleton_method(cAPI, "wave_add_serial",         pigpio_rbfn_wave_add_serial,          7);
     rb_define_singleton_method(cAPI, "wave_chain",              pigpio_rbfn_wave_chain,               2);
-    rb_define_singleton_method(cAPI, "callback",                pigpio_rbfn_callback,                 -1);
+    rb_define_singleton_method(cAPI, "callback",                pigpio_rbfn_callback,                 5);
     rb_define_singleton_method(cAPI, "callback_cancel",         pigpio_rbfn_callback_cancel,          1);
     rb_define_singleton_method(cAPI, "wait_for_edge",           pigpio_rbfn_wait_for_edge,            4);
     rb_define_singleton_method(cAPI, "event_callback",          pigpio_rbfn_event_callback,           -1);
@@ -3654,15 +3746,24 @@ This class has some constances for pigpio library.
     rb_define_method(cBscXfer, "control=", pigpio_rbst_bsc_xfer_w_control, 1);
     rb_define_method(cBscXfer, "txBuf=", pigpio_rbst_bsc_xfer_w_txBuf, 1);
     rb_define_method(cBscXfer, "rxBuf", pigpio_rbst_bsc_xfer_r_rxBuf, 0);
+
   /*
-  The class for callback.
+  The class of native queue.
+  */
+  cNativeQueue = rb_define_class_under(cPigpio,"NativeQueue", rb_cData);
+    rb_define_singleton_method(cNativeQueue, "make", pigpio_rbst_callback_pqueue_make, 0);
+    rb_define_method(cNativeQueue, "pop", pigpio_rbst_callback_pqueue_pop, 0);
+
+  /*
+  The class of callback.
   */
   cCallbackID = rb_define_class_under(cPigpio,"Callback", rb_cData);
     rb_define_method(cCallbackID, "id", pigpio_rbst_callback_id_r_id, 0);
     rb_define_method(cCallbackID, "cancel", pigpio_rbst_callback_id_cancel, 0);
     rb_gc_register_address(&cCallbackID);
+
   /*
-  The class for callback error.
+  The class of callback error.
   */
   cCallbackError = rb_define_class_under(cPigpio,"CallbackError", rb_eException);
     rb_gc_register_address(&cCallbackError);

data/lib/pigpio/bank.rb

@@ -1,20 +1,22 @@
-class Pigpio::Bank
-  Set={
-    read:  [:read_bank_1 ,:read_bank_2],
-    clear: [:clear_bank_1,:clear_bank_2],
-    set:   [:set_bank_1  ,:set_bank_2],
-  }
-  def initialize(pi,num)
-    @pi=pi
-    @num=num
+class Pigpio
+  class Bank
+    Set={
+      read:  [:read_bank_1 ,:read_bank_2],
+      clear: [:clear_bank_1,:clear_bank_2],
+      set:   [:set_bank_1  ,:set_bank_2],
+    }
+    def initialize(pi,num)
+      @pi=pi
+      @num=num
+    end
+    def read
+      IF.send(Set[:read][@num],@pi)
+    end
+    def clear(bits)
+      IF.send(Set[:clear][@num],@pi,bits)
+    end
+    def set(bits)
+      IF.send(Set[:set][@num],@pi,bits)
+    end
   end
-  def read
-    IF.send(Set[:read][@num],@pi)
-  end
-  def clear(bits)
-    IF.send(Set[:clear][@num],@pi,bits)
-  end
-  def set(bits)
-    IF.send(Set[:set][@num],@pi,bits)
-  end
-end
+end

data/lib/pigpio/gpio.rb

@@ -1,31 +1,32 @@
-class Pigpio::GPIO
-  IF=Pigpio::IF
-  def initialize(pi,gpio)
-    @pi=pi #0-15
-    @gpio=gpio #0-53
-  end
-  def gpio
-    [@pi,@gpio]
-  end
-  def mode=(mode)
-    ret=IF.set_mode(@pi,@gpio,mode)
-  end
-  def mode
-    ret=IF.get_mode(@pi,@gpio)
-  end
-  def pud=(pud)
-    ret=IF.set_pull_up_down(@pi,@gpio,pud)
-  end
-  def read
-    ret=IF.gpio_read(@pi,@gpio)
-  end
-  def write(level)
-    ret=IF.gpio_write(@pi,@gpio,level)
-  end
-  def hardware_clock(clkfreq)
-    ret=IF.hardware_clock(@pi,@gpio,clkfreq)
-  end
-  def hardware_PWM(vPWMfreq,vPWMduty)
-    ret=IF.hardware_PWM(@pi,@gpio,vPWMfreq,vPWMduty)
+class Pigpio
+  class GPIO
+    def initialize(pi,gpio)
+      @pi=pi #0-15
+      @gpio=gpio #0-53
+    end
+    def gpio
+      [@pi,@gpio]
+    end
+    def mode=(mode)
+      ret=IF.set_mode(@pi,@gpio,mode)
+    end
+    def mode
+      ret=IF.get_mode(@pi,@gpio)
+    end
+    def pud=(pud)
+      ret=IF.set_pull_up_down(@pi,@gpio,pud)
+    end
+    def read
+      ret=IF.gpio_read(@pi,@gpio)
+    end
+    def write(level)
+      ret=IF.gpio_write(@pi,@gpio,level)
+    end
+    def hardware_clock(clkfreq)
+      ret=IF.hardware_clock(@pi,@gpio,clkfreq)
+    end
+    def hardware_PWM(vPWMfreq,vPWMduty)
+      ret=IF.hardware_PWM(@pi,@gpio,vPWMfreq,vPWMduty)
+    end
   end
 end

data/lib/pigpio/pwm.rb

@@ -1,34 +1,38 @@
-class Pigpio::PWM
-  IF=Pigpio::IF
-  def initialize(pi,gpio)
-    @pi=pi
-    @gpio=gpio
-  end
-  def dutycycle=(dutycycle)
-    ret=IF.set_PWM_dutycycle(@pi,@gpio,dutycycle)
-  end
-  def dutycycle
-    ret=IF.get_PWM_dutycycle(@pi,@gpio)
-  end
-  def range=(range)
-    ret=IF.set_PWM_range(@pi,@gpio,range)
-  end
-  def range
-    ret=IF.get_PWM_range(@pi,@gpio)
-  end
-  def real_range
-    ret=IF.get_PWM_real_range(@pi,@gpio)
-  end
-  def frequency=(frequency)
-    ret=IF.set_PWM_frequency(@pi,@gpio,frequency)
-  end
-  def frequency
-    ret=IF.get_PWM_frequency(@pi,@gpio)
-  end
-  def servo_pulsewidth=(pulsewidth)
-    ret=IF.set_servo_pulsewidth(@pi,@gpio,pulsewidth)
-  end
-  def servo_pulsewidth
-    ret=IF.get_servo_pulsewidth(@pi,@gpio)
+class Pigpio
+  class PWM
+    def initialize(pi,gpio)
+      @pi=pi
+      @gpio=gpio
+    end
+    def start(dutycycle)
+      ret=IF.set_PWM_dutycycle(@pi,@gpio,dutycycle)
+    end
+    def dutycycle=(dutycycle)
+      ret=IF.set_PWM_dutycycle(@pi,@gpio,dutycycle)
+    end
+    def dutycycle
+      ret=IF.get_PWM_dutycycle(@pi,@gpio)
+    end
+    def range=(range)
+      ret=IF.set_PWM_range(@pi,@gpio,range)
+    end
+    def range
+      ret=IF.get_PWM_range(@pi,@gpio)
+    end
+    def real_range
+      ret=IF.get_PWM_real_range(@pi,@gpio)
+    end
+    def frequency=(frequency)
+      ret=IF.set_PWM_frequency(@pi,@gpio,frequency)
+    end
+    def frequency
+      ret=IF.get_PWM_frequency(@pi,@gpio)
+    end
+    def servo_pulsewidth=(pulsewidth)
+      ret=IF.set_servo_pulsewidth(@pi,@gpio,pulsewidth)
+    end
+    def servo_pulsewidth
+      ret=IF.get_servo_pulsewidth(@pi,@gpio)
+    end
   end
 end