ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-03-10 22:44:25 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge tag '17.0.3'

Browse Source 
Converting units incoming from the variable server.
This commit is contained in:
Alex Lin 2016-09-06 13:22:09 -05:00
commit eaa6f796d9
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
trick_source/sim_services/VariableServer/var_server_ext.cpp
View File

@ -6,6 +6,7 @@
#include "trick/message_proto.h" #include "trick/message_proto.h"
#include "trick/message_type.h" #include "trick/message_type.h"
#include "trick/memorymanager_c_intf.h" #include "trick/memorymanager_c_intf.h"
#include "trick/map_trick_units_to_udunits.hh"
extern Trick::VariableServer * the_vs ; extern Trick::VariableServer * the_vs ;
@ -524,7 +525,8 @@ int var_set_base( const char * var , T value , const char * units ) {
V_DATA v_data ; V_DATA v_data ;
v_tree.v_data = &v_data ; v_tree.v_data = &v_data ;
var_set_value( v_data , value) ; var_set_value( v_data , value) ;
ref->units = (char *)units ; //ref->units = (char *)units ;
ref->units = (char *)(map_trick_units_to_udunits(units).c_str()) ;
ref_assignment(ref , &v_tree) ; ref_assignment(ref , &v_tree) ;
free(ref) ; free(ref) ;
} else { } else {