fix(hyd): all actuators controlled in angular reference (#7349)

* all actuators controlled in angular reference * clippy * Update CHANGELOG.md
flybywiresim · Aug 2, 2022 · 20e7a84 · 20e7a84
1 parent c8b015a
commit 20e7a84
Show file tree

Hide file tree

Showing 4 changed files with 293 additions and 25 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -39,6 +39,7 @@
 1. [HYD] Fixed too slow leak measurement valves operation - @Crocket63 (crocket)
 1. [ISIS] Added temporary ISIS font with arrows - @aweissoertel (Alexibexi#7550)
 1. [PFD] Improve PFD barberpole rendering and behaviour - @lukecologne (luke)
+1. [HYD] Fixed actuator position control demand consistency - @Crocket63 (crocket)
 1. [FMGC] Only emit decel point when an approach is selected - @tracernz (Mike)
 1. [HYD] Fixed SFCC computer failing to send FPPU commands - @Crocket63 (crocket)
 1. [MCDU] Fix padding of arc radii on F-PLN - @tracernz (Mike)

diff --git a/src/systems/a320_systems/src/hydraulic/mod.rs b/src/systems/a320_systems/src/hydraulic/mod.rs
@@ -5107,7 +5107,7 @@ impl ElevatorAssembly {
             ],
         );
 
-        self.position = self.hydraulic_assembly.actuator_position_normalized(0);
+        self.position = self.hydraulic_assembly.position_normalized();
     }
 }
 impl SimulationElement for ElevatorAssembly {
@@ -5225,9 +5225,7 @@ impl SpoilerElement {
             [current_pressure],
         );
 
-        // We return actuator position so it's consistent with demand
-        // Later we must decide who works in actuator position and surface position between demand and control
-        self.position = self.hydraulic_assembly.actuator_position_normalized(0);
+        self.position = self.hydraulic_assembly.position_normalized();
     }
 }
 impl SimulationElement for SpoilerElement {

diff --git a/src/systems/systems/src/hydraulic/landing_gear.rs b/src/systems/systems/src/hydraulic/landing_gear.rs
@@ -585,9 +585,9 @@ impl GearSystemComponentHydraulicController {
         self.actual_position = actual_position;
 
         self.requested_position = if should_open {
-            Ratio::new::<ratio>(1.5)
+            Ratio::new::<ratio>(1.1)
         } else {
-            Ratio::new::<ratio>(-0.5)
+            Ratio::new::<ratio>(-0.1)
         };
 
         self.should_lock = actual_position.get::<ratio>() > 0.5 && should_downlock