From 1072f62abfb5cbb587829c8be0658b1766f40e5d Mon Sep 17 00:00:00 2001
From: StaY <stephane.yang@ensea.fr>
Date: Wed, 4 Oct 2023 12:32:56 +0200
Subject: [PATCH] Changed f_out "v_motors"'s channel name to "simulation"
because it was confusing with (pixhawk.control)
---
Promethe_scripts/navigation/drone/drone.res | Bin 18546 -> 18546 bytes
.../navigation/drone/drone.script | 4 ++--
Promethe_scripts/navigation/drone/drone.symb | 2 +-
Promethe_scripts/navigation/drone/drone.var | 2 +-
Promethe_scripts/navigation/flot/flot.res | Bin 571168 -> 571168 bytes
Promethe_scripts/navigation/flot/flot.script | 2 +-
Promethe_scripts/navigation/flot/flot.symb | 2 +-
7 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Promethe_scripts/navigation/drone/drone.res b/Promethe_scripts/navigation/drone/drone.res
index 7aa0d710fc08c8f7ba900cf37462ec72896cd377..4e9f43b4d9ae0ab49f9359d7c5b6c8ff9999c51f 100644
GIT binary patch
delta 1503
zcmeIwF-ikL6b4{kCSnYmm`%(Y6)d(%G_hI`g%o+@4z|Kt*m{N6TP%zxNMkF^3Enj<
zx3SL&48)!HAHgEUz{k)3n3<j3R<y0?>!s!1tF@>3m6ui?tzdGNvpI;XkK%xwSV_Uu
zwVcgCx+S@fznv+`qZuqo-rjYd{AaS<<0n~Kvu9HRRxtIg!(ag`m`<S&7O;Y80DZ84
z6-+7g)7tJbv|PYC+{BKItfOE$vz);KRxpjB4;HY3DU1EU89bYwm+^2si6t)+%ju$S
zI)N_B-u@Y1r}m6GwKmVpI@>gpUT*Se1=FqN3>L7O1I^+1van%YlyL*TYw~OVM(JT4
czQI5K2Rgq0IM}T$d_UYDyP_z<X!YFr1#axD9{>OV
delta 1503
zcmeIwKS~2Z6b5i!Mlps>%qDS-5iGXJUke+FkivHeYhi`8wM_eN5SSaJu@&Y7?;4g1
zVxJQjh&%5)f<=mfA0OXiW_EVBq1}c)UmI@vz4ki0@zThn6->@@HV1LlX&jJqD=C;-
zma{oXs~~s(w=*SqG=n9{PxhT>|B<W?_(@jQY}=H86-*uLFj&9}rVHqU1*~A|LLV$(
z1yc(Bw6eSOEEll$wy`69>nNB8mNQtu3Z_fwg9WT$%3?oo2G6EfMLZl2W68_Va=NbS
zPM}fIK0M>w*q%|x*5-*>C);|`%QTNxFwHDyuz=MZXb#7hg$?VXh#T--o!|O*N{{RK
b4gT>z(Da?h?tW$AYx!{I%CZdor<dk0-0bG6
diff --git a/Promethe_scripts/navigation/drone/drone.script b/Promethe_scripts/navigation/drone/drone.script
index fd085ce..cc1c18b 100644
--- a/Promethe_scripts/navigation/drone/drone.script
+++ b/Promethe_scripts/navigation/drone/drone.script
@@ -1618,7 +1618,7 @@ liaison entre negative_error et gas_low2 , type = 3 , nbre = 1 , norme = 1.000
secondaire = 0
proba = 1.000000
%Les commentaires doivent etre mis ici.
-liaison entre gas_high et gas_high2 , type = 3 , nbre = 1 , norme = 0.900000
+liaison entre gas_high et gas_high2 , type = 3 , nbre = 1 , norme = 0.700000
temps de memorisation entree= 0.000000
temps de memorisation sortie= 0.000000
mode de calcul = 0
@@ -1748,7 +1748,7 @@ liaison entre 12 et v_motors , type = 5 , nbre = 1 , norme = 0.100000
temps de memorisation sortie= 0.000000
mode de calcul = 0
secondaire = 0
- nom = -bpixhawk.control-s1-v
+ nom = -bsimulation-s1-v
proba = 1.000000
%Les commentaires doivent etre mis ici.
liaison entre 12 et gps_raw , type = 5 , nbre = 1 , norme = 0.100000
diff --git a/Promethe_scripts/navigation/drone/drone.symb b/Promethe_scripts/navigation/drone/drone.symb
index 5ab2d88..d411f62 100644
--- a/Promethe_scripts/navigation/drone/drone.symb
+++ b/Promethe_scripts/navigation/drone/drone.symb
@@ -1748,7 +1748,7 @@ liaison entre 12 et v_motors , type = 5 , nbre = 1 , norme = 0.100000
temps de memorisation sortie= 0.000000
mode de calcul = 0
secondaire = 0
- nom = -bpixhawk.control-s1-v
+ nom = -bsimulation-s1-v
proba = 1.000000
%Les commentaires doivent etre mis ici.
liaison entre 12 et gps_raw , type = 5 , nbre = 1 , norme = 0.100000
diff --git a/Promethe_scripts/navigation/drone/drone.var b/Promethe_scripts/navigation/drone/drone.var
index 0be0427..74b9f17 100644
--- a/Promethe_scripts/navigation/drone/drone.var
+++ b/Promethe_scripts/navigation/drone/drone.var
@@ -5,7 +5,7 @@
@MAX_ALT_CM 1000
% gas percentage enough to climb if desired altitude is above measured
-@GAS_HIGH 0.9
+@GAS_HIGH 0.7
% gas percentage enough to stay stabilized if measured altitude is a little below desired altitude
@GAS_LOW 0.5
diff --git a/Promethe_scripts/navigation/flot/flot.res b/Promethe_scripts/navigation/flot/flot.res
index ae9b9e7b48fcb02b8015cbef9d374a9d5b071d34..3d2bbaeba970e948e92914192f7092a1190dbb88 100644
GIT binary patch
delta 1797
zcmYk*IdDy37{>95;}A=<2ns0>v<RBFu(!lg#?Fk8dt;f=ydgK&F83xm*Pff)1Zk|9
zsPLk-x3;9Ugx2nT#`hS-SN!IGo|$vz%vT()Dh^j^b6N9<{-`b!SMNNSugx`87Bmx0
zk83D{cI^7wk`~8-fPz3-N}+@@sF$;>qn}BjN0dS@DT9VMJL34lB+ze4p$YZjl?|E}
zlpJ-;WfEvHrO+zMpbeZIb8Kf4Xg{S;3uRCTXU82qOak4e6naP*^n$Y!jzK1YK2r+)
zq716o9e%(`$JBs=KyxUC7EuPR<m{AVJ(ED&D24V>24y%q?PzBbs6;7ri!$f|XRVIs
zOai^56dI-s`pH?&F@8_@r2<W%6q-#Lv@j^iJ613Ww2o3}D`n7L&e|N!Oair03UyNk
z-Q=v@VN3!&qZE2e8T5&>4#y8BfyOn2FIA|LGN?KzNgOpy0xhQ$T1y$Ug|mXAkx8J#
zltOvRpf1kNIBqZrbe~e_DP_<b&dxeMG70pZQfO?7*A$u@l$>+SViITprO-0Upjyt(
zJ2o>3l%^CqL>ZLh?1H1nB+zwAp?j1;PdK~ic+Dix2TGxDltE+C;hJ7@ObRFnG?P+j
zK4s8S&N>}ym;~BHDU_lNYT~TuXk`+plTzp!Wzb#Dx*U(01bRg&^qw;4D`(w~@<v`$
zXd<Q149cK+K}pH6gh@(KUA&sIQZy8A{HGp&vLR@oH>xX(Q*3(Kchta@sH-eav)NVO
aQAyu_$Vy-2XQZFl&nQ2m??_+yV8tIf)T?p;
delta 1797
zcmYk*H&7H|7{+mrWz_~_=a{(G+#283+&ShMDs!u#7OyiL9AH9W4=^1b=~~4@yH^lJ
zF^stdQ;E4%-)H<D$Koq~^WSG@c4s#~k<L$~wKi2-)*n@6;+o;n^tR?xb8?!AD&s6=
z(4CRLEva*i1mpyIODXh;GUz8~^^Wp~;r;^6rW8t32CWE6vJPPqXe*`AUdo^&oHaO3
zG6~c~Dbzt3ROGDDahpk?2b4l@D1$z7*5vrXBvAB-ZxWhC8B`gRoOUc{5@;Qz&=$&|
zJ)E6!9A*;e1f@_TWl%e3XB~Y^0u4|K-KPwC&DlA}2PT2OQwo)hh9@;>W>9k8v5-li
zWt2i|DT6k1*6i5LB+wyBq2rW64V+zYv@r?PODR;M3>xO_qT>~lK<_DqzEK9H9)~}m
z#W5owC(r^)p{0~TYdC9lY+@2<7p2fa%Agv~5=WLvpd6)84`t9T&T@`>Oai^66naM)
z^p&$V$D}9xO`++OLh~tumINj3j@3*8ZKM?1Nf~s2vkpf!lR)*9LJ4J1H)od|{Y(N4
zQ3}1F3>xR`vf~SrK))%4rak4S49yElt~eGm3ABn*Xai-?4$iJR_A?1|j8dqMGN_fa
zYmP1^fo@U?4N?X@=Pd6SV-n~yrO+?Rpo(YVQ|@%k4af<!h*D@JWzc%gt~<6f3AB$=
z=qP1ShO>gBg-HrgRa~H~5RJz-{;A8ayc<;Nj;d1eAe;91jw<y=ovC<;&H8*tCB^?x
VFU81Dxu4k2WIs~|q&Rh~;t!xC$(jHF
diff --git a/Promethe_scripts/navigation/flot/flot.script b/Promethe_scripts/navigation/flot/flot.script
index f3b2c24..3dccf29 100644
--- a/Promethe_scripts/navigation/flot/flot.script
+++ b/Promethe_scripts/navigation/flot/flot.script
@@ -559,7 +559,7 @@ liaison entre v_motors et 4 , type = 5 , nbre = 1 , norme = 0.100000
temps de memorisation sortie= 0.000000
mode de calcul = 0
secondaire = 0
- nom = -bpixhawk.control-s1-v
+ nom = -bsimulation-s1-v
proba = 1.000000
%Les commentaires doivent etre mis ici.
liaison entre v_motors et 5 , type = 5 , nbre = 1 , norme = 0.100000
diff --git a/Promethe_scripts/navigation/flot/flot.symb b/Promethe_scripts/navigation/flot/flot.symb
index 89b4a58..7043ecc 100644
--- a/Promethe_scripts/navigation/flot/flot.symb
+++ b/Promethe_scripts/navigation/flot/flot.symb
@@ -559,7 +559,7 @@ liaison entre v_motors et 4 , type = 5 , nbre = 1 , norme = 0.100000
temps de memorisation sortie= 0.000000
mode de calcul = 0
secondaire = 0
- nom = -bpixhawk.control-s1-v
+ nom = -bsimulation-s1-v
proba = 1.000000
%Les commentaires doivent etre mis ici.
liaison entre v_motors et 5 , type = 5 , nbre = 1 , norme = 0.100000
--
GitLab