Merge pull request #11 from yoziru/fix-log-def-duplicate-print

fix log def duplicate print
yoziru · Aug 1, 2024 · e0e9cf4 · e0e9cf4
2 parents 0d27485 + 59abdd6
commit e0e9cf4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/examples/simple/main.cpp b/examples/simple/main.cpp
@@ -53,7 +53,7 @@ int main()
   {
     LOG_ERROR("Failed to get private key");
   }
-  LOG_DEBUG("Private key length: %d\n", private_key_length);
+  LOG_DEBUG("Private key length: %d", private_key_length);
   LOG_DEBUG("Private key: %s", bytes_to_hex_string(private_key_buffer, private_key_length).c_str());
 
   unsigned char whitelist_message_buffer[VCSEC_ToVCSECMessage_size];
@@ -65,11 +65,11 @@ int main()
 
   if (return_code != 0)
   {
-    LOG_ERROR("Failed to build whitelist message: %s\033[0m\n",
+    LOG_ERROR("Failed to build whitelist message: %s",
               TeslaBLE::TeslaBLE_Status_to_string(return_code));
     return -1;
   }
-  LOG_DEBUG("Whitelist message length: %d\n", whitelist_message_length);
+  LOG_DEBUG("Whitelist message length: %d", whitelist_message_length);
   LOG_DEBUG("Whitelist message hex: %s", bytes_to_hex_string(whitelist_message_buffer, whitelist_message_length).c_str());
 
   // mock received_message from VSSEC
@@ -81,7 +81,7 @@ int main()
   return_code = client.parseUniversalMessage(received_bytes_vcsec, sizeof(received_bytes_vcsec), &received_message_vcsec);
   if (return_code != 0)
   {
-    LOG_ERROR("Failed to parse received message VSSE: %s\033[0m\n",
+    LOG_ERROR("Failed to parse received message VSSE: %s",
               TeslaBLE::TeslaBLE_Status_to_string(return_code));
     return -1;
   }
@@ -106,7 +106,7 @@ int main()
     return -1;
   }
 
-  LOG_INFO("Session initialized: %s\n", session->isInitialized() ? "true" : "false");
+  LOG_INFO("Session initialized: %s", session->isInitialized() ? "true" : "false");
   if (!session->isInitialized())
   {
     LOG_ERROR("Session not initialized");
@@ -129,7 +129,7 @@ int main()
     LOG_ERROR("Failed to build action message ");
     return -1;
   }
-  LOG_DEBUG("Action message length: %d\n", action_message_buffer_length);
+  LOG_DEBUG("Action message length: %d", action_message_buffer_length);
   LOG_INFO("Action message hex: %s", bytes_to_hex_string(action_message_buffer, action_message_buffer_length).c_str());
 
   // build information request status
@@ -142,7 +142,7 @@ int main()
     LOG_ERROR("Failed to build action message ");
     return -1;
   }
-  LOG_DEBUG("VCSEC InfoRequest status length: %d\n", info_request_status_length);
+  LOG_DEBUG("VCSEC InfoRequest status length: %d", info_request_status_length);
   LOG_INFO("VCSEC InfoRequest status hex: %s", bytes_to_hex_string(info_request_status_buffer, info_request_status_length).c_str());
 
   // mock received message from INFOTAINMENT
@@ -178,7 +178,7 @@ int main()
     return -1;
   }
 
-  LOG_INFO("Session initialized: %s\n", session->isInitialized() ? "true" : "false");
+  LOG_INFO("Session initialized: %s", session->isInitialized() ? "true" : "false");
   if (!session->isInitialized())
   {
     LOG_ERROR("Session not initialized");
@@ -205,7 +205,7 @@ int main()
     LOG_ERROR("Failed to build charging amps message");
     return -1;
   }
-  LOG_DEBUG("ChargingAmpsMessage length: %d\n", charging_amps_message_length);
+  LOG_DEBUG("ChargingAmpsMessage length: %d", charging_amps_message_length);
   LOG_INFO("ChargingAmpsMessage hex: %s", bytes_to_hex_string(charging_amps_message_buffer, charging_amps_message_length).c_str());
 
   LOG_INFO("Set charging limit message");
@@ -217,7 +217,7 @@ int main()
     LOG_ERROR("Failed to build charging limit message");
     return -1;
   }
-  LOG_DEBUG("ChargingSetLimitMessage length: %d\n", charging_limit_message_length);
+  LOG_DEBUG("ChargingSetLimitMessage length: %d", charging_limit_message_length);
   LOG_INFO("ChargingSetLimitMessage hex: %s", bytes_to_hex_string(charging_limit_message_buffer, charging_limit_message_length).c_str());
 
   LOG_INFO("Turn on HVAC limit message");
@@ -229,6 +229,6 @@ int main()
     LOG_ERROR("Failed to build HVAC message");
     return -1;
   }
-  LOG_DEBUG("HVAC length: %d\n", hvac_on_message_length);
+  LOG_DEBUG("HVAC length: %d", hvac_on_message_length);
   LOG_INFO("HVAC hex: %s", bytes_to_hex_string(hvac_on_message_buffer, hvac_on_message_length).c_str());
 }
diff --git a/include/defs.h b/include/defs.h
@@ -31,10 +31,11 @@ template <typename... Args>
 void log(const char *type, const char *color, const char *s, Args... args)
 {
     printf("%s%s - ", color, type);
-    printf("%s", s);  // Print s as a string, not as a format string
     if constexpr (sizeof...(args) > 0) {
-        printf(": ");
+        // printf(": ");
         printf(s, args...);  // Only use format specifiers for additional arguments
+    } else {
+        printf("%s", s);
     }
     printf("%s\n", RESET_COLOR);
 }