From ed85aeee7500c3fad64112f2fb6794e4c95710e6 Mon Sep 17 00:00:00 2001 From: wortelus Date: Sun, 26 Feb 2023 20:34:57 +0100 Subject: [PATCH] polishing 737 15 key variant --- B737-800X/sd15/ctr.yaml | 2 +- B737-800X/sd15/ctr2.yaml | 2 +- B737-800X/sd15/efis.yaml | 2 +- B737-800X/sd15/efis2.yaml | 2 +- B737-800X/sd15/elec.yaml | 56 +++++++++++-- B737-800X/sd15/flaps.yaml | 165 +++++++++++++++++++++++++++---------- B737-800X/sd15/gen.yaml | 4 +- B737-800X/sd15/hydai.yaml | 2 +- B737-800X/sd15/left.yaml | 54 ++++++------ B737-800X/sd15/mcpctl.yaml | 10 +++ 10 files changed, 210 insertions(+), 89 deletions(-) diff --git a/B737-800X/sd15/ctr.yaml b/B737-800X/sd15/ctr.yaml index 1b9c4dc..f91ad27 100644 --- a/B737-800X/sd15/ctr.yaml +++ b/B737-800X/sd15/ctr.yaml @@ -7,7 +7,7 @@ actions: - index: 13 name: ctr2 type: dir - icon: dir + icon: right label: PAGE 2 - index: 12 name: spdref diff --git a/B737-800X/sd15/ctr2.yaml b/B737-800X/sd15/ctr2.yaml index f943128..cd4848f 100644 --- a/B737-800X/sd15/ctr2.yaml +++ b/B737-800X/sd15/ctr2.yaml @@ -2,7 +2,7 @@ actions: - index: 14 name: return type: dir - icon: dir + icon: left label: CTR 1 - index: 0 name: eng pfd diff --git a/B737-800X/sd15/efis.yaml b/B737-800X/sd15/efis.yaml index f6a099a..10669a8 100644 --- a/B737-800X/sd15/efis.yaml +++ b/B737-800X/sd15/efis.yaml @@ -7,7 +7,7 @@ actions: - index: 13 name: efis2 type: dir - icon: dir + icon: right label: EFIS 2 - index: 12 name: efis3 diff --git a/B737-800X/sd15/efis2.yaml b/B737-800X/sd15/efis2.yaml index 5f20141..4b61bba 100644 --- a/B737-800X/sd15/efis2.yaml +++ b/B737-800X/sd15/efis2.yaml @@ -2,7 +2,7 @@ actions: - index: 13 name: return type: dir - icon: dir + icon: left label: RETURN - index: 5 name: wxr diff --git a/B737-800X/sd15/elec.yaml b/B737-800X/sd15/elec.yaml index 5e26e76..0171be7 100644 --- a/B737-800X/sd15/elec.yaml +++ b/B737-800X/sd15/elec.yaml @@ -108,7 +108,7 @@ actions: type: none dataref: laminar/B738/dc_amp_value display: - name: -100.500.elec + name: -100.500.elec-dc-amps text-center: x: center y: 60 # center doesn't work as it should, due to font's height @@ -125,9 +125,9 @@ actions: - label: DC AMPS text-center: x: center - y: 120 + y: 86 font-path: IBMPlexMono-Bold.ttf - font-size: 10 + font-size: 14 color: white direction: ltr align: center @@ -136,7 +136,7 @@ actions: type: none dataref: laminar/B738/dc_volt_value display: - name: -100.500.elec + name: -100.500.elec-dc-volts text-center: x: center y: 60 # center doesn't work as it should, due to font's height @@ -149,13 +149,23 @@ actions: color: lime keep-decimal: False background: none + special-labels: + - label: DC VOLTS + text-center: + x: center + y: 86 + font-path: IBMPlexMono-Bold.ttf + font-size: 14 + color: white + direction: ltr + align: center # ac - index: 7 name: ac amps display type: none dataref: laminar/B738/ac_amp_value display: - name: -100.500.elec + name: -100.500.elec-ac-amps text-center: x: center y: 60 # center doesn't work as it should, due to font's height @@ -168,12 +178,22 @@ actions: color: lime keep-decimal: False background: none + special-labels: + - label: AC AMPS + text-center: + x: center + y: 86 + font-path: IBMPlexMono-Bold.ttf + font-size: 14 + color: white + direction: ltr + align: center - index: 6 name: ac volts display type: none dataref: laminar/B738/ac_volt_value display: - name: -100.500.elec + name: -100.500.elec-ac-volts text-center: x: center y: 60 # center doesn't work as it should, due to font's height @@ -186,12 +206,22 @@ actions: color: lime keep-decimal: False background: none + special-labels: + - label: AC VOLTS + text-center: + x: center + y: 86 + font-path: IBMPlexMono-Bold.ttf + font-size: 14 + color: white + direction: ltr + align: center - index: 8 name: ac freq display type: none dataref: laminar/B738/ac_freq_value display: - name: -100.500.elec + name: -100.500.elec-ac-freq text-center: x: center y: 60 # center doesn't work as it should, due to font's height @@ -203,4 +233,14 @@ actions: step: 1 color: lime keep-decimal: False - background: none \ No newline at end of file + background: none + special-labels: + - label: AC FREQ + text-center: + x: center + y: 86 + font-path: IBMPlexMono-Bold.ttf + font-size: 14 + color: white + direction: ltr + align: center \ No newline at end of file diff --git a/B737-800X/sd15/flaps.yaml b/B737-800X/sd15/flaps.yaml index c6ddf8c..80bb505 100644 --- a/B737-800X/sd15/flaps.yaml +++ b/B737-800X/sd15/flaps.yaml @@ -1,5 +1,5 @@ actions: - - index: 0 + - index: 11 name: return type: dir dataref: sim/flightmodel/misc/blown_flap_engage_rat @@ -15,71 +15,152 @@ actions: min: 0.0 max: 100 step: 1 - - index: 1 + - index: 0 name: move flaps up type: single icon: red-button label: MOVE UP command: FlyWithLua/B738/Cmd_MP_Flaps_Up - - index: 3 + - index: 10 + name: move flaps down + type: single + icon: blue-button + label: MOVE DOWN + command: FlyWithLua/B738/Cmd_MP_Flaps_Dn + - index: 2 name: flaps up type: single - icon: orange-button - label: UP + icon: none command: laminar/B738/push_button/flaps_0 - - index: 5 + special-labels: + - label: UP + text-center: + x: center + y: 60 + font-path: IBMPlexMono-Bold.ttf + font-size: 38 + color: white + direction: ltr + align: center + - index: 3 name: flaps 1 type: single - icon: orange-button - label: 1 + icon: none command: laminar/B738/push_button/flaps_1 + special-labels: + - label: 1 + text-center: + x: center + y: 60 + font-path: IBMPlexMono-Bold.ttf + font-size: 38 + color: khaki + direction: ltr + align: center + - index: 4 + name: flaps 2 + type: single + icon: none + command: laminar/B738/push_button/flaps_2 + special-labels: + - label: 2 + text-center: + x: center + y: 60 + font-path: IBMPlexMono-Bold.ttf + font-size: 38 + color: DarkKhaki + direction: ltr + align: center - index: 7 name: flaps 5 type: single - icon: orange-button - label: 5 + icon: none command: laminar/B738/push_button/flaps_5 - - index: 9 - name: flaps 15 - type: single - icon: orange-button - label: 15 - command: laminar/B738/push_button/flaps_15 - - index: 11 - name: flaps 30 - type: single - icon: orange-button - label: 30 - command: laminar/B738/push_button/flaps_30 - - index: 2 - name: move flaps down - type: single - icon: blue-button - label: MOVE DOWN - command: FlyWithLua/B738/Cmd_MP_Flaps_Dn - - index: 6 - name: flaps 2 - type: single - icon: orange-button - label: 2 - command: laminar/B738/push_button/flaps_2 + special-labels: + - label: 5 + text-center: + x: center + y: 60 + font-path: IBMPlexMono-Bold.ttf + font-size: 38 + color: yellow + direction: ltr + align: center - index: 8 name: flaps 10 type: single - icon: orange-button - label: 10 + icon: none command: laminar/B738/push_button/flaps_10 - - index: 10 + special-labels: + - label: 10 + text-center: + x: center + y: 60 + font-path: IBMPlexMono-Bold.ttf + font-size: 38 + color: LightSalmon + direction: ltr + align: center + - index: 9 + name: flaps 15 + type: single + icon: none + command: laminar/B738/push_button/flaps_15 + special-labels: + - label: 15 + text-center: + x: center + y: 60 + font-path: IBMPlexMono-Bold.ttf + font-size: 38 + color: Coral + direction: ltr + align: center + - index: 12 name: flaps 25 type: single - icon: orange-button - label: 25 + icon: none command: laminar/B738/push_button/flaps_25 - - index: 12 + special-labels: + - label: 25 + text-center: + x: center + y: 60 + font-path: IBMPlexMono-Bold.ttf + font-size: 38 + color: Tomato + direction: ltr + align: center + - index: 13 + name: flaps 30 + type: single + icon: none + command: laminar/B738/push_button/flaps_30 + special-labels: + - label: 30 + text-center: + x: center + y: 60 + font-path: IBMPlexMono-Bold.ttf + font-size: 38 + color: OrangeRed + direction: ltr + align: center + - index: 14 name: flaps 40 type: single - icon: orange-button - label: 40 + icon: none command: laminar/B738/push_button/flaps_40 + special-labels: + - label: 40 + text-center: + x: center + y: 60 + font-path: IBMPlexMono-Bold.ttf + font-size: 38 + color: Red + direction: ltr + align: center diff --git a/B737-800X/sd15/gen.yaml b/B737-800X/sd15/gen.yaml index 1edad58..9ccfc60 100644 --- a/B737-800X/sd15/gen.yaml +++ b/B737-800X/sd15/gen.yaml @@ -131,9 +131,7 @@ actions: - index: 7 name: cover transfer bus type: single - file-names: - - blue-down - - red-down + icon: black-cover-rotated dataref: laminar/B738/button_switch/cover_position[6] command: laminar/B738/button_switch_cover06 label: TR BUS COVER \ No newline at end of file diff --git a/B737-800X/sd15/hydai.yaml b/B737-800X/sd15/hydai.yaml index a7d0b2b..ab12ae5 100644 --- a/B737-800X/sd15/hydai.yaml +++ b/B737-800X/sd15/hydai.yaml @@ -70,7 +70,7 @@ actions: type: none icon: overheat dataref: laminar/B738/annunciator/el_hyd_ovht_1 - - index: 13 + - index: 12 name: elec b overheat type: none icon: overheat diff --git a/B737-800X/sd15/left.yaml b/B737-800X/sd15/left.yaml index 688f572..8759727 100644 --- a/B737-800X/sd15/left.yaml +++ b/B737-800X/sd15/left.yaml @@ -1,6 +1,6 @@ actions: - # capt six pack start - - index: 2 + # capt six-pack start + - index: 0 name: flt cont type: single icon: fltcont @@ -8,7 +8,7 @@ actions: dataref-multiplier: 1.5 command: FlyWithLua/streamdeck_handler/capt_six_pack_start command-release: FlyWithLua/streamdeck_handler/capt_six_pack_end - - index: 3 + - index: 1 name: elec type: single icon: elec @@ -16,7 +16,7 @@ actions: dataref-multiplier: 1.5 command: FlyWithLua/streamdeck_handler/capt_six_pack_start command-release: FlyWithLua/streamdeck_handler/capt_six_pack_end - - index: 10 + - index: 5 name: irs type: single icon: irs @@ -24,7 +24,7 @@ actions: dataref-multiplier: 1.5 command: FlyWithLua/streamdeck_handler/capt_six_pack_start command-release: FlyWithLua/streamdeck_handler/capt_six_pack_end - - index: 11 + - index: 6 name: apu type: single icon: apu @@ -32,7 +32,7 @@ actions: dataref-multiplier: 1.5 command: FlyWithLua/streamdeck_handler/capt_six_pack_start command-release: FlyWithLua/streamdeck_handler/capt_six_pack_end - - index: 12 + - index: 10 name: fuel type: single icon: fuel @@ -40,7 +40,7 @@ actions: dataref-multiplier: 1.5 command: FlyWithLua/streamdeck_handler/capt_six_pack_start command-release: FlyWithLua/streamdeck_handler/capt_six_pack_end - - index: 13 + - index: 11 name: ovht det type: single icon: ovhtdet @@ -48,17 +48,9 @@ actions: dataref-multiplier: 1.5 command: FlyWithLua/streamdeck_handler/capt_six_pack_start command-release: FlyWithLua/streamdeck_handler/capt_six_pack_end - # capt six pack end - - - index: 1 - name: six pack - type: single - icon: orange-up - label: SIX PACK - command: FlyWithLua/streamdeck_handler/capt_six_pack_start - command-release: FlyWithLua/streamdeck_handler/capt_six_pack_end - # f/o six pack start - - index: 4 + # capt six-pack end + # f/o six-pack start + - index: 3 name: anti ice type: single icon: antiice @@ -66,7 +58,7 @@ actions: dataref-multiplier: 1.5 command: FlyWithLua/streamdeck_handler/capt_six_pack_start command-release: FlyWithLua/streamdeck_handler/capt_six_pack_end - - index: 5 + - index: 4 name: engine type: single icon: eng @@ -74,7 +66,7 @@ actions: dataref-multiplier: 1.5 command: FlyWithLua/streamdeck_handler/capt_six_pack_start command-release: FlyWithLua/streamdeck_handler/capt_six_pack_end - - index: 6 + - index: 8 name: hydraulics type: single icon: hyd @@ -82,7 +74,7 @@ actions: dataref-multiplier: 1.5 command: FlyWithLua/streamdeck_handler/capt_six_pack_start command-release: FlyWithLua/streamdeck_handler/capt_six_pack_end - - index: 7 + - index: 9 name: overhead type: single icon: overhead @@ -90,7 +82,7 @@ actions: dataref-multiplier: 1.5 command: FlyWithLua/streamdeck_handler/capt_six_pack_start command-release: FlyWithLua/streamdeck_handler/capt_six_pack_end - - index: 8 + - index: 13 name: doors type: single icon: doors @@ -98,7 +90,7 @@ actions: dataref-multiplier: 1.5 command: FlyWithLua/streamdeck_handler/capt_six_pack_start command-release: FlyWithLua/streamdeck_handler/capt_six_pack_end - - index: 9 + - index: 14 name: air conditioning type: single icon: aircond @@ -107,16 +99,16 @@ actions: command: FlyWithLua/streamdeck_handler/capt_six_pack_start command-release: FlyWithLua/streamdeck_handler/capt_six_pack_end # f/o six pack end - - index: 14 + - index: 12 name: return type: dir icon: dir label: MAIN DECK - - index: 0 - name: six pack + - index: 2 + name: master caution type: single - icon: orange-up - label: SIX PACK - command: FlyWithLua/streamdeck_handler/capt_six_pack_start - command-release: FlyWithLua/streamdeck_handler/capt_six_pack_end - + icon: mastercaution + dataref: laminar/B738/annunciator/master_caution_light + dataref-multiplier: 1.5 + command: FlyWithLua/streamdeck_handler/capt_master_caution_start + command-release: FlyWithLua/streamdeck_handler/capt_master_caution_end diff --git a/B737-800X/sd15/mcpctl.yaml b/B737-800X/sd15/mcpctl.yaml index 9e00b72..97a70e0 100644 --- a/B737-800X/sd15/mcpctl.yaml +++ b/B737-800X/sd15/mcpctl.yaml @@ -120,6 +120,16 @@ actions: color: white keep-decimal: False background: none + special-labels: + - label: RETURN + text-center: + x: center + y: 90 + font-path: IBMPlexMono-Bold.ttf + font-size: 14 + color: orange + direction: ltr + align: center - index: 14 name: mcp vs dn type: single