hydra10_951 and 20_600 OK

aenarete · Jun 13, 2024 · 1ee1351 · 1ee1351
1 parent 02dc4d7
commit 1ee1351
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/data/fpp_settings.yaml b/data/fpp_settings.yaml
@@ -17,4 +17,4 @@ fpp_settings:
     heading_offset_up: 60.0    # degrees, before finishing the up-turn
     heading_upper_turn: 335    # degrees
     k_factor:           1.0    # a factor > 1 reduces the width of the intermediate phase
-    corr_vec:  [24.02, 36.08, 32.70, 25.40, 19.85, 16.13, 13.55, 11.42, 9.32, 7.38, 5.58, 3.84]
+    corr_vec:  [12.01, 24.02, 36.08, 32.70, 25.40, 19.85, 16.13, 13.55, 11.42, 9.32, 7.38, 5.58, 3.84]
diff --git a/data/fpp_settings_hydra20.yaml b/data/fpp_settings_hydra20.yaml
@@ -17,4 +17,4 @@ fpp_settings:
     heading_offset_up: 60.0    # degrees, before finishing the up-turn
     heading_upper_turn: 335    # degrees
     k_factor:           1.8    # a factor > 1 reduces the width of the intermediate phase
-    corr_vec: [-0.1, -0.25, -0.4, -0.55, -0.7, -0.85, -1.0, -1.15, -1.3, -1.45, -1.6, -1.75, -1.9, -2.05, -2.2, -2.35, -2.5, -2.65, -2.8, -2.95] 
+    corr_vec: [6.5, 1.0, -0.25, -0.4, -0.55, -1.7, -3.85] 
diff --git a/data/fpp_settings_hydra20_426.yaml b/data/fpp_settings_hydra20_426.yaml
@@ -17,4 +17,4 @@ fpp_settings:
     heading_offset_up: 60.0    # degrees, before finishing the up-turn
     heading_upper_turn: 335    # degrees
     k_factor:           1.8    # a factor > 1 reduces the width of the intermediate phase
-    corr_vec: [-0.1, -0.25, -0.4, -0.55, -0.7, -0.85, -1.0, -1.15, -1.3, -1.45, -1.6, -1.75, -1.9, -2.05, -2.2, -2.35, -2.5, -2.65, -2.8, -2.95] 
+    corr_vec: [-0.07, -0.1, -0.25, -0.4, -0.55, -0.7, -0.85, -1.0, -1.15, -1.3, -1.45, -1.6, -1.75, -1.9, -2.05, -2.2, -2.35, -2.5, -2.65, -2.8, -2.95] 
diff --git a/src/kiteobserver.jl b/src/kiteobserver.jl
@@ -58,13 +58,13 @@ end
 function corrected_elev(corr_vec::Vector{Float64}, fig8, elev_nom)
     fig8 = Int64(round(fig8))
     if ! isnothing(corr_vec) && fig8 >= 0 && length(corr_vec) > 0
-        if 2fig8 + 1 <= length(corr_vec) 
-            elev_right = elev_nom + corr_vec[2fig8+1]
+        if 2fig8 + 1 <= length(corr_vec)-1 
+            elev_right = elev_nom + corr_vec[2fig8+2]
         else
             elev_right = elev_nom + corr_vec[end]
         end
-        if 2fig8+2 <= length(corr_vec)
-            elev_left = elev_nom + corr_vec[2fig8+2]
+        if 2fig8+2 <= length(corr_vec)-1
+            elev_left = elev_nom + corr_vec[2fig8+3]
         else
             elev_left = elev_right
         end
@@ -85,5 +85,5 @@ function corrected_elev(corr_vec, elev_nom)
     if isnothing(corr_vec) || length(corr_vec) == 0
         return elev_nom
     end
-    elev_nom + 0.5*corr_vec[1]
+    elev_nom + corr_vec[1]
 end