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

auto-sync

This commit is contained in:
rusEfi 2015-02-22 09:05:13 -06:00
parent 026f2ca359
commit ca4a5746c8
9 changed files with 92 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/config/engines/citroenBerlingoTU3JP.cpp
View File

@ -1,7 +1,8 @@
/** /**
* @file citroenBerlingoTU3JP.cpp * @file citroenBerlingoTU3JP.cpp
* *
* CITROEN_TU3JP: engine_type 15 * CITROEN_TU3JP
* set_engine_type 15
* Board pin out for Frankenstein * Board pin out for Frankenstein
* *
* This config overrides some values of the default configuration which is set by setDefaultConfiguration() method * This config overrides some values of the default configuration which is set by setDefaultConfiguration() method
@ -53,6 +54,9 @@ static const ignition_table_t tps_advance_table = {
{/*15 engineLoad=100.00*/ /*0 800.0*/+12.00, /*1 1213.0*/+13.20, /*2 1626.0*/+14.40, /*3 2040.0*/+15.60, /*4 2453.0*/+16.80, /*5 2866.0*/+18.00, /*6 3280.0*/+19.20, /*7 3693.0*/+20.40, /*8 4106.0*/+21.60, /*9 4520.0*/+22.80, /*10 4933.0*/+24.00, /*11 5346.0*/+25.20, /*12 5760.0*/+26.40, /*13 6173.0*/+27.60, /*14 6586.0*/+28.80, /*15 7000.0*/+30.00} {/*15 engineLoad=100.00*/ /*0 800.0*/+12.00, /*1 1213.0*/+13.20, /*2 1626.0*/+14.40, /*3 2040.0*/+15.60, /*4 2453.0*/+16.80, /*5 2866.0*/+18.00, /*6 3280.0*/+19.20, /*7 3693.0*/+20.40, /*8 4106.0*/+21.60, /*9 4520.0*/+22.80, /*10 4933.0*/+24.00, /*11 5346.0*/+25.20, /*12 5760.0*/+26.40, /*13 6173.0*/+27.60, /*14 6586.0*/+28.80, /*15 7000.0*/+30.00}
}; };
static const float rpmSteps[16] = {800, 1200, 1600, 2000, 2500, 2800,
3280, 3693.0, 4106.0, 4520.0, 4933.0, 5346.0, 5760.0, 6173.0, 6586.0, 7000.0};
void setCitroenBerlingoTU3JPConfiguration(engine_configuration_s *engineConfiguration) { void setCitroenBerlingoTU3JPConfiguration(engine_configuration_s *engineConfiguration) {
board_configuration_s *boardConfiguration = &engineConfiguration->bc; board_configuration_s *boardConfiguration = &engineConfiguration->bc;
@ -73,6 +77,8 @@ void setCitroenBerlingoTU3JPConfiguration(engine_configuration_s *engineConfigur
engineConfiguration->rpmHardLimit = 5000; engineConfiguration->rpmHardLimit = 5000;
engineConfiguration->cranking.rpm = 600; engineConfiguration->cranking.rpm = 600;
memcpy(engineConfiguration->ve2RpmBins, rpmSteps, sizeof(rpmSteps));
/** /**
* Cranking fuel setting * Cranking fuel setting
* TODO: they recomend using something like -40C for low point and +80C for high point * TODO: they recomend using something like -40C for low point and +80C for high point

2
firmware/config/stm32f4ems/efifeatures.h
View File

@ -18,6 +18,8 @@
#define EFI_USE_CCM TRUE #define EFI_USE_CCM TRUE
#define EFI_ENABLE_ASSERTS TRUE
#ifndef EFI_ENABLE_ASSERTS #ifndef EFI_ENABLE_ASSERTS
#define EFI_ENABLE_ASSERTS FALSE #define EFI_ENABLE_ASSERTS FALSE
#endif /* EFI_ENABLE_ASSERTS */ #endif /* EFI_ENABLE_ASSERTS */

2
firmware/rusefi.cpp
View File

@ -278,5 +278,5 @@ int getRusEfiVersion(void) {
return 1; // this is here to make the compiler happy about the unused array return 1; // this is here to make the compiler happy about the unused array
if (UNUSED_CCM_SIZE == 0) if (UNUSED_CCM_SIZE == 0)
return 1; // this is here to make the compiler happy about the unused array return 1; // this is here to make the compiler happy about the unused array
return 20150220; return 20150222;
} }

27
java_console/.idea/runConfigurations/Launcher_COM18.xml Normal file
View File

@ -0,0 +1,27 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Launcher COM18" type="Application" factoryName="Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" value="com.rusefi.Launcher" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="COM18" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<module name="ui" />
<envs />
<RunnerSettings RunnerId="Cover" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Cover" />
<ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
<method />
</configuration>
</component>

17
java_console/.idea/runConfigurations/Launcher_COM37.xml Normal file
View File

@ -0,0 +1,17 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Launcher COM37" type="Application" factoryName="Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" value="com.rusefi.Launcher" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="COM37" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<module name="ui" />
<envs />
<method />
</configuration>
</component>

17
java_console/.idea/runConfigurations/Launcher_COM41.xml Normal file
View File

@ -0,0 +1,17 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Launcher COM41" type="Application" factoryName="Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" value="com.rusefi.Launcher" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="COM41" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<module name="ui" />
<envs />
<method />
</configuration>
</component>

3
java_console/.idea/runConfigurations/Launcher_COM7.xml
View File

@ -1,6 +1,7 @@
<component name="ProjectRunConfigurationManager"> <component name="ProjectRunConfigurationManager">
<configuration default="false" name="Launcher COM7" type="Application" factoryName="Application"> <configuration default="false" name="Launcher COM7" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" value="com.irnems.Launcher" /> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" value="com.rusefi.Launcher" />
<option name="VM_PARAMETERS" value="" /> <option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="COM7" /> <option name="PROGRAM_PARAMETERS" value="COM7" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />

14
java_console/autotest/src/com/rusefi/AutoTest.java
View File

@ -18,6 +18,7 @@ import static com.rusefi.TestingUtils.*;
*/ */
public class AutoTest { public class AutoTest {
private static void mainTestBody() { private static void mainTestBody() {
testCitroenBerlingo();
testMazda626(); testMazda626();
test2003DodgeNeon(); test2003DodgeNeon();
testFordAspire(); testFordAspire();
@ -27,18 +28,25 @@ public class AutoTest {
testFordFiesta(); testFordFiesta();
} }
private static void testCitroenBerlingo() {
sendCommand("set_engine_type 15");
// time to change engine type
nextChart();
String msg = "Citroen";
// todo: add more content
}
private static void testMazda626() { private static void testMazda626() {
sendCommand("set_engine_type 28"); sendCommand("set_engine_type 28");
WaveChart chart; WaveChart chart;
// time to change engine type // time to change engine type
nextChart(); nextChart();
String msg = "Mazda 626"; String msg = "mazda 626 default cranking";
IoUtil.changeRpm(200); IoUtil.changeRpm(200);
chart = nextChart(); chart = nextChart();
double x = 275; double x = 275;
assertWave("aspire default cranking ", chart, WaveChart.SPARK_1, 0.1944, x, x + 180, x + 360, x + 540); assertWave(msg, chart, WaveChart.SPARK_1, 0.1944, x, x + 180, x + 360, x + 540);
} }
private static void test2003DodgeNeon() { private static void test2003DodgeNeon() {

8
java_console/ui/src/com/rusefi/CmdLine.java Normal file
View File

@ -0,0 +1,8 @@
package com.rusefi;
/**
* (c) Andrey Belomutskiy 2013-2015
* 2/22/2015
*/
public class CmdLine {
}