ws2812 0.0.2 → 0.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e39a82b0bca3478139d613c71a9391f6897fe818
+  data.tar.gz: 93b56a48d2f0a479fb40bf899d4a6e6e10582238
+SHA512:
+  metadata.gz: a53401e7e986463d426fcbbf403cb16bda51deaa8edb2a6d0c28f5f8f95d58166bb78fd427ea65992b6b768a1ada8c78b2523bb98964fb941b25d9b42eca33f1
+  data.tar.gz: e0e1198ed35a8b8a5944cff9cab294a18de8452e7022a05b3144a38c43f1b73e40046ab00f95b8107f82e6765946cd9146c270c301c501b0ffd189fa22d3f186

data/README.md

@@ -9,10 +9,25 @@ These WS281x LEDs are sometimes also known as NeoPixels.
 
 # Installation
 As this is a published Ruby gem,
-```
+```bash
 gem install ws2812
 ```
-should be enough.
+should be enough. But the examples will be hidden in 'gems' dir.
+
+If you want to avoid the gem route, the following works just as well:
+```bash
+git clone https://github.com/wejn/ws2812
+cd ws2812
+# Assuming raspbian here; otherwise make sure you have 'mkmf'
+# and can compile exts (failing that "rake compile" will bomb on you)
+sudo apt-get update
+sudo apt-get install -y ruby-full
+# .
+sudo gem install rake rake-compiler
+rake compile
+# and then, to demo it:
+sudo ruby examples/digiclock.rb
+```
 
 # Examples
 See the [examples](https://github.com/wejn/ws2812/tree/master/examples)
@@ -23,7 +38,8 @@ GNU General Public License v. 2, see [LICENSE.txt](LICENSE.txt).
 
 # Authors
 This gem (all of the ruby code and some tweaks to the C extension) was
-created by Michal Jirků <box@wejn.org>.
+originally created by Michal Jirků <box@wejn.org>, later extended by
+Philip Howard <phil@gadgetoid.com> to support newer Pi-s.
 
 And it wouldn't be possible without the original UnicornHAT repo.
 

data/Rakefile

@@ -30,10 +30,3 @@ Rake::ExtensionTask.new "ws2812" do |ext|
 	ext.lib_dir = 'lib/ws2812'
 	ext.gem_spec = spec
 end
-
-task :clobber => :clobber_extras
-task :clobber_extras do
-	Dir.chdir('ext/ws2812/lib') do
-		system('make', 'clean')
-	end
-end

data/examples/gamma-vs-direct.rb

@@ -6,7 +6,7 @@ require 'ws2812'
 n = 64 # num leds
 ws = Ws2812::Basic.new(n, 18) # +n+ leds at pin 18, using defaults
 ws.open
-ws.brightness = 255
+ws.brightness = 128
 if ARGV.first
 	puts 'Using direct mode.'
 	puts 'Remove all positional parameters to switch to gamma-corrected mode.'
@@ -17,14 +17,14 @@ else
 end
 
 # up...
-0.upto(255) do |i|
+0.upto(128) do |i|
 	ws[0..63] = Ws2812::Color.new(i, i, i)
 	ws.show
 	sleep 0.01
 end
 
 # and down...
-255.downto(0) do |i|
+128.downto(0) do |i|
 	ws[0..63] = Ws2812::Color.new(i, i, i)
 	ws.show
 	sleep 0.01

data/ext/ws2812/clk.h

@@ -51,7 +51,7 @@ typedef struct {
 #define CM_PWM_DIV_PASSWD                        (0x5a << 24)
 #define CM_PWM_DIV_DIVI(val)                     ((val & 0xfff) << 12)
 #define CM_PWM_DIV_DIVF(val)                     ((val & 0xfff) << 0)
-} __attribute__ ((packed)) cm_pwm_t;
+} cm_pwm_t;
 
 
 #define CM_PWM_OFFSET                            (0x001010a0)

data/ext/ws2812/dma.h

@@ -46,7 +46,7 @@ typedef struct
     uint32_t stride;
     uint32_t nextconbk;
     uint32_t resvd_0x18[2];
-} __attribute__((packed)) dma_cb_t;
+} dma_cb_t;
 
 /*
  * DMA register set
@@ -95,7 +95,7 @@ typedef struct
 #define RPI_DMA_STRIDE_S_STRIDE(val)             ((val & 0xffff) << 0)
     uint32_t nextconbk;
     uint32_t debug;
-} __attribute__((packed)) dma_t;
+} dma_t;
 
 
 #define DMA0_OFFSET                              (0x00007000)

data/ext/ws2812/gpio.h

@@ -59,7 +59,7 @@ typedef struct
     uint32_t pudclk[2];                          // GPIO Pin Pull up/down Enable Clock
     uint32_t resvd_0xa0[4];
     uint32_t test;
-} __attribute__((packed)) gpio_t;
+} gpio_t;
 
 
 #define GPIO_OFFSET                              (0x00200000)

data/ext/ws2812/lowlevel_wrap.c

@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGRUBY
@@ -41,28 +41,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -105,7 +105,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -150,28 +150,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -214,7 +214,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -252,7 +252,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -278,16 +278,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -320,23 +320,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -350,17 +350,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -391,14 +391,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -442,7 +442,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -462,18 +462,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -481,24 +481,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -526,7 +515,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -561,7 +550,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -605,7 +594,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -613,14 +602,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -629,18 +618,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -649,11 +638,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -678,14 +667,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -704,12 +693,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -725,7 +714,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -739,21 +728,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -813,18 +802,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1374,7 +1363,7 @@ SWIG_Ruby_AppendOutput(VALUE target, VALUE o) {
 
 /* Runtime API */
 
-#define SWIG_GetModule(clientdata)                      SWIG_Ruby_GetModule()	
+#define SWIG_GetModule(clientdata)                      SWIG_Ruby_GetModule(clientdata)
 #define SWIG_SetModule(clientdata, pointer) 		SWIG_Ruby_SetModule(pointer)
 
 
@@ -1710,7 +1699,7 @@ SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty) {
 }
 
 SWIGRUNTIME swig_module_info *
-SWIG_Ruby_GetModule(void)
+SWIG_Ruby_GetModule(void *SWIGUNUSEDPARM(clientdata))
 {
   VALUE pointer;
   swig_module_info *ret = 0;
@@ -1750,7 +1739,7 @@ SWIG_Ruby_SetModule(swig_module_info *pointer)
 SWIGINTERN
 int SWIG_Ruby_isCallable( VALUE proc )
 {
-  if ( rb_respond_to( proc, swig_call_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_call_id ) )
     return 1;
   return 0;
 }
@@ -1763,7 +1752,7 @@ int SWIG_Ruby_isCallable( VALUE proc )
 SWIGINTERN
 int SWIG_Ruby_arity( VALUE proc, int minimal )
 {
-  if ( rb_respond_to( proc, swig_arity_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_arity_id ) )
     {
       VALUE num = rb_funcall( proc, swig_arity_id, 0 );
       int arity = NUM2INT(num);
@@ -1817,7 +1806,7 @@ static VALUE mLowlevel;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020007 
+#define SWIGVERSION 0x020012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2668,31 +2657,6 @@ fail:
 }
 
 
-SWIGINTERN VALUE
-_wrap_ws2811_dma_error_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_From_unsigned_SS_int((unsigned int)(ws2811_dma_error));
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-_wrap_ws2811_dma_error_set(VALUE self, VALUE _val) {
-  {
-    unsigned int val;
-    int res = SWIG_AsVal_unsigned_SS_int(_val, &val);
-    if (!SWIG_IsOK(res)) {
-      SWIG_exception_fail(SWIG_ArgError(res), "in variable '""ws2811_dma_error""' of type '""uint32_t""'");
-    }
-    ws2811_dma_error = (uint32_t)(val);
-  }
-  return _val;
-fail:
-  return Qnil;
-}
-
-
 SWIGINTERN VALUE
 _wrap_ws2811_wait(int argc, VALUE *argv, VALUE self) {
   ws2811_t *arg1 = (ws2811_t *) 0 ;
@@ -2885,18 +2849,18 @@ static swig_cast_info *swig_cast_initial[] = {
 
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial 
+ * The generated swig_type_info structures are assigned staticly to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -2906,17 +2870,17 @@ static swig_cast_info *swig_cast_initial[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
+ * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded. 
+ * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
+ *  2) If BOTH types (the one we are adding casting info to, and the
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -2942,8 +2906,6 @@ SWIG_InitializeModule(void *clientdata) {
   swig_module_info *module_head, *iter;
   int found, init;
 
-  clientdata = clientdata;
-
   /* check to see if the circular list has been setup, if not, set it up */
   if (swig_module.next==0) {
     /* Initialize the swig_module */
@@ -2981,7 +2943,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
 
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
      a different interpreter, but not yet have a pointer in this interpreter.
      In this case, we do not want to continue adding types... everything should be
      set up already */
@@ -2995,7 +2957,7 @@ SWIG_InitializeModule(void *clientdata) {
     swig_type_info *type = 0;
     swig_type_info *ret;
     swig_cast_info *cast;
-  
+
 #ifdef SWIGRUNTIME_DEBUG
     printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
 #endif
@@ -3022,7 +2984,7 @@ SWIG_InitializeModule(void *clientdata) {
     /* Insert casting types */
     cast = swig_module.cast_initial[i];
     while (cast->type) {
-    
+
       /* Don't need to add information already in the list */
       ret = 0;
 #ifdef SWIGRUNTIME_DEBUG
@@ -3179,8 +3141,6 @@ SWIGEXPORT void Init_lowlevel(void) {
   rb_define_singleton_method(mLowlevel, "ws2811_direct_colors", _wrap_ws2811_direct_colors_get, 0);
   rb_define_singleton_method(mLowlevel, "ws2811_direct_colors=", _wrap_ws2811_direct_colors_set, 1);
   rb_define_module_function(mLowlevel, "ws2811_render", _wrap_ws2811_render, -1);
-  rb_define_singleton_method(mLowlevel, "ws2811_dma_error", _wrap_ws2811_dma_error_get, 0);
-  rb_define_singleton_method(mLowlevel, "ws2811_dma_error=", _wrap_ws2811_dma_error_set, 1);
   rb_define_module_function(mLowlevel, "ws2811_wait", _wrap_ws2811_wait, -1);
   rb_define_module_function(mLowlevel, "ws2811_led_get", _wrap_ws2811_led_get, -1);
   rb_define_module_function(mLowlevel, "ws2811_led_set", _wrap_ws2811_led_set, -1);

data/ext/ws2812/mailbox.c

@@ -101,8 +101,7 @@ static int mbox_property(int file_desc, void *buf)
       ret_val = ioctl(fd, IOCTL_MBOX_PROPERTY, buf);
 
       if (ret_val < 0) {
-         // printf("ioctl_set_msg failed, errno %d: %m\n", errno);
-		 // XXX: this is apparently the only error, so why would we bother anyone?
+         printf("ioctl_set_msg failed, errno %d: %m\n", errno);
       }
    }
 #ifdef DEBUG
@@ -268,42 +267,33 @@ unsigned execute_qpu(int file_desc, unsigned num_qpus, unsigned control, unsigne
    return p[5];
 }
 
-// mbox_open errors go here
-int mbox_errno = MBOX_ERRNO_OK;
-
 int mbox_open(void) {
    int file_desc;
-   char *filename = NULL;
-
-   mbox_errno = MBOX_ERRNO_OK;
+   char filename[64];
 
    // open a char device file used for communicating with kernel mbox driver
-   filename = tempnam("/tmp", "mbox");
-   if (filename == NULL) {
-	   mbox_errno = MBOX_ERRNO_CANT_TEMPNAM;
-	   goto err;
-   }
-   unlink(filename);
-   if (mknod(filename, S_IFCHR|0600, makedev(100, 0)) < 0) {
-      // printf("Failed to create mailbox device %s: %m\n", filename);
-	  mbox_errno = MBOX_ERRNO_CANT_MKNOD;
-      goto err;
-   }
+
+   sprintf(filename, "/dev/vcio");
    file_desc = open(filename, 0);
+
+   if( file_desc < 0 ){
+     printf("Failed to open %s, trying old method.\n", filename);
+     sprintf(filename, "/dev/mailbox-%d", getpid());
+     unlink(filename);
+     if (mknod(filename, S_IFCHR|0600, makedev(100, 0)) < 0) {
+        printf("Failed to create mailbox device %s: %m\n", filename);
+        return -1;
+     }
+     file_desc = open(filename, 0);
+   }
    if (file_desc < 0) {
-      // printf("Can't open device file %s: %m\n", filename);
-	  mbox_errno = MBOX_ERRNO_CANT_OPEN;
-      goto err;
+      printf("Can't open device file %s: %m\n", filename);
+      //unlink(filename);
+      return -1;
    }
-   unlink(filename);
+   //unlink(filename);
 
    return file_desc;
-err:
-   if (filename != NULL) {
-	   unlink(filename);
-	   free(filename);
-   }
-   return -1;
 }
 
 void mbox_close(int file_desc) {

data/ext/ws2812/mailbox.h

@@ -30,13 +30,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define MAJOR_NUM 100
 #define IOCTL_MBOX_PROPERTY _IOWR(MAJOR_NUM, 0, char *)
 
-#define MBOX_ERRNO_OK 0
-#define MBOX_ERRNO_CANT_TEMPNAM 1
-#define MBOX_ERRNO_CANT_MKNOD 2
-#define MBOX_ERRNO_CANT_OPEN 3
-// mbox_open errors go here
-extern int mbox_errno;
-
 int mbox_open(void);
 void mbox_close(int file_desc);
 

data/ext/ws2812/pwm.h

@@ -97,7 +97,7 @@ typedef struct
     uint32_t resvd_0x1c;
     uint32_t rng2;
     uint32_t dat2;
-} __attribute__((packed)) pwm_t;
+} pwm_t;
 
 
 #define PWM_OFFSET                               (0x0020c000)

data/ext/ws2812/ws2811.c

@@ -561,11 +561,6 @@ void ws2811_fini(ws2811_t *ws2811)
     ws2811_cleanup(ws2811);
 }
 
-/**
- * Contains any errors from executing ws2811_wait
- */
-uint32_t ws2811_dma_error = 0;
-
 /**
  * Wait for any executing DMA operation to complete before returning.
  *
@@ -585,19 +580,21 @@ int ws2811_wait(ws2811_t *ws2811)
 
     if (dma->cs & RPI_DMA_CS_ERROR)
     {
-        // fprintf(stderr, "DMA Error: %08x\n", dma->debug);
-		ws2811_dma_error = dma->debug;
+        fprintf(stderr, "DMA Error: %08x\n", dma->debug);
         return -1;
     }
 
     return 0;
 }
 
+
+
 /**
  * Setting to non-zero bypasses brightness
  */
 uint8_t ws2811_direct_colors = 0;
 
+
 /**
  * Render the PWM DMA buffer from the user supplied LED arrays and start the DMA
  * controller.  This will update all LEDs on both PWM channels.
@@ -621,16 +618,17 @@ int ws2811_render(ws2811_t *ws2811)
         for (i = 0; i < channel->count; i++)                // Led
         {
             uint8_t color[] = {0, 0, 0};
-
-            color[0] = (channel->leds[i] >> 8) & 0xff; // green
-            color[1] = (channel->leds[i] >> 16) & 0xff; // red
-            color[2] = (channel->leds[i] >> 0) & 0xff; // blue
-            if (ws2811_direct_colors == 0) {
-                // apply the gamma table
-                color[0] = (ws281x_gamma[color[0]] * scale) >> 8; // green
-                color[1] = (ws281x_gamma[color[1]] * scale) >> 8; // red
-                color[2] = (ws281x_gamma[color[2]] * scale) >> 8; // blue
+            
+            if (ws2811_direct_colors == 0){
+                color[0] = (ws281x_gamma[((channel->leds[i] >> 8)  & 0xff)] * scale) >> 8; // green
+                color[1] = (ws281x_gamma[((channel->leds[i] >> 16) & 0xff)] * scale) >> 8; // red
+                color[2] = (ws281x_gamma[((channel->leds[i] >> 0)  & 0xff)] * scale) >> 8; // blue
             }
+            else {
+                color[0] = (channel->leds[i] >> 8) & 0xff;  // green
+                color[1] = (channel->leds[i] >> 16) & 0xff; // red
+                color[2] = (channel->leds[i] >> 0) & 0xff;  // blue
+            };
 
             for (j = 0; j < ARRAY_SIZE(color); j++)        // Color
             {

data/ext/ws2812/ws2811.h

@@ -59,9 +59,8 @@ typedef struct
 
 int ws2811_init(ws2811_t *ws2811);               //< Initialize buffers/hardware
 void ws2811_fini(ws2811_t *ws2811);              //< Tear it all down
-extern uint8_t ws2811_direct_colors;             //< Set to non-zero to bypass "brightness" [gamma correction] altogether (default is 0)
+extern uint8_t ws2811_direct_colors;		 //< Set to non-zero to bypass "brightness" [gamma correction] altogether (default is 0)
 int ws2811_render(ws2811_t *ws2811);             //< Send LEDs off to hardware
-extern uint32_t ws2811_dma_error;                //< DMA errors from ws2811_wait go here
 int ws2811_wait(ws2811_t *ws2811);               //< Wait for DMA completion
 
 

data/lib/ws2812.rb

@@ -1,5 +1,5 @@
 module Ws2812
-	VERSION = "0.0.2"
+	VERSION = "0.0.3"
 end
 
 # to make it all less confusing

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ws2812
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.3
 platform: ruby
 authors:
 - Michal Jirků
@@ -17,33 +16,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Gem that encapsulates modified RPi ws281x library from UnicornHat to
@@ -54,7 +49,7 @@ extensions:
 - ext/ws2812/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -89,26 +84,25 @@ files:
 homepage: https://github.com/wejn/ws2812
 licenses:
 - GPL-2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby wrapper around WS2812 LED driver for Raspberry Pi
 test_files: []