vivectl: make the default log level INFO.

grand151 · Oct 17, 2016 · 6f9e8bd · 6f9e8bd
1 parent fb6429b
commit 6f9e8bd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/src/vl_log.cpp b/src/vl_log.cpp
@@ -24,7 +24,7 @@
 
 #include "vl_log.h"
 
-static Level log_level = Level::Debug;
+static Level log_level = Level::DEBUG;
 
 void vl_set_log_level(Level level) {
     log_level = level;

diff --git a/src/vl_log.h b/src/vl_log.h
@@ -22,10 +22,10 @@
 #pragma once
 
 enum class Level : int {
-    Debug,
-    Info,
-    Warning,
-    Error
+    DEBUG,
+    INFO,
+    WARNING,
+    ERROR,
 };
 
 void vl_set_log_level(Level level);
@@ -35,7 +35,7 @@ __attribute__((format(printf, 2, 3)))
 #endif
 void vl_log(Level level, const char* format, ...);
 
-#define vl_debug(...) vl_log(Level::Debug, __VA_ARGS__)
-#define vl_info(...) vl_log(Level::Info, __VA_ARGS__)
-#define vl_warn(...) vl_log(Level::Warning, __VA_ARGS__)
-#define vl_error(...) vl_log(Level::Error, __VA_ARGS__)
+#define vl_debug(...) vl_log(Level::DEBUG, __VA_ARGS__)
+#define vl_info(...) vl_log(Level::INFO, __VA_ARGS__)
+#define vl_warn(...) vl_log(Level::WARNING, __VA_ARGS__)
+#define vl_error(...) vl_log(Level::ERROR, __VA_ARGS__)
diff --git a/tools/vivectl.cpp b/tools/vivectl.cpp
@@ -95,7 +95,9 @@ static void read_hmd_light(uint8_t* buffer, int size, vl_driver* driver) {
     vl_report_id report_id = static_cast<vl_report_id>(buffer[0]);
 
     if (report_id != vl_report_id::HMD_LIGHTHOUSE_PULSE2) {
-        vl_error("Wrong light message type, expected %d got %d.", vl_report_id::HMD_LIGHTHOUSE_PULSE2, buffer[0]);
+        vl_error("Wrong light message type, expected %d got %d.",
+                 static_cast<uint8_t>(vl_report_id::HMD_LIGHTHOUSE_PULSE2),
+                 buffer[0]);
         return;
     }
 
@@ -258,6 +260,7 @@ typedef std::function<void(void)> taskfun;
 void run(taskfun task) {
     if (!task)
         return;
+    vl_set_log_level(Level::INFO);
     driver = new vl_driver();
     if (!driver->init_devices(0))
         return;