Merge remote-tracking branch 'origin/develop' into develop-entv

2019-05-23 16:51:30 +02:00
parent 642d6ee681 ebd40e8d4e
commit b1c1c4545a
115 changed files with 2917 additions and 2699 deletions
@@ -481,10 +481,10 @@ static inline void printMeas(char *txt, Meas *M, int period) {
            M->iterations,
            M->maxArray[1],M->maxArray[2], M->maxArray[3],M->maxArray[4], M->maxArray[5],
            M->maxArray[6],M->maxArray[7], M->maxArray[8],M->maxArray[9],M->maxArray[10]);
-#if DISABLE_LOG_X
-    printf("%s",txt2);
+#if T_TRACER
+    LOG_W(PHY,"%s",txt2);
 #else
-    LOG_W(PHY, "%s",txt2);
+    printf("%s",txt2);
 #endif
  }
 }