merged

timers_unix: Fix termination problem of WaitReceiveTaskEnd

The function pthread_kill sends the Signal thread and to the own process.
If you use this construct than the application which calls uses the
canfestival api will terminate at the call of canClose. To avoid that
use pthread_cancel instead of pthread_kill. To use the pthread_cancel call
you need to set the cancel ability in the thread function. That means
you need to call pthread_setcancelstate and pthread_setcanceltype.
For the termination of the thread at any time it is important to set the
cancel type to PTHREAD_CANCEL_ASYNCHRONOUS.

some fixes

Fix : libcanfestival_unix.a not built if examples are not compiled

Problem: when building Canfestival with unix timers 'libcanfestiva_unix.a'
is built only if you build examples too.

Test case:

$ ./configure --timers=unix --can=socket --target=unix
$ make canfestival

...

no errors but 'libcanfestival_unix.a' is not built:
$ find . -name "*.a"
./src/libcanfestival.a

Changing line 90 of 'drivers/unix/Makefile.in' to:
#driver: $(OBJS)
driver: libcanfestival_$(TARGET).a

solves the problem:

$ ./configure --timers=unix --can=socket --target=unix
$ make canfestival

...

$ find . -name "*.a"
./drivers/unix/libcanfestival_unix.a
./src/libcanfestival.a

Honor DESTDIR in install rules

Signed-off-by: Samuel Martin <s.martin49@gmail.com>

WxPython 2.9 support fix by J?rg H?bler

Merge changes from bitbucket.org/HMSFAE/canfestival_ixxat

VCI3 driver added

Fix bug when creating new node in newer version of wxPython (>=2.9)

Fixed SplitterWindows sash position at creation when subindextable is used in notebook tab

Fixed set usage in eds_utils

Updated DS301 standard node entries definition

Removed call of deprecated function on wxSplitterWindow

Fixed Save As... function in Beremiz

Fixed bug when importing NodeEditorTemplate

Merge

Fixed conflict in internationalization with Beremiz CanFestival extension

Harmonized unix and win32 canClose_driver, fixed crash on close under win32

Fixed import and export of EDS files

Fixed DS401 profile config

Fixed DLL calling convention when build with mingw32 + some re-indenting in can_tcp_win32

win32: reverted DLL loading from LoadLibraryA to LoadLibrary

can_peak_linux link sequence modifed, thx to chenxi

Now can_tcp_win32 default to 127.0.0.1 and can_tcp_win32_server is verbose

Restored 'libcanfestival_' prefix to windows CAN drivers DLLs

Configure now initialize DLL_LIST in objdictgen/canfestival_config.py, required by Beremiz' CanFestival plugin

Removed 'cyg' prefix abusively appended to .dll files of some windows CAN drivers

Removed depricated CHANGES file

Fixed bug when replacing already imported EDS file in NetworkEditor

Fixed warnings when compiling generated Object Dictionary

Fix error in UNS8 and INTEGER8 corresponding C type definition in none platform

Merged

Fix bug with Type selection of Array user defined variables

Fix bug when Drag'n Dropping located variables on Windows

Fixed compilability with Micrsoft visual C++

Ability to send content of emergency data.

Added comments

Fix bug when using not editable EditingPanel for displaying nodelist generated master

Fixing bug in dcf.c preventing to configure more than one slave using concise dcf when Save Node option is disabled

Gnosis XML beeing included since ages, wget commented out in Makefile

Merged Markus Wildbolz' node-guarding and fixes

Doxyfile adapted to show all basic source files, search engine included

Removed auto-generated object dictionary files from example folders
Updated .hgignore file (generated Makefiles, auto-generated OD files)

Changed call to sleep function because it gets redefined when using RTAI_LXRT

Implementation of a basic working node-guarding
Documentation adapted
Typos corrected

Changed configure to compile on Debian with the latest RTAI patch installed (removed rtdm library in compiler flags)
Commented out the MSG_WAR section for RTAI because this only runs in an RTAI Kernelspace program

Fixing networkedit to deal with non-null master nodeid

Adding support for translating CANOpen type to corresponding IEC type for location drag'n drop

Master now sends NMT_Reset only from default preOperational application callback

Fix bug when adding an entry to a node

Fix bug with 'not saved' state for network when removing a slave

Removed debug code remaining in pdo.c

pdo.c : missalignment problem on some cpu when comparing cobids, various typo fixes
dcf.c : factorized code, and added automatic state change to operational when DCF finished
drivers/none : default time value is now nanoseconds

Adding informations in data send when drag'n dropping locations

Fix bug when importing and loading not well formatted eds files

Merged Christian Taedcke changes

Merged Francois BEAULIER's changes

Updated build configuration for travis to build more driver and send notification to irc.

Adapted path to xeno-config.
Changed parameters to xeno-config.

Building 4 can drivers now.

Added first version of .travis.yml for build server.

Win32 win32test:
- fixed wrong size parameter of call to writeLocalDict() to set remote node id.

can_peak_win32 project files:
- adapted VS2008 project file
- added lib file and include directory to releas config of VS2010 project

VS2010 project files:
- reverted character set of Debug configuration to MultiByte

can_peak_win32 code:
- changed m->Data to m->data, because the renaming was not done in the main code yet.
The peak driver compiles now.

cna_peak_win32 VS2010 project file:
- removed libs as project dependencies
- added include path and lib to AdditionalDependencies

Win32 fixes:
- added macros used by driver can_peak_win32

Win32 win32test:
- added optional parameter busname to command line

Win32 IXXAT driver:
- prevent crash after calling the close() function

Win32 VS2010 project files:
- changed debug database name und moved it to the OutDir

Win32 fixes:
- fixed MSG-macro for VS2010

Win32:
- changed parameter type of LoadCanDriver from TCHAR to char

Win32 IXXAT fixes:
- added missing function to dll exports

Win32 project settings:
- set character encoding to unicode

Win32 fixes:
- generate debug information for canopenshell in debug configuration

merge with main Canfestival repository

Fixed : wrong parameter size

Fixed example TestMasterSlaveLSS in Master.c missing argument in writeNetworkDictCallBack
Fixed comments in sdo.c

Merged with smarteh-dev

Adding support for integration of panels in Beremiz

Merged JaFojtik Peak Win32 update

Fixed PEAK Win 32 driver, for PEAK Light API 1.x and 2.x

merge with CanFestival-3-asc

minor modification on two MSG_ERR

merged ica

win32:
- Added visual studio 2010 solution file and project files. Some driver that
does not work are disabled in the configuration manager.

can_copican_win32:
- renamed project files to include vc10

can_uvccm_win32:
- remove depricated OptimizeForWindows98 from project file

can_uvccm_win32:
- added can_uvccm_win32 to solution file and fixed compilation errors for current driver
- renamed project file to include vc9

CANopenShell win32:
- fixed include path for release configuration

can_peak_win32:
- added can_peak_win32 to solution file (disabled project in configuration manager)
- renamed project file to include vc9

can_anagate_win32:
- added can_anagate_win32 to solution file and fixed compilation errors for current driver
- renamed project file to include vc9

CANOpenShell example:
ADDED: - generated obejct dictionaries, so that the samples can be build without
using objdictgen first

Win32:
FIXED: - converted visual studio solution file back to 2008.
RENAMED: - solution file name and used project file names to project.vc9.vcproj

Win32 fixes:
- added SDO_BLOCK_SIZE macro to win32 config.h
- added explicit casts to remove compiler warnings to sdo.c
- added missing exports to Canfestival-3.def

dcf.c:
- removed inline definition of dcf variable, which is not allowed on many c compilers.
- removed SaveNode() call using ifdef, because not all canopen devices support this feature.
Later on it should be possible to enable this for each dcf entry using objdictedit.
- fixed bug when dereferencing an dcf entry from the object dictionary.

merges with https://bitbucket.org/JaFojtik/canfestival-3

ID: 3459307 - Async problem in drivers/win32/win32.c

Windows CAN DLL driver sanity check.

Multiple instances CAN wirtual network for PEAK and Windows.

There is no English word "transfert". Fix all the typos.

Applyed changes from discussion '[Canfestival-devel] some minor CanFestival build suggestions', https://sourceforge.net/mailarchive/message.php?msg_id=28397766

[ canfestival-Bugs-3458203 ] Objdictedit

[ canfestival-Patches-3481330 ] Useless structure SHORT_CAN
[ canfestival-Patches-3481339 ] Useless local variable res in CanFestival\drivers\win32.c

Merge further Ica changes

Win32 IXXAT driver:
CHANGED: - Removed deprecated call to VCI_GetBrdTypeByName().
- The board type given to VCI2_PrepareBoard() is now always 0, because this parameter is not used.
- Removed the board_name parameter from IXXAT::open(). The board that should be opened is identified by the parameter board_number.
The correct parameter board_number can be determined using XAT_EnumHwEntry() and XAT_GetConfig().
- Changed the constructor IXXAT::IXXAT(). board->busname now only contains the board_number, see XAT_EnumHwEntry() and XAT_GetConfig().

Win32 IXXAT::
CHANGED: - removed newline from log messages

pdo.c:
FIXED: - fixed two wrong MSG_ERR calls

Win32:
CHANGED: - Switch character encoding to unicode.
- Changed logging format strings from %s to %S.
FIXED: - second argument to swprintf() is now the size of the target buffer

Win32 IXXAT:
CHANGED: - Changed logging format strings from %s to %S.

Win32:
FIXED: - The argument of LoadCanDriver() is LPCTSTR, not const char*

Win32 IXXAT driver:
ADDED: - Two additional log messages added, when initialization of the driver fails.
CHANGED: - Instead of writing directly into OutputDebugString() messages are printed using the new macro MSG_ERR_DRV().

Win32 applconfig:
CHANGED: - The MSG()-Makros for Visual Studio both print now to OutputDebugString().
ADDED: - Makro CANFESTIVAL_DEBUG_DRV_MSG() and MSG_ERR_DRV() to print into MSG() from a can driver implementation.

Win32 IXXAT driver:
FIXED: - A return value of 0 from VCI_ResetCan() and VCI_StartCan() indicates an error, too.
CHANGED: - The return values of VCI_ResetCan() and VCI_StartCan() are logged in case of an error.

SDO transfer:
FIXED: - Wrong SDO line could get changed due to a wrong parameter to setSDOlineRestBytes().

Win32-Dll:
CHANGED: - export the function sendOnePDOevent from the windows dll.

Win32-Timer:
CHANGED: - Timer implementation for win32 from absolute time (_ftime) to GetTickCount().
This fixes the following bug: When the system time was changed, a heartbeat timeout occurred.
FIXED: - Timeout seems only work properly if EnterMutex() is called before call of GetTickCount() (Patch from Roland Marquis)

FIXED: - The AVR example now compiles in linux.
- adapted AVR code to current default branch.

FIXED: - adapted paths for current vscom driver
- removed chmod +x vs_can_api.dll;
- added option -o to unzip command to overwrite existing files

FIXED: - the macro SUB_PROG_CFLAGS was overwritten for 64bit machines using gcc. Because of this the xenomai compilation failed.

Merged some canfestival-3-ica Fixes.

FIXED: - The AVR example now compiles in linux.
- adapted AVR code to current default branch.