Coldbox/TECware
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

canbus adding filters

Browse Source
This commit is contained in:
pique_n
2022-01-20 12:39:41 +01:00
parent 852f344c7f
commit fd665a9d94
16 changed files with 768 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Core/Application/MAIN_MainApplication.c
View File

@@ -57,17 +57,17 @@
// Description: Definition of local constants (visible by this module only).
//=================================================================================================
#define SLOW_TEXT (U32)0x83767987
#define FAST_TEXT (U32)0x46415354
#define MSG_QUEUE_SIZE 8
#define EVENT_NEW_MESSAGE ((U32)(1<<0))
#define EVENT_TIMER_UPDATE ((U32)(1<<1))
#define EVENT_FLAGS_ALL ( EVENT_NEW_MESSAGE | EVENT_TIMER_UPDATE )
#define MESSAGE_TYPE_READ 0
#define MESSAGE_TYPE_WRITE 1
#define MESSAGE_TYPE_COMMAND 2
//=================================================================================================
// Section: MACROS
// Description: Definition of local macros (visible by this module only).
@@ -107,13 +107,8 @@ LOCAL osThreadId_t m_pstThreadID = NULL;
LOCAL osMessageQueueId_t m_pstCANRxMsgQueueID = NULL;
LOCAL osEventFlagsId_t m_pstEventID = NULL;
LOCAL osTimerId_t m_pstUpdateTimer = NULL;
LOCAL U32 m_u32DataCnt = 0;
//=================================================================================================
// Section: LOCAL CONSTANTS
// Description: Definition of local constants (visible by this module only).
@@ -230,15 +225,19 @@ PRIVATE VOID vTask( PVOID arg )
// TODO: implement new protocol
CAND_Message stMessage;
osMessageQueueGet( m_pstCANRxMsgQueueID, &stMessage, NULL, 0 );
osMessageQueueGet( m_pstCANRxMsgQueueID, &stMessage, NULL, 0 );
U8 u8Register = stMessage.au8Data[0];
U8 u8Typ = stMessage.au8Data[1];
U32 u32Data = *(PU32)&stMessage.au8Data[2];
if( stMessage.u8Id == 0x12 ){
if( u8Register == 0x12 ){
S16 s16Voltage = stMessage.au8Data[0] << 8;
s16Voltage |= stMessage.au8Data[1];
VARH_vSetVariableDataFloat( VARH_eControlVoltage, (FLOAT)s16Voltage / 1000 );
} else if( stMessage.u8Id == 0x13 ){
} else if( u8Register == 0x13 ){
S16 SupplyVoltage24V = (S16) ( VARH_flGetVariableData( VARH_eSupply_U ) * 1000 );
S16 SupplyCurrent24V = (S16) ( VARH_flGetVariableData( VARH_eSupply_I ) * 1000 );
@@ -256,7 +255,7 @@ PRIVATE VOID vTask( PVOID arg )
CAND_boSendMessage( 0x14, 8, au8Buffer );
} else if( stMessage.u8Id == 0x15 ){
} else if( u8Register == 0x15 ){
S16 Cold = (S16) ( VARH_flGetVariableData( VARH_eTemp_C ) * 100 );
S16 Hot = (S16) ( VARH_flGetVariableData( VARH_eTemp_H ) * 100 );
@@ -268,11 +267,11 @@ PRIVATE VOID vTask( PVOID arg )
CAND_boSendMessage( 0x16, 4, au8Buffer );
} else if( stMessage.u8Id == 0x17 ){
} else if( u8Register == 0x17 ){
PECO_Enable( TRUE );
} else if( stMessage.u8Id == 0x18 ){
} else if( u8Register == 0x18 ){
PECO_Enable( FALSE );

2
Core/Application/VARH_VariableHandler.c
View File

@@ -342,7 +342,7 @@ U8 VARH_uGetVariableFlags( U8 u8Variable )
VOID VARH_vSetVariableToInitData( U8 u8Variable )
{
osMutexAcquire( m_pstMutexID, osWaitForever ); // aquire mutex
VARH_vSetVariableDataFromSystem( u8Variable, m_astVarInfo[u8Variable].uInitData );
vSetVariableDataFromSystem( u8Variable, m_astVarInfo[u8Variable].uInitData );
osMutexRelease( m_pstMutexID ); // release mutex
}

4
Core/Drivers/ANPO_AnalogPortsOut.c
View File

@@ -139,9 +139,9 @@ BOOL ANPO_boInitializeModule( VOID )
BOOL ANPO_boSetVoltage( FLOAT Voltage ){
BOOL boOK = TRUE;
U32 RawData = u32ConvertVoltagetoRaw( Voltage );
U32 u32RawData = u32ConvertVoltagetoRaw( Voltage );
boOK &= HAL_DAC_SetValue( &hdac1, DAC_CHANNEL_1, DAC_ALIGN_12B_R, RawDatab );
boOK &= HAL_DAC_SetValue( &hdac1, DAC_CHANNEL_1, DAC_ALIGN_12B_R, u32RawData );
return( boOK );
}

39
Core/Drivers/CAND_CanDriver.c
View File

@@ -7,7 +7,7 @@
//-------------------------------------------------------------------------------------------------
//
// Project: Peltier Controller V2
// Author: Noah Piqu<EFBFBD> (noah.pique@psi.ch)
// Author: Noah Piqué (noah.pique@psi.ch)
//
//-------------------------------------------------------------------------------------------------
//
@@ -36,6 +36,9 @@
// Toolbox
#include "../Toolbox/UTIL_Utility.h"
// Driver
#include "DIPO_DigitalPorts.h"
// include STM32 drivers
#include "stm32l4xx_hal.h"
@@ -46,7 +49,11 @@
// Description: Definition of local constants (visible by this module only).
//=================================================================================================
#define CAND_SHIFT 0x0 // Shift address space (0-3)
#define CAND_BOARD_GROUP 0x03 // Board group (0-127 / 0x00-0x7F)
#define CAND_PRIVATE 1
#define CAND_PUBLIC 0
//=================================================================================================
// Section: MACROS
@@ -61,14 +68,10 @@
//=================================================================================================
//=================================================================================================
// Section: STRUCTURES
// Description: Definition of local Structures (visible by this module only).
//=================================================================================================
//=================================================================================================
@@ -77,6 +80,19 @@
//=================================================================================================
CAND_pfnRxCallback m_pfnRxCallback = NULL;
CAN_FilterTypeDef stFilter = {
(CAND_SHIFT<<6)|(CAND_PUBLIC<<5)|(CAND_BOARD_GROUP<<1), // FilterIdHigh
0x00, // FilterIdLow
(CAND_SHIFT<<6)|(CAND_PRIVATE<<5)|(CAND_BOARD_GROUP<<1), // FilterMaskIdHigh
0x00, // FilterMaskIdLow
CAN_FILTER_FIFO0, // FilterFIFOAssignment
0x00, // FilterBank
CAN_FILTERMODE_IDLIST, // FilterMode
CAN_FILTERSCALE_32BIT, // FilterScale
CAN_FILTER_ENABLE, // FilterActivation
0x00 // SlaveStartFilterBank
};
//=================================================================================================
// Section: LOCAL CONSTANTS
// Description: Definition of local constants (visible by this module only).
@@ -117,6 +133,17 @@ extern CAN_HandleTypeDef hcan1;
BOOL CAND_boInitializeModule( VOID )
{
BOOL boOK = TRUE;
U8 u8BoardId = 0x00;
u8BoardId |= DIPO_boGetInput(DIPO_eADR0) << 0;
u8BoardId |= DIPO_boGetInput(DIPO_eADR1) << 1;
u8BoardId |= DIPO_boGetInput(DIPO_eADR2) << 2;
//u8BoardId |= DIPO_boGetInput(DIPO_eADR0) << 3; // TODO: New HW
stFilter.FilterIdHigh |= u8BoardId >> 3;
stFilter.FilterIdLow |= u8BoardId << 5;
HAL_CAN_ConfigFilter(&hcan1, &stFilter);
boOK &= ( HAL_CAN_Start(&hcan1) == HAL_OK ) ? TRUE : FALSE;
@@ -161,7 +188,6 @@ BOOL CAND_boSendMessage( U8 u8Id, U8 u8Len, PU8 pu8Buffer ){
// Returns: none
//-------------------------------------------------------------------------------------------------
VOID CAND_vSetRxCallback( CAND_pfnRxCallback pfnRxCallback ){
m_pfnRxCallback = pfnRxCallback;
}
@@ -188,7 +214,6 @@ void HAL_CAN_RxFifo0MsgPendingCallback( CAN_HandleTypeDef *hcan ){
CAND_Message stMessage;
stMessage.u8Id = header.StdId;
stMessage.u8Len = header.DLC;
UTIL_vMemCopy( au8Data,stMessage.au8Data,stMessage.u8Len );

1
Core/Drivers/CAND_CanDriver.h
View File

@@ -62,7 +62,6 @@ extern "C" {
//=================================================================================================
typedef struct {
U8 u8Id;
U8 au8Data[8];
U8 u8Len;
} CAND_Message;