# HG changeset patch # User Christian Taedcke # Date 1327345546 -3600 # Node ID 9e4ccb3cab964f64b130d68fb964d6c020db84b8 # Parent 23df92154894aff1c90297e52a224f77057123d9 Win32: FIXED: - converted visual studio solution file back to 2008. RENAMED: - solution file name and used project file names to project.vc9.vcproj diff -r 23df92154894 -r 9e4ccb3cab96 CanFestival-3.vc8.sln --- a/CanFestival-3.vc8.sln Mon Jan 23 08:49:26 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,75 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CanFestival-3", "CanFestival-3.vc8.vcxproj", "{50EF2507-9B87-4525-8B19-80EB42E67079}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "can_uvccm_win32", "drivers\can_uvccm_win32\can_uvccm_win32.vcxproj", "{782632D2-B467-DF90-C86E-D767972BAA59}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "can_peak_win32", "drivers\can_peak_win32\can_peak_win32.vcxproj", "{C943EB26-ADEA-0DCD-E581-8BF52F0F20F5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestMasterSlave", "examples\TestMasterSlave\TestMasterSlave.vcxproj", "{B51A176D-5320-4534-913B-3025CED5B27E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "can_ixxat_win32", "drivers\can_ixxat_win32\can_ixxat_win32.vc8.vcxproj", "{8F57E7FF-1B73-4134-A2B2-9C0EADB2AEFB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "can_copcican_win32", "drivers\can_copcican_win32\can_copcican_win32.vcxproj", "{A18C416F-3CBB-4744-BA24-FA5C5F3CBE0D}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug UNICODE|Win32 = Debug UNICODE|Win32 - Debug|Win32 = Debug|Win32 - Release UNICODE|Win32 = Release UNICODE|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {50EF2507-9B87-4525-8B19-80EB42E67079}.Debug UNICODE|Win32.ActiveCfg = Debug|Win32 - {50EF2507-9B87-4525-8B19-80EB42E67079}.Debug UNICODE|Win32.Build.0 = Debug|Win32 - {50EF2507-9B87-4525-8B19-80EB42E67079}.Debug|Win32.ActiveCfg = Debug|Win32 - {50EF2507-9B87-4525-8B19-80EB42E67079}.Debug|Win32.Build.0 = Debug|Win32 - {50EF2507-9B87-4525-8B19-80EB42E67079}.Release UNICODE|Win32.ActiveCfg = Release|Win32 - {50EF2507-9B87-4525-8B19-80EB42E67079}.Release UNICODE|Win32.Build.0 = Release|Win32 - {50EF2507-9B87-4525-8B19-80EB42E67079}.Release|Win32.ActiveCfg = Release|Win32 - {50EF2507-9B87-4525-8B19-80EB42E67079}.Release|Win32.Build.0 = Release|Win32 - {782632D2-B467-DF90-C86E-D767972BAA59}.Debug UNICODE|Win32.ActiveCfg = Debug UNICODE|Win32 - {782632D2-B467-DF90-C86E-D767972BAA59}.Debug UNICODE|Win32.Build.0 = Debug UNICODE|Win32 - {782632D2-B467-DF90-C86E-D767972BAA59}.Debug|Win32.ActiveCfg = Debug|Win32 - {782632D2-B467-DF90-C86E-D767972BAA59}.Debug|Win32.Build.0 = Debug|Win32 - {782632D2-B467-DF90-C86E-D767972BAA59}.Release UNICODE|Win32.ActiveCfg = Release UNICODE|Win32 - {782632D2-B467-DF90-C86E-D767972BAA59}.Release UNICODE|Win32.Build.0 = Release UNICODE|Win32 - {782632D2-B467-DF90-C86E-D767972BAA59}.Release|Win32.ActiveCfg = Release|Win32 - {782632D2-B467-DF90-C86E-D767972BAA59}.Release|Win32.Build.0 = Release|Win32 - {C943EB26-ADEA-0DCD-E581-8BF52F0F20F5}.Debug UNICODE|Win32.ActiveCfg = Debug UNICODE|Win32 - {C943EB26-ADEA-0DCD-E581-8BF52F0F20F5}.Debug UNICODE|Win32.Build.0 = Debug UNICODE|Win32 - {C943EB26-ADEA-0DCD-E581-8BF52F0F20F5}.Debug|Win32.ActiveCfg = Debug|Win32 - {C943EB26-ADEA-0DCD-E581-8BF52F0F20F5}.Debug|Win32.Build.0 = Debug|Win32 - {C943EB26-ADEA-0DCD-E581-8BF52F0F20F5}.Release UNICODE|Win32.ActiveCfg = Release UNICODE|Win32 - {C943EB26-ADEA-0DCD-E581-8BF52F0F20F5}.Release UNICODE|Win32.Build.0 = Release UNICODE|Win32 - {C943EB26-ADEA-0DCD-E581-8BF52F0F20F5}.Release|Win32.ActiveCfg = Release|Win32 - {C943EB26-ADEA-0DCD-E581-8BF52F0F20F5}.Release|Win32.Build.0 = Release|Win32 - {B51A176D-5320-4534-913B-3025CED5B27E}.Debug UNICODE|Win32.ActiveCfg = Debug|Win32 - {B51A176D-5320-4534-913B-3025CED5B27E}.Debug UNICODE|Win32.Build.0 = Debug|Win32 - {B51A176D-5320-4534-913B-3025CED5B27E}.Debug|Win32.ActiveCfg = Debug|Win32 - {B51A176D-5320-4534-913B-3025CED5B27E}.Debug|Win32.Build.0 = Debug|Win32 - {B51A176D-5320-4534-913B-3025CED5B27E}.Release UNICODE|Win32.ActiveCfg = Release|Win32 - {B51A176D-5320-4534-913B-3025CED5B27E}.Release UNICODE|Win32.Build.0 = Release|Win32 - {B51A176D-5320-4534-913B-3025CED5B27E}.Release|Win32.ActiveCfg = Release|Win32 - {B51A176D-5320-4534-913B-3025CED5B27E}.Release|Win32.Build.0 = Release|Win32 - {8F57E7FF-1B73-4134-A2B2-9C0EADB2AEFB}.Debug UNICODE|Win32.ActiveCfg = Debug|Win32 - {8F57E7FF-1B73-4134-A2B2-9C0EADB2AEFB}.Debug UNICODE|Win32.Build.0 = Debug|Win32 - {8F57E7FF-1B73-4134-A2B2-9C0EADB2AEFB}.Debug|Win32.ActiveCfg = Debug|Win32 - {8F57E7FF-1B73-4134-A2B2-9C0EADB2AEFB}.Debug|Win32.Build.0 = Debug|Win32 - {8F57E7FF-1B73-4134-A2B2-9C0EADB2AEFB}.Release UNICODE|Win32.ActiveCfg = Release|Win32 - {8F57E7FF-1B73-4134-A2B2-9C0EADB2AEFB}.Release UNICODE|Win32.Build.0 = Release|Win32 - {8F57E7FF-1B73-4134-A2B2-9C0EADB2AEFB}.Release|Win32.ActiveCfg = Release|Win32 - {8F57E7FF-1B73-4134-A2B2-9C0EADB2AEFB}.Release|Win32.Build.0 = Release|Win32 - {A18C416F-3CBB-4744-BA24-FA5C5F3CBE0D}.Debug UNICODE|Win32.ActiveCfg = Debug|Win32 - {A18C416F-3CBB-4744-BA24-FA5C5F3CBE0D}.Debug UNICODE|Win32.Build.0 = Debug|Win32 - {A18C416F-3CBB-4744-BA24-FA5C5F3CBE0D}.Debug|Win32.ActiveCfg = Debug|Win32 - {A18C416F-3CBB-4744-BA24-FA5C5F3CBE0D}.Debug|Win32.Build.0 = Debug|Win32 - {A18C416F-3CBB-4744-BA24-FA5C5F3CBE0D}.Release UNICODE|Win32.ActiveCfg = Release|Win32 - {A18C416F-3CBB-4744-BA24-FA5C5F3CBE0D}.Release UNICODE|Win32.Build.0 = Release|Win32 - {A18C416F-3CBB-4744-BA24-FA5C5F3CBE0D}.Release|Win32.ActiveCfg = Release|Win32 - {A18C416F-3CBB-4744-BA24-FA5C5F3CBE0D}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff -r 23df92154894 -r 9e4ccb3cab96 CanFestival-3.vc8.vcproj --- a/CanFestival-3.vc8.vcproj Mon Jan 23 08:49:26 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,339 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 23df92154894 -r 9e4ccb3cab96 CanFestival-3.vc9.sln --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/CanFestival-3.vc9.sln Mon Jan 23 20:05:46 2012 +0100 @@ -0,0 +1,74 @@ +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual C++ Express 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CanFestival-3", "CanFestival-3.vc9.vcproj", "{50EF2507-9B87-4525-8B19-80EB42E67079}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "can_ixxat_win32", "drivers\can_ixxat_win32\can_ixxat_win32.vc9.vcproj", "{8F57E7FF-1B73-4134-A2B2-9C0EADB2AEFB}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestMasterMicroMod", "examples\DS401_Master\TestMasterMicroMod.vc9.vcproj", "{B51A176D-5320-4534-913B-3025CED5B27E}" + ProjectSection(ProjectDependencies) = postProject + {50EF2507-9B87-4525-8B19-80EB42E67079} = {50EF2507-9B87-4525-8B19-80EB42E67079} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CANOpenShell", "examples\CANOpenShell\CANOpenShell.vc9.vcproj", "{06B3C378-9EE4-4C56-A519-775FF499DAB5}" + ProjectSection(ProjectDependencies) = postProject + {50EF2507-9B87-4525-8B19-80EB42E67079} = {50EF2507-9B87-4525-8B19-80EB42E67079} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32test", "examples\win32test\win32test.vc9.vcproj", "{BD8B1FE1-89CD-4F89-8275-0F553FA71059}" + ProjectSection(ProjectDependencies) = postProject + {50EF2507-9B87-4525-8B19-80EB42E67079} = {50EF2507-9B87-4525-8B19-80EB42E67079} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug UNICODE|Win32 = Debug UNICODE|Win32 + Debug|Win32 = Debug|Win32 + Release UNICODE|Win32 = Release UNICODE|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {50EF2507-9B87-4525-8B19-80EB42E67079}.Debug UNICODE|Win32.ActiveCfg = Debug|Win32 + {50EF2507-9B87-4525-8B19-80EB42E67079}.Debug UNICODE|Win32.Build.0 = Debug|Win32 + {50EF2507-9B87-4525-8B19-80EB42E67079}.Debug|Win32.ActiveCfg = Debug|Win32 + {50EF2507-9B87-4525-8B19-80EB42E67079}.Debug|Win32.Build.0 = Debug|Win32 + {50EF2507-9B87-4525-8B19-80EB42E67079}.Release UNICODE|Win32.ActiveCfg = Release|Win32 + {50EF2507-9B87-4525-8B19-80EB42E67079}.Release UNICODE|Win32.Build.0 = Release|Win32 + {50EF2507-9B87-4525-8B19-80EB42E67079}.Release|Win32.ActiveCfg = Release|Win32 + {50EF2507-9B87-4525-8B19-80EB42E67079}.Release|Win32.Build.0 = Release|Win32 + {8F57E7FF-1B73-4134-A2B2-9C0EADB2AEFB}.Debug UNICODE|Win32.ActiveCfg = Debug|Win32 + {8F57E7FF-1B73-4134-A2B2-9C0EADB2AEFB}.Debug UNICODE|Win32.Build.0 = Debug|Win32 + {8F57E7FF-1B73-4134-A2B2-9C0EADB2AEFB}.Debug|Win32.ActiveCfg = Debug|Win32 + {8F57E7FF-1B73-4134-A2B2-9C0EADB2AEFB}.Debug|Win32.Build.0 = Debug|Win32 + {8F57E7FF-1B73-4134-A2B2-9C0EADB2AEFB}.Release UNICODE|Win32.ActiveCfg = Release|Win32 + {8F57E7FF-1B73-4134-A2B2-9C0EADB2AEFB}.Release UNICODE|Win32.Build.0 = Release|Win32 + {8F57E7FF-1B73-4134-A2B2-9C0EADB2AEFB}.Release|Win32.ActiveCfg = Release|Win32 + {8F57E7FF-1B73-4134-A2B2-9C0EADB2AEFB}.Release|Win32.Build.0 = Release|Win32 + {B51A176D-5320-4534-913B-3025CED5B27E}.Debug UNICODE|Win32.ActiveCfg = Debug|Win32 + {B51A176D-5320-4534-913B-3025CED5B27E}.Debug UNICODE|Win32.Build.0 = Debug|Win32 + {B51A176D-5320-4534-913B-3025CED5B27E}.Debug|Win32.ActiveCfg = Debug|Win32 + {B51A176D-5320-4534-913B-3025CED5B27E}.Debug|Win32.Build.0 = Debug|Win32 + {B51A176D-5320-4534-913B-3025CED5B27E}.Release UNICODE|Win32.ActiveCfg = Release|Win32 + {B51A176D-5320-4534-913B-3025CED5B27E}.Release UNICODE|Win32.Build.0 = Release|Win32 + {B51A176D-5320-4534-913B-3025CED5B27E}.Release|Win32.ActiveCfg = Release|Win32 + {B51A176D-5320-4534-913B-3025CED5B27E}.Release|Win32.Build.0 = Release|Win32 + {06B3C378-9EE4-4C56-A519-775FF499DAB5}.Debug UNICODE|Win32.ActiveCfg = Debug|Win32 + {06B3C378-9EE4-4C56-A519-775FF499DAB5}.Debug UNICODE|Win32.Build.0 = Debug|Win32 + {06B3C378-9EE4-4C56-A519-775FF499DAB5}.Debug|Win32.ActiveCfg = Debug|Win32 + {06B3C378-9EE4-4C56-A519-775FF499DAB5}.Debug|Win32.Build.0 = Debug|Win32 + {06B3C378-9EE4-4C56-A519-775FF499DAB5}.Release UNICODE|Win32.ActiveCfg = Release|Win32 + {06B3C378-9EE4-4C56-A519-775FF499DAB5}.Release UNICODE|Win32.Build.0 = Release|Win32 + {06B3C378-9EE4-4C56-A519-775FF499DAB5}.Release|Win32.ActiveCfg = Release|Win32 + {06B3C378-9EE4-4C56-A519-775FF499DAB5}.Release|Win32.Build.0 = Release|Win32 + {BD8B1FE1-89CD-4F89-8275-0F553FA71059}.Debug UNICODE|Win32.ActiveCfg = Debug|Win32 + {BD8B1FE1-89CD-4F89-8275-0F553FA71059}.Debug UNICODE|Win32.Build.0 = Debug|Win32 + {BD8B1FE1-89CD-4F89-8275-0F553FA71059}.Debug|Win32.ActiveCfg = Debug|Win32 + {BD8B1FE1-89CD-4F89-8275-0F553FA71059}.Debug|Win32.Build.0 = Debug|Win32 + {BD8B1FE1-89CD-4F89-8275-0F553FA71059}.Release UNICODE|Win32.ActiveCfg = Release|Win32 + {BD8B1FE1-89CD-4F89-8275-0F553FA71059}.Release UNICODE|Win32.Build.0 = Release|Win32 + {BD8B1FE1-89CD-4F89-8275-0F553FA71059}.Release|Win32.ActiveCfg = Release|Win32 + {BD8B1FE1-89CD-4F89-8275-0F553FA71059}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff -r 23df92154894 -r 9e4ccb3cab96 CanFestival-3.vc9.vcproj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/CanFestival-3.vc9.vcproj Mon Jan 23 20:05:46 2012 +0100 @@ -0,0 +1,347 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 23df92154894 -r 9e4ccb3cab96 drivers/can_ixxat_win32/can_ixxat_win32.vc8.vcproj --- a/drivers/can_ixxat_win32/can_ixxat_win32.vc8.vcproj Mon Jan 23 08:49:26 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 23df92154894 -r 9e4ccb3cab96 drivers/can_ixxat_win32/can_ixxat_win32.vc9.vcproj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/drivers/can_ixxat_win32/can_ixxat_win32.vc9.vcproj Mon Jan 23 20:05:46 2012 +0100 @@ -0,0 +1,229 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 23df92154894 -r 9e4ccb3cab96 examples/CANOpenShell/CANOpenShell.sln --- a/examples/CANOpenShell/CANOpenShell.sln Mon Jan 23 08:49:26 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C++ Express 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CANOpenShell", "CANOpenShell.vcproj", "{06B3C378-9EE4-4C56-A519-775FF499DAB5}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {06B3C378-9EE4-4C56-A519-775FF499DAB5}.Debug|Win32.ActiveCfg = Debug|Win32 - {06B3C378-9EE4-4C56-A519-775FF499DAB5}.Debug|Win32.Build.0 = Debug|Win32 - {06B3C378-9EE4-4C56-A519-775FF499DAB5}.Release|Win32.ActiveCfg = Release|Win32 - {06B3C378-9EE4-4C56-A519-775FF499DAB5}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff -r 23df92154894 -r 9e4ccb3cab96 examples/CANOpenShell/CANOpenShell.vc9.vcproj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/CANOpenShell/CANOpenShell.vc9.vcproj Mon Jan 23 20:05:46 2012 +0100 @@ -0,0 +1,218 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 23df92154894 -r 9e4ccb3cab96 examples/CANOpenShell/CANOpenShell.vcproj --- a/examples/CANOpenShell/CANOpenShell.vcproj Mon Jan 23 08:49:26 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,219 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 23df92154894 -r 9e4ccb3cab96 examples/DS401_Master/TestMasterMicroMod.vc9.vcproj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/DS401_Master/TestMasterMicroMod.vc9.vcproj Mon Jan 23 20:05:46 2012 +0100 @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 23df92154894 -r 9e4ccb3cab96 examples/DS401_Master/TestMasterMicroMod.vcproj --- a/examples/DS401_Master/TestMasterMicroMod.vcproj Mon Jan 23 08:49:26 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,228 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 23df92154894 -r 9e4ccb3cab96 examples/TestMasterMicroMod/TestMasterMicroMod.vc9.vcproj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/TestMasterMicroMod/TestMasterMicroMod.vc9.vcproj Mon Jan 23 20:05:46 2012 +0100 @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 23df92154894 -r 9e4ccb3cab96 examples/TestMasterMicroMod/TestMasterMicroMod.vcproj --- a/examples/TestMasterMicroMod/TestMasterMicroMod.vcproj Mon Jan 23 08:49:26 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,228 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 23df92154894 -r 9e4ccb3cab96 examples/TestMasterSlave/TestMasterSlave.vc9.vcproj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/TestMasterSlave/TestMasterSlave.vc9.vcproj Mon Jan 23 20:05:46 2012 +0100 @@ -0,0 +1,251 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 23df92154894 -r 9e4ccb3cab96 examples/TestMasterSlave/TestMasterSlave.vcproj --- a/examples/TestMasterSlave/TestMasterSlave.vcproj Mon Jan 23 08:49:26 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,251 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 23df92154894 -r 9e4ccb3cab96 examples/TestMasterSlaveLSS/TestMasterSlaveLSS.vc9.vcproj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/TestMasterSlaveLSS/TestMasterSlaveLSS.vc9.vcproj Mon Jan 23 20:05:46 2012 +0100 @@ -0,0 +1,252 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 23df92154894 -r 9e4ccb3cab96 examples/TestMasterSlaveLSS/TestMasterSlaveLSS.vcproj --- a/examples/TestMasterSlaveLSS/TestMasterSlaveLSS.vcproj Mon Jan 23 08:49:26 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,252 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 23df92154894 -r 9e4ccb3cab96 examples/win32test/main.c --- a/examples/win32test/main.c Mon Jan 23 08:49:26 2012 +0100 +++ b/examples/win32test/main.c Mon Jan 23 20:05:46 2012 +0100 @@ -76,12 +76,12 @@ return 0xFF; } -UNS8 ReadSDO(UNS8 nodeId, UNS16 index, UNS8 subIndex, UNS8 dataType, void* data, UNS8* size) +UNS8 ReadSDO(UNS8 nodeId, UNS16 index, UNS8 subIndex, UNS8 dataType, void* data, UNS32* size) { UNS32 abortCode = 0; UNS8 res = SDO_UPLOAD_IN_PROGRESS; // Read SDO - UNS8 err = readNetworkDict (&win32test_Data, nodeId, index, subIndex, dataType); + UNS8 err = readNetworkDict (&win32test_Data, nodeId, index, subIndex, dataType, 0); if (err) return 0xFF; for(;;) @@ -159,7 +159,7 @@ UNS32 COB_ID_Client_to_Server_Transmit_SDO = 0x600 + node_id; UNS32 COB_ID_Server_to_Client_Receive_SDO = 0x580 + node_id; UNS32 Node_ID_of_the_SDO_Server = node_id; - UNS8 ExpectedSize = sizeof (UNS32); + UNS32 ExpectedSize = sizeof (UNS32); if (OD_SUCCESSFUL == writeLocalDict(&win32test_Data, 0x1280, 1, &COB_ID_Client_to_Server_Transmit_SDO, &ExpectedSize, RW) && OD_SUCCESSFUL == writeLocalDict(&win32test_Data, 0x1280, 2, &COB_ID_Server_to_Client_Receive_SDO, &ExpectedSize, RW) @@ -172,7 +172,7 @@ UNS32 vendor_id = 0; UNS32 prod_code = 0; UNS32 ser_num = 0; - UNS8 size; + UNS32 size; UNS8 res; printf("\nnode_id: %d (%xh) info\n",(int)node_id,(int)node_id); diff -r 23df92154894 -r 9e4ccb3cab96 examples/win32test/win32test.c --- a/examples/win32test/win32test.c Mon Jan 23 08:49:26 2012 +0100 +++ b/examples/win32test/win32test.c Mon Jan 23 20:05:46 2012 +0100 @@ -1,160 +1,188 @@ - -/* File generated by gen_cfile.py. Should not be modified. */ - -#include "win32test.h" - -/**************************************************************************/ -/* Declaration of the mapped variables */ -/**************************************************************************/ - -/**************************************************************************/ -/* Declaration of the value range types */ -/**************************************************************************/ - -UNS32 win32test_valueRangeTest (UNS8 typeValue, void * value) -{ - switch (typeValue) { - } - return 0; -} - -/**************************************************************************/ -/* The node id */ -/**************************************************************************/ -/* node_id default value.*/ -UNS8 win32test_bDeviceNodeId = 0x01; - -/**************************************************************************/ -/* Array of message processing information */ - -const UNS8 win32test_iam_a_slave = 0; - -TIMER_HANDLE win32test_heartBeatTimers[1]; - -/* -$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ - - OBJECT DICTIONARY - -$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ -*/ - -/* index 0x1000 : Device Type. */ - UNS32 win32test_obj1000 = 0x12D; /* 301 */ - subindex win32test_Index1000[] = - { - { RO, uint32, sizeof (UNS32), (void*)&win32test_obj1000 } - }; - -/* index 0x1001 : Error Register. */ - UNS8 win32test_obj1001 = 0x0; /* 0 */ - subindex win32test_Index1001[] = - { - { RO, uint8, sizeof (UNS8), (void*)&win32test_obj1001 } - }; - -/* index 0x1005 : SYNC COB ID. */ - UNS32 win32test_obj1005 = 0x0; /* 0 */ - ODCallback_t win32test_Index1005_callbacks[] = - { - NULL, - }; - subindex win32test_Index1005[] = - { - { RW, uint32, sizeof (UNS32), (void*)&win32test_obj1005 } - }; - -/* index 0x1006 : Communication / Cycle Period */ - UNS32 win32test_obj1006 = 0x0; /* 0 */ - -/* index 0x1016 : Consumer Heartbeat Time */ - UNS8 win32test_highestSubIndex_obj1016 = 0; - UNS32 win32test_obj1016[]={0}; - -/* index 0x1017 : Producer Heartbeat Time */ - UNS16 win32test_obj1017 = 0x0; /* 0 */ - -/* index 0x1018 : Identity. */ - UNS8 win32test_highestSubIndex_obj1018 = 4; /* number of subindex - 1*/ - UNS32 win32test_obj1018_Vendor_ID = 0x0; /* 0 */ - UNS32 win32test_obj1018_Product_Code = 0x0; /* 0 */ - UNS32 win32test_obj1018_Revision_Number = 0x0; /* 0 */ - UNS32 win32test_obj1018_Serial_Number = 0x0; /* 0 */ - subindex win32test_Index1018[] = - { - { RO, uint8, sizeof (UNS8), (void*)&win32test_highestSubIndex_obj1018 }, - { RO, uint32, sizeof (UNS32), (void*)&win32test_obj1018_Vendor_ID }, - { RO, uint32, sizeof (UNS32), (void*)&win32test_obj1018_Product_Code }, - { RO, uint32, sizeof (UNS32), (void*)&win32test_obj1018_Revision_Number }, - { RO, uint32, sizeof (UNS32), (void*)&win32test_obj1018_Serial_Number } - }; - -/* index 0x1280 : Client SDO 1 Parameter. */ - UNS8 win32test_highestSubIndex_obj1280 = 3; /* number of subindex - 1*/ - UNS32 win32test_obj1280_COB_ID_Client_to_Server_Transmit_SDO = 0x0; /* 0 */ - UNS32 win32test_obj1280_COB_ID_Server_to_Client_Receive_SDO = 0x0; /* 0 */ - INTEGER32 win32test_obj1280_Node_ID_of_the_SDO_Server = 0x0; /* 0 */ - subindex win32test_Index1280[] = - { - { RO, uint8, sizeof (UNS8), (void*)&win32test_highestSubIndex_obj1280 }, - { RW, uint32, sizeof (UNS32), (void*)&win32test_obj1280_COB_ID_Client_to_Server_Transmit_SDO }, - { RW, uint32, sizeof (UNS32), (void*)&win32test_obj1280_COB_ID_Server_to_Client_Receive_SDO }, - { RW, int32, sizeof (INTEGER32), (void*)&win32test_obj1280_Node_ID_of_the_SDO_Server } - }; - -const indextable win32test_objdict[] = -{ - { (subindex*)win32test_Index1000,sizeof(win32test_Index1000)/sizeof(win32test_Index1000[0]), 0x1000}, - { (subindex*)win32test_Index1001,sizeof(win32test_Index1001)/sizeof(win32test_Index1001[0]), 0x1001}, - { (subindex*)win32test_Index1005,sizeof(win32test_Index1005)/sizeof(win32test_Index1005[0]), 0x1005}, - { (subindex*)win32test_Index1018,sizeof(win32test_Index1018)/sizeof(win32test_Index1018[0]), 0x1018}, - { (subindex*)win32test_Index1280,sizeof(win32test_Index1280)/sizeof(win32test_Index1280[0]), 0x1280}, -}; - -const indextable * win32test_scanIndexOD (UNS16 wIndex, UNS32 * errorCode, ODCallback_t **callbacks) -{ - int i; - *callbacks = NULL; - switch(wIndex){ - case 0x1000: i = 0;break; - case 0x1001: i = 1;break; - case 0x1005: i = 2;*callbacks = win32test_Index1005_callbacks; break; - case 0x1018: i = 3;break; - case 0x1280: i = 4;break; - default: - *errorCode = OD_NO_SUCH_OBJECT; - return NULL; - } - *errorCode = OD_SUCCESSFUL; - return &win32test_objdict[i]; -} - -/* - * To count at which received SYNC a PDO must be sent. - * Even if no pdoTransmit are defined, at least one entry is computed - * for compilations issues. - */ -s_PDO_status win32test_PDO_status[1] = {s_PDO_status_Initializer}; - -quick_index win32test_firstIndex = { - 0, /* SDO_SVR */ - 4, /* SDO_CLT */ - 0, /* PDO_RCV */ - 0, /* PDO_RCV_MAP */ - 0, /* PDO_TRS */ - 0 /* PDO_TRS_MAP */ -}; - -quick_index win32test_lastIndex = { - 0, /* SDO_SVR */ - 4, /* SDO_CLT */ - 0, /* PDO_RCV */ - 0, /* PDO_RCV_MAP */ - 0, /* PDO_TRS */ - 0 /* PDO_TRS_MAP */ -}; - -UNS16 win32test_ObjdictSize = sizeof(win32test_objdict)/sizeof(win32test_objdict[0]); - -CO_Data win32test_Data = CANOPEN_NODE_DATA_INITIALIZER(win32test); - + +/* File generated by gen_cfile.py. Should not be modified. */ + +#include "win32test.h" + +/**************************************************************************/ +/* Declaration of mapped variables */ +/**************************************************************************/ + +/**************************************************************************/ +/* Declaration of value range types */ +/**************************************************************************/ + +#define valueRange_EMC 0x9F /* Type for index 0x1003 subindex 0x00 (only set of value 0 is possible) */ +UNS32 win32test_valueRangeTest (UNS8 typeValue, void * value) +{ + switch (typeValue) { + case valueRange_EMC: + if (*(UNS8*)value != (UNS8)0) return OD_VALUE_RANGE_EXCEEDED; + break; + } + return 0; +} + +/**************************************************************************/ +/* The node id */ +/**************************************************************************/ +/* node_id default value.*/ +UNS8 win32test_bDeviceNodeId = 0x00; + +/**************************************************************************/ +/* Array of message processing information */ + +const UNS8 win32test_iam_a_slave = 0; + +TIMER_HANDLE win32test_heartBeatTimers[1]; + +/* +$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ + + OBJECT DICTIONARY + +$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ +*/ + +/* index 0x1000 : Device Type. */ + UNS32 win32test_obj1000 = 0x12D; /* 301 */ + subindex win32test_Index1000[] = + { + { RO, uint32, sizeof (UNS32), (void*)&win32test_obj1000 } + }; + +/* index 0x1001 : Error Register. */ + UNS8 win32test_obj1001 = 0x0; /* 0 */ + subindex win32test_Index1001[] = + { + { RO, uint8, sizeof (UNS8), (void*)&win32test_obj1001 } + }; + +/* index 0x1003 : Pre-defined Error Field */ + UNS8 win32test_highestSubIndex_obj1003 = 0; /* number of subindex - 1*/ + UNS32 win32test_obj1003[] = + { + 0x0 /* 0 */ + }; + ODCallback_t win32test_Index1003_callbacks[] = + { + NULL, + NULL, + }; + subindex win32test_Index1003[] = + { + { RW, valueRange_EMC, sizeof (UNS8), (void*)&win32test_highestSubIndex_obj1003 }, + { RO, uint32, sizeof (UNS32), (void*)&win32test_obj1003[0] } + }; + +/* index 0x1005 : SYNC COB ID. */ + UNS32 win32test_obj1005 = 0x0; /* 0 */ + ODCallback_t win32test_Index1005_callbacks[] = + { + NULL, + }; + subindex win32test_Index1005[] = + { + { RW, uint32, sizeof (UNS32), (void*)&win32test_obj1005 } + }; + +/* index 0x1006 : Communication / Cycle Period */ + UNS32 win32test_obj1006 = 0x0; /* 0 */ + +/* index 0x1014 : Emergency COB ID */ + UNS32 win32test_obj1014 = 0x80 + 0x00; /* 128 + NodeID */ + +/* index 0x1016 : Consumer Heartbeat Time */ + UNS8 win32test_highestSubIndex_obj1016 = 0; + UNS32 win32test_obj1016[]={0}; + +/* index 0x1017 : Producer Heartbeat Time */ + UNS16 win32test_obj1017 = 0x0; /* 0 */ + +/* index 0x1018 : Identity. */ + UNS8 win32test_highestSubIndex_obj1018 = 4; /* number of subindex - 1*/ + UNS32 win32test_obj1018_Vendor_ID = 0x0; /* 0 */ + UNS32 win32test_obj1018_Product_Code = 0x0; /* 0 */ + UNS32 win32test_obj1018_Revision_Number = 0x0; /* 0 */ + UNS32 win32test_obj1018_Serial_Number = 0x0; /* 0 */ + subindex win32test_Index1018[] = + { + { RO, uint8, sizeof (UNS8), (void*)&win32test_highestSubIndex_obj1018 }, + { RO, uint32, sizeof (UNS32), (void*)&win32test_obj1018_Vendor_ID }, + { RO, uint32, sizeof (UNS32), (void*)&win32test_obj1018_Product_Code }, + { RO, uint32, sizeof (UNS32), (void*)&win32test_obj1018_Revision_Number }, + { RO, uint32, sizeof (UNS32), (void*)&win32test_obj1018_Serial_Number } + }; + +/* index 0x1280 : Client SDO 1 Parameter. */ + UNS8 win32test_highestSubIndex_obj1280 = 3; /* number of subindex - 1*/ + UNS32 win32test_obj1280_COB_ID_Client_to_Server_Transmit_SDO = 0x0; /* 0 */ + UNS32 win32test_obj1280_COB_ID_Server_to_Client_Receive_SDO = 0x0; /* 0 */ + UNS8 win32test_obj1280_Node_ID_of_the_SDO_Server = 0x0; /* 0 */ + subindex win32test_Index1280[] = + { + { RO, uint8, sizeof (UNS8), (void*)&win32test_highestSubIndex_obj1280 }, + { RW, uint32, sizeof (UNS32), (void*)&win32test_obj1280_COB_ID_Client_to_Server_Transmit_SDO }, + { RW, uint32, sizeof (UNS32), (void*)&win32test_obj1280_COB_ID_Server_to_Client_Receive_SDO }, + { RW, uint8, sizeof (UNS8), (void*)&win32test_obj1280_Node_ID_of_the_SDO_Server } + }; + +/**************************************************************************/ +/* Declaration of pointed variables */ +/**************************************************************************/ + +const indextable win32test_objdict[] = +{ + { (subindex*)win32test_Index1000,sizeof(win32test_Index1000)/sizeof(win32test_Index1000[0]), 0x1000}, + { (subindex*)win32test_Index1001,sizeof(win32test_Index1001)/sizeof(win32test_Index1001[0]), 0x1001}, + { (subindex*)win32test_Index1005,sizeof(win32test_Index1005)/sizeof(win32test_Index1005[0]), 0x1005}, + { (subindex*)win32test_Index1018,sizeof(win32test_Index1018)/sizeof(win32test_Index1018[0]), 0x1018}, + { (subindex*)win32test_Index1280,sizeof(win32test_Index1280)/sizeof(win32test_Index1280[0]), 0x1280}, +}; + +const indextable * win32test_scanIndexOD (UNS16 wIndex, UNS32 * errorCode, ODCallback_t **callbacks) +{ + int i; + *callbacks = NULL; + switch(wIndex){ + case 0x1000: i = 0;break; + case 0x1001: i = 1;break; + case 0x1005: i = 2;*callbacks = win32test_Index1005_callbacks; break; + case 0x1018: i = 3;break; + case 0x1280: i = 4;break; + default: + *errorCode = OD_NO_SUCH_OBJECT; + return NULL; + } + *errorCode = OD_SUCCESSFUL; + return &win32test_objdict[i]; +} + +/* + * To count at which received SYNC a PDO must be sent. + * Even if no pdoTransmit are defined, at least one entry is computed + * for compilations issues. + */ +s_PDO_status win32test_PDO_status[1] = {s_PDO_status_Initializer}; + +const quick_index win32test_firstIndex = { + 0, /* SDO_SVR */ + 4, /* SDO_CLT */ + 0, /* PDO_RCV */ + 0, /* PDO_RCV_MAP */ + 0, /* PDO_TRS */ + 0 /* PDO_TRS_MAP */ +}; + +const quick_index win32test_lastIndex = { + 0, /* SDO_SVR */ + 4, /* SDO_CLT */ + 0, /* PDO_RCV */ + 0, /* PDO_RCV_MAP */ + 0, /* PDO_TRS */ + 0 /* PDO_TRS_MAP */ +}; + +const UNS16 win32test_ObjdictSize = sizeof(win32test_objdict)/sizeof(win32test_objdict[0]); + +CO_Data win32test_Data = CANOPEN_NODE_DATA_INITIALIZER(win32test); + diff -r 23df92154894 -r 9e4ccb3cab96 examples/win32test/win32test.h --- a/examples/win32test/win32test.h Mon Jan 23 08:49:26 2012 +0100 +++ b/examples/win32test/win32test.h Mon Jan 23 20:05:46 2012 +0100 @@ -1,16 +1,16 @@ - -/* File generated by gen_cfile.py. Should not be modified. */ - -#ifndef WIN32TEST_H -#define WIN32TEST_H - -#include "data.h" - -/* Prototypes of function provided by object dictionnary */ -UNS32 win32test_valueRangeTest (UNS8 typeValue, void * value); -const indextable * win32test_scanIndexOD (UNS16 wIndex, UNS32 * errorCode, ODCallback_t **callbacks); - -/* Master node data struct */ -extern CO_Data win32test_Data; - -#endif // WIN32TEST_H + +/* File generated by gen_cfile.py. Should not be modified. */ + +#ifndef WIN32TEST_H +#define WIN32TEST_H + +#include "data.h" + +/* Prototypes of function provided by object dictionnary */ +UNS32 win32test_valueRangeTest (UNS8 typeValue, void * value); +const indextable * win32test_scanIndexOD (UNS16 wIndex, UNS32 * errorCode, ODCallback_t **callbacks); + +/* Master node data struct */ +extern CO_Data win32test_Data; + +#endif // WIN32TEST_H diff -r 23df92154894 -r 9e4ccb3cab96 examples/win32test/win32test.vc9.vcproj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/win32test/win32test.vc9.vcproj Mon Jan 23 20:05:46 2012 +0100 @@ -0,0 +1,213 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 23df92154894 -r 9e4ccb3cab96 examples/win32test/win32test.vcproj --- a/examples/win32test/win32test.vcproj Mon Jan 23 08:49:26 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,215 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -