pigpio 0.1.11 → 0.1.12

data/lib/pigpio/gpio.rb

@@ -1,30 +1,37 @@
-class Pigpio
-  class GPIO
-    attr_reader :pi,:gpio
-    def initialize(pi,gpio)
-      @pi=pi #0-15
-      @gpio=gpio #0-53
-    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
+class Pigpio
+  class GPIO
+    attr_reader :pi, :gpio
+    def initialize(pi, gpio)
+      @pi = pi # 0-15
+      @gpio = gpio # 0-53
+    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/i2c.rb

@@ -1,60 +1,77 @@
-class Pigpio
-  class I2C
-    attr_reader :pi,:handle
-    def initialize(pi,i2c_bus,i2c_addr)
-      @pi=pi
-      @handle=IF.i2c_open(@pi,i2c_bus,i2c_addr,0)
-    end
-    def close()
-      IF.i2c_close(@pi,@handle)
-    end
-    def write_quick(bit)
-      IF.i2c_write_quick(@pi,@handle,bit)
-    end
-    def write_byte(bVal)
-      IF.i2c_write_byte(@pi,@handle,bVal)
-    end
-    def read_byte()
-      IF.i2c_read_byte(@pi,@handle)
-    end
-    def write_byte_data(i2c_reg,bVal)
-      IF.i2c_write_byte_data(@pi,@handle,i2c_reg,bVal)
-    end
-    def write_word_data(i2c_reg,wVal)
-      IF.i2c_write_word_data(@pi,@handle,i2c_reg,wVal)
-    end
-    def read_byte_data(i2c_reg)
-      IF.i2c_read_byte_data(@pi,@handle,i2c_reg)
-    end
-    def read_word_data(i2c_reg)
-      IF.i2c_read_word_data(@pi,@handle,i2c_reg)
-    end
-    def process_call(i2c_reg,wVal)
-      IF.i2c_process_call(@pi,@handle,i2c_reg,wVal)
-    end
-    def read_block_data(i2c_reg)
-      IF.i2c_read_block_data(@pi,@handle,i2c_reg)
-    end
-    def read_i2c_block_data(i2c_reg,count)
-      IF.i2c_read_i2c_block_data(@pi,@handle,i2c_reg,count)
-    end
-    def write_block_data(i2c_reg,buf)
-      IF.i2c_write_block_data(@pi,@handle,i2c_reg,buf)
-    end
-    def write_i2c_block_data(i2c_reg,buf)
-      IF.i2c_write_i2c_block_data(@pi,@handle,i2c_reg,buf)
-    end
-    def block_process_call(i2c_reg,buf)
-      IF.i2c_block_process_call(@pi,@handle,i2c_reg,buf)
-    end
-    def read_device(count)
-      IF.i2c_read_device(@pi,@handle,count)
-    end
-    def write_device(buf)
-      IF.i2c_write_device(@pi,@handle,buf)
-    end
-    def zip(inBuf,outLen)
-      IF.i2c_zip(@pi,@handle,inBuf,outLen)
-    end
-  end
-end
+class Pigpio
+  class I2C
+    attr_reader :pi, :handle
+    def initialize(pi, i2c_bus, i2c_addr)
+      @pi = pi
+      @handle = IF.i2c_open(@pi, i2c_bus, i2c_addr, 0)
+    end
+
+    def close
+      IF.i2c_close(@pi, @handle)
+    end
+
+    def write_quick(bit)
+      IF.i2c_write_quick(@pi, @handle, bit)
+    end
+
+    def write_byte(bVal)
+      IF.i2c_write_byte(@pi, @handle, bVal)
+    end
+
+    def read_byte
+      IF.i2c_read_byte(@pi, @handle)
+    end
+
+    def write_byte_data(i2c_reg, bVal)
+      IF.i2c_write_byte_data(@pi, @handle, i2c_reg, bVal)
+    end
+
+    def write_word_data(i2c_reg, wVal)
+      IF.i2c_write_word_data(@pi, @handle, i2c_reg, wVal)
+    end
+
+    def read_byte_data(i2c_reg)
+      IF.i2c_read_byte_data(@pi, @handle, i2c_reg)
+    end
+
+    def read_word_data(i2c_reg)
+      IF.i2c_read_word_data(@pi, @handle, i2c_reg)
+    end
+
+    def process_call(i2c_reg, wVal)
+      IF.i2c_process_call(@pi, @handle, i2c_reg, wVal)
+    end
+
+    def read_block_data(i2c_reg)
+      IF.i2c_read_block_data(@pi, @handle, i2c_reg)
+    end
+
+    def read_i2c_block_data(i2c_reg, count)
+      IF.i2c_read_i2c_block_data(@pi, @handle, i2c_reg, count)
+    end
+
+    def write_block_data(i2c_reg, buf)
+      IF.i2c_write_block_data(@pi, @handle, i2c_reg, buf)
+    end
+
+    def write_i2c_block_data(i2c_reg, buf)
+      IF.i2c_write_i2c_block_data(@pi, @handle, i2c_reg, buf)
+    end
+
+    def block_process_call(i2c_reg, buf)
+      IF.i2c_block_process_call(@pi, @handle, i2c_reg, buf)
+    end
+
+    def read_device(count)
+      IF.i2c_read_device(@pi, @handle, count)
+    end
+
+    def write_device(buf)
+      IF.i2c_write_device(@pi, @handle, buf)
+    end
+
+    def zip(inBuf, outLen)
+      IF.i2c_zip(@pi, @handle, inBuf, outLen)
+    end
+  end
+end

data/lib/pigpio/pwm.rb

@@ -1,38 +1,48 @@
-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
+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

data/lib/pigpio/serial.rb

@@ -1,29 +1,35 @@
-class Pigpio
-  class Serial
-    attr_reader :pi,:handle
-    TTY=%w(/dev/tty /dev/serial)
-    Baud=[50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400]
-    def initialize(pi,ser_tty,baud)
-      @pi=pi
-      @handle=IF.serial_open(pi,ser_tty,baud=19200,0)
-    end
-    def close
-      IF.serial_close(@pi,@handle)
-    end
-    def byte=(bVal)
-      IF.serial_write_byte(@pi,@handle,bVal)
-    end
-    def byte
-      IF.serial_read_byte(@pi,@handle)
-    end
-    def write(buf)
-      IF.serial_write(@pi,@handle,buf)
-    end
-    def read(count)
-      IF.serial_read(@pi,@handle,count)
-    end
-    def size
-      IF.serial_data_available(@pi,@handle)
-    end
-  end
-end
+class Pigpio
+  class Serial
+    attr_reader :pi, :handle
+    TTY = %w[/dev/tty /dev/serial]
+    Baud = [50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400]
+    def initialize(pi, ser_tty, baud)
+      @pi = pi
+      @handle = IF.serial_open(pi, ser_tty, baud = 19200, 0)
+    end
+
+    def close
+      IF.serial_close(@pi, @handle)
+    end
+
+    def byte=(bVal)
+      IF.serial_write_byte(@pi, @handle, bVal)
+    end
+
+    def byte
+      IF.serial_read_byte(@pi, @handle)
+    end
+
+    def write(buf)
+      IF.serial_write(@pi, @handle, buf)
+    end
+
+    def read(count)
+      IF.serial_read(@pi, @handle, count)
+    end
+
+    def size
+      IF.serial_data_available(@pi, @handle)
+    end
+  end
+end

data/lib/pigpio/spi.rb

@@ -1,33 +1,37 @@
-class Pigpio
-  class SPI
-    attr_reader :pi,:handle
-    def initialize(pi,spi_channel=0,enable_cex=1,baud=500000,bits_per_word: 8,first_MISO: false,first_MOSI: false,idol_bytes: 0,is_3wire: false,active_low_cex: 0,spi_mode: 0)
-      is_aux=(spi_channel!=0)
-      flg=((spi_mode.to_i      & 0x03      ) |
-         ((active_low_cex.to_i & 0x07 )<< 2) |
-         ((enable_cex.to_i     & 0x07 )<< 5) |
-         ((is_aux   ? 1 : 0) << 8) |
-         ((is_3wire ? 1 : 0) << 9) |
-         ((idol_bytes.to_i     & 0x0f )<< 10) |
-         ((first_MOSI ? 1 : 0) << 14) |
-         ((first_MISO ? 1 : 0) << 15) |
-         ((bits_per_word.to_i  & 0x3f )<< 16)
-        )
-      @pi=pi
-      @byte_per_word=(bits_per_word/8.0).ceil
-      @handle=IF.spi_open(@pi,spi_channel,baud,flg)
-    end
-    def close
-      IF.spi_close(@pi,@handle)
-    end
-    def read(words=1)
-      IF.spi_read(@pi,@handle,words*@byte_per_word)
-    end
-    def write(buf)
-      IF.spi_write(@pi,@handle,buf)
-    end
-    def xfer(buf)
-      IF.spi_xfer(@pi,@handle,buf)
-    end
-  end
-end
+class Pigpio
+  class SPI
+    attr_reader :pi, :handle
+    def initialize(pi, spi_channel = 0, enable_cex = 1, baud = 500000, bits_per_word: 8, first_MISO: false, first_MOSI: false, idol_bytes: 0, is_3wire: false, active_low_cex: 0, spi_mode: 0)
+      is_aux = (spi_channel != 0)
+      flg = ((spi_mode.to_i & 0x03) |
+         ((active_low_cex.to_i & 0x07) << 2) |
+         ((enable_cex.to_i & 0x07) << 5) |
+         ((is_aux ? 1 : 0) << 8) |
+         ((is_3wire ? 1 : 0) << 9) |
+         ((idol_bytes.to_i & 0x0f) << 10) |
+         ((first_MOSI ? 1 : 0) << 14) |
+         ((first_MISO ? 1 : 0) << 15) |
+         ((bits_per_word.to_i & 0x3f) << 16)
+            )
+      @pi = pi
+      @byte_per_word = (bits_per_word / 8.0).ceil
+      @handle = IF.spi_open(@pi, spi_channel, baud, flg)
+    end
+
+    def close
+      IF.spi_close(@pi, @handle)
+    end
+
+    def read(words = 1)
+      IF.spi_read(@pi, @handle, words * @byte_per_word)
+    end
+
+    def write(buf)
+      IF.spi_write(@pi, @handle, buf)
+    end
+
+    def xfer(buf)
+      IF.spi_xfer(@pi, @handle, buf)
+    end
+  end
+end

data/lib/pigpio/user_gpio.rb

@@ -1,27 +1,33 @@
-require_relative "./gpio"
-class Pigpio
-  class UserGPIO < GPIO
-    def watchdog(timeout)
-      ret=IF.set_watchdog(@pi,@gpio,timeout)
-    end
-    def glitch_filter(steady)
-      ret=IF.set_glitch_filter(@pi,@gpio,steady)
-    end
-    def noise_filter(steady,active)
-      ret=IF.set_noise_filter(@pi,@gpio,steady,active)
-    end
-    def callback(edge,&blk)
-      return nil unless blk
-      IF.callback(@pi,@gpio,edge,&blk)
-    end
-    def wait_for_edge(edge,timeout)
-      ret=IF.wait_for_edge(@pi,@gpio,edge,timeout)
-    end
-    def trigger(pulseLen,level)
-      ret=IF.gpio_trigger(@pi,@gpio,pulseLen,level)
-    end
-    def pwm
-      PWM.new(@pi,@gpio)
-    end
-  end
-end
+require_relative "./gpio"
+class Pigpio
+  class UserGPIO < GPIO
+    def watchdog(timeout)
+      ret = IF.set_watchdog(@pi, @gpio, timeout)
+    end
+
+    def glitch_filter(steady)
+      ret = IF.set_glitch_filter(@pi, @gpio, steady)
+    end
+
+    def noise_filter(steady, active)
+      ret = IF.set_noise_filter(@pi, @gpio, steady, active)
+    end
+
+    def callback(edge, &blk)
+      return nil unless blk
+      IF.callback(@pi, @gpio, edge, &blk)
+    end
+
+    def wait_for_edge(edge, timeout)
+      ret = IF.wait_for_edge(@pi, @gpio, edge, timeout)
+    end
+
+    def trigger(pulseLen, level)
+      ret = IF.gpio_trigger(@pi, @gpio, pulseLen, level)
+    end
+
+    def pwm
+      PWM.new(@pi, @gpio)
+    end
+  end
+end

data/lib/pigpio/version.rb

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

data/lib/pigpio/wave.rb

@@ -1,78 +1,100 @@
-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,us)
-      Pulse.make(on,off,us)
-    end
-        
-  end
-end
+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_send_once(@pi, id)
+    end
+
+    def send_repeat(id)
+      IF.wave_send_repeat(@pi, id)
+    end
+
+    def send_using_mode(id, mode)
+      IF.wave_send_using_mode(@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, us)
+      Pulse.make(on, off, us)
+    end
+  end
+end