rusefi
/
rusefi-hardware
mirror of https://github.com/rusefi/rusefi-hardware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

receiveAuxDigitalCounters

This commit is contained in:
rusefi 2024-01-07 20:22:52 -05:00
parent 32b57691de
commit 7888ea48c4
4 changed files with 48 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
digital-inputs/firmware/Makefile
View File

@ -167,6 +167,7 @@ CWARN = -Wall -Wextra -Wundef -Wstrict-prototypes
# Define C++ warning options here.
CPPWARN = -Wall -Wextra -Wundef
CPPWARN += -Werror=unused-function
#
# Project, target, sources and paths

58
digital-inputs/firmware/can.cpp
View File

@ -79,6 +79,21 @@ bool isHappyCanTest() {
return isGoodWbo1 && isGoodWbo2 && isGoodCanPackets && hasReceivedAnalog;
}
static void handleCounter(Counter *cnt, bool *isHappy, bool *eventExpected, const char *suffix) {
if (!eventExpected[cnt->canFrameIndex])
return;
if (cnt->nonZero) {
setGreenText();
chprintf(chp, "* HAPPY %s %s counter!\r\n", cnt->name, suffix);
setNormalText();
} else {
setErrorLedAndRedText();
chprintf(chp, "* ZERO %s %s counter!\r\n", cnt->name, suffix);
setNormalText();
}
*isHappy = *isHappy && cnt->nonZero;
}
bool checkDigitalInputCounterStatus() {
if (currentBoard == nullptr) {
setErrorLedAndRedText();
@ -90,33 +105,15 @@ bool checkDigitalInputCounterStatus() {
bool isHappy = true;
for (auto & evtCnt : counterStatus.eventCounters) {
if (!currentBoard->eventExpected[evtCnt.canFrameIndex])
continue;
if (evtCnt.nonZero) {
setGreenText();
chprintf(chp, "* HAPPY %s event counter!\r\n", evtCnt.name);
setNormalText();
} else {
setErrorLedAndRedText();
chprintf(chp, "* ZERO %s event counter!\r\n", evtCnt.name);
setNormalText();
}
isHappy = isHappy && evtCnt.nonZero;
handleCounter(&evtCnt, &isHappy, currentBoard->eventExpected, "event");
}
for (auto & btnCnt : counterStatus.buttonCounters) {
if (!currentBoard->buttonExpected[btnCnt.canFrameIndex])
continue;
if (btnCnt.nonZero) {
setGreenText();
chprintf(chp, "* HAPPY %s button counter!\r\n", btnCnt.name);
setNormalText();
} else {
setErrorLedAndRedText();
chprintf(chp, "* ZERO %s button counter!\r\n", btnCnt.name);
setNormalText();
}
isHappy = isHappy && btnCnt.nonZero;
handleCounter(&btnCnt, &isHappy, currentBoard->buttonExpected, "button");
}
for (auto & btnCnt : counterStatus.auxDigitalCounters) {
handleCounter(&btnCnt, &isHappy, currentBoard->auxDigitalExpected, "aux digital");
}
return isHappy;
@ -236,6 +233,12 @@ static void receiveButtonCounters(const uint8_t msg[CAN_FRAME_SIZE]) {
}
}
static void receiveAuxDigitalCounters(const uint8_t msg[CAN_FRAME_SIZE]) {
for (auto & cnt : counterStatus.auxDigitalCounters) {
cnt.nonZero = cnt.nonZero || (msg[cnt.canFrameIndex] > 0);
}
}
static void printRxFrame(const CANRxFrame& frame, const char *msg) {
if (!outputMode.displayCanReceive || isMuted) {
return;
@ -271,11 +274,14 @@ void processCanRxMessage(const CANRxFrame& frame) {
printRxFrame(frame, "BENCH_TEST_RAW_ANALOG_2");
receiveRawAnalog(frame.data8, 8);
} else if (extendedId == (int)bench_test_packet_ids_e::EVENT_COUNTERS) {
printRxFrame(frame, "BENCH_TEST_EVENT_COUNTERS");
printRxFrame(frame, "EVENT_COUNTERS");
receiveEventCounters(frame.data8);
} else if (extendedId == (int)bench_test_packet_ids_e::BUTTON_COUNTERS) {
printRxFrame(frame, "BENCH_TEST_BUTTON_COUNTERS");
printRxFrame(frame, "BUTTON_COUNTERS");
receiveButtonCounters(frame.data8);
} else if (extendedId == (int)bench_test_packet_ids_e::AUX_DIGITAL_COUNTERS) {
printRxFrame(frame, "AUX_DIGITAL_COUNTERS");
receiveAuxDigitalCounters(frame.data8);
} else if (extendedId == (int)bench_test_packet_ids_e::IO_META_INFO) {
printRxFrame(frame, "BENCH_TEST_IO_META_INFO");
receiveOutputMetaInfo(frame.data8);

14
digital-inputs/firmware/test_logic.h
View File

@ -26,6 +26,7 @@ public:
#define EVENT_ENUM_SIZE 7
#define BUTTON_ENUM_SIZE 3
#define AUX_DIGITAL_SIZE 8
class CounterStatus {
public:
@ -44,6 +45,18 @@ public:
{ 1, "ClutchUp" },
{ 2, "AcButton" },
};
Counter auxDigitalCounters[AUX_DIGITAL_SIZE] = {
{ 0, "Aux 1" },
{ 1, "Aux 2" },
{ 2, "Aux 3" },
{ 3, "Aux 4" },
{ 4, "Aux 5" },
{ 5, "Aux 6" },
{ 6, "Aux 7" },
{ 7, "Aux 8" },
};
};
class AnalogChannelConfig {
@ -61,6 +74,7 @@ public:
AnalogChannelConfig channels[MAX_ANALOG_CHANNELS];
bool eventExpected[EVENT_ENUM_SIZE];
bool buttonExpected[BUTTON_ENUM_SIZE];
bool auxDigitalExpected[BUTTON_ENUM_SIZE];
const char *outputNames[MAX_OUTPUT_NAMES];
int wboUnitsCount;
// do we have some defect in the logic or loose state? does DC validation depend on if we have just finished testing low-side or high-side pins?

2
ext/libfirmware

@ -1 +1 @@
Subproject commit e5ac1591345640365eb850921c97962b07315ad2
Subproject commit 7bcee1b8139f18b3bc5edddb5ca9e783c9314247