wiringpi 1.0.2 → 1.1.0

data/ext/wiringpi/wiringPi.c

@@ -26,6 +26,8 @@
  */
 
 // Revisions:
+//	 2 Jul 2012:
+//		Fixed a few more bugs to do with range-checking when in GPIO mode.
 //	11 Jun 2012:
 //		Fixed some typos.
 //		Added c++ support for the .h file
@@ -43,12 +45,17 @@
 
 #include <stdio.h>
 #include <stdint.h>
+#include <unistd.h>
 #include <errno.h>
 #include <string.h>
 #include <time.h>
 #include <fcntl.h>
 #include <sys/time.h>
 #include <sys/mman.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+
 
 #include "wiringPi.h"
 
@@ -59,15 +66,15 @@
 
 // Port function select bits
 
-#define	FSEL_INPT	    0x0
-#define	FSEL_OUTP		0x1
-#define	FSEL_ALT0		0x4
-#define	FSEL_ALT0		0x4
-#define	FSEL_ALT1		0x5
-#define	FSEL_ALT2		0x6
-#define	FSEL_ALT3		0x7
-#define	FSEL_ALT4		0x3
-#define	FSEL_ALT5		0x2
+#define	FSEL_INPT		0b000
+#define	FSEL_OUTP		0b001
+#define	FSEL_ALT0		0b100
+#define	FSEL_ALT0		0b100
+#define	FSEL_ALT1		0b101
+#define	FSEL_ALT2		0b110
+#define	FSEL_ALT3		0b111
+#define	FSEL_ALT4		0b011
+#define	FSEL_ALT5		0b010
 
 // Access from ARM Running Linux
 //	Take from Gerts code. Some of this is not in the manual
@@ -135,7 +142,12 @@ static volatile uint32_t *clk ;
 // So the 3 bits for port X are:
 //	X / 10 + ((X % 10) * 3)
 
-// mode
+// sysFds:
+//	Map a file descriptor from the /sys/class/gpio/gpioX/value file
+
+static int sysFds [64] ;
+
+// Mode
 
 static int gpioPinMode ;
 
@@ -267,6 +279,9 @@ void wiringPiGpioMode (int mode)
 /*
  * wiringPiSetup:
  *	Must be called once at the start of your program execution.
+ *
+ * Default setup: Initialises the system into wiringPi Pin mode and uses the
+ *	memory mapped hardware directly.
  *********************************************************************************
  */
 
@@ -386,6 +401,65 @@ int wiringPiSetup (void)
 }
 
 
+/*
+ * wiringPiSetupGpio:
+ *	Must be called once at the start of your program execution.
+ *
+ * GPIO setup: Initialises the system into GPIO Pin mode and uses the
+ *	memory mapped hardware directly.
+ *********************************************************************************
+ */
+
+int wiringPiSetupGpio (void)
+{
+  int x = wiringPiSetup () ;
+
+  if (x != 0)
+    return x ;
+
+  wiringPiGpioMode (WPI_MODE_GPIO) ;
+  return 0 ;
+}
+
+
+/*
+ * wiringPiSetupSys:
+ *	Must be called once at the start of your program execution.
+ *
+ * Initialisation (again), however this time we are using the /sys/class/gpio
+ *	interface to the GPIO systems - slightly slower, but always usable as
+ *	a non-root user, assuming the devices are already exported and setup correctly.
+ */
+
+int wiringPiSetupSys (void)
+{
+  int fd, pin ;
+  struct timeval tv ;
+  char fName [128] ;
+
+// Set GPIO_SYS mode by default
+
+  wiringPiGpioMode (WPI_MODE_GPIO_SYS) ;
+
+// Open and scan the directory, looking for exported GPIOs, and pre-open
+//	the 'value' part to speed things up for later
+  
+  for (pin = 0 ; pin < 64 ; ++pin)
+  {
+    sysFds [pin] = -1 ;
+    sprintf (fName, "/sys/class/gpio/gpio%d/value", pin) ;
+    if ((fd = open (fName, O_RDWR)) == -1)
+      continue ;
+    sysFds [pin] = fd ;
+  }
+
+  gettimeofday (&tv, NULL) ;
+  epoch = (tv.tv_sec * 1000000 + tv.tv_usec) / 1000 ;
+
+  return 0 ;
+}
+
+
 /*
  * pinMode:
  *	Sets the mode of a pin to be input, output or PWM output
@@ -399,6 +473,10 @@ void pinMode (int pin, int mode)
   int gpioPin, fSel, shift ;
   int alt ;
 
+// We can't change the mode in GPIO_SYS mode
+
+  if (gpioPinMode == WPI_MODE_GPIO_SYS)
+    return ;
 
   if (gpioPinMode == WPI_MODE_PINS)
   {
@@ -412,7 +490,6 @@ void pinMode (int pin, int mode)
   fSel    = gpioToGPFSEL [gpioPin] ;
   shift   = gpioToShift  [gpioPin] ;
 
-
   /**/ if (mode == INPUT)
     *(gpio + fSel) = (*(gpio + fSel) & ~(7 << shift)) ; // Sets bits to zero = input
   else if (mode == OUTPUT)
@@ -480,10 +557,23 @@ void digitalWrite (int pin, int value)
   else
     gpioPin = pin ;
 
-  if (value == HIGH)
-    *(gpio + gpioToGPSET [gpioPin]) = 1 << gpioPin ;
+  if (gpioPinMode == WPI_MODE_GPIO_SYS)
+  {
+    if (sysFds [gpioPin] != -1)
+    {
+      if (value == LOW)
+	write (sysFds [gpioPin], "0\n", 2) ;
+      else
+	write (sysFds [gpioPin], "1\n", 2) ;
+    }
+  }
   else
-    *(gpio + gpioToGPCLR [gpioPin]) = 1 << gpioPin ;
+  {
+    if (value == LOW)
+      *(gpio + gpioToGPCLR [gpioPin]) = 1 << gpioPin ;
+    else
+      *(gpio + gpioToGPSET [gpioPin]) = 1 << gpioPin ;
+  }
 }
 
 
@@ -497,6 +587,11 @@ void pwmWrite (int pin, int value)
 {
   int port, gpioPin ;
 
+// We can't do this in GPIO_SYS mode
+
+  if (gpioPinMode == WPI_MODE_GPIO_SYS)
+    return ;
+
   if (gpioPinMode == WPI_MODE_PINS)
   {
     if ((pin < 0) || (pin >= NUM_PINS))
@@ -521,6 +616,7 @@ void pwmWrite (int pin, int value)
 int digitalRead (int pin)
 {
   int gpioPin ;
+  char c ;
 
   if (gpioPinMode == WPI_MODE_PINS)
   {
@@ -531,10 +627,24 @@ int digitalRead (int pin)
   else
     gpioPin = pin ;
 
-  if ((*(gpio + gpioToGPLEV [gpioPin]) & (1 << gpioPin)) != 0)
-    return HIGH ;
+  if (gpioPinMode == WPI_MODE_GPIO_SYS)
+  {
+    if (sysFds [gpioPin] == -1)
+      return 0 ;
+    else
+    {
+      lseek (sysFds [gpioPin], 0L, SEEK_SET) ;
+      read  (sysFds [gpioPin], &c, 1) ;
+      return (c == '0') ? 0 : 1 ;
+    }
+  }
   else
-    return LOW ;
+  {
+    if ((*(gpio + gpioToGPLEV [gpioPin]) & (1 << gpioPin)) != 0)
+      return HIGH ;
+    else
+      return LOW ;
+  }
 }
 
 /*
@@ -550,6 +660,11 @@ void pullUpDnControl (int pin, int pud)
 {
   int gpioPin ;
 
+// We can't do this in GPIO_SYS mode
+
+  if (gpioPinMode == WPI_MODE_GPIO_SYS)
+    return ;
+
   if (gpioPinMode == WPI_MODE_PINS)
   {
     if ((pin < 0) || (pin >= NUM_PINS))

data/ext/wiringpi/wiringPi.h

@@ -25,8 +25,9 @@
 
 #define	NUM_PINS	17
 
-#define	WPI_MODE_PINS	 0
-#define	WPI_MODE_GPIO	 1
+#define	WPI_MODE_PINS		 0
+#define	WPI_MODE_GPIO		 1
+#define	WPI_MODE_GPIO_SYS	 2
 
 #define	INPUT		 0
 #define	OUTPUT		 1
@@ -48,7 +49,11 @@ extern "C" {
 #endif
 
 extern int  wiringPiSetup     (void) ;
+extern int  wiringPiSetupSys  (void) ;
+extern int  wiringPiSetupGpio (void) ;
+
 extern void wiringPiGpioMode  (int mode) ;
+
 extern void pullUpDnControl   (int pin, int pud) ;
 extern void pinMode           (int pin, int mode) ;
 extern void digitalWrite      (int pin, int value) ;

data/ext/wiringpi/wiringpi_wrap.c

@@ -1841,7 +1841,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/share/swig2.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/2.0.7/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -1886,7 +1886,7 @@ SWIG_AsVal_int (VALUE obj, int *val)
 }
 
 
-/*@SWIG:/usr/share/swig2.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/2.0.7/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -1945,6 +1945,29 @@ SWIG_From_unsigned_SS_char  (unsigned char value)
 }
 
 
+SWIGINTERN int
+SWIG_AsVal_unsigned_SS_int (VALUE obj, unsigned int *val)
+{
+  unsigned long v;
+  int res = SWIG_AsVal_unsigned_SS_long (obj, &v);
+  if (SWIG_IsOK(res)) {
+    if ((v > UINT_MAX)) {
+      return SWIG_OverflowError;
+    } else {
+      if (val) *val = (unsigned int)(v);
+    }
+  }  
+  return res;
+}
+
+
+SWIGINTERNINLINE VALUE
+SWIG_From_unsigned_SS_int  (unsigned int value)
+{    
+  return SWIG_From_unsigned_SS_long  (value);
+}
+
+
 SWIGINTERN swig_type_info*
 SWIG_pchar_descriptor(void)
 {
@@ -2019,6 +2042,38 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_wiringPiSetupSys(int argc, VALUE *argv, VALUE self) {
+  int result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  result = (int)wiringPiSetupSys();
+  vresult = SWIG_From_int((int)(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_wiringPiSetupGpio(int argc, VALUE *argv, VALUE self) {
+  int result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  result = (int)wiringPiSetupGpio();
+  vresult = SWIG_From_int((int)(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_wiringPiGpioMode(int argc, VALUE *argv, VALUE self) {
   int arg1 ;
@@ -2265,6 +2320,64 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_delay(int argc, VALUE *argv, VALUE self) {
+  unsigned int arg1 ;
+  unsigned int val1 ;
+  int ecode1 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  ecode1 = SWIG_AsVal_unsigned_SS_int(argv[0], &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "unsigned int","delay", 1, argv[0] ));
+  } 
+  arg1 = (unsigned int)(val1);
+  delay(arg1);
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_delayMicroseconds(int argc, VALUE *argv, VALUE self) {
+  unsigned int arg1 ;
+  unsigned int val1 ;
+  int ecode1 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  ecode1 = SWIG_AsVal_unsigned_SS_int(argv[0], &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "unsigned int","delayMicroseconds", 1, argv[0] ));
+  } 
+  arg1 = (unsigned int)(val1);
+  delayMicroseconds(arg1);
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_millis(int argc, VALUE *argv, VALUE self) {
+  unsigned int result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  result = (unsigned int)millis();
+  vresult = SWIG_From_unsigned_SS_int((unsigned int)(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_serialOpen(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
@@ -2430,6 +2543,39 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_serialPrintf(int argc, VALUE *argv, VALUE self) {
+  int arg1 ;
+  char *arg2 = (char *) 0 ;
+  void *arg3 = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  
+  if (argc < 2) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  ecode1 = SWIG_AsVal_int(argv[0], &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "int","serialPrintf", 1, argv[0] ));
+  } 
+  arg1 = (int)(val1);
+  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char *","serialPrintf", 2, argv[1] ));
+  }
+  arg2 = (char *)(buf2);
+  serialPrintf(arg1,arg2,arg3);
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  return Qnil;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  return Qnil;
+}
+
+
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
@@ -2704,6 +2850,8 @@ SWIGEXPORT void Init_wiringpi(void) {
   
   SWIG_RubyInitializeTrackings();
   rb_define_module_function(mWiringpi, "wiringPiSetup", _wrap_wiringPiSetup, -1);
+  rb_define_module_function(mWiringpi, "wiringPiSetupSys", _wrap_wiringPiSetupSys, -1);
+  rb_define_module_function(mWiringpi, "wiringPiSetupGpio", _wrap_wiringPiSetupGpio, -1);
   rb_define_module_function(mWiringpi, "wiringPiGpioMode", _wrap_wiringPiGpioMode, -1);
   rb_define_module_function(mWiringpi, "pullUpDnControl", _wrap_pullUpDnControl, -1);
   rb_define_module_function(mWiringpi, "pinMode", _wrap_pinMode, -1);
@@ -2712,11 +2860,15 @@ SWIGEXPORT void Init_wiringpi(void) {
   rb_define_module_function(mWiringpi, "digitalRead", _wrap_digitalRead, -1);
   rb_define_module_function(mWiringpi, "shiftOut", _wrap_shiftOut, -1);
   rb_define_module_function(mWiringpi, "shiftIn", _wrap_shiftIn, -1);
+  rb_define_module_function(mWiringpi, "delay", _wrap_delay, -1);
+  rb_define_module_function(mWiringpi, "delayMicroseconds", _wrap_delayMicroseconds, -1);
+  rb_define_module_function(mWiringpi, "millis", _wrap_millis, -1);
   rb_define_module_function(mWiringpi, "serialOpen", _wrap_serialOpen, -1);
   rb_define_module_function(mWiringpi, "serialClose", _wrap_serialClose, -1);
   rb_define_module_function(mWiringpi, "serialPutchar", _wrap_serialPutchar, -1);
   rb_define_module_function(mWiringpi, "serialPuts", _wrap_serialPuts, -1);
   rb_define_module_function(mWiringpi, "serialDataAvail", _wrap_serialDataAvail, -1);
   rb_define_module_function(mWiringpi, "serialGetchar", _wrap_serialGetchar, -1);
+  rb_define_module_function(mWiringpi, "serialPrintf", _wrap_serialPrintf, -1);
 }
 

data/lib/wiringpi.rb

@@ -2,6 +2,7 @@ require 'wiringpi/wiringpi'
 
 WPI_MODE_PINS = 0 # Use sane pin numbering
 WPI_MODE_GPIO = 1 # Use Broadcom barmy GPIO pin numbering
+WPI_MODE_SYS  = 2 # Use /sys/class/gpio method
 
 # Constants for mode()
 INPUT = 0
@@ -103,13 +104,19 @@ module WiringPi
 
     def wiringPiSetup
 
-      begin        
-        Wiringpi.wiringPiSetup
+      begin
+        if @mode == WPI_MODE_PINS
+            Wiringpi.wiringPiSetup
+        elsif @mode == WPI_MODE_GPIO
+            Wiringpi.wiringPiSetupGpio
+        elsif @mode == WPI_MODE_SYS
+            Wiringpi.wiringPiSetupSys
+        end
       rescue Exception=>e
         raise e
       end
 
-      Wiringpi.wiringPiGpioMode( @mode )
+      #Wiringpi.wiringPiGpioMode( @mode )
       @@init = true
     
     end
@@ -170,13 +177,13 @@ and handing to Wiringpi.shiftOut, must contain only 1s or 0s
       raise ArgumentError, "invalid clock pin, available gpio pins: #{PINS}" unless checkPin(clockPin)
       raise ArgumentError, "invalid latch pin, available gpio pins: #{PINS}" unless checkPin(latchPin)
 
-      WiringPi.write( latchPin, LOW )
+      Wiringpi.digitalWrite( latchPin, LOW )
 
       bits.each_slice(8) do |slice|
         Wiringpi.shiftOut(dataPin, clockPin, LSBFIRST, slice.reverse.join.to_i(2)) 
       end
 
-      WiringPi.write( latchPin, HIGH )
+      Wiringpi.digitalWrite( latchPin, HIGH )
 
     end
 
@@ -184,17 +191,17 @@ and handing to Wiringpi.shiftOut, must contain only 1s or 0s
 shiftOut int dataPin, int clockPin, int latchPin, char
 Shift out a single 8-bit integer 0-255
 =end
-    def shiftOut(dataPin, clockPin, latchPin, char)
+    def shiftOut(dataPin, clockPin, byteOrder, char)
 
-      raise ArgumentError, "invalid data pin, available gpio pins: #{PINS}" unless checkPin(dataPin)
-      raise ArgumentError, "invalid clock pin, available gpio pins: #{PINS}" unless checkPin(clockPin)
-      raise ArgumentError, "invalid latch pin, available gpio pins: #{PINS}" unless checkPin(latchPin)
+      #raise ArgumentError, "invalid data pin, available gpio pins: #{PINS}" unless checkPin(dataPin)
+      #raise ArgumentError, "invalid clock pin, available gpio pins: #{PINS}" unless checkPin(clockPin)
+      #raise ArgumentError, "invalid latch pin, available gpio pins: #{PINS}" unless checkPin(latchPin)
         
-      WiringPi.write( latchPin, LOW )
+      #Wiringpi.digitalWrite( latchPin, LOW )
 
-      Wiringpi.shiftOut(dataPin, clockPin, LSBFIRST, char)
+      Wiringpi.shiftOut(dataPin, clockPin, byteOrder, char)
 
-      WiringPi.write( latchPin, HIGH )
+      #Wiringpi.digitalWrite( latchPin, HIGH )
 
     end
 
@@ -230,4 +237,4 @@ Reads values of all pins and returns them as a hash
 
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wiringpi
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors: