- Timestamp:
- Jan 9, 2019, 3:38:32 PM (6 years ago)
- Location:
- trunk/lib
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/lib/FlairCore/src/Object.cpp
r15 r294 91 91 if (rt_task_self() != NULL) { 92 92 rt_fprintf(stderr, "\033[%dm", color); 93 if (line) { 94 rt_fprintf(stderr, "%s - line %d, %s: ", function, line, 95 pimpl_->name.c_str()); 96 } else { 97 rt_fprintf(stderr, "%s, %s: ", function, pimpl_->name.c_str()); 93 if(function) { 94 if (line) { 95 rt_fprintf(stderr, "%s - line %d, %s: ", function, line, 96 pimpl_->name.c_str()); 97 } else { 98 rt_fprintf(stderr, "%s, %s: ", function, pimpl_->name.c_str()); 99 } 98 100 } 99 101 rt_vfprintf(stderr, format, *args); … … 103 105 { 104 106 fprintf(stderr, "\033[%dm", color); 105 if (line) { 106 fprintf(stderr, "%s - line %d, %s: ", function, line, 107 pimpl_->name.c_str()); 108 } else { 109 fprintf(stderr, "%s, %s: ", function, pimpl_->name.c_str()); 107 if(function) { 108 if (line) { 109 fprintf(stderr, "%s - line %d, %s: ", function, line, 110 pimpl_->name.c_str()); 111 } else { 112 fprintf(stderr, "%s, %s: ", function, pimpl_->name.c_str()); 113 } 110 114 } 111 115 vfprintf(stderr, format, *args); -
trunk/lib/FlairCore/src/Object.h
r15 r294 18 18 #include <stdarg.h> 19 19 20 //orange printf, with function call and object name display 20 21 #define Warn(...) Warning(__PRETTY_FUNCTION__, __VA_ARGS__) 22 //red printf, with function call and object name display 21 23 #define Err(...) Error(__PRETTY_FUNCTION__, __VA_ARGS__) 24 //green printf, with function call and object name display 22 25 #define Info(...) Information(__PRETTY_FUNCTION__, __LINE__, __VA_ARGS__) 26 27 //orange printf 28 #define SimpleWarn(...) Warning(NULL, __VA_ARGS__) 23 29 24 30 #define TIME_INFINITE 0 … … 140 146 * Green colored Printf(). \n 141 147 * Note that it is better to call Info macro, which automatically fills 142 * function parameter.148 * calling function parameter. 143 149 * 144 150 * \param function name of calling function … … 154 160 * Orange colored Printf(). \n 155 161 * Note that it is better to call Warn macro, which automatically fills 156 * function parameter.162 * calling function parameter. 157 163 * 158 164 * \param function name of calling function … … 166 172 * Red colored Printf(). \n 167 173 * Note that it is better to call Err macro, which automatically fills function 168 * parameter. \n174 * calling parameter. \n 169 175 * After calling this method, ErrorOccured() will always return true. 170 176 * -
trunk/lib/FlairCore/src/Unix_SerialPort.h
r15 r294 35 35 * \param parent parent 36 36 * \param name name 37 * \param device serial device (ex rtser1)37 * \param device serial device (ex /dev/ttyS0) 38 38 */ 39 39 Unix_SerialPort(const Object *parent, std::string port_name, -
trunk/lib/FlairSensorActuator/src/VrpnClient.cpp
r232 r294 39 39 : Thread(getFrameworkManager(), name, priority) { 40 40 if (singleton != NULL) { 41 Err("VrpnClient must be instanced only one time\n"); 42 return; 41 SimpleWarn("VrpnClient should be instanced only one time!\n"); 42 SimpleWarn("Next calls to GetVrpnClient() will return the first created VrpnClient (%s)\n",singleton->ObjectName().c_str()); 43 } else { 44 singleton = this; 43 45 } 44 46 45 singleton = this;46 47 pimpl_ = new VrpnClient_impl(this, name, address); 47 48 } … … 52 53 : Thread(getFrameworkManager(), name, priority) { 53 54 if (singleton != NULL) { 54 Err("VrpnClient must be instanced only one time\n"); 55 return; 55 SimpleWarn("VrpnClient should be instanced only one time!\n"); 56 SimpleWarn("Next calls to GetVrpnClient() will return the first created VrpnClient (%s)\n",singleton->ObjectName().c_str()); 57 } else { 58 singleton = this; 56 59 } 57 58 singleton = this; 60 59 61 pimpl_ = new VrpnClient_impl(this, name, serialport, us_period); 60 62 } -
trunk/lib/FlairSensorActuator/src/VrpnClient_impl.cpp
r232 r294 41 41 std::string address) { 42 42 this->self = self; 43 this->address = address; 43 44 serialport = NULL; 44 45 isConnected=false; … … 55 56 rotation_1 = new OneAxisRotation(setup_tab->NewRow(), "post rotation 1",OneAxisRotation::PreRotation); 56 57 rotation_2 = new OneAxisRotation(setup_tab->NewRow(), "post rotation 2",OneAxisRotation::PreRotation); 58 59 Printf("Connecting to VRPN server on %s\n",address.c_str()); 57 60 } 58 61 … … 75 78 rotation_1 = new OneAxisRotation(setup_tab->NewRow(), "post rotation 1",OneAxisRotation::PreRotation); 76 79 rotation_2 = new OneAxisRotation(setup_tab->NewRow(), "post rotation 2",OneAxisRotation::PreRotation); 80 81 Printf("Connecting to VRPN server on %s\n",serialport->ObjectName().c_str()); 77 82 } 78 83 … … 172 177 // self->Warn("erreur rt_dev_read (%s)\n",strerror(-read)); 173 178 } else if (read != sizeof(response)) { 174 self->Warn(" erreur rt_dev_read%i/%i\n", read, sizeof(response));179 self->Warn("serial read error %i/%i\n", read, sizeof(response)); 175 180 } else { 176 181 // for(ssize_t i=0;i<read;i++) printf("%x ",response[i]); … … 209 214 if(connection->connected()==vrpn_true && !isConnected) { 210 215 isConnected=true; 211 Printf("VRPN connected \n");216 Printf("VRPN connected to %s\n",address.c_str()); 212 217 } 213 218 if(connection->connected()==vrpn_false && isConnected) { 214 219 isConnected=false; 215 Printf("VRPN disconnected \n");220 Printf("VRPN disconnected to %s\n",address.c_str()); 216 221 } 217 222 //timeout in mainloop is not well handled if not connected... … … 219 224 //this is when trackables callbacks are called: 220 225 if(connection->mainloop(&timeout)!=0) { 221 self->Warn("connection dropped \n");226 self->Warn("connection dropped from\n",address.c_str()); 222 227 } 223 228 //printf("%lld\n",GetTime()/(1000*1000)); -
trunk/lib/FlairSensorActuator/src/unexported/VrpnClient_impl.h
r167 r294 77 77 flair::core::SerialPort *serialport; 78 78 bool isConnected;//only for ip connection, not for xbee 79 std::string address; 79 80 }; 80 81 -
trunk/lib/FlairSimulator/src/Gui_impl.cpp
r288 r294 378 378 std::ostringstream text; 379 379 380 text << "Cam: " << cameras.at(cam_id)->getName().c_str()380 text << getSimulator()->ObjectName().c_str() << ", active cam: " << cameras.at(cam_id)->getName().c_str() 381 381 << ", FPS: " << fps; 382 382 -
trunk/lib/FlairSimulator/src/Simulator_impl.cpp
r286 r294 36 36 this->optitrack_mstime = optitrack_mstime; 37 37 yaw_rad = Euler::ToRadian(yaw_deg); 38 Printf("Starting VRPN server on port %i\n",port); 38 39 } 39 40
Note:
See TracChangeset
for help on using the changeset viewer.