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

evil manual merge of https://github.com/DonaldBecker/rusefi

This commit is contained in:
rusefi 2019-11-05 22:40:33 -05:00
parent 0b5709ac1b
commit 3357e41614
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/engine_controller.cpp
View File

@ -290,7 +290,7 @@ static void resetAccel(void) {
engine->engineLoadAccelEnrichment.resetAE();
engine->tpsAccelEnrichment.resetAE();
for (int i = 0; i < sizeof(engine->wallFuel) / sizeof(engine->wallFuel[0]); i++)
for (unsigned int i = 0; i < sizeof(engine->wallFuel) / sizeof(engine->wallFuel[0]); i++)
{
engine->wallFuel[i].resetWF();
}

4
firmware/controllers/trigger/decoders/trigger_honda.cpp
View File

@ -173,8 +173,6 @@ void configureHondaCbr600(TriggerShape *s) {
s->setTriggerSynchronizationGap(6);
// w = 15
float w = 720 / 2 / 24;
int totalTeethCount = 24;
int skippedCount = 0;
@ -182,6 +180,8 @@ void configureHondaCbr600(TriggerShape *s) {
addSkippedToothTriggerEvents(T_SECONDARY, s, totalTeethCount, skippedCount, 0.5, 0, 720,
0, 349);
// w = 15
// float w = 720 / 2 / 24;
//s->addEvent720(360 -w, T_SECONDARY, TV_RISE);

2
firmware/controllers/trigger/decoders/trigger_structure.cpp
View File

@ -241,7 +241,7 @@ void TriggerShape::addEvent(angle_t angle, trigger_wheel_e const channelIndex, t
}
int exactMatch = wave.findAngleMatch(angle, privateTriggerDefinitionSize);
if (exactMatch != EFI_ERROR_CODE) {
if (exactMatch != (int)EFI_ERROR_CODE) {
warning(CUSTOM_ERR_SAME_ANGLE, "same angle: not supported");
setShapeDefinitionError(true);
return;

2
firmware/controllers/trigger/main_trigger_callback.cpp
View File

@ -505,7 +505,7 @@ void mainTriggerCallback(trigger_event_e ckpSignalType, uint32_t trgEventIndex D
efiAssertVoid(CUSTOM_IGN_MATH_STATE, !CONFIG(useOnlyRisingEdgeForTrigger) || CONFIG(ignMathCalculateAtIndex) % 2 == 0, "invalid ignMathCalculateAtIndex");
if (trgEventIndex == CONFIG(ignMathCalculateAtIndex)) {
if (trgEventIndex == (uint32_t)CONFIG(ignMathCalculateAtIndex)) {
if (CONFIG(externalKnockSenseAdc) != EFI_ADC_NONE) {
float externalKnockValue = getVoltageDivided("knock", engineConfiguration->externalKnockSenseAdc PASS_ENGINE_PARAMETER_SUFFIX);
engine->knockLogic(externalKnockValue PASS_ENGINE_PARAMETER_SUFFIX);