Add NO_FPS_LIMIT instead of magic numbers

tannewt · tannewt · commit 923a5b28ca57 · 2023-10-05T14:56:11.000-07:00
diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c
@@ -276,15 +276,15 @@ STATIC mp_obj_t displayio_display_obj_refresh(size_t n_args, const mp_obj_t *pos
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     displayio_display_obj_t *self = native_display(pos_args[0]);
-    uint32_t maximum_ms_per_real_frame = 0xffffffff;
+    uint32_t maximum_ms_per_real_frame = NO_FPS_LIMIT;
     mp_int_t minimum_frames_per_second = args[ARG_minimum_frames_per_second].u_int;
     if (minimum_frames_per_second > 0) {
         maximum_ms_per_real_frame = 1000 / minimum_frames_per_second;
     }
 
     uint32_t target_ms_per_frame;
     if (args[ARG_target_frames_per_second].u_obj == mp_const_none) {
-        target_ms_per_frame = 0xffffffff;
+        target_ms_per_frame = NO_FPS_LIMIT;
     } else {
         target_ms_per_frame = 1000 / mp_obj_get_int(args[ARG_target_frames_per_second].u_obj);
     }
diff --git a/shared-bindings/displayio/Display.h b/shared-bindings/displayio/Display.h
@@ -35,6 +35,7 @@
 extern const mp_obj_type_t displayio_display_type;
 
 #define NO_BRIGHTNESS_COMMAND 0x100
+#define NO_FPS_LIMIT 0xffffffff
 
 void common_hal_displayio_display_construct(displayio_display_obj_t *self,
     mp_obj_t bus, uint16_t width, uint16_t height,
diff --git a/shared-bindings/framebufferio/FramebufferDisplay.c b/shared-bindings/framebufferio/FramebufferDisplay.c
@@ -136,15 +136,15 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_obj_refresh(size_t n_args, cons
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     framebufferio_framebufferdisplay_obj_t *self = native_display(pos_args[0]);
-    uint32_t maximum_ms_per_real_frame = 0xffffffff;
+    uint32_t maximum_ms_per_real_frame = NO_FPS_LIMIT;
     mp_int_t minimum_frames_per_second = args[ARG_minimum_frames_per_second].u_int;
     if (minimum_frames_per_second > 0) {
         maximum_ms_per_real_frame = 1000 / minimum_frames_per_second;
     }
 
     uint32_t target_ms_per_frame;
     if (args[ARG_target_frames_per_second].u_obj == mp_const_none) {
-        target_ms_per_frame = 0xffffffff;
+        target_ms_per_frame = NO_FPS_LIMIT;
     } else {
         target_ms_per_frame = 1000 / mp_obj_get_int(args[ARG_target_frames_per_second].u_obj);
     }
diff --git a/shared-bindings/framebufferio/FramebufferDisplay.h b/shared-bindings/framebufferio/FramebufferDisplay.h
@@ -36,6 +36,7 @@
 extern const mp_obj_type_t framebufferio_framebufferdisplay_type;
 
 #define NO_BRIGHTNESS_COMMAND 0x100
+#define NO_FPS_LIMIT 0xffffffff
 
 void common_hal_framebufferio_framebufferdisplay_construct(framebufferio_framebufferdisplay_obj_t *self,
     mp_obj_t framebuffer,
diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c
@@ -354,7 +354,7 @@ uint16_t common_hal_displayio_display_get_rotation(displayio_display_obj_t *self
 
 
 bool common_hal_displayio_display_refresh(displayio_display_obj_t *self, uint32_t target_ms_per_frame, uint32_t maximum_ms_per_real_frame) {
-    if (!self->auto_refresh && !self->first_manual_refresh && (target_ms_per_frame != 0xffffffff)) {
+    if (!self->auto_refresh && !self->first_manual_refresh && (target_ms_per_frame != NO_FPS_LIMIT)) {
         uint64_t current_time = supervisor_ticks_ms64();
         uint32_t current_ms_since_real_refresh = current_time - self->core.last_refresh;
         // Test to see if the real frame time is below our minimum.
diff --git a/shared-module/framebufferio/FramebufferDisplay.c b/shared-module/framebufferio/FramebufferDisplay.c
@@ -283,7 +283,7 @@ uint16_t common_hal_framebufferio_framebufferdisplay_get_rotation(framebufferio_
 
 
 bool common_hal_framebufferio_framebufferdisplay_refresh(framebufferio_framebufferdisplay_obj_t *self, uint32_t target_ms_per_frame, uint32_t maximum_ms_per_real_frame) {
-    if (!self->auto_refresh && !self->first_manual_refresh && (target_ms_per_frame != 0xffffffff)) {
+    if (!self->auto_refresh && !self->first_manual_refresh && (target_ms_per_frame != NO_FPS_LIMIT)) {
         uint64_t current_time = supervisor_ticks_ms64();
         uint32_t current_ms_since_real_refresh = current_time - self->core.last_refresh;
         // Test to see if the real frame time is below our minimum.
