From 1f56fda25f45d3dc62448a5b5e6c964b065dcf13 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 7 May 2016 13:02:40 -0400 Subject: [PATCH] auto-sync --- firmware/console/binary/tunerstudio.cpp | 4 ++-- java_console/ui/resources/com/rusefi/joystick.png | Bin 0 -> 373 bytes java_console/ui/resources/com/rusefi/sdinfo.jpg | Bin 0 -> 875 bytes java_console/ui/src/com/rusefi/Launcher.java | 2 +- .../ui/src/com/rusefi/ui/RecentCommands.java | 4 ++-- 5 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 java_console/ui/resources/com/rusefi/joystick.png create mode 100644 java_console/ui/resources/com/rusefi/sdinfo.jpg diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp index 139f4e429d..8c0047633c 100644 --- a/firmware/console/binary/tunerstudio.cpp +++ b/firmware/console/binary/tunerstudio.cpp @@ -248,9 +248,9 @@ void yellowMagic(int currentPageId, int offset, int count) { * read log file content for rusEfi console */ static void handleReadFileContent(ts_channel_s *tsChannel, short fileId, short offset, short length) { - +#if EFI_PROD_CODE || defined(__DOXYGEN__) readLogFileContent(tsChannel->crcReadBuffer, fileId, offset, length); - +#endif } /** diff --git a/java_console/ui/resources/com/rusefi/joystick.png b/java_console/ui/resources/com/rusefi/joystick.png new file mode 100644 index 0000000000000000000000000000000000000000..c9eae4ed2d14cb2708a6ed551989a98e9e13df57 GIT binary patch literal 373 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAwFLNtxc>kDAIJ;}3Oaf6q_?;C z+qZ9zA3y%*&!4YfzyAFB^Zonx2M-?f@bGy4{CQPX)u&IN&Ye5Ad-v|yvu8UxI<8*5 zx}~K>R8(~H=FL;5PK}R`x3;!^`0(MfWy`v|yVcax3JVKOOiUCN6;o4F!^6YN%gZGs zB(7e)s-mKzudmO?$CsR(Jb(WDXF7rxfR12H@^*J&=wOxg0CG4BJR*x37`TN&n2}-D z9FX(bOFVsD*&nd73m7ZJv^+=#3YB}hIEHAPPfloHc2h_=z|s@YpvX7<@RS4VS|?7N z_)O@IL7`m9_frl>S_>;CGD;`3R7~a)dZfTvs3Vr$pdu0=d*H+gMkR$A&4Hq}84pz^ zwOA;5uuN2yn3z04Fp^z*&fyb1%bFVYTlit!vAEyAF Oz~JfX=d#Wzp$P!Fq>niO literal 0 HcmV?d00001 diff --git a/java_console/ui/resources/com/rusefi/sdinfo.jpg b/java_console/ui/resources/com/rusefi/sdinfo.jpg new file mode 100644 index 0000000000000000000000000000000000000000..250c6864c6adc9e76af51c89484d444e6da69425 GIT binary patch literal 875 zcmb7BZAep57=F(^_ippN*KBqH^vOv=QNK20c#O4qqFO@H>D_t!b^^E~hKoZ$1|2#~Dw z%yd8qK?XYzdj4`B%ahY>6&UWL_~F!p3Z zu=oXl7f^5rbnKcVm;j*q)UTiX(Q5-OGybmHLQD7{5C?-=2yo2s0$wceD&UZ0T+awJ zEFC0p6{E#ZKJ4C`J1~^iJlZ;z^uYT4>hxBBe0fjq^%EXO6GZ_p-T`r#SZ($Y2S&(& zGCLXzJ{P6Ygq(_508?Ec3kY+(jaWkfP66ycm)L;Y_7#>k*0lFB$a2Co*pwj5WxzCe z5F)6JNcMHEWUsIM^xvIT4(^pWKDMguJz2fW2UBrTKW`UJm6bj1dV41G*2XNasRj>_|F%IJ(&j9Ljx z6mjag6U*;ln*u-zyolt3gZR*(;d#w1lX&6im*@2Twn_cdl!a&oH ztdBEN?X{HF@$|vRISdy1DrOLXxagG&Oe%&lxAR^VL5j#E%hc%#$tbCkjLQeTQ+c{a z%5KpNz$*;%g$T7xg4G$CS3)HPuI{vs0aH`{;5&w}FgNVqLb9_U#SIf6zJFH8;rhBG zG0;EZP3dj9o80%S`{<$OzDRLLV(G*^B)gNjv;E6bR=m0Y+heROaoe3+@)IxJP#Y6A JJaYtJ`~euv&{qHe literal 0 HcmV?d00001 diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index 2987edf1e4..3caa8847ca 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -36,7 +36,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; * @see EngineSnifferPanel */ public class Launcher { - public static final int CONSOLE_VERSION = 20160421; + public static final int CONSOLE_VERSION = 20160507; public static final boolean SHOW_STIMULATOR = false; private static final String TAB_INDEX = "main_tab"; protected static final String PORT_KEY = "port"; diff --git a/java_console/ui/src/com/rusefi/ui/RecentCommands.java b/java_console/ui/src/com/rusefi/ui/RecentCommands.java index f98d3b8951..899194f085 100644 --- a/java_console/ui/src/com/rusefi/ui/RecentCommands.java +++ b/java_console/ui/src/com/rusefi/ui/RecentCommands.java @@ -59,12 +59,12 @@ public class RecentCommands { COMMAND_ICONS.put(ALTINFO, UiUtils.loadIcon("alternator.jpg")); COMMAND_ICONS.put(ACCELINFO, infoIcon); COMMAND_ICONS.put(TSINFO, infoIcon); - COMMAND_ICONS.put(joystickINFO, infoIcon); + COMMAND_ICONS.put(joystickINFO, UiUtils.loadIcon("joystick.png")); COMMAND_ICONS.put(CANINFO, infoIcon); COMMAND_ICONS.put(FUELINFO, infoIcon); COMMAND_ICONS.put(TEMPINFO, infoIcon); COMMAND_ICONS.put(HIPINFO, UiUtils.loadIcon("knock.jpg")); - COMMAND_ICONS.put(SDINFO, infoIcon); + COMMAND_ICONS.put(SDINFO, UiUtils.loadIcon("sdinfo.jpg")); COMMAND_ICONS.put(FSIOINFO, infoIcon); COMMAND_ICONS.put(PINS, infoIcon); COMMAND_ICONS.put(SettingsTab.WRITECONFIG, UiUtils.loadIcon("writeconfig.jpg"));