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

auto-sync

This commit is contained in:
rusEfi 2014-11-22 15:03:22 -06:00
parent 11670b61e0
commit 0aa93c89d4
6 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/config/efifeatures.h
View File

@ -12,7 +12,9 @@
#define EFI_USE_CCM TRUE
#define EFI_ENABLE_ASSERTS TRUE
#ifndef EFI_ENABLE_ASSERTS
#define EFI_ENABLE_ASSERTS TRUE
#endif /* EFI_ENABLE_ASSERTS */
//#define EFI_UART_ECHO_TEST_MODE TRUE

1
firmware/controllers/algo/engine_configuration.cpp
View File

@ -293,6 +293,7 @@ void setDefaultConfiguration(engine_configuration_s *engineConfiguration, board_
boardConfiguration->idleSolenoidFrequency = 200;
boardConfiguration->idleSolenoidPwm = 0.5;
engineConfiguration->targetIdleRpm = 1200;
// engineConfiguration->idleMode = IM_AUTO;
engineConfiguration->idleMode = IM_MANUAL;

4
firmware/controllers/algo/engine_configuration.h
View File

@ -495,7 +495,9 @@ typedef struct {
float ignitionDwellForCrankingMs;
int unused3[93];
int targetIdleRpm;
int unused3[92];
} engine_configuration_s;

6
firmware/controllers/algo/idle_controller.cpp
View File

@ -20,9 +20,11 @@
static int lastGoodValue = DEFAULT_IDLE_DUTY;
void idleInit(IdleValveState *idle) {
EXTERN_ENGINE;
void idleInit(IdleValveState *idle DECLARE_ENGINE_PARAMETER_S) {
idle->value = DEFAULT_IDLE_DUTY;
setIdleRpm(idle, DEFAULT_TARGET_RPM);
setIdleRpm(idle, engineConfiguration->targetIdleRpm);
idle->timeOfLastIdleChange = 0;
}

9
firmware/controllers/algo/idle_controller.h
View File

@ -5,15 +5,14 @@
* @author Andrey Belomutskiy, (c) 2012-2014
*/
#include "engine.h"
#ifndef IDLE_CONTROLLER_H_
#define IDLE_CONTROLLER_H_
// 700‰ duty cycle by default
// 600‰ duty cycle by default
#define DEFAULT_IDLE_DUTY 600
#define DEFAULT_TARGET_RPM 1000
//#define DEFAULT_TARGET_RPM 2000
#define IDLE_PERIOD 1
// Per mil (1/1000) values
@ -32,7 +31,7 @@ public:
int timeOfLastIdleChange;
};
void idleInit(IdleValveState *idle);
void idleInit(IdleValveState *idle DECLARE_ENGINE_PARAMETER_S);
int getIdle(IdleValveState *idle, int currentRpm, int time);
void setIdleRpm(IdleValveState *idle, int targetRpm);

2
firmware/controllers/flash_main.h
View File

@ -12,7 +12,7 @@
#include "engine_configuration.h"
#include "engine.h"
#define FLASH_DATA_VERSION 5466
#define FLASH_DATA_VERSION 5472
void readFromFlash(void);
void initFlash(Engine *engine);