Update rgbmatrix, fix column calculation

pull/11/head
Mike Ryan 7 years ago
parent 4bc9d716f5
commit 7ee3f98c49

@ -37,6 +37,7 @@ import (
// DefaultConfig default WS281x configuration // DefaultConfig default WS281x configuration
var DefaultConfig = HardwareConfig{ var DefaultConfig = HardwareConfig{
Rows: 32, Rows: 32,
Cols: 32,
ChainLength: 1, ChainLength: 1,
Parallel: 1, Parallel: 1,
PWMBits: 11, PWMBits: 11,
@ -49,6 +50,8 @@ var DefaultConfig = HardwareConfig{
type HardwareConfig struct { type HardwareConfig struct {
// Rows the number of rows supported by the display, so 32 or 16. // Rows the number of rows supported by the display, so 32 or 16.
Rows int 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 // ChainLengthis the number of displays daisy-chained together
// (output of one connected to input of next). // (output of one connected to input of next).
ChainLength int ChainLength int
@ -82,12 +85,13 @@ type HardwareConfig struct {
} }
func (c *HardwareConfig) geometry() (width, height int) { 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 { func (c *HardwareConfig) toC() *C.struct_RGBLedMatrixOptions {
o := &C.struct_RGBLedMatrixOptions{} o := &C.struct_RGBLedMatrixOptions{}
o.rows = C.int(c.Rows) o.rows = C.int(c.Rows)
o.cols = C.int(c.Cols)
o.chain_length = C.int(c.ChainLength) o.chain_length = C.int(c.ChainLength)
o.parallel = C.int(c.Parallel) o.parallel = C.int(c.Parallel)
o.pwm_bits = C.int(c.PWMBits) o.pwm_bits = C.int(c.PWMBits)

@ -1 +1 @@
Subproject commit 24ecf1d8393d55880b013e068a7d3575c13ab8ac Subproject commit 0a4f8f9a9ea46dbb74f068afea8d07b5aeb72244
Loading…
Cancel
Save