Merge branch 'master' of github.com:badgeteam/troopers24-firmware

badgeteam · Jun 13, 2024 · d6c0532 · d6c0532
2 parents 2b0ae11 + c7aec81
commit d6c0532
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/components/spi-st77xx/st77xx.c b/components/spi-st77xx/st77xx.c
@@ -136,11 +136,11 @@ esp_err_t st77xx_write_init_data(ST77XX* device, const uint8_t * data) {
         cmd = *data++;
         if (!cmd) break;
         len = *data++;
-        ESP_LOGD(TAG, "Sending command %x", cmd);
+//        ESP_LOGD(TAG, "Sending command %x", cmd);
         res = st77xx_send_command(device, cmd);
         if (res != ESP_OK) break;
         if (len > 0) {
-            ESP_LOGD(TAG, "Sending %d bytes of data", len);
+//            ESP_LOGD(TAG, "Sending %d bytes of data", len);
             res = st77xx_send_data(device, data, len);
             if (res != ESP_OK) break;
         }
@@ -299,7 +299,7 @@ esp_err_t st77xx_set_addr_window(ST77XX* device, uint16_t x, uint16_t y, uint16_
     uint32_t xa = ((uint32_t)x << 16) | (x+w-1);
     uint32_t ya = ((uint32_t)y << 16) | (y+h-1);
     esp_err_t res;
-    ESP_LOGD(TAG, "CASET %x, RASET %x", xa, ya);
+//    ESP_LOGD(TAG, "CASET %x, RASET %x", xa, ya);
     res = st77xx_send_command(device, ST77XX_CASET);
     if (res != ESP_OK) return res;
     res = st77xx_send_u32(device, xa);

diff --git a/sdkconfig b/sdkconfig
@@ -834,13 +834,14 @@ CONFIG_HEAP_TRACING_OFF=y
 # CONFIG_LOG_DEFAULT_LEVEL_NONE is not set
 # CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set
 # CONFIG_LOG_DEFAULT_LEVEL_WARN is not set
-# CONFIG_LOG_DEFAULT_LEVEL_INFO is not set
-CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y
+CONFIG_LOG_DEFAULT_LEVEL_INFO=y
+# CONFIG_LOG_DEFAULT_LEVEL_DEBUG is not set
 # CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set
-CONFIG_LOG_DEFAULT_LEVEL=4
+CONFIG_LOG_DEFAULT_LEVEL=3
 CONFIG_LOG_MAXIMUM_EQUALS_DEFAULT=y
+# CONFIG_LOG_MAXIMUM_LEVEL_DEBUG is not set
 # CONFIG_LOG_MAXIMUM_LEVEL_VERBOSE is not set
-CONFIG_LOG_MAXIMUM_LEVEL=4
+CONFIG_LOG_MAXIMUM_LEVEL=3
 CONFIG_LOG_COLORS=y
 CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
 # CONFIG_LOG_TIMESTAMP_SOURCE_SYSTEM is not set