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

beautified

This commit is contained in:
dave 2017-12-19 13:14:56 -05:00
parent d12e3d3824
commit 177baf5d15
5 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buzz_scripts/include/uavstates.bzz
View File

@ -61,7 +61,7 @@ function land() {
function set_goto(transf) {
UAVSTATE = "GOTOGPS"
statef=function() {
gotoWPRRT(transf)
gotoWP(transf)
}
if(rc_goto.id==id){

8
include/buzz_update.h
View File

@ -129,9 +129,9 @@ void destroy_out_msg_queue();
/***************************************************/
/*obatins updater state*/
/***************************************************/
//int get_update_mode();
// int get_update_mode();
//buzz_updater_elem_t get_updater();
// buzz_updater_elem_t get_updater();
/***************************************************/
/*sets bzz file name*/
/***************************************************/
@ -155,7 +155,7 @@ int compile_bzz(std::string bzz_file);
void updates_set_robots(int robots);
//void set_packet_id(int packet_id);
// void set_packet_id(int packet_id);
//void collect_data(std::ofstream& logger);
// void collect_data(std::ofstream& logger);
#endif

2
include/buzzuav_closures.h
View File

@ -85,7 +85,7 @@ void set_deque_full(bool state);
void set_rssi(float value);
void set_raw_packet_loss(float value);
void set_filtered_packet_loss(float value);
//void set_api_rssi(float value);
// void set_api_rssi(float value);
/*
* sets current position
*/

5
src/buzz_update.cpp
View File

@ -267,7 +267,7 @@ void code_message_outqueue_append()
*(uint16_t*)(updater->outmsg_queue->queue + size) = (uint16_t) * (size_t*)(updater->patch_size);
size += sizeof(uint16_t);
memcpy(updater->outmsg_queue->queue + size, updater->patch, *(size_t*)(updater->patch_size));
//size += (uint16_t) * (size_t*)(updater->patch_size);
// size += (uint16_t) * (size_t*)(updater->patch_size);
updater_msg_ready = 1;
}
@ -713,7 +713,8 @@ int compile_bzz(std::string bzz_file)
double time_spent = (t2.tv_sec - t1.tv_sec) * 1000.0; //(double)(end - begin) / CLOCKS_PER_SEC;
time_spent += (t2.tv_usec - t1.tv_usec) / 1000.0;
// RID,update trigger,time steps taken,old byte code size, new bytecode size, patch size,update number,
// Patch_packets_received_counter,Patch_request_packets_received,Patch_packets_sent_counter,Patch_request_packets_sent_counter
//
Patch_packets_received_counter,Patch_request_packets_received,Patch_packets_sent_counter,Patch_request_packets_sent_counter
logger << (int)no_of_robot << "," << neigh << "," << (double)time_spent << "," << (int)timer_steps << ","
<< old_byte_code_size << "," << *(size_t*)updater->bcode_size << "," << *(size_t*)updater->patch_size << ","
<< (int)*(uint8_t*)updater->update_no << "," << (int)packet_id_;

5
src/buzzuav_closures.cpp
View File

@ -154,7 +154,7 @@ void parse_gpslist()
double lon = atof(strtok(NULL, DELIMS));
double lat = atof(strtok(NULL, DELIMS));
int alt = atoi(strtok(NULL, DELIMS));
//int tilt = atoi(strtok(NULL, DELIMS));
// int tilt = atoi(strtok(NULL, DELIMS));
// DEBUG
// ROS_INFO("%.6f, %.6f, %i %i %i",lat, lon, alt, tilt, tid);
RB_arr.latitude = lat;
@ -187,7 +187,8 @@ int buzz_exportmap(buzzvm_t vm)
buzzobj_t t = buzzvm_stack_at(vm, 1);
/* Copy the values into a vector */
std::vector<float> mat;
for(int32_t i = 0; i < buzzdict_size(t->t.value); ++i) {
for (int32_t i = 0; i < buzzdict_size(t->t.value); ++i)
{
/* Duplicate the table */
buzzvm_dup(vm);
/* Push the index */