From db7d99359d62b05a1f6e2c551106b7bf26764889 Mon Sep 17 00:00:00 2001 From: Hugues Hiegel Date: Mon, 18 Nov 2013 21:04:19 +0100 Subject: 3.3.0.3 -> 3.3.0.5 --- scripts/speedlimiter.lua | 1406 +++++++++++++++++++++++----------------------- 1 file changed, 703 insertions(+), 703 deletions(-) (limited to 'scripts/speedlimiter.lua') diff --git a/scripts/speedlimiter.lua b/scripts/speedlimiter.lua index 9382675..8ce51cb 100644 --- a/scripts/speedlimiter.lua +++ b/scripts/speedlimiter.lua @@ -26,9 +26,9 @@ function spdLmtMethodEvent(idx) -- check if initialized if isGlobalInitialized == 0 then - isGlobalInitialized = 1 - -- init them - InitGlobals() + isGlobalInitialized = 1 + -- init them + InitGlobals() end -- get global prefs GetSLIMaxInfo() @@ -38,200 +38,200 @@ function spdLmtMethodEvent(idx) SetRPMLed("mRPMLedTable") if mNoBlink or (mSpdLimitMethod == 0) then - -- speedlimiter led NOT blinking - SetWarnLed(mSpeedLimiterLED, 1) + -- speedlimiter led NOT blinking + SetWarnLed(mSpeedLimiterLED, 1) elseif mSpdLimitMethod == 1 then - -- speedlimiter led blinking, method 1 - if GetTicks() > mOldTickCount then - mSpdLmtBlink = mSpdLmtBlink + 1 - end + -- speedlimiter led blinking, method 1 + if GetTicks() > mOldTickCount then + mSpdLmtBlink = mSpdLmtBlink + 1 + end - if mSpdLmtBlink >= mBlinkTime then - mSpdLmtBlink = 0 - end + if mSpdLmtBlink >= mBlinkTime then + mSpdLmtBlink = 0 + end - if mSpdLmtBlink <= (mBlinkTime / 2) then - if mLimiterChar then SetGearDigit("L") end - SetWarnLed(mSpeedLimiterLED, 1) - end + if mSpdLmtBlink <= (mBlinkTime / 2) then + if mLimiterChar then SetGearDigit("L") end + SetWarnLed(mSpeedLimiterLED, 1) + end - if mSpdLmtBlink > (mBlinkTime / 2) then - if mLimiterChar then SetGearDigit(" ") end - SetWarnLed(mSpeedLimiterLED, 0) - end + if mSpdLmtBlink > (mBlinkTime / 2) then + if mLimiterChar then SetGearDigit(" ") end + SetWarnLed(mSpeedLimiterLED, 0) + end elseif mSpdLimitMethod == 2 then - -- speedlimiter led + RPM blinking, method 2 - if GetTicks() > mOldTickCount then - mSpdLmtBlink = mSpdLmtBlink + 1 - end - - if mSpdLmtBlink >= mBlinkTime then - mSpdLmtBlink = 0 - end - - if mSpdLmtBlink <= (mBlinkTime / 2) then - if mLimiterChar then SetGearDigit("L") end - initLedTable(mRPMLedTable, 1) - if not mSpdLmtRPMLedOnly then - SetWarnLed(mSpeedLimiterLED, 1) - end - end - - if mSpdLmtBlink > (mBlinkTime / 2) then - if mLimiterChar then SetGearDigit(" ") end - initLedTable(mRPMLedTable, 0) - if not mSpdLmtRPMLedOnly then - SetWarnLed(mSpeedLimiterLED, 0) - end - end - SetRPMLed("mRPMLedTable") + -- speedlimiter led + RPM blinking, method 2 + if GetTicks() > mOldTickCount then + mSpdLmtBlink = mSpdLmtBlink + 1 + end + + if mSpdLmtBlink >= mBlinkTime then + mSpdLmtBlink = 0 + end + + if mSpdLmtBlink <= (mBlinkTime / 2) then + if mLimiterChar then SetGearDigit("L") end + initLedTable(mRPMLedTable, 1) + if not mSpdLmtRPMLedOnly then + SetWarnLed(mSpeedLimiterLED, 1) + end + end + + if mSpdLmtBlink > (mBlinkTime / 2) then + if mLimiterChar then SetGearDigit(" ") end + initLedTable(mRPMLedTable, 0) + if not mSpdLmtRPMLedOnly then + SetWarnLed(mSpeedLimiterLED, 0) + end + end + SetRPMLed("mRPMLedTable") elseif mSpdLimitMethod == 3 then - -- speedlimiter led + alternate RPM blinking, method 3 - if GetTicks() > mOldTickCount then - mSpdLmtBlink = mSpdLmtBlink + 1 - end - if mSpdLmtBlink >= mBlinkTime then - mSpdLmtBlink = 0 - end - if mSpdLmtBlink <= (mBlinkTime / 2) then - if mLimiterChar then - SetGearDigit("L") - end - for i = 0,12 do - led = led.format("RPM%d",i) - if (i % 2)==0 then - mRPMLedTable[led] = 1 - else - mRPMLedTable[led] = 0 - end - end - if not mSpdLmtRPMLedOnly then - SetWarnLed(mSpeedLimiterLED, 1) - end - end - - if mSpdLmtBlink > (mBlinkTime / 2) then - if mLimiterChar then - SetGearDigit(" ") - end - for i = 0,13 do - led = led.format("RPM%d",i) - if (i % 2)==0 then - mRPMLedTable[led] = 0 - else - mRPMLedTable[led] = 1 - end - end - if not mSpdLmtRPMLedOnly then - SetWarnLed(mSpeedLimiterLED, 0) - end - end - SetRPMLed("mRPMLedTable") + -- speedlimiter led + alternate RPM blinking, method 3 + if GetTicks() > mOldTickCount then + mSpdLmtBlink = mSpdLmtBlink + 1 + end + if mSpdLmtBlink >= mBlinkTime then + mSpdLmtBlink = 0 + end + if mSpdLmtBlink <= (mBlinkTime / 2) then + if mLimiterChar then + SetGearDigit("L") + end + for i = 0,12 do + led = led.format("RPM%d",i) + if (i % 2)==0 then + mRPMLedTable[led] = 1 + else + mRPMLedTable[led] = 0 + end + end + if not mSpdLmtRPMLedOnly then + SetWarnLed(mSpeedLimiterLED, 1) + end + end + + if mSpdLmtBlink > (mBlinkTime / 2) then + if mLimiterChar then + SetGearDigit(" ") + end + for i = 0,13 do + led = led.format("RPM%d",i) + if (i % 2)==0 then + mRPMLedTable[led] = 0 + else + mRPMLedTable[led] = 1 + end + end + if not mSpdLmtRPMLedOnly then + SetWarnLed(mSpeedLimiterLED, 0) + end + end + SetRPMLed("mRPMLedTable") elseif mSpdLimitMethod == 4 then - -- speedlimiter led + RPM + digits blinking, method 4 - if GetTicks() > mOldTickCount then - mSpdLmtBlink = mSpdLmtBlink + 1 - end - - if mSpdLmtBlink >= mBlinkTime then - mSpdLmtBlink = 0 - end - - if mSpdLmtBlink <= (mBlinkTime / 2) then - - if mLimiterChar then SetGearDigit("L") end - SetDigitsAllowed(true) - - for i = 0,2 do - led = led.format("RPM%d",i) - mRPMLedTable[led] = 0 - end - for i = 10,12 do - led = led.format("RPM%d",i) - mRPMLedTable[led] = 0 - end - - if not mSpdLmtRPMLedOnly then - SetWarnLed(mSpeedLimiterLED, 0) - end - end - - if mSpdLmtBlink > (mBlinkTime / 2) then - if mLimiterChar then SetGearDigit(" ") end - - SetDigitsAllowed(false) - - SetLeftDigits (mLeftSpdLmtText) - SetRightDigits (mRightSpdLmtText) - - for i = 0,2 do - led = led.format("RPM%d",i) - mRPMLedTable[led] = 1 - end - for i = 10,12 do - led = led.format("RPM%d",i) - mRPMLedTable[led] = 1 - end - if not mSpdLmtRPMLedOnly then - SetWarnLed(mSpeedLimiterLED, 0) - end - end - SetRPMLed("mRPMLedTable") + -- speedlimiter led + RPM + digits blinking, method 4 + if GetTicks() > mOldTickCount then + mSpdLmtBlink = mSpdLmtBlink + 1 + end + + if mSpdLmtBlink >= mBlinkTime then + mSpdLmtBlink = 0 + end + + if mSpdLmtBlink <= (mBlinkTime / 2) then + + if mLimiterChar then SetGearDigit("L") end + SetDigitsAllowed(true) + + for i = 0,2 do + led = led.format("RPM%d",i) + mRPMLedTable[led] = 0 + end + for i = 10,12 do + led = led.format("RPM%d",i) + mRPMLedTable[led] = 0 + end + + if not mSpdLmtRPMLedOnly then + SetWarnLed(mSpeedLimiterLED, 0) + end + end + + if mSpdLmtBlink > (mBlinkTime / 2) then + if mLimiterChar then SetGearDigit(" ") end + + SetDigitsAllowed(false) + + SetLeftDigits (mLeftSpdLmtText) + SetRightDigits (mRightSpdLmtText) + + for i = 0,2 do + led = led.format("RPM%d",i) + mRPMLedTable[led] = 1 + end + for i = 10,12 do + led = led.format("RPM%d",i) + mRPMLedTable[led] = 1 + end + if not mSpdLmtRPMLedOnly then + SetWarnLed(mSpeedLimiterLED, 0) + end + end + SetRPMLed("mRPMLedTable") elseif mSpdLimitMethod == 5 or mSpdLimitMethod == 6 then - -- speedlimiter led + digits blinking, method 5 - -- speedlimiter led + RPM fixed + Digits blinking, method 6 - if GetTicks() > mOldTickCount then - mSpdLmtBlink = mSpdLmtBlink + 1 - end + -- speedlimiter led + digits blinking, method 5 + -- speedlimiter led + RPM fixed + Digits blinking, method 6 + if GetTicks() > mOldTickCount then + mSpdLmtBlink = mSpdLmtBlink + 1 + end - if mSpdLmtBlink >= mBlinkTime then - mSpdLmtBlink = 0 - end + if mSpdLmtBlink >= mBlinkTime then + mSpdLmtBlink = 0 + end - if mSpdLmtBlink <= (mBlinkTime / 2) then - if mLimiterChar then SetGearDigit("L") end + if mSpdLmtBlink <= (mBlinkTime / 2) then + if mLimiterChar then SetGearDigit("L") end - SetDigitsAllowed (true) + SetDigitsAllowed (true) - local state = 0 - if mSpdLimitMethod == 6 then state = 1 end - initLedTable(mRPMLedTable, state) + local state = 0 + if mSpdLimitMethod == 6 then state = 1 end + initLedTable(mRPMLedTable, state) - if not mSpdLmtRPMLedOnly then - SetWarnLed(mSpeedLimiterLED, 0) - end - end + if not mSpdLmtRPMLedOnly then + SetWarnLed(mSpeedLimiterLED, 0) + end + end - if mSpdLmtBlink > (mBlinkTime / 2) then - if mLimiterChar then SetGearDigit(" ") end + if mSpdLmtBlink > (mBlinkTime / 2) then + if mLimiterChar then SetGearDigit(" ") end - SetLeftDigits ( mLeftSpdLmtText) - SetRightDigits ( mRightSpdLmtText) + SetLeftDigits ( mLeftSpdLmtText) + SetRightDigits ( mRightSpdLmtText) - SetDigitsAllowed(false) + SetDigitsAllowed(false) - local state = 0 - if mSpdLimitMethod == 6 then state = 1 end - initLedTable(mRPMLedTable, state) + local state = 0 + if mSpdLimitMethod == 6 then state = 1 end + initLedTable(mRPMLedTable, state) - if not mSpdLmtRPMLedOnly then - SetWarnLed(mSpeedLimiterLED, 0) - end - end - SetRPMLed("mRPMLedTable") + if not mSpdLmtRPMLedOnly then + SetWarnLed(mSpeedLimiterLED, 0) + end + end + SetRPMLed("mRPMLedTable") else - return 1 + return 1 end -- timebase if GetTicks() > mOldTickCount then - mOldTickCount = GetTicks() + 20 + mOldTickCount = GetTicks() + 20 end return 1 end @@ -258,9 +258,9 @@ function spdLmtG27MethodEvent(idx) -- check if initialized if isGlobalInitialized == 0 then - isGlobalInitialized = 1 - -- init them - InitGlobals() + isGlobalInitialized = 1 + -- init them + InitGlobals() end -- get global prefs GetSLIMaxInfo() @@ -269,58 +269,58 @@ function spdLmtG27MethodEvent(idx) mG27Leds = 0 if mNoBlink or mSpdLimitG27Method == 0 then - -- speedlimiter led NOT blinking - mG27Leds = 0x1F + -- speedlimiter led NOT blinking + mG27Leds = 0x1F elseif mSpdLimitG27Method == 1 then - -- speedlimiter led blinking, method 1 - if GetTicks() > mOldTickCount then - mSpdLmtBlink = mSpdLmtBlink + 1 - end + -- speedlimiter led blinking, method 1 + if GetTicks() > mOldTickCount then + mSpdLmtBlink = mSpdLmtBlink + 1 + end - if mSpdLmtBlink >= mBlinkTime then - mSpdLmtBlink = 0 - end + if mSpdLmtBlink >= mBlinkTime then + mSpdLmtBlink = 0 + end - if mSpdLmtBlink <= (mBlinkTime / 2) then + if mSpdLmtBlink <= (mBlinkTime / 2) then - mG27Leds = 0x1F - end + mG27Leds = 0x1F + end - if mSpdLmtBlink > (mBlinkTime / 2) then + if mSpdLmtBlink > (mBlinkTime / 2) then - mG27Leds = 0 - end + mG27Leds = 0 + end elseif mSpdLimitG27Method >= 2 then - -- speedlimiter alternate led blinking, method 2 to n - if GetTicks() > mOldTickCount then - mSpdLmtBlink = mSpdLmtBlink + 1 - end + -- speedlimiter alternate led blinking, method 2 to n + if GetTicks() > mOldTickCount then + mSpdLmtBlink = mSpdLmtBlink + 1 + end - if mSpdLmtBlink >= mBlinkTime then - mSpdLmtBlink = 0 - end + if mSpdLmtBlink >= mBlinkTime then + mSpdLmtBlink = 0 + end - if mSpdLmtBlink <= (mBlinkTime / 2) then + if mSpdLmtBlink <= (mBlinkTime / 2) then - mG27Leds = 0x0A - end + mG27Leds = 0x0A + end - if mSpdLmtBlink > (mBlinkTime / 2) then + if mSpdLmtBlink > (mBlinkTime / 2) then - mG27Leds = 0x15 - end + mG27Leds = 0x15 + end else - return 1 + return 1 end SetG27Led(mG27Leds) -- timebase if GetTicks() > mOldTickCount then - mOldTickCount = GetTicks() + 20 + mOldTickCount = GetTicks() + 20 end return 1 end @@ -348,9 +348,9 @@ function spdLmtFanatecMethodEvent(idx) -- check if initialized if isGlobalInitialized == 0 then - isGlobalInitialized = 1 - -- init them - InitGlobals() + isGlobalInitialized = 1 + -- init them + InitGlobals() end -- get global prefs GetSLIMaxInfo() @@ -360,191 +360,191 @@ function spdLmtFanatecMethodEvent(idx) SetRPMLed("mRPMLedTable") if mNoBlink or mSpdLimitFanatecMethod == 0 then - -- speedlimiter first rpm led NOT blinking - SetFanatecDigitsAllowed(true) - mRPMLedTable["RPM0"]= 1 - SetRPMLed("mRPMLedTable") - if mLimiterChar then - SetFanatecDigitsAllowed(false) - SetFanatecDigits( " L " ) - oldGear = 110 - else - SetFanatecDigitsAllowed(true) - end + -- speedlimiter first rpm led NOT blinking + SetFanatecDigitsAllowed(true) + mRPMLedTable["RPM0"]= 1 + SetRPMLed("mRPMLedTable") + if mLimiterChar then + SetFanatecDigitsAllowed(false) + SetFanatecDigits( " L " ) + oldGear = 110 + else + SetFanatecDigitsAllowed(true) + end elseif mSpdLimitFanatecMethod == 1 then - -- speedlimiter first rpm led blinking - if GetTicks() > mOldTickCount then - mSpdLmtBlink = mSpdLmtBlink + 1 - end - if mSpdLmtBlink >= mBlinkTime then - mSpdLmtBlink = 0 - end - - if mSpdLmtBlink <= (mBlinkTime / 2) then - -- one led - mRPMLedTable["RPM0"]= 1 - - if mLimiterChar then - SetFanatecDigitsAllowed(false) - SetFanatecDigits( " L " ) - oldGear = 110 - end - end - - if mSpdLmtBlink > (mBlinkTime / 2) then - mRPMLedTable["RPM0"]= 0 - if mLimiterChar then - oldGear = 110 - SetFanatecDigitsAllowed(true) - end - end - SetRPMLed("mRPMLedTable") + -- speedlimiter first rpm led blinking + if GetTicks() > mOldTickCount then + mSpdLmtBlink = mSpdLmtBlink + 1 + end + if mSpdLmtBlink >= mBlinkTime then + mSpdLmtBlink = 0 + end + + if mSpdLmtBlink <= (mBlinkTime / 2) then + -- one led + mRPMLedTable["RPM0"]= 1 + + if mLimiterChar then + SetFanatecDigitsAllowed(false) + SetFanatecDigits( " L " ) + oldGear = 110 + end + end + + if mSpdLmtBlink > (mBlinkTime / 2) then + mRPMLedTable["RPM0"]= 0 + if mLimiterChar then + oldGear = 110 + SetFanatecDigitsAllowed(true) + end + end + SetRPMLed("mRPMLedTable") elseif mSpdLimitFanatecMethod == 2 then - -- speedlimiter all rpm led blinking - if GetTicks() > mOldTickCount then - mSpdLmtBlink = mSpdLmtBlink + 1 - end - if mSpdLmtBlink >= mBlinkTime then - mSpdLmtBlink = 0 - end - if mSpdLmtBlink <= (mBlinkTime / 2) then - initLedTable(mRPMLedTable, 1) - - if mLimiterChar then - SetFanatecDigitsAllowed(false) - SetFanatecDigits( " L " ) - oldGear = 110 - end - end - - if mSpdLmtBlink > (mBlinkTime / 2) then - initLedTable(mRPMLedTable, 0) - - if mLimiterChar then - oldGear = 110 - SetFanatecDigitsAllowed(true) - end - end - SetRPMLed("mRPMLedTable") + -- speedlimiter all rpm led blinking + if GetTicks() > mOldTickCount then + mSpdLmtBlink = mSpdLmtBlink + 1 + end + if mSpdLmtBlink >= mBlinkTime then + mSpdLmtBlink = 0 + end + if mSpdLmtBlink <= (mBlinkTime / 2) then + initLedTable(mRPMLedTable, 1) + + if mLimiterChar then + SetFanatecDigitsAllowed(false) + SetFanatecDigits( " L " ) + oldGear = 110 + end + end + + if mSpdLmtBlink > (mBlinkTime / 2) then + initLedTable(mRPMLedTable, 0) + + if mLimiterChar then + oldGear = 110 + SetFanatecDigitsAllowed(true) + end + end + SetRPMLed("mRPMLedTable") elseif mSpdLimitFanatecMethod == 3 or mSpdLimitFanatecMethod > 6 then - -- speedlimiter alternate RPM blinking - if GetTicks() > mOldTickCount then - mSpdLmtBlink = mSpdLmtBlink + 1 - end - if mSpdLmtBlink >= mBlinkTime then - mSpdLmtBlink = 0 - end - if mSpdLmtBlink <= (mBlinkTime / 2) then - - for i = 0,8 do - led = led.format("RPM%d",i) - if (i % 2)==0 then - mRPMLedTable[led] = 1 - else - mRPMLedTable[led] = 0 - end - end - SetFanatecDigitsAllowed(false) - if mLimiterChar then - SetFanatecDigits( " L " ) - oldGear = 110 - else - SetFanatecDigits( "---" ) - end - end - - if mSpdLmtBlink > (mBlinkTime / 2) then - for i = 0,8 do - led = led.format("RPM%d",i) - if (i % 2)==0 then - mRPMLedTable[led] = 0 - else - mRPMLedTable[led] = 1 - end - end - - SetFanatecDigitsAllowed(true) - end - SetRPMLed("mRPMLedTable") + -- speedlimiter alternate RPM blinking + if GetTicks() > mOldTickCount then + mSpdLmtBlink = mSpdLmtBlink + 1 + end + if mSpdLmtBlink >= mBlinkTime then + mSpdLmtBlink = 0 + end + if mSpdLmtBlink <= (mBlinkTime / 2) then + + for i = 0,8 do + led = led.format("RPM%d",i) + if (i % 2)==0 then + mRPMLedTable[led] = 1 + else + mRPMLedTable[led] = 0 + end + end + SetFanatecDigitsAllowed(false) + if mLimiterChar then + SetFanatecDigits( " L " ) + oldGear = 110 + else + SetFanatecDigits( "---" ) + end + end + + if mSpdLmtBlink > (mBlinkTime / 2) then + for i = 0,8 do + led = led.format("RPM%d",i) + if (i % 2)==0 then + mRPMLedTable[led] = 0 + else + mRPMLedTable[led] = 1 + end + end + + SetFanatecDigitsAllowed(true) + end + SetRPMLed("mRPMLedTable") elseif mSpdLimitFanatecMethod == 4 or mSpdLimitFanatecMethod == 5 then - -- speedlimiter no led digits only - if GetTicks() > mOldTickCount then - mSpdLmtBlink = mSpdLmtBlink + 1 - end - - if mSpdLmtBlink >= mBlinkTime then - mSpdLmtBlink = 0 - end - - if mSpdLmtBlink <= (mBlinkTime / 2) then - initLedTable(mRPMLedTable, 0) - - if mLimiterChar then - SetFanatecDigitsAllowed(false) - SetFanatecDigits( " L " ) - oldGear = 110 - else - SetFanatecDigitsAllowed(false) - SetFanatecDigits( "---" ) - end - end - - if mSpdLmtBlink > (mBlinkTime / 2) then - - if mSpdLimitFanatecMethod == 4 then - SetFanatecDigitsAllowed(true) - else - SetFanatecDigitsAllowed(false) - SetFanatecDigits( " " ) - end - - initLedTable(mRPMLedTable, 0) - end - SetRPMLed("mRPMLedTable") + -- speedlimiter no led digits only + if GetTicks() > mOldTickCount then + mSpdLmtBlink = mSpdLmtBlink + 1 + end + + if mSpdLmtBlink >= mBlinkTime then + mSpdLmtBlink = 0 + end + + if mSpdLmtBlink <= (mBlinkTime / 2) then + initLedTable(mRPMLedTable, 0) + + if mLimiterChar then + SetFanatecDigitsAllowed(false) + SetFanatecDigits( " L " ) + oldGear = 110 + else + SetFanatecDigitsAllowed(false) + SetFanatecDigits( "---" ) + end + end + + if mSpdLmtBlink > (mBlinkTime / 2) then + + if mSpdLimitFanatecMethod == 4 then + SetFanatecDigitsAllowed(true) + else + SetFanatecDigitsAllowed(false) + SetFanatecDigits( " " ) + end + + initLedTable(mRPMLedTable, 0) + end + SetRPMLed("mRPMLedTable") elseif mSpdLimitFanatecMethod == 6 then - -- speedlimiter freezed rpm + digits blinking - if GetTicks() > mOldTickCount then - mSpdLmtBlink = mSpdLmtBlink + 1 - end + -- speedlimiter freezed rpm + digits blinking + if GetTicks() > mOldTickCount then + mSpdLmtBlink = mSpdLmtBlink + 1 + end - if mSpdLmtBlink >= mBlinkTime then - mSpdLmtBlink = 0 - end + if mSpdLmtBlink >= mBlinkTime then + mSpdLmtBlink = 0 + end - if mSpdLmtBlink <= (mBlinkTime / 2) then - initLedTable(mRPMLedTable, 1) + if mSpdLmtBlink <= (mBlinkTime / 2) then + initLedTable(mRPMLedTable, 1) - if mLimiterChar then - SetFanatecDigitsAllowed(false) - SetFanatecDigits( " L " ) - oldGear = 110 - else - SetFanatecDigitsAllowed(true) - end - end + if mLimiterChar then + SetFanatecDigitsAllowed(false) + SetFanatecDigits( " L " ) + oldGear = 110 + else + SetFanatecDigitsAllowed(true) + end + end - if mSpdLmtBlink > (mBlinkTime / 2) then + if mSpdLmtBlink > (mBlinkTime / 2) then - SetFanatecDigitsAllowed(false) - SetFanatecDigits( " " ) + SetFanatecDigitsAllowed(false) + SetFanatecDigits( " " ) - initLedTable(mRPMLedTable, 1) - end - SetRPMLed("mRPMLedTable") + initLedTable(mRPMLedTable, 1) + end + SetRPMLed("mRPMLedTable") else - return 1 + return 1 end -- timebase if GetTicks() > mOldTickCount then - mOldTickCount = GetTicks() + 20 + mOldTickCount = GetTicks() + 20 end return 1 end @@ -572,9 +572,9 @@ function spdLmtSRDlxMethodEvent(idx) -- check if initialized if isGlobalInitialized == 0 then - isGlobalInitialized = 1 - -- init them - InitGlobals() + isGlobalInitialized = 1 + -- init them + InitGlobals() end -- get global prefs GetSLIMaxInfo() @@ -584,200 +584,200 @@ function spdLmtSRDlxMethodEvent(idx) SetRPMLed("mRPMLedTable") if mNoBlink or (mSpdLimitSRDlxMethod == 0) then - -- speedlimiter led NOT blinking - SetWarnLed(mSpeedLimiterLED, 1) + -- speedlimiter led NOT blinking + SetWarnLed(mSpeedLimiterLED, 1) elseif mSpdLimitSRDlxMethod == 1 then - -- speedlimiter led blinking, method 1 - if GetTicks() > mOldTickCount then - mSpdLmtBlink = mSpdLmtBlink + 1 - end + -- speedlimiter led blinking, method 1 + if GetTicks() > mOldTickCount then + mSpdLmtBlink = mSpdLmtBlink + 1 + end - if mSpdLmtBlink >= mBlinkTime then - mSpdLmtBlink = 0 - end + if mSpdLmtBlink >= mBlinkTime then + mSpdLmtBlink = 0 + end - if mSpdLmtBlink <= (mBlinkTime / 2) then - if mLimiterChar then SetGearDigit("L") end - SetWarnLed(mSpeedLimiterLED, 1) - end + if mSpdLmtBlink <= (mBlinkTime / 2) then + if mLimiterChar then SetGearDigit("L") end + SetWarnLed(mSpeedLimiterLED, 1) + end - if mSpdLmtBlink > (mBlinkTime / 2) then - if mLimiterChar then SetGearDigit(" ") end - SetWarnLed(mSpeedLimiterLED, 0) - end + if mSpdLmtBlink > (mBlinkTime / 2) then + if mLimiterChar then SetGearDigit(" ") end + SetWarnLed(mSpeedLimiterLED, 0) + end elseif mSpdLimitSRDlxMethod == 2 then - -- speedlimiter led + RPM blinking, method 2 - if GetTicks() > mOldTickCount then - mSpdLmtBlink = mSpdLmtBlink + 1 - end - - if mSpdLmtBlink >= mBlinkTime then - mSpdLmtBlink = 0 - end - - if mSpdLmtBlink <= (mBlinkTime / 2) then - if mLimiterChar then SetGearDigit("L") end - initLedTable(mRPMLedTable, 1) - if not mSpdLmtRPMLedOnly then - SetWarnLed(mSpeedLimiterLED, 1) - end - end - - if mSpdLmtBlink > (mBlinkTime / 2) then - if mLimiterChar then SetGearDigit(" ") end - initLedTable(mRPMLedTable, 0) - if not mSpdLmtRPMLedOnly then - SetWarnLed(mSpeedLimiterLED, 0) - end - end - SetRPMLed("mRPMLedTable") + -- speedlimiter led + RPM blinking, method 2 + if GetTicks() > mOldTickCount then + mSpdLmtBlink = mSpdLmtBlink + 1 + end + + if mSpdLmtBlink >= mBlinkTime then + mSpdLmtBlink = 0 + end + + if mSpdLmtBlink <= (mBlinkTime / 2) then + if mLimiterChar then SetGearDigit("L") end + initLedTable(mRPMLedTable, 1) + if not mSpdLmtRPMLedOnly then + SetWarnLed(mSpeedLimiterLED, 1) + end + end + + if mSpdLmtBlink > (mBlinkTime / 2) then + if mLimiterChar then SetGearDigit(" ") end + initLedTable(mRPMLedTable, 0) + if not mSpdLmtRPMLedOnly then + SetWarnLed(mSpeedLimiterLED, 0) + end + end + SetRPMLed("mRPMLedTable") elseif mSpdLimitSRDlxMethod == 3 then - -- speedlimiter led + alternate RPM blinking, method 3 - if GetTicks() > mOldTickCount then - mSpdLmtBlink = mSpdLmtBlink + 1 - end - if mSpdLmtBlink >= mBlinkTime then - mSpdLmtBlink = 0 - end - if mSpdLmtBlink <= (mBlinkTime / 2) then - if mLimiterChar then - SetGearDigit("L") - end - for i = 0,12 do - led = led.format("RPM%d",i) - if (i % 2)==0 then - mRPMLedTable[led] = 1 - else - mRPMLedTable[led] = 0 - end - end - if not mSpdLmtRPMLedOnly then - SetWarnLed(mSpeedLimiterLED, 1) - end - end - - if mSpdLmtBlink > (mBlinkTime / 2) then - if mLimiterChar then - SetGearDigit(" ") - end - for i = 0,13 do - led = led.format("RPM%d",i) - if (i % 2)==0 then - mRPMLedTable[led] = 0 - else - mRPMLedTable[led] = 1 - end - end - if not mSpdLmtRPMLedOnly then - SetWarnLed(mSpeedLimiterLED, 0) - end - end - SetRPMLed("mRPMLedTable") + -- speedlimiter led + alternate RPM blinking, method 3 + if GetTicks() > mOldTickCount then + mSpdLmtBlink = mSpdLmtBlink + 1 + end + if mSpdLmtBlink >= mBlinkTime then + mSpdLmtBlink = 0 + end + if mSpdLmtBlink <= (mBlinkTime / 2) then + if mLimiterChar then + SetGearDigit("L") + end + for i = 0,12 do + led = led.format("RPM%d",i) + if (i % 2)==0 then + mRPMLedTable[led] = 1 + else + mRPMLedTable[led] = 0 + end + end + if not mSpdLmtRPMLedOnly then + SetWarnLed(mSpeedLimiterLED, 1) + end + end + + if mSpdLmtBlink > (mBlinkTime / 2) then + if mLimiterChar then + SetGearDigit(" ") + end + for i = 0,13 do + led = led.format("RPM%d",i) + if (i % 2)==0 then + mRPMLedTable[led] = 0 + else + mRPMLedTable[led] = 1 + end + end + if not mSpdLmtRPMLedOnly then + SetWarnLed(mSpeedLimiterLED, 0) + end + end + SetRPMLed("mRPMLedTable") elseif mSpdLimitSRDlxMethod == 4 then - -- speedlimiter led + RPM + digits blinking, method 4 - if GetTicks() > mOldTickCount then - mSpdLmtBlink = mSpdLmtBlink + 1 - end - - if mSpdLmtBlink >= mBlinkTime then - mSpdLmtBlink = 0 - end - - if mSpdLmtBlink <= (mBlinkTime / 2) then - - if mLimiterChar then SetGearDigit("L") end - SetDigitsAllowed(true) - - for i = 0,2 do - led = led.format("RPM%d",i) - mRPMLedTable[led] = 0 - end - for i = 10,12 do - led = led.format("RPM%d",i) - mRPMLedTable[led] = 0 - end - - if not mSpdLmtRPMLedOnly then - SetWarnLed(mSpeedLimiterLED, 0) - end - end - - if mSpdLmtBlink > (mBlinkTime / 2) then - if mLimiterChar then SetGearDigit(" ") end - - SetDigitsAllowed(false) - - SetLeftDigits (mLeftSpdLmtText) - SetRightDigits (mRightSpdLmtText) - - for i = 0,2 do - led = led.format("RPM%d",i) - mRPMLedTable[led] = 1 - end - for i = 10,12 do - led = led.format("RPM%d",i) - mRPMLedTable[led] = 1 - end - if not mSpdLmtRPMLedOnly then - SetWarnLed(mSpeedLimiterLED, 0) - end - end - SetRPMLed("mRPMLedTable") + -- speedlimiter led + RPM + digits blinking, method 4 + if GetTicks() > mOldTickCount then + mSpdLmtBlink = mSpdLmtBlink + 1 + end + + if mSpdLmtBlink >= mBlinkTime then + mSpdLmtBlink = 0 + end + + if mSpdLmtBlink <= (mBlinkTime / 2) then + + if mLimiterChar then SetGearDigit("L") end + SetDigitsAllowed(true) + + for i = 0,2 do + led = led.format("RPM%d",i) + mRPMLedTable[led] = 0 + end + for i = 10,12 do + led = led.format("RPM%d",i) + mRPMLedTable[led] = 0 + end + + if not mSpdLmtRPMLedOnly then + SetWarnLed(mSpeedLimiterLED, 0) + end + end + + if mSpdLmtBlink > (mBlinkTime / 2) then + if mLimiterChar then SetGearDigit(" ") end + + SetDigitsAllowed(false) + + SetLeftDigits (mLeftSpdLmtText) + SetRightDigits (mRightSpdLmtText) + + for i = 0,2 do + led = led.format("RPM%d",i) + mRPMLedTable[led] = 1 + end + for i = 10,12 do + led = led.format("RPM%d",i) + mRPMLedTable[led] = 1 + end + if not mSpdLmtRPMLedOnly then + SetWarnLed(mSpeedLimiterLED, 0) + end + end + SetRPMLed("mRPMLedTable") elseif mSpdLimitSRDlxMethod == 5 or mSpdLimitSRDlxMethod == 6 then - -- speedlimiter led + digits blinking, method 5 - -- speedlimiter led + RPM fixed + Digits blinking, method 6 - if GetTicks() > mOldTickCount then - mSpdLmtBlink = mSpdLmtBlink + 1 - end + -- speedlimiter led + digits blinking, method 5 + -- speedlimiter led + RPM fixed + Digits blinking, method 6 + if GetTicks() > mOldTickCount then + mSpdLmtBlink = mSpdLmtBlink + 1 + end - if mSpdLmtBlink >= mBlinkTime then - mSpdLmtBlink = 0 - end + if mSpdLmtBlink >= mBlinkTime then + mSpdLmtBlink = 0 + end - if mSpdLmtBlink <= (mBlinkTime / 2) then - if mLimiterChar then SetGearDigit("L") end + if mSpdLmtBlink <= (mBlinkTime / 2) then + if mLimiterChar then SetGearDigit("L") end - SetDigitsAllowed (true) + SetDigitsAllowed (true) - local state = 0 - if mSpdLimitSRDlxMethod == 6 then state = 1 end - initLedTable(mRPMLedTable, state) + local state = 0 + if mSpdLimitSRDlxMethod == 6 then state = 1 end + initLedTable(mRPMLedTable, state) - if not mSpdLmtRPMLedOnly then - SetWarnLed(mSpeedLimiterLED, 0) - end - end + if not mSpdLmtRPMLedOnly then + SetWarnLed(mSpeedLimiterLED, 0) + end + end - if mSpdLmtBlink > (mBlinkTime / 2) then - if mLimiterChar then SetGearDigit(" ") end + if mSpdLmtBlink > (mBlinkTime / 2) then + if mLimiterChar then SetGearDigit(" ") end - SetLeftDigits ( mLeftSpdLmtText) - SetRightDigits ( mRightSpdLmtText) + SetLeftDigits ( mLeftSpdLmtText) + SetRightDigits ( mRightSpdLmtText) - SetDigitsAllowed(false) + SetDigitsAllowed(false) - local state = 0 - if mSpdLimitSRDlxMethod == 6 then state = 1 end - initLedTable(mRPMLedTable, state) + local state = 0 + if mSpdLimitSRDlxMethod == 6 then state = 1 end + initLedTable(mRPMLedTable, state) - if not mSpdLmtRPMLedOnly then - SetWarnLed(mSpeedLimiterLED, 0) - end - end - SetRPMLed("mRPMLedTable") + if not mSpdLmtRPMLedOnly then + SetWarnLed(mSpeedLimiterLED, 0) + end + end + SetRPMLed("mRPMLedTable") else - return 1 + return 1 end -- timebase if GetTicks() > mOldTickCount then - mOldTickCount = GetTicks() + 20 + mOldTickCount = GetTicks() + 20 end return 1 end @@ -804,9 +804,9 @@ function spdLmtSRF1MethodEvent(idx) -- check if initialized if isGlobalInitialized == 0 then - isGlobalInitialized = 1 - -- init them - InitGlobals() + isGlobalInitialized = 1 + -- init them + InitGlobals() end -- get global prefs GetSLIMaxInfo() @@ -816,201 +816,201 @@ function spdLmtSRF1MethodEvent(idx) SetRPMLed("mRPMLedTable") if mNoBlink or (mSpdLimitSRF1Method == 0) then - -- speedlimiter led NOT blinking - SetWarnLed(mSpeedLimiterLED, 1) + -- speedlimiter led NOT blinking + SetWarnLed(mSpeedLimiterLED, 1) elseif mSpdLimitSRF1Method == 1 then - -- speedlimiter led blinking, method 1 - if GetTicks() > mOldTickCount then - mSpdLmtBlink = mSpdLmtBlink + 1 - end + -- speedlimiter led blinking, method 1 + if GetTicks() > mOldTickCount then + mSpdLmtBlink = mSpdLmtBlink + 1 + end - if mSpdLmtBlink >= mBlinkTime then - mSpdLmtBlink = 0 - end + if mSpdLmtBlink >= mBlinkTime then + mSpdLmtBlink = 0 + end - if mSpdLmtBlink <= (mBlinkTime / 2) then - if mLimiterChar then SetGearDigit("L") end - SetWarnLed(mSpeedLimiterLED, 1) - end + if mSpdLmtBlink <= (mBlinkTime / 2) then + if mLimiterChar then SetGearDigit("L") end + SetWarnLed(mSpeedLimiterLED, 1) + end - if mSpdLmtBlink > (mBlinkTime / 2) then - if mLimiterChar then SetGearDigit(" ") end - SetWarnLed(mSpeedLimiterLED, 0) - end + if mSpdLmtBlink > (mBlinkTime / 2) then + if mLimiterChar then SetGearDigit(" ") end + SetWarnLed(mSpeedLimiterLED, 0) + end elseif mSpdLimitSRF1Method == 2 then - -- speedlimiter led + RPM blinking, method 2 - if GetTicks() > mOldTickCount then - mSpdLmtBlink = mSpdLmtBlink + 1 - end - - if mSpdLmtBlink >= mBlinkTime then - mSpdLmtBlink = 0 - end - - if mSpdLmtBlink <= (mBlinkTime / 2) then - if mLimiterChar then SetGearDigit("L") end - initLedTable(mRPMLedTable, 1) - if not mSpdLmtRPMLedOnly then - SetWarnLed(mSpeedLimiterLED, 1) - end - end - - if mSpdLmtBlink > (mBlinkTime / 2) then - if mLimiterChar then SetGearDigit(" ") end - initLedTable(mRPMLedTable, 0) - if not mSpdLmtRPMLedOnly then - SetWarnLed(mSpeedLimiterLED, 0) - end - end - SetRPMLed("mRPMLedTable") + -- speedlimiter led + RPM blinking, method 2 + if GetTicks() > mOldTickCount then + mSpdLmtBlink = mSpdLmtBlink + 1 + end + + if mSpdLmtBlink >= mBlinkTime then + mSpdLmtBlink = 0 + end + + if mSpdLmtBlink <= (mBlinkTime / 2) then + if mLimiterChar then SetGearDigit("L") end + initLedTable(mRPMLedTable, 1) + if not mSpdLmtRPMLedOnly then + SetWarnLed(mSpeedLimiterLED, 1) + end + end + + if mSpdLmtBlink > (mBlinkTime / 2) then + if mLimiterChar then SetGearDigit(" ") end + initLedTable(mRPMLedTable, 0) + if not mSpdLmtRPMLedOnly then + SetWarnLed(mSpeedLimiterLED, 0) + end + end + SetRPMLed("mRPMLedTable") elseif mSpdLimitSRF1Method == 3 then - -- speedlimiter led + alternate RPM blinking, method 3 - if GetTicks() > mOldTickCount then - mSpdLmtBlink = mSpdLmtBlink + 1 - end - if mSpdLmtBlink >= mBlinkTime then - mSpdLmtBlink = 0 - end - if mSpdLmtBlink <= (mBlinkTime / 2) then - if mLimiterChar then - SetGearDigit("L") - end - for i = 0,14 do - led = led.format("RPM%d",i) - if (i % 2)==0 then - mRPMLedTable[led] = 1 - else - mRPMLedTable[led] = 0 - end - end - if not mSpdLmtRPMLedOnly then - SetWarnLed(mSpeedLimiterLED, 1) - end - end - - if mSpdLmtBlink > (mBlinkTime / 2) then - if mLimiterChar then - SetGearDigit(" ") - end - for i = 0,15 do - led = led.format("RPM%d",i) - if (i % 2)==0 then - mRPMLedTable[led] = 0 - else - mRPMLedTable[led] = 1 - end - end - if not mSpdLmtRPMLedOnly then - SetWarnLed(mSpeedLimiterLED, 0) - end - end - SetRPMLed("mRPMLedTable") + -- speedlimiter led + alternate RPM blinking, method 3 + if GetTicks() > mOldTickCount then + mSpdLmtBlink = mSpdLmtBlink + 1 + end + if mSpdLmtBlink >= mBlinkTime then + mSpdLmtBlink = 0 + end + if mSpdLmtBlink <= (mBlinkTime / 2) then + if mLimiterChar then + SetGearDigit("L") + end + for i = 0,14 do + led = led.format("RPM%d",i) + if (i % 2)==0 then + mRPMLedTable[led] = 1 + else + mRPMLedTable[led] = 0 + end + end + if not mSpdLmtRPMLedOnly then + SetWarnLed(mSpeedLimiterLED, 1) + end + end + + if mSpdLmtBlink > (mBlinkTime / 2) then + if mLimiterChar then + SetGearDigit(" ") + end + for i = 0,15 do + led = led.format("RPM%d",i) + if (i % 2)==0 then + mRPMLedTable[led] = 0 + else + mRPMLedTable[led] = 1 + end + end + if not mSpdLmtRPMLedOnly then + SetWarnLed(mSpeedLimiterLED, 0) + end + end + SetRPMLed("mRPMLedTable") elseif mSpdLimitSRF1Method == 4 then - -- speedlimiter led + RPM + digits blinking, method 4 - if GetTicks() > mOldTickCount then - mSpdLmtBlink = mSpdLmtBlink + 1 - end - - if mSpdLmtBlink >= mBlinkTime then - mSpdLmtBlink = 0 - end - - if mSpdLmtBlink <= (mBlinkTime / 2) then - - if mLimiterChar then SetGearDigit("L") end - SetDigitsAllowed(true) - - for i = 0,4 do - led = led.format("RPM%d",i) - mRPMLedTable[led] = 0 - end - for i = 10,14 do - led = led.format("RPM%d",i) - mRPMLedTable[led] = 0 - end - - if not mSpdLmtRPMLedOnly then - SetWarnLed(mSpeedLimiterLED, 0) - end - end - - if mSpdLmtBlink > (mBlinkTime / 2) then - if mLimiterChar then SetGearDigit(" ") end - - SetDigitsAllowed(false) - - SetLeftDigits (mLeftSpdLmtText) - SetRightDigits (mRightSpdLmtText) - - for i = 0,4 do - led = led.format("RPM%d",i) - mRPMLedTable[led] = 1 - end - for i = 10,14 do - led = led.format("RPM%d",i) - mRPMLedTable[led] = 1 - end - if not mSpdLmtRPMLedOnly then - SetWarnLed(mSpeedLimiterLED, 0) - end - end - SetRPMLed("mRPMLedTable") + -- speedlimiter led + RPM + digits blinking, method 4 + if GetTicks() > mOldTickCount then + mSpdLmtBlink = mSpdLmtBlink + 1 + end + + if mSpdLmtBlink >= mBlinkTime then + mSpdLmtBlink = 0 + end + + if mSpdLmtBlink <= (mBlinkTime / 2) then + + if mLimiterChar then SetGearDigit("L") end + SetDigitsAllowed(true) + + for i = 0,4 do + led = led.format("RPM%d",i) + mRPMLedTable[led] = 0 + end + for i = 10,14 do + led = led.format("RPM%d",i) + mRPMLedTable[led] = 0 + end + + if not mSpdLmtRPMLedOnly then + SetWarnLed(mSpeedLimiterLED, 0) + end + end + + if mSpdLmtBlink > (mBlinkTime / 2) then + if mLimiterChar then SetGearDigit(" ") end + + SetDigitsAllowed(false) + + SetLeftDigits (mLeftSpdLmtText) + SetRightDigits (mRightSpdLmtText) + + for i = 0,4 do + led = led.format("RPM%d",i) + mRPMLedTable[led] = 1 + end + for i = 10,14 do + led = led.format("RPM%d",i) + mRPMLedTable[led] = 1 + end + if not mSpdLmtRPMLedOnly then + SetWarnLed(mSpeedLimiterLED, 0) + end + end + SetRPMLed("mRPMLedTable") elseif mSpdLimitSRF1Method == 5 or mSpdLimitSRF1Method == 6 then - -- speedlimiter led + digits blinking, method 5 - -- speedlimiter led + RPM fixed + Digits blinking, method 6 - if GetTicks() > mOldTickCount then - mSpdLmtBlink = mSpdLmtBlink + 1 - end + -- speedlimiter led + digits blinking, method 5 + -- speedlimiter led + RPM fixed + Digits blinking, method 6 + if GetTicks() > mOldTickCount then + mSpdLmtBlink = mSpdLmtBlink + 1 + end - if mSpdLmtBlink >= mBlinkTime then - mSpdLmtBlink = 0 - end + if mSpdLmtBlink >= mBlinkTime then + mSpdLmtBlink = 0 + end - if mSpdLmtBlink <= (mBlinkTime / 2) then - if mLimiterChar then SetGearDigit("L") end + if mSpdLmtBlink <= (mBlinkTime / 2) then + if mLimiterChar then SetGearDigit("L") end - SetDigitsAllowed (true) + SetDigitsAllowed (true) - local state = 0 - if mSpdLimitSRF1Method == 6 then state = 1 end - initLedTable(mRPMLedTable, state) + local state = 0 + if mSpdLimitSRF1Method == 6 then state = 1 end + initLedTable(mRPMLedTable, state) - if not mSpdLmtRPMLedOnly then - SetWarnLed(mSpeedLimiterLED, 0) - end - end + if not mSpdLmtRPMLedOnly then + SetWarnLed(mSpeedLimiterLED, 0) + end + end - if mSpdLmtBlink > (mBlinkTime / 2) then - if mLimiterChar then SetGearDigit(" ") end + if mSpdLmtBlink > (mBlinkTime / 2) then + if mLimiterChar then SetGearDigit(" ") end - SetLeftDigits ( mLeftSpdLmtText) - SetRightDigits ( mRightSpdLmtText) + SetLeftDigits ( mLeftSpdLmtText) + SetRightDigits ( mRightSpdLmtText) - SetDigitsAllowed(false) + SetDigitsAllowed(false) - local state = 0 - if mSpdLimitSRF1Method == 6 then state = 1 end - initLedTable(mRPMLedTable, state) + local state = 0 + if mSpdLimitSRF1Method == 6 then state = 1 end + initLedTable(mRPMLedTable, state) - if not mSpdLmtRPMLedOnly then - SetWarnLed(mSpeedLimiterLED, 0) - end - end - SetRPMLed("mRPMLedTable") + if not mSpdLmtRPMLedOnly then + SetWarnLed(mSpeedLimiterLED, 0) + end + end + SetRPMLed("mRPMLedTable") else - return 1 + return 1 end -- timebase if GetTicks() > mOldTickCount then - mOldTickCount = GetTicks() + 20 + mOldTickCount = GetTicks() + 20 end return 1 -end +end \ No newline at end of file -- cgit v1.2.3