Diff: sm_sections.cpp

Revision:

13:3868cbdfa5ce

Parent:

12:58ad06f9847d

Child:

14:914467165f34

--- a/sm_sections.cpp	Fri Oct 04 22:20:23 2019 +0000
+++ b/sm_sections.cpp	Fri Oct 04 23:00:53 2019 +0000
@@ -12,12 +12,14 @@
 s_Section s_section5_1;
 s_Section s_section6_0;
 s_Section s_section6;
+s_Section s_section6_1;
 s_Section s_section7;
 s_Section s_section8;
 s_Section s_section9;
 s_Section s_section9_1;
 s_Section s_section10;
 s_Section s_section11;
+s_Section s_section11_1;
 s_Section s_section12;
 
 E_STATE_SECTIONS e_SECTIONS_state;
@@ -119,22 +121,31 @@
     s_section6.nextSection = &s_section7;
     s_section6.consigne_position = 0.58;
     s_section6.targetSpeed_mps = 1675;
-    s_section6.lng_section_m = 18.0;
+    s_section6.lng_section_m = 17.0;
     s_section6.coef_pos = 30;//50
     s_section6.coef_bord = 2.0;//2.0
     s_section6.plagePulseFreinage = 50;
     
+    //fin chicane SKIPPED
+    s_section6_1.nextSection = &s_section7;
+    s_section6_1.consigne_position = 0.58;
+    s_section6_1.targetSpeed_mps = 1675;
+    s_section6_1.lng_section_m = 0.0;
+    s_section6_1.coef_pos = 30;//50
+    s_section6_1.coef_bord = 2.0;//2.0
+    s_section6_1.plagePulseFreinage = 50;
+    
    //ligne droite postchicane
     s_section7.nextSection = &s_section8;
-    s_section7.consigne_position = 0.5;
+    s_section7.consigne_position = 0.4;
     s_section7.targetSpeed_mps = 1770;
-    s_section7.lng_section_m = 8.0;
+    s_section7.lng_section_m = 9.0;
     s_section7.coef_pos = 30;
     s_section7.coef_bord = 0.5;
     s_section7.plagePulseFreinage = 50;
     
     
-    //ligne droite debut
+    //freinage avant epingle
     s_section8.nextSection = &s_section9;
     s_section8.consigne_position = 0.4;
     s_section8.targetSpeed_mps = 1600;
@@ -155,7 +166,7 @@
     //epingle 2 milieu
     s_section9_1.nextSection = &s_section10;
     s_section9_1.consigne_position = 0.7;
-    s_section9_1.targetSpeed_mps = 1680;
+    s_section9_1.targetSpeed_mps = 1670;
     s_section9_1.lng_section_m = 4.0;
     s_section9_1.coef_pos = 30;
     s_section9_1.coef_bord = 2.0;
@@ -171,13 +182,22 @@
     s_section10.plagePulseFreinage = 30;
     
     //dernière ligne droite
-    s_section11.nextSection = &s_section12;
+    s_section11.nextSection = &s_section11_1;
     s_section11.consigne_position = 0.5;
-    s_section11.targetSpeed_mps = 1790;
-    s_section11.lng_section_m = 37.0;
+    s_section11.targetSpeed_mps = 1750;
+    s_section11.lng_section_m = 8.0;
     s_section11.coef_pos = 30;
-    s_section11.coef_bord = 0.7;
+    s_section11.coef_bord = 0.5;
     s_section11.plagePulseFreinage = 100;
+    
+    //dernière ligne droite
+    s_section11_1.nextSection = &s_section12;
+    s_section11_1.consigne_position = 0.5;
+    s_section11_1.targetSpeed_mps = 1810;
+    s_section11_1.lng_section_m = 30.0;
+    s_section11_1.coef_pos = 30;
+    s_section11_1.coef_bord = 0.4;
+    s_section11_1.plagePulseFreinage = 100;
   
     
     //frein