[Csp-commits] svn:csp r1480 - in trunk/CSP/CSPSim: . Bin Tools/HID/Maps

[<sv...@ww...>]

Author: mkrose
Date: 2005-02-19 13:23:35 -0800 (Sat, 19 Feb 2005)
New Revision: 1480

Modified:
   trunk/CSP/CSPSim/Bin/CSPSim.py
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Tools/HID/Maps/aircraft-core.map
Log:
Fix path for hid generation under windows.
Add the correct F16DJ binding for the core aircraft.map.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1480

Modified: trunk/CSP/CSPSim/Bin/CSPSim.py
===================================================================
--- trunk/CSP/CSPSim/Bin/CSPSim.py	2005-02-19 01:01:35 UTC (rev 1479)
+++ trunk/CSP/CSPSim/Bin/CSPSim.py	2005-02-19 21:23:35 UTC (rev 1480)
@@ -55,10 +55,14 @@
 	Verify that the specified hid input definition exists.  If not, generate it from
 	from the example input maps in ../Tools/HID/Examples
 	"""
-	if not os.path.exists('../Data/Input'): return
-	output = '../Data/Input/%s.hid' % hid_file
+	input_path = os.path.join('..', 'Data', 'Input')
+	if not os.path.exists(input_path): return
+	output = os.path.join(input_path, '%s.hid' % hid_file)
 	if not os.path.exists(output):
-		os.system('../Tools/HID/cspinput -I../Tools/HID -o%s ../Tools/HID/Examples/%s.map' % (output, hid_file))
+		tool_path = os.path.join('..', 'Tools', 'HID')
+		csp_input = os.path.join(tool_path, 'cspinput')
+		example = os.path.join(tool_path, 'Examples', '%s.map' % hid_file)
+		os.system('%s -I%s -o%s %s' % (csp_input, tool_path, output, example))
 		if os.path.exists(output):
 			print 'Default input map created for %s.hid; see Tools/HID/README for details.' % hid_file
 		else:

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-02-19 01:01:35 UTC (rev 1479)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-02-19 21:23:35 UTC (rev 1480)
@@ -1,9 +1,13 @@
  Version 0.4.0 (in progress)
 ===========================
 
+2005-02-20: onsight
+ * Fix path for hid generation under windows.
+ * Add the correct F16DJ binding for the core aircraft.map.
+
 2005-02-18: delta
  * Fixed a bug with ContactMarkers.
- 
+
 2005-02-17: lologramme
  * Added F16 D
 

Modified: trunk/CSP/CSPSim/Tools/HID/Maps/aircraft-core.map
===================================================================
--- trunk/CSP/CSPSim/Tools/HID/Maps/aircraft-core.map	2005-02-19 01:01:35 UTC (rev 1479)
+++ trunk/CSP/CSPSim/Tools/HID/Maps/aircraft-core.map	2005-02-19 21:23:35 UTC (rev 1480)
@@ -5,7 +5,7 @@
 device mouse 0 mouse standard_mouse
 
 bind sim:vehicles.aircraft.m2k
-bind sim:vehicles.aircraft.f16
+bind sim:vehicles.aircraft.F16DJ
 
 mode base