--- a/CanFestival-3.vc10.vcxproj	Tue Mar 20 16:04:52 2018 +0100
+++ b/CanFestival-3.vc10.vcxproj	Wed Mar 21 13:33:43 2018 +0100
@@ -116,7 +116,7 @@
     <ClInclude Include="include\sdo.h" />
     <ClInclude Include="include\states.h" />
     <ClInclude Include="include\sync.h" />
-    <ClInclude Include="include\timer.h" />
+    <ClInclude Include="include\timers.h" />
     <ClInclude Include="include\timers_driver.h" />
     <ClInclude Include="include\win32\applicfg.h" />
     <ClInclude Include="include\win32\canfestival.h" />

--- a/CanFestival-3.vc10.vcxproj.filters	Tue Mar 20 16:04:52 2018 +0100
+++ b/CanFestival-3.vc10.vcxproj.filters	Wed Mar 21 13:33:43 2018 +0100
@@ -110,7 +110,7 @@
     <ClInclude Include="include\sync.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\timer.h">
+    <ClInclude Include="include\timers.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\timers_driver.h">

--- a/CanFestival-3.vc9.vcproj	Tue Mar 20 16:04:52 2018 +0100
+++ b/CanFestival-3.vc9.vcproj	Wed Mar 21 13:33:43 2018 +0100
@@ -300,7 +300,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\include\timer.h"
+				RelativePath=".\include\timers.h"
 				>
 			</File>
 			<File

--- a/drivers/AT91/timer_AT91.c	Tue Mar 20 16:04:52 2018 +0100
+++ b/drivers/AT91/timer_AT91.c	Wed Mar 21 13:33:43 2018 +0100
@@ -23,7 +23,7 @@
 
 // Includes for the Canfestival driver
 #include "canfestival.h"
-#include "timer.h"
+#include "timers.h"
 
 // Define the timer registers
 #define AT91C_BASE_TC	AT91C_BASE_TC2

--- a/drivers/AVR/timer_AVR.c	Tue Mar 20 16:04:52 2018 +0100
+++ b/drivers/AVR/timer_AVR.c	Wed Mar 21 13:33:43 2018 +0100
@@ -25,7 +25,7 @@
 
 // Includes for the Canfestival driver
 #include "canfestival.h"
-#include "timer.h"
+#include "timers.h"
 
 // Define the timer registers
 #define TimerAlarm        OCR3B

--- a/drivers/hcs12/canOpenDriver.c	Tue Mar 20 16:04:52 2018 +0100
+++ b/drivers/hcs12/canOpenDriver.c	Wed Mar 21 13:33:43 2018 +0100
@@ -35,7 +35,7 @@
 #include "../include/hcs12/canOpenDriver.h"
 #include "../include/can.h"
 #include "../include/objdictdef.h"
-#include "../include/timer.h"
+#include "../include/timers.h"
 
 
 

--- a/drivers/timers_kernel/timers_kernel.c	Tue Mar 20 16:04:52 2018 +0100
+++ b/drivers/timers_kernel/timers_kernel.c	Wed Mar 21 13:33:43 2018 +0100
@@ -22,10 +22,10 @@
 
 #include <linux/spinlock.h>
 #include <linux/jiffies.h>
-#include <linux/timer.h>
+#include <linux/timers.h>
 #include <linux/errno.h>
 
-#include "timer.h"
+#include "timers.h"
 #include "applicfg.h"
 
 static spinlock_t lock = SPIN_LOCK_UNLOCKED;

--- a/drivers/timers_kernel_xeno/timers_kernel_xeno.c	Tue Mar 20 16:04:52 2018 +0100
+++ b/drivers/timers_kernel_xeno/timers_kernel_xeno.c	Wed Mar 21 13:33:43 2018 +0100
@@ -25,7 +25,7 @@
 #include <asm/current.h>
 
 #include <native/task.h>
-#include <native/timer.h>
+#include <native/timers.h>
 #include <native/sem.h>
 #include <native/mutex.h>
 #include <native/cond.h>
@@ -33,7 +33,7 @@
 
 #include "applicfg.h"
 #include "can_driver.h"
-#include "timer.h"
+#include "timers.h"
 
 #define TIMERLOOP_TASK_CREATED        1
 

--- a/drivers/timers_rtai/timers_rtai.c	Tue Mar 20 16:04:52 2018 +0100
+++ b/drivers/timers_rtai/timers_rtai.c	Wed Mar 21 13:33:43 2018 +0100
@@ -11,7 +11,7 @@
 
 #include "applicfg.h"
 #include "can_driver.h"
-#include "timer.h"
+#include "timers.h"
 
 #define TIMERLOOP_TASK_CREATED        1
 

--- a/drivers/timers_unix/timers_unix.c	Tue Mar 20 16:04:52 2018 +0100
+++ b/drivers/timers_unix/timers_unix.c	Wed Mar 21 13:33:43 2018 +0100
@@ -6,7 +6,7 @@
 #include <time.h>
 
 #include <applicfg.h>
-#include <timer.h>
+#include <timers.h>
 
 static pthread_mutex_t CanFestival_mutex = PTHREAD_MUTEX_INITIALIZER;
 

--- a/drivers/timers_win32/timers_win32.c	Tue Mar 20 16:04:52 2018 +0100
+++ b/drivers/timers_win32/timers_win32.c	Wed Mar 21 13:33:43 2018 +0100
@@ -31,7 +31,7 @@
 
 #include "applicfg.h"
 #include "can_driver.h"
-#include "timer.h"
+#include "timers.h"
 #include "timers_driver.h"
 
 #ifdef __cplusplus

--- a/drivers/timers_xeno/timers_xeno.c	Tue Mar 20 16:04:52 2018 +0100
+++ b/drivers/timers_xeno/timers_xeno.c	Wed Mar 21 13:33:43 2018 +0100
@@ -11,7 +11,7 @@
 
 #include "applicfg.h"
 #include "can_driver.h"
-#include "timer.h"
+#include "timers.h"
 
 #define TIMERLOOP_TASK_CREATED        1
 

--- a/drivers/win32/win32.c	Tue Mar 20 16:04:52 2018 +0100
+++ b/drivers/win32/win32.c	Wed Mar 21 13:33:43 2018 +0100
@@ -33,7 +33,7 @@
 #endif
 
 #include "canfestival.h"
-#include "timer.h"
+#include "timers.h"
 #include "timers_driver.h"
 
 #ifdef __cplusplus

--- a/examples/AVR/Slave/AVR-Studio/SlaveAVR.aps	Tue Mar 20 16:04:52 2018 +0100
+++ b/examples/AVR/Slave/AVR-Studio/SlaveAVR.aps	Wed Mar 21 13:33:43 2018 +0100
@@ -1,1 +1,1 @@
-<AVRStudio><MANAGEMENT><ProjectName>SlaveAVR</ProjectName><Created>16-Dec-2007 22:17:10</Created><LastEdit>07-Mar-2008 15:45:15</LastEdit><ICON>241</ICON><ProjectType>0</ProjectType><Created>16-Dec-2007 22:17:10</Created><Version>4</Version><Build>4, 13, 0, 528</Build><ProjectTypeName>AVR GCC</ProjectTypeName></MANAGEMENT><CODE_CREATION><ObjectFile>I:\Entwicklung\Firmware\CAN\CanFestival-3\examples\AVR\Slave\SlaveAVR.elf</ObjectFile><EntryFile></EntryFile><SaveFolder>I:\Entwicklung\Firmware\CAN\CanFestival-3\examples\AVR\Slave\AVR-Studio\</SaveFolder></CODE_CREATION><DEBUG_TARGET><CURRENT_TARGET>JTAGICE mkII</CURRENT_TARGET><CURRENT_PART>AT90CAN128</CURRENT_PART><BREAKPOINTS></BREAKPOINTS><IO_EXPAND><HIDE>false</HIDE></IO_EXPAND><REGISTERNAMES><Register>R00</Register><Register>R01</Register><Register>R02</Register><Register>R03</Register><Register>R04</Register><Register>R05</Register><Register>R06</Register><Register>R07</Register><Register>R08</Register><Register>R09</Register><Register>R10</Register><Register>R11</Register><Register>R12</Register><Register>R13</Register><Register>R14</Register><Register>R15</Register><Register>R16</Register><Register>R17</Register><Register>R18</Register><Register>R19</Register><Register>R20</Register><Register>R21</Register><Register>R22</Register><Register>R23</Register><Register>R24</Register><Register>R25</Register><Register>R26</Register><Register>R27</Register><Register>R28</Register><Register>R29</Register><Register>R30</Register><Register>R31</Register></REGISTERNAMES><COM>Auto</COM><COMType>0</COMType><WATCHNUM>0</WATCHNUM><WATCHNAMES><Pane0><Variables>Read_Inputs_8_Bit</Variables><Variables>Interrupt_Mask_Any_Change_8_Bit</Variables><Variables>Interrupt_Mask_Low_to_High_8_Bit</Variables><Variables>Interrupt_Mask_High_to_Low_8_Bit</Variables><Variables>transmission</Variables></Pane0><Pane1></Pane1><Pane2></Pane2><Pane3></Pane3></WATCHNAMES><BreakOnTrcaeFull>0</BreakOnTrcaeFull></DEBUG_TARGET><Debugger><modules><module></module></modules><Triggers></Triggers></Debugger><AVRGCCPLUGIN><FILES><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\drivers\AVR\can_AVR.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\dcf.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\timer.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\emcy.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\lifegrd.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\lss.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\nmtMaster.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\nmtSlave.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\objacces.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\pdo.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\sdo.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\states.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\sync.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\drivers\AVR\timer_AVR.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\examples\AVR\Slave\ObjDict.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\examples\AVR\Slave\main.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\examples\AVR\Slave\ds401.c</SOURCEFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\timers_driver.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\can.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\can_driver.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\data.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\dcf.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\def.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\emcy.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\lifegrd.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\lss.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\nmtMaster.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\nmtSlave.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\objacces.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\objdictdef.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\pdo.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\sdo.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\states.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\sync.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\sysdep.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\timer.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\AVR\timerscfg.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\AVR\applicfg.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\AVR\can_AVR.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\AVR\can_drv.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\AVR\canfestival.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\AVR\config.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\AVR\iar.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\examples\AVR\Slave\ObjDict.h</HEADERFILE><OTHERFILE>default\SlaveAVR.lss</OTHERFILE><OTHERFILE>default\SlaveAVR.map</OTHERFILE><OTHERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\examples\AVR\Slave\Makefile</OTHERFILE></FILES><CONFIGS><CONFIG><NAME>default</NAME><USESEXTERNALMAKEFILE>YES</USESEXTERNALMAKEFILE><EXTERNALMAKEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\examples\AVR\Slave\Makefile</EXTERNALMAKEFILE><PART>at90can128</PART><HEX>1</HEX><LIST>1</LIST><MAP>1</MAP><OUTPUTFILENAME>SlaveAVR.elf</OUTPUTFILENAME><OUTPUTDIR>default\</OUTPUTDIR><ISDIRTY>0</ISDIRTY><OPTIONS><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\drivers\AVR\can_AVR.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\drivers\AVR\timer_AVR.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\examples\AVR\Slave\ObjDict.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\examples\AVR\Slave\main.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\dcf.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\emcy.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\lifegrd.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\lss.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\nmtMaster.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\nmtSlave.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\objacces.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\pdo.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\sdo.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\states.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\sync.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\timer.c</FILE><OPTIONLIST></OPTIONLIST></OPTION></OPTIONS><INCDIRS><INCLUDE>..\..\..\..\include\</INCLUDE><INCLUDE>..\..\..\..\include\AVR\</INCLUDE><INCLUDE>.\</INCLUDE></INCDIRS><LIBDIRS/><LIBS/><LINKOBJECTS/><OPTIONSFORALL>-Wall -gdwarf-2                              -Os -fsigned-char -fpack-struct</OPTIONSFORALL><LINKEROPTIONS></LINKEROPTIONS><SEGMENTS/></CONFIG></CONFIGS><LASTCONFIG>default</LASTCONFIG><USES_WINAVR>1</USES_WINAVR><GCC_LOC>C:\programme\WinAVR\bin\avr-gcc.exe</GCC_LOC><MAKE_LOC>C:\programme\WinAVR\utils\bin\make.exe</MAKE_LOC></AVRGCCPLUGIN><JTAGICEmkII><DAISY_CHAIN>0</DAISY_CHAIN><DEVS_BEFORE>0</DEVS_BEFORE><DEVS_AFTER>0</DEVS_AFTER><INSTRBITS_BEFORE>0</INSTRBITS_BEFORE><INSTRBITS_AFTER>0</INSTRBITS_AFTER><BAUDRATE>19200</BAUDRATE><JTAG_FREQ>8000000</JTAG_FREQ><TIMERS_RUNNING>0</TIMERS_RUNNING><PRESERVE_EEPROM>1</PRESERVE_EEPROM><ALWAYS_EXT_RESET>0</ALWAYS_EXT_RESET><PRINT_BRK_CAUSE>0</PRINT_BRK_CAUSE><ENABLE_IDR_IN_RUN_MODE>0</ENABLE_IDR_IN_RUN_MODE><ALLOW_BRK_INSTR>1</ALLOW_BRK_INSTR><STOPIF_ENTRYFUNC_NOTFOUND>1</STOPIF_ENTRYFUNC_NOTFOUND><ENTRY_FUNCTION>main</ENTRY_FUNCTION><REPROGRAM>2</REPROGRAM></JTAGICEmkII><AVRSimulator><FuseExt>0</FuseExt><FuseHigh>138</FuseHigh><FuseLow>56</FuseLow><LockBits>123</LockBits><Frequency>8000000</Frequency><ExtSRAM>0</ExtSRAM><SimBoot>1</SimBoot><SimBootnew>1</SimBootnew></AVRSimulator><IOView><usergroups/><sort sorted="1" column="1" ordername="1" orderaddress="0" ordergroup="1"/></IOView><Files><File00000><FileId>00000</FileId><FileName>I:\Entwicklung\Firmware\CAN\CanFestival-3\examples\AVR\Slave\main.c</FileName><Status>1</Status></File00000><File00001><FileId>00001</FileId><FileName>I:\Entwicklung\Firmware\CAN\CanFestival-3\examples\AVR\Slave\Makefile</FileName><Status>1</Status></File00001><File00002><FileId>00002</FileId><FileName>default\Makefile</FileName><Status>1</Status></File00002></Files><Events><Bookmarks></Bookmarks></Events><Trace><Filters></Filters></Trace></AVRStudio>
+<AVRStudio><MANAGEMENT><ProjectName>SlaveAVR</ProjectName><Created>16-Dec-2007 22:17:10</Created><LastEdit>07-Mar-2008 15:45:15</LastEdit><ICON>241</ICON><ProjectType>0</ProjectType><Created>16-Dec-2007 22:17:10</Created><Version>4</Version><Build>4, 13, 0, 528</Build><ProjectTypeName>AVR GCC</ProjectTypeName></MANAGEMENT><CODE_CREATION><ObjectFile>I:\Entwicklung\Firmware\CAN\CanFestival-3\examples\AVR\Slave\SlaveAVR.elf</ObjectFile><EntryFile></EntryFile><SaveFolder>I:\Entwicklung\Firmware\CAN\CanFestival-3\examples\AVR\Slave\AVR-Studio\</SaveFolder></CODE_CREATION><DEBUG_TARGET><CURRENT_TARGET>JTAGICE mkII</CURRENT_TARGET><CURRENT_PART>AT90CAN128</CURRENT_PART><BREAKPOINTS></BREAKPOINTS><IO_EXPAND><HIDE>false</HIDE></IO_EXPAND><REGISTERNAMES><Register>R00</Register><Register>R01</Register><Register>R02</Register><Register>R03</Register><Register>R04</Register><Register>R05</Register><Register>R06</Register><Register>R07</Register><Register>R08</Register><Register>R09</Register><Register>R10</Register><Register>R11</Register><Register>R12</Register><Register>R13</Register><Register>R14</Register><Register>R15</Register><Register>R16</Register><Register>R17</Register><Register>R18</Register><Register>R19</Register><Register>R20</Register><Register>R21</Register><Register>R22</Register><Register>R23</Register><Register>R24</Register><Register>R25</Register><Register>R26</Register><Register>R27</Register><Register>R28</Register><Register>R29</Register><Register>R30</Register><Register>R31</Register></REGISTERNAMES><COM>Auto</COM><COMType>0</COMType><WATCHNUM>0</WATCHNUM><WATCHNAMES><Pane0><Variables>Read_Inputs_8_Bit</Variables><Variables>Interrupt_Mask_Any_Change_8_Bit</Variables><Variables>Interrupt_Mask_Low_to_High_8_Bit</Variables><Variables>Interrupt_Mask_High_to_Low_8_Bit</Variables><Variables>transmission</Variables></Pane0><Pane1></Pane1><Pane2></Pane2><Pane3></Pane3></WATCHNAMES><BreakOnTrcaeFull>0</BreakOnTrcaeFull></DEBUG_TARGET><Debugger><modules><module></module></modules><Triggers></Triggers></Debugger><AVRGCCPLUGIN><FILES><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\drivers\AVR\can_AVR.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\dcf.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\timer.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\emcy.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\lifegrd.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\lss.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\nmtMaster.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\nmtSlave.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\objacces.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\pdo.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\sdo.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\states.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\sync.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\drivers\AVR\timer_AVR.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\examples\AVR\Slave\ObjDict.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\examples\AVR\Slave\main.c</SOURCEFILE><SOURCEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\examples\AVR\Slave\ds401.c</SOURCEFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\timers_driver.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\can.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\can_driver.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\data.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\dcf.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\def.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\emcy.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\lifegrd.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\lss.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\nmtMaster.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\nmtSlave.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\objacces.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\objdictdef.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\pdo.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\sdo.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\states.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\sync.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\sysdep.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\timers.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\AVR\timerscfg.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\AVR\applicfg.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\AVR\can_AVR.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\AVR\can_drv.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\AVR\canfestival.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\AVR\config.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\include\AVR\iar.h</HEADERFILE><HEADERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\examples\AVR\Slave\ObjDict.h</HEADERFILE><OTHERFILE>default\SlaveAVR.lss</OTHERFILE><OTHERFILE>default\SlaveAVR.map</OTHERFILE><OTHERFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\examples\AVR\Slave\Makefile</OTHERFILE></FILES><CONFIGS><CONFIG><NAME>default</NAME><USESEXTERNALMAKEFILE>YES</USESEXTERNALMAKEFILE><EXTERNALMAKEFILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\examples\AVR\Slave\Makefile</EXTERNALMAKEFILE><PART>at90can128</PART><HEX>1</HEX><LIST>1</LIST><MAP>1</MAP><OUTPUTFILENAME>SlaveAVR.elf</OUTPUTFILENAME><OUTPUTDIR>default\</OUTPUTDIR><ISDIRTY>0</ISDIRTY><OPTIONS><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\drivers\AVR\can_AVR.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\drivers\AVR\timer_AVR.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\examples\AVR\Slave\ObjDict.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\examples\AVR\Slave\main.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\dcf.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\emcy.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\lifegrd.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\lss.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\nmtMaster.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\nmtSlave.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\objacces.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\pdo.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\sdo.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\states.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\sync.c</FILE><OPTIONLIST></OPTIONLIST></OPTION><OPTION><FILE>I:\Entwicklung\Firmware\CAN\CanFestival-3\src\timer.c</FILE><OPTIONLIST></OPTIONLIST></OPTION></OPTIONS><INCDIRS><INCLUDE>..\..\..\..\include\</INCLUDE><INCLUDE>..\..\..\..\include\AVR\</INCLUDE><INCLUDE>.\</INCLUDE></INCDIRS><LIBDIRS/><LIBS/><LINKOBJECTS/><OPTIONSFORALL>-Wall -gdwarf-2                              -Os -fsigned-char -fpack-struct</OPTIONSFORALL><LINKEROPTIONS></LINKEROPTIONS><SEGMENTS/></CONFIG></CONFIGS><LASTCONFIG>default</LASTCONFIG><USES_WINAVR>1</USES_WINAVR><GCC_LOC>C:\programme\WinAVR\bin\avr-gcc.exe</GCC_LOC><MAKE_LOC>C:\programme\WinAVR\utils\bin\make.exe</MAKE_LOC></AVRGCCPLUGIN><JTAGICEmkII><DAISY_CHAIN>0</DAISY_CHAIN><DEVS_BEFORE>0</DEVS_BEFORE><DEVS_AFTER>0</DEVS_AFTER><INSTRBITS_BEFORE>0</INSTRBITS_BEFORE><INSTRBITS_AFTER>0</INSTRBITS_AFTER><BAUDRATE>19200</BAUDRATE><JTAG_FREQ>8000000</JTAG_FREQ><TIMERS_RUNNING>0</TIMERS_RUNNING><PRESERVE_EEPROM>1</PRESERVE_EEPROM><ALWAYS_EXT_RESET>0</ALWAYS_EXT_RESET><PRINT_BRK_CAUSE>0</PRINT_BRK_CAUSE><ENABLE_IDR_IN_RUN_MODE>0</ENABLE_IDR_IN_RUN_MODE><ALLOW_BRK_INSTR>1</ALLOW_BRK_INSTR><STOPIF_ENTRYFUNC_NOTFOUND>1</STOPIF_ENTRYFUNC_NOTFOUND><ENTRY_FUNCTION>main</ENTRY_FUNCTION><REPROGRAM>2</REPROGRAM></JTAGICEmkII><AVRSimulator><FuseExt>0</FuseExt><FuseHigh>138</FuseHigh><FuseLow>56</FuseLow><LockBits>123</LockBits><Frequency>8000000</Frequency><ExtSRAM>0</ExtSRAM><SimBoot>1</SimBoot><SimBootnew>1</SimBootnew></AVRSimulator><IOView><usergroups/><sort sorted="1" column="1" ordername="1" orderaddress="0" ordergroup="1"/></IOView><Files><File00000><FileId>00000</FileId><FileName>I:\Entwicklung\Firmware\CAN\CanFestival-3\examples\AVR\Slave\main.c</FileName><Status>1</Status></File00000><File00001><FileId>00001</FileId><FileName>I:\Entwicklung\Firmware\CAN\CanFestival-3\examples\AVR\Slave\Makefile</FileName><Status>1</Status></File00001><File00002><FileId>00002</FileId><FileName>default\Makefile</FileName><Status>1</Status></File00002></Files><Events><Bookmarks></Bookmarks></Events><Trace><Filters></Filters></Trace></AVRStudio>

--- a/examples/AVR/Slave/ds401.h	Tue Mar 20 16:04:52 2018 +0100
+++ b/examples/AVR/Slave/ds401.h	Wed Mar 21 13:33:43 2018 +0100
@@ -27,7 +27,7 @@
 
 // Includes for the Canfestival
 #include "canfestival.h"
-#include "timer.h"
+#include "timers.h"
 #include "ObjDict.h"
 
 

--- a/examples/gene_SYNC_HCS12/appli.c	Tue Mar 20 16:04:52 2018 +0100
+++ b/examples/gene_SYNC_HCS12/appli.c	Wed Mar 21 13:33:43 2018 +0100
@@ -44,7 +44,7 @@
 #include "../include/objacces.h"
 #include "../include/sdo.h"
 #include "../include/pdo.h"
-#include "../include/timer.h"
+#include "../include/timers.h"
 #include "../include/lifegrd.h"
 #include "../include/sync.h"
 

--- a/include/lss.h	Tue Mar 20 16:04:52 2018 +0100
+++ b/include/lss.h	Wed Mar 21 13:33:43 2018 +0100
@@ -91,7 +91,7 @@
 
 struct struct_lss_transfer;
 
-//#include "timer.h"
+//#include "timers.h"
 
 #ifdef CO_ENABLE_LSS_FS
 struct struct_lss_fs_transfer {

--- a/include/sdo.h	Tue Mar 20 16:04:52 2018 +0100
+++ b/include/sdo.h	Wed Mar 21 13:33:43 2018 +0100
@@ -36,7 +36,7 @@
 
 struct struct_s_transfer;
 
-#include "timer.h"
+#include "timers.h"
 
 /* Block mode : Data consumer receive step 
  * - set to RXSTEP_STARTED when client receive initiate upload response 

--- a/include/timer.h	Tue Mar 20 16:04:52 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-/*
-This file is part of CanFestival, a library implementing CanOpen Stack.
-
-Copyright (C): Edouard TISSERANT and Francis DUPIN
-
-See COPYING file for copyrights details.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-#ifndef __timer_h__
-#define __timer_h__
-
-#include <timerscfg.h>
-#include <applicfg.h>
-
-#define TIMER_HANDLE INTEGER16
-
-#include "data.h"
-
-/* --------- types and constants definitions --------- */
-#define TIMER_FREE 0
-#define TIMER_ARMED 1
-#define TIMER_TRIG 2
-#define TIMER_TRIG_PERIOD 3
-
-#define TIMER_NONE -1
-
-typedef void (*TimerCallback_t)(CO_Data* d, UNS32 id);
-
-struct struct_s_timer_entry {
-	UNS8 state;
-	CO_Data* d;
-	TimerCallback_t callback; /* The callback func. */
-	UNS32 id; /* The callback func. */
-	TIMEVAL val;
-	TIMEVAL interval; /* Periodicity */
-};
-
-typedef struct struct_s_timer_entry s_timer_entry;
-
-/* ---------  prototypes --------- */
-/*#define SetAlarm(d, id, callback, value, period) printf("%s, %d, SetAlarm(%s, %s, %s, %s, %s)\n",__FILE__, __LINE__, #d, #id, #callback, #value, #period); _SetAlarm(d, id, callback, value, period)*/
-/**
- * @ingroup timer
- * @brief Set an alarm to execute a callback function when expired.
- * @param *d Pointer to a CAN object data structure
- * @param id The alarm Id
- * @param callback A callback function
- * @param value Call the callback function at current time + value
- * @param period Call periodically the callback function
- * @return handle The timer handle
- */
-TIMER_HANDLE SetAlarm(CO_Data* d, UNS32 id, TimerCallback_t callback, TIMEVAL value, TIMEVAL period);
-
-/**
- * @ingroup timer
- * @brief Delete an alarm before expiring.
- * @param handle A timer handle
- * @return The timer handle
- */
-TIMER_HANDLE DelAlarm(TIMER_HANDLE handle);
-
-void TimeDispatch(void);
-
-/**
- * @ingroup timer
- * @brief Set a timerfor a given time.
- * @param value The time value.
- */
-void setTimer(TIMEVAL value);
-
-/**
- * @ingroup timer
- * @brief Get the time elapsed since latest timer occurence.
- * @return time elapsed since latest timer occurence
- */
-TIMEVAL getElapsedTime(void);
-
-#endif /* #define __timer_h__ */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/include/timers.h	Wed Mar 21 13:33:43 2018 +0100
@@ -0,0 +1,92 @@
+/*
+This file is part of CanFestival, a library implementing CanOpen Stack.
+
+Copyright (C): Edouard TISSERANT and Francis DUPIN
+
+See COPYING file for copyrights details.
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifndef __timers_h__
+#define __timers_h__
+
+#include <timerscfg.h>
+#include <applicfg.h>
+
+#define TIMER_HANDLE INTEGER16
+
+#include "data.h"
+
+/* --------- types and constants definitions --------- */
+#define TIMER_FREE 0
+#define TIMER_ARMED 1
+#define TIMER_TRIG 2
+#define TIMER_TRIG_PERIOD 3
+
+#define TIMER_NONE -1
+
+typedef void (*TimerCallback_t)(CO_Data* d, UNS32 id);
+
+struct struct_s_timer_entry {
+	UNS8 state;
+	CO_Data* d;
+	TimerCallback_t callback; /* The callback func. */
+	UNS32 id; /* The callback func. */
+	TIMEVAL val;
+	TIMEVAL interval; /* Periodicity */
+};
+
+typedef struct struct_s_timer_entry s_timer_entry;
+
+/* ---------  prototypes --------- */
+/*#define SetAlarm(d, id, callback, value, period) printf("%s, %d, SetAlarm(%s, %s, %s, %s, %s)\n",__FILE__, __LINE__, #d, #id, #callback, #value, #period); _SetAlarm(d, id, callback, value, period)*/
+/**
+ * @ingroup timer
+ * @brief Set an alarm to execute a callback function when expired.
+ * @param *d Pointer to a CAN object data structure
+ * @param id The alarm Id
+ * @param callback A callback function
+ * @param value Call the callback function at current time + value
+ * @param period Call periodically the callback function
+ * @return handle The timer handle
+ */
+TIMER_HANDLE SetAlarm(CO_Data* d, UNS32 id, TimerCallback_t callback, TIMEVAL value, TIMEVAL period);
+
+/**
+ * @ingroup timer
+ * @brief Delete an alarm before expiring.
+ * @param handle A timer handle
+ * @return The timer handle
+ */
+TIMER_HANDLE DelAlarm(TIMER_HANDLE handle);
+
+void TimeDispatch(void);
+
+/**
+ * @ingroup timer
+ * @brief Set a timerfor a given time.
+ * @param value The time value.
+ */
+void setTimer(TIMEVAL value);
+
+/**
+ * @ingroup timer
+ * @brief Get the time elapsed since latest timer occurence.
+ * @return time elapsed since latest timer occurence
+ */
+TIMEVAL getElapsedTime(void);
+
+#endif /* #define __timers_h__ */

--- a/include/timers_driver.h	Tue Mar 20 16:04:52 2018 +0100
+++ b/include/timers_driver.h	Wed Mar 21 13:33:43 2018 +0100
@@ -28,7 +28,7 @@
 #define __timer_driver_h__
 
 #include "timerscfg.h"
-#include "timer.h"
+#include "timers.h"
 
 // For use from CAN driver
 

--- a/src/symbols.c	Tue Mar 20 16:04:52 2018 +0100
+++ b/src/symbols.c	Wed Mar 21 13:33:43 2018 +0100
@@ -117,7 +117,7 @@
 EXPORT_SYMBOL (sendSYNCMessage);
 EXPORT_SYMBOL (proceedSYNC);
 
-// timer.h
+// timers.h
 EXPORT_SYMBOL (SetAlarm);
 EXPORT_SYMBOL (DelAlarm);
 EXPORT_SYMBOL (TimeDispatch);

--- a/src/timer.c	Tue Mar 20 16:04:52 2018 +0100
+++ b/src/timer.c	Wed Mar 21 13:33:43 2018 +0100
@@ -33,7 +33,7 @@
 /* #define DEBUG_ERR_CONSOLE_ON */
 
 #include <applicfg.h>
-#include "timer.h"
+#include "timers.h"
 
 /*  ---------  The timer table --------- */
 s_timer_entry timers[MAX_NB_TIMER] = {{TIMER_FREE, NULL, NULL, 0, 0, 0},};

--- a/src/win32/CanFestival-3.def	Tue Mar 20 16:04:52 2018 +0100
+++ b/src/win32/CanFestival-3.def	Wed Mar 21 13:33:43 2018 +0100
@@ -120,7 +120,7 @@
         EMCY_errorRecovered
         _post_emcy
         
-        ; timer.h
+        ; timers.h
         SetAlarm
         DelAlarm
         TimeDispatch