Merge pull request #2 from Ryuk47/ryuks_edits

Added the ability to process files in Config/Input and Update for DCS 2.7.18080

Author: Quaggles

DCS-Input-Command-Injector-Quaggles/DCS-Input-Command-Injector-Quaggles/Scripts/Input/Data.lua

@@ -93,11 +93,14 @@ local function QuagglesInputCommandInjector(filename, folder, env, result)
 	if quagglesLoggingEnabled then log.write(quagglesLogName, log.INFO, 'Detected loading of: '..filename) end
 	-- Only operate on files that are in this folder
 	local targetPrefixForAircrafts = "./Mods/aircraft/"
-	local targetPrefixForConfig = "./Config/Input/"
+	local targetPrefixForDotConfig = "./Config/Input/"
+	local targetPrefixForConfig    = "Config/Input/"
 	local targetPrefix = nil
 	if StartsWith(filename, targetPrefixForAircrafts) and StartsWith(folder, targetPrefixForAircrafts) then
 		targetPrefix = targetPrefixForAircrafts
-	elseif StartsWith(filename, targetPrefixForConfig) and StartsWith(folder, targetPrefixForConfig) then
+	elseif StartsWith(filename, targetPrefixForDotConfig) and StartsWith(folder, targetPrefixForDotConfig) then
+		targetPrefix = targetPrefixForDotConfig
+	elseif StartsWith(filename, targetPrefixForConfig) then
 		targetPrefix = targetPrefixForConfig
 	end
 	if targetPrefix then
@@ -577,6 +580,14 @@ local default_assignments =
 		thrust	= 'JOY_Z',
 		fire	= 'JOY_BTN14',
 	},
+	["SideWinder Force Feedback 2 Joystick"] = 
+	{ 
+		thrust	= 'JOY_SLIDER1',
+		pitch	= 'JOY_Y',
+		roll	= 'JOY_X',
+		rudder	= 'JOY_RZ',
+		fire	= 'JOY_BTN1',
+	},
 }
 
 local function loadDeviceProfileFromFile(filename, deviceGenericName, folder)
@@ -2827,4 +2838,4 @@ return {
 	getUiProfileName					= getUiProfileName,
 	setDeviceDisabled					= setDeviceDisabled,
 	getDeviceDisabled					= getDeviceDisabled,
-}
+}

Inject.lua

@@ -16,11 +16,14 @@ local function QuagglesInputCommandInjector(filename, folder, env, result)
 	if quagglesLoggingEnabled then log.write(quagglesLogName, log.INFO, 'Detected loading of: '..filename) end
 	-- Only operate on files that are in this folder
 	local targetPrefixForAircrafts = "./Mods/aircraft/"
-	local targetPrefixForConfig = "./Config/Input/"
+	local targetPrefixForDotConfig = "./Config/Input/"
+	local targetPrefixForConfig    = "Config/Input/"
 	local targetPrefix = nil
 	if StartsWith(filename, targetPrefixForAircrafts) and StartsWith(folder, targetPrefixForAircrafts) then
 		targetPrefix = targetPrefixForAircrafts
-	elseif StartsWith(filename, targetPrefixForConfig) and StartsWith(folder, targetPrefixForConfig) then
+	elseif StartsWith(filename, targetPrefixForDotConfig) and StartsWith(folder, targetPrefixForDotConfig) then
+		targetPrefix = targetPrefixForDotConfig
+	elseif StartsWith(filename, targetPrefixForConfig) then
 		targetPrefix = targetPrefixForConfig
 	end
 	if targetPrefix then
@@ -52,4 +55,4 @@ local function QuagglesInputCommandInjector(filename, folder, env, result)
 			end
 		end
 	end
-end
+end