From 2b4352556febc0eddc24e287e75d2470eede244d Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Fri, 21 May 2021 19:21:06 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../controllers/generated/signature_all.h | 4 +-- .../generated/signature_frankenso_na6.h | 4 +-- .../generated/signature_hellen121nissan.h | 4 +-- .../generated/signature_hellen121vag.h | 4 +-- .../generated/signature_hellen128.h | 4 +-- .../generated/signature_hellen72.h | 4 +-- .../generated/signature_hellenNA6.h | 4 +-- .../generated/signature_hellen_cypress.h | 4 +-- .../controllers/generated/signature_kin.h | 4 +-- .../controllers/generated/signature_mre_f4.h | 4 +-- .../controllers/generated/signature_mre_f7.h | 4 +-- .../generated/signature_prometheus_405.h | 4 +-- .../generated/signature_prometheus_469.h | 4 +-- .../generated/signature_proteus_f4.h | 4 +-- .../generated/signature_proteus_f7.h | 4 +-- .../generated/signature_subaru_eg33_f7.h | 4 +-- firmware/tunerstudio/generated/cache.zip | Bin 1499196 -> 1499692 bytes firmware/tunerstudio/generated/rusefi.ini | 25 +++++++++--------- .../generated/rusefi_frankenso_na6.ini | 25 +++++++++--------- .../generated/rusefi_hellen121nissan.ini | 25 +++++++++--------- .../generated/rusefi_hellen121vag.ini | 25 +++++++++--------- .../generated/rusefi_hellen128.ini | 25 +++++++++--------- .../tunerstudio/generated/rusefi_hellen72.ini | 25 +++++++++--------- .../generated/rusefi_hellenNA6.ini | 25 +++++++++--------- .../generated/rusefi_hellen_cypress.ini | 25 +++++++++--------- .../tunerstudio/generated/rusefi_kinetis.ini | 25 +++++++++--------- .../tunerstudio/generated/rusefi_mre_f4.ini | 25 +++++++++--------- .../tunerstudio/generated/rusefi_mre_f7.ini | 25 +++++++++--------- .../generated/rusefi_prometheus_405.ini | 25 +++++++++--------- .../generated/rusefi_prometheus_469.ini | 25 +++++++++--------- .../generated/rusefi_proteus_f4.ini | 25 +++++++++--------- .../generated/rusefi_proteus_f7.ini | 25 +++++++++--------- .../generated/rusefi_subaru_eg33_f7.ini | 25 +++++++++--------- 33 files changed, 240 insertions(+), 224 deletions(-) diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 5df373a459..a53c50f7cd 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2021.05.21 -#define SIGNATURE_HASH 1349457671 -#define TS_SIGNATURE "rusEFI 2021.05.21.all.1349457671" +#define SIGNATURE_HASH 1598996836 +#define TS_SIGNATURE "rusEFI 2021.05.21.all.1598996836" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index b0a32c7184..1bfe74dd89 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD frankenso_na6 #define SIGNATURE_DATE 2021.05.21 -#define SIGNATURE_HASH 1747032382 -#define TS_SIGNATURE "rusEFI 2021.05.21.frankenso_na6.1747032382" +#define SIGNATURE_HASH 1728073565 +#define TS_SIGNATURE "rusEFI 2021.05.21.frankenso_na6.1728073565" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 01dd8fc333..2e739fc49c 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen121nissan #define SIGNATURE_DATE 2021.05.21 -#define SIGNATURE_HASH 2550898484 -#define TS_SIGNATURE "rusEFI 2021.05.21.hellen121nissan.2550898484" +#define SIGNATURE_HASH 2536130903 +#define TS_SIGNATURE "rusEFI 2021.05.21.hellen121nissan.2536130903" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index e831ab8c69..61cf3477c3 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen121vag #define SIGNATURE_DATE 2021.05.21 -#define SIGNATURE_HASH 185538087 -#define TS_SIGNATURE "rusEFI 2021.05.21.hellen121vag.185538087" +#define SIGNATURE_HASH 70172740 +#define TS_SIGNATURE "rusEFI 2021.05.21.hellen121vag.70172740" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 4ebcf7e779..1e013c41b8 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen128 #define SIGNATURE_DATE 2021.05.21 -#define SIGNATURE_HASH 2811298787 -#define TS_SIGNATURE "rusEFI 2021.05.21.hellen128.2811298787" +#define SIGNATURE_HASH 2830161280 +#define TS_SIGNATURE "rusEFI 2021.05.21.hellen128.2830161280" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 9e15d6103e..549a3263ce 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen72 #define SIGNATURE_DATE 2021.05.21 -#define SIGNATURE_HASH 4271499404 -#define TS_SIGNATURE "rusEFI 2021.05.21.hellen72.4271499404" +#define SIGNATURE_HASH 4055383791 +#define TS_SIGNATURE "rusEFI 2021.05.21.hellen72.4055383791" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index b9280a2a69..594108cd82 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellenNA6 #define SIGNATURE_DATE 2021.05.21 -#define SIGNATURE_HASH 3152763845 -#define TS_SIGNATURE "rusEFI 2021.05.21.hellenNA6.3152763845" +#define SIGNATURE_HASH 3033173414 +#define TS_SIGNATURE "rusEFI 2021.05.21.hellenNA6.3033173414" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 944a66bafe..3ccce6c4c4 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellen_cypress #define SIGNATURE_DATE 2021.05.21 -#define SIGNATURE_HASH 303287511 -#define TS_SIGNATURE "rusEFI 2021.05.21.hellen_cypress.303287511" +#define SIGNATURE_HASH 489822900 +#define TS_SIGNATURE "rusEFI 2021.05.21.hellen_cypress.489822900" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 56c4c4a962..7578930e7b 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2021.05.21 -#define SIGNATURE_HASH 3988127787 -#define TS_SIGNATURE "rusEFI 2021.05.21.kin.3988127787" +#define SIGNATURE_HASH 3801601608 +#define TS_SIGNATURE "rusEFI 2021.05.21.kin.3801601608" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index a3bc376657..3ccfdc5264 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f4 #define SIGNATURE_DATE 2021.05.21 -#define SIGNATURE_HASH 201478734 -#define TS_SIGNATURE "rusEFI 2021.05.21.mre_f4.201478734" +#define SIGNATURE_HASH 52659245 +#define TS_SIGNATURE "rusEFI 2021.05.21.mre_f4.52659245" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 457a485813..0d51946fe5 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f7 #define SIGNATURE_DATE 2021.05.21 -#define SIGNATURE_HASH 201478734 -#define TS_SIGNATURE "rusEFI 2021.05.21.mre_f7.201478734" +#define SIGNATURE_HASH 52659245 +#define TS_SIGNATURE "rusEFI 2021.05.21.mre_f7.52659245" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 84a811707a..e9e86fac9d 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_405 #define SIGNATURE_DATE 2021.05.21 -#define SIGNATURE_HASH 1123620145 -#define TS_SIGNATURE "rusEFI 2021.05.21.prometheus_405.1123620145" +#define SIGNATURE_HASH 1306051410 +#define TS_SIGNATURE "rusEFI 2021.05.21.prometheus_405.1306051410" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index a7b7e615e9..882ced93f3 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_469 #define SIGNATURE_DATE 2021.05.21 -#define SIGNATURE_HASH 1123620145 -#define TS_SIGNATURE "rusEFI 2021.05.21.prometheus_469.1123620145" +#define SIGNATURE_HASH 1306051410 +#define TS_SIGNATURE "rusEFI 2021.05.21.prometheus_469.1306051410" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 70b81bcaf0..da4980d20a 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f4 #define SIGNATURE_DATE 2021.05.21 -#define SIGNATURE_HASH 970566172 -#define TS_SIGNATURE "rusEFI 2021.05.21.proteus_f4.970566172" +#define SIGNATURE_HASH 922254463 +#define TS_SIGNATURE "rusEFI 2021.05.21.proteus_f4.922254463" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 3a86a7ff26..99af79e872 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f7 #define SIGNATURE_DATE 2021.05.21 -#define SIGNATURE_HASH 970566172 -#define TS_SIGNATURE "rusEFI 2021.05.21.proteus_f7.970566172" +#define SIGNATURE_HASH 922254463 +#define TS_SIGNATURE "rusEFI 2021.05.21.proteus_f7.922254463" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index c05bbc3a7f..99e604291e 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD subaru_eg33_f7 #define SIGNATURE_DATE 2021.05.21 -#define SIGNATURE_HASH 3285683705 -#define TS_SIGNATURE "rusEFI 2021.05.21.subaru_eg33_f7.3285683705" +#define SIGNATURE_HASH 3438697370 +#define TS_SIGNATURE "rusEFI 2021.05.21.subaru_eg33_f7.3438697370" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 85ead1fed39ae2161d0753ca565731413aaed57b..3d0fe0c03c4c9328c50463bceb2409f3b96b148a 100644 GIT binary patch delta 260886 zcmeF)Ra9He{x@*k-6>Yw-QC@bL-FEXC=S7$V#VFvU5aaQcc(bTrRdw9^ISaV{(tda z?5xa6X1=q3$wji(&dz++bad-g^y~Qrfd@eZK{h~e zrV>R$eJLKMOup~e%cfH}2=%@8UckxnhDl?3$;*{3{%#Fo9Qp!;ETemGR($i>{`=MA zW>ZHo=Z~jbis&ofDEo7+lC6bi#*3kM(7se70n3-%-27LmLLufuppfNS#Qnv3fr*Sn z^P#u5g5}H6F(pAKTT9nxx%zt65sMU}uCY^ZeGmDuuZC8xomCy2<6jNU|2*lYG#{$w z;OCS*MvNN0v6TcdYsc(GPJ~|G$ad)J@enahK9U;7&J%d)7uUuf8OKvrw=mACWtcwO zTa;723&s_&cJJABzP#!?2*&u$JGYo$entKjVF7Aem_#?CH)z7_17=%IK}7X>eb$vn zn1ju=*{5XrAIM?Tw06_OOjCx(!7UbQp_5_>w~>kq)w7>KFVSfg)nz~4xa=0Rup4-d ztnzOoqwj2{Zlz9e2`b;B-&GpgHZT)smUBwW+&9PUqp>%w^1uBz2oJ zMcHG)ql-x58}@>DZSN&UV4FQF&S%-hTvsK`o&rC&z-K3;SWsWU>{W6mmoqP&H`44t zspK*%5E)|uowgy64#K3}mE6d>2l8`FXccN$MQdNT>R7kfSZjs0>DE2DCqXx_415v1 zpTEM4SzssHCL52OJjlUpXwRilw@{jwD(f7zQf)t4bV_6kV=G|ZB)^q%rT*m4KOL~Dp69#Z z6TYN2Z%jMbwv8_{4{=B1$ijQNWiyU9Ukon510BkFvm@H4Tc1l)6p3gZZx8qp1>a9g zq$!MDdTuHwqoZ<}m*EcKo?>z?M}CyPutGrSU?FHp)paW@IH>V<*&@6rmq5KFO(MFc zb}krot3O3EXSgKHo3441WjJ|2fh4k`E~n@juSW9OG)r?CoK8`QtsKJ&Bk(2l@_!pF z2Pw3$=X`wVpEPBqroOwXJ|#oytP#KDu&4NV6P6(#)+Z zfDS2Z%`I!lCYK%?IcQ{YD`G~==?g6U4H5)GU~Sl`!vkx{FwNpGJ>Ry?rMo$2lb#z& z6{kLZcCv=P0rF`2%Y%k%vpqJ4g$Ygfc~E55t_%s;1JgQ%Din%5L*|t8#YwTX*X*#V zR~7niP5Fec!!C_33I2OZWZyQZa;aLiaL{d7tm62dL2XYnMO^WAJ(CyoGd%X~{4m@l z6iutwkNTvdecz3+;%)E8`h)Uf;G=C@5n*Y|1JQDldDQEH1tBjsAbk~2(=B3&t z?wi#mu{SD+?Wc-=eX-Qc==-Dr>RiyTZ`GIHBkyx)M0U_ObT03d59Qmw6-H(&uxVla zSedTKNAG&DOu1AOzTI?oJBP3rOQkx$w^x){SPpDCWj^qneC2;aFeo?lWHnGZeMxw; zyIJU}$M&T#UC_FBZ?V82hpSPlgVG{nLz>zDKoz@Uvo*>1aLsu^gxFaR(`f_haZ^16 z^(Y+GZ-UInJfxqNI8op|aTsr_K z_^^RIq>fhoW}gcy!T=Co%;-$urHgVGEKCl!r8`R*(><-+o;18cl^7KQt|_td%N82_ zB6Lh~D*~iZ#TTb6kFE0~3#wjUj^UE6^109I>PGtemOh-XE6PbaC^p?7yAG@w@OJ2#XG+4uT?0E3DFrMkzu7Jo9XH#5|C^f=^DuI{X-5f=Np4M#gn z0IS*@Q<63PBpFhYM@<%Xhm7msGA_<;U-%U^Z%TEK^qD4##E05fZRm~g01?j8EuT#E zT%g|JCV><2aK@Fe5k-0>G4OE@Jje^2-~$Ov?Fc8=#|@!BpWLV+Pz>4zBm{VVa)4`$ z$_(3no6-CW6PZz6%HHF^N1R#*9EObxSwmz=!dW+*=l0+}%}*F2j5RJ>(q=qnbp`C% zE^1a)y-T&{H}y9xs5`xHQX0!{4T1K zaLU2|I;Hse@?`-}5!5iq5r&TpztQy`PR>tLU6Q^`vAoY=QGK0<*Y|9Yu1Rzrp%PJJ z9$_QAfU9zN)ofZ*AIGDeVWn&|PbFDW?~BgfS)JuB6M>7YMUMQg66;a_?*cV2c*yU5 z86mCs3$KqMgj4k*V#>?{&y5tEF&4A)5bZ~4&|71+oZy{W(jaN-N6D_oPh;us#&b>< z?^dtzxbS>fMi%dIAKWH8&x_A`A*AAleT>>JdQi3LtWgn^KSV?8FP{;g5kyzeL~xR! z1*1b4hxEevKZqCyi6CXOh|xSK;gMs#r;b8LFu@#zlgx%U4eA|Kk1~+NNvJ9a839@v4AE_y{8mk!a5{QSF}JA?}#SM1xtz# zg^VaPPANc!+PGl${frgf5kr`ZCTmOR_OxJyNI6;rLaAlYK;8$4zJTeH*eEG&j(6B~ z({PB=`C@$Uj4%Dbz=Xco)2%Yb??7Gl5!>?lrht|z)rUY1FqeH_^Z9(~!$@3_=PzRd z9*hr^iQahrbkFB5mH%{Mm5AOr{&c73E+>1hFkN~%_6}GS-qZNQ_}4&%WYQo*guq>i z7x2_awo=5z6?G#X(mUBvgt=x@t8n^9Gd5^Ph6ras3P}KSvT(2ZoM*EvcOA#{e)@t2$6zM}H z_xqPk4e2uhhDg;{h#|{s$7dsR6zGoJXsxQDlLlcG-;kqK9)lahj6R;1` z$}N6YC4R}OpGCy=&b^DW^q2%$-$T%nSZbXBa^*qWhk#0Doi+<1hDCmy!ZEg>$v|#!5 zfxl84rB=K_5ZVs;DGbpYtn=LeeDwmCITkKP>`i`A5dJNK#JG;a#d&WniUjG0t?UHn zDx)hiO7^l=Amd|KXe;*WqPyn*9==Y@PGF`caPO{Aj{xXflVXehsJ*|A{{IWKw?Y3Up z9|%!knrhJ8!K!hc7C&VMz?UqVG(;EC>9<6ec77221nWMVf}sjeyF}79do8nsiEX|9 z(uaQ$%6Mvn4;sj^ALU$8I)o^_-zp7qt|7y7&f!J&5tIsOel&qdA(`(o0x0+9~ zJ%*-yze2-lm@BAtvRY3`pmuy%#4}NO%2gp*PG($~sYCmG$(7>TR^+$_TUvMV0PV_C z5X_hfE;=BiCpeTmvLKU$n@|zr_>s+pP}`G_4+TjO8AMc^vvAT|YQx&TW1NtH{J`ttQKu}Gx4 zm5>{8KImipM2LN1gGAgW7eR)%UA7m|5j<5+vRvgh>=oThdW?{S)PoT5q20&jki(~= z)o90+8faAKG3X-lPPdLR@;)~lUB7~FR@oGKJLd3pYOISyBvH)B{$^BZ*cg#uZI;?5 z1Y@6Cls?-@eA{^6ct*LjO$|8+39mSO!oG+E2M8GQv1#uy!#0emVTO3?&KEa7q+is(^Q!pFgSV zqZg-LyFhSk-g${mH|Qc;qO|=LF2w2^Rhw^AVfuRPYiu1VSy)FW0k0qKIsED|@c7VA zA^_ETA#W&R^KOX|9BVw~dll?9>F=4yxbV+rq>;%p;+GeOquQ{cm{-YW&=AmISoNxz zwnCvI#M;xWucUpc1O%iyXZNvqpTuYc4zBQU4Vq;adoE#cq`tAWh|;`Q3G!ywf9y?L z9{Pb?11{h_reyMQ-HLI9=o5CQ!PFaOs%NrDA{-t=fl6au@ImV5jLFB3cX35_8nlw^xNGi ze9x+%!!`20=gp+JzYLJ&W>>JLzTVtkCMx>D4bkKck`+Kt<$SxDYBgY}qYi^|pYll z>&uvjU3*~p-1d&~qAQ)n@4iiy!jYGHe<@1EOFU!rGK#v~c0L8o$ahr2Ol`}_amjGF zAR%RH)Devg>Ib1nnKP~F`MYxVEw)-)lGyHX(ON@JL@=YJEe9$;j*VN4+pA8f#IWog)#tZp z*0xH@dT!Sy`jB5|D?^IEw{5l({Z5qM2F6w&yoZ7^ z44GG`f;&JHQEzJEVp~~xe3HKXI!&t|HZ8_Ol=Rc4F2Z6jqDBWvTAt5Z>$%$JLvAfk zoIrRgVJY4>UBSl=tN?|DTupPzAi@F=wr=wE3@KLcc_ZE6Y-hN-J<^$jNMdu>5C}}0 zxcQ4ZbG>&4P1?=3OYA7rZXQ(<0w~NN@RCU*fr8tX?`i5F@+t#Resp*(tn;^O)K!V5 zy`RS(VZ{roSspguBq5zaZ|AGoBoD{khVpK$IYEDsBZ#+HLTXf=fql*Z+xxgz%>$%xlp0J| zH|io4qs^_8dlC^>{c$J;*X&V2`M$i+*CC?BJdTuGBQc{Tv7>J;$G|d)Qyn(Mh#bkE zmfjyHCf7|>c%4_K*%J&i^Ho593w&uG%y?XUZ=GfzeC0AyoS%s5cgEp7c#t=*Vef-z zu4E>;r2rumySL?e+o&^Vp9?5(6())ZAq5LszGUP3NEWGMNiSsCVx&{nSb`)x=^j<4 zO9j*b?Tk(@5&Vn9q9Jx@q;G!qVe;tMG<^<9)hZE$#&TP}CX!oNK3~|40t9h{X{noqc_R z+ho-XiDs4E86m;%=O17BHZWNPU4ZetN zG&PY0;g-Bi)PzyDU!)kQ$9nfP5Zn|z$qem2>3Rhh;@}&e94+lGmc4Hat{OtPA+Do$ zpOSo}vaGMN1}C<$9k{S^+Bi!bY^83hB64|Wn{=$|4 zhT!)NIW);50ZLYF@dcj5u!9c7%r_DcPkXGRYIK1vKhl($7uW_tMe(=O+I^kq76LBX zSn}p4^vN5ylcq&FsCb$G9q)+I$n_TGzw{G z681=yyD5?skplF7|IFy0ywqYFuWyCBwnwu}2xSoW=nEyh`-+H#3bI%6gQ?Gj*1gb` zInt4BWb+39(anDdB6Y=KS;nYU%-O{{#C-kyNdczzR4XCNR%xX!M}JD`>AsA{`0Ty# zz6-{FLiSjpK`mzaCDrr$bH9mz7}XS5!^CF$S-mNX!=RXi%ns9sbEErc(t^~8z8Kx{ zyRmd$xN<7<6#I`D%nyq`IG*F_x(!-HF~}1=kCJGxwci!bK{&+aMhKqGQxL7XPYqy$ zE@k=8y%^E6%aX*q0c+JW%TOk5`3J&w#jReBc|*Sghh$mSGd2BJhP=?1oeU$N@s9gM zuw>?=i`-x~2I#Qb^+=gqO$u|Qi7uQxMrtJjP^d6Io*q{HdZ|8hYV8#%88cMJMaHL8 zwpNQOPBzW10g1emf;>3lnS3nY*|~b>#9Pp`B{0(}v(;$@fj^vl_|db;qD35H2M%5O z-S_E?UtASP>fco)y1>5YbRXj|MIhXK4vSxq^)%}C!4_p%lKp-w3cWZ#8#7qgTk&q) zZH*!!Km&=3lp9yy+5BEn%SN~Jz`0?exe3yw#bLF?#v9abhNM3-5}s?*As7}$0iWV- zsV$(*tn0fZRB$Vvibsdx{U}KH;reiMbD15&C?v5EqfD0+Tmku=h#%?3<*ivvRn@YD zp1Mb9-FZlh`78!g%+z!K_7P;to#VY!6oc0T!QtVc8gp|r=>h)Ytm!MX&|z$t zTqrKe+YeAkM4k~#(6u}3(UvK=hQheOS7I9d^id3gDMzF)r*9Fgi=#pdzj%{poDLoVyLY%d7Yy0a*}vcBl>bu z_Gz5>oh5mlv~S%I%JOdXF!9q!7SAVTE;6qjYA?`ntl)asX=(Ops`#BPd7XuCoj_Xw z=|kx2@A8bBqi1zD}DZAlKf`aG_dY7eiNmg+8uJC8g& zpcg_>^2=)}WIRdsdHu>Uyi?-m&oh3bNLzW=2MOp`S|eTK@8b)(?|1h(9jg(^v=d|>C5qSfgzsHsAMo6k57PP{ z6Z@|k`){I$*ygEXxIPp`+0mxq3A0XvW)r(P*aNBfE(oN98)(5gNQXrBl6=2?_!#`e@2;@rO^Ch2ARao8HN&>cB{%gV!0wW zWtwH2_U@OFc&jeloDNRpdZNfrH13A}7SFM)%ifikB&Hg|I59@dCqZ}OrDPp9;tN)> zkZ`q7MfXa-WXHw~@^X+9Tl#dq%k(?{N)u{Rhm&8U=}lG*7nTI83E|Ok)Xr_oD3^IW zK2X}LeBQqgcI$mk-sv?})k>bcBWOU8_Ar#`yF0V7U+&z;`SUO(#Ps}RooBl_XgSIy zrPsiE)r_76nVL(o^m_!h?W_5qUuo;m59so%2eTQquX;NI<}{!WJaN@YHy2$3QWUe8LJ6MMk% zQe=kMm9)KALvC*SAgVZ*o>l~4+LIHtN&R`~huoUHE(EhyvJDnQrg`T@}6Wsm93Lg}=fT~+yIV3w4 zn%N;RSl&xusuM%0AE-%TvlCC|*>I%WU_Cz?CXM`6Rc)0uqNfZE(Z#)i31ak8{A%;9 zk{i2ACrR~o3~E)TKnU>^t{P2bZQJHlfhBC+*^6O!e>w}4W z9mmSdN;B~8*1Ta>(bA1OUvN3-uF{yfCaKB1UNe*j@3Vu*NBr{E{ysA7TvpbJ(#6=) zVQRJM@?rJ8#M1X?(Vyt9eyGRZNwHyjn9<32k*7vHvtd(phAT+=rs`G~-K8FLCDC6& zMkIU3VOR8nR;((&?7)&(lpFQT1a^&U`b)}u7#PDiCqHn~2^d{QEfDMzc`QUH-^s!r zHHUY!5^U(&#iJDlkEIqFz(lioGJX48#~=XF9y($5MmcN6r_@8{lAU`^#=t7}J+jTT z#_dwtj8pKO2O*(L%$+zR5=-o7tgVv>b(=4Fg1=QUD9;hHDczkFGw=A9Md%ot?n0Q3 z94KI8IX2$-wheRDeP_ptJV44GM_APZzY*N{{Fg-Debzx*`vcz(Blc|q*hOi)Q|HzD z8%w#6@BX7WG9pK48Qk2~%4dpkRCNTbXi}x}eV-@rqtWTR)*D_OdS=6}S(=toe|qeH z{zku94vLP~CF%P(pZ8#GTWwRLXqau+46{0NQvbbj0s9f*$x{GXS_Dk563>IEp)<`tCuHVO6M;Po|;qaZxaCMR8Gu+?NnJ~+nrOD8_AqLm)vELR?G z$ZCi4TqD0P7e}Wa?7e#E-Y`$`kRpqC%JnGe5hyr@gRetd`#@`YA#jf&{(1Xk%SM&z zT5MIx&rbHXj`5CTFht_1N@BPrhGlR9Z^0~H;U?Cl=oZ^n{M$gc+EvO|ixH9ShhF0S z5j8G7*2(fH*7w)*QRNDmFt&yeiAVh~$1dIkKkJAb8lgJGdTb1}gdSr|yA z>?}`yv3z3ja!h>CCCwy*lFOic1BYn=gZfqN0f}Mc#%M+OvOw!VCqsGTO>QwBy1j0m zzvVpdIt_We~JjFO3m=agW zPiE7v5fNzzVFQ?xRjptx%D4@rx^SSD+iy?lYQMBp78J2}2Yw^$nl=bet^1n|;P!bL z36L&$EU4RX4IT(EVj>2cY*~au%+JRV4OnNbtvi3we9$}g^H8r?YSKXx+z)Oja>-=Z z6fU7Me6pRocIPDZF*AqHxu|ql*1GyhYVqnjReJA%qddq8;xwa&5-$Gop0gJ86&amy zir<+A2cJ#5K;27KqhAxz<0h^)RM1=r>pNvF%Zeu}vB z#E;}ct2^W@U|<`th4c^ON)EFGVaA0uC5Ky*=Wc28e0(P(?KX5{OMxGMO}cYxS7iQK z27SxfP+6i)YaUZGMa4P0&eJ$@WksnLB732r_qu?um%6mp$C8rM2bDiJ6amS6Id~U3 z=p#he2Sayw6jHpR0Wc>Y?)-1G^m`MTJE@zm_QQwWGPP}e*86)E3-w%xp!d~{+zk$C zKd-gd)u)w{A0$Ift$VM8%v|OxraVuLb*9u*;)QZcryah7ql12-XEFuP)-TVzyw>6U zWM+ZlTAG5PhfW!E_;){ygcb?-O3pn;HtDEJ*UMZmV1v zIU;?k5*I2?xSEFUpB!Ys2VL03K=b?-|-@7_=%0Ao>?wZSc4s-Dmx3G77sm;TW-*HV;*s>l@i4zflPY@k)$nxg3=>O zC&CPx6$6c&22q9f#?ph2jd|(Teds2^CGN)&LMLlp@>YAT-0(GQBq(NA=(xLlR!ul{ z<;eH2?a4}DAqm0Ndi%Sn3q=+Kf`Cp`(n9zrXf4B2u1(&!htV5)y4>o|^W@#nrTe}cjwcB!vg`K#Kbn`a8 ze*P7WMiqc6lZC|1s0{*V+m#>viqE!TL|Y^gpzWL0b`|0!&G)_xMcNhhKthzEKv`v<_l?uTYFxij0N`r*=F< zC=&OTE=ZOU3kx>C#IfJ6<6yLvBEUkrSks7OZ`;xUJj+5y6(S|`>j^P}rKtoTt!ZNR zVEwY-ynTwX^7F4XQxUrG0-9NmioD*qme{3ln5%1>gQJM>LrMXJ{b)3I1|@YLj)G_i zanwFQ;F`Krn;L;OAlbt$nW-XRa8WuuvyTS14-<>cVvvu7) zhk#sU(<|C7|I`#j>|c-aT%`ru=|t&|JF1Jm>zMwHHRGGhne~KMrG%24smC@V;V?l= z@TXR zBXJ*Z>>($fC`s)P5aNg3bCWD{!)E@J`1vt)hRgQ|h4_*V(tTKzgC+vOC-b#RIYI9u zAJ@&0ScoKH!9R^rzw~5z5s|01Mg)b!jMhoJ1v%GI;K%&FNY~ZT%!D0XmA2WLV`cbx zN!0i~xBF8rXpChuvZc3PTuj%;zBDeN5A$m`^S25Z4U8sP1i2qgO&3$UD(_;IW>nXX zSw&EO?(wD`O-k8TQ?DVksmKk*iiMQ!T>EDr7TBnM(t&&kGs@MJ=CCd?KWtUt&_*ZZ z;jPFs%PAtpuv1yA@l%~Iu!grmWbV}7J9HdvK55HJsEhKk55O| zH^J8fhi%x)mr}2=-cX%CA8LS}xYnT&F;s2OzrKuU?JTPC3^>vE5-4ii-WkC4eNgg^ z+7AD!;-jyUWgZ2c^hK$nCR{eExL`Js!+RkR2NQ&vR#tNVsn@b3IGBxELqeU!+&R)f zACsX=+fNy@#M!zIpaB)N|UlN#>p?%H0Js%3bC908<<2+h&tw z^AxBNJ3xIW#PQDUI%7E7I9gt6noo7OZ|(QgmRSed`3e^?Ge_d1MVX*5JEaAZpf`0# z&gT_M;?w{g(wd@JZhj{!Onhoc-k3qfPsf9DtL_(C z{&mX0Ceg29NUXA~JzLl^h0{2yb0uc4ouTywsZiY62Norpp{~>_G<-9v!w8JI5+x!8 zl@CEwTIkRmuI(t$J~&5D=rAAcCJyzH2g>I(PzYW$`yoeJe5zRJupaFu)y)MZu+JHE z7>tTq>?T0a18(Oo-GELw6XK>o&?EY%(}+&E5aRZcpvT`1kDQ>|pxga~b{aa%w?Bxj zsKh2G4)I-T8-}}e$WJdi=M*Ijq}g#KZy1BV;ApX$IK)+?9xnYQO}M6?y~M#rF&~$9 z(N1d-y)XgQyC*l|D$9W(I~UVa3mMw7$K>~i2X!NQIengb1;C zh0wssp#%C~zM-1ZR!o{nNP zin{a}Eaury8fB}NU=ZLkmVOhx$HF&$ek{n=!#m{>0$N&j=qEkXV9;cHU_+V`Kw;-!?W z@v}bs7#eHyoZ;;Lx}hLGd~@U=f`3&w=>u72C4m^1zf0CeF@UaN7`wl(R|K?A|yfD zkOu#I9~$OY&RXh$*|gyuHI0z}a~0f&yM++8g^=K*%e=W?CKR1BUC0)#X*qcH2<^#j z@z}S(S+L)KR=KffdKQ#`vf+=5o-?3JvVWIyqkOqil$Q>Gt>PPif}^4y7t;Mvgn( z7Or>HgDN4<(nb$RAe3;}nq+QtQo^d*xf#A4qY2Ut^op7ddeSpn3Igm7bZaQT?~Aai zU`t+ZQ%GQ5%qY6xM(341e+Teg2*K_)pfjQTl#xmD1PrjQ8~oDM4n8<8{iYe8aC7}} zDF^+2w)gg0;pExe_2SPuh}54GY?B!Npm&y}h*)MYw=meCLkEdV7CS=<^F0%(Tb6Vt z^Lk?Q(E;1}K7r4yF~`Ql?I}aIECh7uP5wdwh(0T$U-)??$jT)1bpG5UCCVct%5lQ; z=`f@lWeBz6cwA);{iUV|u?`@wE3w)4co~OcVApi9Misp(%>13E7UuL7;_@&uzH6Mx-_<$ipv@uYW%Ju2WN*K1(h(_E^FB z`R1lTlY;z`oKlj&fjlY>7cDwFm!ALBn5ICH^2nuzIew$Pl@4)~mSY>lH`#o??? zahlx)3aFk!Re`P`94eXLY*M5gxIzltH-Zqlz%yl)R2v# z*x9W@0I^|KKQBOg?V`ZsP6O+%fIXu_#Y{QZhX`ZRM3-_2Cny=C#m*8bNgz@7F~!D| zTL+6)P=>u4PV|nq6<2B(dxHSt9cbIm55wRK#}v-AGew5Mi5`#Z(0!_778+|yx6(c< z$Y0l1ml6;1JD-byyB$-=K^>b0wrE$KfZkNrx6-ro`jN#-I?3hpv*X)bmOitd^0|e| zZWp!mh-2iQKGwcBB=R~tYiZ$WkU4a4jNb)qY-;*33dL@Xq)*g^%AopE<1=1{N1j8c z2dTXWOoLdA0u@9-x_*i&?wHh?Q%Xr6=#a|*L8{FSh6&;`B?RYoG+ZBNd7Es0nArNU zV<{@rmu)JcmT<)8f?_#+WU{q2=jcd3PjyzPJ>Bt=ZI+RPW-i&w`QQeth-yvd-k+7H zQYn2GJ%?f~slgE1D#nz!pN`xfJ%0QGwcZ@N`}I{ddC*j)q*h%c80)%Lfju_RfNJRm z=?3yqW%G;~bE+*lP4Q>my|ZMfXXoO|jNqnU(oo6OX9JDE2j+UkPR5Lg32HMc(pzQD z*%d*V)KjBF{ib4Pw8c}T+!9JpK)0e61OI8EU3pMN18gF}O&u4b zrloM85BvoudC#UPpauH8`{x~PE{I>r(JaX5x3X2-MlpNaKB<;F1k|~zYq7Ep?xnzX zdZ$H;?;tc51O{t@hAvm+Q24K#8~2!Ks6dHfupa~G=^uqWN1()}Sfq)uOR#%eUUo^& z>@DV6tw9ftPVA44_uD%pZ(zb5Bt3$`oP_m}Q)e76p9k=;g;Sd`8|YWd*+7u6dR5l_ z*+tv7X}A^qZ%Uth1p*d^BjG(1>~oS} zpTP;y6lOyT^aD9#k2H)qY^Q$WTd6vq53#xk-*Kw-6~VIZO%#jW{yV9W*A~jj# z2UjNqUl~m^;>iMB!pz#p5hUWpZn|Uoj!RKnqosG03EX~U?MgX!3b1@rOdT@c-1#w* zuo~AfSF$qtlD8R=utBee&Np`+W0o)RalQH1j3Hh5Z%@HQKEaz@EnyHdCEC7L>fKT} zw(8)k4MyqMHH?T&8sJ`^dWbc;iS=rRuxqGsPGzA_OQF4V!M)6TvNWOxwl_LiaY8k^ zkr7+0_qG~0z`ol0w<<=mQY_`Yo%wIKr;}r!z8(7Kh7xP1kb*d~#--4{I5tRVxxfZn zoCK%~=~9m!EvljzMo+;X*T-NHgZCte7ei4uPRIM+7~hz#2wl9jMB(y%nCOZr!W)^j zJ1}K??G;3F>0tFHsr^1rC3@`V0J?eRx+p@D0aq_GgUa`-V zlNUE}y^{L9QV%E*MI2f8P=LnH{rwVK@jXg~MTem`97C+KG!y}Jl*I#w$)$Ap$?}jk z^`GSmgqWt;QG;yIc6gyxiR<$IT&Yzh9dBZ|3j+`61Ny>4h0C$N{?2qbeI$FZNcNIP zI9WNlA9{2*Q$jtG_-l4vmL7d|3Q}+3_p^mKv(?%H#D9UzPZ_Xz_SoN;_!gFw9NR^R zqk}1!Z|1lHy+S2s$jeZzsuhgI{hjbq>`3~F%+6&72+nsdop}Anao6D|jEm_86ER5? z|9+1f#8^)5K9DPwLrM|2w5)J*=XHh~v_imOxXq4!%J{%m6P!iCTm*eZ;E9A@Y1XNT zKyr7UfTVMGKDk8`Y~WJZrBQ?24s*O0Yp9#=trniZC{N8y-ldt;5>2-jf^UaUg}i24 ze(lrraeOD^!m>Zu=eFFqxsL~+cK0MUU?cC;pU>fp^ok6lor<*@2>_ePM0>YiVMw!fMZ%TcMoc^tU4~phV#+#6C`-^YNKq5IRnRJ)+U0uyiLfvVe_l;Q9OyxNnrQ@* z(gLo%gA+-`h-S;JCU*zNMEt38v5UaKn=s10dbO{q)WuF|!#)s^AXcPl9%-2LBP@7q zUbNSF1Xb9DkBzLUcIUWd{ma!iho5sN0ogr4l}P4mPH-lu##LMTQ!>hlQCg6{iI`-O zL`(_T#?;`PchbK2fC6p>Y0;2x znMoH$$;=t9DpFu31?|0u+mk3rwXQ#AuW^5#V?quknO4Q-_R3|!q7xX$8reMp(Ah@Wl8e^ z343%f?+XYpZ0+B3E`@<#G?IB%YDy$lx0=kvikz* zp>e?)!rg)vlh~p#W#V17T}>1mO(_?%deI$bRgcIfFIndv9*tk`@S){C^t=Y+ewUSs zM}~z?>+&_Z`#T&ysQu7z)4&_A$w9zF>-UbO3IBpGKYM06^^~U9$0FsiyMiB6NpY&( z3=#RNq~?(mGiOl4r+A+*IH0LEy&H5^@<@E&cRqUMEsksQIW)~hU6QASvrAoIep*=i zijO^1Ou;Pq%`}j*Udk6c$$anSX9kkSr{XEpd?aHKZ$;TCAINpA$d(aR3d!H*%CTT6 zqeUU<>APM6WlReLK|>SivDxKL;h1Satz6|{cm^R>BPoa4cpCl8*sCs|o8O=1TtBYv z(0d^yURcq#_hp1>Nj*R8G(R2ahJQg8vmY0m(#-73An8hA@cfc@6s_YCIPm!^8bKHh zRSO0~Kv`rY4Ft$x1*HaxlxW+3%g$K3gs;e{KPc>)xgiL>YBC02H*Yma5hJ20hei(# z58@S)fD}Q)8O_ygx$VI4;c*#h(Vi-9uy-g@8(#lGL8bA+r-dMX((MJL4|-6n^17?D z*lDZ$@x|cByyLa?(9O5cn8HSUyw8G85H}?XdmN5aQ+^kZ9L9 z%Nu0%E2a#xKEq$LabaTiOO8O=eBf2n%SK^-FLpzESL&uk^BKnz&GBcWwmTOe30sug zM1>b0w|J+Ko<_Q;`WIo=NhuLLfuUF={PRWy1-|^Mnb09*nY)C%paT(#$S;MT^vk%H zueokNMdQ+fG8tWx#ysTHj(G=&?Kmnbsmi4{3d=C}?O>RD|EvWs#77F*S?=-3@~QpM z-eFeyft4VXmZ@vJ&dbw&YvGVAmVFan$cS`70>`6~zaPe88g@k3{ct4|+WQoa{@FFW z`YRt7RGGu9pm7v64x|?`v)PEzbBcmyj&mXcL4A_SGM zu;|Bau!7pEPcGQQw9Nxh8%90qDmta26_C0cxC7$DxukP2+*F}&?s9OqFcZRP=0cP= zp=JcH_kn>22M5{6*N)(HQ4?<#e4zJ|La#AyLglMhCk(tfb#c+}LPLdx3ufKA-r?+{ zj{dyv0Fkb*x@4oc+?xD!4Irh4NFJ+2sV)hP0p$=`HMuj_FA)%xdBalr%sQz!ePM?q zDENh=;9*n(DaoW~pz}fe-Z9uNXLG2OMb>srn=xCpg97O?C=WCnqHtid`T`b z`BgnkH?VOV{9%_oj>PKh8|2SldVGZ3XRFutUiWqo_|hDoFFD)}8=0So10XPHsUl_h z*4JNx8IDSA@87^xHty)kUD_W0i+HfbpWXYNF6}x08$5#I)Kyx zqz)i;0I35=9YE>;QU{PafYbq`4j^>^sRKwIKHty) zkUD_W0i+HfbpWXYNF6}x08$5#I)Kyxqz)i;0I35=9YE>;QU{PafYbq`4j^>^sRKwI zK7J7`WB#CC)Jo1l+jtNu^&U!4B84 zpwj`J4(N11rvo}2(CL6q2Xs21(*d0h=yX7*13Deh>3~iLbUL8Z0i6!$bU>#AIvvpI zfKCT=I-t`5oet=9K&Jyb9nk53P6u>4pwj`J4(N11rvo}2(CL6q2Xs21(*d0h=yX7* z13Deh>3~iLbUL8Z0i6!$bU>#AIvvpIfKCT=I-t`5o&JBO)BmrxQ1|%*#=*T{#1S|C z@brJ$KRo?!ltcN)lCLvBAtXEY;1K`a?fhT!{=19%-)SljFoyrGklgkF;|=*Y;r$Jx z`R}CpzfS#cRPqQT^gj{6(*d3i@N|Hu13Vqz=>Sg$csjt-0iF)6Hbo(}MIfTsgI9pLEzPX~B9z|#Sq4)AnSg$csjt-0iF)6Hbo(}MIfTsgI9pLEzPX~B9z|#Sq4)An< zrvp6w|688!_s5A(r@{&#ZvWxw|FnO2`rn8Q6He&g(SJlb`k&+j*uQT4$>4BMbjiX=`@c)sjU7LIx-E?^6Fj^}mrHIUM)@L;zF=pgI860jLf@bpWaZP#u8k z08|H{IsnxHs187N0ICB}9f0ZpR0p6s0M!Ag4nTDPssm6Rfa(BL2cS9t)d8puKy?7B z15h1+>Ht&+pgI860jLf@bpWaZP#u8k08|H{IsnxHs187N0ICB}9f0ZpR0p6s0M!Ag z4nTDPssm6Rfa(BL2cS9t)d8puK=uD`p}PMcCoUR*iJRQo3rB^x`$wz))Be%wfAh*o zXxwB(0eG5!=l|VA{crqJ7~bIDN%Q|}?_PtWD(^UspX@HVolV%yZVm}afRG|aBsYRW zAY39>Q3)B_DcS;IilY)*tgW^Ul#3`ALD4NfiUoBn6h=ku6k{kM0hD4?5SSuDf?O(! zg22c{#7m#&oCVHV54`G&y!bM6UNHaP|GDkiv&oCk=C(meZ?yBOQo^vLpE^p`Ur|@3 z(cOF<#KPf8xsEzQ9ifg;N2nvz5$XtaggQbUp^i{Ts3X)7>Iij&IzkIij&Izk=0qy{IfIGk);0|yHxC7h)?f`dyJHQ>_4sZv! z1Ka`b0C#{pz#ZTYa0j>p+yU+YcYr&<9pDad2e<>=0qy{IfIGk);0|yHxC7h)?f`dy zJHQ>_4sZv!1Ka`b0C#{pz`e}^_c_vu_wVB$tRI!YJ$hNdJt#|6n(bfDNL-{6lO3pfe ze|x14!H!@@up`(J>K$iQOq9?IVajr&H&8RpmDyrj*+&U~~@{9gGe}2cv`0!RTOg zFgh3=j1EQzql3}G=wNg(Iv5>{4n_x~gVDk0V017#7#)lbMhByV(ZT3obTB#?9gGe} z2cv`0!RTOgFgh3=j1EQzql3}G=wNg(Iv5>{4n_x~gVDk0V017#7#)lbMhBy}S&aUO zh0!bY~WR~5<5b0Q~mgQ9YlC(9nO{JDxqf1VRL(4~Fk%cVhk z0*8)6--ScRq2thT=s0v7Iu0F&jzh0+EpcKV%qKYO5NQP)86)YRjFuF+6|6UZcDp$ z6K0eIw}19@*T(8zpS*f<{;ogPbX+ku?U%1kUA18D(4+sDzj*bb(&@85_~W`S-qiD+ zOI>niN?q0Ro3nyX_uQHJLjJOGeUI#VciXItZbw&lnD*csf6Cpz`l0YYzbJU%(D?7y z)}DEAbnVJVPbJpZui5dtf&ci=%n3aj5AV!dmbCTp0ddnqQ?gfyXJ?$Q`FcUub!WT( zYRblz=7pnsJT|H1?hjY&ne=MKj-w~nFPi2LmEHE&)^53_tz9l|*U$C8@9xtDKi#pX_JNWo&$i&sap$;m-1!LHIqn>HjyuPlHjyuPl>PFuJAVgu4m*dP!_Hyn zuyfcs>>PFuJBOXa&SB@UbJ#iT9Ci*nhn>UDVdt=O*g5PRb`Cp-ox{#y=dg3wIqV#E z4m*dP!_Hynuyfcs>>PFuJBOXa&SB@UbJ#iT9Ci*nhn>UDVdt=O*m;{}=Z{J!eot<= zLO&R2F}(UxJ$(Jq)ivjSh^rixka+*TcQ+keu4zf9JX+8QFqmw0}IQT(IkS~coh zMpoREry7mI!o4w*%5v4jp&h@U@71&m@tT&eC25!cHHvYKMzL$t((cQ)RLh36>ou+1 z(e#?w&}a-Ta+_(*XPxgqDTiwK5@>Cw76T2G2)O~!R; zvGYw^D)RRm+1`@ccyVDwde8KBT0%?A?qz0y%FI0-FDf^s7hWNATxDv%ju)?W^A(By z9~+s)KOSjqm3?<*jwO!$KHB@n$40=l*S@`Oj^0f_#EaBxd>tcSE=@ID_Ap((zYTn12)Rg_>4rcvAZuUrfxKHi(O(>xBe^Pe6@Uy7RhU*V*{%cFZt}qr_t|!u_EHB;8{t@7{;!h7m^DVGC>oZOEt=LDx_GJCNOc{>entZwql~)u@+ju( z>$U;=2{|7e^^=oD^{Yk)bqlGxBer|C-2RF=hjWkpLDTC07N`BhG5LjLJ+jds7C-DY zjL;`BCnsA)<-g_Kck>)w+*d0%s_r4z*o0;o>oZRm!2(}T^AucT@2S|F#kwf2N$#Uo z>oR544@-YO#22S&kI3h1FUM-%c_KQ&2U`ul>jWpZ$_WNW%ve`(K0P6%c)r=lbd8w@`TP3IF{oS%v{s93Mv zDUmfDx>z@(TPpW`nYwmwig@jPqr`eky2PqpY`S;PF!}j#i@XLn?tpQvX77+h;)fn9r@_<${M)`Aus3KY|I6- z_Xf2Ow@&*$x;yq!_-(2fobJiKxR2QGM=tK;foI!`@pFxA>!m&(vkMh7ckzBWAYNCo z&hw0R)+d-t_9|Q1oM8?S5(%eM^VELa+ONEy7cv9l<5b_J{ls?9l?y$#Lmu~MZw4Yw zT{Eob=!ux^sMM&PGS#mnC{8Ufa;#g|E%vgEd3xR;p3eyM65sBWPdT?#)-IXa&{w4j zMA2>|=$cxfQjeFbRDX4^xQ%pPW%R)+lP3md2U2>u2OV$kJjZKZS`lf<%M>S8hs}3) z>@4%5N91|%U}Vs>nbr$_D&~Y#$ULFuJJQ4li;N8O<2d9NQzztIKQ2uK2M0^6BXWzW zBl6xl(Tw%9&d4pM&dA&8E;H6o9goY%;6T~Nn#PSb~9-*&d4o4+gRN`k3g(B0EJ6d;-TdHi2ObwkIiX7~5jTksF zElb_;ElI?vtuoeWn;E-KeI=avbCSz|S2^(V?dc+z@5?sd`ZYoj%R9sLTheAY3mlI2=YHkycvr5UuRvFVznB9oL6<@S!_e1cH@`N z!b_+BIMkonRwYVY|{cgG{83E#m22{ z5`27c(ME=Ax)!LWnLhXRlZ8LbwAvBvs4cSWdqA0j7a_M*SkbibfpTI@6hmbE#q8Y` zKJIjIwqu$$*|Tv9VusI;hepp)rlxtVi@Q!?K3_An-R{3qKdpAt3J~a9;3$H7t@}7g zt@9-`oFynw@7L{!D4SnaKPtJfNg5;qp-D0U=Iy}xO@IDWo4St^pz^ZZ{8^ z^_pGwG-31I?-S6kji4Dh<-#t(^jII71%S*3~8T9UBMTdaNpDOq9 zuy>oLQ(?mEw*Yx(z!gT#EN?Bm z-&Y!R3^gYA{fndjhUFh(3xrjMb`5VlHVuBYQ}dvZ>KUuoX=w!^DSdL4`l{h&9=q*b z>QHV==8)Cm7{0hZqcU3EBr*}$#|s2++9AbniKjUJU#v8n+cjN+A7BAuF2h~0@14>0Q1unE!| z4NI_%LzleGkJC+PqnBAma_O1~jh)z=)rmp#^C>9Q$2czOeV%2QKHhiXPO!%Ub|ihQ z5BwpZBWVZl{w*2>vi=b?FX(nlLu52Tf=tI3F$<05Z#($=T+rBP8s@uiH|F?PB(N6S z9x->P)zeq)?XI4MMT`|X%+J59jh$R2G%M|W4^&eXuxsoTpsKh|Cz>|t@@-<-i^oAh zvSL-!-2_-vcD4ydxRi*x>YhHCnr4U@J1J?!!sf*X89^txPbOY(Wh@^j4c|(aQBqg} z>TpXtG*7xuUiwJ`=WKF9>*dNb@VCV#Jxxw4M}p)s^l=kR@))kh7+dVi^$FtBAoRb7 z;zGJ(t;=9qv$GAJ_=@OD3ofR8Hy{ET)+o)Iu{aa=$WYN<_S$V)*sLAJ=k#5dd~;ci zMHA|$QF9;79gSz+@TikWtL=9QlkPjGsjb`*Kyoe0u1tVx{?2}@nrc0bFJsCs*2Jzx z<}em~3jId-gMG`>-+9YaF!ong*5XK4T_o#cFUl{lZaN7Nc4}Hh z9C;+Ch!DRIj%9Fv_xvE9--_LE)XSKDAcMT&uQ_6>Ne(z#qydV$uC2j5io(y&W>0)R zrh%#x;m|XwqQCTA$HFEJuwprxf8@@PB*%}mLkj3^6*GGAQu>B%wz*nKqVqD=x{6Qq zutbzc%TmUknM&{KF@5Bxn3j>;iX9zFdXOCrWT$VCoP}(w4?L*`0n~pJZ4Wh9FSXVsFGs3yjJV12ld_7%djh- z_Iok@ut{9QS{orDQW)5WD7gSsun%pof4aVy&-;EOt9q+LkkJ<3Q<2e}2PMPm9^uK% z6Ze@;+$;C`R+n_>YY5rGU&k^E!g%)`844=s^E_5AB)E%3etP`QW#ge3T z#Wod#?ZS^g|EeU4QL7D7|HjjNQjIDcDRHS}>7? zL}Lhl%Vc!tJ1J4Ya_i<*gEGqVfG#fXPuRB{KMRUenZQ-pPI;z5bL4sRZ|BZaDiWTGXe64QjfI?FL!I)X)Ztx?oGJ^jm8zyQ3bCPc-)&Pl-u)bOYUrn% z+hc*qYsy`yn7Dv;kQ18QbJ#I{hoKoOofkzw%c|p*^nxH~i{`N>EdsF=NpEcLTjv{&?x8~?`?mskj~==Qc3QbR%Y#*$J8b zbK6>>Z(%L=MU7Zx9;-MRnKB+Z+AvKNT38dNG+gj7ylIg5QV^T?mPIdKJ};Ybl(K(n z##BZ4f@&Z(LYHbF211F6BBo=UQXMSswv`P`d(1?AXk~aQC3aPf_N=^- zHmfdI!W2TJbcHmxuJM-DoU9B3Bgtm@h1x+$-5Q1OM>LUB+mfBor%+;1w-@)nv+eIY z9s!TWG@ppyS;I)(XJ)Tr|4wBTiQjquP8&h9S4w~9mh!~!oQxu39&!?XD7{bt7*=R- z3Py`-Q)EVAWFnFg9BpX|*LcDsX>>V10=K zgzv?2gYuMoCQHc=)h-T+ph6G25lKltU3fMHKoZ2IY{oUUn=T`u*o+92S8dibwS#v4 z&MNWiq?jS4nZ9@(>;~vZ!%=7*WRG7B_wY7ujSKj7?{@C^lZ1$(5>FPQ9mYd?5kYVj zT?=*?3JuLtUtW?cW6(|oT-bW3ENhfKQ2*9{+)_0VsFB$4NDOZy7Hb&_ad{wxTWH#X z@Dbq7VuR|s3pKlJJ1)x(HRogQ1a-453lfQ>@d<-}G278Nx$;_jNXj+-!yS$r$TDu6 z<>xkj?JwvYCo>io`g(%%vxBhwdB8cnasO-j9Y+e7Lss3SzNs#&Lv32{JaP}ai<|-K zg<^tEI*4@G_`>j*8ca4NabiP)&3Ty^dWD#a+PYByp{b2cu5C@FYz>*N$s*gmIq=MZ z=Wl2uw(~GeaBo}5cjw7}Ok+|))n#hmNKn6v4XJJ?X+kZyA%t9h)CLh!D^|}N1|#o0 z=G=~d89tB_eq!7>O89y4@xtfwYIpb0|2Cu!TJ8!ex6%>{x@_guy4yFEJQNKdr0LX1 zKdh)Q4!fa+cu2JT@q9+ER(De%5;hUniD;r=hNO8FIzmstvnQIXSTVBnvtF+IrG$~o zh<_njO{lW~+^YLG0kO>(L?1jTZf;bg(aD1^4n%?mQyP>`x-{gJsAjvtcHU$w217Bh z(^go5lk5_jXGLPhSD890$ehk%ps~T4OhnnCPf@VC54UP#s-r8ybhdMd#nN#^uOxzq z@;1%^v(u-3kJ*}){7v3N!WPcl_l~H2!$rj6XmrLkTnx_6#>y{>&LAY zR8{k>E5uVLSwua4$bg9WCa)Nl#Hx5k7HS>jtroLG-kMuiS0X$w0ucWvv8n|pV+NHU zF_4aWgXvUnB6Ci4ck+E)_8!?GY8^I5jZ9%Yhz)9xZh}+5;)J9cYf;3XAtWG_L0@}D>bPW5XLhkfEZEa zw57rUcb%%~=T38R%-&rNqwNs0Sy8Czlaal8xVo0F>tpc37Y4Z(w%ac!q;f36$k;aY zJ<%*6HwT9A=qFA%pMZPtg`>ZJa#$z#_$kHGKkSg!rN81_k7*ggNpQBU(6*{>$8(3K z{F4i-x}EGB!92aJUY8ERwEcIFG1vt<%kQ~^tN9^MBc~jw4CzDIeOKqFc-~7@f;C`> z80-}zcF2Xjw>6;4o9IV4XbGNI>w3{G;|St*_a*x6$|E}S|O?}TiBZpzn%$sI=)KPC@ijG`kK7pnacEN55CO3_RgY2%A0G1VYFi0 z#l7AH++Br>c)~evrFQzybJplV&}OiCtD*KnUjHPe#N0C%$6+ZB-R|j1sYOAd*_{|6 zfIZXP=TUp=T&YTg6lp(E-GS$= zzNYHYk#MopizvD0ACZ9pJ+t5Y+HnI7$c!POq??%8VNdm#d!{5xcan%}Bf4|#>-KA_ zc=|8y2M$rwu&D_uC^#UEoL!LR&mnRZiC}y(<(1kf+(ZqXy&J84lo4JlwCF>%5%3+v zGL)c$fJ+oZmr+o}=Nd3Ej(~vC!MvXb@VB zIhAkxY4SQ9IrX!+Mm`U83e(S?Jw=)L)NV6R7ni3fYI}s>dYvH7Pm(C3B0{d!xREdL z6yWQ(>(VdyhJ`c{U%VX0$@dF|?erDv!3rw8>O~--#f`e~eYKi(>Ii?kD>Q5->$PcF z+<7YcSTI7@hs(^-Mx&Q`a?&o#V00@+Lzc))&nA3YWI3B3-pXee!B~;_5F*j1t6vaB zV?KgP{FF~A;<{phx^^$&@iIv)a+^>3XA;$SH&pmqg7i5*_H~lR?-0{Pox?SG|GM}h zFJIKt^`e5&XTQB^tw$r_%TR7nRORcD=D|p^yBq38RPiYv=o!g6y+PC% zjHg5cUu)tC4*_}ZNm!=T^?d)ZC4rE6h09X~*}!av%jt7yk2C!_Us9bHp2K4GNozP- zFd@+#7cT-2Z@H}_NArzi;Ja(Zmi3Qw4+j~)JylQ89gbZ@uiUmV!Q$o?s%rJKfOq{=;Gx_Ih>PktU-gmr*m35c%;vbT8Uz`?g?$v*MkS$`ww$c7m#Oj z&w@XOC_ZAgeh=n#8~FfLz~MZPuZsM0FQ_3B7j)arT6d>Xcmn&1ZKi6V1| z_0`igfSTO!_q~a$v8R!Pp&Jh%oCD!lVWQY@rMDD zj_S10x}r(mKI7CllTcK|M~7>laDfz|oykRzKr~H;Jz8dO;9eF6J_}3jsIs@)WjdnL z9*C{b5~qBKxgKB0WNo*&nqi>RnOMX?eThS8?MKR=4!VL2sgTuK4R$Anuc2~+9g~b* zr6@=}(s&SRnh;Dmq89~ztuAp6cVN`~uV0(GA#29Kdox0Z+Ehj%8+KSw&g_zKTne;c z(IWPI;CEnyaol3^t{l-uFY{kdTyiwx-Jbak-$;jCWcn)%4DKw{xM`kE}W763o-~$CV z;31^nZ@@mrEV0`~QAJ~3%fvXyB9Kg*y?^;Lw8L%B)~I!b6}El1}=^$F^b2MF;2*lqnGdSxMp>Q#k8{ znMP!H$grxbBFJb;A9%h|d?am06+vO)G)BP1Z92vrKfw2vC5r{l%>)Aqq5LpsjW=l-ueaIV7=Ifd<83Mk$~&=IgA z&9tJC_)`!}p3FtJm6f`Guk!amnyZo$3;KklvB) zy4XTE)tnwxDwcA-a=|*y^&`zxDQrW(w@#S+`05gQe*#(8Bc|O2zfINzYCBr%HN{aB zyTH+<(y}eY=}!CPmSm{?$&tTp$nUS(!lV+l+h03M`FJmWWpt)Xb|jcA0M{ zZa(ot<78~UFjCMr^);(j%T4o2@!B?Q2-8x{CeK-L(v(yp1+zmVik@FF4kznx%h~D- zQ9-|nq}`_CjIWEhfBAbsgYMxYi;OuPb3R7+)X=jq|3FWbh=8UE{JbwEzS&EcZ~Dvh zN6tC^Tbw_ybbqb%7s1jtWCmyr5v*wzQ5M>o*6_#zhz_EHBDVw*d`H7zG$eObkgs}= z+ud!U(|6Vi=?7vSYt_1l9_row?bWO$$eD$Vl#3_9s=JP}IJ~zNZqPBofdjszma}uf zAweuE1(h5EHwghw?0jSiX%nXPjW%^i1XQVCY{cy6KMx-FQE+L-=HG+LRTRP00%6dM z!aRI@mr5&abF3oiFO=`s&=!1jd(P0k{@j>duI-@wlCHv@ZTbi02h zk+hS9mrdt1@1Kr;p55knU5D^)b4!kUj1MG*zT8?@nk_!vV`z}N>m+1>J=7vy%-IJ(eM;U7%z8x$GEBjjtsYtlFI@H-#9tGKC zE5e*|N@SHpdO8+o9*UUcV?p5(&e2vd_lH8#d{_SH3Mk``i^6ZjLXZUasSRPtWuK={ zj(R?9P?a1&T|?sMZ0NY1L{6Vm@tK1 zGG6bGio6phedb_->#^9@n%87(=A7vaSQ0llf`dUcMD*6Ki!T!+{Zxi=6wzaJ;pb&6 zpFX_cP&QHXo5{3KLW2L9sK(WAiQv&w{* z)KKK#woO-3A7Uci*HF6H7KprOL#}N3mC;=bB3WW}5@Y9>4K#pgE27)f?JSAVsCfFY z`PImLVb&x{RW~U;gr`*=%?W6r$~ps(ypvP1X&UR)lSG zCZX(X-^D6%R#~;wZsn=X#WT6a3lDm=#UtWG5FA^!)UE)LaG{Eao|K z7y|=Ws;71lMFYhE-yH@!_LCXC7kYX`J3Dq!N4%nxK{~?px@-x>4@GF}FH~yrh9$lI zJn`R$SkzADW`)((2Ark*K%!R(O0@yW+5%OLpI$aA?1&lDJTGOI_-o+g%B^&^jdvNV z=^eSBzqwlCiFdIVNUYYIEHQ#JkA>WO5S{GOfL#ZbctV)ygJumsr9ev?;Z8!Ib-D77 zQRAltoO8Gu1bvW>^HA|Xx?z4Rt13AFmodIRfSpiqNf(PFN?=)^0)c`fRB6i${T^<~ zbOgcT*d?9K(35N zr_i)K-$}x7>YZ43$8?6f!Tc6;l*lfl)p~G+e&Z#&RyJD<F-)WLTg~SVnM2BDF?0{$G+L4f@X?e=mvC5b{dcEk4%`Hwnc&`x)T&hOI|UR zJls+SrLOO_T2mMoldINi%|%!o?@jT(<0*yW!HuVsp|15Du35QCn4|m-79!-A=!4BG z+)=N9mYmf2pfe8USjWZ)!oN{gpB0p0%yD)fgYNbPHRT~s1$0%F3NB_{=Y`Zc6ymXr zYvSP-KIfdHFy3_FkwEMOX&>mQRW0G=MpVi(VMTn){eYmZCE}h`@zu*?VovAi%Xi3q zm0FV(3%1)u?CFeYw{h*)ybPbSda;RZ4RM&?ofx89E8XmsyCV`kM6Y>j7mG zOkBRGnUfOGA+>^`JJ3*i5TUAupW#u+@htYxoP2o-ljsH{KkE4ku-+Tl;MG z%|I3NH(ZEhKhk*`zGUFuXs@YHDWyJ2g__#*It!S)&Q(r&of_**t0`v)kiC-#d9NSpGoElf1r6$-7+}P|wvUD8WgcC*2TQ_tEWz}bKaa*e zyXhm#if8!qLJQ|%)=dn%6*IQA`91EzoZ7!jPmj#&W{_UUY|_u!$dpiYu!9Ue;+<}gBa=c0Y53&mCH zk(Ro+mhA>-BL*)Eo?GFjQL0(V{g5@wUQO<7OtZ;D_wh~_;bzaUlU~NL(oexc`nK6a zp=tLen;^7>t%PqbHi3JqgoKKc#Bm@&d*E9**X_a8s@4*4vMvquAcySLVe5sO`r-!o$Q6YjvV+`H(f-DSR z^_Wg;65#exvQ*}k*E62nZKcb|E+^p|+1^O96!9q<+_4(Gycnq%na(De&nuo^$+s5e z;sWs?eyt;F2-9by1^1cA%Wr~AT+iK*M!k)w(buF3tQ@zxD;~bDtLJCn#oUXDpPg${ zLz&xzVzQmT{2I03d1GdEthzSm{wZ&%aEQ)((tY9Own?ak;aOXW&4$u!jol|Fw@|&` zz97F_#F>KI+5N5kicB^o_o3_Sq-5Vnyy>v2o=!n8-abRvr2aq>}0k9c0S2R%=?`hK0pKWXj=@ocsRyB;?t}>n<6cVn2P`kb- zo6mhsYWHoR9w+KkC0SGftq>w8;`AYLbc8Vo3g8sY9i$M@@d<9hy@(InC^H#n7UdP$ z*(#t4p%jB3Q4#;DB7xjhrk*%b1aX^q3vDSmq7=I#(V3;u3zH806dh-ZU^E0HMQ5Bn z4wFW{LlR02hhYeSqzTn%K$@MEC`Udfz+o-VP-il>-};3cNs%cC3RrvYOhb4ik(*1V zW!)g6J=c@dTV4=5bFFh=-E`s0Br;OrRHP|+WI;?az|lu`cs7kH^N(MQ6DmvlkaYT_ z9p4h5cp!wnAO9P>>CAzi*F{`*_4BDk{VGaC=$zblh`nM9)(-vi5f<65SB?9GiF`v& zeZd8RZoj({d+SpsP`GMM@KG(b_?L)7ghU+z7EOf`;(FB}@1xp@90tsd;1Nz{G0nvS z7?k%YrISr*N3arw-ff^aZVGs?>zJbSIm=7QO2 z+$7Z*EnIR93^5tIwEfkgYlGv?{QW{CE*O)?|>avnqri)j8 za_GN@*%loXrP$*zwEn?k^zx@>h`iA!+-)i_%&@d!e0>vxyax)dtw9hn9|b>aYc6bX&b^=3 z`y*_L8Muj)vN*Vsoh=m;)^aFwcTN?t? zZ5~P{yl#b=z`DJ_zdy;xqqY(UI6UVGkRQgN{$YjkJq#2^5F>rcil0+`J_6-0JH)BA(E66xCZtw}%dG*dw0NbX3+`SNS_>+#_DlbTrZ%7#gTx zG3vQXI)+dZF%iaBo8_7uf{s?yhZp2JxfV+1RiuHRKeB)jhWxSDD^0#Q6l@=Aw8Csh z1GVC0j4DwR%6zH3g82?g>##z(X@u;wce>aIeovD`hyFZLIb zuvDUfKE)UCW~MWm*j&Pt1NWAm$dN)=#Oo9~LA50*!#jTAu`F!S9=qt_t)+@=r*P8Q zPh_l~4*KvXpr+BsfTKGX66#(jL)$+T4LpDmgU+RO!-!NKlXSgEU6pr!lC4?aj?X`y zlojL*w&K^_1i5$x=}y!wA+nhd>A4Fl=nNM7>OY9G8BTiH4=#8InbS(_hjw@ciOb2! zdw$pe(Kq8fSc;98mm(lu)s5D;%4P!%^L;Nym4Q`}x4Dw8pU38UAH1sHxzqcm-)K*u zotS1M{U`I87>i`mx9aWIJ#EZSKu<=y6q5>;Iu?zEuSD%#R*j-

C)0XjP0k%8UA(+z6;Z&^z>8kPP0hsPmc;LEuvQsvghzp?}jRy&sd&HS{&Ce zX<`sz5Q#-oiMlbRNylu>=ee%PHHADgXzad!2$e&8j$AhUZ3xLFihgdKpcoVf$bAHL z(*JrLt!H)Hy7wcNHy;vR1n)JyDPX`1bfM{fiZk4{xGf@{*qu{OW_e(}Ar&Rwex(g; zVIIK-F@j&f20j@3|MNn>W}c>Tuj!G|8@~?QR{iY!2*y5rJ-RyvVV@Z(ay<0{B(AHDc5#BhJ?)#g#f zd;QQhC#U&bIZ>E;@=cxLK9y?vOBA{A&hknI^ckaJCbrYEh!bN5q_*%KMg{j)8e(lu zTYTPE-@8P*h)~JoXuUJ5;lLqCOy;7^|7pw2p_{z8YhK-6>F%hJXZ}+q+Y>Zo%d0)E zF-w%_YxSo|{B?Z)N2Z>PQ?T_YX+4CZMEz1TT;1)#KEdH|07?k|ytH`0ajwz64Um$A10kXeKU{rI7?=ud!?|cx{uRSpqxG?Ty0tvj3v?|;ZrNzAREJ* zsYfns8w8{rqR091w|=6P8`M$OWcLf{>v;L_j(`Ju#9oQYd|f|Z z5CoXu6YNp=X9ie;rt(J6M{r8LSv0Dv+aS;~#&;|nG^-J*9rQIRnYw>2 z`o2?BhM`P8F78;-<>hv_NRyZHit>XL;TOu3cw985Jn07xrU@iWIwl&=8cpBD&)&Q8 z?$Wt0I2;`Bd5ZAjy6W+w7cZBA7`W+YtHxiMwC7)BbCyOf1vi2$uh|91DvL?h6Y_CB z?mqJp$SK2hWDe312bO$S%k3J`;t~+wW|1lBQ;c6*6 zr~Bo5@^y0#t}Z@hb(zalI!N%N9mIl&RCx2_52VV9W=p9Q!EOd(^riQfb-4=fc$!|p zFxsp#ltJFu+cBhetaHpoDWQH18^tvX`s>yl-6s6T8!ww-3(zbX&P;pA>Yw4=gc*tp z-rf0etVJt9c80T3^+cAM`H(V?Cp#{s3X04)M3M<`618Ag&7)L=<1J`NHofFg&!C(F znhN~IfdX<04d&6VD?$Avd?8tm1vs&Lz7E`!9WG`f2m;WSy+4M5Tf;OCxhqwc!HFKP z`{2XR%RIDiEuijC`)t9wcDf(%AUpV71wHMVr7i2&-LSL?5+bCSZ(E^c;DG?NQX zAKdT$D5p);?P?q!YZ|qF|M>AvdUHQ*2NZ(7#NAk!dni&L(5oWKi!;>z@gr=4(_(?J zbQG;A{i*Ia(zxIh&qh01v!H}-z6>=c`1F}enknw6@+#;m!>ad?+W|(Mjv#gxr`lUObe}j6ZsLeCS2?~2>%v^#`aFfQ2%WA_i@u* z1SS7X@!#jSbSLaNr9LwcNDC7!{^IHs7IpF?7FSerLb)Utwed!Aa8DvXAAJ)?WJEra zp&;Mvt4!&Vr>uy)O$l8@duy#dT(CF{TwJUhzU+{0MmE8`habIp)Y>jz*0eo^@~j$&!)OwCeXc1FMyOj%)6Cii zD32Lxy5)*s>5_+a-jKYjctn*ZO>j128=y$>jnar8H9wW99wB*}fge>_mJfe1vz_8F zX-v1p`|!MzVg{-kj_6$aMfWJIuOTIvSncRKz?^_DSp7|7R?BlI5Ui($OFmJ{pQ7zk z-u*`w{z>L`*(6T^j1;WKHO%Flte#XdMQCi$y`jtP{nt&a*M#`qLRjX3?!x!yU}EAB z!{(MSi0PKkehzcp(l~bNkSk3_D_k|ih)rsc-c~&%^W7vmH8NZ^gE*&7$fx1Z-l~w^ zHa$7>(Z71uJK1nx-MX0&TO4*b8`r^N?7saR`wd^TQ1E{CZL2Ml9Q*YB@LPVYgLWDz zh%0Ao0L{y>T@vI98+>pa;3KR{GkUb(1a27p2!C83i$wz7lPFONMbmhd;CE|`WU?%L z`Q8$R%dgtg6aF~=)?u0FVT5H!v%JI@XPF%STytUck`^@yg;nVS>F zi-0$AX+0VcH^1QG53a=QMaoMJBZ{wN2C>YFqR%kF0O@_M)POI(pj3YQQU`)ZeJWEebqXgKOj+^m!uw16`C0# zW)~SMBJOJ4;!)_1_+(-UpKc@)>D*sTY|;iBxF&aL)F8LP9Pj!Y>K6K_g(otNB(Ruv zX{NMP@vo-fJL6L$ui91I_;!9C+YY#l>o4}btMD*LpLU8WrlYY>XWzpzWuW}ctaD06 zVz-dz1?!MX?v6qYf-4hq;0Vim==7EhLBoRcHn=6yYQjFttL?|597r>X5^-m7g73ML z0Iw-Y$-J_+?|x`nc{k{^M2}slP>^TZs4t5tjXe^~#Cr0Np8v`pee@Hv4-*hT)%a0y`8;eAS`{^J%!Vng3*7wnt41uZ1c>y^L$%v93%Q1HE}-vzR=?F z;K$k0_QYJ>H|P7ga_E(e#ED;GiMEqm7wwt zbA!GJkd7&Ltt0q-;V5SUMz9j65-*me#-3FCOzU`C%55T5CrL2mDdQh}JcN_x3Q<2x zv6f(5Z^YJ}3cCWy*=D1|R5cqD0y z(Wi2gx0Y)2#u>~5=GUDr^skg^rDJX z8lEBaV+0Qrb8>XEIo?=jSFYeXt_ukXj^oWUhFw3{qb_=fIzz#-W;+-mIaH@+gJC)L z*|Mfxuf+ty&4e>eKBx~S{W8*-t=LMvGWSxJ!#TUmk z`M)&HDqd2ig>y(>Vw%k_$KYcRmNt}0mYD{AsF(IbPqBD>-OGwnH!Gb)EkvpX@l}?O z@Pph(OYHta6r^v2*N#PtSuKhwu&;WFA5hyE2^*TokIk>P6*T&xAX9Y7vH19CkHxJ@ zLb$Yw(q9{0&%s2v;ga^wD1)HG_D#up$Ku6w#cqpczdTGdVw?~Jt!4!0Rq==NiTKgz z+#XBL5Y}JAMD7uhbEBz@I)BiH(!j-4fdZ{J5F5dZd-X#0tn}t6yD9F3!K35mTEkPW zW|49oJ*R7g$zW44kf_UFRGQP zm~Y88f7{kx+PSVD;N52FJlr}+`}8!Ga|ccy`_aUat-3wJ7g@pN#UGxi4a=0($-VbMD0@0pc!2uG6-Vn z6fL)4#fz}K7>{_VPu|$$8cB_y<5P5cvQOEVae-`>#+}M~8ovZbtfj6Ss#qfz<&6}U zee01}5N6yoRnp$_VDNF9ttHp>O+AM<6|BWuyz!({2uU2|)cH1kHR-=|GzYR7Pv{d< zy3(fG9rWZc#%6|3dwhlJ35JXtXib>W$je*Bfp6~#_?}m%8mJB1;6oN66DKQChU}n- z@_yBhc8r__A{+IQKSUkje))S@BqSp8ZkHB{sBG-|CQ|0pWPOyM{zd2$)yb@>Rp9KRpg%%0pa zmH*pAd76h97F&xax<>5Sp(hD8gkO308k$C?b9{h zPjJSxEy2n%$R8(kBndo6@KIh!B_t8kNa9h`ESYiEFQJqY^iS|dKO#WpC~UdHYum)J z_5lS!<4<8Ihz@S{4pRi-(QhW<(d`(7_6)W0N+y(AMFmw<+}HA_IJ+GfgilmWa!R}y zgnSq)L8J2+gwRyn2y%A2iHov{i)GR#E4EZkueb_!D-5+~_8*$g5*M2oRL`oYn$D6J znTEXobA(!GOV(}$6u(Gq)|9g7E^4wu9&Z0k)l?;C*CuTu@OOuszdH;v)Mo$PVJC4h zhCwy^?+!cv+u`q#|LidMzYRW#nh21GpFL7F70Oi_tgXFs{Jzn70(lIxI3;vnU=`*GyB>iT73yshnrnyf%Ud}L{` z#1C)2OEj!FSvGyDC0CCJ+`6LDy0v#$Wd&F`H00y4-W)Knx=RQ!Wd%qmEHF4YI53*O zu-r=%S_qNgFD(Dx_#Z6)Cyh=(i~KA7SC9XbI%c5N{*?%4p?zQ=|4A9k(DMIEJ#R3G z;QvWVAE5A4(|U1;P>{i3|L^Wf10ecSEbHJVh_8hS1fISE7 zIbhELdk)xhz@7v49I)qrJqPSLV9x=24%l^Wf1|DV}&`oB~hD;HJ*k?gNM|KIqZJ^v@=eSjiJU1NkoNR7jTBmdW;|0r~* zzl&5;9igCbQoV@aWdHAi)G;DBAIN_;Q6z@b{J*97zZCtS)J6g){I3KMbbz1(1RWsg z06_-`IzZ3?f({ULfS>~e9U$lcK?evrK+pk#4iI#JpaTRQAm{)=2M9Vq&;f!D5Ojc` z0|Xr)=m0?n2s%K}0fG(?bbz1(1RWsg06_-`IzZ3?f({ULfS>~e9U$lcK?evrK+pk# z4iI#JpaTRQAm{)=2M9Vq&;f!D5Ojc`0|Xr)=m0_ge@4(5{yOkcn7_`PxD$>7k>amI z|KIqZL;t6%^S}%LEB*IB(Emx20`MyTN_hhC)d-OPBo%3R*?*<~!t;MpoeVtBzY+k? z0eB9;a{!(L@Em~W06YiaIRMWAcn-jG0G%edJ;e`;X z{+jdujsKbRf0C3Dg2=zpf6e(niQ5dp;9n`%450}c@}Hz_gP`%R^j~xSPg42-g`2u& zi$MOb4#0B&o&)e4fad@_2jDpX&jEN2z;ghe1MnPx=Kwqh;5h)#0eB9;a{!(L@Em~W z06YiaIRMWAcn-jG0GYg{k3$qnwVT30L_r3F{l8~N)gs-%LjG@w z!v8%xb@33_<6JfhtHEzN{&NTlHZN#M*-?5SVckFG9;NFnaRvtA_+nO6CfdzKnNg)5`NUQ zR1B1AMO*n%T3y%_3tg=szl!T(Rf0o(6qLf2Hf3%3Wf2i60RaVp5PDW55D@LwZWoa% zu2vNHd1fYXpUc(LKlYsb^Y)zkhv)nGKKHrbx%ZO%@yejqQR}F6)H-S%wT@axt)tda z>!@|qI%*xYj#@{pqt;RDsCCpjY8|zXT1Ty;)=}%Ib<{d)9kq^HN3EmQQR}F6)H-S% zwT@axt)tda>!@|qI%*xYj#@{pqt;RDsCCpjYQ4kMdYSa+e;?qx-rGm2_0*A4>#9`y zJKqgjDXG>~Nvd^Id}EVupjJ{4n_x~gVDk0V017#7#)lb zMhByV(ZT3obTB#?9gGe}2cv`0!RTOgFgh3=j1EQzql3}G=wNg(Iv5>{4n_x~gVDk0 zV017#7`?+VdbzaYp?QH3-hL9Jr;ZdxSEbfSuxmW8AV>V+f+tVQBvrb~9LWoI6>}~I zN`00!CW(6&y6Q#znqXeK3a!6JhQ>x+Iq`EVLfS&0bI>{H9CQvk2c3h?LFb@z&^hQF zbPhTPorBIn=b&@YIp`d84mt;&gU&(cpmWeU=p1woItQJD&Ozs(bI>{H9CQvk2c3h? zLFb@z&^hQFbPhTPorBIn=b&@YIp`d84mt;&gU&(cpmWeU=p1woI`1%aUXeuSUB&8^ zIoEk(Ql6)dlss2;DbGh~r6f34B?->I=CgEJt+}d8YhJCjLd+rN5Oat*#2jJ{F^8B# z%pv9wbBH;_9AXYJhnPdmA?6Tsh&jX@Vh%Bfm_y7V<`8p;Im8@d4l#$AL(C!O5Oat* z#2jJ{F^8B#%pv9wbBH;_9AXYJhnPdmA?6Tsh&jX@Vh%Bfm_y7V<`8p;ImEofh2g)7?H?Mhm6Ez#m7cB+jSzFILO!h?uL=!JPfyjWMM6Xo z*42AmANuj-$XKoW!|G7?WJ!M4dPJ1ggvzXSF|8(aJh6Dqh|mygWh-(F)RI&>Yn4qbD9l8!(hpt1{q3h6f=sI*A zx(;23u0z+M>(F)RI&>Yn4qbD9l8!(hpt1{ zJB+RmkO+P8nb0ur07=(VM~bei(y@uT!?jY9uB(!y>s`bnF?UaK-mSSLYgf4hYu|o%ZkcswN!G5)lC^gc(;LiyXx`xqSu+6lZUA?H zJHQ>_4sZv!1Ka`b0C#{pz#ZTYa0j>p+yU+YcYr&<9pDad2e<>=0qy{IfIGk);0|yH zxC7h)?f`dyJHQ>_4sZv!1Ka`b0C#{pz#ZTYa0j>p+yU+YcYr&<9pDad2e<>=0qy{I zfIGk);ND@ty;6$saCUg8w^9Q4)R6-2sxt+rO6?a+2;`+R6Sv>nnDK z+8@09QJ^L3D}~d?oVextbKUop#%sK#d&}nRTyprHciw$_>XS!yojyCiENjiOjL@pO zqTCD@Y?W- zc~9@jDI7NC$@J{}DL?NLzOe7q2Yc4EY@aZC>U+oc*G~Mdx3Y87pze3K&3NW${?-o< z{LlOo@2`5j_j||Ul?N_Xytw1U>P5Goe!dBG4mt;&Zv>r#&Ozs(bI>{H9CQvk2c3h? zLFb@z&^hQFbPhTPorBIn=b&@YIp`d84mt;&gU&(cpmWeU=p1woItQJD&Ozs(bI>{H z9CQvk2c3h?LFb@z&^hQFbPhTPorBIn=b&@YIp`d84mt;&|HJ5f%>NTQPjh7(@o_G5 z>*{**t-ACg`330@?lfz{dGc%3>&B$HB1RIWtHSY}=19jvtjQdCtwYE7E5KbeG?^7K zd!~5X@5ldY@!N%G?=y^TYtxKkBg?q*-&k?J$&AIi*tVjYri|`#X-T?aT=W=5AFXM% z7`scJ$*E~Y@iY4-%ZA)i!>HDpmWlPd%+cjeP3!;CZPt0YryVZCsMMP3Tg8T5W{DWP z+YCCM@5ERi+FUm*|)-ezP`3`^wXLy-0u;~wwhf?!@by{Bg8 zkEYF>R{y=S+4s%<)&%GCS#AWE(ObK!m7jRTYu9F$R6BH**yd5Bb?$kplX2Iy88fEU z59%-0oG^P<^svoD^;_>0{mjvDrbzR+^TmR>uAsVThjy{)6?xGaoioMcuV(cYbBAV` zmCniW)*Ge2w$a=knWE-ZbFkz7tT#!a);6nWrkIrHHbv8`X6UNkQrm3wN9X6eGlhSH z*;y<-Vwx4bY;#e)*170U&^tr3#H9UZ%(3mI`R}x@%rJ~+I~zu=w%s?rk|k<3n%9W# zrEb4??4Po8#KxCQ?-K{iK-ggeqVRy6>?fmbO$BPa4sq=c(jTU~Zp;$nHkqB{=T-#N z$7t{FC!dV->SRCrb5?wpFCx~Tkk3z%Z6+#p>5xpd-kB{XKOnE8{kCvQ-hNmnU!9sQ zLS^oLVn&M@sBnml@4ft%TUzAH<2w2B7^qDvG9z28Y48qK8+Pav3l7Q?-1g6@6U=Ki zeU3YRrdh_C>l3jaV*YY7=(rE-P1a4@NA=8XvGD;jBIX}5Lsy-mtbKIf$?=L^hs?g= zKDM!`L}F~e{Wq^DUmzDMKWyeX#u77I@rYN9Yc^9eb6D+5X7=ahsopye%6rP8H#xPE zClawCj)}y;)`&zRH86*Tw7X3oSk6=4cv>VPns@jD>Rz>X$867Ki8k)oV4qmC$jnbZ zmnF7gs$T1JslWdp+~gB=ulvi@E#uHB3R>j7aQ_yc=zi2J7U#;`-o%X=cFI1gvKwEp zX4_iK+zN;6_>uqX+1F3r#5c>MLc5w-+Y$>5a%{8SbNY)r_@Ym=_}uyJ53K#9W_O13dE{5dEYsuma5d^*ZrdYVxUTWWDX(i z1J_@rQ;zvXP1IG;zFT{DMf+|a{+EEbd5KvdHmuAEt1ZWDTUN=$me0Hw5NlL2=V3GB z@_WW9p4j`b4-)aPsQXW|sKO!kCA;5pAs|i%+?RK6@9r=6wCN2wptg8Uys1ZC^5s}= z+qp^wkIPiKKPb*TB7X*He>plO?@`Gfp zms<+LPN|z)WomKW7`)2rgv&)18g%>sl?1y4-AQ>rDk68&FB^(A9^YII0UZjjfeUWaN{_V!9Sg*hk8{Olcn z3K`SyuAeshZZSD4y-+=em9~k=toHiTpF{t5bK`TfyCm+sFY5mE;IBUa5BYCxUeGXx zX`kn(lXK%|N{Yl!PMX&aaXPW}b=6&K?Kv$swewl=Gb{4dRoWLAD6cZ{#v0`gi*9XZ z|8SM<+EgO(?5}(vEDBxj!pl#PQ*yt0`z>1-79qF%%UwI&?rbrsF_Nz?+aa!fKKjrq z7lp-wQ)a)b_EXiq<2wo?Puv(yykZC2_N+3AJwLZ1B5F>Xl@$(&@kI^Q8yBS+MyC9! zP@nm_Rf)E+n6xKarpD&bE^-##Wk-ddmiRJZ=p zxrsCV&iYHa%=CR(W(Mqz zit1kOF5(xx+{u4Wz99XmN*C{oijCK~%f-o;&1)*IUUQ4~tIYM#aW&6{kP<^zM53N;2dxCranking Settings dialog = crankingDialog, "Cranking Settings" field = "Cranking RPM limit", cranking_rpm - field = "Enable cylinder cleanup", isCylinderCleanupEnabled + field = "Enable flood clear", isCylinderCleanupEnabled field = "" field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled panel = primingFuelPulsePanel diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 6b53e0938e..71d18b6405 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.21.frankenso_na6.1747032382" + signature = "rusEFI 2021.05.21.frankenso_na6.1728073565" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.21.frankenso_na6.1747032382" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.21.frankenso_na6.1728073565" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 20 23:09:29 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri May 21 19:20:08 UTC 2021 pageSize = 20000 page = 1 @@ -3441,7 +3441,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = multisparkSettings, "Multispark" field = "#WARNING! These settings have the potential to overheat ignition components" field = "#and cause other nasty misbehavior. Use with care, at your own risk!" - field = "Enable Multiple Sparks", multisparkEnable + field = "#Not recommended for use on distributor or wasted spark ignition systems." + field = "Enable multiple sparks", multisparkEnable panel = multisparkMain panel = multisparkDwellParams @@ -4056,7 +4057,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit - field = "RPM dead zone", idlePidRpmDeadZone + field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" field = "Extra idle air if throttle pressed", iacByTpsTaper @@ -4069,7 +4070,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleSettings, "", yAxis field = "Idle control mode", idleMode - field = "! Solenoid idle control requires above zero RPM" + field = "! Solenoid idle control is disabled at zero RPM" slider = "Open loop idle position", manIdlePosition, horizontal field = "" @@ -4219,26 +4220,26 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Power region load", stft_minPowerLoad dialog = stftPartitionSettingsMain, "Main Region", xAxis - field = "Time Const", stft_cellCfgs4_timeConstant + field = "Time const", stft_cellCfgs4_timeConstant field = "Max add", stft_cellCfgs4_maxAdd field = "Max remove", stft_cellCfgs4_maxRemove dialog = stftPartitionSettingsIdle, "Idle Region", xAxis - field = "Time Const", stft_cellCfgs1_timeConstant + field = "Time const", stft_cellCfgs1_timeConstant field = "Max add", stft_cellCfgs1_maxAdd field = "Max remove", stft_cellCfgs1_maxRemove dialog = stftPartitionSettingsPower, "Power Region", xAxis - field = "Time Const", stft_cellCfgs3_timeConstant + field = "Time const", stft_cellCfgs3_timeConstant field = "Max add", stft_cellCfgs3_maxAdd field = "Max remove", stft_cellCfgs3_maxRemove dialog = stftPartitionSettingsOverrun, "Overrun Region", xAxis - field = "Time Const", stft_cellCfgs2_timeConstant + field = "Time const", stft_cellCfgs2_timeConstant field = "Max add", stft_cellCfgs2_maxAdd field = "Max remove", stft_cellCfgs2_maxRemove - dialog = fuelClosedLoopDialog, "Short-term fuel trim" + dialog = fuelClosedLoopDialog, "Closed loop fuel correction" field = "Enabled", fuelClosedLoopCorrectionEnabled field = "Startup delay" stft_startupDelay, {fuelClosedLoopCorrectionEnabled == 1} @@ -4497,7 +4498,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" field = "Cranking RPM limit", cranking_rpm - field = "Enable cylinder cleanup", isCylinderCleanupEnabled + field = "Enable flood clear", isCylinderCleanupEnabled field = "" field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled panel = primingFuelPulsePanel diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index ce5dd4e7dc..047f787f87 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.21.hellen121nissan.2550898484" + signature = "rusEFI 2021.05.21.hellen121nissan.2536130903" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.21.hellen121nissan.2550898484" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.21.hellen121nissan.2536130903" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 20 23:09:17 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri May 21 19:19:57 UTC 2021 pageSize = 20000 page = 1 @@ -3437,7 +3437,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = multisparkSettings, "Multispark" field = "#WARNING! These settings have the potential to overheat ignition components" field = "#and cause other nasty misbehavior. Use with care, at your own risk!" - field = "Enable Multiple Sparks", multisparkEnable + field = "#Not recommended for use on distributor or wasted spark ignition systems." + field = "Enable multiple sparks", multisparkEnable panel = multisparkMain panel = multisparkDwellParams @@ -4040,7 +4041,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit - field = "RPM dead zone", idlePidRpmDeadZone + field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" field = "Extra idle air if throttle pressed", iacByTpsTaper @@ -4053,7 +4054,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleSettings, "", yAxis field = "Idle control mode", idleMode - field = "! Solenoid idle control requires above zero RPM" + field = "! Solenoid idle control is disabled at zero RPM" slider = "Open loop idle position", manIdlePosition, horizontal field = "" @@ -4203,26 +4204,26 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Power region load", stft_minPowerLoad dialog = stftPartitionSettingsMain, "Main Region", xAxis - field = "Time Const", stft_cellCfgs4_timeConstant + field = "Time const", stft_cellCfgs4_timeConstant field = "Max add", stft_cellCfgs4_maxAdd field = "Max remove", stft_cellCfgs4_maxRemove dialog = stftPartitionSettingsIdle, "Idle Region", xAxis - field = "Time Const", stft_cellCfgs1_timeConstant + field = "Time const", stft_cellCfgs1_timeConstant field = "Max add", stft_cellCfgs1_maxAdd field = "Max remove", stft_cellCfgs1_maxRemove dialog = stftPartitionSettingsPower, "Power Region", xAxis - field = "Time Const", stft_cellCfgs3_timeConstant + field = "Time const", stft_cellCfgs3_timeConstant field = "Max add", stft_cellCfgs3_maxAdd field = "Max remove", stft_cellCfgs3_maxRemove dialog = stftPartitionSettingsOverrun, "Overrun Region", xAxis - field = "Time Const", stft_cellCfgs2_timeConstant + field = "Time const", stft_cellCfgs2_timeConstant field = "Max add", stft_cellCfgs2_maxAdd field = "Max remove", stft_cellCfgs2_maxRemove - dialog = fuelClosedLoopDialog, "Short-term fuel trim" + dialog = fuelClosedLoopDialog, "Closed loop fuel correction" field = "Enabled", fuelClosedLoopCorrectionEnabled field = "Startup delay" stft_startupDelay, {fuelClosedLoopCorrectionEnabled == 1} @@ -4473,7 +4474,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" field = "Cranking RPM limit", cranking_rpm - field = "Enable cylinder cleanup", isCylinderCleanupEnabled + field = "Enable flood clear", isCylinderCleanupEnabled field = "" field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled panel = primingFuelPulsePanel diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 0d9d8ccbc6..1fe171820b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.21.hellen121vag.185538087" + signature = "rusEFI 2021.05.21.hellen121vag.70172740" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.21.hellen121vag.185538087" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.21.hellen121vag.70172740" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri May 21 16:14:55 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri May 21 19:19:55 UTC 2021 pageSize = 20000 page = 1 @@ -3437,7 +3437,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = multisparkSettings, "Multispark" field = "#WARNING! These settings have the potential to overheat ignition components" field = "#and cause other nasty misbehavior. Use with care, at your own risk!" - field = "Enable Multiple Sparks", multisparkEnable + field = "#Not recommended for use on distributor or wasted spark ignition systems." + field = "Enable multiple sparks", multisparkEnable panel = multisparkMain panel = multisparkDwellParams @@ -4040,7 +4041,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit - field = "RPM dead zone", idlePidRpmDeadZone + field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" field = "Extra idle air if throttle pressed", iacByTpsTaper @@ -4053,7 +4054,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleSettings, "", yAxis field = "Idle control mode", idleMode - field = "! Solenoid idle control requires above zero RPM" + field = "! Solenoid idle control is disabled at zero RPM" slider = "Open loop idle position", manIdlePosition, horizontal field = "" @@ -4203,26 +4204,26 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Power region load", stft_minPowerLoad dialog = stftPartitionSettingsMain, "Main Region", xAxis - field = "Time Const", stft_cellCfgs4_timeConstant + field = "Time const", stft_cellCfgs4_timeConstant field = "Max add", stft_cellCfgs4_maxAdd field = "Max remove", stft_cellCfgs4_maxRemove dialog = stftPartitionSettingsIdle, "Idle Region", xAxis - field = "Time Const", stft_cellCfgs1_timeConstant + field = "Time const", stft_cellCfgs1_timeConstant field = "Max add", stft_cellCfgs1_maxAdd field = "Max remove", stft_cellCfgs1_maxRemove dialog = stftPartitionSettingsPower, "Power Region", xAxis - field = "Time Const", stft_cellCfgs3_timeConstant + field = "Time const", stft_cellCfgs3_timeConstant field = "Max add", stft_cellCfgs3_maxAdd field = "Max remove", stft_cellCfgs3_maxRemove dialog = stftPartitionSettingsOverrun, "Overrun Region", xAxis - field = "Time Const", stft_cellCfgs2_timeConstant + field = "Time const", stft_cellCfgs2_timeConstant field = "Max add", stft_cellCfgs2_maxAdd field = "Max remove", stft_cellCfgs2_maxRemove - dialog = fuelClosedLoopDialog, "Short-term fuel trim" + dialog = fuelClosedLoopDialog, "Closed loop fuel correction" field = "Enabled", fuelClosedLoopCorrectionEnabled field = "Startup delay" stft_startupDelay, {fuelClosedLoopCorrectionEnabled == 1} @@ -4473,7 +4474,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" field = "Cranking RPM limit", cranking_rpm - field = "Enable cylinder cleanup", isCylinderCleanupEnabled + field = "Enable flood clear", isCylinderCleanupEnabled field = "" field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled panel = primingFuelPulsePanel diff --git a/firmware/tunerstudio/generated/rusefi_hellen128.ini b/firmware/tunerstudio/generated/rusefi_hellen128.ini index c819840b92..d7b04ac130 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.21.hellen128.2811298787" + signature = "rusEFI 2021.05.21.hellen128.2830161280" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.21.hellen128.2811298787" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.21.hellen128.2830161280" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 20 23:09:13 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri May 21 19:19:53 UTC 2021 pageSize = 20000 page = 1 @@ -3437,7 +3437,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = multisparkSettings, "Multispark" field = "#WARNING! These settings have the potential to overheat ignition components" field = "#and cause other nasty misbehavior. Use with care, at your own risk!" - field = "Enable Multiple Sparks", multisparkEnable + field = "#Not recommended for use on distributor or wasted spark ignition systems." + field = "Enable multiple sparks", multisparkEnable panel = multisparkMain panel = multisparkDwellParams @@ -4040,7 +4041,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit - field = "RPM dead zone", idlePidRpmDeadZone + field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" field = "Extra idle air if throttle pressed", iacByTpsTaper @@ -4053,7 +4054,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleSettings, "", yAxis field = "Idle control mode", idleMode - field = "! Solenoid idle control requires above zero RPM" + field = "! Solenoid idle control is disabled at zero RPM" slider = "Open loop idle position", manIdlePosition, horizontal field = "" @@ -4203,26 +4204,26 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Power region load", stft_minPowerLoad dialog = stftPartitionSettingsMain, "Main Region", xAxis - field = "Time Const", stft_cellCfgs4_timeConstant + field = "Time const", stft_cellCfgs4_timeConstant field = "Max add", stft_cellCfgs4_maxAdd field = "Max remove", stft_cellCfgs4_maxRemove dialog = stftPartitionSettingsIdle, "Idle Region", xAxis - field = "Time Const", stft_cellCfgs1_timeConstant + field = "Time const", stft_cellCfgs1_timeConstant field = "Max add", stft_cellCfgs1_maxAdd field = "Max remove", stft_cellCfgs1_maxRemove dialog = stftPartitionSettingsPower, "Power Region", xAxis - field = "Time Const", stft_cellCfgs3_timeConstant + field = "Time const", stft_cellCfgs3_timeConstant field = "Max add", stft_cellCfgs3_maxAdd field = "Max remove", stft_cellCfgs3_maxRemove dialog = stftPartitionSettingsOverrun, "Overrun Region", xAxis - field = "Time Const", stft_cellCfgs2_timeConstant + field = "Time const", stft_cellCfgs2_timeConstant field = "Max add", stft_cellCfgs2_maxAdd field = "Max remove", stft_cellCfgs2_maxRemove - dialog = fuelClosedLoopDialog, "Short-term fuel trim" + dialog = fuelClosedLoopDialog, "Closed loop fuel correction" field = "Enabled", fuelClosedLoopCorrectionEnabled field = "Startup delay" stft_startupDelay, {fuelClosedLoopCorrectionEnabled == 1} @@ -4473,7 +4474,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" field = "Cranking RPM limit", cranking_rpm - field = "Enable cylinder cleanup", isCylinderCleanupEnabled + field = "Enable flood clear", isCylinderCleanupEnabled field = "" field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled panel = primingFuelPulsePanel diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index a205d2db2e..1c9b383fb6 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.21.hellen72.4271499404" + signature = "rusEFI 2021.05.21.hellen72.4055383791" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.21.hellen72.4271499404" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.21.hellen72.4055383791" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 20 23:09:20 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri May 21 19:19:59 UTC 2021 pageSize = 20000 page = 1 @@ -3437,7 +3437,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = multisparkSettings, "Multispark" field = "#WARNING! These settings have the potential to overheat ignition components" field = "#and cause other nasty misbehavior. Use with care, at your own risk!" - field = "Enable Multiple Sparks", multisparkEnable + field = "#Not recommended for use on distributor or wasted spark ignition systems." + field = "Enable multiple sparks", multisparkEnable panel = multisparkMain panel = multisparkDwellParams @@ -4040,7 +4041,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit - field = "RPM dead zone", idlePidRpmDeadZone + field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" field = "Extra idle air if throttle pressed", iacByTpsTaper @@ -4053,7 +4054,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleSettings, "", yAxis field = "Idle control mode", idleMode - field = "! Solenoid idle control requires above zero RPM" + field = "! Solenoid idle control is disabled at zero RPM" slider = "Open loop idle position", manIdlePosition, horizontal field = "" @@ -4203,26 +4204,26 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Power region load", stft_minPowerLoad dialog = stftPartitionSettingsMain, "Main Region", xAxis - field = "Time Const", stft_cellCfgs4_timeConstant + field = "Time const", stft_cellCfgs4_timeConstant field = "Max add", stft_cellCfgs4_maxAdd field = "Max remove", stft_cellCfgs4_maxRemove dialog = stftPartitionSettingsIdle, "Idle Region", xAxis - field = "Time Const", stft_cellCfgs1_timeConstant + field = "Time const", stft_cellCfgs1_timeConstant field = "Max add", stft_cellCfgs1_maxAdd field = "Max remove", stft_cellCfgs1_maxRemove dialog = stftPartitionSettingsPower, "Power Region", xAxis - field = "Time Const", stft_cellCfgs3_timeConstant + field = "Time const", stft_cellCfgs3_timeConstant field = "Max add", stft_cellCfgs3_maxAdd field = "Max remove", stft_cellCfgs3_maxRemove dialog = stftPartitionSettingsOverrun, "Overrun Region", xAxis - field = "Time Const", stft_cellCfgs2_timeConstant + field = "Time const", stft_cellCfgs2_timeConstant field = "Max add", stft_cellCfgs2_maxAdd field = "Max remove", stft_cellCfgs2_maxRemove - dialog = fuelClosedLoopDialog, "Short-term fuel trim" + dialog = fuelClosedLoopDialog, "Closed loop fuel correction" field = "Enabled", fuelClosedLoopCorrectionEnabled field = "Startup delay" stft_startupDelay, {fuelClosedLoopCorrectionEnabled == 1} @@ -4473,7 +4474,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" field = "Cranking RPM limit", cranking_rpm - field = "Enable cylinder cleanup", isCylinderCleanupEnabled + field = "Enable flood clear", isCylinderCleanupEnabled field = "" field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled panel = primingFuelPulsePanel diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 571fff18b6..b965ac088d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.21.hellenNA6.3152763845" + signature = "rusEFI 2021.05.21.hellenNA6.3033173414" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.21.hellenNA6.3152763845" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.21.hellenNA6.3033173414" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 20 23:09:23 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri May 21 19:20:01 UTC 2021 pageSize = 20000 page = 1 @@ -3437,7 +3437,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = multisparkSettings, "Multispark" field = "#WARNING! These settings have the potential to overheat ignition components" field = "#and cause other nasty misbehavior. Use with care, at your own risk!" - field = "Enable Multiple Sparks", multisparkEnable + field = "#Not recommended for use on distributor or wasted spark ignition systems." + field = "Enable multiple sparks", multisparkEnable panel = multisparkMain panel = multisparkDwellParams @@ -4040,7 +4041,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit - field = "RPM dead zone", idlePidRpmDeadZone + field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" field = "Extra idle air if throttle pressed", iacByTpsTaper @@ -4053,7 +4054,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleSettings, "", yAxis field = "Idle control mode", idleMode - field = "! Solenoid idle control requires above zero RPM" + field = "! Solenoid idle control is disabled at zero RPM" slider = "Open loop idle position", manIdlePosition, horizontal field = "" @@ -4203,26 +4204,26 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Power region load", stft_minPowerLoad dialog = stftPartitionSettingsMain, "Main Region", xAxis - field = "Time Const", stft_cellCfgs4_timeConstant + field = "Time const", stft_cellCfgs4_timeConstant field = "Max add", stft_cellCfgs4_maxAdd field = "Max remove", stft_cellCfgs4_maxRemove dialog = stftPartitionSettingsIdle, "Idle Region", xAxis - field = "Time Const", stft_cellCfgs1_timeConstant + field = "Time const", stft_cellCfgs1_timeConstant field = "Max add", stft_cellCfgs1_maxAdd field = "Max remove", stft_cellCfgs1_maxRemove dialog = stftPartitionSettingsPower, "Power Region", xAxis - field = "Time Const", stft_cellCfgs3_timeConstant + field = "Time const", stft_cellCfgs3_timeConstant field = "Max add", stft_cellCfgs3_maxAdd field = "Max remove", stft_cellCfgs3_maxRemove dialog = stftPartitionSettingsOverrun, "Overrun Region", xAxis - field = "Time Const", stft_cellCfgs2_timeConstant + field = "Time const", stft_cellCfgs2_timeConstant field = "Max add", stft_cellCfgs2_maxAdd field = "Max remove", stft_cellCfgs2_maxRemove - dialog = fuelClosedLoopDialog, "Short-term fuel trim" + dialog = fuelClosedLoopDialog, "Closed loop fuel correction" field = "Enabled", fuelClosedLoopCorrectionEnabled field = "Startup delay" stft_startupDelay, {fuelClosedLoopCorrectionEnabled == 1} @@ -4473,7 +4474,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" field = "Cranking RPM limit", cranking_rpm - field = "Enable cylinder cleanup", isCylinderCleanupEnabled + field = "Enable flood clear", isCylinderCleanupEnabled field = "" field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled panel = primingFuelPulsePanel diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index e4ded30159..6ebcf7af72 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.21.hellen_cypress.303287511" + signature = "rusEFI 2021.05.21.hellen_cypress.489822900" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.21.hellen_cypress.303287511" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.21.hellen_cypress.489822900" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu May 20 23:09:41 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Fri May 21 19:20:19 UTC 2021 pageSize = 20000 page = 1 @@ -3441,7 +3441,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = multisparkSettings, "Multispark" field = "#WARNING! These settings have the potential to overheat ignition components" field = "#and cause other nasty misbehavior. Use with care, at your own risk!" - field = "Enable Multiple Sparks", multisparkEnable + field = "#Not recommended for use on distributor or wasted spark ignition systems." + field = "Enable multiple sparks", multisparkEnable panel = multisparkMain panel = multisparkDwellParams @@ -4056,7 +4057,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit - field = "RPM dead zone", idlePidRpmDeadZone + field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" field = "Extra idle air if throttle pressed", iacByTpsTaper @@ -4069,7 +4070,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleSettings, "", yAxis field = "Idle control mode", idleMode - field = "! Solenoid idle control requires above zero RPM" + field = "! Solenoid idle control is disabled at zero RPM" slider = "Open loop idle position", manIdlePosition, horizontal field = "" @@ -4219,26 +4220,26 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Power region load", stft_minPowerLoad dialog = stftPartitionSettingsMain, "Main Region", xAxis - field = "Time Const", stft_cellCfgs4_timeConstant + field = "Time const", stft_cellCfgs4_timeConstant field = "Max add", stft_cellCfgs4_maxAdd field = "Max remove", stft_cellCfgs4_maxRemove dialog = stftPartitionSettingsIdle, "Idle Region", xAxis - field = "Time Const", stft_cellCfgs1_timeConstant + field = "Time const", stft_cellCfgs1_timeConstant field = "Max add", stft_cellCfgs1_maxAdd field = "Max remove", stft_cellCfgs1_maxRemove dialog = stftPartitionSettingsPower, "Power Region", xAxis - field = "Time Const", stft_cellCfgs3_timeConstant + field = "Time const", stft_cellCfgs3_timeConstant field = "Max add", stft_cellCfgs3_maxAdd field = "Max remove", stft_cellCfgs3_maxRemove dialog = stftPartitionSettingsOverrun, "Overrun Region", xAxis - field = "Time Const", stft_cellCfgs2_timeConstant + field = "Time const", stft_cellCfgs2_timeConstant field = "Max add", stft_cellCfgs2_maxAdd field = "Max remove", stft_cellCfgs2_maxRemove - dialog = fuelClosedLoopDialog, "Short-term fuel trim" + dialog = fuelClosedLoopDialog, "Closed loop fuel correction" field = "Enabled", fuelClosedLoopCorrectionEnabled field = "Startup delay" stft_startupDelay, {fuelClosedLoopCorrectionEnabled == 1} @@ -4497,7 +4498,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" field = "Cranking RPM limit", cranking_rpm - field = "Enable cylinder cleanup", isCylinderCleanupEnabled + field = "Enable flood clear", isCylinderCleanupEnabled field = "" field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled panel = primingFuelPulsePanel diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index f591d2a86c..9e96643fb3 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.21.kin.3988127787" + signature = "rusEFI 2021.05.21.kin.3801601608" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.21.kin.3988127787" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.21.kin.3801601608" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu May 20 23:09:39 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri May 21 19:20:18 UTC 2021 pageSize = 19972 page = 1 @@ -3423,7 +3423,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = multisparkSettings, "Multispark" field = "#WARNING! These settings have the potential to overheat ignition components" field = "#and cause other nasty misbehavior. Use with care, at your own risk!" - field = "Enable Multiple Sparks", multisparkEnable + field = "#Not recommended for use on distributor or wasted spark ignition systems." + field = "Enable multiple sparks", multisparkEnable panel = multisparkMain panel = multisparkDwellParams @@ -4038,7 +4039,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit - field = "RPM dead zone", idlePidRpmDeadZone + field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" field = "Extra idle air if throttle pressed", iacByTpsTaper @@ -4051,7 +4052,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleSettings, "", yAxis field = "Idle control mode", idleMode - field = "! Solenoid idle control requires above zero RPM" + field = "! Solenoid idle control is disabled at zero RPM" slider = "Open loop idle position", manIdlePosition, horizontal field = "" @@ -4201,26 +4202,26 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Power region load", stft_minPowerLoad dialog = stftPartitionSettingsMain, "Main Region", xAxis - field = "Time Const", stft_cellCfgs4_timeConstant + field = "Time const", stft_cellCfgs4_timeConstant field = "Max add", stft_cellCfgs4_maxAdd field = "Max remove", stft_cellCfgs4_maxRemove dialog = stftPartitionSettingsIdle, "Idle Region", xAxis - field = "Time Const", stft_cellCfgs1_timeConstant + field = "Time const", stft_cellCfgs1_timeConstant field = "Max add", stft_cellCfgs1_maxAdd field = "Max remove", stft_cellCfgs1_maxRemove dialog = stftPartitionSettingsPower, "Power Region", xAxis - field = "Time Const", stft_cellCfgs3_timeConstant + field = "Time const", stft_cellCfgs3_timeConstant field = "Max add", stft_cellCfgs3_maxAdd field = "Max remove", stft_cellCfgs3_maxRemove dialog = stftPartitionSettingsOverrun, "Overrun Region", xAxis - field = "Time Const", stft_cellCfgs2_timeConstant + field = "Time const", stft_cellCfgs2_timeConstant field = "Max add", stft_cellCfgs2_maxAdd field = "Max remove", stft_cellCfgs2_maxRemove - dialog = fuelClosedLoopDialog, "Short-term fuel trim" + dialog = fuelClosedLoopDialog, "Closed loop fuel correction" field = "Enabled", fuelClosedLoopCorrectionEnabled field = "Startup delay" stft_startupDelay, {fuelClosedLoopCorrectionEnabled == 1} @@ -4479,7 +4480,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" field = "Cranking RPM limit", cranking_rpm - field = "Enable cylinder cleanup", isCylinderCleanupEnabled + field = "Enable flood clear", isCylinderCleanupEnabled field = "" field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled panel = primingFuelPulsePanel diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 264995b6ad..891bd19271 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.21.mre_f4.201478734" + signature = "rusEFI 2021.05.21.mre_f4.52659245" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.21.mre_f4.201478734" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.21.mre_f4.52659245" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 20 23:09:27 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri May 21 19:20:06 UTC 2021 pageSize = 20000 page = 1 @@ -3437,7 +3437,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = multisparkSettings, "Multispark" field = "#WARNING! These settings have the potential to overheat ignition components" field = "#and cause other nasty misbehavior. Use with care, at your own risk!" - field = "Enable Multiple Sparks", multisparkEnable + field = "#Not recommended for use on distributor or wasted spark ignition systems." + field = "Enable multiple sparks", multisparkEnable panel = multisparkMain panel = multisparkDwellParams @@ -4040,7 +4041,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit - field = "RPM dead zone", idlePidRpmDeadZone + field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" field = "Extra idle air if throttle pressed", iacByTpsTaper @@ -4053,7 +4054,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleSettings, "", yAxis field = "Idle control mode", idleMode - field = "! Solenoid idle control requires above zero RPM" + field = "! Solenoid idle control is disabled at zero RPM" slider = "Open loop idle position", manIdlePosition, horizontal field = "" @@ -4202,26 +4203,26 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Power region load", stft_minPowerLoad dialog = stftPartitionSettingsMain, "Main Region", xAxis - field = "Time Const", stft_cellCfgs4_timeConstant + field = "Time const", stft_cellCfgs4_timeConstant field = "Max add", stft_cellCfgs4_maxAdd field = "Max remove", stft_cellCfgs4_maxRemove dialog = stftPartitionSettingsIdle, "Idle Region", xAxis - field = "Time Const", stft_cellCfgs1_timeConstant + field = "Time const", stft_cellCfgs1_timeConstant field = "Max add", stft_cellCfgs1_maxAdd field = "Max remove", stft_cellCfgs1_maxRemove dialog = stftPartitionSettingsPower, "Power Region", xAxis - field = "Time Const", stft_cellCfgs3_timeConstant + field = "Time const", stft_cellCfgs3_timeConstant field = "Max add", stft_cellCfgs3_maxAdd field = "Max remove", stft_cellCfgs3_maxRemove dialog = stftPartitionSettingsOverrun, "Overrun Region", xAxis - field = "Time Const", stft_cellCfgs2_timeConstant + field = "Time const", stft_cellCfgs2_timeConstant field = "Max add", stft_cellCfgs2_maxAdd field = "Max remove", stft_cellCfgs2_maxRemove - dialog = fuelClosedLoopDialog, "Short-term fuel trim" + dialog = fuelClosedLoopDialog, "Closed loop fuel correction" field = "Enabled", fuelClosedLoopCorrectionEnabled field = "Startup delay" stft_startupDelay, {fuelClosedLoopCorrectionEnabled == 1} @@ -4472,7 +4473,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" field = "Cranking RPM limit", cranking_rpm - field = "Enable cylinder cleanup", isCylinderCleanupEnabled + field = "Enable flood clear", isCylinderCleanupEnabled field = "" field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled panel = primingFuelPulsePanel diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index a8576aa6d0..07b67c3d65 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.21.mre_f7.201478734" + signature = "rusEFI 2021.05.21.mre_f7.52659245" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.21.mre_f7.201478734" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.21.mre_f7.52659245" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 20 23:09:25 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri May 21 19:20:04 UTC 2021 pageSize = 20000 page = 1 @@ -3437,7 +3437,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = multisparkSettings, "Multispark" field = "#WARNING! These settings have the potential to overheat ignition components" field = "#and cause other nasty misbehavior. Use with care, at your own risk!" - field = "Enable Multiple Sparks", multisparkEnable + field = "#Not recommended for use on distributor or wasted spark ignition systems." + field = "Enable multiple sparks", multisparkEnable panel = multisparkMain panel = multisparkDwellParams @@ -4040,7 +4041,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit - field = "RPM dead zone", idlePidRpmDeadZone + field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" field = "Extra idle air if throttle pressed", iacByTpsTaper @@ -4053,7 +4054,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleSettings, "", yAxis field = "Idle control mode", idleMode - field = "! Solenoid idle control requires above zero RPM" + field = "! Solenoid idle control is disabled at zero RPM" slider = "Open loop idle position", manIdlePosition, horizontal field = "" @@ -4202,26 +4203,26 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Power region load", stft_minPowerLoad dialog = stftPartitionSettingsMain, "Main Region", xAxis - field = "Time Const", stft_cellCfgs4_timeConstant + field = "Time const", stft_cellCfgs4_timeConstant field = "Max add", stft_cellCfgs4_maxAdd field = "Max remove", stft_cellCfgs4_maxRemove dialog = stftPartitionSettingsIdle, "Idle Region", xAxis - field = "Time Const", stft_cellCfgs1_timeConstant + field = "Time const", stft_cellCfgs1_timeConstant field = "Max add", stft_cellCfgs1_maxAdd field = "Max remove", stft_cellCfgs1_maxRemove dialog = stftPartitionSettingsPower, "Power Region", xAxis - field = "Time Const", stft_cellCfgs3_timeConstant + field = "Time const", stft_cellCfgs3_timeConstant field = "Max add", stft_cellCfgs3_maxAdd field = "Max remove", stft_cellCfgs3_maxRemove dialog = stftPartitionSettingsOverrun, "Overrun Region", xAxis - field = "Time Const", stft_cellCfgs2_timeConstant + field = "Time const", stft_cellCfgs2_timeConstant field = "Max add", stft_cellCfgs2_maxAdd field = "Max remove", stft_cellCfgs2_maxRemove - dialog = fuelClosedLoopDialog, "Short-term fuel trim" + dialog = fuelClosedLoopDialog, "Closed loop fuel correction" field = "Enabled", fuelClosedLoopCorrectionEnabled field = "Startup delay" stft_startupDelay, {fuelClosedLoopCorrectionEnabled == 1} @@ -4472,7 +4473,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" field = "Cranking RPM limit", cranking_rpm - field = "Enable cylinder cleanup", isCylinderCleanupEnabled + field = "Enable flood clear", isCylinderCleanupEnabled field = "" field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled panel = primingFuelPulsePanel diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 948a50dd2e..fb93073a59 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.21.prometheus_405.1123620145" + signature = "rusEFI 2021.05.21.prometheus_405.1306051410" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.21.prometheus_405.1123620145" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.21.prometheus_405.1306051410" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 20 23:09:33 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri May 21 19:20:12 UTC 2021 pageSize = 20000 page = 1 @@ -3436,7 +3436,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = multisparkSettings, "Multispark" field = "#WARNING! These settings have the potential to overheat ignition components" field = "#and cause other nasty misbehavior. Use with care, at your own risk!" - field = "Enable Multiple Sparks", multisparkEnable + field = "#Not recommended for use on distributor or wasted spark ignition systems." + field = "Enable multiple sparks", multisparkEnable panel = multisparkMain panel = multisparkDwellParams @@ -4051,7 +4052,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit - field = "RPM dead zone", idlePidRpmDeadZone + field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" field = "Extra idle air if throttle pressed", iacByTpsTaper @@ -4064,7 +4065,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleSettings, "", yAxis field = "Idle control mode", idleMode - field = "! Solenoid idle control requires above zero RPM" + field = "! Solenoid idle control is disabled at zero RPM" slider = "Open loop idle position", manIdlePosition, horizontal field = "" @@ -4214,26 +4215,26 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Power region load", stft_minPowerLoad dialog = stftPartitionSettingsMain, "Main Region", xAxis - field = "Time Const", stft_cellCfgs4_timeConstant + field = "Time const", stft_cellCfgs4_timeConstant field = "Max add", stft_cellCfgs4_maxAdd field = "Max remove", stft_cellCfgs4_maxRemove dialog = stftPartitionSettingsIdle, "Idle Region", xAxis - field = "Time Const", stft_cellCfgs1_timeConstant + field = "Time const", stft_cellCfgs1_timeConstant field = "Max add", stft_cellCfgs1_maxAdd field = "Max remove", stft_cellCfgs1_maxRemove dialog = stftPartitionSettingsPower, "Power Region", xAxis - field = "Time Const", stft_cellCfgs3_timeConstant + field = "Time const", stft_cellCfgs3_timeConstant field = "Max add", stft_cellCfgs3_maxAdd field = "Max remove", stft_cellCfgs3_maxRemove dialog = stftPartitionSettingsOverrun, "Overrun Region", xAxis - field = "Time Const", stft_cellCfgs2_timeConstant + field = "Time const", stft_cellCfgs2_timeConstant field = "Max add", stft_cellCfgs2_maxAdd field = "Max remove", stft_cellCfgs2_maxRemove - dialog = fuelClosedLoopDialog, "Short-term fuel trim" + dialog = fuelClosedLoopDialog, "Closed loop fuel correction" field = "Enabled", fuelClosedLoopCorrectionEnabled field = "Startup delay" stft_startupDelay, {fuelClosedLoopCorrectionEnabled == 1} @@ -4492,7 +4493,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" field = "Cranking RPM limit", cranking_rpm - field = "Enable cylinder cleanup", isCylinderCleanupEnabled + field = "Enable flood clear", isCylinderCleanupEnabled field = "" field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled panel = primingFuelPulsePanel diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 7f97b86bec..d898675d3a 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.21.prometheus_469.1123620145" + signature = "rusEFI 2021.05.21.prometheus_469.1306051410" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.21.prometheus_469.1123620145" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.21.prometheus_469.1306051410" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 20 23:09:31 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri May 21 19:20:10 UTC 2021 pageSize = 20000 page = 1 @@ -3436,7 +3436,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = multisparkSettings, "Multispark" field = "#WARNING! These settings have the potential to overheat ignition components" field = "#and cause other nasty misbehavior. Use with care, at your own risk!" - field = "Enable Multiple Sparks", multisparkEnable + field = "#Not recommended for use on distributor or wasted spark ignition systems." + field = "Enable multiple sparks", multisparkEnable panel = multisparkMain panel = multisparkDwellParams @@ -4051,7 +4052,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit - field = "RPM dead zone", idlePidRpmDeadZone + field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" field = "Extra idle air if throttle pressed", iacByTpsTaper @@ -4064,7 +4065,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleSettings, "", yAxis field = "Idle control mode", idleMode - field = "! Solenoid idle control requires above zero RPM" + field = "! Solenoid idle control is disabled at zero RPM" slider = "Open loop idle position", manIdlePosition, horizontal field = "" @@ -4214,26 +4215,26 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Power region load", stft_minPowerLoad dialog = stftPartitionSettingsMain, "Main Region", xAxis - field = "Time Const", stft_cellCfgs4_timeConstant + field = "Time const", stft_cellCfgs4_timeConstant field = "Max add", stft_cellCfgs4_maxAdd field = "Max remove", stft_cellCfgs4_maxRemove dialog = stftPartitionSettingsIdle, "Idle Region", xAxis - field = "Time Const", stft_cellCfgs1_timeConstant + field = "Time const", stft_cellCfgs1_timeConstant field = "Max add", stft_cellCfgs1_maxAdd field = "Max remove", stft_cellCfgs1_maxRemove dialog = stftPartitionSettingsPower, "Power Region", xAxis - field = "Time Const", stft_cellCfgs3_timeConstant + field = "Time const", stft_cellCfgs3_timeConstant field = "Max add", stft_cellCfgs3_maxAdd field = "Max remove", stft_cellCfgs3_maxRemove dialog = stftPartitionSettingsOverrun, "Overrun Region", xAxis - field = "Time Const", stft_cellCfgs2_timeConstant + field = "Time const", stft_cellCfgs2_timeConstant field = "Max add", stft_cellCfgs2_maxAdd field = "Max remove", stft_cellCfgs2_maxRemove - dialog = fuelClosedLoopDialog, "Short-term fuel trim" + dialog = fuelClosedLoopDialog, "Closed loop fuel correction" field = "Enabled", fuelClosedLoopCorrectionEnabled field = "Startup delay" stft_startupDelay, {fuelClosedLoopCorrectionEnabled == 1} @@ -4492,7 +4493,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" field = "Cranking RPM limit", cranking_rpm - field = "Enable cylinder cleanup", isCylinderCleanupEnabled + field = "Enable flood clear", isCylinderCleanupEnabled field = "" field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled panel = primingFuelPulsePanel diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 4faf573077..28fd108bf5 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.21.proteus_f4.970566172" + signature = "rusEFI 2021.05.21.proteus_f4.922254463" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.21.proteus_f4.970566172" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.21.proteus_f4.922254463" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 20 23:09:37 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri May 21 19:20:16 UTC 2021 pageSize = 20000 page = 1 @@ -3433,7 +3433,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = multisparkSettings, "Multispark" field = "#WARNING! These settings have the potential to overheat ignition components" field = "#and cause other nasty misbehavior. Use with care, at your own risk!" - field = "Enable Multiple Sparks", multisparkEnable + field = "#Not recommended for use on distributor or wasted spark ignition systems." + field = "Enable multiple sparks", multisparkEnable panel = multisparkMain panel = multisparkDwellParams @@ -4033,7 +4034,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit - field = "RPM dead zone", idlePidRpmDeadZone + field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" field = "Extra idle air if throttle pressed", iacByTpsTaper @@ -4046,7 +4047,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleSettings, "", yAxis field = "Idle control mode", idleMode - field = "! Solenoid idle control requires above zero RPM" + field = "! Solenoid idle control is disabled at zero RPM" slider = "Open loop idle position", manIdlePosition, horizontal field = "" @@ -4196,26 +4197,26 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Power region load", stft_minPowerLoad dialog = stftPartitionSettingsMain, "Main Region", xAxis - field = "Time Const", stft_cellCfgs4_timeConstant + field = "Time const", stft_cellCfgs4_timeConstant field = "Max add", stft_cellCfgs4_maxAdd field = "Max remove", stft_cellCfgs4_maxRemove dialog = stftPartitionSettingsIdle, "Idle Region", xAxis - field = "Time Const", stft_cellCfgs1_timeConstant + field = "Time const", stft_cellCfgs1_timeConstant field = "Max add", stft_cellCfgs1_maxAdd field = "Max remove", stft_cellCfgs1_maxRemove dialog = stftPartitionSettingsPower, "Power Region", xAxis - field = "Time Const", stft_cellCfgs3_timeConstant + field = "Time const", stft_cellCfgs3_timeConstant field = "Max add", stft_cellCfgs3_maxAdd field = "Max remove", stft_cellCfgs3_maxRemove dialog = stftPartitionSettingsOverrun, "Overrun Region", xAxis - field = "Time Const", stft_cellCfgs2_timeConstant + field = "Time const", stft_cellCfgs2_timeConstant field = "Max add", stft_cellCfgs2_maxAdd field = "Max remove", stft_cellCfgs2_maxRemove - dialog = fuelClosedLoopDialog, "Short-term fuel trim" + dialog = fuelClosedLoopDialog, "Closed loop fuel correction" field = "Enabled", fuelClosedLoopCorrectionEnabled field = "Startup delay" stft_startupDelay, {fuelClosedLoopCorrectionEnabled == 1} @@ -4464,7 +4465,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" field = "Cranking RPM limit", cranking_rpm - field = "Enable cylinder cleanup", isCylinderCleanupEnabled + field = "Enable flood clear", isCylinderCleanupEnabled field = "" field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled panel = primingFuelPulsePanel diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 24fedf733c..356e6685ed 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.21.proteus_f7.970566172" + signature = "rusEFI 2021.05.21.proteus_f7.922254463" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.21.proteus_f7.970566172" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.21.proteus_f7.922254463" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 20 23:09:35 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri May 21 19:20:13 UTC 2021 pageSize = 20000 page = 1 @@ -3433,7 +3433,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = multisparkSettings, "Multispark" field = "#WARNING! These settings have the potential to overheat ignition components" field = "#and cause other nasty misbehavior. Use with care, at your own risk!" - field = "Enable Multiple Sparks", multisparkEnable + field = "#Not recommended for use on distributor or wasted spark ignition systems." + field = "Enable multiple sparks", multisparkEnable panel = multisparkMain panel = multisparkDwellParams @@ -4033,7 +4034,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit - field = "RPM dead zone", idlePidRpmDeadZone + field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" field = "Extra idle air if throttle pressed", iacByTpsTaper @@ -4046,7 +4047,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleSettings, "", yAxis field = "Idle control mode", idleMode - field = "! Solenoid idle control requires above zero RPM" + field = "! Solenoid idle control is disabled at zero RPM" slider = "Open loop idle position", manIdlePosition, horizontal field = "" @@ -4196,26 +4197,26 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Power region load", stft_minPowerLoad dialog = stftPartitionSettingsMain, "Main Region", xAxis - field = "Time Const", stft_cellCfgs4_timeConstant + field = "Time const", stft_cellCfgs4_timeConstant field = "Max add", stft_cellCfgs4_maxAdd field = "Max remove", stft_cellCfgs4_maxRemove dialog = stftPartitionSettingsIdle, "Idle Region", xAxis - field = "Time Const", stft_cellCfgs1_timeConstant + field = "Time const", stft_cellCfgs1_timeConstant field = "Max add", stft_cellCfgs1_maxAdd field = "Max remove", stft_cellCfgs1_maxRemove dialog = stftPartitionSettingsPower, "Power Region", xAxis - field = "Time Const", stft_cellCfgs3_timeConstant + field = "Time const", stft_cellCfgs3_timeConstant field = "Max add", stft_cellCfgs3_maxAdd field = "Max remove", stft_cellCfgs3_maxRemove dialog = stftPartitionSettingsOverrun, "Overrun Region", xAxis - field = "Time Const", stft_cellCfgs2_timeConstant + field = "Time const", stft_cellCfgs2_timeConstant field = "Max add", stft_cellCfgs2_maxAdd field = "Max remove", stft_cellCfgs2_maxRemove - dialog = fuelClosedLoopDialog, "Short-term fuel trim" + dialog = fuelClosedLoopDialog, "Closed loop fuel correction" field = "Enabled", fuelClosedLoopCorrectionEnabled field = "Startup delay" stft_startupDelay, {fuelClosedLoopCorrectionEnabled == 1} @@ -4464,7 +4465,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" field = "Cranking RPM limit", cranking_rpm - field = "Enable cylinder cleanup", isCylinderCleanupEnabled + field = "Enable flood clear", isCylinderCleanupEnabled field = "" field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled panel = primingFuelPulsePanel diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index ec4f5c2492..5e291f2c22 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.05.21.subaru_eg33_f7.3285683705" + signature = "rusEFI 2021.05.21.subaru_eg33_f7.3438697370" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.05.21.subaru_eg33_f7.3285683705" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.05.21.subaru_eg33_f7.3438697370" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Thu May 20 23:09:43 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Fri May 21 19:20:21 UTC 2021 pageSize = 20000 page = 1 @@ -3437,7 +3437,8 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = multisparkSettings, "Multispark" field = "#WARNING! These settings have the potential to overheat ignition components" field = "#and cause other nasty misbehavior. Use with care, at your own risk!" - field = "Enable Multiple Sparks", multisparkEnable + field = "#Not recommended for use on distributor or wasted spark ignition systems." + field = "Enable multiple sparks", multisparkEnable panel = multisparkMain panel = multisparkDwellParams @@ -4050,7 +4051,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleGating, "Idle Detection Thresholds" field = "TPS threshold", idlePidDeactivationTpsThreshold field = "RPM upper limit", idlePidRpmUpperLimit - field = "RPM dead zone", idlePidRpmDeadZone + field = "RPM deadzone", idlePidRpmDeadZone dialog = idleExtra, "Extra Idle Features" field = "Extra idle air if throttle pressed", iacByTpsTaper @@ -4063,7 +4064,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = idleSettings, "", yAxis field = "Idle control mode", idleMode - field = "! Solenoid idle control requires above zero RPM" + field = "! Solenoid idle control is disabled at zero RPM" slider = "Open loop idle position", manIdlePosition, horizontal field = "" @@ -4213,26 +4214,26 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Power region load", stft_minPowerLoad dialog = stftPartitionSettingsMain, "Main Region", xAxis - field = "Time Const", stft_cellCfgs4_timeConstant + field = "Time const", stft_cellCfgs4_timeConstant field = "Max add", stft_cellCfgs4_maxAdd field = "Max remove", stft_cellCfgs4_maxRemove dialog = stftPartitionSettingsIdle, "Idle Region", xAxis - field = "Time Const", stft_cellCfgs1_timeConstant + field = "Time const", stft_cellCfgs1_timeConstant field = "Max add", stft_cellCfgs1_maxAdd field = "Max remove", stft_cellCfgs1_maxRemove dialog = stftPartitionSettingsPower, "Power Region", xAxis - field = "Time Const", stft_cellCfgs3_timeConstant + field = "Time const", stft_cellCfgs3_timeConstant field = "Max add", stft_cellCfgs3_maxAdd field = "Max remove", stft_cellCfgs3_maxRemove dialog = stftPartitionSettingsOverrun, "Overrun Region", xAxis - field = "Time Const", stft_cellCfgs2_timeConstant + field = "Time const", stft_cellCfgs2_timeConstant field = "Max add", stft_cellCfgs2_maxAdd field = "Max remove", stft_cellCfgs2_maxRemove - dialog = fuelClosedLoopDialog, "Short-term fuel trim" + dialog = fuelClosedLoopDialog, "Closed loop fuel correction" field = "Enabled", fuelClosedLoopCorrectionEnabled field = "Startup delay" stft_startupDelay, {fuelClosedLoopCorrectionEnabled == 1} @@ -4488,7 +4489,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; Cranking->Cranking Settings dialog = crankingDialog, "Cranking Settings" field = "Cranking RPM limit", cranking_rpm - field = "Enable cylinder cleanup", isCylinderCleanupEnabled + field = "Enable flood clear", isCylinderCleanupEnabled field = "" field = "Enable faster engine spin-up", isFasterEngineSpinUpEnabled panel = primingFuelPulsePanel