This commit is contained in:
rusefi 2023-11-05 23:05:16 -05:00
parent 2fd1267eeb
commit 23664424a1
4 changed files with 44 additions and 8 deletions

View File

@ -154,7 +154,7 @@ static void receiveOutputMetaInfo(const uint8_t msg[CAN_FRAME_SIZE]) {
lowSideOutputCount = msg[3];
dcOutputsCount = msg[4];
if (outputMode.displayCanReceive && !isMuted) {
chprintf(chp, " CAN ECU says: total=%d outputs of which low side=%d also %d DC\r\n", outputCount, lowSideOutputCount);
chprintf(chp, " CAN ECU says: total=%d outputs of which low side=%d also %d DC\r\n", outputCount, lowSideOutputCount, dcOutputsCount);
}
}
}

View File

@ -64,11 +64,19 @@ bool testEcuDcOutputs(size_t startStepIndex) {
bool isGood = true;
int numOutputs = getDigitalDcOutputStepsCount();
for (size_t currentIndex = 0; currentIndex < numOutputs; currentIndex++) {
testDcOutput();
int dcOutputs = getDigitalDcOutputStepsCount();
for (size_t dcIndex = 0; dcIndex < dcOutputs; dcIndex++) {
bool dcResult = testDcOutput(dcIndex);
if (dcResult) {
setGlobalStatusText();
chprintf(chp, "GOOD DC=%d\n", dcIndex);
setNormalText();
}
isGood = isGood & dcResult;
}
return true;
return isGood;
}
bool testEcuDigitalOutputs(size_t startStepIndex) {

View File

@ -155,6 +155,31 @@ BoardConfig boardConfigs[] = {
"HS 1", "HS 2", "HS 3", "HS 4",
},
},
{
.boardName = "Proteus-HD",
.desiredEngineConfig = -1,
.boardIds = { STATIC_BOARD_ID_PROTEUS_HARLEY, 0 },
.channels = {
{ nullptr, 0, 0, 0 },// { "TPS1_1", 1.0f, VOLT_7B * ANALOG_L, VOLT_7B * ANALOG_H },
{ nullptr, 0, 0, 0 },
{ nullptr, 0, 0, 0 },
{ nullptr, 0, 0, 0 },
{ nullptr, 0, 0, 0 },//{ "MAP", 1.0f, VOLT_8B * ANALOG_L, VOLT_8B * ANALOG_H_FOR_LOW_VOLTAGE },
{ nullptr, 0, 0, 0 },//{ "CLT", 1.0f, CLT_VALUE(PROTEUS_R) * ANALOG_L, CLT_VALUE(PROTEUS_R) * ANALOG_H },
{ nullptr, 0, 0, 0 },//{ "IAT", 1.0f, IAT_VALUE(PROTEUS_R) * ANALOG_L, IAT_VALUE(PROTEUS_R) * ANALOG_H },
{ "BATT", 9.2f, 9.0f, 15.0f },
{ nullptr, 0, 0, 0 }, // { "TPS2_1", 1.0f, 0.5f * ANALOG_L, 0.5f * ANALOG_H },
{ nullptr, 0, 0, 0 }, // { "TPS2_2", 1.0f, 0.5f * ANALOG_L, 0.5f * ANALOG_H },
{ nullptr, 0, 0, 0 },//{ "AUXL1", 1.0f, 1.35f * ANALOG_L, 1.35f * ANALOG_H },
{ nullptr, 0, 0, 0 },//{ "AUXL2", 1.0f, 2.23f * ANALOG_L, 2.23f * ANALOG_H },
},
.eventExpected = {/*crank*/true, false, /*cam1*/true, false, false, false, false},
.buttonExpected = {false, false, false},
.outputNames = {"Inj 1", "Inj 2", "Coil 1", "Coil 2",
"ACR 1", "ACR 2",
},
},
{
.boardName = "112-17",
.desiredEngineConfig = -1,
@ -174,6 +199,7 @@ BoardConfig boardConfigs[] = {
{ nullptr, 0, 0, 0 }, // { "AUXL1", 1.0f, 1.35f * ANALOG_L, 1.35f * ANALOG_H },
{ nullptr, 0, 0, 0 }, // { "AUXL2", 1.0f, 2.23f * ANALOG_L, 2.23f * ANALOG_H },
},
/* crank neg goes to 24C crank positive 22B with a 4.7K pull up */
.eventExpected = {/*crank*/true, false, /*cam1*/true, false, false, false, /*vss*/true},
.buttonExpected = {false, false, false},
.outputNames = {"inj1", "inj2", "inj3", "inj4",
@ -342,8 +368,10 @@ bool testEcuDigitalOutput(int testLineIndex, bool isLowSide) {
// lazy way to get value into lambda
static int globalDcIndex = 0;
bool testDcOutput() {
chprintf(chp, "sending DC\r\n");
bool testDcOutput(size_t dcIndex) {
globalDcIndex = dcIndex;
chprintf(chp, "sending DC %d\r\n", globalDcIndex);
CanRequestSender sender = [](int testLineIndex, bool value) {
sendCanDcState(globalDcIndex, value);

View File

@ -15,7 +15,7 @@
#define DIGITAL_INPUT_BANK_SIZE 16
bool testEcuDigitalOutput(int testLineIndex, bool isLowSide);
bool testDcOutput();
bool testDcOutput(size_t dcIndex);
class Counter {
public: