testability: bench test commands should have automated coverage using…

… simulator #5562
rusefi · Sep 14, 2023 · 735e442 · 735e442
1 parent 1dc0cab
commit 735e442
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/firmware/controllers/can/can.h b/firmware/controllers/can/can.h
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#define HAS_CAN_FRAME (EFI_SIMULATOR || HAL_USE_CAN || EFI_UNIT_TEST)
+
 #if EFI_UNIT_TEST || !EFI_CAN_SUPPORT
 #include "can_mocks.h"
 #endif // EFI_PROD_CODE

diff --git a/firmware/hw_layer/drivers/can/can_msg_tx.cpp b/firmware/hw_layer/drivers/can/can_msg_tx.cpp
@@ -14,6 +14,11 @@
 
 #include "can.h"
 
+#if EFI_SIMULATOR
+#include "fifo_buffer.h"
+fifo_buffer<CANTxFrame, 1024> txCanBuffer;
+#endif // EFI_SIMULATOR
+
 #if EFI_CAN_SUPPORT
 /*static*/ CANDriver* CanTxMessage::s_devices[2] = {nullptr, nullptr};
 
@@ -25,7 +30,7 @@
 
 CanTxMessage::CanTxMessage(CanCategory category, uint32_t eid, uint8_t dlc, size_t bus, bool isExtended) {
     this->category = category;
-#if HAL_USE_CAN || EFI_UNIT_TEST
+#if HAS_CAN_FRAME
 #ifndef STM32H7XX
 	// ST bxCAN device
 	m_frame.IDE = isExtended ? CAN_IDE_EXT : CAN_IDE_STD;
@@ -51,10 +56,14 @@ CanTxMessage::CanTxMessage(CanCategory category, uint32_t eid, uint8_t dlc, size
 	setBus(bus);
 
 	memset(m_frame.data8, 0, sizeof(m_frame.data8));
-#endif // HAL_USE_CAN || EFI_UNIT_TEST
+#endif // HAS_CAN_FRAME
 }
 
 CanTxMessage::~CanTxMessage() {
+#if EFI_SIMULATOR
+	txCanBuffer.put(m_frame);
+#endif // EFI_SIMULATOR
+
 #if EFI_CAN_SUPPORT
 	auto device = s_devices[busIndex];
 

diff --git a/firmware/hw_layer/drivers/can/can_msg_tx.h b/firmware/hw_layer/drivers/can/can_msg_tx.h
@@ -66,14 +66,14 @@ class CanTxMessage
 
 	void setBus(size_t bus);
 
-#if HAL_USE_CAN || EFI_UNIT_TEST
+#if HAS_CAN_FRAME
 	const CANTxFrame *getFrame() const {
 		return &m_frame;
 	}
 #endif // HAL_USE_CAN || EFI_UNIT_TEST
 
 protected:
-#if HAL_USE_CAN || EFI_UNIT_TEST
+#if HAS_CAN_FRAME
 	CANTxFrame m_frame;
 #endif // HAL_USE_CAN || EFI_UNIT_TEST