Use esp32-hal-log

Lyrkan · Jan 15, 2024 · 11939e0 · 11939e0
1 parent 40c52c0
commit 11939e0
Show file tree

Hide file tree

Showing 6 changed files with 354 additions and 366 deletions.
diff --git a/partitions.csv b/partitions.csv
diff --git a/platformio.ini b/platformio.ini
@@ -18,6 +18,8 @@ extra_scripts = platformio_ota.py
 build_flags =
     !echo '-DGIT_CURRENT_REF=\\"'$(git describe --tags --always --abbrev=8 HEAD)'\\"'
     '-DLV_CONF_INCLUDE_SIMPLE'
+    '-DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_INFO'
+    '-DCONFIG_ARDUHAL_LOG_COLORS=1'
     '-Iinclude/LVGL'
 lib_deps =
     lvgl/lvgl@^8.3.4
@@ -29,14 +31,19 @@ lib_deps =
 [env:nodemcu-32s]
 platform = espressif32
 board = nodemcu-32s
-board_build.partitions = partitions.csv
+board_build.partitions = min_spiffs.csv
+monitor_filters = direct
 monitor_speed = 115200
 
 [env:nodemcu-32s-debug]
 extends = env:nodemcu-32s
 build_type = debug
+build_unflags =
+    '-DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_INFO'
 build_flags =
-    -D DEBUG
     ${env.build_flags}
+    '-DDEBUG'
+    '-DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG'
 monitor_filters =
+    ${env.monitor_filters}
     esp32_exception_decoder
diff --git a/src/K40/bed.cpp b/src/K40/bed.cpp
@@ -1,5 +1,6 @@
 #include <Arduino.h>
 #include <math.h>
+
 #include "K40/bed.h"
 #include "queues.h"
 #include "settings.h"
@@ -134,11 +135,13 @@ static void bed_run() {
         // Check if we reached the limit switch
         if (digitalRead(PIN_BED_LIMIT) == BED_LIMIT_PIN_ACTIVATION_STATE &&
             bed_current_status.state != BED_STATE_GOING_UP) {
-            Serial.println("Bed: Limit switch triggered");
+            log_i("Bed limit switch triggered");
             bed_current_status.current.is_set = true;
             if (bed_current_status.origin.is_set) {
+                log_d("Bed current position set to origin (%dnm)", bed_current_status.origin.position_nm);
                 bed_current_status.current.position_nm = bed_current_status.origin.position_nm;
             } else {
+                log_d("Bed origin set to 0");
                 bed_current_status.current.position_nm = 0;
                 bed_current_status.origin.position_nm = 0;
                 bed_current_status.origin.is_set = true;
@@ -183,23 +186,23 @@ BedState bed_update() {
     if (xQueueReceive(bed_command_queue, &bed_command, 0) == pdTRUE) {
         switch (bed_command.type) {
         case BED_COMMAND_STOP:
-            Serial.println("Bed: Received STOP command");
+            log_i("Bed: Received STOP command");
             bed_stop();
             break;
         case BED_COMMAND_HOME:
-            Serial.println("Bed: Received HOME command");
+            log_i("Bed: Received HOME command");
             bed_home();
             break;
         case BED_COMMAND_MOVE_ABSOLUTE:
-            Serial.println("Bed: Received MOVE_ABSOLUTE command");
+            log_i("Bed: Received MOVE_ABSOLUTE command (value_nm=%d)", bed_command.value_nm);
             bed_move_absolute(bed_command.value_nm);
             break;
         case BED_COMMAND_MOVE_RELATIVE:
-            Serial.println("Bed: Received MOVE_RELATIVE command");
+            log_i("Bed: Received MOVE_RELATIVE command (value_nm=%d)", bed_command.value_nm);
             bed_move_relative(bed_command.value_nm);
             break;
         case BED_COMMAND_SET_CURRENT_POSITION_AS_ORIGIN:
-            Serial.println("Bed: Received SET_CURRENT_POSITION_AS_ORIGIN command");
+            log_i("Bed: Received SET_CURRENT_POSITION_AS_ORIGIN command");
             bed_set_current_position_as_origin();
             break;
         }