From af37b12082234fcdcb2b2992d2a18ea54b6ef665 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Sat, 8 Aug 2020 15:31:21 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 4 ++-- .../controllers/algo/rusefi_generated.h | 13 ++++++++++--- ...ngine_configuration_generated_structures.h | 4 ++-- .../generated/fsio_enums_generated.def | 2 +- .../controllers/generated/fsio_getters.def | 2 +- firmware/controllers/generated/fsio_names.def | 2 +- .../controllers/generated/fsio_strings.def | 2 +- .../controllers/generated/rusefi_generated.h | 13 ++++++++++--- .../controllers/generated/signature_all.h | 4 ++-- .../generated/signature_frankenso_na6.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 ++-- firmware/tunerstudio/generated/cache.zip | Bin 849748 -> 850405 bytes firmware/tunerstudio/generated/rusefi.ini | 6 +++--- .../generated/rusefi_frankenso_na6.ini | 6 +++--- .../tunerstudio/generated/rusefi_kinetis.ini | 6 +++--- .../tunerstudio/generated/rusefi_mre_f4.ini | 6 +++--- .../tunerstudio/generated/rusefi_mre_f7.ini | 6 +++--- .../generated/rusefi_prometheus_405.ini | 6 +++--- .../generated/rusefi_prometheus_469.ini | 6 +++--- .../generated/rusefi_proteus_f4.ini | 6 +++--- .../generated/rusefi_proteus_f7.ini | 6 +++--- .../com/rusefi/config/generated/Fields.java | 12 ++++++++++-- java_console/rusefi.xml | 2 +- 29 files changed, 84 insertions(+), 62 deletions(-) diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index b4790e4d0d..e93af862a1 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Aug 06 00:48:27 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Aug 08 15:30:53 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3651,4 +3651,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Aug 06 00:48:27 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Aug 08 15:30:53 UTC 2020 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 976a47fb26..529d1b6bf2 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -333,8 +333,14 @@ #define engineSnifferRpmThreshold_offset 4 #define engineType_offset 0 #define ERROR_BUFFER_SIZE 120 +#define ET_BMW_E34 25 #define ET_BMW_M73_PROTEUS 63 +#define ET_CAMARO 35 #define ET_CITROEN_TU3JP 65 +#define ET_DODGE_NEON_1995 2 +#define ET_FORD_ASPIRE 3 +#define ET_FORD_FIESTA 4 +#define ET_FORD_INLINE_6 7 #define ET_FRANKENSO_MIATA_NA6 41 #define ET_FRANKENSO_MIATA_NA6_VAF 57 #define ET_FRANKENSO_MIATA_NB2 47 @@ -345,6 +351,7 @@ #define ET_MRE_MIATA_NB2_MAP 11 #define ET_MRE_NEW_TEST_BOARD 31 #define ET_MRE_OLD_TEST_BOARD 30 +#define ET_ROVER_V8 10 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define etb_dFactor_offset 1744 @@ -1081,8 +1088,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.08.06 -#define SIGNATURE_HASH 3131935648 +#define SIGNATURE_DATE 2020.08.08 +#define SIGNATURE_HASH 1707812931 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1382,7 +1389,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.08.06.kin.3131935648" +#define TS_SIGNATURE "rusEFI 2020.08.08.kin.1707812931" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 660a05160f..8c55e54106 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 06 00:48:17 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 15:30:40 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3651,4 +3651,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 06 00:48:17 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 15:30:40 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 85607112e4..7687fc59aa 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 06 00:48:17 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 15:30:40 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_FANONTEMPERATURE = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index ad7d06d469..35ee976b2a 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 06 00:48:17 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 15:30:40 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index a76f1c99ef..34eb9d34fc 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 06 00:48:17 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 15:30:40 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index 34da43613b..4be048402d 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 06 00:48:17 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 15:30:40 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index e1ece273cd..87accc2571 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -333,8 +333,14 @@ #define engineSnifferRpmThreshold_offset 4 #define engineType_offset 0 #define ERROR_BUFFER_SIZE 120 +#define ET_BMW_E34 25 #define ET_BMW_M73_PROTEUS 63 +#define ET_CAMARO 35 #define ET_CITROEN_TU3JP 65 +#define ET_DODGE_NEON_1995 2 +#define ET_FORD_ASPIRE 3 +#define ET_FORD_FIESTA 4 +#define ET_FORD_INLINE_6 7 #define ET_FRANKENSO_MIATA_NA6 41 #define ET_FRANKENSO_MIATA_NA6_VAF 57 #define ET_FRANKENSO_MIATA_NB2 47 @@ -345,6 +351,7 @@ #define ET_MRE_MIATA_NB2_MAP 11 #define ET_MRE_NEW_TEST_BOARD 31 #define ET_MRE_OLD_TEST_BOARD 30 +#define ET_ROVER_V8 10 #define ETB_BIAS_CURVE_LENGTH 8 #define ETB_COUNT 2 #define etb_dFactor_offset 1744 @@ -1081,8 +1088,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.08.06 -#define SIGNATURE_HASH 2507787776 +#define SIGNATURE_DATE 2020.08.08 +#define SIGNATURE_HASH 1243573731 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1382,7 +1389,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.08.06.all.2507787776" +#define TS_SIGNATURE "rusEFI 2020.08.08.all.1243573731" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index ad5a144f73..ebda44389d 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 2020.08.08 -#define SIGNATURE_HASH 2348678693 -#define TS_SIGNATURE "rusEFI 2020.08.08.all.2348678693" +#define SIGNATURE_HASH 1243573731 +#define TS_SIGNATURE "rusEFI 2020.08.08.all.1243573731" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 6308c09561..2f89ed4940 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 2020.08.08 -#define SIGNATURE_HASH 3079670780 -#define TS_SIGNATURE "rusEFI 2020.08.08.frankenso_na6.3079670780" +#define SIGNATURE_HASH 1987221562 +#define TS_SIGNATURE "rusEFI 2020.08.08.frankenso_na6.1987221562" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 0c61fe6fa1..18332e2edf 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 2020.08.08 -#define SIGNATURE_HASH 2754198405 -#define TS_SIGNATURE "rusEFI 2020.08.08.kin.2754198405" +#define SIGNATURE_HASH 1707812931 +#define TS_SIGNATURE "rusEFI 2020.08.08.kin.1707812931" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index d7a011fbdd..a48efc75ad 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 2020.08.08 -#define SIGNATURE_HASH 1884515198 -#define TS_SIGNATURE "rusEFI 2020.08.08.mre_f4.1884515198" +#define SIGNATURE_HASH 2981230776 +#define TS_SIGNATURE "rusEFI 2020.08.08.mre_f4.2981230776" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 1bcfe1aaa6..dd70f60bda 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 2020.08.08 -#define SIGNATURE_HASH 1884515198 -#define TS_SIGNATURE "rusEFI 2020.08.08.mre_f7.1884515198" +#define SIGNATURE_HASH 2981230776 +#define TS_SIGNATURE "rusEFI 2020.08.08.mre_f7.2981230776" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index a86b71ed0d..c21c0f7b7d 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 2020.08.08 -#define SIGNATURE_HASH 2618015643 -#define TS_SIGNATURE "rusEFI 2020.08.08.prometheus_405.2618015643" +#define SIGNATURE_HASH 1575562333 +#define TS_SIGNATURE "rusEFI 2020.08.08.prometheus_405.1575562333" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 5af5f9fdca..6ae654395f 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 2020.08.08 -#define SIGNATURE_HASH 2618015643 -#define TS_SIGNATURE "rusEFI 2020.08.08.prometheus_469.2618015643" +#define SIGNATURE_HASH 1575562333 +#define TS_SIGNATURE "rusEFI 2020.08.08.prometheus_469.1575562333" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 4b8000292b..6ea53835d2 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 2020.08.08 -#define SIGNATURE_HASH 3023140862 -#define TS_SIGNATURE "rusEFI 2020.08.08.proteus_f4.3023140862" +#define SIGNATURE_HASH 1976820792 +#define TS_SIGNATURE "rusEFI 2020.08.08.proteus_f4.1976820792" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index f24c38ecaf..990234c59a 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 2020.08.08 -#define SIGNATURE_HASH 3023140862 -#define TS_SIGNATURE "rusEFI 2020.08.08.proteus_f7.3023140862" +#define SIGNATURE_HASH 1976820792 +#define TS_SIGNATURE "rusEFI 2020.08.08.proteus_f7.1976820792" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index ac24296ff21fb17e63420544650811fccf33321c..39f8de85dd8a19ee0ff337410247867a5ee36b62 100644 GIT binary patch delta 9735 zcmeI2`CC)R8pjXWISfJ|Kp-rFHmrsOQlKiEhzp7smja3cf-F)N>khO)FBdB+MN%2j zTZ&a{uT{Hogi*6F(MoYApy5qv0O;!ld^ca9n8MP zf0Ab=p#|@ zHc^nvTh4DSt8ZNvd2h#T z>#ut&!pmB0lB6BI-?zp`#JD_(PumMLlhbSWez@`3d6MrWjcc}3Y>zE8Yjsr?Jz=Y7A=R2CnQT7Cl_Ijw0swQvEuu)V6G z=DWb*|F>qx+vXN>++rG=KgqRRT|c#@B5IyyWye>lO(iZ#Gov!zDIin4BNL<{sriS< z_NL{$?y9ipuv4`@ZNs~kEzUm{?$qdI65jN=T9$ac#cpeKSW|mqPhC^hHFf=)j*|B0 zbGkHle(njc{w=L(|3q8g)rXGzFD$RFtNHSga?`mcO+s9LX3n-`cb{Q>xr+CSC*vU{ND=olaTyawPe?oe7h-m=H`>5``&XE*)l zY}~yoA*-@~DyqD2Sh;R(XaP_xK6NvTxOB?2Y^U%<`{@R|fNlP975-lC@cXc;*s5AI?}lMrYf-SXj1XEGdmKkJ00S^cbs`@ zHhl`4BO(ZafVhwc?`L!T@R{wE!>Q!3P~gN;Wa87n#7ct*}-;}1(Ln+IVt zk`Th{?ZDO4l;Dp*;LyzgjscvZ08Vor%t_$cz`iuDl*Fbt4GD@mCZp)?ceuVL15w$& zdU(u;g`&H&xM5ft{4H`c$417Nn^%ZNaI6Q#yJ6q!htKHv>!t zn1%vOEqRqO{PFn2rdevqgZt<5qp$#Mn`j)MJ}j;g(2s^l(HX~|BpF~r7JrjP3_Lp` zfodK<5G$bwtv6s04PHjD`xS5LAxpZf7B!Uc{2%0xexgfaubeQFm?@V)6c6Rx3^! zI`?y<4lvFEG2Gh)EU8lr55yeZ49ppr8w$*|=D|X_i3GlN9t?wRZ;@gWo8vTnNRl2% zM&N<^Kytnj3k4j4$uKMc7X_1RsQx24XLQmof%q@XU{-lJrDa(anIB0jr^d zRVY5QahN19QfcCiM{%Mg>MfpPI6as&#}qhPqp|+}rR(aTrRxo}bS3rzH)_>VAiU^i zz{`NwP{8YI9-QC`f=Fy;(|DmkuLqco2WEMK^(+<&+#Cgx?FKSr@oelU1H}_%z#mUU zC+~$N(DwjvI~cJaxGGE;uZ7|J8sIOd-UUyeV#E>=|GZ5Ts50{-6r~)3Q2P*s6JbmY z{J7`94H{qtpJ{;5LN^sUv;%vN(J~HEna*|g;SzjZjX z2gAJwC+WVH!>=g=UTX(l7St;W+z5IT;cy4ovoq7V@UI473)`*&OMR+bq#`AmTq5(` zh4Cr=aKmNbqfd9V16A|M=EC|cuD23-)BQxIH|DKdlEa04*<2T2J(;>MM{t9IPvGIZ zz|(>{GsYdFqhYPX;6xrQO5nL$p~`wRlt1=^WS-hcB!V^0MkI_(=80b;)|%v`@?cFP zaH+fp%;mZj|IKB18VtDyq>8~=jDu>lG4W)KyIB_xsycZx>Y}K#I@~2XX}Ek3IS|M4 zp)iIoe~l*SKCox~90%j>gJ26iHTIx5n>U{iU&is3)EMY$n7*WpD@>nHRknvw4}egv zFBSi93ol0M=-aUT0q|8&XNOE<0#)9k`a7{~f>_HV2pJ=5e3SsTHK9*5?*w8C-CQ`P z8yR{wLjXgqSW;Nn4ea!(c2laeGX=0jz3#>)d4o9yWcAbw2+#oj@MO}cdiguLcX9Caq znTYA{pnq)XQEP3v1emBdcn;XoqoZuGp9N^EN~vKUtkHd>#7C;}C`{-@3kS8J;;zs_ zTHT9o*lBlI*9&C&;xAB~ojVGsuX{?NmnV==zV*~u{21xdhcr42Y-+r7L94 l#^H<+(4h3TAAl7#9UWd}bI}(DK{TLW$8iMl%|U?v`Ww%}vpxU- delta 9067 zcmeI2Yg80R7RP&fp7hl4Mp00C&44^-KMTmHek+_OR z$5^`>PmCCMH3`QxDn>;?qpR77qVZ_LA&81AC}4Q&3302sAyh;AnS2;H^?|zod%JJ- z{dHAW(by6ELu>H*jiQb8M)7e;gv`;?q%ht-+HxSnL{Sm%il}jv9R)vgqCJ?7(!eyX zm2c~jzRW1v(D?cy=NEqGa#UXK1*(OIOnbHB&-OK4x}~n$U6*UFO5gKapZc6icP z9>t~bN^s%1zt1wRx^sWcj)flE>;F{-nh%F(z2~v4IJD!$4UL!B`-o>sHC51hG$_;O z?vaMv3CBKGZH@f-S)W=+xE3;WU~ zY_sluwu$ z8u#*qHs|3t$0@n--rBKoTNNj-Pc5-NUA(G zTcRbaGA~=QTS9x9pej!iMjAxX%u+En9A6^|A`LsTWFKy_^BPj}Ugq;)6kORO9mRB^ zn&+CO<}Ecpay5@jv|w4qV_0O8hLcsvmA01&dasb`NkigNS(S)J2HQ;8Xqd7}>Q7kV zf=pREHX5^#ad)xBkEL4mf6}U86D&`mzv1CmEBo(2t1kP(&Qy zKWY_fhB_FS#x)Bk7EVTv6I`DIoH(1Gxy#InZq{&pA?-kxCjSdUl58jHC7>v2=Tx*3lA0^{s26jjbft6s{9>+wP8vZ81)c1!>PIA(WIn0 zOqnX8QPl@VC|%5BHO?@*3#jnSGFaWPAVRqrYdYhY$)q#;{jKujO&8a$Fd+<$$l#iV z3=0_}M+PoUcBZJFq>Lh~k|V><1Q8i}(!lY642Xwmgn?rK^~)lalZpQR*}c~8 zj*%b+xMpF%!obKefJ>8Qpl%|FAghvNz~2Nn1%MRN&=>$pXc`%EwIF@$U>yghiHR?4 zWN+7kaMBUY2kSSLe_aj?Iu-AD4%#$|vmy{r)9jSry5jeLAxJvG=lCURt4sc5o zuoIG%VcDr%B+D@<+$TvX`S4f@sghcd zYX3?pG^~;aIibu1u6GwlYFNca@(32t4BrALv;U$S&U^~|?D4iEnF-oN#F@y`7s{v= ztCzxtNlG=o0|6b*g|<(JH7&pi?spe4FtQG~2t{P`nV2Di?wK++AAx8%A9`6Pj;7HK zwGZFHBy$OAm2vx-*7abNJ>LEyGeWyQ%UjV{b-pQw+1~>at|JwF_-)wI3Sxz# z#Izy%{rPZy8;H;j_vhD|hF3Pz7vQL_@Ln6R8|KQ}eL{!U{yf)F525=r5Uj%=^<-KD z8w2yi6tzW0QGqpIPe&3D;q{OIzaZa=b?;DJ@7f?;gB2SN4e+ZY%_(>{z@pgAE$?s@ox7HvD05jb|_7`zlZJ zpB8+01K4`q3Rcxv`Qaytm*4y$fC=5`8GRASz{=ZbC0`%KIK4vnB^EB2!a&_a;DML? zj;{~~bs?c$EMvCSptoHYu(cPsY<>@7p(z#~?E=2Kp?2QlA3alkLgkkkbDWPeWMRc0 z1Y|~NF~w$-t5uq>`HbUO6%eu6XhM|c)QQgAyJsLH0Wq7=PoYZl4!{141VlI^@v$&2 z;?W+&=}-}GJ%`d#^PbcC3iwM8ni}xbNM?kl#Gqa@Sd+bBVlN03vX>ycxXBlo8~ik| zA^^DH*ZJ@`3L~Dp=>8cjk$3ew0nqI^NY)8?kyYu&^GXQ>Fy|6*!f=lJ{hCtrHle7C P=y&{|D9Y^wK!5!oYxSPr diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index aaa953723d..f8d984eb6d 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.08.08.all.2348678693" + signature = "rusEFI 2020.08.08.all.1243573731" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.08.all.2348678693" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.08.all.1243573731" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 Sat Aug 08 13:09:06 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 15:30:40 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 357a6e8df2..07503fc2a6 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 2020.08.08.frankenso_na6.3079670780" + signature = "rusEFI 2020.08.08.frankenso_na6.1987221562" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.08.frankenso_na6.3079670780" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.08.frankenso_na6.1987221562" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 Sat Aug 08 13:09:11 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 15:30:45 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 0755ab96bd..09ab77d7b6 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 2020.08.08.kin.2754198405" + signature = "rusEFI 2020.08.08.kin.1707812931" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.08.kin.2754198405" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.08.kin.1707812931" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 Sat Aug 08 13:09:23 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Aug 08 15:30:53 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 3f72232238..98873df01a 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 2020.08.08.mre_f4.1884515198" + signature = "rusEFI 2020.08.08.mre_f4.2981230776" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.08.mre_f4.1884515198" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.08.mre_f4.2981230776" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 Sat Aug 08 13:09:09 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 15:30:44 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 3706aa2cb5..94c1cd3117 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 2020.08.08.mre_f7.1884515198" + signature = "rusEFI 2020.08.08.mre_f7.2981230776" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.08.mre_f7.1884515198" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.08.mre_f7.2981230776" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 Sat Aug 08 13:09:08 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 15:30:42 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 87eaca4084..de1acc0b3f 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 2020.08.08.prometheus_405.2618015643" + signature = "rusEFI 2020.08.08.prometheus_405.1575562333" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.08.prometheus_405.2618015643" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.08.prometheus_405.1575562333" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 Sat Aug 08 13:09:19 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 15:30:48 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index da4babca55..66f5d07f0c 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 2020.08.08.prometheus_469.2618015643" + signature = "rusEFI 2020.08.08.prometheus_469.1575562333" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.08.prometheus_469.2618015643" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.08.prometheus_469.1575562333" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 Sat Aug 08 13:09:13 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 15:30:46 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 489034067c..8e978f61bb 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 2020.08.08.proteus_f4.3023140862" + signature = "rusEFI 2020.08.08.proteus_f4.1976820792" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.08.proteus_f4.3023140862" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.08.proteus_f4.1976820792" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 Sat Aug 08 13:09:22 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 15:30:51 UTC 2020 pageSize = 20000 page = 1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index ea16a36bc7..c9c689f0ab 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 2020.08.08.proteus_f7.3023140862" + signature = "rusEFI 2020.08.08.proteus_f7.1976820792" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.08.proteus_f7.3023140862" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.08.proteus_f7.1976820792" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -76,7 +76,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 Sat Aug 08 13:09:20 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 15:30:49 UTC 2020 pageSize = 20000 page = 1 diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index fff5156b1e..e876300117 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 06 00:48:17 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 08 15:30:40 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -329,8 +329,14 @@ public class Fields { public static final int engineSnifferRpmThreshold_offset = 4; public static final int engineType_offset = 0; public static final int ERROR_BUFFER_SIZE = 120; + public static final int ET_BMW_E34 = 25; public static final int ET_BMW_M73_PROTEUS = 63; + public static final int ET_CAMARO = 35; public static final int ET_CITROEN_TU3JP = 65; + public static final int ET_DODGE_NEON_1995 = 2; + public static final int ET_FORD_ASPIRE = 3; + public static final int ET_FORD_FIESTA = 4; + public static final int ET_FORD_INLINE_6 = 7; public static final int ET_FRANKENSO_MIATA_NA6 = 41; public static final int ET_FRANKENSO_MIATA_NA6_VAF = 57; public static final int ET_FRANKENSO_MIATA_NB2 = 47; @@ -341,6 +347,7 @@ public class Fields { public static final int ET_MRE_MIATA_NB2_MAP = 11; public static final int ET_MRE_NEW_TEST_BOARD = 31; public static final int ET_MRE_OLD_TEST_BOARD = 30; + public static final int ET_ROVER_V8 = 10; public static final int ETB_BIAS_CURVE_LENGTH = 8; public static final int ETB_COUNT = 2; public static final int etb_dFactor_offset = 1744; @@ -1064,6 +1071,7 @@ public class Fields { public static final int servoOutputPins8_offset = 3147; public static final int showHumanReadableWarning_offset = 976; public static final int showSdCardWarning_offset = 76; + public static final int SIGNATURE_HASH = 1243573731; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1319,7 +1327,7 @@ public class Fields { public static final char TS_SD_R_COMMAND = 'r'; public static final char TS_SD_W_COMMAND = 'w'; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2020.08.06.all.2507787776"; + public static final String TS_SIGNATURE = "rusEFI 2020.08.08.all.1243573731"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int tunerStudioSerialSpeed_offset = 728; public static final int twoWireBatchIgnition_offset = 1476; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 5f4345ddf9..81e3f9d254 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +