Added static port system and a new altimeter model connected to it.

[flightgear.git] / src / Environment / environment_mgr.cxx

diff --git a/src/Environment/environment_mgr.cxx b/src/Environment/environment_mgr.cxx
index 6f82b95afdf95f62a3e0088fa13a6c130a5bc346..213da1f7ca0264c3693e06aaf159fc7c2779f564 100644 (file)
--- a/src/Environment/environment_mgr.cxx
+++ b/src/Environment/environment_mgr.cxx
@@ -65,25 +65,21 @@ FGEnvironmentMgr::bind ()
        &FGEnvironment::set_temperature_sea_level_degc);
   fgSetArchivable("/environment/temperature-sea-level-degc");
   fgTie("/environment/temperature-degc", _environment,
-       &FGEnvironment::get_temperature_degc,
-       &FGEnvironment::set_temperature_degc);
-  fgSetArchivable("/environment/temperature-degc");
+       &FGEnvironment::get_temperature_degc); // FIXME: read-only for now
+  fgTie("/environment/dewpoint-sea-level-degc", _environment,
+       &FGEnvironment::get_dewpoint_sea_level_degc,
+       &FGEnvironment::set_dewpoint_sea_level_degc);
+  fgSetArchivable("/environment/dewpoint-sea-level-degc");
+  fgTie("/environment/dewpoint-degc", _environment,
+       &FGEnvironment::get_dewpoint_degc); // FIXME: read-only for now
   fgTie("/environment/pressure-sea-level-inhg", _environment,
        &FGEnvironment::get_pressure_sea_level_inhg,
        &FGEnvironment::set_pressure_sea_level_inhg);
   fgSetArchivable("/environment/pressure-sea-level-inhg");
   fgTie("/environment/pressure-inhg", _environment,
-       &FGEnvironment::get_pressure_inhg,
-       &FGEnvironment::set_pressure_inhg);
-  fgSetArchivable("/environment/pressure-inhg");
-  fgTie("/environment/density-sea-level-slugft3", _environment,
-       &FGEnvironment::get_density_sea_level_slugft3,
-       &FGEnvironment::set_density_sea_level_slugft3);
-  fgSetArchivable("/environment/density-sea-level-slugft3");
+       &FGEnvironment::get_pressure_inhg); // FIXME: read-only for now
   fgTie("/environment/density-slugft3", _environment,
-       &FGEnvironment::get_density_slugft3,
-       &FGEnvironment::set_density_slugft3);
-  fgSetArchivable("/environment/density-inhg");
+       &FGEnvironment::get_density_slugft3); // read-only
   fgTie("/environment/wind-from-heading-deg", _environment,
        &FGEnvironment::get_wind_from_heading_deg,
        &FGEnvironment::set_wind_from_heading_deg);
@@ -108,22 +104,27 @@ FGEnvironmentMgr::bind ()
     fgTie(buf, this, i,
          &FGEnvironmentMgr::get_cloud_layer_span_m,
          &FGEnvironmentMgr::set_cloud_layer_span_m);
+    fgSetArchivable(buf);
     sprintf(buf, "/environment/clouds/layer[%d]/elevation-ft", i);
     fgTie(buf, this, i,
          &FGEnvironmentMgr::get_cloud_layer_elevation_ft,
          &FGEnvironmentMgr::set_cloud_layer_elevation_ft);
+    fgSetArchivable(buf);
     sprintf(buf, "/environment/clouds/layer[%d]/thickness-ft", i);
     fgTie(buf, this, i,
          &FGEnvironmentMgr::get_cloud_layer_thickness_ft,
          &FGEnvironmentMgr::set_cloud_layer_thickness_ft);
+    fgSetArchivable(buf);
     sprintf(buf, "/environment/clouds/layer[%d]/transition-ft", i);
     fgTie(buf, this, i,
          &FGEnvironmentMgr::get_cloud_layer_transition_ft,
          &FGEnvironmentMgr::set_cloud_layer_transition_ft);
+    fgSetArchivable(buf);
     sprintf(buf, "/environment/clouds/layer[%d]/type", i);
     fgTie(buf, this, i,
          &FGEnvironmentMgr::get_cloud_layer_type,
          &FGEnvironmentMgr::set_cloud_layer_type);
+    fgSetArchivable(buf);
   }
 }
 
@@ -131,8 +132,13 @@ void
 FGEnvironmentMgr::unbind ()
 {
   fgUntie("/environment/visibility-m");
-  fgUntie("/environment/wind-from-heading-deg");
-  fgUntie("/environment/wind-speed-kt");
+  fgUntie("/environment/temperature-sea-level-degc");
+  fgUntie("/environment/temperature-degc");
+  fgUntie("/environment/dewpoint-sea-level-degc");
+  fgUntie("/environment/dewpoint-degc");
+  fgUntie("/environment/pressure-sea-level-inhg");
+  fgUntie("/environment/pressure-inhg");
+  fgUntie("/environment/density-inhg");
   fgUntie("/environment/wind-from-north-fps");
   fgUntie("/environment/wind-from-east-fps");
   fgUntie("/environment/wind-from-down-fps");
@@ -193,7 +199,7 @@ FGEnvironmentMgr::_update_fdm () const
                                // convert from Rankine to Celsius
     cur_fdm_state
       ->set_Static_temperature((9.0/5.0)
-                              * _environment->get_temperature_degc() + 492.0);
+                              * (_environment->get_temperature_degc() + 273.15));
                                // convert from inHG to PSF
     cur_fdm_state
       ->set_Static_pressure(_environment->get_pressure_inhg() * 70.726566);