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

Merge branch 'master' of https://github.com/MISTLab/ROSBuzz into HEAD

This commit is contained in:
David St-Onge 2017-01-26 23:19:36 -05:00
parent 959e339914 529d7595e9
commit 4027de8262
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/buzz_update.cpp
View File

@ -244,7 +244,7 @@ int size=0;
memcpy(updater->bcode, updater->inmsg_queue->queue+size, update_bcode_size); memcpy(updater->bcode, updater->inmsg_queue->queue+size, update_bcode_size);
//updater->bcode = BO_BUF; //updater->bcode = BO_BUF;
updater->bcode_size = (size_t)update_bcode_size; updater->bcode_size = (size_t)update_bcode_size;
code_message_outqueue_append(SEND_CODE); code_message_outqueue_append(STATE_MSG);
updater->mode=CODE_NEIGHBOUR; updater->mode=CODE_NEIGHBOUR;
//return updater->mode; //return updater->mode;
@ -399,7 +399,7 @@ dbgf_name=(char*)dbgfname;
*(uint8_t*)tmp=0; *(uint8_t*)tmp=0;
buzzdict_foreach( updater->state_dict,reinterpret_cast<buzzdict_elem_funp>(standby_barrier_test), tmp); buzzdict_foreach( updater->state_dict,reinterpret_cast<buzzdict_elem_funp>(standby_barrier_test), tmp);
fprintf(stdout,"Standby barrier ................... %i\n",*(uint8_t*)tmp); fprintf(stdout,"Standby barrier ................... %i\n",*(uint8_t*)tmp);
code_message_outqueue_append(STATE_MSG); code_message_outqueue_append(SEND_CODE);
if(*(uint8_t*)tmp==no_of_robot) { if(*(uint8_t*)tmp==no_of_robot) {
updater->mode=CODE_RUNNING; updater->mode=CODE_RUNNING;
//gettimeofday(&t2, NULL); //gettimeofday(&t2, NULL);