fly/flightgear
1
0
Fork 0
Code Activity

Also log propery samples over DDS

Browse source
This commit is contained in:
Erik Hofman 2021-04-07 11:53:22 +02:00
parent 202c69ad77
commit c951f3fcf4
2 changed files with 54 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Network/DDS/dds_fwd.hxx
View file

@ -7,4 +7,4 @@
#include "dds_gui.h" #include "dds_gui.h"
#include "dds_fdm.h" #include "dds_fdm.h"
#include "dds_ctrls.h" #include "dds_ctrls.h"
#include "dds_props.h"

56
src/Network/DDS/fg_dds_log.cpp
View file

@ -77,10 +77,14 @@ int main()
topics["ctrls"] = new SG_DDS_Topic(ctrls, &FG_DDS_Ctrls_desc); topics["ctrls"] = new SG_DDS_Topic(ctrls, &FG_DDS_Ctrls_desc);
participant.add(topics["ctrls"], SG_IO_IN); participant.add(topics["ctrls"], SG_IO_IN);
FG_DDS_PROP prop;
topics["prop"] = new SG_DDS_Topic(prop, &FG_DDS_PROP_desc);
participant.add(topics["prop"], SG_IO_IN);
set_mode(1); set_mode(1);
while(participant.wait(0.1f)) while(participant.wait(0.1f))
{ {
if (topics["gui"]->read(gui)) { if (topics["gui"]->read()) {
printf("=== [fg_dds_log] Received : "); printf("=== [fg_dds_log] Received : ");
printf("GUI Message:\n"); printf("GUI Message:\n");
printf(" version: %i\n", gui.version); printf(" version: %i\n", gui.version);
@ -89,7 +93,7 @@ int main()
printf(" dist_nm: %lf\n", gui.altitude); printf(" dist_nm: %lf\n", gui.altitude);
} }
if (topics["fdm"]->read(fdm)) { if (topics["fdm"]->read()) {
printf("=== [fg_dds_log] Received : "); printf("=== [fg_dds_log] Received : ");
printf("FDM Message:\n"); printf("FDM Message:\n");
printf(" version: %i\n", fdm.version); printf(" version: %i\n", fdm.version);
@ -98,7 +102,7 @@ int main()
printf(" altitude: %lf\n", fdm.altitude); printf(" altitude: %lf\n", fdm.altitude);
} }
if (topics["ctrls"]->read(ctrls)) { if (topics["ctrls"]->read()) {
printf("=== [fg_dds_log] Received : "); printf("=== [fg_dds_log] Received : ");
printf("Ctrls Message:\n"); printf("Ctrls Message:\n");
printf(" version: %i\n", ctrls.version); printf(" version: %i\n", ctrls.version);
@ -107,6 +111,52 @@ int main()
printf(" rudder: %lf\n", ctrls.rudder); printf(" rudder: %lf\n", ctrls.rudder);
} }
if (topics["prop"]->read()) {
printf("=== [fg_dds_log] Received : ");
printf("PROP Message:\n");
printf(" type: ");
switch(prop.type)
{
case FG_DDS_NONE:
printf(" type: none");
break;
case FG_DDS_ALIAS:
printf(" type: alias");
printf(" value: %s\n", prop.val._u.String);
break;
case FG_DDS_BOOL:
printf(" type: bool");
printf(" value: %i\n", prop.val._u.Bool);
break;
case FG_DDS_INT:
printf(" type: int");
printf(" value: %i\n", prop.val._u.Int32);
break;
case FG_DDS_LONG:
printf(" type: long");
printf(" value: %li\n", prop.val._u.Int64);
break;
case FG_DDS_FLOAT:
printf(" type: float");
printf(" value: %f\n", prop.val._u.Float32);
break;
case FG_DDS_DOUBLE:
printf(" type: double");
printf(" value: %lf\n", prop.val._u.Float64);
break;
case FG_DDS_STRING:
printf(" type: string");
printf(" value: %s\n", prop.val._u.String);
break;
case FG_DDS_UNSPECIFIED:
printf(" type: unspecified");
printf(" value: %s\n", prop.val._u.String);
break;
default:
break;
}
}
fflush(stdout); fflush(stdout);
if (get_key()) break; if (get_key()) break;