s-d-a/DCS-ExportScripts
1
0
Fork 0
mirror of https://github.com/s-d-a/DCS-ExportScripts.git synced 2025-10-29 16:59:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Error correction of genericRadio function.

Browse Source 
PresetChannelFrequency, PresetChannel, Frequency no longer display values when the radio is off.
This commit is contained in:
mcmicha 2017-12-30 18:05:34 +01:00
parent fc17982b01
commit a894ff698f
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Scripts/DCS-ExportScript/lib/genericRadio.lua
View File

@ -104,17 +104,17 @@ function ExportScript.genericRadio(key, value)
lPower = tonumber(value) lPower = tonumber(value)
end end
local lPresetChannelFrequency = "" -- ID 3000 local lPresetChannelFrequency = "-" -- ID 3000
local lPresetChannel = "" -- ID 3001 local lPresetChannel = "-" -- ID 3001
local lFrequency = "" -- ID 3002 local lFrequency = "-" -- ID 3002
if ExportScript.AF.genericRadio == 0 or ExportScript.AF.genericRadio > ExportScript.genericRadioConf['maxRadios'] then if ExportScript.AF.genericRadio == 0 or ExportScript.AF.genericRadio > ExportScript.genericRadioConf['maxRadios'] then
if ExportScript.AF.genericRadio ~= 0 then if ExportScript.AF.genericRadio ~= 0 then
ExportScript.Tools.WriteToLog("Radio Nr. "..ExportScript.AF.genericRadio.." not defined.") ExportScript.Tools.WriteToLog("Radio Nr. "..ExportScript.AF.genericRadio.." not defined.")
end end
ExportScript.Tools.SendDataDAC("3000", "") ExportScript.Tools.SendDataDAC("3000", lPresetChannelFrequency)
ExportScript.Tools.SendDataDAC("3001", "") ExportScript.Tools.SendDataDAC("3001", lPresetChannel)
ExportScript.Tools.SendDataDAC("3002", "") ExportScript.Tools.SendDataDAC("3002", lFrequency)
ExportScript.Tools.SendDataDAC("3010", 0) ExportScript.Tools.SendDataDAC("3010", 0)
ExportScript.Tools.SendDataDAC("3011", 0) ExportScript.Tools.SendDataDAC("3011", 0)
ExportScript.Tools.SendDataDAC("3012", 0) ExportScript.Tools.SendDataDAC("3012", 0)
@ -158,7 +158,9 @@ function ExportScript.genericRadio(key, value)
if lRADIO:is_on() then if lRADIO:is_on() then
if ExportScript.genericRadioConf[ExportScript.AF.genericRadio]['Preset'] ~= nil then if ExportScript.genericRadioConf[ExportScript.AF.genericRadio]['Preset'] ~= nil then
lPresetChannel = string.format("%s", ExportScript.genericRadioConf[ExportScript.AF.genericRadio]['Preset']['List'][ExportScript.Tools.round(lMainPanelDevice:get_argument_value(ExportScript.genericRadioConf[ExportScript.AF.genericRadio]['Preset']['ArgumentID']), 2)]) --lPresetChannel = string.format("%s", ExportScript.genericRadioConf[ExportScript.AF.genericRadio]['Preset']['List'][ExportScript.Tools.round(lMainPanelDevice:get_argument_value(ExportScript.genericRadioConf[ExportScript.AF.genericRadio]['Preset']['ArgumentID']), 2)])
--ExportScript.Tools.WriteToLog('Preset index: '..ExportScript.Tools.dump(ExportScript.Tools.round(lMainPanelDevice:get_argument_value(ExportScript.genericRadioConf[ExportScript.AF.genericRadio]['Preset']['ArgumentID']), string.match(string.reverse(ExportScript.genericRadioConf[ExportScript.AF.genericRadio]['Preset']['Step']), '.'))))
lPresetChannel = string.format("%s", ExportScript.genericRadioConf[ExportScript.AF.genericRadio]['Preset']['List'][ExportScript.Tools.round(lMainPanelDevice:get_argument_value(ExportScript.genericRadioConf[ExportScript.AF.genericRadio]['Preset']['ArgumentID']), string.match(string.reverse(ExportScript.genericRadioConf[ExportScript.AF.genericRadio]['Preset']['Step']), '.'))])
end end
lFrequency = ExportScript.Tools.round(lRADIO:get_frequency()/ExportScript.genericRadioConf[ExportScript.AF.genericRadio]['FrequencyMultiplicator'] , 3, "floor") lFrequency = ExportScript.Tools.round(lRADIO:get_frequency()/ExportScript.genericRadioConf[ExportScript.AF.genericRadio]['FrequencyMultiplicator'] , 3, "floor")
@ -166,6 +168,7 @@ function ExportScript.genericRadio(key, value)
lPresetChannelFrequency = string.format("%s%s", lPresetChannel, lFrequency) lPresetChannelFrequency = string.format("%s%s", lPresetChannel, lFrequency)
lPresetChannelFrequency = lPresetChannelFrequency:gsub(" ", "0") lPresetChannelFrequency = lPresetChannelFrequency:gsub(" ", "0")
lPresetChannelFrequency = lPresetChannelFrequency:gsub("-", "")
--ExportScript.Tools.WriteToLog('lPresetChannel: '..ExportScript.Tools.dump(lPresetChannel)) --ExportScript.Tools.WriteToLog('lPresetChannel: '..ExportScript.Tools.dump(lPresetChannel))
--ExportScript.Tools.WriteToLog('lFrequency: '..ExportScript.Tools.dump(lFrequency)) --ExportScript.Tools.WriteToLog('lFrequency: '..ExportScript.Tools.dump(lFrequency))
--ExportScript.Tools.WriteToLog('lPresetChannelFrequency: '..ExportScript.Tools.dump(lPresetChannelFrequency)) --ExportScript.Tools.WriteToLog('lPresetChannelFrequency: '..ExportScript.Tools.dump(lPresetChannelFrequency))
@ -351,7 +354,7 @@ function ExportScript.genericRadio(key, value)
end end
end end
if ExportScript.genericRadioConf[ExportScript.AF.genericRadio]['ManualPreset'] ~= nil then if ExportScript.genericRadioConf[ExportScript.AF.genericRadio]['Power'] ~= nil then
if lPower ~= nil and (lPower == 0.0 or lPower <= 1.0) then if lPower ~= nil and (lPower == 0.0 or lPower <= 1.0) then
if lPower == 1.0 and ExportScript.AF.genericRadioPower[ExportScript.AF.genericRadio] == 1.0 then if lPower == 1.0 and ExportScript.AF.genericRadioPower[ExportScript.AF.genericRadio] == 1.0 then
-- Power off -- Power off