🐛 remove buggy ground altitude correcting

Author: Sequal32

src/yourcontrols/src/corrector.rs

@@ -4,18 +4,11 @@ use yourcontrols_types::{AVarMap, VarReaderTypes};
 use crate::sync::transfer::AircraftVars;
 use crate::util::InDataTypes;
 
-const ALTITUDE_CHANGE_THRESHOLD: f64 = 1000.0;
-
 #[derive(Default)]
 struct Current {
     wind_z: f64,
-    ground_alt: f64,
-    alt_above_ground: f64,
 }
 
-fn average(new_value: f64, average: f64) -> f64 {
-    return average + (new_value - average) / 5 as f64;
-}
 // In order to synchronize groundspeed in different winds, the Z component is removed remotely and added locally
 // Because A:PLANE ALT ABOVE GROUND is not directly setable by execute_calculate_code, the logic is done in this struct instead where the ground altitude is removed remotely below 1000 feet, and added back locally.
 pub struct Corrector {
@@ -28,8 +21,6 @@ impl Corrector {
         let mut avars = AircraftVars::new(define_id);
 
         avars.add_var("AIRCRAFT WIND Z", "Feet per second", InDataTypes::F64);
-        avars.add_var("GROUND ALTITUDE", "Feet", InDataTypes::F64);
-        avars.add_var("PLANE ALT ABOVE GROUND", "Feet", InDataTypes::F64);
 
         Self {
             avars,
@@ -41,30 +32,12 @@ impl Corrector {
         if let Some(VarReaderTypes::F64(velocity)) = data.get_mut("VELOCITY BODY Z") {
             *velocity -= self.current.wind_z
         }
-
-        if let Some(VarReaderTypes::F64(altitude)) = data.get_mut("PLANE ALTITUDE") {
-            if self.current.alt_above_ground <= ALTITUDE_CHANGE_THRESHOLD {
-                *altitude -= self.current.ground_alt;
-                // Mark for adding back
-                data.insert("CORRECTED".to_string(), VarReaderTypes::Bool(true));
-            }
-        }
     }
 
     pub fn add_components(&self, data: &mut AVarMap) {
         if let Some(VarReaderTypes::F64(velocity)) = data.get_mut("VELOCITY BODY Z") {
             *velocity += self.current.wind_z
         }
-
-        let is_altitude_corrected = data
-            .remove("CORRECTED")
-            .is_some();
-
-        if let Some(VarReaderTypes::F64(altitude)) = data.get_mut("PLANE ALTITUDE") {
-            if is_altitude_corrected {
-                *altitude += self.current.ground_alt
-            }
-        }
     }
 
     pub fn on_connected(&self, conn: &SimConnector) {
@@ -91,19 +64,6 @@ impl Corrector {
             if let Some(VarReaderTypes::F64(velocity)) = data.get("AIRCRAFT WIND Z") {
                 self.current.wind_z = *velocity;
             }
-
-            if let Some(VarReaderTypes::F64(altitude)) = data.get("GROUND ALTITUDE") {
-                if self.current.ground_alt == 0.0 {
-                    // Not set yet, set value right away without averaging
-                    self.current.ground_alt = *altitude
-                } else {
-                    self.current.ground_alt = average(*altitude, self.current.ground_alt);
-                }
-            }
-
-            if let Some(VarReaderTypes::F64(altitude)) = data.get("PLANE ALT ABOVE GROUND") {
-                self.current.alt_above_ground = *altitude;
-            }
         }
     }
 }

src/yourcontrols/src/definitions.rs

@@ -1106,8 +1106,6 @@ impl Definitions {
 
         // Shrink all maps
         self.shrink_maps();
-        // Add corrector thing
-        self.unreliable_vars.insert("CORRECTED".to_string());
 
         Ok(())
     }