andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2016-01-23 12:02:44 -05:00
parent fa151b09a3
commit ae9ad1cab7
2 changed files with 5 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
firmware/.cproject
View File

@ -62,7 +62,6 @@
<listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/> <listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config&quot;"/> <listOptionValue builtIn="false" value="&quot;../config&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/> <listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config/boards&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/algo&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/algo&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/core&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/core&quot;"/>
@ -75,16 +74,10 @@
<listOptionValue builtIn="false" value="&quot;../development/test&quot;"/> <listOptionValue builtIn="false" value="&quot;../development/test&quot;"/>
<listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/> <listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer&quot;"/> <listOptionValue builtIn="false" value="&quot;../hw_layer&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer/flash&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer/lcd&quot;"/> <listOptionValue builtIn="false" value="&quot;../hw_layer/lcd&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer/serial_over_usb&quot;"/> <listOptionValue builtIn="false" value="&quot;../hw_layer/serial_over_usb&quot;"/>
<listOptionValue builtIn="false" value="&quot;../russianefi&quot;"/>
<listOptionValue builtIn="false" value="&quot;../russianefi/algo&quot;"/>
<listOptionValue builtIn="false" value="&quot;../russianefi/ckp&quot;"/>
<listOptionValue builtIn="false" value="&quot;../russianefi/adc&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config/system&quot;"/> <listOptionValue builtIn="false" value="&quot;../config/system&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config/stm32f4ems&quot;"/> <listOptionValue builtIn="false" value="&quot;../config/stm32f4ems&quot;"/>
<listOptionValue builtIn="false" value="&quot;../splib&quot;"/>
<listOptionValue builtIn="false" value="&quot;../chibios/os/kernel/include&quot;"/> <listOptionValue builtIn="false" value="&quot;../chibios/os/kernel/include&quot;"/>
<listOptionValue builtIn="false" value="&quot;../chibios/boards/ST_STM32F4_DISCOVERY&quot;"/> <listOptionValue builtIn="false" value="&quot;../chibios/boards/ST_STM32F4_DISCOVERY&quot;"/>
<listOptionValue builtIn="false" value="&quot;../chibios/os/hal/src&quot;"/> <listOptionValue builtIn="false" value="&quot;../chibios/os/hal/src&quot;"/>
@ -123,7 +116,6 @@
<listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/> <listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config&quot;"/> <listOptionValue builtIn="false" value="&quot;../config&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/> <listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config/boards&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/algo&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/algo&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/core&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/core&quot;"/>
@ -136,16 +128,10 @@
<listOptionValue builtIn="false" value="&quot;../development/test&quot;"/> <listOptionValue builtIn="false" value="&quot;../development/test&quot;"/>
<listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/> <listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer&quot;"/> <listOptionValue builtIn="false" value="&quot;../hw_layer&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer/flash&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer/lcd&quot;"/> <listOptionValue builtIn="false" value="&quot;../hw_layer/lcd&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer/serial_over_usb&quot;"/> <listOptionValue builtIn="false" value="&quot;../hw_layer/serial_over_usb&quot;"/>
<listOptionValue builtIn="false" value="&quot;../russianefi&quot;"/>
<listOptionValue builtIn="false" value="&quot;../russianefi/algo&quot;"/>
<listOptionValue builtIn="false" value="&quot;../russianefi/ckp&quot;"/>
<listOptionValue builtIn="false" value="&quot;../russianefi/adc&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config/system&quot;"/> <listOptionValue builtIn="false" value="&quot;../config/system&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config/stm32f4ems&quot;"/> <listOptionValue builtIn="false" value="&quot;../config/stm32f4ems&quot;"/>
<listOptionValue builtIn="false" value="&quot;../splib&quot;"/>
<listOptionValue builtIn="false" value="&quot;../chibios/os/kernel/include&quot;"/> <listOptionValue builtIn="false" value="&quot;../chibios/os/kernel/include&quot;"/>
<listOptionValue builtIn="false" value="&quot;../chibios/boards/ST_STM32F4_DISCOVERY&quot;"/> <listOptionValue builtIn="false" value="&quot;../chibios/boards/ST_STM32F4_DISCOVERY&quot;"/>
<listOptionValue builtIn="false" value="&quot;../chibios/os/hal/src&quot;"/> <listOptionValue builtIn="false" value="&quot;../chibios/os/hal/src&quot;"/>
@ -354,7 +340,6 @@
<listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/> <listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config&quot;"/> <listOptionValue builtIn="false" value="&quot;../config&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/> <listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config/boards&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/algo&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/algo&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/core&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/core&quot;"/>
@ -367,16 +352,10 @@
<listOptionValue builtIn="false" value="&quot;../development/test&quot;"/> <listOptionValue builtIn="false" value="&quot;../development/test&quot;"/>
<listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/> <listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer&quot;"/> <listOptionValue builtIn="false" value="&quot;../hw_layer&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer/flash&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer/lcd&quot;"/> <listOptionValue builtIn="false" value="&quot;../hw_layer/lcd&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer/serial_over_usb&quot;"/> <listOptionValue builtIn="false" value="&quot;../hw_layer/serial_over_usb&quot;"/>
<listOptionValue builtIn="false" value="&quot;../russianefi&quot;"/>
<listOptionValue builtIn="false" value="&quot;../russianefi/algo&quot;"/>
<listOptionValue builtIn="false" value="&quot;../russianefi/ckp&quot;"/>
<listOptionValue builtIn="false" value="&quot;../russianefi/adc&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config/system&quot;"/> <listOptionValue builtIn="false" value="&quot;../config/system&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config/stm32f1egt&quot;"/> <listOptionValue builtIn="false" value="&quot;../config/stm32f1egt&quot;"/>
<listOptionValue builtIn="false" value="&quot;../splib&quot;"/>
<listOptionValue builtIn="false" value="&quot;../chibios/os/kernel/include&quot;"/> <listOptionValue builtIn="false" value="&quot;../chibios/os/kernel/include&quot;"/>
<listOptionValue builtIn="false" value="&quot;../chibios/boards/ST_NUCLEO_F103RB&quot;"/> <listOptionValue builtIn="false" value="&quot;../chibios/boards/ST_NUCLEO_F103RB&quot;"/>
<listOptionValue builtIn="false" value="&quot;../chibios/os/hal/src&quot;"/> <listOptionValue builtIn="false" value="&quot;../chibios/os/hal/src&quot;"/>
@ -410,7 +389,6 @@
<listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/> <listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config&quot;"/> <listOptionValue builtIn="false" value="&quot;../config&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/> <listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config/boards&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/algo&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/algo&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/core&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/core&quot;"/>
@ -425,7 +403,6 @@
<listOptionValue builtIn="false" value="&quot;../hw_layer&quot;"/> <listOptionValue builtIn="false" value="&quot;../hw_layer&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer/stm32f1&quot;"/> <listOptionValue builtIn="false" value="&quot;../hw_layer/stm32f1&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer/algo&quot;"/> <listOptionValue builtIn="false" value="&quot;../hw_layer/algo&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer/flash&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer/lcd&quot;"/> <listOptionValue builtIn="false" value="&quot;../hw_layer/lcd&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer/serial_over_usb&quot;"/> <listOptionValue builtIn="false" value="&quot;../hw_layer/serial_over_usb&quot;"/>
<listOptionValue builtIn="false" value="&quot;../russianefi&quot;"/> <listOptionValue builtIn="false" value="&quot;../russianefi&quot;"/>
@ -535,7 +512,6 @@
<listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/> <listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config&quot;"/> <listOptionValue builtIn="false" value="&quot;../config&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/> <listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config/boards&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/algo&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/algo&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/core&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/core&quot;"/>
@ -550,7 +526,6 @@
<listOptionValue builtIn="false" value="&quot;../hw_layer&quot;"/> <listOptionValue builtIn="false" value="&quot;../hw_layer&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer/stm32f1&quot;"/> <listOptionValue builtIn="false" value="&quot;../hw_layer/stm32f1&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer/algo&quot;"/> <listOptionValue builtIn="false" value="&quot;../hw_layer/algo&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer/flash&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer/lcd&quot;"/> <listOptionValue builtIn="false" value="&quot;../hw_layer/lcd&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer/serial_over_usb&quot;"/> <listOptionValue builtIn="false" value="&quot;../hw_layer/serial_over_usb&quot;"/>
<listOptionValue builtIn="false" value="&quot;../russianefi&quot;"/> <listOptionValue builtIn="false" value="&quot;../russianefi&quot;"/>
@ -655,7 +630,6 @@
<listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/> <listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config&quot;"/> <listOptionValue builtIn="false" value="&quot;../config&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/> <listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config/boards&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/algo&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/algo&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/core&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/core&quot;"/>
@ -668,16 +642,10 @@
<listOptionValue builtIn="false" value="&quot;../development/test&quot;"/> <listOptionValue builtIn="false" value="&quot;../development/test&quot;"/>
<listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/> <listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer&quot;"/> <listOptionValue builtIn="false" value="&quot;../hw_layer&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer/flash&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer/lcd&quot;"/> <listOptionValue builtIn="false" value="&quot;../hw_layer/lcd&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer/serial_over_usb&quot;"/> <listOptionValue builtIn="false" value="&quot;../hw_layer/serial_over_usb&quot;"/>
<listOptionValue builtIn="false" value="&quot;../russianefi&quot;"/>
<listOptionValue builtIn="false" value="&quot;../russianefi/algo&quot;"/>
<listOptionValue builtIn="false" value="&quot;../russianefi/ckp&quot;"/>
<listOptionValue builtIn="false" value="&quot;../russianefi/adc&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config/system&quot;"/> <listOptionValue builtIn="false" value="&quot;../config/system&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config/stm32f4ems&quot;"/> <listOptionValue builtIn="false" value="&quot;../config/stm32f4ems&quot;"/>
<listOptionValue builtIn="false" value="&quot;../splib&quot;"/>
<listOptionValue builtIn="false" value="&quot;../chibios/os/kernel/include&quot;"/> <listOptionValue builtIn="false" value="&quot;../chibios/os/kernel/include&quot;"/>
<listOptionValue builtIn="false" value="&quot;../chibios/boards/ST_STM32F4_DISCOVERY&quot;"/> <listOptionValue builtIn="false" value="&quot;../chibios/boards/ST_STM32F4_DISCOVERY&quot;"/>
<listOptionValue builtIn="false" value="&quot;../chibios/os/hal/src&quot;"/> <listOptionValue builtIn="false" value="&quot;../chibios/os/hal/src&quot;"/>
@ -716,7 +684,6 @@
<listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/> <listOptionValue builtIn="false" value="&quot;../console/binary&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config&quot;"/> <listOptionValue builtIn="false" value="&quot;../config&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/> <listOptionValue builtIn="false" value="&quot;../config/engines&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config/boards&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/algo&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/algo&quot;"/>
<listOptionValue builtIn="false" value="&quot;../controllers/core&quot;"/> <listOptionValue builtIn="false" value="&quot;../controllers/core&quot;"/>
@ -729,16 +696,10 @@
<listOptionValue builtIn="false" value="&quot;../development/test&quot;"/> <listOptionValue builtIn="false" value="&quot;../development/test&quot;"/>
<listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/> <listOptionValue builtIn="false" value="&quot;../development/hw_layer&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer&quot;"/> <listOptionValue builtIn="false" value="&quot;../hw_layer&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer/flash&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer/lcd&quot;"/> <listOptionValue builtIn="false" value="&quot;../hw_layer/lcd&quot;"/>
<listOptionValue builtIn="false" value="&quot;../hw_layer/serial_over_usb&quot;"/> <listOptionValue builtIn="false" value="&quot;../hw_layer/serial_over_usb&quot;"/>
<listOptionValue builtIn="false" value="&quot;../russianefi&quot;"/>
<listOptionValue builtIn="false" value="&quot;../russianefi/algo&quot;"/>
<listOptionValue builtIn="false" value="&quot;../russianefi/ckp&quot;"/>
<listOptionValue builtIn="false" value="&quot;../russianefi/adc&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config/system&quot;"/> <listOptionValue builtIn="false" value="&quot;../config/system&quot;"/>
<listOptionValue builtIn="false" value="&quot;../config/stm32f4ems&quot;"/> <listOptionValue builtIn="false" value="&quot;../config/stm32f4ems&quot;"/>
<listOptionValue builtIn="false" value="&quot;../splib&quot;"/>
<listOptionValue builtIn="false" value="&quot;../chibios/os/kernel/include&quot;"/> <listOptionValue builtIn="false" value="&quot;../chibios/os/kernel/include&quot;"/>
<listOptionValue builtIn="false" value="&quot;../chibios/boards/ST_STM32F4_DISCOVERY&quot;"/> <listOptionValue builtIn="false" value="&quot;../chibios/boards/ST_STM32F4_DISCOVERY&quot;"/>
<listOptionValue builtIn="false" value="&quot;../chibios/os/hal/src&quot;"/> <listOptionValue builtIn="false" value="&quot;../chibios/os/hal/src&quot;"/>

6
firmware/controllers/settings.cpp
View File

@ -192,6 +192,10 @@ const char* getConfigurationName(engine_type_e engineType) {
return "DODGE_RAM"; return "DODGE_RAM";
case MAZDA_626: case MAZDA_626:
return "Mazda626"; return "Mazda626";
case TOYOTA_JZS147:
return "TOYOTA_JZS147";
case LADA_KALINA:
return "LADA_KALINA";
default: default:
return "UnknownType"; return "UnknownType";
} }
@ -508,7 +512,6 @@ static void setIndividualCoilsIgnition(void) {
setIgnitionMode((int)IM_INDIVIDUAL_COILS); setIgnitionMode((int)IM_INDIVIDUAL_COILS);
} }
static void setTriggerType(int value) { static void setTriggerType(int value) {
engineConfiguration->trigger.type = (trigger_type_e) value; engineConfiguration->trigger.type = (trigger_type_e) value;
incrementGlobalConfigurationVersion(); incrementGlobalConfigurationVersion();
@ -516,6 +519,7 @@ static void setTriggerType(int value) {
} }
static void setToothedWheel(int total, int skipped) { static void setToothedWheel(int total, int skipped) {
engineConfiguration->trigger.type = TT_TOOTHED_WHEEL;
scheduleMsg(&logger, "toothed: total=%d/skipped=%d", total, skipped); scheduleMsg(&logger, "toothed: total=%d/skipped=%d", total, skipped);
setToothedWheelConfiguration(&engine->triggerShape, total, skipped, engineConfiguration->operationMode); setToothedWheelConfiguration(&engine->triggerShape, total, skipped, engineConfiguration->operationMode);
// initializeTriggerShape(&logger, engineConfiguration, engineConfiguration2); // initializeTriggerShape(&logger, engineConfiguration, engineConfiguration2);