@@ -152,6 +152,7 @@ var displayClass = {

                     'PFD-Map',

                     'PFD-Multilines',

                     'WindData', 'WindData-OPTN1', 'WindData-OPTN2', 'WindData-OPTN1-HDG', 'WindData-OPTN2-symbol', 'WindData-OPTN2-headwind', 'WindData-OPTN2-crosswind', 'WindData-NODATA',

+                    'AOA', 'AOA-needle',

                 );

                 append(groups.clip,

                     'SpeedLint1',

@@ -186,6 +187,8 @@ var displayClass = {

                         'AltSmallD' ~ place

                     );

                 }

+                me.device.data.aoa = 0;

+                me.device.data['aoa-auto'] = 0;

             }

             else {

                 if (contains(me.parents[0], 'showEIS'))

@@ -1146,6 +1149,28 @@ var displayClass = {

     _winddata_optn : 0,

 #}}}

+    updateAOA : func {

+# update Angle Of Attack {{{

+        if (me.device.data.aoa == 0)

+            return;

+        var color = [1,1,1];

+        var norm = data.aoa / data['stall-aoa'];

+        if (norm > 1) norm = 1;

+        if (norm > 0.9)

+            color = [1,0,0];

+        elsif (norm > 0.7)

+            color = [1,1,0];

+        elsif (norm < 0) {

+            norm = 0;

+            color = [1,0,0];

+        }

+        me.screenElements['AOA-needle']

+            .setRotation(-norm * math.pi)

+            .setColor(color);

+        settimer(func me.updateAOA(), 0.1);

+    },

+# }}}

+

     updateBRG : func {

 # displays and update BRG1/2 {{{

         foreach (var brg; [1, 2]) {

@@ -1306,4 +1331,6 @@ var keyMap = {

         },

     },

 };

+if (data['stall-aoa'] == 9999)

+    keyMap.PFD.PFD['AOA/WIND'].texts = ['', 'WIND'];

 #}}}

@@ -63,6 +63,50 @@ var softkeysClass = {

             },

             PFD: {

                 'AOA/WIND' : {

+                    AOA : {

+                        'AOA ON' : func {

+                            if (me.device.data['aoa-auto'])

+                                return;

+                            me.device.data.aoa = ! me.device.data.aoa;

+                            me.device.display.screenElements['AOA']

+                                .setVisible(me.device.data.aoa);

+                            me.device.display.screenElements['AOA-needle']

+                                .setVisible(me.device.data.aoa);

+                            me.device.display.updateAOA();

+                            me.device.display.setSoftKeyColor(5 ,me.device.data.aoa);

+                            if (me.device.data.aoa)

+                                me.colored['PFDAOA/WINDAOAAOA ON'] = 1;

+                            else

+                                delete(me.colored, 'PFDAOA/WINDAOAAOA ON');

+                        },

+                        'AOA AUTO' : func {

+                            if (me.device.data.aoa)

+                                return;

+                            me.device.data['aoa-auto'] = ! me.device.data['aoa-auto'];

+                            me.device.display.setSoftKeyColor(6 ,me.device.data['aoa-auto']);

+                            if (me.device.data['aoa-auto']) {

+                                me.colored['PFDAOA/WINDAOAAOA AUTO'] = 1;

+                                if (!contains(me.device.timers, 'aoa'))

+                                    me.device.timers.aoa = maketimer(1,

+                                            func {

+                                                var v = getprop('/gear/gear/position-norm') == 1

+                                                    and getprop('/surfaces-positions/flap-pos-norm') != 0;

+                                                me.device.display.screenElements['AOA']

+                                                    .setVisible(v);

+                                                me.device.display.screenElements['AOA-needle']

+                                                    .setVisible(v);

+                                            }, me);

+                                me.device.timers.aoa.start();

+                            }

+                            else {

+                                delete(me.colored, 'PFDAOA/WINDAOAAOA AUTO');

+                                me.device.timers.aoa.stop();

+                                me.device.data.aoa = 0;

+                                me.device.display.screenElements['AOA']

+                                    .hide();

+                            }

+                        },

+                    },

                     WIND : {

                         OPTN1 : func {

                             me.device.display._winddata_optn = 1;

@@ -75,6 +75,7 @@ Please report bug at <seb.marque@free.fr>.

   * EIS: separation for aircraft specifics (selected by the zkv1000 config)

 * ![][90%]

   * TMR/REF Timer ![][done], Vspeeds ![][done], minimums ![][pending] (don't understand the role of this)

+  * angle of attack display (not sure about calculation): specific for each airplane (see Installation instructions below)

   * Bearing needs some checks to be sure it shows the correct information

   * XPDR: emergency code depending of the country (eg.: 1200 for US, 7700 for Europe), should be set in settings

 * ![][80%]

@@ -95,7 +96,6 @@ Please report bug at <seb.marque@free.fr>.

 * ![][0%] (TODO list, unsorted)

   * CDI/GPS: scale depending of the flight phase

   * recenter the MFD depending of EIS width

-  * angle of attack display

   * Alerts

   * Flight planning (MFD)

   * Inset Map (PFD)

@@ -106,6 +106,8 @@ Please report bug at <seb.marque@free.fr>.

   * VNAV

   * scrolling lift in menus

   * tutorials

+  * make any Vspeed available (not only Vx, Vy, Vr and Vglide), depending of their presence in aircraft config

+  * [touchable screen](http://wiki.flightgear.org/Canvas_Event_Handling)

   * many more...

 # Installation

@@ -144,6 +146,15 @@ To tells the zkv1000 which kind of engines equip your aircraft, and the associat

 Defaults to `none`, available entries are the `.nas` files located in `Nasal/EIS/` directory.

 If you want to add yours, just copy the `Systems/EIS/single-engine.svg`, modify it to fit your needs, and refer to it in a function named `displayClass.showEIS`, another very important function is `displayClass.updateEIS` (example in [zkv1000/Nasal/EIS/single-engine.nas](Nasal/EIS/single-engine.nas))

+### Angle Of Attack (AOA)

+You can specify the stall AoA in order to display it in the dedicated display.

+

+        <alerts>

+          <stall-aoa>15</stall-aoa>

+        </alerts>

+

+If not specified or equals to 0 (zero) the AOA display won't be accessible.

+

 ## 3D models

 In the definition of your flightdeck (here are the values for the installation in the Lancair 235 in which I develop the device)

 put it everywhere you want to

@@ -7106,6 +7106,43 @@

          id="Annunciation-bg"

          style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.01803744;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />

     </g>

+    <g

+       id="AOA"

+       inkscape:label="AOA">

+      <rect

+         style="opacity:1;fill:#020000;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

+         id="AOA-bg"

+         width="75.831932"

+         height="71.529388"

+         x="158.11763"

+         y="325.3782"

+         inkscape:label="AOA-bg" />

+      <text

+         inkscape:label="AOA-text"

+         id="AOA-text"

+         y="345.68497"

+         x="159.34264"

+         style="font-style:normal;font-weight:normal;font-size:16px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

+         xml:space="preserve"><tspan

+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';fill:#ffffff;fill-opacity:1"

+           y="345.68497"

+           x="159.34264"

+           id="tspan5885"

+           sodipodi:role="line">AOA</tspan></text>

+      <path

+         inkscape:label="AOA-needle"

+         inkscape:transform-center-y="17.435497"

+         inkscape:transform-center-x="-0.303765"

+         inkscape:connector-curvature="0"

+         id="AOA-needle"

+         d="m 191.3807,360.58563 0.63375,34.70574 v 0 0"

+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.97909927;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />

+      <path

+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"

+         d="m 192.45312,325.95312 v 1 c 12.21842,0 23.48918,6.57015 29.51172,17.20118 6.02255,10.63103 5.86335,23.67799 -0.41796,34.1582 -6.28132,10.48021 -17.71104,16.77019 -29.92579,16.4707 l -0.0254,1 c 12.57316,0.30828 24.34297,-6.1693 30.8086,-16.95703 6.46562,-10.78773 6.6309,-24.22109 0.43164,-35.16406 -6.19926,-10.94297 -17.80588,-17.70899 -30.38282,-17.70899 z"

+         id="AOA-circle"

+         inkscape:connector-curvature="0" />

+    </g>

     <g

        id="Reversionnary"

        inkscape:label="Reversionnary">

@@ -30,6 +30,7 @@ var data = { # set of data common to all devices

     wow : 1,

     lat : 0,

     lon : 0,

+    aoa : 0,

     timers : {

         '20Hz': maketimer (

             0.05,

@@ -40,6 +41,7 @@ var data = { # set of data common to all devices

                 data.ias = getprop('/velocities/airspeed-kt');

                 data.alt = getprop('/instrumentation/altimeter/indicated-altitude-ft');

                 data.hdg = getprop('/orientation/heading-deg');

+                data.aoa = getprop('/orientation/alpha-deg');

             }

         ),

         '1Hz': maketimer (

@@ -100,6 +102,8 @@ var init_props = func {

         var speed = getprop('/instrumentation/zkv1000/alerts/' ~ v);

         data[v] = speed != nil ? speed : 9999;

     }

+    var aoa = getprop('/instrumentation/zkv1000/alerts/stall-aoa');

+    data['stall-aoa'] = (aoa == nil or aoa == 0) ? 9999 : aoa;

     afcs = zkv.getNode('afcs',1);

     afcs.getNode('fd-bars-visible',1).setBoolValue(0);

@@ -184,8 +188,8 @@ var load_multikey = func {

 var zkv1000_init = func {

     removelistener(init);

     load_multikey();

-    load_nasal();

     init_props();

+    load_nasal();

     print('zkv1000 loaded');

 }