fps graph enable/disable

eez-open · Dec 11, 2021 · 5c14ee5 · 5c14ee5
1 parent 4b729c7
commit 5c14ee5
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 31 deletions.
diff --git a/src/bb3/conf/eez/gui_conf.h b/src/bb3/conf/eez/gui_conf.h
@@ -36,5 +36,4 @@
 #define EEZ_CONF_COLOR_ID_BACKDROP eez::gui::COLOR_ID_BACKDROP
 
 #define EEZ_CONF_GUI_CALC_FPS
-#define EEZ_CONF_GUI_DRAW_FPS_GRAPH
 #define EEZ_CONF_STYLE_ID_FPS_GRAPH STYLE_ID_FPS_GRAPH
diff --git a/src/bb3/keyboard.cpp b/src/bb3/keyboard.cpp
@@ -23,7 +23,6 @@
 #include <bb3/keyboard.h>
 #include <bb3/mouse.h>
 #include <eez/gui/gui.h>
-#include <eez/gui/display.h>
 #include <bb3/psu/psu.h>
 #include <bb3/psu/gui/psu.h>
 

diff --git a/src/bb3/mouse.cpp b/src/bb3/mouse.cpp
@@ -17,7 +17,6 @@
 */
 
 #include <eez/gui/gui.h>
-#include <eez/gui/display.h>
 
 #include <bb3/keyboard.h>
 #include <bb3/mouse.h>

diff --git a/src/bb3/psu/scpi/debug.cpp b/src/bb3/psu/scpi/debug.cpp
@@ -23,6 +23,8 @@
 #include <main.h>
 #endif
 
+#include <eez/gui/gui.h>
+
 #include <bb3/firmware.h>
 #include <bb3/system.h>
 #include <eez/alloc.h>
@@ -37,9 +39,7 @@
 #include <bb3/psu/ontime.h>
 #include <bb3/psu/scpi/psu.h>
 #include <bb3/psu/event_queue.h>
-#if OPTION_DISPLAY
 #include <bb3/psu/gui/psu.h>
-#endif
 
 #include <bb3/mcu/eeprom.h>
 
@@ -142,8 +142,19 @@ scpi_result_t scpi_cmd_debug(scpi_t *context) {
         }
 		else if (cmd == 34) {
 			g_startTime = millis();
-		} else {
-            SCPI_ErrorPush(context, SCPI_ERROR_HARDWARE_MISSING);
+		} 
+#if defined(EEZ_CONF_GUI_CALC_FPS) && defined(EEZ_CONF_STYLE_ID_FPS_GRAPH)
+        else if (cmd == 35) {
+			using namespace eez::gui;
+			using namespace eez::gui::display;
+			g_drawFpsGraphEnabled = !g_drawFpsGraphEnabled;
+            g_calcFpsEnabled = g_drawFpsGraphEnabled;
+			refreshScreen();
+			return SCPI_RES_OK;
+		} 
+#endif
+        else {
+            SCPI_ErrorPush(context, SCPI_ERROR_PARAMETER_NOT_ALLOWED);
             return SCPI_RES_ERR;
         }
     } else {

diff --git a/src/bb3/tasks.cpp b/src/bb3/tasks.cpp
@@ -110,7 +110,7 @@ EEZ_MESSAGE_QUEUE_DECLARE(highPriority, {
 
 void lowPriorityThreadMainLoop(void *);
 
-EEZ_THREAD_DECLARE(lowPriority, Normal, 12 * 1024);
+EEZ_THREAD_DECLARE(lowPriority, Normal, 24 * 1024);
 
 EEZ_MESSAGE_QUEUE_DECLARE(lowPriority, {
 	LowPriorityThreadMessage type;

diff --git a/src/bb3/usb.cpp b/src/bb3/usb.cpp
@@ -27,14 +27,13 @@
 #include <bb3/mouse.h>
 #include <bb3/usb.h>
 
+#include <eez/gui/gui.h>
 #include <bb3/gui/thread.h>
 
 #include <bb3/psu/psu.h>
 #include <bb3/psu/persist_conf.h>
 #include <bb3/psu/serial_psu.h>
 
-#include <eez/gui/display.h>
-
 int g_usbMode = USB_MODE_DISABLED;
 int g_otgMode = USB_MODE_DISABLED;
 int g_usbDeviceClass = USB_DEVICE_CLASS_VIRTUAL_COM_PORT;

diff --git a/src/eez/gui/display.cpp b/src/eez/gui/display.cpp
@@ -562,10 +562,10 @@ void endRendering() {
     }
 #endif
 
-#ifdef EEZ_CONF_GUI_CALC_FPS
-#ifdef EEZ_CONF_GUI_DRAW_FPS_GRAPH
-	setDirty();
-#endif
+#if defined(EEZ_CONF_GUI_CALC_FPS) && defined(EEZ_CONF_STYLE_ID_FPS_GRAPH)
+    if (g_drawFpsGraphEnabled) {
+	    setDirty();
+    }
 #endif
 
     if (isDirty()) {
@@ -595,10 +595,10 @@ void endRendering() {
             bitBlt(g_buffers[bufferIndex].bufferPointer, nullptr, sx, sy, x2 - x1 + 1, y2 - y1 + 1, x1, y1, buffer.opacity);
         }
 
-#ifdef EEZ_CONF_GUI_CALC_FPS
-#ifdef EEZ_CONF_GUI_DRAW_FPS_GRAPH
-        drawFpsGraph(getDisplayWidth() - 64 - 4, 4, 64, 32, getStyle(EEZ_CONF_STYLE_ID_FPS_GRAPH));
-#endif
+#if defined(EEZ_CONF_GUI_CALC_FPS) && defined(EEZ_CONF_STYLE_ID_FPS_GRAPH)
+        if (g_drawFpsGraphEnabled) {
+            drawFpsGraph(getDisplayWidth() - 64 - 4, 4, 64, 32, getStyle(EEZ_CONF_STYLE_ID_FPS_GRAPH));
+        }
 #endif
 
 #if OPTION_KEYBOARD
@@ -612,12 +612,20 @@ void endRendering() {
 }
 
 #ifdef EEZ_CONF_GUI_CALC_FPS
+bool g_calcFpsEnabled;
+#if defined(EEZ_CONF_STYLE_ID_FPS_GRAPH)
+bool g_drawFpsGraphEnabled;
+#endif
 uint32_t g_fpsValues[NUM_FPS_VALUES];
 uint32_t g_fpsAvg;
 static uint32_t g_fpsTotal;
 static uint32_t g_lastTimeFPS;
 
 void startCalcFPS() {
+    if (!g_calcFpsEnabled) {
+        return;
+    }
+
     // calculate last FPS value
 	g_fpsTotal -= g_fpsValues[0];
 
@@ -639,6 +647,10 @@ void startCalcFPS() {
 }
 
 void endCalcFPS() {
+    if (!g_calcFpsEnabled) {
+        return;
+    }
+
 	g_lastTimeFPS = millis();
 }
 

diff --git a/src/eez/gui/display.h b/src/eez/gui/display.h
@@ -118,6 +118,10 @@ void *getBufferPointer();
 const uint8_t * takeScreenshot();
 
 #ifdef EEZ_CONF_GUI_CALC_FPS
+extern bool g_calcFpsEnabled;
+#if defined(EEZ_CONF_STYLE_ID_FPS_GRAPH)
+extern bool g_drawFpsGraphEnabled;
+#endif
 extern uint32_t g_fpsAvg;
 void drawFpsGraph(int x, int y, int w, int h, const Style *style);
 #endif

diff --git a/src/eez/gui/gui.h b/src/eez/gui/gui.h
@@ -18,11 +18,10 @@
 
 #pragma once
 
+#include <eez/gui_conf.h>
 #include <eez/gui/assets.h>
 #include <eez/gui/page.h>
-
 #include <eez/gui/display.h>
-#include <eez/gui_conf.h>
 
 enum {
 	PAGE_ID_NONE = 0,

diff --git a/src/eez/platform/simulator/display.cpp b/src/eez/platform/simulator/display.cpp
@@ -37,7 +37,6 @@
 #include <eez/mouse.h>
 #endif
 
-#include <eez/gui/display.h>
 #include <eez/gui/display-private.h>
 
 using namespace eez::gui;
@@ -265,6 +264,10 @@ void sync() {
         return;
     }
 
+#ifdef EEZ_CONF_GUI_CALC_FPS
+	startCalcFPS();
+#endif
+
     if (g_mainWindow == nullptr) {
         init();
     }
@@ -276,9 +279,9 @@ void sync() {
         }
         clearDirty();
 #ifdef EEZ_CONF_GUI_CALC_FPS
-        calcFPS();
+		endCalcFPS();
 #endif
-        return;
+		return;
     }
 
     if (g_takeScreenshot) {
@@ -298,9 +301,8 @@ void sync() {
     }
 
 #ifdef EEZ_CONF_GUI_CALC_FPS
-    calcFPS();
+	endCalcFPS();
 #endif
-
 }
 
 void finishAnimation() {

diff --git a/src/eez/platform/stm32/display.cpp b/src/eez/platform/stm32/display.cpp
@@ -33,7 +33,6 @@
 #include <eez/os.h>
 
 #include <eez/gui/gui.h>
-#include <eez/gui/display.h>
 #include <eez/gui/display-private.h>
 
 #include <eez/platform/stm32/display.h>
@@ -435,11 +434,11 @@ void sync() {
         return;
     }
 
-    static const uint32_t VSYNC_PERIOD = 12;
-    uint32_t time = millis();
-    if (time - g_lastSyncTime < VSYNC_PERIOD) {
-        osDelay(VSYNC_PERIOD - (time - g_lastSyncTime));
-    }
+    // static const uint32_t VSYNC_PERIOD = 12;
+    // uint32_t time = millis();
+    // if (time - g_lastSyncTime < VSYNC_PERIOD) {
+    //     osDelay(VSYNC_PERIOD - (time - g_lastSyncTime));
+    // }
 
     if (isDirty()) {
         clearDirty();