Review feedback including NO_BRIGHTNESS_COMMAND macro

4 files changed, 20 insertions, 20 deletions

diff --git a/shared-module/displayio/ColorConverter.c b/shared-module/displayio/ColorConverter.c
index 563d40c51..6b9bd5840 100644
--- a/shared-module/displayio/ColorConverter.c
+++ b/shared-module/displayio/ColorConverter.c
@@ -57,8 +57,8 @@ bool displayio_colorconverter_convert(displayio_colorconverter_t *self, const _d
     return false;
 }
 
-bool common_hal_displayio_colorconverter_convert(displayio_colorconverter_t *self, const _displayio_colorspace_t* colorspace, uint32_t input_color, uint32_t* output_color) {
-    return displayio_colorconverter_convert(self, colorspace, input_color, output_color);
+void common_hal_displayio_colorconverter_convert(displayio_colorconverter_t *self, const _displayio_colorspace_t* colorspace, uint32_t input_color, uint32_t* output_color) {
+    displayio_colorconverter_convert(self, colorspace, input_color, output_color);
 }
 
 // Currently no refresh logic is needed for a ColorConverter.
diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c
index 9aee70e32..a8515b9e5 100644
--- a/shared-module/displayio/Display.c
+++ b/shared-module/displayio/Display.c
@@ -153,7 +153,8 @@ void common_hal_displayio_display_construct(displayio_display_obj_t* self,
             common_hal_pulseio_pwmout_never_reset(&self->backlight_pwm);
         }
     }
-    if (!self->auto_brightness && (self->backlight_inout.base.type != &mp_type_NoneType || brightness_command <= 0xff)) {
+    if (!self->auto_brightness && (self->backlight_inout.base.type != &mp_type_NoneType ||
+                                   brightness_command != NO_BRIGHTNESS_COMMAND)) {
         common_hal_displayio_display_set_brightness(self, brightness);
     } else {
         self->current_brightness = -1.0;
@@ -258,7 +259,7 @@ bool common_hal_displayio_display_set_brightness(displayio_display_obj_t* self,
     } else if (self->backlight_inout.base.type == &digitalio_digitalinout_type) {
         common_hal_digitalio_digitalinout_set_value(&self->backlight_inout, brightness > 0.99);
         ok = true;
-    } else if (self->brightness_command < 0x100) {
+    } else if (self->brightness_command != NO_BRIGHTNESS_COMMAND) {
         ok = self->begin_transaction(self->bus);
         if (ok) {
             if (self->data_as_commands) {
@@ -315,17 +316,16 @@ void displayio_display_set_region_to_update(displayio_display_obj_t* self, displ
         data_length = 0;
     }
     if (self->single_byte_bounds) {
-        data[data_length] = x1 + self->colstart;
-        data[data_length + 1] = x2 - 1 + self->colstart;
+        data[data_length++] = x1 + self->colstart;
+        data[data_length++] = x2 - 1 + self->colstart;
         data_length += 2;
     } else {
         x1 += self->colstart;
         x2 += self->colstart - 1;
-        data[data_length] = x1 >> 8;
-        data[data_length + 1] = x1 & 0xff;
-        data[data_length + 2] = x2 >> 8;
-        data[data_length + 3] = x2 & 0xff;
-        data_length += 4;
+        data[data_length++] = x1 >> 8;
+        data[data_length++] = x1 & 0xff;
+        data[data_length++] = x2 >> 8;
+        data[data_length++] = x2 & 0xff;
     }
     self->send(self->bus, self->data_as_commands, data, data_length);
 
@@ -337,17 +337,15 @@ void displayio_display_set_region_to_update(displayio_display_obj_t* self, displ
         data_length = 0;
     }
     if (self->single_byte_bounds) {
-        data[data_length] = y1 + self->rowstart;
-        data[data_length + 1] = y2 - 1 + self->rowstart;
-        data_length += 2;
+        data[data_length++] = y1 + self->rowstart;
+        data[data_length++] = y2 - 1 + self->rowstart;
     } else {
         y1 += self->rowstart;
         y2 += self->rowstart - 1;
-        data[data_length] = y1 >> 8;
-        data[data_length + 1] = y1 & 0xff;
-        data[data_length + 2] = y2 >> 8;
-        data[data_length + 3] = y2 & 0xff;
-        data_length += 4;
+        data[data_length++] = y1 >> 8;
+        data[data_length++] = y1 & 0xff;
+        data[data_length++] = y2 >> 8;
+        data[data_length++] = y2 & 0xff;
     }
     self->send(self->bus, self->data_as_commands, data, data_length);
 }
diff --git a/shared-module/displayio/Palette.h b/shared-module/displayio/Palette.h
index 6f5e2774c..19c05baf5 100644
--- a/shared-module/displayio/Palette.h
+++ b/shared-module/displayio/Palette.h
@@ -53,6 +53,8 @@ typedef struct {
     bool needs_refresh;
 } displayio_palette_t;
 
+// Returns false if color fetch did not succeed (out of range or transparent).
+// Returns true if color is opaque, and sets color.
 bool displayio_palette_get_color(displayio_palette_t *palette, const _displayio_colorspace_t* colorspace, uint32_t palette_index, uint32_t* color);
 bool displayio_palette_needs_refresh(displayio_palette_t *self);
 void displayio_palette_finish_refresh(displayio_palette_t *self);
diff --git a/shared-module/displayio/TileGrid.c b/shared-module/displayio/TileGrid.c
index 77e6daf6f..88873d3a9 100644
--- a/shared-module/displayio/TileGrid.c
+++ b/shared-module/displayio/TileGrid.c
@@ -379,7 +379,7 @@ bool displayio_tilegrid_fill_area(displayio_tilegrid_t *self, const _displayio_c
             // Compute the destination pixel in the buffer and mask based on the transformations.
             int16_t offset = row_start + (x - start_x + x_shift) * x_stride; // in pixels
 
-            // This is super useful for debugging out range accesses. Uncomment to use.
+            // This is super useful for debugging out of range accesses. Uncomment to use.
             // if (offset < 0 || offset >= (int32_t) displayio_area_size(area)) {
             //     asm("bkpt");
             // }