From 7ee3f98c49164a83a243dc9b812e8b795d01721e Mon Sep 17 00:00:00 2001
From: Mike Ryan <falter@gmail.com>
Date: Sun, 4 Mar 2018 23:10:23 -0600
Subject: [PATCH] Update rgbmatrix, fix column calculation

---
 matrix.go                 | 8 ++++++--
 vendor/rpi-rgb-led-matrix | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/matrix.go b/matrix.go
index 8523004..b6673c5 100644
--- a/matrix.go
+++ b/matrix.go
@@ -37,6 +37,7 @@ import (
 // DefaultConfig default WS281x configuration
 var DefaultConfig = HardwareConfig{
 	Rows:              32,
+	Cols:              32,
 	ChainLength:       1,
 	Parallel:          1,
 	PWMBits:           11,
@@ -49,6 +50,8 @@ var DefaultConfig = HardwareConfig{
 type HardwareConfig struct {
 	// Rows the number of rows supported by the display, so 32 or 16.
 	Rows int
+	// Cols the number of columns supported by the display, so 32 or 64 .
+	Cols int
 	// ChainLengthis the number of displays daisy-chained together
 	// (output of one connected to input of next).
 	ChainLength int
@@ -82,12 +85,13 @@ type HardwareConfig struct {
 }
 
 func (c *HardwareConfig) geometry() (width, height int) {
-	return c.Rows * c.ChainLength, c.Rows * c.Parallel
+	return c.Cols * c.ChainLength, c.Rows * c.Parallel
 }
 
 func (c *HardwareConfig) toC() *C.struct_RGBLedMatrixOptions {
 	o := &C.struct_RGBLedMatrixOptions{}
 	o.rows = C.int(c.Rows)
+	o.cols = C.int(c.Cols)
 	o.chain_length = C.int(c.ChainLength)
 	o.parallel = C.int(c.Parallel)
 	o.pwm_bits = C.int(c.PWMBits)
@@ -132,7 +136,7 @@ func NewRGBLedMatrix(config *HardwareConfig) (c Matrix, err error) {
 			}
 		}
 	}()
-	
+
 	if isMatrixEmulator() {
 		return buildMatrixEmulator(config), nil
 	}
diff --git a/vendor/rpi-rgb-led-matrix b/vendor/rpi-rgb-led-matrix
index 24ecf1d..0a4f8f9 160000
--- a/vendor/rpi-rgb-led-matrix
+++ b/vendor/rpi-rgb-led-matrix
@@ -1 +1 @@
-Subproject commit 24ecf1d8393d55880b013e068a7d3575c13ab8ac
+Subproject commit 0a4f8f9a9ea46dbb74f068afea8d07b5aeb72244