Skip to content

Commit 45f357e

Browse files
committed
Shortned logs
1 parent d5ae621 commit 45f357e

1 file changed

Lines changed: 14 additions & 16 deletions

File tree

src/main.cpp

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -390,8 +390,7 @@ vTaskUpdateFSM([[maybe_unused]] void *pvParameters) { // NOSONAR
390390
/**
391391
* @brief Task to poll high priority sensors
392392
*/
393-
[[noreturn]] void
394-
vTPollS([[maybe_unused]] void *pvParameters) { // NOSONAR
393+
[[noreturn]] void vTPollS([[maybe_unused]] void *pvParameters) { // NOSONAR
395394
while (true) {
396395
static TickType_t xLastWakeTime = xTaskGetTickCount();
397396

@@ -681,11 +680,10 @@ constexpr uint32_t LOG_ITEM_INTERVAL_MS = RUN::TASK_INTERVALS::TI_LOG_DATA_ms;
681680
REC_BYTES_PER_TASK * (NUM_MAIN_TASKS + NUM_ESP_TASKS);
682681
char statsBuffer[STATS_BUFFER_SIZE] = {'\0'};
683682
if (uxTaskGetNumberOfTasks() > NUM_MAIN_TASKS + NUM_ESP_TASKS) {
684-
ESP_LOGE(
685-
TAG,
686-
"Number of tasks (%d) exceeds expected max (%d), skipping to "
687-
"prevent memory corruption",
688-
uxTaskGetNumberOfTasks(), NUM_MAIN_TASKS + NUM_ESP_TASKS);
683+
ESP_LOGE(TAG,
684+
"Task count (%d) > (%d), skipping to prevent memory "
685+
"corruption",
686+
uxTaskGetNumberOfTasks(), NUM_MAIN_TASKS + NUM_ESP_TASKS);
689687
// delay(LOG_ITEM_INTERVAL_MS);
690688
} else {
691689
// } else if (statsBuffer[0] == '\0') {
@@ -697,19 +695,19 @@ constexpr uint32_t LOG_ITEM_INTERVAL_MS = RUN::TASK_INTERVALS::TI_LOG_DATA_ms;
697695
'\0'; // hard cap, avoid over-read
698696
// uxTaskGetSystemState();
699697
size_t usedBytes = strnlen(statsBuffer, STATS_BUFFER_SIZE);
700-
ESP_LOGD(TAG, "Task Buffer Used (%): %d",
698+
ESP_LOGD(TAG, "Task Buff U (%): %d",
701699
usedBytes * 100 / sizeof(statsBuffer));
702-
ESP_LOGD(TAG, "Stats Buffer Used: %d bytes", usedBytes);
703-
ESP_LOGD(TAG, "Stats Buffer Free: %d bytes",
700+
ESP_LOGD(TAG, "Stats Buff U: %d bytes", usedBytes);
701+
ESP_LOGD(TAG, "Stats Buff F: %d bytes",
704702
sizeof(statsBuffer) - usedBytes);
705-
ESP_LOGD(TAG, "Stats Buffer Size: %d", sizeof(statsBuffer));
706-
ESP_LOGI(TAG, "Task Run Time Stats:\n%s", statsBuffer);
703+
ESP_LOGD(TAG, "Stats Buff Sz: %d", sizeof(statsBuffer));
704+
ESP_LOGI(TAG, "Task RT Stats:\n%s", statsBuffer);
707705
// Serial.flush();
708706
// delay(LOG_ITEM_INTERVAL_MS);
709707

710708
for (TaskInfo *taskDesc : load.mainTaskDescriptions) {
711709
if (taskDesc == nullptr) {
712-
ESP_LOGE(TAG, "Caught null task description pointer!");
710+
ESP_LOGE(TAG, "Caught null task desc. ptr!");
713711
continue;
714712
}
715713

@@ -750,13 +748,13 @@ constexpr uint32_t LOG_ITEM_INTERVAL_MS = RUN::TASK_INTERVALS::TI_LOG_DATA_ms;
750748
ESP_ERROR_CHECK(temperature_sensor_disable(tempSensHandle));
751749
// delay(LOG_ITEM_INTERVAL_MS);
752750

753-
ESP_LOGI(TAG, "Current State: %d", loadFSM.getCurrentState());
754-
delay(LOG_ITEM_INTERVAL_MS);
751+
ESP_LOGI(TAG, "Curr. State: %d", loadFSM.getCurrentState());
752+
// delay(LOG_ITEM_INTERVAL_MS);
755753

756754
// TODO: Improve logging, check ESTOP logic
757755

758756
ESP_LOGI(TAG, "%s", INA260::getLogString().c_str());
759-
ESP_LOGI(TAG, "Current State: %d", loadFSM.getCurrentState());
757+
// ESP_LOGI(TAG, "Curr. State: %d", loadFSM.getCurrentState());
760758
ESP_LOGI(TAG, "%S", load.getLogString().c_str());
761759
ESP_LOGI(TAG, "%s", loadDevice.getLogString().c_str());
762760

0 commit comments

Comments
 (0)