Merge pull request #9 from wortelus/bugfix/annunciator-multiplier

Zibo 737 Annunciator fix

B737-800X/sd15/actions.yaml

@@ -4,56 +4,59 @@ actions:
     type: single
     icon: firewarn
     dataref: laminar/B738/annunciator/fire_bell_annun
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
     command: FlyWithLua/streamdeck_handler/capt_fire_warn_start
     command-release: FlyWithLua/streamdeck_handler/capt_fire_warn_end
   - index: 1
     name: master caution
     type: single
     icon: mastercaution
     dataref: laminar/B738/annunciator/master_caution_light
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
     command: FlyWithLua/streamdeck_handler/capt_master_caution_start
     command-release: FlyWithLua/streamdeck_handler/capt_master_caution_end
   - index: 2
     name: ap light
     type: single
     icon: apprst
     dataref: laminar/B738/annunciator/ap_disconnect1
+    dataref-offset: 0.8
     command: FlyWithLua/streamdeck_handler/ap_prst_start
     command-release: FlyWithLua/streamdeck_handler/ap_prst_end
   - index: 3
     name: at light
     type: single
     icon: atprst
     dataref: laminar/B738/annunciator/at_disconnect1
+    dataref-offset: 0.8
     command: FlyWithLua/streamdeck_handler/at_prst_start
     command-release: FlyWithLua/streamdeck_handler/at_prst_end
   - index: 4
     name: fmc light
     type: single
     icon: fmcprst
     dataref: laminar/B738/annunciator/at_fms_disconnect1
+    dataref-offset: 0.8
     command: FlyWithLua/streamdeck_handler/fmc_prst_start
     command-release: FlyWithLua/streamdeck_handler/fmc_prst_end
   - index: 5
     name: speedbrake armed
     type: single
     icon: speedbrakearmed
     dataref: laminar/B738/annunciator/speedbrake_armed
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 6
     name: speedbrake do not arm
     type: single
     icon: speedbrakedonotarm
     dataref: laminar/B738/annunciator/speedbrake_extend
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 7
     name: stab out of trim
     type: single
     icon: staboutoftrim
     dataref: laminar/B738/annunciator/stab_out_of_trim
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 11
     name: flaps
     type: dir
@@ -75,13 +78,13 @@ actions:
     type: single
     icon: leflapstransit
     dataref: laminar/B738/annunciator/slats_transit
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 13
     name: le flaps ext
     type: single
     icon: leflapsext
     dataref: laminar/B738/annunciator/slats_extend
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 10
     name: left
     type: dir

B737-800X/sd15/aftovhd.yaml

@@ -10,49 +10,49 @@ actions:
     type: none
     icon: align
     dataref: laminar/B738/annunciator/irs_align_left
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 1
     name: left irs on dc
     type: none
     icon: ondc
     dataref: laminar/B738/annunciator/irs_on_dc_left
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 5
     name: left irs fault
     type: none
     icon: fault
     dataref: laminar/B738/annunciator/irs_align_fail_left
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 6
     name: left irs dc fail
     type: none
     icon: dcfail
     dataref: laminar/B738/annunciator/irs_dc_fail_left
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 3
     name: right dc align
     type: none
     icon: align
     dataref: laminar/B738/annunciator/irs_align_right
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 4
     name: right irs on dc
     type: none
     icon: ondc
     dataref: laminar/B738/annunciator/irs_on_dc_right
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 8
     name: right irs fault
     type: none
     icon: fault
     dataref: laminar/B738/annunciator/irs_align_fail_right
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 9
     name: right irs dc fail
     type: none
     icon: dcfail
     dataref: laminar/B738/annunciator/irs_dc_fail_right
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
     # irs mode
   - index: 11
     name: lirsmode

B737-800X/sd15/ctr.yaml

@@ -56,13 +56,13 @@ actions:
     type: single
     icon: autobrakedisarm
     dataref: laminar/B738/annunciator/auto_brake_disarm
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 10
     name: anti skid inop
     type: single
     icon: antiskidinop
     dataref: laminar/B738/annunciator/anti_skid_inop
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 8
     name: main panel dus
     type: dual
@@ -102,18 +102,18 @@ actions:
     type: single
     icon: belowgs
     dataref: laminar/B738/annunciator/below_gs
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
     command: laminar/B738/alert/below_gs_pilot
   - index: 1
     name: takeoff config
     type: single
     icon: takeoffconfig
     dataref: laminar/B738/annunciator/takeoff_config
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 2
     name: cabin altitude
     type: single
     icon: cabinaltitude
     dataref: laminar/B738/annunciator/cabin_alt
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
 

B737-800X/sd15/doors.yaml

@@ -9,40 +9,40 @@ actions:
     type: single
     icon: fwdentry
     dataref: laminar/B738/annunciator/fwd_entry
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
     command: laminar/B738/door/fwd_L_toggle
   - index: 1
     name: fwd r doors
     type: single
     icon: fwdservice
     dataref: laminar/B738/annunciator/fwd_service
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
     command: laminar/B738/door/fwd_R_toggle
   - index: 5
     name: aft l doors
     type: single
     icon: aftentry
     dataref: laminar/B738/annunciator/aft_entry
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
     command: laminar/B738/door/aft_L_toggle
   - index: 6
     name: aft r doors
     type: single
     icon: aftservice
     dataref: laminar/B738/annunciator/aft_service
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
     command: laminar/B738/door/aft_R_toggle
   - index: 2
     name: fwd cargo
     type: single
     icon: fwdcargo
     dataref: laminar/B738/annunciator/fwd_cargo
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
     command: laminar/B738/door/fwd_cargo_toggle
   - index: 7
     name: aft cargo
     type: single
     icon: aftcargo
     dataref: laminar/B738/annunciator/aft_cargo
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
     command: laminar/B738/door/aft_cargo_toggle

B737-800X/sd15/elec.yaml

@@ -83,19 +83,19 @@ actions:
     type: none
     icon: batdischarge
     dataref: laminar/B738/annunciator/bat_discharge
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 2
     name: tr unit
     type: none
     icon: trunit
     dataref: laminar/B738/annunciator/tr_unit
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 3
     name: elec
     type: none
     icon: elec
     dataref: laminar/B738/annunciator/elec
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 13
     name: maint
     type: none

B737-800X/sd15/exttest.yaml

@@ -32,18 +32,18 @@ actions:
     icon: extcircuit
     label: APU
     dataref: laminar/B738/annunciator/extinguisher_circuit_annun_apu
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 12
     name: left ext circuit
     type: none
     icon: extcircuit
     label: LEFT
     dataref: laminar/B738/annunciator/extinguisher_circuit_annun_left
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 13
     name: right ext circuit
     type: none
     icon: extcircuit
     label: RIGHT
     dataref: laminar/B738/annunciator/extinguisher_circuit_annun_right
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8

B737-800X/sd15/fire.yaml

@@ -16,7 +16,7 @@ actions:
     type: none
     icon: eng1overheat
     dataref: laminar/B738/annunciator/engine1_ovht
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 8
     type: single
     name: fire ovht test
@@ -29,31 +29,31 @@ actions:
     type: none
     icon: wheelwell
     dataref: laminar/B738/annunciator/wheel_well_fire
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 4
     name: fire fault inop
     type: none
     icon: fault
     dataref: laminar/B738/annunciator/fire_fault_inop
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 6
     name: apu det inop
     type: none
     icon: apudetinop
     dataref: laminar/B738/annunciator/fire_fault_inop # dataref not found
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 7
     name: apu det inop
     type: none
     icon: apubottledischarge
     dataref: laminar/B738/annunciator/apu_bottle_discharge
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 2
     name: eng 2 overheat
     type: none
     icon: eng2overheat
     dataref: laminar/B738/annunciator/engine2_ovht
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 9
     name: exttest
     type: dir
@@ -65,34 +65,34 @@ actions:
     icon: extcircuit
     label: APU
     dataref: laminar/B738/annunciator/extinguisher_circuit_annun_apu
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 11
     name: left ext circuit
     type: none
     icon: extcircuit
     label: LEFT
     dataref: laminar/B738/annunciator/extinguisher_circuit_annun_left
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 12
     name: right ext circuit
     type: none
     icon: extcircuit
     label: RIGHT
     dataref: laminar/B738/annunciator/extinguisher_circuit_annun_right
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
   - index: 0
     name: fire warning
     type: single
     icon: firewarn
     dataref: laminar/B738/annunciator/fire_bell_annun
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
     command: FlyWithLua/streamdeck_handler/capt_fire_warn_start
     command-release: FlyWithLua/streamdeck_handler/capt_fire_warn_end
   - index: 3
     name: ovht det
     type: single
     icon: ovhtdet
     dataref: laminar/B738/annunciator/six_pack_fire
-    dataref-multiplier: 1.5
+    dataref-offset: 0.8
     command: FlyWithLua/streamdeck_handler/capt_six_pack_start
     command-release: FlyWithLua/streamdeck_handler/capt_six_pack_end

B737-800X/sd15/fltctlnav.yaml

@@ -9,19 +9,23 @@ actions:
     type: none
     icon: feeldiffpress
     dataref: laminar/B738/annunciator/feel_diff_press
+    dataref-offset: 0.8
   - index: 6
     name: speed trim fail
     type: none
     icon: speedtrimfail.0.0
+    # TODO: Add missing dataref
   - index: 7
     name: mach trim fail
     type: none
     icon: machtrimfail.0.0
+    # TODO: Add missing dataref
   - index: 8
     name:  auto slat fail
     type: none
     icon: autoslatfail
     dataref: laminar/B738/annunciator/auto_slat_fail
+    dataref-offset: 0.8
   - index: 10
     name: spoiler a cover
     type: single

B737-800X/sd15/fltctlnav2.yaml

@@ -92,4 +92,5 @@ actions:
     name: yaw damper ann
     type: none
     icon: yawdamper
-    dataref: laminar/B738/annunciator/yaw_damp
+    dataref: laminar/B738/annunciator/yaw_damp
+    dataref-offset: 0.8