mcy
/
owlps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Position endianess conversion in all modules

This commit is contained in:
Matteo Cypriani 2011-04-07 15:30:57 +02:00
parent 2ce238984c
commit d31ac3864e
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
owlps-aggregator/owlps-aggregatord.c
View File

@ -415,6 +415,9 @@ int read_loop(int sockfd)
// Endianess conversions:
request.request_time = owl_ntoh_timestamp(request.request_time) ;
request.start_time = owl_ntoh_timestamp(request.start_time) ;
request.x_position = owl_ntohf(request.x_position) ;
request.y_position = owl_ntohf(request.y_position) ;
request.z_position = owl_ntohf(request.z_position) ;
if (cfg_getbool(cfg, "verbose"))
{

3
owlps-client/owlps-client.c
View File

@ -348,6 +348,9 @@ void make_packet()
printf("Direction = %d, X = %f, Y = %f, Z = %f\n",
packet[offset - 1], options.x, options.y, options.z) ;
#endif // DEBUG
options.x = owl_htonf(options.x) ;
options.y = owl_htonf(options.y) ;
options.z = owl_htonf(options.z) ;
memcpy(&packet[offset], &options.x, sizeof(float)) ;
offset += sizeof(float) ;
memcpy(&packet[offset], &options.y, sizeof(float)) ;

12
owlps-listener/owlps-listenerd.c
View File

@ -1065,9 +1065,9 @@ void read_packet(u_char *args, const struct pcap_pkthdr *header,
request_time_str,
start_time_str,
request.antenna_signal_dbm - 0x100,
request.x_position,
request.y_position,
request.z_position,
owl_ntohf(request.x_position),
owl_ntohf(request.y_position),
owl_ntohf(request.z_position),
request.direction
) ;
}
@ -1267,9 +1267,9 @@ uint_fast16_t make_packet(uint8_t **packet)
uint_fast16_t offset ; // Index used to create the packet
owl_timestamp request_time ;
float
my_position_x = GET_MY_POSITION_X(),
my_position_y = GET_MY_POSITION_Y(),
my_position_z = GET_MY_POSITION_Z() ;
my_position_x = owl_htonf(GET_MY_POSITION_X()),
my_position_y = owl_htonf(GET_MY_POSITION_Y()),
my_position_z = owl_htonf(GET_MY_POSITION_Z()) ;
owl_timestamp_now(&request_time) ;

6
owlps-positioning/src/inputudpsocket.cc
View File

@ -150,9 +150,9 @@ const Request& InputUDPSocket::get_next_request()
calib_request->set_direction(Direction(request.direction)) ;
ReferencePoint position(request.x_position,
request.y_position,
request.z_position) ;
ReferencePoint position(owl_ntohf(request.x_position),
owl_ntohf(request.y_position),
owl_ntohf(request.z_position)) ;
const ReferencePoint &reference_point =
Stock::find_create_reference_point(position) ;
calib_request->set_reference_point(&reference_point) ;