Changeset 331 in flair-src
- Timestamp:
- Oct 1, 2019, 4:45:02 PM (5 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/lib/FlairSensorActuator/src/VrpnClient_impl.cpp
r330 r331 131 131 liteObject_t tmp; 132 132 tmp.vrpnobject = obj; 133 tmp.id =liteObjects.size();133 uint16_t id=liteObjects.size(); 134 134 mutex->GetMutex(); 135 135 liteObjects.push_back(tmp); … … 137 137 //Printf("%i %s\n",tmp.id,obj->self->ObjectName().c_str()); 138 138 139 char char_array[obj->self->ObjectName().length() + 2];//id coded on 16bits 140 strcpy(char_array, obj->self->ObjectName().c_str()); 141 uint16_t* idPtr=(uint16_t*)&char_array[obj->self->ObjectName().length()]; 142 *idPtr=tmp.id; 143 dataSocket->HostToNetwork((char*)idPtr,sizeof(uint16_t)); 144 dataSocket->SendMessage(char_array,obj->self->ObjectName().length() + 2); 139 char char_array[obj->self->ObjectName().length() + sizeof(id)]; 140 strcpy(char_array, obj->self->ObjectName().c_str()); 141 dataSocket->HostToNetwork((char*)(&id),sizeof(id)); 142 memcpy(&char_array[obj->self->ObjectName().length()],&id,sizeof(id)); 143 dataSocket->SendMessage(char_array,obj->self->ObjectName().length() + sizeof(id)); 145 144 }else { 146 145 self->Warn("too much trackables for vrpnlite connection, not adding %s\n",obj->self->ObjectName().c_str()); -
trunk/tools/VrpnLite/src/VrpnLite.cpp
r330 r331 53 53 if(rcv>0) { 54 54 string object=msg; 55 uint16_t* idPtr=(uint16_t*)&msg[rcv-2]; 56 dataSocket->HostToNetwork((char*)idPtr,sizeof(uint16_t)); 55 uint16_t id; 56 memcpy(&id,&msg[rcv-2],sizeof(id)); 57 dataSocket->HostToNetwork((char*)&id,sizeof(id)); 57 58 //assume we receive it in the good order 58 if( *idPtr==vrpnobjects.size()) {59 Printf("adding object %s with id %i\n",object.c_str(), *idPtr);59 if(id==vrpnobjects.size()) { 60 Printf("adding object %s with id %i\n",object.c_str(),id); 60 61 VrpnObject* vrpnobject = new VrpnObject(object,vrpnclient->GetTabWidget()); 61 62 vrpnobjects.push_back(vrpnobject); 62 63 }else { 63 Err("adding object %s failed, expected id %i, got %i\n",object.c_str(),vrpnobjects.size(), *idPtr);64 Err("adding object %s failed, expected id %i, got %i\n",object.c_str(),vrpnobjects.size(),id); 64 65 } 65 66 }
Note:
See TracChangeset
for help on using the changeset viewer.