SliMax Manager 3.++

2 files changed, 214 insertions, 90 deletions

diff --git a/scripts/zdoc_scripts/iracing_common_scripts.lua b/scripts/zdoc_scripts/iracing_common_scripts.lua
index 3b19bb2..1da0e2d 100755..100644
--- a/scripts/zdoc_scripts/iracing_common_scripts.lua
+++ b/scripts/zdoc_scripts/iracing_common_scripts.lua
@@ -1,6 +1,6 @@
--- iRacing SLI-PRO Custom SLIMax Manager Scripts v3

+-- iRacing SLI-PRO Custom SLIMax Manager Scripts v3.2.2

 -- Copyright ©2012-2013 by Zappadoc - All Rights Reserved.

--- last change by Zappadoc - 2013-02

+-- last change by Zappadoc - 2013-10

 

 -- ================================

 -- CONSTANTS

@@ -26,91 +26,120 @@ require "scripts/zdoc_scripts/iracing_stuff"
 

 function custom_initEvent(scriptfile)

 	-- type your custom script initialization here

+	-- if iRacingZDocComboInitialized == nil then

+		-- iRacingZDocComboInitialized = true

+		-- local devStr = GetDeviceType(GetContextInfo("devicetype"))

+		-- if devStr == nil then devStr = "Unknown" end

+		-- local str = string.format("iRacing Combo Setup (settings + scripts)\n©2012-2013 By zappadoc, All Rights Reserved.\n\nInitialized for device: %s\n\nReminder: A COMBO SETUP automatically chooses for you the best corresponding settings in the car you are currently driving. Change to a simple setup if you want to set up the car by yourself using Basic or Advanced Options panel.", devStr )

+		-- SMXMessageBox(str)

+	-- end

+end

+

+-- function custom_controlsEvent(deviceType, ctrlType, ctrlPos, value, funcIndex)

+	-- -- type your custom controls script here (manage buttons, switches and encoders)

+	-- return 2

+-- end

+

+-- function custom_deviceReport(deviceType)

+	-- -- type your script here (just before sending report to the device )

+	-- return 2

+-- end

+

+function UnifyOSPMethod(idx, device)

+	-- custom OSP for each iRacing car

+	local result = 2

+	-- get current simulation name

+	local sim = GetContextInfo("simulation")

+	if isAppIRacing(sim) then

+		result = iRacing_ospMethodEvent(idx, device)

+	end

+	return result

 end

 

-function custom_controlsEvent(deviceIdx, ctrlType, ctrlPos, value, funcIndex)

-	-- type your custom controls script here (manage buttons, switches and encoders)

-	return 2

+function custom_ospMethodEvent(idx)

+	-- type your custom Optimal Shift Points (OSP) method here

+

+	return UnifyOSPMethod(idx, "SLI")

 end

 

-function custom_deviceReport(devType)

-	-- type your script here (just before sending report to the device )

-	return 2

+function custom_ospFanatecMethodEvent(idx)

+	-- type your custom Optimal Shift Points (OSP) method here

+		-- custom speedlimiter for each iRacing car

+	return UnifyOSPMethod(idx, "FANATEC")

 end

 

-function custom_ospMethodEvent(idx)

+function custom_ospSRDlxMethodEvent(idx)

 	-- type your custom Optimal Shift Points (OSP) method here

 		-- custom speedlimiter for each iRacing car

-	local result = 2

-	-- get current simulation name

-	local sim = GetContextInfo("simulation")

-	if isAppIRacing(sim) then

-		result = iRacing_ospMethodEvent(idx, "SLI")

-	end

-	return result

+	return UnifyOSPMethod(idx, "SRDLX")

 end

-function custom_ospFanatecMethodEvent(idx)

+function custom_ospSRF1MethodEvent(idx)

 	-- type your custom Optimal Shift Points (OSP) method here

 		-- custom speedlimiter for each iRacing car

-	local result = 2

-	-- get current simulation name

-	local sim = GetContextInfo("simulation")

-	if isAppIRacing(sim) then

-		result = iRacing_ospMethodEvent(idx, "FANATEC")

-	end

-	return result

+	return UnifyOSPMethod(idx, "SRF1")

 end

 

-function custom_shiftLightsMethodEvent(idx)

-	-- type your custom shiftlights method here

-	

+--==================================================

+

+function UnifyShiftlightsMethod(idx, device)

 	-- custom shiftlights for each iRacing car

 	-- get current simulation name

 	local sim = GetContextInfo("simulation")

 	if isAppIRacing(sim) then

-		iRacing_shiftLightsMethodEvent(idx, "SLI")

+		iRacing_shiftLightsMethodEvent(idx, device)

 		-- skip std methods

 		return 1

 	end

-	

 	return 2

 end

-function custom_shiftLightsFanatecMethodEvent(idx)

+

+function custom_shiftLightsSRDlxMethodEvent(idx)

 	-- type your custom shiftlights method here

 	

-	-- custom shiftlights for each iRacing car

-	-- get current simulation name

-	local sim = GetContextInfo("simulation")

-	if isAppIRacing(sim) then

-		iRacing_shiftLightsMethodEvent(idx, "FANATEC")

-		-- skip std methods

-		return 1

-	end

-	

-	return 2

+	return UnifyShiftlightsMethod(idx, "SRDLX")

 end

 

-function custom_shiftLightsBU0710Event(idx)

-	-- type your custom shiftlights method for BU0710 device only here

-	return 2

+function custom_shiftLightsMethodEvent(idx)

+	-- type your custom shiftlights method here

+	

+	return UnifyShiftlightsMethod(idx, "SLI")

 end

 

-function custom_leftDigitsEvent(swPosition)

-	-- type your custom script related to left SLI-PRO digits panel here

-	return 2

+function custom_shiftLightsFanatecMethodEvent(idx)

+	-- type your custom shiftlights method here

+	

+	return UnifyShiftlightsMethod(idx, "FANATEC")

 end

 

-function custom_rightDigitsEvent(swPosition)

-	-- type your custom script related to right SLI-PRO digits panel here

-	return 2

+function custom_shiftLightsSRF1MethodEvent(idx)

+	-- type your custom shiftlights method here

+	

+	return UnifyShiftlightsMethod(idx, "SRF1")

 end

 

-function custom_fanatecDigitsEvent(swPosition)

-	-- type your custom script related to Fanatec digits panel here

-	return 2

-end

+-- function custom_shiftLightsBU0710Event(idx)

+	-- -- type your custom shiftlights method for BU0710 device only here

+	-- return 2

+-- end

 

-function custom_spdLmtMethodEvent(idx)

+-- function custom_leftDigitsEvent(swPosition)

+	-- -- type your custom script related to left SLI-PRO digits panel here

+	-- return 2

+-- end

+

+-- function custom_rightDigitsEvent(swPosition)

+	-- -- type your custom script related to right SLI-PRO digits panel here

+	-- return 2

+-- end

+

+-- function custom_fanatecDigitsEvent(swPosition)

+	-- -- type your custom script related to Fanatec digits panel here

+	-- return 2

+-- end

+

+--==================================================

+

+function UnifySpeedlimiterMethod(idx, device)

 	-- type your custom speedlimiter method here

 		

 	-- custom speedlimiter for each iRacing car

@@ -118,45 +147,60 @@ function custom_spdLmtMethodEvent(idx)
 	-- get current simulation name

 	local sim = GetContextInfo("simulation")

 	if isAppIRacing(sim) then

-		result = iRacing_spdLmtMethodEvent(idx, "SLI")

+		result = iRacing_spdLmtMethodEvent(idx, device)

 	end

 	return result

 end

 

+function custom_spdLmtMethodEvent(idx)

+	-- type your custom speedlimiter method here

+

+	return UnifySpeedlimiterMethod(idx, "SLI")

+end

+

 function custom_spdLmtFanatecMethodEvent(idx)

 	-- type your custom Optimal Shift Points (OSP) method here

 

-	-- custom speedlimiter for each iRacing car

-	local result = 2

-	-- get current simulation name

+	return UnifySpeedlimiterMethod(idx, "FANATEC")

+end

+

+function custom_spdLmtSRDlxMethodEvent(idx)

+	-- type your custom Optimal Shift Points (OSP) method here

+

+	return UnifySpeedlimiterMethod(idx, "SRDLX")

+end

+

+function custom_spdLmtSRF1MethodEvent(idx)

+	-- type your custom Optimal Shift Points (OSP) method here

+

+	return UnifySpeedlimiterMethod(idx, "SRF1")

+end

+--==================================================

+

+function UnifyGearEvent(gear)

 	local sim = GetContextInfo("simulation")

-	if isAppIRacing(sim) then

-		result = iRacing_spdLmtMethodEvent(idx, "FANATEC")

+	if isAppIRacing(sim) then	

+		iRacing_InitGearEvent(gear)

 	end

-	return result

 end

 

 function custom_gearFanatecEvent(gear)

 	-- type your custom gear event script here

 	

-	local sim = GetContextInfo("simulation")

-	if isAppIRacing(sim) then	

-		iRacing_InitGearEvent(gear)

-	end

+	UnifyGearEvent(gear)

 	return 2

 end

 

 function custom_gearEvent(gear)

 	-- type your custom gear event script here

 	

-	local sim = GetContextInfo("simulation")

-	if isAppIRacing(sim) then	

-		iRacing_InitGearEvent(gear)

-	end

+	UnifyGearEvent(gear)

 	return 2

 end

 

-function custom_enterSessionEvent(devType)

+--==================================================

+

+function custom_enterSessionEvent(deviceType)

 	-- type your custom script on session start, here

 

 	-- custom script to get the max gear of each iRacing car

@@ -164,12 +208,12 @@ function custom_enterSessionEvent(devType)
 	local sim = GetContextInfo("simulation")

 	if isAppIRacing(sim ) then

 		iRacing_CarSetup(0)

-		iRacing_DebugCarInfo(devType)

+		iRacing_DebugCarInfo(deviceType)

 	end

 	return 2

 end

 

-function custom_exitSessionEvent(devType)

-	-- type your custom script on session ending, here

-	return 2

-end
\ No newline at end of file
+-- function custom_exitSessionEvent(deviceType)

+	-- -- type your custom script on session ending, here

+	-- return 2

+-- end
\ No newline at end of file
diff --git a/scripts/zdoc_scripts/iracing_stuff.lua b/scripts/zdoc_scripts/iracing_stuff.lua
index 42a708d..ee942d6 100755..100644
--- a/scripts/zdoc_scripts/iracing_stuff.lua
+++ b/scripts/zdoc_scripts/iracing_stuff.lua
@@ -1,18 +1,19 @@
--- Custom SLIMax Manager Scripts for iRacing v3

+-- Custom SLIMax Manager Scripts for iRacing v3.2.1

 -- Copyright ©2012-2013 by Zappadoc

--- _last change by Zappadoc - 2013-02

+-- _last change by Zappadoc - 2013-10

 

 -- =====================================

 -- iRacing Stuff script

 -- define car setup function and all pit limiter and shiftlights methods for each car you drive

-function iRacing_DebugCarInfo(devType)

+function iRacing_DebugCarInfo(deviceType)

 	-- see debug console window

 	-- get car name

-	local dev = GetDeviceType(devType)

+	local dev = GetDeviceType(deviceType)

 	local cNm = GetContextInfo("carname")

 	local mxG = GetCarInfo("maxgear")

+	local rdz = GetCarInfo("redzone")

 	local ospf = GetContextInfo("ospfactor")

-	print("\n----------\nDevice:"..dev.."\nSetup car:" .. cNm .. "\nMaxGear:" .. mxG .. "\nOSP Factor:" .. ospf .. "\n");

+	print("\n----------\nDevice:"..dev.."\nSetup car:" .. cNm .. "(" .. rdz .. ")" .. "\nMaxGear:" .. mxG .. "\nOSP Factor:" .. ospf .. "\n");

 end

 

 function iRacing_InitGearEvent(gear)

@@ -44,6 +45,10 @@ function iRacing_CarSetup(cGear)
 		mxG = 6

 		ospf = 150

 

+	elseif cNm == "kiaoptima" then

+		mxG = 5

+		ospf = 150

+		

 	elseif cNm == "formulamazda" then

 		mxG = 6

 		ospf = 60

@@ -174,7 +179,7 @@ function FixRPMSpeedlimiter()
 	-- init table

 	initLedTable(mRPMLedTable, 0)

 	SetRPMLed("mRPMLedTable")

-	for i = 0,12 do 

+	for i = 0,14 do 

 		led = led.format("RPM%d",i)

 		mRPMLedTable[led] = 1

 	end

@@ -182,7 +187,7 @@ function FixRPMSpeedlimiter()
 		

 end

 

-function iRacing_spdLmtMethodEvent(idx, devType)

+function iRacing_spdLmtMethodEvent(idx, deviceType)

 	local led = ""

 	

 	-- get car name

@@ -298,6 +303,10 @@ function iRacing_shiftLightsMethodEvent(idx, dev)
 		-- start Mazda shiftlights

 		if dev == "FANATEC" then

 			SideToCenterFanatec(rpm, gRedZone, 96, 97 ,98 ,99 ,99.5)		

+		elseif dev == "SRDLX" then

+			SideToCenterSRDlx(rpm, gRedZone, 95, 96, 97 ,98 ,99 ,99.5)		

+		elseif dev == "SRF1" then

+			SideToCenterSRF1(rpm, gRedZone, 94, 94.5, 95, 96, 97 ,98 ,99 ,99.5)		

 		else

 			SideToCenterSLI(rpm, gRedZone, 94.5, 95, 96, 97 ,98 ,99 ,99.5)

 		end

@@ -306,12 +315,20 @@ function iRacing_shiftLightsMethodEvent(idx, dev)
 		if gear == 6 then

 			if dev == "FANATEC" then

 				RpmFanatec(rpm, 6720 , 6870 , 7000 , 7200, 7305, 7340, 7340, 7340, 7340)		

+			elseif dev == "SRDLX" then

+				RpmSRDlx(rpm, 6690, 6720 , 6870 , 7000 , 7200, 7305, 7340, 7340, 7340, 7340)		

+			elseif dev == "SRF1" then

+				RpmSRF1(rpm, 6300, 6350, 6400, 6490, 6580, 6690, 6720 , 6870 , 7000 , 7200, 7305, 7340, 7340, 7340, 7340)		

 			else

 				ProgressiveFixedSLI(rpm, 6300, 6490, 6580, 6690, 6720 , 6870 , 7000 , 7200, 7305, 7340, 7340, 7340, 7340)		

 			end

 		else

 			if dev == "FANATEC" then

 				RpmFanatec(rpm, 6620 , 6670 , 6750 , 6800, 6895, 7040, 7040, 7040, 7040)	

+			elseif dev == "SRDLX" then

+				RpmSRDlx(rpm, 6590, 6620 , 6670 , 6750 , 6800, 6895, 7040, 7040, 7040, 7040)	

+			elseif dev == "SRF1" then

+				RpmSRF1(rpm, 6200, 6250, 6300, 6390, 6480, 6590, 6620 , 6670 , 6750 , 6800, 6895, 7040, 7040, 7040, 7040)	

 			else

 				ProgressiveFixedSLI(rpm, 6200, 6390, 6480, 6590, 6620 , 6670 , 6750 , 6800, 6895, 7040, 7040, 7040, 7040)

 			end

@@ -320,13 +337,32 @@ function iRacing_shiftLightsMethodEvent(idx, dev)
 	elseif cNm == "williamsfw31" then

 			if dev == "FANATEC" then

 				AlternateFanatec(rpm, gRedZone, 7.0, 8.0, 8.9)		

+			elseif dev == "SRDLX" then

+				AlternateSRDlx(rpm, gRedZone, 8.0, 9.0, 9.9)		

+			elseif dev == "SRF1" then

+				AlternateSRF1(rpm, gRedZone, 12.0, 13.0, 14.9)		

 			else

 				AlternateSLI(rpm, gRedZone, 11.0, 12.0, 12.9)		

 			end

 		

+	elseif cNm == "kiaoptima" then

+		if dev == "FANATEC" then

+			SideToCenterFanatec(rpm, gRedZone, 95, 96 ,97 ,98 ,99)		

+		elseif dev == "SRDLX" then

+			SideToCenterSRDlx(rpm, gRedZone, 90, 95, 96 ,97 ,98 ,99)			

+		elseif dev == "SRF1" then

+			SideToCenterSRF1(rpm, gRedZone, 86, 90, 95, 96 ,97 ,98 ,99, 99.5)			

+		else

+			SideToCenterSLI(rpm, gRedZone, 86, 90, 95, 96 ,97 ,98 ,99)

+		end	

+		

 	elseif cNm == "mx5 cup" or cNm == "mx5 roadster" then

 		if dev == "FANATEC" then

 			SideToCenterFanatec(rpm, gRedZone, 95, 96 ,97 ,98 ,99)		

+		elseif dev == "SRDLX" then

+			SideToCenterSRDlx(rpm, gRedZone, 90, 95, 96 ,97 ,98 ,99)		

+		elseif dev == "SRF1" then

+			SideToCenterSRF1(rpm, gRedZone, 86, 90, 95, 96 ,97 ,98 ,99, 99.5)		

 		else

 			SideToCenterSLI(rpm, gRedZone, 86, 90, 95, 96 ,97 ,98 ,99)

 		end	

@@ -334,6 +370,10 @@ function iRacing_shiftLightsMethodEvent(idx, dev)
 	elseif cNm == "fr500s" then

 		if dev == "FANATEC" then

 			SideToCenterFanatec(rpm, gRedZone, 86, 88 ,90 ,98 ,99)	

+		elseif dev == "SRDLX" then

+			SideToCenterSRDlx(rpm, gRedZone, 84, 86, 88 ,90 ,98 ,99)	

+		elseif dev == "SRF1" then

+			SideToCenterSRF1(rpm, gRedZone, 80, 84, 86, 88 ,90 ,98 ,99, 99.5)	

 		else

 			SideToCenterSLI(rpm, gRedZone, 80, 84, 86, 88 ,90 ,98 ,99)

 		end		

@@ -341,6 +381,10 @@ function iRacing_shiftLightsMethodEvent(idx, dev)
 	elseif cNm == "fordv8sc" then

 		if dev == "FANATEC" then

 			SideToCenterFanatec(rpm, gRedZone, 92, 94 ,97 ,98 ,99)

+		elseif dev == "SRDLX" then

+			SideToCenterSRDlx(rpm, gRedZone, 90, 92, 94 ,97 ,98 ,99)

+		elseif dev == "SRF1" then

+			SideToCenterSRF1(rpm, gRedZone, 87, 90, 92, 94 ,97 ,98 ,99, 99.5)

 		else

 			SideToCenterSLI(rpm, gRedZone, 87, 90, 92, 94 ,97 ,98 ,99)

 		end				

@@ -348,6 +392,10 @@ function iRacing_shiftLightsMethodEvent(idx, dev)
 	 elseif cNm == "dallara" then

 		if dev == "FANATEC" then

 			SideToCenterFanatec(rpm, gRedZone, 90, 94 ,97 ,98 ,99)

+		elseif dev == "SRDLX" then

+			SideToCenterSRDlx(rpm, gRedZone, 82, 90, 94 ,97 ,98 ,99)

+		elseif dev == "SRF1" then

+			SideToCenterSRF1(rpm, gRedZone, 78, 82, 90, 94 ,97 ,98 ,99, 99.5)

 		else

 			SideToCenterSLI(rpm, gRedZone, 78, 82, 90, 94 ,97 ,98 ,99)

 		end				

@@ -355,6 +403,10 @@ function iRacing_shiftLightsMethodEvent(idx, dev)
 	elseif cNm == "fordgt" then

 		if dev == "FANATEC" then

 			SideToCenterFanatec(rpm, gRedZone, 95, 96 ,97 ,98 ,99)

+		elseif dev == "SRDLX" then

+			SideToCenterSRDlx(rpm, gRedZone, 94, 95, 96 ,97 ,98 ,99)

+		elseif dev == "SRF1" then

+			SideToCenterSRF1(rpm, gRedZone, 93, 94, 95, 96 ,97 ,98 ,99, 99.5)

 		else

 			SideToCenterSLI(rpm, gRedZone, 93, 94, 95, 96 ,97 ,98 ,99)

 		end				

@@ -362,6 +414,10 @@ function iRacing_shiftLightsMethodEvent(idx, dev)
  	elseif cNm == "hpdarx01c" then

 		if dev == "FANATEC" then

 			RpmFanatec(rpm, 8500 , 8700 , 8800 , 8900, 9100, 9300, 9500, 9700, 9940)

+		elseif dev == "SRDLX" then

+			RpmSRDlx(rpm, 8300, 8500 , 8700 , 8800 , 8900, 9100, 9300, 9500, 9700, 9940)

+		elseif dev == "SRF1" then

+			RpmSRF1(rpm, 7800, 7840, 7890, 7900, 8100, 8300, 8500 , 8700 , 8800 , 8900, 9100, 9300, 9500, 9700, 9940)

 		else

 			ProgressiveFixedSLI(rpm, 7800, 7900, 8100, 8300, 8500 , 8700 , 8800 , 8900, 9100, 9300, 9500, 9700, 9940)

 		end	

@@ -369,6 +425,10 @@ function iRacing_shiftLightsMethodEvent(idx, dev)
 	elseif cNm == "rileydp" then

 		if dev == "FANATEC" then

 			RpmFanatec(rpm, 6900, 7000 , 10000 , 10000 , 10000, 10000, 10000, 10000, 10000)

+		elseif dev == "SRDLX" then

+			RpmSRDlx(rpm, 6800, 6900, 7000 , 10000 , 10000 , 10000, 10000, 10000, 10000, 10000)

+		elseif dev == "SRF1" then

+			RpmSRF1(rpm, 10000, 10000, 6700, 6800, 6900, 7000 , 10000 , 10000 , 10000, 10000, 10000, 10000, 10000, 10000, 10000)

 		else

 			ProgressiveFixedSLI(rpm, 10000, 6700, 6800, 6900, 7000 , 10000 , 10000 , 10000, 10000, 10000, 10000, 10000, 10000)

 		end	

@@ -376,6 +436,10 @@ function iRacing_shiftLightsMethodEvent(idx, dev)
 	elseif cNm == "c6r" then	

 		if dev == "FANATEC" then

 			RpmFanatec(rpm, 5200 , 5300 , 5400 , 5600, 5700, 5800, 5900, 6000, 6100)

+		elseif dev == "SRDLX" then

+			RpmSRDlx(rpm, 5000, 5200 , 5300 , 5400 , 5600, 5700, 5800, 5900, 6000, 6100)

+		elseif dev == "SRF1" then

+			RpmSRF1(rpm, 4700, 4800, 4900, 5000, 5040, 5190, 5200 , 5300 , 5400 , 5600, 5700, 5800, 5900, 6000, 6100)

 		else

 			ProgressiveFixedSLI(rpm, 4700, 4800, 4900, 5000, 5200 , 5300 , 5400 , 5600, 5700, 5800, 5900, 6000, 6100)

 		end			

@@ -383,6 +447,10 @@ function iRacing_shiftLightsMethodEvent(idx, dev)
 	elseif cNm == "radical sr8" then

 		if dev == "FANATEC" then

 			RpmFanatec(rpm, 6400 , 6900 , 7700 , 8100, 8700, 9850, 10100, 10250, 10500)

+		elseif dev == "SRDLX" then

+			RpmSRDlx(rpm, 5700, 6400 , 6900 , 7700 , 8100, 8700, 9850, 10100, 10250, 10500)

+		elseif dev == "SRF1" then

+			RpmSRF1(rpm, 4350, 4800, 5100, 5300, 5500, 5700, 6400 , 6900 , 7700 , 8100, 8700, 9850, 10100, 10250, 10500)

 		else

 			ProgressiveFixedSLI(rpm, 4350, 4800, 5100, 5700, 6400 , 6900 , 7700 , 8100, 8700, 9850, 10100, 10250, 10500)

 		end			

@@ -390,6 +458,10 @@ function iRacing_shiftLightsMethodEvent(idx, dev)
 	elseif cNm == "jettatdi" then

 		if dev == "FANATEC" then

 			SideToCenterFanatec(rpm, gRedZone, 86, 88 ,90 ,98 ,99)

+		elseif dev == "SRDLX" then

+			SideToCenterSRDlx(rpm, gRedZone, 84, 86, 88 ,90 ,98 ,99)

+		elseif dev == "SRF1" then

+			SideToCenterSRF1(rpm, gRedZone, 80, 84, 86, 88 ,90 ,98 ,99, 99.5)

 		else

 			SideToCenterSLI(rpm, gRedZone, 80, 84, 86, 88 ,90 ,98 ,99)

 		end			

@@ -397,7 +469,11 @@ function iRacing_shiftLightsMethodEvent(idx, dev)
 	elseif cNm == "cadillacctsvr" then

 		--ProgressiveFixedSLI(rpm, 6500, 6580, 6600, 6700, 6800 , 6900 , 7000 , 7100, 7200, 7300, 7400, 7500, 7600)

 		if dev == "FANATEC" then

-			ProgressiveFanatec(rpm,  7.9, 8.15, 8.2, 8.25, 8.3, 8.35, 8.5, 8.8, 8.98 )

+			ProgressiveFanatec(rpm, gRedZone, 7.9, 8.15, 8.2, 8.25, 8.3, 8.35, 8.5, 8.8, 8.98 )

+		elseif dev == "SRDLX" then

+			ProgressiveSRDlx(rpm, gRedZone, 8.5, 8.9, 9.15, 9.2, 9.25, 9.3, 9.35, 9.5, 9.8, 9.98 )

+		elseif dev == "SRF1" then

+			ProgressiveSRF1(rpm, gRedZone, 13.8, 13.85, 13.9, 13.95, 13.98, 14, 14.1, 14.15, 14.2, 14.25, 14.3, 14.35, 14.5, 14.8, 14.98 )

 		else

 			ProgressiveSLI(rpm, gRedZone, 11.9, 11.95, 11.98, 12, 12.1, 12.15, 12.2, 12.25, 12.3, 12.35, 12.5, 12.8, 12.98 )

 		end			

@@ -422,7 +498,11 @@ function iRacing_shiftLightsMethodEvent(idx, dev)
 	else

 		-- default 

 		if dev == "FANATEC" then

-			ProgressiveFanatec(rpm,  4.5, 5, 6.5, 7, 7.5, 8, 8.5, 8.8, 8.98 )

+			ProgressiveFanatec(rpm,  gRedZone, 4.5, 5, 6.5, 7, 7.5, 8, 8.5, 8.8, 8.98 )

+		elseif dev == "SRDLX" then

+			ProgressiveSRDlx(rpm,  gRedZone, 5.0, 5.5, 6, 7.5, 8, 8.5, 9, 9.5, 9.8, 9.98 )

+		elseif dev == "SRF1" then

+			ProgressiveSRF1(rpm,  gRedZone, 9.0, 9.5, 9.8, 10, 10.5, 11, 11.5, 12, 12.5, 13, 13.5, 14, 14.5, 14.8, 14.98  )

 		else

 			ProgressiveSLI(rpm, gRedZone, 7.5, 8, 8.5, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.5, 12.8, 12.98 )

 		end			

@@ -432,21 +512,21 @@ function iRacing_shiftLightsMethodEvent(idx, dev)
 	SetRPMLed(tName)	

 end

 

-function iRacing_ospMethodEvent(idx, devType)

+function iRacing_ospMethodEvent(idx, deviceType)

 	-- get car name

 	local cNm = GetContextInfo("carname")

 	-- OSP Method stuff	

 	if mOSPMethod ~= nil then

 		if cNm == "mclarenmp4" or cNm == "williamsfw31" then

-			 --if devType == "FANATEC" then

-				-- mOSPMethod = 0

-			--else

+			 if deviceType == "FANATEC" then

+				mOSPMethod = 1

+			else

 				mOSPMethod = 3 

-			--end

+			end

 	

 		-- else

 			-- -- default

-			-- if devType == "FANATEC" then

+			-- if deviceType == "FANATEC" then

 				-- mOSPMethod = 1

 			-- end

 		end