Merge pull request #227 from LeeLeahy2/idle-count

Idle count

Author: nseidle

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -42,7 +42,7 @@ const int FIRMWARE_VERSION_MINOR = 3;
 #include "settings.h"
 
 #define MAX_CPU_CORES               2
-#define IDLE_COUNT_PER_SECOND       196289
+#define IDLE_COUNT_PER_SECOND       1000
 #define IDLE_TIME_DISPLAY_SECONDS   5
 #define MAX_IDLE_TIME_COUNT         (IDLE_TIME_DISPLAY_SECONDS * IDLE_COUNT_PER_SECOND)
 #define MILLISECONDS_IN_A_SECOND    1000
@@ -425,9 +425,8 @@ unsigned long systemTestDisplayTime = 0; //Timestamp for swapping the graphic du
 uint8_t systemTestDisplayNumber = 0; //Tracks which test screen we're looking at
 unsigned long rtcWaitTime = 0; //At poweron, we give the RTC a few seconds to update during PointPerfect Key checking
 
-uint32_t cpuIdleCount[MAX_CPU_CORES];
 TaskHandle_t idleTaskHandle[MAX_CPU_CORES];
-uint32_t cpuLastIdleDisplayTime;
+uint32_t max_idle_count = MAX_IDLE_TIME_COUNT;
 
 uint64_t uptime;
 uint32_t previousMilliseconds;
@@ -438,14 +437,11 @@ void setup()
 {
   Serial.begin(115200); //UART0 for programming and debugging
 
+  beginIdleTasks();
+
   Wire.begin(); //Start I2C on core 1
   //Wire.setClock(400000);
 
-  //Initialize the CPU idle time counts
-  for (int index = 0; index < MAX_CPU_CORES; index++)
-    cpuIdleCount[index] = 0;
-  cpuLastIdleDisplayTime = millis();
-
   beginDisplay(); //Start display first to be able to display any errors
 
   beginGNSS(); //Connect to GNSS to get module type
@@ -483,8 +479,6 @@ void setup()
   log_d("Boot time: %d", millis());
 
   danceLEDs(); //Turn on LEDs like a car dashboard
-
-  beginIdleTasks();
 }
 
 void loop()
@@ -526,49 +520,10 @@ void loop()
   //Convert current system time to minutes. This is used in F9PSerialReadTask()/updateLogs() to see if we are within max log window.
   systemTime_minutes = millis() / 1000L / 60;
 
-  //Display the CPU idle time
-  if (settings.enablePrintIdleTime)
-    printIdleTimes();
-
-  //Monitor the days in uptime
-  currentMilliseconds = millis();
-  uptime = (uptime & 0xffffffff00000000ull) | currentMilliseconds;
-  if (currentMilliseconds < previousMilliseconds)
-    uptime += 0x100000000ull;
-  previousMilliseconds = currentMilliseconds;
-
   //A small delay prevents panic if no other I2C or functions are called
   delay(10);
 }
 
-//Print the CPU idle times
-void printIdleTimes()
-{
-  uint32_t idleCount[MAX_CPU_CORES];
-  int index;
-
-  //Determine if it is time to print the CPU idle times
-  if ((millis() - cpuLastIdleDisplayTime) >= (IDLE_TIME_DISPLAY_SECONDS * 1000))
-  {
-    //Get the idle times
-    cpuLastIdleDisplayTime = millis();
-    for (index = 0; index < MAX_CPU_CORES; index++)
-    {
-      idleCount[index] = cpuIdleCount[index];
-      cpuIdleCount[index] = 0;
-    }
-
-    //Display the idle times
-    for (int index = 0; index < MAX_CPU_CORES; index++)
-      Serial.printf("CPU %d idle time: %d%% (%d/%d)\r\n", index,
-                    idleCount[index] * 100 / MAX_IDLE_TIME_COUNT,
-                    idleCount[index], MAX_IDLE_TIME_COUNT);
-
-    //Print the task count
-    Serial.printf("%d Tasks\r\n", uxTaskGetNumberOfTasks());
-  }
-}
-
 //Create or close files as needed (startup or as user changes settings)
 //Push new data to log as needed
 void updateLogs()

Firmware/RTK_Surveyor/Tasks.ino

@@ -584,27 +584,50 @@ void ButtonCheckTask(void *e)
 
 void idleTask(void *e)
 {
+  int cpu = xPortGetCoreID();
+  uint32_t idleCount = 0;
+  uint32_t lastDisplayIdleTime = 0;
   uint32_t lastStackPrintTime = 0;
 
   while (1)
   {
-    if (settings.enablePrintIdleTime)
+    //Increment a count during the idle time
+    idleCount++;
+
+    //Determine if it is time to print the CPU idle times
+    if ((millis() - lastDisplayIdleTime) >= (IDLE_TIME_DISPLAY_SECONDS * 1000))
     {
-      //Increment a count during the idle time
-      cpuIdleCount[xPortGetCoreID()]++;
+      lastDisplayIdleTime = millis();
+
+      //Get the idle time
+      if (idleCount > max_idle_count)
+        max_idle_count = idleCount;
+
+      //Display the idle times
+      if (settings.enablePrintIdleTime) {
+        Serial.printf("CPU %d idle time: %d%% (%d/%d)\r\n", cpu,
+                      idleCount * 100 / max_idle_count,
+                      idleCount, max_idle_count);
+
+        //Print the task count
+        if (cpu)
+          Serial.printf("%d Tasks\r\n", uxTaskGetNumberOfTasks());
+      }
 
-      //Let other same priority tasks run
-      yield();
+      //Restart the idle count for the next display time
+      idleCount = 0;
     }
-    else
-      delay(1000);
 
     //Display the high water mark if requested
-    if ((settings.enableTaskReports == true) && ((millis() - lastStackPrintTime) >= 1000))
+    if ((settings.enableTaskReports == true)
+      && ((millis() - lastStackPrintTime) >= (IDLE_TIME_DISPLAY_SECONDS * 1000)))
     {
       lastStackPrintTime = millis();
       Serial.printf("idleTask %d High watermark: %d\n\r",
                     xPortGetCoreID(), uxTaskGetStackHighWaterMark(NULL));
     }
+
+    //Let other same priority tasks run
+    taskYIELD();
   }
 }