Fixed ILE register and the tests

modm-io · May 11, 2023 · da5ebc5 · da5ebc5
1 parent f104f60
commit da5ebc5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/modm/platform/can/stm32-fdcan/can.cpp.in b/src/modm/platform/can/stm32-fdcan/can.cpp.in
@@ -375,7 +375,7 @@ modm::platform::Fdcan{{ id }}::getMessage(can::Message& message, uint8_t *filter
 			(*timestamp) = rxMessage.timestamp;
 		}
 		rxQueue.pop();
-		{{ reg }}->ILE = FDCAN_ILE_EINT1 && FDCAN_ILE_EINT0; // reenable ISR, in case it was disabled due to rxQueue full
+		{{ reg }}->ILE = FDCAN_ILE_EINT1 | FDCAN_ILE_EINT0; // reenable ISR, in case it was disabled due to rxQueue full
 		return true;
 	}
 %% else

diff --git a/test/modm/platform/fdcan/fdcan_test.cpp b/test/modm/platform/fdcan/fdcan_test.cpp
@@ -86,8 +86,8 @@ FdcanTest::testBuffers()
 
 	modm::can::Message message{0x4711, 0};
 	for (uint_fast16_t i = 0; i <= numberOfMsgs; ++i) {
-		message.setLength(i % 8);
-		for (uint_fast8_t dataIndex = 0; dataIndex < i; ++dataIndex) {
+		message.setLength(length);
+		for (uint_fast8_t dataIndex = 0; dataIndex < length; ++dataIndex) {
 			message.data[dataIndex] = i;
 		}
 		Fdcan1::sendMessage(message);
@@ -101,9 +101,11 @@ FdcanTest::testBuffers()
 		TEST_ASSERT_TRUE(Fdcan1::getMessage(receivedMessage));
 
 		TEST_ASSERT_EQUALS(receivedMessage.getIdentifier(), 0x4711u);
-		TEST_ASSERT_EQUALS(receivedMessage.getLength(), (i % 8));
+
+		uint_fast8_t length = i % 8;
+		TEST_ASSERT_EQUALS(receivedMessage.getLength(), length);
 
-		for (uint_fast8_t dataIndex = 0; dataIndex < i; ++dataIndex) {
+		for (uint_fast8_t dataIndex = 0; dataIndex < length; ++dataIndex) {
 			TEST_ASSERT_EQUALS(receivedMessage.data[dataIndex], i);
 		}
 	}