From 31c3c3397228deddfd9be271b046c232c1264291 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sun, 17 Apr 2022 22:28:36 -0400 Subject: [PATCH] logging of live data structs was: data points #3614 alpha version of TS UI --- firmware/gen_config_common.sh | 2 ++ firmware/tunerstudio/rusefi.input | 5 ++++ java_tools/ConfigDefinition.jar | Bin 5530568 -> 5510644 bytes .../java/com/rusefi/ldmp/UsagesReader.java | 14 +++++++--- .../rusefi/output/FragmentDialogConsumer.java | 24 +++++++++++++++--- .../test/FragmentDialogConsumerTest.java | 4 +-- 6 files changed, 40 insertions(+), 9 deletions(-) diff --git a/firmware/gen_config_common.sh b/firmware/gen_config_common.sh index 3a4678e75c..b989d98a82 100755 --- a/firmware/gen_config_common.sh +++ b/firmware/gen_config_common.sh @@ -6,6 +6,8 @@ COMMON_GEN_CONFIG=" -enumInputFile controllers/algo/rusefi_enums.h \ -readfile OUTPUTS_SECTION console/binary/generated/output_channels.ini \ -readfile DATALOG_SECTION console/binary/generated/data_logs.ini \ + -readfile LIVE_DATA_MENU_FROM_FILE console/binary/generated/fancy_menu.ini \ + -readfile LIVE_DATA_PANELS_FROM_FILE console/binary/generated/fancy_content.ini \ -ts_destination tunerstudio \ -firing_order controllers/algo/firing_order.h \ -triggerFolder ../unit_tests \ diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index e41c5d932c..99d5c811d7 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1474,6 +1474,9 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} + menu = "&View" +@@LIVE_DATA_MENU_FROM_FILE@@ + menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 subMenu = gearDetection, "Gear detection", 0 @@ -3138,6 +3141,8 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" panel = speedSensorAnalog, { enableCanVss == 0 } panel = speedSensorCan +@@LIVE_DATA_PANELS_FROM_FILE@@ + dialog = gearDetection, "Gear Detection" field = "Wheel revolutions per kilometer", driveWheelRevPerKm field = "Final drive ratio", finalGearRatio diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index 6bab83274b93806d001d1198602196120e0fdfbd..090a60569ebbeb702c135d57e75f4fcd305f59ae 100644 GIT binary patch delta 157216 zcmaHyWl-DS+OE;!?q1y8g1fsr6nBRr1yYIzN^o~8ngRs^#aaju+}&EBI25N)XgT@s zea_6g-ev_^}^i6gg* zqXgdJSGS}a&)yHj#i1i1#p2{5XAlYjv)=?7sZb^WwS3pbyytnVLo_*O$YbTPNzn!g z6=^WB{B$i9qcc9ZYiN*QA`f-fhN>C&aC2>u@zc^e=cN;Ty}-J`xyO2%zl`kQ7IKZ9 z1x8JWZJm}}PnB$D(g1C{@n4BXH7b&(Y7BB+0!nHJ@TDz4#Q@%x!iTIu`u%wzG5IwW zR$-Vb(^Q11L*7HtAm()#sCR;bg?NI3^-j<(gVMQ=r=>K^bO-603=}gFNbERa#)>a! zm#HpfmrLndlB+KGEiLa=A7{EtAFJSKgq1_m19;GWznhq9{|)i{#4lE`fLz*$5Wo6_ zfLzvypj^g?uv`vcjN3omY=;C0*8BXFKPb3=Kz9G`!5O`;{_8S|X!+qQ0QDzFL2hCi zA~#Ugm2lqxX!mIJJ%9GJj?0ILb)lov!T5E!4~{uh-a>@@J)um;v6A2%*PGm-IbN8RltN127bjOfyBg9&Hd5!Dfu&+Y(tb&Jy8@mQbz zbAT(P|D5lp8>eA2PW0!1Wr+P(8}kFcPO01O|2AhKA!~ZYVk(EX7I)?w*tqe-DE%$3 zcs$NQDrg0$3Z5)p7zs>mobQyP4_}SopW~jjp^YV=riUi-S*o3Xf&j|oVB2id- zBVj1j{ZGmTVwxg2S{s?k&V`5tZq9o!hDjdhhX`;C^F9h&vik3HtOW_ zBz^K+dDCP#4?HqDKHAQc*Y%B0AVscTUYK}&uc+Hl(3R6%43n<$cNzk|Z7YI4*f09Q z=JA+K+BX0m{6gj_LEwboKua!je@m)kmZKaT85~3FNSgr2pxveA1Y?0k;4E-bxIGvb zE&?Y4^T2V{z|7N^Ft3_i89%?Fm`ZD@c$=H6pUwC5r1Hrf_i~Wpx49I9!rIWX9VQEb@!eG9GHb;kV*9 z=+|UF;8(g`yB!5XjmN-);}TG@;lc5Y;z{D&VHz+_7%ZL&<_=?yw}4T>itM*8YPSWI z)`A8l2qS>Q9C{fKiSNvzH?E1}zYj1t#)A!Z6f~z#k%|VCy6!H%WomumK-c?Rx1R;z z;QX94$IW51$5U;|mF2`aZ&+7vKGtr`O`sK*Lv1q7)V{#UpB(bqy4P^c1w*X%^O}pA zSbf+USG#DPi?_*|rEvq)!`r*wrcli)p`Zz(YE=WYEQ6R@#EnN+jxzBxfM2ef3_@#7!>M37R2<{x%QTqsvvfdrKLvi6w3yP%KBT& z8i>hycyJR`%$sIG)%$EstnRTb*loS>=dzfcmAv=tQXOwC)D(beGX(7_6$nLF;yTUl zpa4SOQ2c#IhgD$c!m3GUYz`8_$TqFmP-xFC8x=Ku=dxgd#h-nQW$gJL2_@;!uyAN`iMnXLIzGM}aFst4 z_REoFl4teMk25u{Owb+h_=MzfL}H`{|E8t(sbnf~fJ)@M^!^SL_0jn&`j3@Z;