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

auto-sync

This commit is contained in:
rusEfi 2014-11-25 20:03:18 -06:00
parent 5b7c82b413
commit 6469c25cab
7 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,8 @@ void setBmwE34(engine_configuration_s *engineConfiguration) {
engineConfiguration->injectionMode = IM_SIMULTANEOUS; engineConfiguration->injectionMode = IM_SIMULTANEOUS;
engineConfiguration->ignitionMode = IM_WASTED_SPARK; engineConfiguration->ignitionMode = IM_WASTED_SPARK;
engineConfiguration->ignMathCalculateAtIndex = 15;
setConstantDwell(engineConfiguration, 3); // a bit shorter dwell setConstantDwell(engineConfiguration, 3); // a bit shorter dwell
engineConfiguration->useConstantDwellDuringCranking = true; engineConfiguration->useConstantDwellDuringCranking = true;
engineConfiguration->ignitionDwellForCrankingMs = 5; engineConfiguration->ignitionDwellForCrankingMs = 5;

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

@ -509,7 +509,9 @@ typedef struct {
*/ */
adc_channel_e acSwitchAdc; adc_channel_e acSwitchAdc;
int unused3[91]; int ignMathCalculateAtIndex;
int unused3[90];
} engine_configuration_s; } engine_configuration_s;

2
firmware/controllers/flash_main.h
View File

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

19
firmware/controllers/math/engine_math.cpp
View File

@ -35,6 +35,12 @@ EXTERN_ENGINE
extern OutputPin outputs[IO_PIN_COUNT]; extern OutputPin outputs[IO_PIN_COUNT];
/**
* this cache allows us to find a close-enough (with one degree precision) trigger wheel index by
* given angle with fast constant speed
*/
static int triggerIndexByAngle[720];
/* /*
* default Volumetric Efficiency * default Volumetric Efficiency
*/ */
@ -110,8 +116,7 @@ void initializeIgnitionActions(float advance, float dwellAngle, IgnitionEventLis
event->io_pin = pin; event->io_pin = pin;
event->advance = localAdvance; event->advance = localAdvance;
findTriggerPosition(&event->dwellPosition, localAdvance - dwellAngle findTriggerPosition(&event->dwellPosition, localAdvance - dwellAngle PASS_ENGINE_PARAMETER);
PASS_ENGINE_PARAMETER);
} }
} }
@ -252,7 +257,7 @@ void findTriggerPosition(event_trigger_position_s *position, float angleOffset D
angleOffset += CONFIG(globalTriggerAngleOffset); angleOffset += CONFIG(globalTriggerAngleOffset);
fixAngle(angleOffset); fixAngle(angleOffset);
int index = findAngleIndex(angleOffset PASS_ENGINE_PARAMETER); int index = triggerIndexByAngle[(int)angleOffset];
float eventAngle = TRIGGER_SHAPE(eventAngles[index]); float eventAngle = TRIGGER_SHAPE(eventAngles[index]);
if (angleOffset < eventAngle) { if (angleOffset < eventAngle) {
firmwareError("angle constraint violation in registerActuatorEventExt(): %f/%f", angleOffset, eventAngle); firmwareError("angle constraint violation in registerActuatorEventExt(): %f/%f", angleOffset, eventAngle);
@ -328,9 +333,13 @@ void prepareOutputSignals(DECLARE_ENGINE_PARAMETER_F) {
} }
for (int angle = 0; angle < CONFIG(engineCycle); angle++) {
triggerIndexByAngle[angle] = findAngleIndex(angle PASS_ENGINE_PARAMETER);
}
injectonSignals.clear(); injectonSignals.clear();
engineConfiguration2->crankingInjectionEvents.addFuelEvents(engineConfiguration->crankingInjectionMode engineConfiguration2->crankingInjectionEvents.addFuelEvents(
PASS_ENGINE_PARAMETER); engineConfiguration->crankingInjectionMode PASS_ENGINE_PARAMETER);
engineConfiguration2->injectionEvents.addFuelEvents(engineConfiguration->injectionMode PASS_ENGINE_PARAMETER); engineConfiguration2->injectionEvents.addFuelEvents(engineConfiguration->injectionMode PASS_ENGINE_PARAMETER);
} }

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

@ -340,10 +340,15 @@ void mainTriggerCallback(trigger_event_e ckpSignalType, uint32_t eventIndex DECL
if (eventIndex == 0) { if (eventIndex == 0) {
if (localVersion.isOld()) if (localVersion.isOld())
prepareOutputSignals(PASS_ENGINE_PARAMETER_F); prepareOutputSignals(PASS_ENGINE_PARAMETER_F);
}
if (eventIndex == engineConfiguration->ignMathCalculateAtIndex) {
engine->beforeIgnitionMath = GET_TIMESTAMP(); engine->beforeIgnitionMath = GET_TIMESTAMP();
doSomeCalc(rpm PASS_ENGINE_PARAMETER); doSomeCalc(rpm PASS_ENGINE_PARAMETER);
engine->ignitionMathTime = GET_TIMESTAMP() - engine->beforeIgnitionMath; engine->ignitionMathTime = GET_TIMESTAMP() - engine->beforeIgnitionMath;
}
if (eventIndex == 0) {
engine->beforeIgnitionSch = GET_TIMESTAMP(); engine->beforeIgnitionSch = GET_TIMESTAMP();
/** /**

2
firmware/rusefi.cpp
View File

@ -256,7 +256,7 @@ void firmwareError(const char *fmt, ...) {
} }
} }
static char UNUSED_RAM_SIZE[10000]; static char UNUSED_RAM_SIZE[7000];
static char UNUSED_CCM_SIZE[11000] CCM_OPTIONAL; static char UNUSED_CCM_SIZE[11000] CCM_OPTIONAL;

4
unit_tests/test_fuel_map.cpp
View File

@ -187,8 +187,8 @@ void testAngleResolver(void) {
printf("*************************************************** testAngleResolver 2\r\n"); printf("*************************************************** testAngleResolver 2\r\n");
ae.resetEventList(); ae.resetEventList();
findTriggerPosition(&ae.getNextActuatorEvent()->position, 51 + 180 - 175 PASS_ENGINE_PARAMETER); findTriggerPosition(&ae.getNextActuatorEvent()->position, 51 + 180 - 175 PASS_ENGINE_PARAMETER);
assertEquals(3, ae.events[0].position.eventIndex); assertEquals(2, ae.events[0].position.eventIndex);
assertEquals(2.955, ae.events[0].position.angleOffset); assertEquals(112.3495, ae.events[0].position.angleOffset);
} }
void testPinHelper(void) { void testPinHelper(void) {