publicWagsHome/go-rpi-rgb-led-matrix
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases 2 Wiki Activity

Merge pull request #5 from lukasmalkmus/patch-1

Browse Source 
Update matrix.go
This commit is contained in:
Máximo Cuadros
2017-12-01 23:32:46 +01:00
committed by GitHub
parent e2bcdb7724 511237f615
commit 4bc9d716f5
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
matrix.go
View File

@@ -122,7 +122,17 @@ type RGBLedMatrix struct {
const MatrixEmulatorENV = "MATRIX_EMULATOR" const MatrixEmulatorENV = "MATRIX_EMULATOR"
// NewRGBLedMatrix returns a new matrix using the given size and config // NewRGBLedMatrix returns a new matrix using the given size and config
func NewRGBLedMatrix(config *HardwareConfig) (Matrix, error) { func NewRGBLedMatrix(config *HardwareConfig) (c Matrix, err error) {
defer func() {
if r := recover(); r != nil {
var ok bool
err, ok = r.(error)
if !ok {
err = fmt.Errorf("error creating matrix: %v", r)
}
}
}()
if isMatrixEmulator() { if isMatrixEmulator() {
return buildMatrixEmulator(config), nil return buildMatrixEmulator(config), nil
} }
@@ -130,14 +140,14 @@ func NewRGBLedMatrix(config *HardwareConfig) (Matrix, error) {
w, h := config.geometry() w, h := config.geometry()
m := C.led_matrix_create_from_options(config.toC(), nil, nil) m := C.led_matrix_create_from_options(config.toC(), nil, nil)
b := C.led_matrix_create_offscreen_canvas(m) b := C.led_matrix_create_offscreen_canvas(m)
c := &RGBLedMatrix{ c = &RGBLedMatrix{
Config: config, Config: config,
width: w, height: h, width: w, height: h,
matrix: m, matrix: m,
buffer: b, buffer: b,
leds: make([]C.uint32_t, w*h), leds: make([]C.uint32_t, w*h),
} }
if c.matrix == nil { if m == nil {
return nil, fmt.Errorf("unable to allocate memory") return nil, fmt.Errorf("unable to allocate memory")
} }