Merge pull request #5 from devleaks/main

Added/uipdated deck types, updated Toliss A321
dlicudi · Aug 29, 2024 · cf182ea · cf182ea
2 parents 9a4a67e + 8e5d295
commit cf182ea
Show file tree

Hide file tree

Showing 62 changed files with 3,349 additions and 850 deletions.
diff --git a/decks/toliss-airbus-a321-neo/deckconfig/comm-radio/a.yaml b/decks/toliss-airbus-a321-neo/deckconfig/comm-radio/a.yaml
@@ -8,9 +8,30 @@ description: Encoders and push buttons on "Page A" of X-Touch mini
 version: 1.0.0
 # ########################
 buttons:
-#
-# BUTTONS
-#
+  #
+  # BUTTONS
+  #
+  - index: 2
+    name: BUTTON ON
+    type: push
+    led: single
+    options: counter
+    formula: 1
+  - index: 3
+    name: INSPECT
+    led: single
+    type: inspect
+    formula: 1
+  - index: 4
+    name: BUTTON BLINK
+    type: push
+    formula: 1
+    options: blink
+    led: single
+  - index: 5
+    name: RELOADSOFT
+    type: reload
+    led: single
   - index: 6
     name: MASTERCAUT
     type: push
@@ -44,21 +65,21 @@ buttons:
     type: reload
     led: true
     formula: 1
-#
+  #
   - index: slider
     name: SLIDER
     type: slider
     set-dataref: data:xtmslider
     representation: false
     value-step: 10
-#
-  - index: A
+  #
+  - index: a
     name: A
     type: page
     page: a
     led: true
     formula: 1
-  - index: B
+  - index: b
     name: B
     type: page
     page: b

diff --git a/decks/toliss-airbus-a321-neo/deckconfig/comm-radio/b.yaml b/decks/toliss-airbus-a321-neo/deckconfig/comm-radio/b.yaml
@@ -53,24 +53,24 @@ buttons:
     type: reload
     led: true
     formula: 1
-#
+  #
   - index: slider
     name: SLIDER
     type: slider
-    set-dataref: DatarefPlaceholder
+    set-dataref: data:noop
     representation: false
-
-  - index: A
+  #
+  - index: a
     name: A
     type: page
     page: a
     led: true
     formula: 0
-  - index: B
+  - index: b
     name: B
     type: page
     page: b
     led: true
     formula: 1
 #
-includes: encoders
+includes: encoders
diff --git a/decks/toliss-airbus-a321-neo/deckconfig/comm-radio/encoders.yaml b/decks/toliss-airbus-a321-neo/deckconfig/comm-radio/encoders.yaml
@@ -52,36 +52,4 @@ buttons:
     set-dataref: data:_enc0
     formula: ${data:_enc0}
     encoder-leds: 3
-  - index: 2
-    name: BUTTON ON
-    type: push
-    led: single
-    options: counter
-    dataref-rpn: 1
-  - index: 6
-    name: INSPECT
-    led: single
-    type: inspect
-    dataref-rpn: 1
-  - index: 10
-    name: BUTTON BLINK
-    type: push
-    dataref-rpn: 1
-    options: blink
-    led: single
-  - index: 15
-    name: RELOAD
-    type: reload
-    led: single
-  #
-  - index: A
-    name: Page A
-    type: none
-    led: single
-    dataref-rpn: 1
-  - index: B
-    name: Page B
-    type: page
-    page: B
-    led: single
-    dataref-rpn: 0
+#
diff --git a/decks/toliss-airbus-a321-neo/deckconfig/consoles/adirs.yaml b/decks/toliss-airbus-a321-neo/deckconfig/consoles/adirs.yaml
@@ -1,4 +1,3 @@
----
 aircraft: Toliss A321neo
 description: ADIRS Start/stop
 version: 1.0.0
@@ -21,9 +20,11 @@ buttons:
     type: push
     icon: P_TOLISS_ISCS_OFF
     command: AirbusFBW/ADIRU_fast_align
-    label: "ADIR\nF/ALIGN"
+    label: |-
+      ADIR
+      F/ALIGN
     label-position: cb
-  # ### LINE 2 ###  8-15 ######################################################
+    # ### LINE 2 ###  8-15 ######################################################
   - index: 8
     name: ADIRS1_INDICATOR
     type: none
@@ -79,10 +80,12 @@ buttons:
     name: left
     type: page
     page: ovrhdhyd
-    text: ${fa:arrow-right}
-    text-font: fontawesome.otf
-    text-size: 60
-  # ### LINE 3 ### 16-23 ######################################################
+    label: HYD
+    label-size: 10
+    text:
+      text: ${fa:arrow-right}
+      text-font: fontawesome.otf
+      text-size: 60
   - index: 16
     # name must be unique on page
     name: ADIRS1
@@ -111,9 +114,9 @@ buttons:
       tick-width: 8
       tick-length: 24
       tick-labels:
-        - "OFF"
-        - "NAV"
-        - "ATT"
+        - OFF
+        - NAV
+        - ATT
       tick-label-font: DIN Bold
       tick-label-size: 30
       needle-underline-width: 8
@@ -145,9 +148,9 @@ buttons:
       tick-width: 8
       tick-length: 24
       tick-labels:
-        - "OFF"
-        - "NAV"
-        - "ATT"
+        - OFF
+        - NAV
+        - ATT
       tick-label-font: DIN Bold
       tick-label-size: 30
       needle-underline-width: 8
@@ -179,13 +182,13 @@ buttons:
       tick-width: 8
       tick-length: 24
       tick-labels:
-        - "OFF"
-        - "NAV"
-        - "ATT"
+        - OFF
+        - NAV
+        - ATT
       tick-label-font: DIN Bold
       tick-label-size: 30
       needle-underline-width: 8
-  # ### LINE 4 ### 24-31 ######################################################
+      # ### LINE 4 ### 24-31 ######################################################
   - index: 24
     name: ADIRS1_OFF
     type: onoff
@@ -199,12 +202,12 @@ buttons:
         size: 60
         formula: "0"
       B1:
-        text: "OFF"
+        text: OFF
         color: peachpuff
         size: 80
         font: DIN Condensed Bold
         formula: ${AirbusFBW/ADRLights[0]} not
-        framed: True
+        framed: true
     set-dataref: AirbusFBW/ADIRUSwitchArray[0]
   - index: 25
     name: ADIRS3_OFF
@@ -219,12 +222,12 @@ buttons:
         size: 60
         formula: "0"
       B1:
-        text: "OFF"
+        text: OFF
         color: peachpuff
         size: 80
         font: DIN Condensed Bold
         formula: ${AirbusFBW/ADRLights[2]} not
-        framed: True
+        framed: true
     set-dataref: AirbusFBW/ADIRUSwitchArray[2]
   - index: 26
     name: ADIRS2_OFF
@@ -239,12 +242,12 @@ buttons:
         size: 60
         formula: "0"
       B1:
-        text: "OFF"
+        text: OFF
         color: peachpuff
         size: 80
         font: DIN Condensed Bold
         formula: ${AirbusFBW/ADRLights[1]} not
-        framed: True
+        framed: true
     set-dataref: AirbusFBW/ADIRUSwitchArray[1]
   - index: 31
     name: Index

diff --git a/decks/toliss-airbus-a321-neo/deckconfig/consoles/aptnav.yaml b/decks/toliss-airbus-a321-neo/deckconfig/consoles/aptnav.yaml
@@ -0,0 +1,119 @@
+buttons:
+  - index: 1
+    type: push
+    command: pikitanga/AptNav/MoveDown
+    text:
+      text: ${fa:arrow-up}
+      text-font: fontawesome.otf
+      text-size: 60
+  - index: 2
+    text:
+      text: ${fa:plus}
+      text-font: fontawesome.otf
+      text-size: 60
+    type: push
+    command: pikitanga/AptNav/ZoomIn
+  - index: 8
+    text:
+      text: ${fa:arrow-left}
+      text-font: fontawesome.otf
+      text-size: 60
+    type: push
+    command: pikitanga/AptNav/MoveRight
+  - index: 9
+    text:
+      text: ${fa:arrows-to-dot}
+      text-font: fontawesome.otf
+      text-size: 60
+    type: push
+    command: pikitanga/AptNav/ZoomReset
+  - index: 10
+    text:
+      text: ${fa:arrow-right}
+      text-font: fontawesome.otf
+      text-size: 60
+    type: push
+    command: pikitanga/AptNav/MoveLeft
+  - index: 16
+    text:
+      text: ${fa:location-crosshairs}
+      text-font: fontawesome.otf
+      text-size: 60
+    type: push
+    command: pikitanga/AptNav/MoveCenter
+  - index: 17
+    text:
+      text: ${fa:arrow-down}
+      text-font: fontawesome.otf
+      text-size: 60
+    type: push
+    command: pikitanga/AptNav/MoveUp
+  - index: 18
+    text:
+      text: ${fa:minus}
+      text-font: fontawesome.otf
+      text-size: 60
+    type: push
+    command: pikitanga/AptNav/ZoomOut
+  - index: 4
+    text:
+      text: ${fa:square-parking}
+      text-font: fontawesome.otf
+      text-size: 60
+    type: push
+    command: pikitanga/AptNav/ToggleRamp
+  - index: 12
+    text:
+      text: ${fa:plane-departure}
+      text-font: fontawesome.otf
+      text-size: 60
+    type: push
+    command: pikitanga/AptNav/ToggleTaxi
+  - index: 20
+    text:
+      text: ${fa:location-dot}
+      text-font: fontawesome.otf
+      text-size: 60
+    type: push
+    command: pikitanga/AptNav/ToggleTracking
+  - index: 6
+    text:
+      text: ${far:circle}
+      text-font: Font Awesome 6 Free-Regular-400.otf
+      text-size: 60
+    type: push
+    command: pikitanga/AptNav/BackgroundNone
+  - index: 14
+    text:
+      text: ${fa:circle-half-stroke}
+      text-font: fontawesome.otf
+      text-size: 60
+    type: push
+    command: pikitanga/AptNav/BackgroundSemi
+  - index: 22
+    type: push
+    text:
+      text: ${fa:circle}
+      text-font: fontawesome.otf
+      text-size: 60
+    command: pikitanga/AptNav/BackgroundBlack
+  - index: 15
+    text:
+      text: ${fa:radio}
+      text-font: fontawesome.otf
+      text-size: 60
+    type: push
+    command: pikitanga/AptNav/ToggleComm
+  - index: 7
+    text:
+      text: ${fa:map}
+      text-font: fontawesome.otf
+      text-size: 60
+    type: push
+    command: pikitanga/AptNav/ToggleMap
+  - index: 31
+    name: BACK
+    type: page
+    page: back
+    icon: TOLISS-A21N
+default-text-size: 20