Switch to int32 for marquee text timer

AEFeinstein · Aug 24, 2024 · b24ddab · b24ddab
1 parent 9df67ab
commit b24ddab
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/main/display/font.c b/main/display/font.c
@@ -521,7 +521,7 @@ void makeOutlineFont(font_t* srcFont, font_t* dstFont, bool spiRam)
  * @return The x offset at the end of the drawn string
  */
 int16_t drawTextMarquee(const font_t* font, paletteColor_t color, const char* text, int16_t xOff, int16_t yOff,
-                        int16_t xMax, int64_t* timer)
+                        int16_t xMax, int32_t* timer)
 {
 // Marquee speed in microseconds per pixel
 #define MARQUEE_SPEED 40000

diff --git a/main/display/font.h b/main/display/font.h
@@ -84,7 +84,7 @@ uint16_t textWordWrapHeight(const font_t* font, const char* text, int16_t width,
 
 void makeOutlineFont(font_t* srcFont, font_t* dstFont, bool spiRam);
 int16_t drawTextMarquee(const font_t* font, paletteColor_t color, const char* text, int16_t xOff, int16_t yOff,
-                        int16_t xMax, int64_t* timer);
+                        int16_t xMax, int32_t* timer);
 bool drawTextEllipsize(const font_t* font, paletteColor_t color, const char* text, int16_t xOff, int16_t yOff,
                        int16_t maxW, bool center);
 

diff --git a/main/menu/menuManiaRenderer.h b/main/menu/menuManiaRenderer.h
@@ -82,7 +82,7 @@ typedef struct
     int16_t selectedBounceIdx;    ///< The index to the bounce offset for the selected item
     int32_t selectedBounceTimer;  ///< The timer to bounce the offset for the selected item
     int32_t selectedValue;        ///< The option index or setting value to tell when it changes
-    int64_t selectedMarqueeTimer; ///< The timer for marquee-ing the selected item text, if too long to fit
+    int32_t selectedMarqueeTimer; ///< The timer for marquee-ing the selected item text, if too long to fit
 } menuManiaRenderer_t;
 
 menuManiaRenderer_t* initMenuManiaRenderer(font_t* titleFont, font_t* titleFontOutline, font_t* menuFont);

diff --git a/main/modes/music/usbsynth/mode_synth.c b/main/modes/music/usbsynth/mode_synth.c
@@ -330,7 +330,7 @@ typedef struct
     synthConfig_t synthConfig;
     list_t controllerSettings;
 
-    int64_t marqueeTimer;
+    int32_t marqueeTimer;
 } synthData_t;
 
 //==============================================================================

diff --git a/main/utils/wheel_menu.h b/main/utils/wheel_menu.h
@@ -80,7 +80,7 @@ typedef struct
     bool zoomed;                 ///< Whether or not a settings item is selected
     bool zoomBackSelected;       ///< Whether or not the center is selected while zoomed
     uint8_t zoomValue;           ///< The current selected option/value if zoomed
-    int64_t timer;               ///< The timer for animations
+    int32_t timer;               ///< The timer for animations
 } wheelMenuRenderer_t;
 
 wheelMenuRenderer_t* initWheelMenu(const font_t* font, uint16_t anchorAngle, const rectangle_t* textBox);