Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-27 08:55:51 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

[flightgear] also update logalizer flightgear header

Browse Source
This commit is contained in:
Gautier Hattenberger
2015-06-03 22:18:36 +02:00
parent 6d3de02137
commit 4404126edf
2 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/logalizer/flight_gear.h
+5 -7
View File
@@ -109,7 +109,7 @@ struct FGNetCtrls {
}; };
#define FG_NET_FDM_VERSION 23 #define FG_NET_FDM_VERSION 24
#define FG_NET_FDM_MAX_ENGINES 4 #define FG_NET_FDM_MAX_ENGINES 4
#define FG_NET_FDM_MAX_WHEELS 3 #define FG_NET_FDM_MAX_WHEELS 3
#define FG_NET_FDM_MAX_TANKS 4 #define FG_NET_FDM_MAX_TANKS 4
@@ -141,12 +141,9 @@ struct FGNetFDM {
float v_north; // north velocity in local/body frame, fps float v_north; // north velocity in local/body frame, fps
float v_east; // east velocity in local/body frame, fps float v_east; // east velocity in local/body frame, fps
float v_down; // down/vertical velocity in local/body frame, fps float v_down; // down/vertical velocity in local/body frame, fps
float v_wind_body_north; // north velocity in local/body frame float v_body_u; // ECEF velocity in body frame
// relative to local airmass, fps float v_body_v; // ECEF velocity in body frame
float v_wind_body_east; // east velocity in local/body frame float v_body_w; // ECEF velocity in body frame
// relative to local airmass, fps
float v_wind_body_down; // down/vertical velocity in local/body
// frame relative to local airmass, fps
// Accelerations // Accelerations
float A_X_pilot; // X accel in body frame ft/sec^2 float A_X_pilot; // X accel in body frame ft/sec^2
@@ -163,6 +160,7 @@ struct FGNetFDM {
uint32_t eng_state[FG_NET_FDM_MAX_ENGINES];// Engine state (off, cranking, running) uint32_t eng_state[FG_NET_FDM_MAX_ENGINES];// Engine state (off, cranking, running)
float rpm[FG_NET_FDM_MAX_ENGINES]; // Engine RPM rev/min float rpm[FG_NET_FDM_MAX_ENGINES]; // Engine RPM rev/min
float fuel_flow[FG_NET_FDM_MAX_ENGINES]; // Fuel flow gallons/hr float fuel_flow[FG_NET_FDM_MAX_ENGINES]; // Fuel flow gallons/hr
float fuel_px[FG_NET_FDM_MAX_ENGINES]; // Fuel pressure psi
float egt[FG_NET_FDM_MAX_ENGINES]; // Exhuast gas temp deg F float egt[FG_NET_FDM_MAX_ENGINES]; // Exhuast gas temp deg F
float cht[FG_NET_FDM_MAX_ENGINES]; // Cylinder head temp deg F float cht[FG_NET_FDM_MAX_ENGINES]; // Cylinder head temp deg F
float mp_osi[FG_NET_FDM_MAX_ENGINES]; // Manifold pressure float mp_osi[FG_NET_FDM_MAX_ENGINES]; // Manifold pressure
sw/simulator/flight_gear.h
+14 -14
View File
@@ -122,9 +122,9 @@ struct FGNetFDM {
float v_north; // north velocity in local/body frame, fps float v_north; // north velocity in local/body frame, fps
float v_east; // east velocity in local/body frame, fps float v_east; // east velocity in local/body frame, fps
float v_down; // down/vertical velocity in local/body frame, fps float v_down; // down/vertical velocity in local/body frame, fps
float v_body_u; // ECEF velocity in body frame float v_body_u; // ECEF velocity in body frame
float v_body_v; // ECEF velocity in body frame float v_body_v; // ECEF velocity in body frame
float v_body_w; // ECEF velocity in body frame float v_body_w; // ECEF velocity in body frame
// Accelerations // Accelerations
float A_X_pilot; // X accel in body frame ft/sec^2 float A_X_pilot; // X accel in body frame ft/sec^2
@@ -137,17 +137,17 @@ struct FGNetFDM {
// Pressure // Pressure
// Engine status // Engine status
uint32_t num_engines; // Number of valid engines uint32_t num_engines; // Number of valid engines
uint32_t eng_state[FG_NET_FDM_MAX_ENGINES];// Engine state (off, cranking, running) uint32_t eng_state[FG_NET_FDM_MAX_ENGINES]; // Engine state (off, cranking, running)
float rpm[FG_NET_FDM_MAX_ENGINES]; // Engine RPM rev/min float rpm[FG_NET_FDM_MAX_ENGINES]; // Engine RPM rev/min
float fuel_flow[FG_NET_FDM_MAX_ENGINES]; // Fuel flow gallons/hr float fuel_flow[FG_NET_FDM_MAX_ENGINES]; // Fuel flow gallons/hr
float fuel_px[FG_NET_FDM_MAX_ENGINES]; // Fuel pressure psi float fuel_px[FG_NET_FDM_MAX_ENGINES]; // Fuel pressure psi
float egt[FG_NET_FDM_MAX_ENGINES]; // Exhuast gas temp deg F float egt[FG_NET_FDM_MAX_ENGINES]; // Exhuast gas temp deg F
float cht[FG_NET_FDM_MAX_ENGINES]; // Cylinder head temp deg F float cht[FG_NET_FDM_MAX_ENGINES]; // Cylinder head temp deg F
float mp_osi[FG_NET_FDM_MAX_ENGINES]; // Manifold pressure float mp_osi[FG_NET_FDM_MAX_ENGINES]; // Manifold pressure
float tit[FG_NET_FDM_MAX_ENGINES]; // Turbine Inlet Temperature float tit[FG_NET_FDM_MAX_ENGINES]; // Turbine Inlet Temperature
float oil_temp[FG_NET_FDM_MAX_ENGINES]; // Oil temp deg F float oil_temp[FG_NET_FDM_MAX_ENGINES]; // Oil temp deg F
float oil_px[FG_NET_FDM_MAX_ENGINES]; // Oil pressure psi float oil_px[FG_NET_FDM_MAX_ENGINES]; // Oil pressure psi
// Consumables // Consumables
uint32_t num_tanks; // Max number of fuel tanks uint32_t num_tanks; // Max number of fuel tanks