This commit is contained in:
Matthew Kennedy 2020-03-03 05:37:02 -08:00 committed by GitHub
parent 86c6494ff7
commit 986b80671b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions

View File

@ -108,12 +108,10 @@ efitime_t EventQueue::getNextEventTime(efitime_t nowX) const {
return EMPTY_QUEUE;
}
static scheduling_s * longScheduling;
/**
* See also maxPrecisionCallbackDuration for total hw callback time
*/
uint32_t maxEventCallbackDuration = 0;
static uint32_t lastEventCallbackDuration;
/**
* Invoke all pending actions prior to specified timestamp

View File

@ -102,7 +102,7 @@ void TriggerWaveform::initialize(operation_mode_e operationMode) {
#endif
}
int TriggerWaveform::getSize() const {
size_t TriggerWaveform::getSize() const {
return privateTriggerDefinitionSize;
}
@ -129,7 +129,7 @@ angle_t TriggerWaveform::getCycleDuration() const {
* Trigger event count equals engine cycle event count if we have a cam sensor.
* Two trigger cycles make one engine cycle in case of a four stroke engine If we only have a cranksensor.
*/
uint32_t TriggerWaveform::getLength() const {
size_t TriggerWaveform::getLength() const {
/**
* 4 for FOUR_STROKE_SYMMETRICAL_CRANK_SENSOR
* 2 for FOUR_STROKE_CRANK_SENSOR

View File

@ -45,7 +45,7 @@
*/
class event_trigger_position_s {
public:
uint32_t triggerEventIndex = 0;
size_t triggerEventIndex = 0;
angle_t angleOffsetFromTriggerEvent = 0;
@ -242,8 +242,8 @@ public:
/**
* this one is per CRANKshaft revolution
*/
uint32_t getLength() const;
int getSize() const;
size_t getLength() const;
size_t getSize() const;
int getTriggerWaveformSynchPointIndex() const;
void prepareShape();

View File

@ -222,6 +222,8 @@ public:
}
void PeriodicTask(efitime_t nowNt) {
UNUSED(nowNt);
switch (engineConfiguration->canNbcType) {
case CAN_BUS_NBC_BMW:
canDashboardBMW();

View File

@ -23,7 +23,7 @@ void configureOilPressure(LinearFunc func, const oil_pressure_config_s& cfg)
float greaterOutput = val1 > val2 ? val1 : val2;
// Allow slightly negative output (-5kpa) so as to not fail the sensor when engine is off
oilpSensorFunc.configure(cfg.v1, val1, cfg.v2, val2, /*minOutput*/ -5, greaterOutput);
func.configure(cfg.v1, val1, cfg.v2, val2, /*minOutput*/ -5, greaterOutput);
}
void initOilPressure() {