diff -r 092e33606e51 -r 8261c8f1e365 plugins/canfestival/canfestival.py --- a/plugins/canfestival/canfestival.py Thu Oct 08 11:09:01 2009 +0200 +++ b/plugins/canfestival/canfestival.py Thu Oct 08 11:26:40 2009 +0200 @@ -17,6 +17,23 @@ from gnosis.xml.pickle.util import setParanoia setParanoia(0) +if wx.Platform == '__WXMSW__': + DEFAULT_SETTINGS = { + "CAN_Driver": "can_tcp_win32", + "CAN_Device": "127.0.0.1", + "CAN_Baudrate": "125K", + "Slave_NodeId": 2, + "Master_NodeId": 1, + } +else: + DEFAULT_SETTINGS = { + "CAN_Driver": "../CanFestival-3/drivers/can_socket/libcanfestival_can_socket.so", + "CAN_Device": "vcan0", + "CAN_Baudrate": "125K", + "Slave_NodeId": 2, + "Master_NodeId": 1, + } + #-------------------------------------------------- # SLAVE #-------------------------------------------------- @@ -26,9 +43,9 @@ - - - + + + @@ -41,7 +58,7 @@ - """ + """ % DEFAULT_SETTINGS def GetSlaveODPath(self): return os.path.join(self.PlugPath(), 'slave.od') @@ -150,14 +167,14 @@ - - - + + + - """ + """ % DEFAULT_SETTINGS def __init__(self): manager = NodeManager() @@ -254,12 +271,13 @@ - + - """ + """ % DEFAULT_SETTINGS + PlugChildsTypes = [("CanOpenNode",_NodeListPlug, "CanOpen Master"), ("CanOpenSlave",_SlavePlug, "CanOpen Slave")] def GetParamsAttributes(self, path = None):