mirror of
https://git.intern.spaceteamaachen.de/ALPAKA/CAN-Demo.git
synced 2025-06-10 02:55:59 +00:00
cleaned up demo
This commit is contained in:
parent
145294991d
commit
1f6f610c61
@ -17,16 +17,6 @@
|
||||
|
||||
canController.start();
|
||||
|
||||
|
||||
/*CAN_TxHeaderTypeDef txHeader;
|
||||
txHeader.DLC = 8;
|
||||
txHeader.IDE = CAN_ID_STD;
|
||||
txHeader.RTR = CAN_RTR_DATA;
|
||||
txHeader.StdId = 0x030;
|
||||
//txHeader.ExtId = 0x02;
|
||||
txHeader.TransmitGlobalTime = DISABLE;*/
|
||||
|
||||
//HAL_CAN_Start(handle);
|
||||
// Create a CanTxHeader for your message
|
||||
sta::CanTxHeader txHeader;
|
||||
txHeader.id.format = sta::CanIdFormat::STD; // Set to EXT for extended ID
|
||||
@ -36,11 +26,9 @@
|
||||
// Create your message payload
|
||||
uint8_t payload[8] = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08};
|
||||
|
||||
uint32_t canMailbox; //CAN Bus Mail box variable
|
||||
// Send the CAN message
|
||||
while (true){
|
||||
canController.sendFrame(txHeader, payload);
|
||||
//HAL_CAN_AddTxMessage(handle,&txHeader,payload,&canMailbox);
|
||||
HAL_Delay(1000);
|
||||
}
|
||||
|
||||
@ -48,34 +36,21 @@
|
||||
|
||||
extern "C" void testCanMsg(CAN_HandleTypeDef * handle, uint8_t payload[8]){
|
||||
|
||||
sta::STM32CanController canController(handle);
|
||||
sta::STM32CanController canController(handle);
|
||||
|
||||
//canController.start();
|
||||
//canController.start();
|
||||
|
||||
// Create a CanTxHeader for your message
|
||||
sta::CanTxHeader txHeader;
|
||||
txHeader.id.format = sta::CanIdFormat::STD; // Set to EXT for extended ID
|
||||
txHeader.id.sid = 0x030; // Set the standard ID or extended ID
|
||||
txHeader.payloadLength = 8; // Set the payload length (max 8 bytes)
|
||||
|
||||
// Send the CAN message
|
||||
canController.sendFrame(txHeader, payload);
|
||||
|
||||
|
||||
CAN_TxHeaderTypeDef txHeader;
|
||||
txHeader.DLC = 8;
|
||||
txHeader.IDE = CAN_ID_STD;
|
||||
txHeader.RTR = CAN_RTR_DATA;
|
||||
txHeader.StdId = 0x030;
|
||||
//txHeader.ExtId = 0x02;
|
||||
txHeader.TransmitGlobalTime = DISABLE;
|
||||
|
||||
//HAL_CAN_Start(handle);
|
||||
// Create a CanTxHeader for your message
|
||||
/*sta::CanTxHeader txHeader;
|
||||
txHeader.id.format = sta::CanIdFormat::STD; // Set to EXT for extended ID
|
||||
txHeader.id.sid = 0x123; // Set the standard ID or extended ID
|
||||
txHeader.payloadLength = 8; // Set the payload length (max 8 bytes)*/
|
||||
|
||||
uint32_t canMailbox; //CAN Bus Mail box variable
|
||||
// Send the CAN message
|
||||
//okay = canController.sendFrame(txHeader, payload);
|
||||
HAL_CAN_AddTxMessage(handle,&txHeader,payload,&canMailbox);
|
||||
HAL_Delay(1000);
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
void unpackValues(uint8_t packedByte, uint8_t* type_id, uint8_t* sensor_ID, uint8_t* value, uint8_t* include) {
|
||||
*type_id = (packedByte >> 6) & 0x03; // Extracting two bits for type_id
|
||||
|
@ -124,15 +124,13 @@ int main(void)
|
||||
|
||||
HAL_CAN_ConfigFilter(&hcan1, &canfilterconfig);
|
||||
HAL_CAN_Start(&hcan1);
|
||||
//HAL_CAN_ActivateNotification(&hcan1,CAN_IT_RX_FIFO0_MSG_PENDING);
|
||||
|
||||
|
||||
if (HAL_CAN_ActivateNotification(&hcan1, CAN_IT_RX_FIFO0_MSG_PENDING) != HAL_OK)
|
||||
{
|
||||
Error_Handler();
|
||||
}
|
||||
//HAL_GPIO_WritePin(GPIOB,GPIO_PIN_12, GPIO_PIN_SET);
|
||||
testCan(&hcan1);
|
||||
|
||||
//testCan(&hcan1);
|
||||
|
||||
/* USER CODE END 2 */
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
../App/Src/test.cpp:14:18:void testCan(CAN_HandleTypeDef*) 1
|
||||
../App/Src/test.cpp:49:18:void testCanMsg(CAN_HandleTypeDef*, uint8_t*) 1
|
||||
../App/Src/test.cpp:80:7:void unpackValues(uint8_t, uint8_t*, uint8_t*, uint8_t*, uint8_t*) 1
|
||||
../App/Src/test.cpp:87:10:uint8_t packValues(uint8_t, uint8_t, uint8_t, uint8_t) 1
|
||||
../App/Src/test.cpp:37:18:void testCanMsg(CAN_HandleTypeDef*, uint8_t*) 1
|
||||
../App/Src/test.cpp:55:7:void unpackValues(uint8_t, uint8_t*, uint8_t*, uint8_t*, uint8_t*) 1
|
||||
../App/Src/test.cpp:62:10:uint8_t packValues(uint8_t, uint8_t, uint8_t, uint8_t) 1
|
||||
|
Binary file not shown.
@ -1,4 +1,4 @@
|
||||
../App/Src/test.cpp:14:18:void testCan(CAN_HandleTypeDef*) 608 static
|
||||
../App/Src/test.cpp:49:18:void testCanMsg(CAN_HandleTypeDef*, uint8_t*) 616 static
|
||||
../App/Src/test.cpp:80:7:void unpackValues(uint8_t, uint8_t*, uint8_t*, uint8_t*, uint8_t*) 24 static
|
||||
../App/Src/test.cpp:87:10:uint8_t packValues(uint8_t, uint8_t, uint8_t, uint8_t) 24 static
|
||||
../App/Src/test.cpp:37:18:void testCanMsg(CAN_HandleTypeDef*, uint8_t*) 600 static
|
||||
../App/Src/test.cpp:55:7:void unpackValues(uint8_t, uint8_t*, uint8_t*, uint8_t*, uint8_t*) 24 static
|
||||
../App/Src/test.cpp:62:10:uint8_t packValues(uint8_t, uint8_t, uint8_t, uint8_t) 24 static
|
||||
|
@ -1,7 +1,7 @@
|
||||
../Core/Src/main.c:79:5:main 3
|
||||
../Core/Src/main.c:181:6:SystemClock_Config 3
|
||||
../Core/Src/main.c:227:13:MX_CAN1_Init 2
|
||||
../Core/Src/main.c:264:13:MX_UART4_Init 2
|
||||
../Core/Src/main.c:297:13:MX_GPIO_Init 1
|
||||
../Core/Src/main.c:344:6:HAL_CAN_RxFifo0MsgPendingCallback 1
|
||||
../Core/Src/main.c:373:6:Error_Handler 1
|
||||
../Core/Src/main.c:179:6:SystemClock_Config 3
|
||||
../Core/Src/main.c:225:13:MX_CAN1_Init 2
|
||||
../Core/Src/main.c:262:13:MX_UART4_Init 2
|
||||
../Core/Src/main.c:295:13:MX_GPIO_Init 1
|
||||
../Core/Src/main.c:342:6:HAL_CAN_RxFifo0MsgPendingCallback 1
|
||||
../Core/Src/main.c:371:6:Error_Handler 1
|
||||
|
Binary file not shown.
@ -1,7 +1,7 @@
|
||||
../Core/Src/main.c:79:5:main 8 static
|
||||
../Core/Src/main.c:181:6:SystemClock_Config 88 static
|
||||
../Core/Src/main.c:227:13:MX_CAN1_Init 8 static
|
||||
../Core/Src/main.c:264:13:MX_UART4_Init 8 static
|
||||
../Core/Src/main.c:297:13:MX_GPIO_Init 48 static
|
||||
../Core/Src/main.c:344:6:HAL_CAN_RxFifo0MsgPendingCallback 16 static
|
||||
../Core/Src/main.c:373:6:Error_Handler 8 static,ignoring_inline_asm
|
||||
../Core/Src/main.c:179:6:SystemClock_Config 88 static
|
||||
../Core/Src/main.c:225:13:MX_CAN1_Init 8 static
|
||||
../Core/Src/main.c:262:13:MX_UART4_Init 8 static
|
||||
../Core/Src/main.c:295:13:MX_GPIO_Init 48 static
|
||||
../Core/Src/main.c:342:6:HAL_CAN_RxFifo0MsgPendingCallback 16 static
|
||||
../Core/Src/main.c:371:6:Error_Handler 8 static,ignoring_inline_asm
|
||||
|
Binary file not shown.
@ -1,20 +1,21 @@
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:12:10:void sta::Printable::print(char) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:17:10:void sta::Printable::print(bool) 2
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:22:10:void sta::Printable::print(double) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:29:10:void sta::Printable::print(uint8_t, sta::IntegerBase) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:34:10:void sta::Printable::print(uint16_t, sta::IntegerBase) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:39:10:void sta::Printable::print(uint32_t, sta::IntegerBase) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:44:10:void sta::Printable::print(const char*) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:49:10:void sta::Printable::println() 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:54:10:void sta::Printable::println(char) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:60:10:void sta::Printable::println(bool) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:66:10:void sta::Printable::println(double) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:72:10:void sta::Printable::println(uint8_t, sta::IntegerBase) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:78:10:void sta::Printable::println(uint16_t, sta::IntegerBase) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:84:10:void sta::Printable::println(uint32_t, sta::IntegerBase) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:90:10:void sta::Printable::println(const char*) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:95:10:void sta::Printable::println(const char*, size_t) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:101:10:void sta::Printable::printBase(uintmax_t, sta::IntegerBase, const char*, size_t) 5
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:124:10:void sta::Printable::printDec(uintmax_t, const char*) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:131:10:void sta::Printable::printBin(uintmax_t, size_t) 4
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:156:10:void sta::Printable::printHex(uintmax_t, size_t) 5
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:14:7:) 2
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:30:10:void sta::Printable::print(char) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:35:10:void sta::Printable::print(bool) 2
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:40:10:void sta::Printable::print(double) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:47:10:void sta::Printable::print(uint8_t, sta::IntegerBase) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:52:10:void sta::Printable::print(uint16_t, sta::IntegerBase) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:57:10:void sta::Printable::print(uint32_t, sta::IntegerBase) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:62:10:void sta::Printable::print(const char*) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:67:10:void sta::Printable::println() 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:72:10:void sta::Printable::println(char) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:78:10:void sta::Printable::println(bool) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:84:10:void sta::Printable::println(double) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:90:10:void sta::Printable::println(uint8_t, sta::IntegerBase) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:96:10:void sta::Printable::println(uint16_t, sta::IntegerBase) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:102:10:void sta::Printable::println(uint32_t, sta::IntegerBase) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:108:10:void sta::Printable::println(const char*) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:113:10:void sta::Printable::println(const char*, size_t) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:119:10:void sta::Printable::printBase(uintmax_t, sta::IntegerBase, const char*, size_t) 5
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:142:10:void sta::Printable::printDec(uintmax_t, const char*) 1
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:149:10:void sta::Printable::printBin(uintmax_t, size_t) 4
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:174:10:void sta::Printable::printHex(uintmax_t, size_t) 5
|
||||
|
Binary file not shown.
@ -1,20 +1,21 @@
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:12:10:void sta::Printable::print(char) 16 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:17:10:void sta::Printable::print(bool) 16 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:22:10:void sta::Printable::print(double) 96 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:29:10:void sta::Printable::print(uint8_t, sta::IntegerBase) 48 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:34:10:void sta::Printable::print(uint16_t, sta::IntegerBase) 48 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:39:10:void sta::Printable::print(uint32_t, sta::IntegerBase) 48 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:44:10:void sta::Printable::print(const char*) 24 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:49:10:void sta::Printable::println() 16 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:54:10:void sta::Printable::println(char) 16 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:60:10:void sta::Printable::println(bool) 16 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:66:10:void sta::Printable::println(double) 24 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:72:10:void sta::Printable::println(uint8_t, sta::IntegerBase) 24 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:78:10:void sta::Printable::println(uint16_t, sta::IntegerBase) 24 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:84:10:void sta::Printable::println(uint32_t, sta::IntegerBase) 24 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:90:10:void sta::Printable::println(const char*) 16 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:95:10:void sta::Printable::println(const char*, size_t) 24 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:101:10:void sta::Printable::printBase(uintmax_t, sta::IntegerBase, const char*, size_t) 32 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:124:10:void sta::Printable::printDec(uintmax_t, const char*) 88 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:131:10:void sta::Printable::printBin(uintmax_t, size_t) 112 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:156:10:void sta::Printable::printHex(uintmax_t, size_t) 64 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:14:7:) 60 dynamic
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:30:10:void sta::Printable::print(char) 16 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:35:10:void sta::Printable::print(bool) 16 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:40:10:void sta::Printable::print(double) 96 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:47:10:void sta::Printable::print(uint8_t, sta::IntegerBase) 48 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:52:10:void sta::Printable::print(uint16_t, sta::IntegerBase) 48 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:57:10:void sta::Printable::print(uint32_t, sta::IntegerBase) 48 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:62:10:void sta::Printable::print(const char*) 24 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:67:10:void sta::Printable::println() 16 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:72:10:void sta::Printable::println(char) 16 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:78:10:void sta::Printable::println(bool) 16 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:84:10:void sta::Printable::println(double) 24 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:90:10:void sta::Printable::println(uint8_t, sta::IntegerBase) 24 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:96:10:void sta::Printable::println(uint16_t, sta::IntegerBase) 24 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:102:10:void sta::Printable::println(uint32_t, sta::IntegerBase) 24 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:108:10:void sta::Printable::println(const char*) 16 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:113:10:void sta::Printable::println(const char*, size_t) 24 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:119:10:void sta::Printable::printBase(uintmax_t, sta::IntegerBase, const char*, size_t) 32 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:142:10:void sta::Printable::printDec(uintmax_t, const char*) 88 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:149:10:void sta::Printable::printBin(uintmax_t, size_t) 112 static
|
||||
../Libs/sta-core/src/debug/printing/printable.cpp:174:10:void sta::Printable::printHex(uintmax_t, size_t) 64 static
|
||||
|
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
||||
Subproject commit 85dfcac48eecddf527441c8597903000f0221033
|
||||
Subproject commit 664545601bf5086e5bfc039fd907256baf9a1a25
|
Loading…
x
Reference in New Issue
Block a user