From f76619c0e2dde50079cb8898654472ccd3f29e22 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 26 May 2019 20:54:44 -0400 Subject: [PATCH] generator now takes full file name --- ...ngine_configuration_generated_structures.h | 4 ++-- firmware/gen_config.bat | 2 +- .../models/src/com/rusefi/config/Fields.java | 2 +- java_tools/ConfigDefinition.jar | Bin 60769 -> 60679 bytes .../runConfigurations/ConfigDefinition.xml | 2 +- .../src/com/rusefi/ConfigDefinition.java | 18 +++++++++--------- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 4b1158e892..3400e41457 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 25 15:28:18 EDT 2019 +// this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Sun May 26 20:52:16 EDT 2019 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -2752,4 +2752,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 25 15:28:18 EDT 2019 +// this section was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Sun May 26 20:52:16 EDT 2019 diff --git a/firmware/gen_config.bat b/firmware/gen_config.bat index 16085c2ca4..2d407d451a 100644 --- a/firmware/gen_config.bat +++ b/firmware/gen_config.bat @@ -1,7 +1,7 @@ rem This batch files reads rusefi_config.txt and produses firmware persistent configuration headers rem the storage section of rusefi.ini is updated as well -java -jar ../java_tools/ConfigDefinition.jar -definition integration -ts_destination tunerstudio -c_destination controllers\algo -java_destination ../java_console -skip build/config.gen +java -jar ../java_tools/ConfigDefinition.jar -definition integration\rusefi_config.txt -ts_destination tunerstudio -c_destination controllers\algo -java_destination ../java_console -skip build/config.gen rem This would automatically copy latest file to 'dev' TS project diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 39ad80fb15..c4ac37aedb 100644 --- a/java_console/models/src/com/rusefi/config/Fields.java +++ b/java_console/models/src/com/rusefi/config/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config; -// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 25 15:28:18 EDT 2019 +// this file was generated automatically by ConfigDefinition.jar based on integration\rusefi_config.txt Sun May 26 20:52:16 EDT 2019 public class Fields { public static final int accelerometerSpiDevice_offset = 2736; public static final int acCutoffHighRpm_offset = 1498; diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index b7729b7b19dce3bd6688bda1974a3a43366d6439..d31f170716152498b7f4a2eefa0953d5993142d2 100644 GIT binary patch delta 7701 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 RJMI7S5sEkYaX0?W{{RkS3pW4& delta 7872 zcmeI%S5(tMmjG~xfYPM|#89MnDS~uFrAn7BB_dsr(2E43h*S~bPj7-C5fB1WrG!o> zQllZ%(2F1h5NT1C{mwq^<38?T=H=cybLO0xx8K~DsY?q}m*`CNFHz8tkzFApOHWOv z69uKERx5B)F+6(PWW?Ln|3#RAj7$vzI8uotY^_4ics6}e%bOXT!WJp@4<0h>)Gw77 zVl54^%JsP->CR4~db80@@d3}olO-*ho^I7^&`LUbwa-a#K_np8>Z?9V_T7x8_;Y1M zrgx5!>Q$@CACa&s=AVB@exwObKaCg~X)E$a@8|6tpP~J|(WEJ))Fr&|@Yh|5%0{9R z0`AZOD?j2=h+uC+E|x){?d%qCy`BsUxK@vq1qmIA`Z^XR?ss&Fonc{9?4QX^bm3ys zOw~ft3Q<_>pLx&w(j$K`f|nXmI*(!{)j@1`4HfF=VXW}M#2jC(j)qyh5aP_TBY37! zYkQ|X7);88G!qXKk1msnA`yOFQi!a7lZoD>gvg9p{3}FS4#A8F6Zk-mRbpXk7gAe5xoYrW84dl zoSG_mX! zYc(Me*_~I`IH*+-JjjbEhz+Cg>R70HAq-dEwf>+0WM*w8avcBuCeV<5Qge%vU&e{k z*g3vQLtjMMPeNV&8qH-)QFwB}3ufxxC*d(l({jq396Y~h=_zzDJh4%jrH($`MycVv zxAH1on8j4SQScjX2CY|1f4jyyMi-ol!goh~0!Tj6*O%oKrMVLjN!*)BJP`Wc-lQvX zjFgz(%aN}N-F5fIp6JD5bQ5~+kD+C&4Vh1^u(z{n7u>xvT~SjWsVe+M9m$UaG&Iu6 z@h0w3Uuc^grKx@sM%@zmp9=}k+p~YT-xDD8ag9TC?d5NSDaAhbpl$V=k9S5&u1TE+ z@Tu`vRqq!bjHP)QB4qfJRax|w7vs!0?3pgJ`l4*i2oJmOvN2X)&o%t1#6P4evZ#Kd zP_$VZayv*U5AwrU?*P=SJfV*&+PV7@r#E|TRJgb_^%_Ux{l{*3UCk4KweDw5tr=sM zz2|)LDHHxD1_Rw%FGVYbUo+IN?M)Uth;(ywH>&3i3ef$fhalj&t*>kro+{_&ClmSE z_O%x@r!wQ+M%Lea&S5xkLn042iqLoyE@tYhS&NvlSJx}_9tdOnY?tAV-4Q7Bx4DMoHgDi$l*zZC#OTNiXYfX-jQ zW~j6sud8j0U=4usB89Om{)XH6-v=sT>H0;|`Qx;j!B1YN+UX<*RS1gleTutl=S+I) z%={%=QNp@V(o?g>)kFN~HX*dKp1H$L;1^8s4p7z4OJdZy3O! z>hCiVv`AWQF8T4|z^4P6rH}E*aRogbh-N#7ugeMK5WK& ziGeA5kGEdKrmM9y<&m$?YV*gteSPn-FwS2>WM2aUe-{XGGYiY_vSsB3(P~Hk$ouon z$PI5bVE%QKNKFzlebg`A{G3DVSK8w@R|})T*1J`#Wj~_rSe6zug}9UPGv>`q*@ZjZ z4f&Zk&3n1ynh&e46f6kBA9V>XTCP8dw0DiM@otJ<+hyukE{zjS#&vrzja9i@I`^nz z5w*8zk&~n&xiI4=DW4|88zb!rrAmY;^a9}X0OGH1WYb^~MNf>9Xug%*7weIg&SB^* zBXwh@<(Cm#lj6PyUyQNGqNzuPPxU+d)`&LSF5z9#snxyX@X0vpxl(n}c%N$EyLi(3 z;@Zd?@Mp_onx?8Hu{GJ5U>!LbVQ!>2LcV{^URBhI6h+q#SdVtw_DnmA%vHuAom0G8 z#_<~RyR{)PLUW?|jxO12NS0pnoxX*nc!^(?H+ts<&DmoP-57G=p_w7MlZY-392RTH+c<^Eh{Nvm=QvF4{hd! z7v(q!R7*5mR#QYSxb6D4pv$LXjQa=pu57kQSjwb(ls|m5%`Q%)r=L*76GwR+q|3XQ zMDM%bP%9mLRoA&j^BK~c7x+zFx}}V7pbzc#tT45oBG9N(_WQZmqZ(|z`eAt5SDNQH9dU@4a2;pyYW%3pp)732&bMF&HfWqFR%f>)6sVup)I`W` zuGfsmF<6G;eh(^-B>4RGhQ&AM7fdKwo+*_S({^m+%DAbUaabq82P#_An{dspulZZ9 z-!JJKQicRMDD?a>94$`X3&YUW@@Mt4{r(}9z7z+4gbva<&>QH(vLWPI6MIfS{3V$; z%D}mdvOd&||N7LzJKld!ReW0HN2WP-v5hRVZrSg0l52o#NHWB%1fw$JyWA@p&CVgJb& zY{NTvNX$>|))y)7yU$?ku zcD!Yi#pX&g{kW@!EPKAE*@pqNvsy;Z=yWUMv+HbcxC3o2tT$<5bZ7NM_$iLOl3-hd zez|%0<8z)}TbpZz-(Nu9lYQcjMNN?ZU#$G5b|s?3wPKe7CN`X-x1>XhfzFpDw!!i3 z3(yxK+FgB5X+=h13JYOYMlk~>FKYHZMEi-OcSG%sd%|G;PJbSSAML2f^ zGsKFCYk&QQ>8-d#wz1EY1lB0qN)$FK ziuw{uUpo^DK5aEZHO0RDTgfmH8i3246d6(c*lp-nQkfeux42&Vv!!EvqfBWh4QXeQ z_qN=m^{tkdLuY!mpcmJ^7;U33xdP>keq)vn{AI78*OGIX2Fpt!)TUU_O~=cjFpm8u zHew0omH@)WwzEZtW|Haz*gd^@)@g3l8@2>`K0xPiYT;$uQys%O zr;Q3HZ)HpP!+b>H{LOzFWp$m54rP*XTMqUEazio z9u7U>;Bv*9PSSklOKh0)`YZVkWfSV^wYdlQL4>1iXNMnIt}EGg5e2XtA;obb@P;xX zc?od$v=QpHpyV+p>U;i+J@v#7>xG?0)1yB8vQUhOx)-{0ox#sen{_B~1V{S&C6ZC} zs45al4xgSzEeQ1A>ArDu6r>_~Y+)(f<~Jz#n#HFogDg1MUTd0}A+dVzME_a{1H*I= z4T6T`ay9kp8)-mt)?R1;%oaHt$P$e-J=q_GqJ&VC^`7o7aFip9 z+DyxX^Q{sqQf6N}2|e;@zo2*ZhqQCME3*?-)G%VU7(Ith>R}!c$8XLdL`^|=CZ&x< zfk(d8VdRYcvUU2LeqtWu65FejHMt@f(V#k8H+3ncQ_O9 zaE3KTQm}YPI>cy#VmT%7fQYF1&V0a4lM<@7aTZB!uwhH>Hk?B{G8Rh!L>-l<{6pJj z>j`5E>s8S9xqODpQsnxf4QXB@-yUG=Yqj!yV~lyM@!W#B4z%JyyknPg>B6QY?$H#mlwFaz~u!lFK~H*%L`my z;PL{O7r4B@Kz>f?yoFigGlwSs-^|=zg@RD505Osqc(x`6 za^M2qC-4Ey=b<|vQ2I^;U|bgiLHU7#w#Eq0X~aHAUb8B zeenUgD$u&22U58Mz$^Fx@tM0vjQ*9(;G(Tsnq#-bimqAZjgX6aF?7F zfNb6a