Skip to content

Commit

Permalink
Devel2.2.3 (#78)
Browse files Browse the repository at this point in the history
* trace stcan
* debugging G3
  • Loading branch information
meeludwig authored Jan 11, 2024
1 parent d14e7f0 commit e67f64e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#
#
cmake_minimum_required( VERSION 3.0 )
project( CanModuleProject LANGUAGES C CXX VERSION 2.2.2 )
project( CanModuleProject LANGUAGES C CXX VERSION 2.2.3 )
message(STATUS "[${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}]: CanModule version= ${PROJECT_VERSION}" )

cmake_policy(SET CMP0054 NEW)
Expand Down
6 changes: 3 additions & 3 deletions CanInterfaceImplementations/systec/STCanScan.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -396,13 +396,15 @@ int STCanScan::openCanPort(tUcanInitCanParam initializationParameters)
MLOGST(WRN,this) << "trying to open a can port which is in use, reuse handle, skipping UCanDeinitHardware";
} else {
//Otherwise we create it.
MLOGST(TRC,this) << "init can port";
MLOGST(TRC,this) << "init can port module number= " << m_moduleNumber << " calling UcanInitHardwareEx DEBUG0";
systecCallReturn = ::UcanInitHardwareEx(&canModuleHandle, m_moduleNumber, 0, 0);
MLOGST(INF,this) << "systecCallReturn= 0x" << std::hex << (unsigned int) systecCallReturn << std::dec << " after calling UcanInitHardwareEx DEBUG0";
if (systecCallReturn != USBCAN_SUCCESSFUL ) {
MLOGST(ERR,this) << "UcanInitHardwareEx, return code = [ 0x" << std::hex << (int) systecCallReturn << std::dec << "]";
::UcanDeinitHardware(canModuleHandle);
return -1;
}
MLOGST(ERR,this) << "UcanInitHardwareEx, seems OKreturn code = [ 0x" << std::hex << (int) systecCallReturn << std::dec << "]";
}

setCanHandleInUse(m_moduleNumber,true);
Expand Down Expand Up @@ -888,7 +890,5 @@ void STCanScan::getStatistics( CanStatistics & result )
/** as a consequence of this coding the
CanModule::CanModule_bus_state::CANMODULE_NOSTATE;
never occurs. fine with me. */


}

0 comments on commit e67f64e

Please sign in to comment.