mirror of https://github.com/FOME-Tech/fome-fw.git
fix tests for no shadowing
This commit is contained in:
parent
83c6ac9f97
commit
4ed8906748
|
@ -144,10 +144,10 @@ static void writeDouble(double value) {
|
|||
writeByte(0);
|
||||
} else {
|
||||
writeByte(8);
|
||||
char *ptr = (char*) (void*) &value;
|
||||
char* c = (char*) (void*) &value;
|
||||
|
||||
for (int i = 0; i < 8; i++) {
|
||||
writeByte(ptr[i]);
|
||||
writeByte(c[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -24,8 +24,8 @@ CsvReader::~CsvReader() {
|
|||
void CsvReader::open(const char *fileName, const int* triggerColumnIndeces, const int *vvtColumnIndeces) {
|
||||
printf("Reading from %s\r\n", fileName);
|
||||
fp = fopen(fileName, "r");
|
||||
this->triggerColumnIndeces = triggerColumnIndeces;
|
||||
this->vvtColumnIndeces = vvtColumnIndeces;
|
||||
m_triggerColumnIndeces = triggerColumnIndeces;
|
||||
m_vvtColumnIndeces = vvtColumnIndeces;
|
||||
ASSERT_TRUE(fp != nullptr);
|
||||
}
|
||||
|
||||
|
@ -61,8 +61,6 @@ double CsvReader::readTimestampAndValues(double *values) {
|
|||
|
||||
// todo: separate trigger handling from csv file processing
|
||||
void CsvReader::processLine(EngineTestHelper *eth) {
|
||||
Engine *engine = ð->engine;
|
||||
|
||||
const char s[2] = ",";
|
||||
char *timeStampstr = trim(strtok(buffer, s));
|
||||
|
||||
|
@ -71,12 +69,12 @@ void CsvReader::processLine(EngineTestHelper *eth) {
|
|||
|
||||
for (size_t i = 0;i<m_triggerCount;i++) {
|
||||
char * triggerToken = trim(strtok(nullptr, s));
|
||||
newTriggerState[triggerColumnIndeces[i]] = triggerToken[0] == '1';
|
||||
newTriggerState[m_triggerColumnIndeces[i]] = triggerToken[0] == '1';
|
||||
}
|
||||
|
||||
for (size_t i = 0;i<m_vvtCount;i++) {
|
||||
char *vvtToken = trim(strtok(nullptr, s));
|
||||
newVvtState[vvtColumnIndeces[i]] = vvtToken[0] == '1';
|
||||
newVvtState[m_vvtColumnIndeces[i]] = vvtToken[0] == '1';
|
||||
}
|
||||
|
||||
if (timeStampstr == nullptr) {
|
||||
|
|
|
@ -47,7 +47,7 @@ private:
|
|||
|
||||
int m_lineIndex = -1;
|
||||
|
||||
const int* triggerColumnIndeces;
|
||||
const int* vvtColumnIndeces;
|
||||
const int* m_triggerColumnIndeces;
|
||||
const int* m_vvtColumnIndeces;
|
||||
};
|
||||
|
||||
|
|
|
@ -67,19 +67,19 @@ TEST(misc, testFindIndex) {
|
|||
TEST(misc, testSetTableValue) {
|
||||
printf("*************************************************** testSetTableValue\r\n");
|
||||
|
||||
persistent_config_s config;
|
||||
persistent_config_s cfg;
|
||||
|
||||
for (int i = 0; i < CLT_CURVE_SIZE; i++) {
|
||||
config.cltFuelCorrBins[i] = -40 + i * 10;
|
||||
config.cltFuelCorr[i] = 1;
|
||||
cfg.cltFuelCorrBins[i] = -40 + i * 10;
|
||||
cfg.cltFuelCorr[i] = 1;
|
||||
}
|
||||
|
||||
ASSERT_EQ(1, config.cltFuelCorr[0]);
|
||||
ASSERT_EQ(1, cfg.cltFuelCorr[0]);
|
||||
|
||||
setCurveValue(config.cltFuelCorrBins, config.cltFuelCorr, CLT_CURVE_SIZE, -40, 1.5);
|
||||
ASSERT_FLOAT_EQ(1.5, config.cltFuelCorr[0]);
|
||||
setCurveValue(cfg.cltFuelCorrBins, cfg.cltFuelCorr, CLT_CURVE_SIZE, -40, 1.5);
|
||||
ASSERT_FLOAT_EQ(1.5, cfg.cltFuelCorr[0]);
|
||||
|
||||
setCurveValue(config.cltFuelCorrBins, config.cltFuelCorr, CLT_CURVE_SIZE, -50, 1.4);
|
||||
ASSERT_FLOAT_EQ(1.4, config.cltFuelCorr[0]);
|
||||
setCurveValue(cfg.cltFuelCorrBins, cfg.cltFuelCorr, CLT_CURVE_SIZE, -50, 1.4);
|
||||
ASSERT_FLOAT_EQ(1.4, cfg.cltFuelCorr[0]);
|
||||
|
||||
}
|
||||
|
|
|
@ -37,7 +37,7 @@ TEST(etb, initializationNoPedal) {
|
|||
TEST(etb, initializationMissingThrottle) {
|
||||
StrictMock<MockEtb> mocks[ETB_COUNT];
|
||||
|
||||
EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* engineConfiguration) {
|
||||
EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* cfg) {
|
||||
engineConfiguration->etbFunctions[0] = DC_None;
|
||||
engineConfiguration->etbFunctions[1] = DC_None;
|
||||
});
|
||||
|
@ -63,7 +63,7 @@ TEST(etb, initializationSingleThrottle) {
|
|||
EXPECT_CALL(mocks[0], isEtbMode())
|
||||
.WillOnce(Return(TRUE));
|
||||
|
||||
EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* engineConfiguration) {
|
||||
EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* cfg) {
|
||||
engineConfiguration->etbFunctions[0] = DC_Throttle1;
|
||||
engineConfiguration->etbFunctions[1] = DC_None;
|
||||
});
|
||||
|
@ -91,7 +91,7 @@ TEST(etb, initializationSingleThrottleInSecondSlot) {
|
|||
EXPECT_CALL(mocks[1], isEtbMode())
|
||||
.WillOnce(Return(TRUE));
|
||||
|
||||
EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* engineConfiguration) {
|
||||
EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* cfg) {
|
||||
engineConfiguration->etbFunctions[0] = DC_None;
|
||||
engineConfiguration->etbFunctions[1] = DC_Throttle1;
|
||||
});
|
||||
|
@ -152,7 +152,7 @@ TEST(etb, initializationWastegate) {
|
|||
EXPECT_CALL(mocks[0], isEtbMode())
|
||||
.WillOnce(Return(false));
|
||||
|
||||
EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* engineConfiguration) {
|
||||
EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* cfg) {
|
||||
engineConfiguration->etbFunctions[0] = DC_Wastegate;
|
||||
engineConfiguration->etbFunctions[1] = DC_None;
|
||||
});
|
||||
|
|
|
@ -207,8 +207,8 @@ TEST(HPFP, Angle) {
|
|||
}
|
||||
|
||||
TEST(HPFP, Schedule) {
|
||||
EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* engineConfiguration) {
|
||||
engineConfiguration->hpfpValvePin = Gpio::A2; // arbitrary
|
||||
EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* cfg) {
|
||||
cfg->hpfpValvePin = Gpio::A2; // arbitrary
|
||||
});
|
||||
|
||||
engineConfiguration->cylindersCount = 4;
|
||||
|
|
|
@ -8,8 +8,8 @@
|
|||
#include "pch.h"
|
||||
|
||||
TEST(HPFP, IntegratedSchedule) {
|
||||
EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* engineConfiguration) {
|
||||
engineConfiguration->hpfpValvePin = Gpio::A2; // arbitrary
|
||||
EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* cfg) {
|
||||
cfg->hpfpValvePin = Gpio::A2; // arbitrary
|
||||
});
|
||||
|
||||
engineConfiguration->cylindersCount = 4;
|
||||
|
|
|
@ -18,12 +18,14 @@ static void callback(void *a) {
|
|||
static int complexTestNow;
|
||||
|
||||
struct TestPwm {
|
||||
TestPwm(EventQueue *eventQueue) {
|
||||
this->eventQueue = eventQueue;
|
||||
TestPwm(EventQueue *eq)
|
||||
: eventQueue(eq)
|
||||
{
|
||||
}
|
||||
|
||||
scheduling_s s;
|
||||
int period;
|
||||
EventQueue *eventQueue;
|
||||
EventQueue* const eventQueue;
|
||||
};
|
||||
|
||||
static void complexCallback(TestPwm *testPwm) {
|
||||
|
|
|
@ -161,8 +161,8 @@ TEST(misc, testMalfunctionCentral) {
|
|||
getErrorCodes(&localCopy);
|
||||
// todo: ASSERT_EQ(2, localCopy.count);
|
||||
|
||||
for (int code = 0; code < 100; code++) {
|
||||
addError((ObdCode) code);
|
||||
for (int c = 0; c < 100; c++) {
|
||||
addError((ObdCode) c);
|
||||
}
|
||||
getErrorCodes(&localCopy);
|
||||
ASSERT_EQ(MAX_ERROR_CODES_COUNT, localCopy.count);
|
||||
|
|
|
@ -60,8 +60,7 @@ TEST_P(AllTriggersFixture, TestTrigger) {
|
|||
persistent_config_s pc;
|
||||
efi::clear(pc);
|
||||
Engine e;
|
||||
Engine* engine = &e;
|
||||
EngineTestHelperBase base(engine, &pc.engineConfiguration, &pc);
|
||||
EngineTestHelperBase base(&e, &pc.engineConfiguration, &pc);
|
||||
|
||||
#if EFI_UNIT_TEST
|
||||
extern TriggerDecoderBase initState;
|
||||
|
|
|
@ -21,7 +21,6 @@ public:
|
|||
|
||||
static void func(TriggerCallback *callback) {
|
||||
int formIndex = callback->toothIndex % callback->form->getSize();
|
||||
Engine *engine = callback->engine;
|
||||
|
||||
bool value = callback->form->wave.getChannelState(0, formIndex);
|
||||
|
||||
|
|
|
@ -27,8 +27,6 @@ static void fireTriggerEvent(EngineTestHelper*eth, double timestampS, TriggerWhe
|
|||
event = SHAFT_SECONDARY_FALLING;
|
||||
}
|
||||
|
||||
Engine *engine = ð->engine;
|
||||
|
||||
timeNowUs = 1'000'000 * timestampS;
|
||||
printf("MIATANA: posting time=%d event=%d\n", timeNowUs, event);
|
||||
hwHandleShaftSignal((int)channel, !isFall, getTimeNowNt());
|
||||
|
|
|
@ -425,9 +425,6 @@ static void setTestBug299(EngineTestHelper *eth) {
|
|||
EXPECT_CALL(*eth->mockAirmass, getAirmass(_, _))
|
||||
.WillRepeatedly(Return(AirmassResult{0.1008001f, 50.0f}));
|
||||
|
||||
Engine *engine = ð->engine;
|
||||
|
||||
|
||||
eth->assertRpm(0, "RPM=0");
|
||||
|
||||
eth->fireTriggerEventsWithDuration(20);
|
||||
|
|
|
@ -31,9 +31,9 @@ struct MockTriggerDecoder : public TriggerDecoderBase {
|
|||
MOCK_METHOD(void, onTooManyTeeth, (int actual, int expected), (override));
|
||||
};
|
||||
|
||||
static auto makeTriggerShape(operation_mode_e mode, const TriggerConfiguration& config) {
|
||||
static auto makeTriggerShape(operation_mode_e mode, const TriggerConfiguration& cfg) {
|
||||
TriggerWaveform shape;
|
||||
shape.initializeTriggerWaveform(mode, config);
|
||||
shape.initializeTriggerWaveform(mode, cfg);
|
||||
|
||||
return shape;
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@ void onTriggerChanged(efitick_t stamp, bool isPrimary, bool isRising) {
|
|||
printf("*\r\n");
|
||||
}
|
||||
|
||||
static void simulateTrigger(TriggerAdcDetector &trigAdcState, CsvReader &reader, float voltageDiv, float adcMaxVoltage) {
|
||||
static void simulateTrigger(TriggerAdcDetector &state, CsvReader &reader, float voltageDiv, float adcMaxVoltage) {
|
||||
static const float Vil = 0.3f * adcMaxVoltage;
|
||||
static const float Vih = 0.7f * adcMaxVoltage;
|
||||
|
||||
|
@ -46,7 +46,7 @@ static void simulateTrigger(TriggerAdcDetector &trigAdcState, CsvReader &reader,
|
|||
// printf("--simulateTrigger %lld %f\r\n", stamp, (float)value);
|
||||
// convert into mcu-adc voltage
|
||||
value = minF(maxF(value / voltageDiv, 0), adcMaxVoltage);
|
||||
if (trigAdcState.curAdcMode == TRIGGER_ADC_EXTI) {
|
||||
if (state.curAdcMode == TRIGGER_ADC_EXTI) {
|
||||
int logicValue = 0;
|
||||
// imitate Schmitt trigger input
|
||||
if (value < Vil || value > Vih) {
|
||||
|
@ -55,16 +55,16 @@ static void simulateTrigger(TriggerAdcDetector &trigAdcState, CsvReader &reader,
|
|||
if (prevLogicValue != -1) {
|
||||
// printf("--> DIGITAL %d %d\r\n", logicValue, prevLogicValue);
|
||||
|
||||
trigAdcState.digitalCallback(stampUs, true, logicValue > prevLogicValue ? true : false);
|
||||
state.digitalCallback(stampUs, true, logicValue > prevLogicValue ? true : false);
|
||||
}
|
||||
prevLogicValue = logicValue;
|
||||
}
|
||||
} else if (trigAdcState.curAdcMode == TRIGGER_ADC_ADC) {
|
||||
} else if (state.curAdcMode == TRIGGER_ADC_ADC) {
|
||||
triggerAdcSample_t sampleValue = value * ADC_MAX_VALUE / adcMaxVoltage;
|
||||
|
||||
// printf("--> ANALOG %d\r\n", sampleValue);
|
||||
|
||||
trigAdcState.analogCallback(stampUs, sampleValue);
|
||||
state.analogCallback(stampUs, sampleValue);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue