Get more accurate frame time measurements

There were a few overflowing fixed point numbers, this should reduce the
issue slightly.

2 files changed, 13 insertions, 9 deletions

diff --git a/src/main.c b/src/main.c
index 2f5d5af..0a78367 100644
--- a/src/main.c
+++ b/src/main.c
@@ -85,6 +85,7 @@ test_moving_line(void) {
     int inc_x = 1;
     int inc_y = 0;
     int should_move = 1;
+    screen_fill(3);
     while (true) {
         poll_keys();
         if (key_tap(KEY_A)) {
@@ -98,8 +99,10 @@ test_moving_line(void) {
         bios_vblank_wait();
         FRAME_START();
         PROF(flip_buffer(), flip_cycles);
+#if FLIP_TYPE == 0
         PROF(screen_fill(3), clear_cycles);
-        PROF(draw_line(x, y, 239 - x, 159 - y, 2), line_cycles);
+#endif
+        PROF(draw_line(x, y, 239 - x, 159 - y, 3), line_cycles);
         x += inc_x * should_move;
         y += inc_y * should_move;
         if (x == 239 && inc_x == 1) {
@@ -112,6 +115,7 @@ test_moving_line(void) {
             inc_x = 1;
             inc_y = 0;
         }
+        PROF(draw_line(x, y, 239 - x, 159 - y, 2), line_cycles);
         FRAME_END();
         PROF_SHOW();
     }
diff --git a/src/profiling.c b/src/profiling.c
index 6a4d448..90215c8 100644
--- a/src/profiling.c
+++ b/src/profiling.c
@@ -9,7 +9,7 @@
 #if PROF_ENABLE > 0 && PROF_ENABLE < 3
 
 #ifndef PROF_N_FRAMES
-#define PROF_N_FRAMES 5
+#define PROF_N_FRAMES 30
 #endif
 
 // Profile method 1: Average per N frames.
@@ -76,17 +76,17 @@ static bool profile_bg_show = true;
         if (profile_bg_show) {\
             u32 frame_time =\
                 FP_DIV(\
-                    FP_NUM(avg_frame_cycles + 1, 2) * 166,\
-                    FP_NUM(280896, 2) / 100,\
-                    2);\
+                    FP_NUM(avg_frame_cycles + 1, 2),\
+                    FP_NUM(2809, 2),\
+                    2) * 166;\
             u32 fps =\
                 FP_DIV(\
-                    FP_NUM(280896, 2),\
+                    FP_NUM(280896 * 60, 2),\
                     FP_NUM(avg_frame_cycles + 1, 2),\
-                    2) * 60;\
+                    2);\
             draw_filled_rect(8 * 18, 0, 239, 16, 0);\
-            txt_drawf("TIME: %.6d", 8 * 18, 0, 1, frame_time >> 2);\
-            txt_drawf("MAX FPS:%.4d", 8 * 18, 8, 1, (fps >> 2) + 1);\
+            txt_drawf("TIME: %.6lu", 8 * 18, 0, 1, frame_time >> 2);\
+            txt_drawf("MAX FPS:%.4lu", 8 * 18, 8, 1, (fps >> 2) + 1);\
         }\
     } while (0)