Merge pull request adafruit#3543 from jepler/rgbmatrix-brighness-crash

tannewt · web-flow · commit 2e5bea262971 · 2020-10-12T15:24:58.000-07:00
rgbmatrix: Don't crash when setting brightness=0
diff --git a/shared-module/rgbmatrix/RGBMatrix.c b/shared-module/rgbmatrix/RGBMatrix.c
@@ -190,6 +190,8 @@ void common_hal_rgbmatrix_rgbmatrix_set_paused(rgbmatrix_rgbmatrix_obj_t* self,
         _PM_stop(&self->protomatter);
     } else if (!paused && self->paused) {
         _PM_resume(&self->protomatter);
+        _PM_convert_565(&self->protomatter, self->bufinfo.buf, self->width);
+        _PM_swapbuffer_maybe(&self->protomatter);
     }
     self->paused = paused;
 }
@@ -199,8 +201,10 @@ bool common_hal_rgbmatrix_rgbmatrix_get_paused(rgbmatrix_rgbmatrix_obj_t* self)
 }
 
 void common_hal_rgbmatrix_rgbmatrix_refresh(rgbmatrix_rgbmatrix_obj_t* self) {
-    _PM_convert_565(&self->protomatter, self->bufinfo.buf, self->width);
-    _PM_swapbuffer_maybe(&self->protomatter);
+    if (!self->paused) {
+        _PM_convert_565(&self->protomatter, self->bufinfo.buf, self->width);
+        _PM_swapbuffer_maybe(&self->protomatter);
+    }
 }
 
 int common_hal_rgbmatrix_rgbmatrix_get_width(rgbmatrix_rgbmatrix_obj_t* self) {

Original file line number	Diff line number	Diff line change
`@@ -190,6 +190,8 @@ void common_hal_rgbmatrix_rgbmatrix_set_paused(rgbmatrix_rgbmatrix_obj_t* self,`
`190`	`190`	`_PM_stop(&self->protomatter);`
`191`	`191`	`} else if (!paused && self->paused) {`
`192`	`192`	`_PM_resume(&self->protomatter);`
	`193`	`+ _PM_convert_565(&self->protomatter, self->bufinfo.buf, self->width);`
	`194`	`+ _PM_swapbuffer_maybe(&self->protomatter);`
`193`	`195`	`}`
`194`	`196`	`self->paused = paused;`
`195`	`197`	`}`
`@@ -199,8 +201,10 @@ bool common_hal_rgbmatrix_rgbmatrix_get_paused(rgbmatrix_rgbmatrix_obj_t* self)`
`199`	`201`	`}`
`200`	`202`
`201`	`203`	`void common_hal_rgbmatrix_rgbmatrix_refresh(rgbmatrix_rgbmatrix_obj_t* self) {`
`202`		`- _PM_convert_565(&self->protomatter, self->bufinfo.buf, self->width);`
`203`		`- _PM_swapbuffer_maybe(&self->protomatter);`
	`204`	`+ if (!self->paused) {`
	`205`	`+ _PM_convert_565(&self->protomatter, self->bufinfo.buf, self->width);`
	`206`	`+ _PM_swapbuffer_maybe(&self->protomatter);`
	`207`	`+ }`
`204`	`208`	`}`
`205`	`209`
`206`	`210`	`int common_hal_rgbmatrix_rgbmatrix_get_width(rgbmatrix_rgbmatrix_obj_t* self) {`