From 3d76f0947bdbe89f3313ed9600e6c70a43063b0c Mon Sep 17 00:00:00 2001
From: Federico Mandelli <federicomandelli@skywarder.eu>
Date: Fri, 28 Jul 2023 14:20:45 +0200
Subject: [PATCH] [TestCan] Updated test to new interface
---
CMakeLists.txt | 2 +-
.../canbus/CanDriver/test-can-2way.cpp | 33 +++----------------
2 files changed, 6 insertions(+), 29 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29e422e7e..07b705e66 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,7 +192,7 @@ add_executable(test-ad5204 src/tests/drivers/test-ad5204.cpp)
sbs_target(test-ad5204 stm32f205rc_skyward_ciuti)
add_executable(test-can-2way src/tests/drivers/canbus/CanDriver/test-can-2way.cpp)
-sbs_target(test-can-2way stm32f429zi_skyward_pyxis_auxiliary)
+sbs_target(test-can-2way stm32f767zi_skyward_death_stack_v4)
add_executable(test-can-filters src/tests/drivers/canbus/CanDriver/test-can-filters.cpp)
sbs_target(test-can-filters stm32f429zi_skyward_pyxis_auxiliary)
diff --git a/src/tests/drivers/canbus/CanDriver/test-can-2way.cpp b/src/tests/drivers/canbus/CanDriver/test-can-2way.cpp
index 7d75b8b7e..1bcb2e3e7 100644
--- a/src/tests/drivers/canbus/CanDriver/test-can-2way.cpp
+++ b/src/tests/drivers/canbus/CanDriver/test-can-2way.cpp
@@ -47,14 +47,6 @@ using namespace Boardcore;
using namespace Boardcore::Canbus;
using namespace miosix;
-#ifdef _ARCH_CORTEXM3_STM32F1
-using CanRX = Gpio<GPIOA_BASE, 11>;
-using CanTX = Gpio<GPIOA_BASE, 12>;
-#else
-using CanRX = Gpio<GPIOA_BASE, 11>;
-using CanTX = Gpio<GPIOA_BASE, 12>;
-#endif
-
SimpleCanManager* canManager;
struct CanMsg
@@ -201,28 +193,13 @@ int main()
{
Logging::startAsyncLogger();
- {
- miosix::FastInterruptDisableLock dLock;
-
-#ifdef _ARCH_CORTEXM3_STM32F1
- CanRX::mode(Mode::ALTERNATE);
- CanTX::mode(Mode::ALTERNATE);
-#else
- CanRX::mode(Mode::ALTERNATE);
- CanTX::mode(Mode::ALTERNATE);
-
- CanRX::alternateFunction(9);
- CanTX::alternateFunction(9);
-#endif
- }
-
CanbusDriver::CanbusConfig cfg{};
CanbusDriver::AutoBitTiming bt;
- bt.baudRate = BAUD_RATE;
- bt.samplePoint = SAMPLE_POINT;
-
- CanbusDriver* c = new CanbusDriver(CAN1, cfg, bt);
- canManager = new SimpleCanManager(*c, BAUD_RATE, handleCanMessage);
+ bt.baudRate = BAUD_RATE;
+ bt.samplePoint = SAMPLE_POINT;
+ CanbusDriver* c1 = new CanbusDriver(CAN1, cfg, bt);
+ CanbusDriver* c = new CanbusDriver(CAN2, cfg, bt);
+ canManager = new SimpleCanManager(*c, BAUD_RATE, handleCanMessage);
// Allow every message
Mask32FilterBank f2(0, 0, 0, 0, 0, 0, 0);
--
GitLab