rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/rusefi/rusefi

This commit is contained in:
rusEfi 2017-02-21 23:06:51 -05:00
parent dad87aa252 8235db4f56
commit 718d3a5301
7 changed files with 87 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/trigger/trigger_central.cpp
View File

@ -357,7 +357,7 @@ void printAllTriggers() {
TriggerShape *s = &engine->triggerShape;
s->initializeTriggerShape(NULL PASS_ENGINE_PARAMETER);
fprintf(fp, "TRIGGERTYPE %d %d %s\r\n", triggerId, s->getLength(), getTrigger_type_e(tt));
fprintf(fp, "TRIGGERTYPE %d %d %s %f\r\n", triggerId, s->getLength(), getTrigger_type_e(tt), s->tdcPosition);
fprintf(fp, "# duty %f %f\r\n", s->dutyCycle[0], s->dutyCycle[1]);

16
java_console/ui/src/com/rusefi/TriggerImage.java
View File

@ -85,6 +85,7 @@ public class TriggerImage {
String idStr = tokens[1];
String eventCountStr = tokens[2];
String triggerName = tokens[3];
triggerPanel.tdcPosition = Double.parseDouble(tokens[4]);
int eventCount = Integer.parseInt(eventCountStr);
int id = Integer.parseInt(idStr);
@ -211,6 +212,7 @@ public class TriggerImage {
private static class TriggerPanel extends JPanel {
public String name = "";
public int id;
public double tdcPosition;
@Override
public void paint(Graphics g) {
@ -234,6 +236,20 @@ public class TriggerImage {
g.drawString(name, 0, (int) (h * 0.75));
g.drawString("#" + id, 0, (int) (h * 0.9));
g.setColor(Color.green);
int tdcFontSize = (int) (f.getSize() * 1.5);
g.setFont(new Font(f.getName(), Font.BOLD, tdcFontSize));
g.drawString("tdcPosition " + formatTdcPosition(), 0, tdcFontSize);
int tdcX = (int) (w / 720.0 * tdcPosition);
g.drawLine(tdcX, 0, tdcX, h);
}
private String formatTdcPosition() {
if ((int) tdcPosition == tdcPosition)
return Integer.toString((int) tdcPosition);
return Double.toString(tdcPosition);
}
}
}

BIN
java_tools/version2header.jar
View File

Binary file not shown.

3
java_tools/version2header/src/com/rusefi/Version2Header.java
View File

@ -7,7 +7,7 @@ import java.util.Date;
* Andrey Belomutskiy (c) 2014
*/
public class Version2Header {
private static final String NL = System.getProperty("line.separator");
private static final String NL = "\n";//System.getProperty("line.separator");
private static final String COMMAND = "svn info";
private static final String VERSION_MARKER = "Last Changed Rev: ";
@ -15,6 +15,7 @@ public class Version2Header {
public static void main(String[] args) throws IOException {
System.out.println("Hi, it's " + new Date());
System.out.println("Working with " + NL.length() + " line ends");
Process simulatorProcess = null;
try {
System.out.println("Executing [" + COMMAND + "]");

20
misc/build_current_bundle.bat
View File

@ -3,7 +3,10 @@ rem This script would compile firmware, dev console and win32 simulator into a s
rem This script depends on Cygwin tools: zip
rem
echo Hello rusEfi
echo Hello rusEfi build full bundle
java -version
echo %date% %time%
echo Building win32 functional tests
@ -115,5 +118,18 @@ pwd
zip -j rusefi_simulator.zip win32_functional_tests/build/rusefi_simulator.exe firmware/tunerstudio/rusefi.ini java_console_binary/rusefi_console.jar
echo open ftp://u71977750-build:%RUSEFI_BUILD_FTP_PASS%@rusefi.com/ > ftp_commands.txt
echo binary >> ftp_commands.txt
echo put rusefi_bundle.zip >> ftp_commands.txt
echo cd separate_files >> ftp_commands.txt
echo put rusefi_simulator.zip >> ftp_commands.txt
echo put rusefi_console.zip >> ftp_commands.txt
echo exit >> ftp_commands.txt
echo %date% %time%
echo "DONE here"
echo "DONE here"

21
misc/unit_tests.bat
View File

@ -12,9 +12,9 @@ if not exist build/rusefi.hex echo FAILED TO COMPILE FIRMWARE
if not exist build/rusefi.hex exit -1
cd ..
echo We are in root folder
pwd
echo Preparing firmware-only fast upload
zip -j firmware/build/rusefi_firmware.zip firmware/svnversion.h firmware/build/rusefi.hex firmware/build/rusefi.bin firmware/build/rusefi.elf firmware/tunerstudio/rusefi.ini
cd unit_tests
@ -25,9 +25,24 @@ ls -l build
if not exist build/rusefi_test.exe echo FAILED TO COMPILE UNIT TESTS
if not exist build/rusefi_test.exe exit -1
echo Looks good, now executing
echo Unit tests build looks good, now executing unit tests
cd build
call rusefi_test.exe
IF NOT ERRORLEVEL echo UNIT TEST FAILED
IF NOT ERRORLEVEL 0 EXIT /B 1
cd ..
cd ..
echo Back to root folder
pwd
echo Preparing firmware-only fast upload
zip -j firmware/build/rusefi_firmware.zip firmware/svnversion.h firmware/build/rusefi.hex firmware/build/rusefi.bin firmware/build/rusefi.elf firmware/tunerstudio/rusefi.ini
echo Now uploading only firmware
ncftpput -u u71977750-build -p %RUSEFI_BUILD_FTP_PASS% rusefi.com separate_files firmware/build/rusefi_firmware.zip

63
unit_tests/.cproject
View File

@ -28,23 +28,23 @@
<option id="gnu.cpp.compiler.cygwin.exe.debug.option.debugging.level.2019038432" name="Debug Level" superClass="gnu.cpp.compiler.cygwin.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
<option id="gnu.cpp.compiler.option.other.other.1220149077" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -fmessage-length=0" valueType="string"/>
<option id="gnu.cpp.compiler.option.include.paths.1280999160" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/firmware/chibios/os/kernel/include&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/firmware/chibios/os/various&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/test_basic_math&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/test_data_structures&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/engines&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/ext_algo/nmea&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/ext_algo&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/controllers/math&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/controllers&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/controllers/sensors&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/controllers/algo&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/controllers/trigger&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/controllers/trigger/decoders&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/controllers/core&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/controllers/system&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/util&quot;"/>
<listOptionValue builtIn="false" value="&quot;..&quot;"/>
<listOptionValue builtIn="false" value="&quot;../../firmware/chibios/os/kernel/include&quot;"/>
<listOptionValue builtIn="false" value="&quot;../../firmware/chibios/os/various&quot;"/>
<listOptionValue builtIn="false" value="&quot;../test_basic_math&quot;"/>
<listOptionValue builtIn="false" value="&quot;../test_data_structures&quot;"/>
<listOptionValue builtIn="false" value="&quot;../engines&quot;"/>
<listOptionValue builtIn="false" value="&quot;../ext_algo&quot;"/>
<listOptionValue builtIn="false" value="&quot;../ext_algo/nmea&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/math&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/sensors&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/algo&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/trigger&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/trigger/decoders&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/core&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/system&quot;"/>
<listOptionValue builtIn="false" value="&quot;../util&quot;"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.cygwin.1681941669" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input.cygwin"/>
</tool>
@ -53,21 +53,22 @@
<option id="gnu.c.compiler.cygwin.exe.debug.option.debugging.level.600286923" name="Debug Level" superClass="gnu.c.compiler.cygwin.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.max" valueType="enumerated"/>
<option id="gnu.c.compiler.option.misc.other.1016166105" name="Other flags" superClass="gnu.c.compiler.option.misc.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 -std=gnu99 -fgnu89-inline -Werror-implicit-function-declaration" valueType="string"/>
<option id="gnu.c.compiler.option.include.paths.811604738" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/test_basic_math&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/test_data_structures&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/engines&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/ext_algo/nmea&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/ext_algo&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/controllers&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/controllers/math&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/controllers/sensors&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/controllers/algo&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/controllers/trigger&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/controllers/core&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/controllers/system&quot;"/>
<listOptionValue builtIn="false" value="&quot;/cygdrive/c/stuff/rusefi_sourceforge/unit_tests/util&quot;"/>
<listOptionValue builtIn="false" value="&quot;..&quot;"/>
<listOptionValue builtIn="false" value="&quot;../test_basic_math&quot;"/>
<listOptionValue builtIn="false" value="&quot;../test_data_structures&quot;"/>
<listOptionValue builtIn="false" value="&quot;../engines&quot;"/>
<listOptionValue builtIn="false" value="&quot;../ext_algo&quot;"/>
<listOptionValue builtIn="false" value="&quot;../ext_algo/nmea&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/math&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/sensors&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/algo&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/trigger&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/core&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/system&quot;"/>
<listOptionValue builtIn="false" value="&quot;../util&quot;"/>
</option>
<option id="gnu.c.compiler.option.dialect.std.1158018789" name="Language standard" superClass="gnu.c.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.c.compiler.dialect.default" valueType="enumerated"/>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.cygwin.1693315995" superClass="cdt.managedbuild.tool.gnu.c.compiler.input.cygwin"/>
</tool>
<tool id="cdt.managedbuild.tool.gnu.c.linker.cygwin.exe.debug.1531611540" name="Cygwin C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.cygwin.exe.debug"/>