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-09-17 11:03:00 -04:00
parent 5a7c5f2222
commit 028707e497
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,8 +45,8 @@ void setMazda626EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->injector.flow = 330;
engineConfiguration->specs.displacement = 2.0;
// set_global_trigger_offset_angle 284
engineConfiguration->globalTriggerAngleOffset = 284;
// set_global_trigger_offset_angle 106
engineConfiguration->globalTriggerAngleOffset = 106;
// set_ignition_mode 2
engineConfiguration->ignitionMode = IM_WASTED_SPARK;
@ -55,9 +55,9 @@ void setMazda626EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->crankingChargeAngle = 70;
// set_cranking_fuel 9
engineConfiguration->cranking.baseFuel = 9;
engineConfiguration->cranking.baseFuel = 2.5;
engineConfiguration->rpmHardLimit = 6000;
engineConfiguration->rpmHardLimit = 7400;
engineConfiguration->tpsMin = 80;
engineConfiguration->tpsMax = 764;

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

@ -346,6 +346,9 @@ extern uint32_t hwSetTimerTime;
extern int maxHowFarOff;
extern uint32_t *cyccnt;
extern int vvtEventRiseCounter;
extern int vvtEventFallCounter;
void triggerInfo(void) {
#if (EFI_PROD_CODE || EFI_SIMULATOR) || defined(__DOXYGEN__)
@ -391,11 +394,11 @@ void triggerInfo(void) {
#if EFI_PROD_CODE || defined(__DOXYGEN__)
if (engineConfiguration->camInput != GPIO_UNASSIGNED) {
scheduleMsg(logger, "CAM input: %s", hwPortname(engineConfiguration->camInput));
scheduleMsg(logger, "VVT input: %s", hwPortname(engineConfiguration->camInput));
scheduleMsg(logger, "VVT event counters: %d/%d", vvtEventRiseCounter, vvtEventFallCounter);
}
scheduleMsg(logger, "primary trigger input: %s", hwPortname(boardConfiguration->triggerInputPins[0]));
scheduleMsg(logger, "primary trigger simulator: %s %s freq=%d",
hwPortname(boardConfiguration->triggerSimulatorPins[0]),

5
firmware/hw_layer/trigger_input.cpp
View File

@ -27,11 +27,16 @@ EXTERN_ENGINE
;
static Logging *logger;
int vvtEventRiseCounter = 0;
int vvtEventFallCounter = 0;
static void cam_icu_width_callback(ICUDriver *icup) {
vvtEventRiseCounter++;
hwHandleVvtCamSignal(TV_RISE);
}
static void cam_icu_period_callback(ICUDriver *icup) {
vvtEventFallCounter++;
hwHandleVvtCamSignal(TV_FALL);
}

2
firmware/rusefi.cpp
View File

@ -293,5 +293,5 @@ int getRusEfiVersion(void) {
return 123; // this is here to make the compiler happy about the unused array
if (UNUSED_CCM_SIZE[0] * 0 != 0)
return 3211; // this is here to make the compiler happy about the unused array
return 20160915;
return 20160917;
}

2
firmware/tunerstudio/rusefi.input
View File

@ -1440,7 +1440,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
field = "#Cam is primary if you have cam sensor"
field = "Primary input channel", triggerInputPins1
field = "Secondary channel", triggerInputPins2
field = "CAM input", camInput
field = "VVT input", camInput
field = "VVT mode", vvtMode, {trigger_type != 80}
field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80}
field = "Trigger error LED", triggerErrorPin