From ce6d14e6fda867e2df8c4c0932405b6661043fe2 Mon Sep 17 00:00:00 2001 From: Mark van Renswoude Date: Fri, 11 Aug 2017 09:32:30 +0200 Subject: [PATCH] Fixed flaps (handle percentage) function, copy-paste issue --- G940LEDControl/Forms/MainFrm.dfm | 8 +-- .../Scripts/FSX/controlsurfaces.lua | 49 ++++++++++++------- .../G940LEDControl.Scripts.sublime-project | 9 ++++ 3 files changed, 44 insertions(+), 22 deletions(-) create mode 100644 G940LEDControl/Scripts/G940LEDControl.Scripts.sublime-project diff --git a/G940LEDControl/Forms/MainFrm.dfm b/G940LEDControl/Forms/MainFrm.dfm index 637855c..70b89a6 100644 --- a/G940LEDControl/Forms/MainFrm.dfm +++ b/G940LEDControl/Forms/MainFrm.dfm @@ -1,7 +1,7 @@ object MainForm: TMainForm Left = 0 Top = 0 - ActiveControl = cmbProfiles + ActiveControl = cbCheckUpdates BorderIcons = [biSystemMenu, biMinimize] BorderStyle = bsSingle Caption = 'G940 LED Control' @@ -30,7 +30,7 @@ object MainForm: TMainForm Margins.Top = 8 Margins.Right = 8 Margins.Bottom = 8 - ActivePage = tsButtons + ActivePage = tsAbout Align = alClient TabOrder = 0 object tsButtons: TTabSheet @@ -559,9 +559,9 @@ object MainForm: TMainForm object lblCopyright: TLabel Left = 16 Top = 35 - Width = 95 + Width = 129 Height = 13 - Caption = #169' 2011 X'#178'Software' + Caption = #169' 2011 - 2017 X'#178'Software' end object lblWebsite: TLabel Left = 16 diff --git a/G940LEDControl/Scripts/FSX/controlsurfaces.lua b/G940LEDControl/Scripts/FSX/controlsurfaces.lua index 607ecac..e37b857 100644 --- a/G940LEDControl/Scripts/FSX/controlsurfaces.lua +++ b/G940LEDControl/Scripts/FSX/controlsurfaces.lua @@ -102,14 +102,16 @@ RegisterFunction( displayName = 'Flaps (handle position - percentage)', states = { ['notAvailable'] = { displayName = 'Not available', default = LEDColor.Off, order = 1 }, - ['0To10'] = { displayName = 'Position 0 (Up)', default = LEDColor.Green, order = 2 }, - ['1'] = { displayName = 'Position 1', default = LEDColor.Amber, order = 3 }, - ['2'] = { displayName = 'Position 2', default = LEDColor.Amber, order = 4 }, - ['3'] = { displayName = 'Position 3', default = LEDColor.Amber, order = 5 }, - ['4'] = { displayName = 'Position 4', default = LEDColor.Amber, order = 6 }, - ['5'] = { displayName = 'Position 5', default = LEDColor.Amber, order = 7 }, - ['6'] = { displayName = 'Position 6', default = LEDColor.Amber, order = 8 }, - ['7'] = { displayName = 'Position 7', default = LEDColor.Amber, order = 9 }, + ['0To10'] = { displayName = '0% - 10%', default = LEDColor.Green, order = 2 }, + ['10To20'] = { displayName = '10% - 20%', default = LEDColor.Amber, order = 3 }, + ['20To30'] = { displayName = '20% - 30%', default = LEDColor.Amber, order = 4 }, + ['30To40'] = { displayName = '30% - 40%', default = LEDColor.Amber, order = 5 }, + ['40To50'] = { displayName = '40% - 50%', default = LEDColor.Amber, order = 6 }, + ['50To60'] = { displayName = '50% - 60%', default = LEDColor.Amber, order = 7 }, + ['60To70'] = { displayName = '60% - 70%', default = LEDColor.Amber, order = 8 }, + ['70To80'] = { displayName = '70% - 80%', default = LEDColor.Amber, order = 9 }, + ['80To90'] = { displayName = '80% - 90%', default = LEDColor.Amber, order = 9 }, + ['90To100'] = { displayName = '90% - 100%', default = LEDColor.Amber, order = 9 }, } }, function(context) @@ -118,20 +120,31 @@ RegisterFunction( OnSimConnect(context, { flapsAvailable = { variable = 'FLAPS AVAILABLE', type = SimConnectDataType.Bool }, - index = { variable = 'FLAPS HANDLE INDEX', type = SimConnectDataType.Int32, units = 'number' } + position = { variable = 'FLAPS HANDLE PERCENT', type = SimConnectDataType.Float64, units = 'percent' } }, function(context, data) if data.flapsAvailable then - local index = data.index - if index < 0 then - index = 0 + if data.position <= 9 then + SetState(context, '0To10') + elseif data.position >= 10 and data.position <= 19 then + SetState(context, '10To20') + elseif data.position >= 20 and data.position <= 29 then + SetState(context, '20To30') + elseif data.position >= 30 and data.position <= 39 then + SetState(context, '30To40') + elseif data.position >= 40 and data.position <= 49 then + SetState(context, '40To50') + elseif data.position >= 50 and data.position <= 59 then + SetState(context, '50To60') + elseif data.position >= 60 and data.position <= 69 then + SetState(context, '60To70') + elseif data.position >= 70 and data.position <= 79 then + SetState(context, '70To80') + elseif data.position >= 80 and data.position <= 89 then + SetState(context, '80To90') + elseif data.position >= 90 then + SetState(context, '90To100') end - - if index > 7 then - index = 7 - end - - SetState(context, tostring(index)) else SetState(context, 'notAvailable') end diff --git a/G940LEDControl/Scripts/G940LEDControl.Scripts.sublime-project b/G940LEDControl/Scripts/G940LEDControl.Scripts.sublime-project new file mode 100644 index 0000000..22aeefa --- /dev/null +++ b/G940LEDControl/Scripts/G940LEDControl.Scripts.sublime-project @@ -0,0 +1,9 @@ +{ + "folders": + [ + { + "path": ".", + "file_exclude_patterns": ["*.sublime-project"] + } + ] +}