Changeset 294 in flair-src for trunk/lib/FlairCore/src

Timestamp:

01/09/19 15:38:32 (5 years ago)

Author:

Sanahuja Guillaume

Message:

vrpn modifs

Location:

trunk/lib/FlairCore/src

Files:

• Object.cpp (modified) (2 diffs)
• Object.h (modified) (4 diffs)
• Unix_SerialPort.h (modified) (1 diff)

trunk/lib/FlairCore/src/Object.cpp

@@ -91 +91 @@
   if (rt_task_self() != NULL) {
     rt_fprintf(stderr, "\033[%dm", color);
-    if (line) {
-      rt_fprintf(stderr, "%s - line %d, %s: ", function, line,
-                 pimpl_->name.c_str());
-    } else {
-      rt_fprintf(stderr, "%s, %s: ", function, pimpl_->name.c_str());
+    if(function) {
+      if (line) {
+        rt_fprintf(stderr, "%s - line %d, %s: ", function, line,
+                   pimpl_->name.c_str());
+      } else {
+        rt_fprintf(stderr, "%s, %s: ", function, pimpl_->name.c_str());
+      }
     }
     rt_vfprintf(stderr, format, *args);
@@ -103 +105 @@
   {
     fprintf(stderr, "\033[%dm", color);
-    if (line) {
-      fprintf(stderr, "%s - line %d, %s: ", function, line,
-              pimpl_->name.c_str());
-    } else {
-      fprintf(stderr, "%s, %s: ", function, pimpl_->name.c_str());
+    if(function) {
+      if (line) {
+        fprintf(stderr, "%s - line %d, %s: ", function, line,
+                pimpl_->name.c_str());
+      } else {
+        fprintf(stderr, "%s, %s: ", function, pimpl_->name.c_str());
+      }
     }
     vfprintf(stderr, format, *args);

trunk/lib/FlairCore/src/Object.h

@@ -18 +18 @@
 #include <stdarg.h>
 
+//orange printf, with function call and object name display
 #define Warn(...) Warning(__PRETTY_FUNCTION__, __VA_ARGS__)
+//red printf, with function call and object name display
 #define Err(...) Error(__PRETTY_FUNCTION__, __VA_ARGS__)
+//green printf, with function call and object name display
 #define Info(...) Information(__PRETTY_FUNCTION__, __LINE__, __VA_ARGS__)
+
+//orange printf
+#define SimpleWarn(...) Warning(NULL, __VA_ARGS__)
 
 #define TIME_INFINITE 0
@@ -140 +146 @@
   * Green colored Printf(). \n
   * Note that it is better to call Info macro, which automatically fills
-  *function parameter.
+  * calling function parameter.
   *
   * \param function name of calling function
@@ -154 +160 @@
   * Orange colored Printf(). \n
   * Note that it is better to call Warn macro, which automatically fills
-  *function parameter.
+  * calling function parameter.
   *
   * \param function name of calling function
@@ -166 +172 @@
   * Red colored Printf(). \n
   * Note that it is better to call Err macro, which automatically fills function
-  *parameter. \n
+  * calling parameter. \n
   * After calling this method, ErrorOccured() will always return true.
   *

trunk/lib/FlairCore/src/Unix_SerialPort.h

@@ -35 +35 @@
   * \param parent parent
   * \param name name
-  * \param device serial device (ex rtser1)
+  * \param device serial device (ex /dev/ttyS0)
   */
   Unix_SerialPort(const Object *parent, std::string port_name,