2 files changed, 12 insertions, 12 deletions
diff --git a/src/displayapp/screens/StopWatch.cpp b/src/displayapp/screens/StopWatch.cpp
index fffedcc3..d2f40479 100644
--- a/src/displayapp/screens/StopWatch.cpp
+++ b/src/displayapp/screens/StopWatch.cpp
@@ -8,13 +8,13 @@ using namespace Pinetime::Controllers;
 
 namespace {
   TimeSeparated ConvertTicksToTimeSegments(const TickType_t timeElapsed) {
-    const int timeElapsedSecs = timeElapsed / configTICK_RATE_HZ;
-    const int timeElapsedFraction = timeElapsed % configTICK_RATE_HZ;
+    const uint32_t timeElapsedSecs = timeElapsed / configTICK_RATE_HZ;
+    const uint16_t timeElapsedFraction = timeElapsed % configTICK_RATE_HZ;
 
-    const int hundredths = timeElapsedFraction * 100 / configTICK_RATE_HZ;
-    const int secs = (timeElapsedSecs) % 60;
-    const int mins = (timeElapsedSecs / 60) % 60;
-    const int hours = (timeElapsedSecs / 60) / 60;
+    const uint8_t hundredths = timeElapsedFraction * 100 / configTICK_RATE_HZ;
+    const uint8_t secs = (timeElapsedSecs) % 60;
+    const uint8_t mins = (timeElapsedSecs / 60) % 60;
+    const uint16_t hours = (timeElapsedSecs / 60) / 60;
     return TimeSeparated {hours, mins, secs, hundredths, timeElapsedSecs};
   }
 
diff --git a/src/displayapp/screens/StopWatch.h b/src/displayapp/screens/StopWatch.h
index 249eec84..3e8d9e73 100644
--- a/src/displayapp/screens/StopWatch.h
+++ b/src/displayapp/screens/StopWatch.h
@@ -13,11 +13,11 @@ namespace Pinetime::Applications {
   namespace Screens {
 
     struct TimeSeparated {
-      int hours;
-      int mins;
-      int secs;
-      int hundredths;
-      int epochSecs;
+      uint16_t hours;
+      uint8_t mins;
+      uint8_t secs;
+      uint8_t hundredths;
+      uint32_t epochSecs;
     };
 
     class StopWatch : public Screen {
@@ -46,7 +46,7 @@ namespace Pinetime::Applications {
       Pinetime::System::WakeLock wakeLock;
       Controllers::StopWatchController& stopWatchController;
       TickType_t blinkTime = 0;
-      int displayedLaps = 3;
+      uint8_t displayedLaps = 3;
       lv_obj_t *time, *msecTime, *btnPlayPause, *btnStopLap, *txtPlayPause, *txtStopLap;
       lv_obj_t* lapText;
       Utility::DirtyValue<TickType_t> renderedSeconds;