mirror of https://github.com/rusefi/openblt.git
Refs #660. Improved CAN connection with PCAN-USB.
git-svn-id: https://svn.code.sf.net/p/openblt/code/trunk@631 5dc33758-31d5-4daf-9ae8-b24bf3d40d73
This commit is contained in:
parent
5ababf911d
commit
83e9c0018c
|
@ -41,6 +41,16 @@
|
||||||
#include "PCANBasic.h" /* for PCAN-Basic API */
|
#include "PCANBasic.h" /* for PCAN-Basic API */
|
||||||
|
|
||||||
|
|
||||||
|
/****************************************************************************************
|
||||||
|
* Macro definitions
|
||||||
|
****************************************************************************************/
|
||||||
|
/** \brief Configurable to enabled/disable the automatic CAN bus off recovery feature.
|
||||||
|
* Testing shows that it is better to leave this disabled. If no connection
|
||||||
|
* with the target can be made, the PCAN-USB automatically re-initialized anyway.
|
||||||
|
*/
|
||||||
|
#define PCANUSB_BUSOFF_AUTORECOVERY_ENABLE (0u)
|
||||||
|
|
||||||
|
|
||||||
/***************************************************************************************
|
/***************************************************************************************
|
||||||
* Type definitions
|
* Type definitions
|
||||||
****************************************************************************************/
|
****************************************************************************************/
|
||||||
|
@ -280,7 +290,9 @@ static bool PCanUsbConnect(void)
|
||||||
bool channelSupported;
|
bool channelSupported;
|
||||||
bool libInitialized = false;
|
bool libInitialized = false;
|
||||||
TPCANBaudrate baudrate = PCAN_BAUD_500K;
|
TPCANBaudrate baudrate = PCAN_BAUD_500K;
|
||||||
|
#if (PCANUSB_BUSOFF_AUTORECOVERY_ENABLE > 0)
|
||||||
uint32_t iBuffer;
|
uint32_t iBuffer;
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Convert the baudrate to a value supported by the PCAN-Basic API. */
|
/* Convert the baudrate to a value supported by the PCAN-Basic API. */
|
||||||
switch (pCanUsbSettings.baudrate)
|
switch (pCanUsbSettings.baudrate)
|
||||||
|
@ -370,6 +382,7 @@ static bool PCanUsbConnect(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if (PCANUSB_BUSOFF_AUTORECOVERY_ENABLE > 0)
|
||||||
/* Enable the bus off auto reset. */
|
/* Enable the bus off auto reset. */
|
||||||
if (result)
|
if (result)
|
||||||
{
|
{
|
||||||
|
@ -381,6 +394,7 @@ static bool PCanUsbConnect(void)
|
||||||
result = false;
|
result = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Configure reception acceptance filter, if it is not supposed to be fully open. */
|
/* Configure reception acceptance filter, if it is not supposed to be fully open. */
|
||||||
if ( (result) && (pCanUsbSettings.mask != 0x00000000u) )
|
if ( (result) && (pCanUsbSettings.mask != 0x00000000u) )
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue