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

trying to fix gpio_slowdown

Browse Source
This commit is contained in:
Brendan Porter
2018-08-17 13:21:43 -05:00
parent 3780e4ab41
commit bccf120d93
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
matrix.go
View File

@@ -4,7 +4,6 @@ package rgbmatrix
#cgo CFLAGS: -std=c99 -I${SRCDIR}/vendor/rpi-rgb-led-matrix/include -DSHOW_REFRESH_RATE #cgo CFLAGS: -std=c99 -I${SRCDIR}/vendor/rpi-rgb-led-matrix/include -DSHOW_REFRESH_RATE
#cgo LDFLAGS: -lrgbmatrix -L${SRCDIR}/vendor/rpi-rgb-led-matrix/lib -lstdc++ -lm #cgo LDFLAGS: -lrgbmatrix -L${SRCDIR}/vendor/rpi-rgb-led-matrix/lib -lstdc++ -lm
#include <led-matrix-c.h> #include <led-matrix-c.h>
#include "led-matrix.h"
void led_matrix_swap(struct RGBLedMatrix *matrix, struct LedCanvas *offscreen_canvas, void led_matrix_swap(struct RGBLedMatrix *matrix, struct LedCanvas *offscreen_canvas,
int width, int height, const uint32_t pixels[]) { int width, int height, const uint32_t pixels[]) {
@@ -173,8 +172,18 @@ type RGBLedMatrix struct {
const MatrixEmulatorENV = "MATRIX_EMULATOR" const MatrixEmulatorENV = "MATRIX_EMULATOR"
func stringsToC(s []string) **C.char {
cArray := C.malloc(C.size_t(len(s)) * C.size_t(unsafe.Sizeof(uintptr(0))))
for idx, substring := range s {
a[idx] = C.CString(substring)
}
return (**C.char)(cArray)
}
// 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) (c Matrix, err error) { func NewRGBLedMatrix(config *HardwareConfig, argc *int, argv *[]string) (c Matrix, err error) {
defer func() { defer func() {
if r := recover(); r != nil { if r := recover(); r != nil {
var ok bool var ok bool
@@ -190,7 +199,7 @@ func NewRGBLedMatrix(config *HardwareConfig) (c Matrix, err 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(), argc, &stringsToC(*argv))
b := C.led_matrix_create_offscreen_canvas(m) b := C.led_matrix_create_offscreen_canvas(m)
c = &RGBLedMatrix{ c = &RGBLedMatrix{
Config: config, Config: config,