Spiri
/
ROSBuzz_MISTLab
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'solo-playground' of http://github.com/mistlab/rosbuzz into solo-playground

This commit is contained in:
isvogor 2017-04-12 15:29:42 -04:00
parent 6a1f18d656 8df538d056
commit 77adf24d30
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/buzz_utility.cpp
View File

@ -91,7 +91,7 @@ namespace buzz_utility{
tot += unMsgSize; tot += unMsgSize;
} }
}while(size - tot > sizeof(uint16_t) && unMsgSize > 0); }while(size - tot > sizeof(uint16_t) && unMsgSize > 0);
delete[] pl; free(pl);
/* Process messages */ /* Process messages */
buzzvm_process_inmsgs(VM); buzzvm_process_inmsgs(VM);
} }
@ -141,7 +141,7 @@ namespace buzz_utility{
uint64_t* payload_64 = new uint64_t[total_size]; uint64_t* payload_64 = new uint64_t[total_size];
memcpy((void*)payload_64, (void*)buff_send, total_size*sizeof(uint64_t)); memcpy((void*)payload_64, (void*)buff_send, total_size*sizeof(uint64_t));
delete[] buff_send; free(buff_send);
/*for(int i=0;i<total_size;i++){ /*for(int i=0;i<total_size;i++){
cout<<" payload from out msg "<<*(payload_64+i)<<endl; cout<<" payload from out msg "<<*(payload_64+i)<<endl;
}*/ }*/

4
src/roscontroller.cpp
View File

@ -363,7 +363,7 @@ namespace rosbzz_node{
uint16_t total_size =(ceil((float)(float)tot/(float)sizeof(uint64_t))); uint16_t total_size =(ceil((float)(float)tot/(float)sizeof(uint64_t)));
uint64_t* payload_64 = new uint64_t[total_size]; uint64_t* payload_64 = new uint64_t[total_size];
memcpy((void*)payload_64, (void*)buff_send, total_size*sizeof(uint64_t)); memcpy((void*)payload_64, (void*)buff_send, total_size*sizeof(uint64_t));
delete[] buff_send; free(buff_send);
/*Send a constant number to differenciate updater msgs*/ /*Send a constant number to differenciate updater msgs*/
update_packets.payload64.push_back((uint64_t)UPDATER_MESSAGE_CONSTANT); update_packets.payload64.push_back((uint64_t)UPDATER_MESSAGE_CONSTANT);
for(int i=0;i<total_size;i++){ for(int i=0;i<total_size;i++){
@ -608,7 +608,7 @@ namespace rosbzz_node{
code_message_inqueue_process(); code_message_inqueue_process();
//fprintf(stdout,"after in queue process : utils\n"); //fprintf(stdout,"after in queue process : utils\n");
} }
delete[] pl; free(pl);
} }
/*BVM FIFO message*/ /*BVM FIFO message*/
else if(msg->payload64.size() > 3){ else if(msg->payload64.size() > 3){