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-04-03 19:01:59 -04:00
parent 6d0c94fc63
commit d36edd5f03
13 changed files with 55 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
firmware/config/engines/custom_engine.cpp
View File

@ -18,6 +18,24 @@
EXTERN_ENGINE;
void setFrankenso_01_LCD(board_configuration_s *boardConfiguration) {
boardConfiguration->HD44780_rs = GPIOE_7;
boardConfiguration->HD44780_e = GPIOE_9;
boardConfiguration->HD44780_db4 = GPIOE_11;
boardConfiguration->HD44780_db5 = GPIOE_13;
boardConfiguration->HD44780_db6 = GPIOE_15;
boardConfiguration->HD44780_db7 = GPIOB_10;
}
void disableLCD(board_configuration_s *boardConfiguration) {
boardConfiguration->HD44780_rs = GPIO_UNASSIGNED;
boardConfiguration->HD44780_e = GPIO_UNASSIGNED;
boardConfiguration->HD44780_db4 = GPIO_UNASSIGNED;
boardConfiguration->HD44780_db5 = GPIO_UNASSIGNED;
boardConfiguration->HD44780_db6 = GPIO_UNASSIGNED;
boardConfiguration->HD44780_db7 = GPIO_UNASSIGNED;
}
void setCustomEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->trigger.type = TT_ONE_PLUS_ONE;

2
firmware/config/engines/custom_engine.h
View File

@ -10,5 +10,7 @@
#include "engine.h"
void setCustomEngineConfiguration(DECLARE_ENGINE_PARAMETER_F);
void setFrankenso_01_LCD(board_configuration_s *boardConfiguration);
void disableLCD(board_configuration_s *boardConfiguration);
#endif /* CONFIG_ENGINES_CUSTOM_ENGINE_H_ */

3
firmware/config/engines/dodge_neon.cpp
View File

@ -28,8 +28,7 @@
#include "HIP9011.h"
#endif
// setFrankenso_01_LCD
#include "honda_accord.h"
#include "custom_engine.h"
#define xxxxx 12

3
firmware/config/engines/ford_festiva.cpp
View File

@ -14,8 +14,7 @@
#include "ego.h"
#include "fsio_impl.h"
#include "mazda_miata.h"
// this is about LCD method, TODO FIX IT FINALLY
#include "honda_accord.h"
#include "custom_engine.h"
static const ignition_table_t racingFestivaIgnitionTable = {
/* Generated by TS2C on Mon Feb 08 13:59:57 EST 2016*/

10
firmware/config/engines/honda_accord.cpp
View File

@ -25,15 +25,7 @@
#include "engine_math.h"
#include "settings.h"
#include "advance_map.h"
void setFrankenso_01_LCD(board_configuration_s *boardConfiguration) {
boardConfiguration->HD44780_rs = GPIOE_7;
boardConfiguration->HD44780_e = GPIOE_9;
boardConfiguration->HD44780_db4 = GPIOE_11;
boardConfiguration->HD44780_db5 = GPIOE_13;
boardConfiguration->HD44780_db6 = GPIOE_15;
boardConfiguration->HD44780_db7 = GPIOB_10;
}
#include "custom_engine.h"
EXTERN_ENGINE;

1
firmware/config/engines/honda_accord.h
View File

@ -10,7 +10,6 @@
#include "engine.h"
void setFrankenso_01_LCD(board_configuration_s *boardConfiguration);
void setHondaAccordConfigurationTwoWires(DECLARE_ENGINE_PARAMETER_F);
void setHondaAccordConfigurationThreeWires(DECLARE_ENGINE_PARAMETER_F);
void setHondaAccordConfigurationDip(DECLARE_ENGINE_PARAMETER_F);

1
firmware/config/engines/lada_kalina.cpp
View File

@ -16,6 +16,7 @@ EXTERN_ENGINE;
void setLadaKalina(DECLARE_ENGINE_PARAMETER_F) {
setCustomEngineConfiguration(PASS_ENGINE_PARAMETER_F);
disableLCD(boardConfiguration);
boardConfiguration->HD44780_rs = GPIO_UNASSIGNED;
boardConfiguration->HD44780_e = GPIO_UNASSIGNED;

2
firmware/config/engines/mazda_miata.cpp
View File

@ -20,7 +20,7 @@
#include "engine_math.h"
#include "advance_map.h"
#include "allsensors.h"
#include "honda_accord.h"
#include "custom_engine.h"
static const fuel_table_t miata_maf_fuel_table = { {/*0 engineLoad=1.2*//*0 800.0*/1.53, /*1 1213.0*/0.92, /*2 1626.0*/
0.74, /*3 2040.0*/0.69, /*4 2453.0*/0.69, /*5 2866.0*/0.67, /*6 3280.0*/0.67, /*7 3693.0*/0.67, /*8 4106.0*/

2
firmware/config/engines/subaru.cpp
View File

@ -9,7 +9,7 @@
*/
#include "subaru.h"
#include "honda_accord.h"
#include "custom_engine.h"
EXTERN_ENGINE;

9
firmware/hw_layer/hardware.cpp
View File

@ -230,15 +230,6 @@ void initHardware(Logging *l) {
initHistogramsModule();
#endif /* EFI_HISTOGRAMS */
#if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__)
/**
* This is so early because we want to init logger
* which would be used while finding trigger synch index
* while reading configuration
*/
initTriggerDecoderLogger(sharedLogger);
#endif
/**
* We need the LED_ERROR pin even before we read configuration
*/

13
firmware/rusefi.cpp
View File

@ -167,12 +167,22 @@ void applyNewConfiguration(void) {
void runRusEfi(void) {
efiAssertVoid(getRemainingStack(chThdSelf()) > 512, "init s");
initIntermediateLoggingBuffer();
initErrorHandling();
#if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__)
/**
* This is so early because we want to init logger
* which would be used while finding trigger synch index
* while reading configuration
*/
initTriggerDecoderLogger(&sharedLogger);
#endif
/**
* First thing is reading configuration from flash memory.
* In order to have complete flexibility configuration has to go before anything else.
*/
// readConfiguration(&sharedLogger);
readConfiguration(&sharedLogger);
msObjectInit(&firmwareErrorMessageStream, errorMessageBuffer, sizeof(errorMessageBuffer), 0);
@ -180,7 +190,6 @@ void runRusEfi(void) {
engine->engineConfiguration2 = engineConfiguration2;
#endif
initErrorHandling();
prepareVoidConfiguration(&activeConfiguration);

2
java_console/.idea/runConfigurations/Launcher_COM12.xml
View File

@ -1,5 +1,5 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Launcher COM12" type="Application" factoryName="Application">
<configuration default="false" name="Launcher COM12" type="Application" factoryName="Application" folderName="1x">
<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="" />

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

@ -0,0 +1,17 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Launcher COM58" type="Application" factoryName="Application" folderName="5x">
<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="COM58 38400" />
<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>