From: leonid <leonid>
Date: Wed, 8 Aug 2007 16:38:27 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: jan-benda-base^0
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/CanFestival-3.git/commitdiff_plain/76ae85fea330814037d87238f8d75853992f2c1c?hp=03ba5dc5f5da4b3f447a959ef965972a66e8b1b7

*** empty log message ***
---

diff --git a/examples/win32test/main.c b/examples/win32test/main.c
index 6a9c98a..ca342d9 100644
--- a/examples/win32test/main.c
+++ b/examples/win32test/main.c
@@ -31,12 +31,13 @@ performs SDO reads and prints some slave node information.
 
 Usage:
 
-    win32test <node_id>
+   win32test <node_id> [can driver dll filename [baud rate]]
 
-  where node_id is node ID in decimal format
+ where node_id is node_id in decimal format
 
-You should have CanFestival-3.dll CAN-uVCCM.dll in the search path to run this sample.
-Code will work with non-UNICODE CanFestival-3.dll CAN-uVCCM.dll libraries.
+If driver is not specified, CAN-uVCCM.dll will be used by default.
+If baudrate is not specified, 125K will be used by default.
+You should have CanFestival-3.dll can driver dll in the search path to run this sample.
 
 Sample can work on other platdorms as well.
 ***************************************************************************/
@@ -106,7 +107,7 @@ int main(int argc, char *argv[])
    /* process command line arguments */
    if (argc < 2)
       {
-      printf("USAGE: win32test node_id [dll_file_name]\n");
+      printf("USAGE: win32test <node_id> [can driver dll filename [baud rate]]\n");
       return 1;
       }
 
@@ -117,10 +118,13 @@ int main(int argc, char *argv[])
       return 1;
       }
 
-      if (argc > 2)
-		dll_file_name = argv[2];
-	  else
-		dll_file_name = "can_uvccm_win32.dll";
+   if (argc > 2)
+      dll_file_name = argv[2];
+   else
+      dll_file_name = "can_uvccm_win32.dll";
+
+   if (argc > 3)
+      MasterBoard.baudrate = argv[3];
 
    // load can driver
    if (!LoadCanDriver(dll_file_name))
diff --git a/src/win32/CanFestival-3.rc b/src/win32/CanFestival-3.rc
deleted file mode 100644
index c076744..0000000
--- a/src/win32/CanFestival-3.rc
+++ /dev/null
@@ -1,104 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,0,0,0
- PRODUCTVERSION 3,0,0,0
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "Win32 CanFestival port"
-            VALUE "CompanyName", "http://canfestival.sourceforge.net/"
-            VALUE "FileDescription", "CanFestival-3 Win32 port"
-            VALUE "FileVersion", "3, 0, 0, 0"
-            VALUE "InternalName", "CanFestival"
-            VALUE "LegalCopyright", "Copyright (C) 2007"
-            VALUE "LegalTrademarks", "CanFestival is an OpenSource (LGPL) CANOpen framework"
-            VALUE "OriginalFilename", "CanFestival-3.dll"
-            VALUE "ProductName", "CanFestival-3 Win32 port"
-            VALUE "ProductVersion", "3, 0, 0, 0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/src/win32/resource.h b/src/win32/resource.h
deleted file mode 100644
index 39e04b2..0000000
--- a/src/win32/resource.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by CanFestival-3.rc
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1001
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif