@@ -13,6 +13,8 @@ var buttonsClass = {

         var tmp = getprop('/instrumentation/nav[' ~ n ~ ']/frequencies/selected-mhz');

         setprop('/instrumentation/nav[' ~ n ~ ']/frequencies/selected-mhz', getprop('/instrumentation/nav[' ~ n ~ ']/frequencies/standby-mhz'));

         setprop('/instrumentation/nav[' ~ n ~ ']/frequencies/standby-mhz', tmp);

+        device[0].display.updateNAV({refresh: n+1});

+        device[1].display.updateNAV({refresh: n+1});

     },

     AsSwitchCOM : func (x) {

@@ -30,6 +30,20 @@ var main_loop = func () {

     settimer(main_loop, 0);

 }

+# les listeners triggent en permanence sur les fréquences...

+var setListeners = func {

+    setlistener('/instrumentation/nav/nav-id',

+            func {

+                device[0].display.updateNAV({'nav-id': 1});

+                device[0].display.updateNAV({'nav-id': 1});

+            }, 1, 2);

+    setlistener('/instrumentation/nav[1]/nav-id',

+            func {

+                device[0].display.updateNAV({'nav-id': 2});

+                device[1].display.updateNAV({'nav-id': 2});

+            }, 1, 2);

+}

+

 var deviceClass = {

     new: func (d) {

         var m = { parents: [ deviceClass ] };

@@ -47,7 +47,7 @@ var displayClass = {

                     'Rose',

                 ],

                 hide : [

-                    'HDI',

+                    'CDI',

                     'NAV1-pointer',

                     'NAV2-pointer',

                     'GPS-pointer',

@@ -59,6 +59,9 @@ var displayClass = {

                     'Speed110',

                     'Alt11100',

                     'HDG-text',

+                    'nav1-standby-freq', 'nav1-selected-freq', 'nav1-id',

+                    'nav2-standby-freq', 'nav2-selected-freq', 'nav2-id',

+                    'nav-freq-switch',

                 ],

                 clip: [

                     'SpeedLint1',

@@ -84,6 +87,7 @@ var displayClass = {

             me.updateIAS(getprop('/velocities/airspeed-kt'));

             me.updateALT(getprop('instrumentation/altimeter/indicated-altitude-ft'));

             me.updateHSI(getprop('orientation/heading-deg'));

+            me.updateNAV({refresh:1, auto:1});

             me.progress.removeAllChildren();

             me.progress = nil;

             me.showInitProgress = nil;

@@ -142,6 +146,8 @@ var displayClass = {

                         me.screenElements[e].setAlignment(me.texts[e].alignment);

                     if (contains(me.texts[e], 'default'))

                         me.screenElements[e].setText(me.texts[e].default);

+                    if (contains(me.texts[e], 'color'))

+                        me.screenElements[e].setColor(me.texts[e].color);

                 }

 #                else

 #                    print('no text format for ' ~ e);

@@ -178,14 +184,23 @@ var displayClass = {

             alignment: "right-bottom", default : num('0'),

         },

         Speed110 : {

-            default: '', alignment : 'left-bottom'

+            alignment : 'left-bottom'

         },

         Alt11100 : {

-            default:'', alignment:'left-bottom'

+            alignment:'left-bottom'

         },

         "HDG-text" : {

             default: '---°'

         },

+        'nav1-standby-freq' : {

+            color: [0, 1, 1],

+        },

+        'nav1-id' : {

+            default: ''

+        },

+        'nav2-id' : {

+            default: ''

+        },

     },

     updateAI: func(roll,pitch){

@@ -374,4 +389,75 @@ var displayClass = {

             .setText(sprintf("%03u°", hdg));

         settimer(func me.updateHSI(getprop('orientation/heading-deg')), 0.1);

     },

+

+    updateNAV : func {

+        # made active via menu

+        if (contains(arg[0], "active")) {

+            if (arg[0]['active'] == 'none') {

+                me.screenElements['nav1-id']

+                    .setColor(1,1,1);

+                me.screenElements['nav1-selected-freq']

+                    .setColor(1,1,1);

+                me.screenElements['nav2-id']

+                    .setColor(1,1,1);

+                me.screenElements['nav2-selected-freq']

+                    .setColor(1,1,1);

+                me.screenElements['NAV1-pointer']

+                    .hide();

+                me.screenElements['NAV2-pointer']

+                    .hide();

+            }

+            else {

+                var inactive = (arg[0]['active'] == 1) + 1;

+                me.screenElements['nav' ~ arg[0]['active'] ~ '-id']

+                    .setColor(0,1,0);

+                me.screenElements['nav' ~ arg[0]['active'] ~ '-selected-freq']

+                    .setColor(0,1,0);

+                me.screenElements['NAV' ~ arg[0]['active'] ~ '-pointer']

+                    .show();

+#                me.screenElements['HDI']

+#                    .setRotation();

+                me.screenElements['nav' ~ inactive ~ '-id']

+                    .setColor(1,1,1);

+                me.screenElements['nav' ~ inactive ~ '-selected-freq']

+                    .setColor(1,1,1);

+#                me.screenElements['NAV' ~ inactive ~ '-pointer']

+#                    .hide();

+#                foreach (var e; [ 'FROM', 'TO', 'CDI' ])

+#                    me.screenElements['NAV' ~ inactive ~ '-' ~ e]

+#                        .hide();

+            }

+        }

+        if (contains(arg[0], 'tune')) {

+            me.screenElements['nav-freq-switch']

+                .setTranslation(0, (arg[0]['tune'] - 1) * 25);

+            me.screenElements['nav' ~ arg[0]['tune'] ~ '-standby-freq']

+                .setColor(0,1,1);

+            me.screenElements['nav' ~ ((arg[0]['tune'] == 1) + 1) ~ '-standby-freq']

+                .setColor(1,1,1);

+        }

+        if (contains(arg[0], 'nav-id')) {

+            var navid = getprop('/instrumentation/nav[' ~ (arg[0]['nav-id'] - 1) ~ ']/nav-id');

+            if (navid == nil)

+                navid = '';

+            me.screenElements["nav" ~ arg[0]['nav-id'] ~ "-id"]

+                    .setText(navid); # veut pas exister au début...

+        }

+        if (contains(arg[0], 'refresh')) {

+            me.screenElements['nav' ~ arg[0].refresh ~ '-selected-freq']

+                .setText(getprop('/instrumentation/nav[' ~ (arg[0].refresh - 1) ~ ']/frequencies/selected-mhz-fmt'));

+            me.screenElements['nav' ~ arg[0].refresh ~ '-standby-freq']

+                .setText(getprop('/instrumentation/nav[' ~ (arg[0].refresh - 1) ~ ']/frequencies/standby-mhz-fmt'));

+        }

+        if (contains(arg[0], 'set')) {

+            var n = getprop('/instrumentation/zkv1000/radios/nav-tune');

+            me.screenElements['nav' ~ (n + 1) ~ '-standby-freq']

+                .setText(getprop('/instrumentation/nav[' ~ n ~ ']/frequencies/standby-mhz-fmt'));

+        }

+        if (contains(arg[0], 'auto')) {

+            me.updateNAV({refresh: 1});

+            settimer(func me.updateNAV({refresh: 2}), 1);

+            settimer(func me.updateNAV({auto:1}),     2);

+        }

+    },

 };

@@ -6044,7 +6044,7 @@

         </g>

       </g>

       <g

-         id="HDI"

+         id="CDI"

          inkscape:label="HDI"

          style="display:inline">

         <circle

@@ -6536,13 +6536,29 @@

      id="NAV"

      inkscape:label="NAV"

      style="display:inline">

+    <rect

+       y="28.10227"

+       x="80.601486"

+       height="22.993343"

+       width="72.99334"

+       id="nav2-standby-tuning"

+       style="display:none;fill:none;fill-opacity:0;stroke:#9bd8d9;stroke-width:1.00665724;stroke-opacity:1"

+       inkscape:label="nav2-standby-tuning" />

+    <rect

+       y="28.10227"

+       x="181.57742"

+       height="22.993343"

+       width="72.99334"

+       id="nav2-selected-tuning"

+       style="display:none;fill:none;fill-opacity:0;stroke:#9bd8d9;stroke-width:1.00665724;stroke-opacity:1"

+       inkscape:label="nav2-selected-tuning" />

     <rect

        y="4.1022692"

        x="80.577423"

        height="22.993343"

        width="72.99334"

        id="nav1-standby-tuning"

-       style="fill:none;fill-opacity:0;stroke:#9bd8d9;stroke-width:1.00665724;stroke-opacity:1"

+       style="display:none;fill:none;fill-opacity:0;stroke:#9bd8d9;stroke-width:1.00665724;stroke-opacity:1"

        inkscape:label="nav1-standby-tuning" />

     <rect

        y="4.1022692"

@@ -6550,88 +6566,90 @@

        height="22.993343"

        width="72.99334"

        id="nav1-selected-tuning"

-       style="display:inline;fill:none;fill-opacity:0;stroke:#9bd8d9;stroke-width:1.00665724;stroke-opacity:1"

+       style="display:none;fill:none;fill-opacity:0;stroke:#9bd8d9;stroke-width:1.00665724;stroke-opacity:1"

        inkscape:label="nav1-selected-tuning" />

-    <path

-       inkscape:connector-curvature="0"

-       id="nav1-switch"

-       d="m 161.57604,12.096987 -3.99804,3.998045 -6.2e-4,1.008425 3.99805,3.998055 -0.004,-2 -0.99547,-0.995475 v -1.00391 l 12.00453,-6.2e-4 -0.0202,2.015015 -0.97708,-0.01901 -0.005,2.00143 3.99938,-3.99938 -10e-4,-0.998665 -4.0025,-4.001955 0.004,1.999995 0.99805,0.99805 -0.004,1 h -11.99609 l 0.006,-0.99743 0.99608,-0.99609 z"

-       style="fill:#9bd8d9;fill-opacity:1;stroke:#9bd8d9;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"

-       inkscape:label="nav1-switch" />

     <text

        transform="scale(0.85708105,1.1667508)"

        id="nav1-selected-freq"

-       y="21.086628"

-       x="254.4381"

+       y="20.658087"

+       x="214.1853"

        style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'Sans Bold';text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none"

        xml:space="preserve"

        inkscape:label="nav1-selected-freq"><tspan

          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20.95271873px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold'"

-         y="21.086628"

-         x="254.4381"

+         y="20.658087"

+         x="214.1853"

          id="tspan4111"

          sodipodi:role="line">123.45</tspan></text>

     <text

        transform="scale(0.85708105,1.1667508)"

        id="nav1-standby-freq"

-       y="21.086628"

-       x="136.5963"

+       y="20.658087"

+       x="112.3863"

        style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'Sans Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#ffffff;fill-opacity:1;stroke:none"

        xml:space="preserve"

        inkscape:label="nav1-standby-freq"><tspan

          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20.95271873px;line-height:125%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1"

-         y="21.086628"

-         x="136.5963"

+         y="20.658087"

+         x="112.3863"

          id="tspan4111-8"

          sodipodi:role="line">123.45</tspan></text>

-    <rect

-       y="28.10227"

-       x="80.601486"

-       height="22.993343"

-       width="72.99334"

-       id="nav2-standby-tuning"

-       style="display:inline;fill:none;fill-opacity:0;stroke:#9bd8d9;stroke-width:1.00665724;stroke-opacity:1"

-       inkscape:label="nav2-standby-tuning" />

-    <rect

-       y="28.10227"

-       x="181.57742"

-       height="22.993343"

-       width="72.99334"

-       id="nav2-selected-tuning"

-       style="display:inline;fill:none;fill-opacity:0;stroke:#9bd8d9;stroke-width:1.00665724;stroke-opacity:1"

-       inkscape:label="nav2-selected-tuning" />

-    <path

-       inkscape:connector-curvature="0"

-       id="nav2-switch"

-       d="m 161.57275,35.094417 -3.99804,3.998045 -6.2e-4,1.008425 3.99805,3.998055 -0.004,-2 -0.99547,-0.995475 v -1.00391 l 12.00453,-6.2e-4 -0.0202,2.015015 -0.97708,-0.01901 -0.005,2.00143 3.99938,-3.99938 -0.001,-0.998665 -4.0025,-4.001955 0.004,1.999995 0.99805,0.99805 -0.004,1 h -11.99609 l 0.006,-0.99743 0.99608,-0.99609 z"

-       style="display:inline;fill:#9bd8d9;fill-opacity:1;stroke:#9bd8d9;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"

-       inkscape:label="nav2-switch" />

     <text

        transform="scale(0.85708105,1.1667508)"

        id="nav2-selected-freq"

        y="41.656574"

-       x="254.4381"

+       x="214.76868"

        style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'Sans Bold';text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#ffffff;fill-opacity:1;stroke:none"

        xml:space="preserve"

        inkscape:label="nav2-selected-freq"><tspan

          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20.95271873px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold'"

          y="41.656574"

-         x="254.4381"

+         x="214.76868"

          id="tspan4111-9"

          sodipodi:role="line">123.45</tspan></text>

     <text

        transform="scale(0.85708105,1.1667508)"

        id="nav2-standby-freq"

        y="41.656574"

-       x="136.5963"

+       x="112.3863"

        style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'Sans Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#ffffff;fill-opacity:1;stroke:none"

        xml:space="preserve"

        inkscape:label="nav2-standby-freq"><tspan

          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20.95271873px;line-height:125%;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1"

          y="41.656574"

-         x="136.5963"

+         x="112.3863"

          id="tspan4111-9-4"

          sodipodi:role="line">123.45</tspan></text>

+    <text

+       xml:space="preserve"

+       style="font-style:normal;font-weight:normal;font-size:18.66666603px;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"

+       x="219.32292"

+       y="21.999998"

+       id="nav1-id"

+       inkscape:label="nav1-id"><tspan

+         sodipodi:role="line"

+         id="tspan4989"

+         x="219.32292"

+         y="21.999998"

+         style="fill:#ffffff">XXX</tspan></text>

+    <text

+       xml:space="preserve"

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

+       x="219.32292"

+       y="47.054035"

+       id="nav2-id"

+       inkscape:label="nav2-id"><tspan

+         sodipodi:role="line"

+         id="tspan4989-6"

+         x="219.32292"

+         y="47.054035"

+         style="fill:#ffffff">XXX</tspan></text>

+    <path

+       inkscape:connector-curvature="0"

+       id="nav-freq-switch"

+       d="m 134.82604,11.203026 -3.99804,3.998045 -6.2e-4,1.008425 3.99805,3.998055 -0.004,-2 -0.99547,-0.995475 v -1.00391 l 12.00453,-6.2e-4 -0.0202,2.015015 -0.97708,-0.01901 -0.005,2.00143 3.99938,-3.99938 -10e-4,-0.998665 -4.0025,-4.001955 0.004,1.999995 0.99805,0.99805 -0.004,1 h -11.99609 l 0.006,-0.99743 0.99608,-0.99609 z"

+       style="fill:#9bd8d9;fill-opacity:1;stroke:#9bd8d9;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"

+       inkscape:label="nav-freq-switch" />

   </g>

   <g

      transform="translate(-1.0643769e-6)"

@@ -7487,7 +7505,7 @@

   <g

      id="Failures"

      inkscape:label="Failures"

-     style="display:none">

+     style="display:inline">

     <g

        id="NoAttitude"

        transform="translate(0.00225444,0.25658069)"

@@ -193,17 +193,8 @@

           <property>/instrumentation/zkv1000/device[1]/status</property>

         </condition>

        <command>nasal</command>

-       <script>zkv1000.device[1].buttons.AsSwitchNav(1);</script>

+       <script>zkv1000.device[1].buttons.AsSwitchNAV();</script>

       </binding>

-      <mod-up>

-        <binding>

-          <condition>

-            <property>/instrumentation/zkv1000/device[1]/status</property>

-          </condition>

-          <command>nasal</command>

-          <script>zkv1000.device[1].buttons.AsSwitchNav(0);</script>

-        </binding>

-      </mod-up>

     </action>

   </animation>

@@ -217,7 +208,7 @@

           <property>/instrumentation/zkv1000/device[1]/status</property>

         </condition>

         <command>property-toggle</command>

-        <property>/instrumentation/zkv1000/radios/nav-selected</property>

+        <property>/instrumentation/zkv1000/radios/nav-tune</property>

       </binding>

     </action>

   </animation>

@@ -236,6 +227,16 @@

         <max>118.000</max>

         <wrap>true></wrap>

       </binding>

+      <binding>

+        <condition>

+          <property>/instrumentation/zkv1000/device[0]/status</property>

+        </condition>

+        <command>nasal</command>

+        <script>

+          zkv1000.device[0].display.updateNAV({set:1});

+          zkv1000.device[1].display.updateNAV({set:1});

+        </script>

+      </binding>

     </action>

     <shift-action>

       <binding>

@@ -246,6 +247,16 @@

         <property>/instrumentation/zkv1000/radios/nav-freq-mhz</property>

         <factor>0.50</factor>

       </binding>

+      <binding>

+        <condition>

+          <property>/instrumentation/zkv1000/device[0]/status</property>

+        </condition>

+        <command>nasal</command>

+        <script>

+          zkv1000.device[0].display.updateNAV({set:1});

+          zkv1000.device[1].display.updateNAV({set:1});

+        </script>

+      </binding>

     </shift-action>

   </animation>

@@ -204,17 +204,8 @@

           <property>/instrumentation/zkv1000/device[0]/status</property>

         </condition>

        <command>nasal</command>

-       <script>zkv1000.device[0].buttons.AsSwitchNav(1);</script>

+       <script>zkv1000.device[0].buttons.AsSwitchNAV();</script>

       </binding>

-      <mod-up>

-        <binding>

-          <condition>

-            <property>/instrumentation/zkv1000/device[0]/status</property>

-          </condition>

-          <command>nasal</command>

-          <script>zkv1000.device[0].buttons.AsSwitchNav(0);</script>

-        </binding>

-      </mod-up>

     </action>

   </animation>

@@ -228,7 +219,7 @@

           <property>/instrumentation/zkv1000/device[0]/status</property>

         </condition>

         <command>property-toggle</command>

-        <property>/instrumentation/zkv1000/radios/nav-selected</property>

+        <property>/instrumentation/zkv1000/radios/nav-tune</property>

       </binding>

     </action>

   </animation>

@@ -247,6 +238,16 @@

         <max>118.000</max>

         <wrap>true></wrap>

       </binding>

+      <binding>

+        <condition>

+          <property>/instrumentation/zkv1000/device[0]/status</property>

+        </condition>

+        <command>nasal</command>

+        <script>

+          zkv1000.device[0].display.updateNAV({set:1});

+          zkv1000.device[1].display.updateNAV({set:1});

+        </script>

+      </binding>

     </action>

     <shift-action>

       <binding>

@@ -257,6 +258,16 @@

         <property>/instrumentation/zkv1000/radios/nav-freq-mhz</property>

         <factor>0.50</factor>

       </binding>

+      <binding>

+        <condition>

+          <property>/instrumentation/zkv1000/device[0]/status</property>

+        </condition>

+        <command>nasal</command>

+        <script>

+          zkv1000.device[0].display.updateNAV({set:1});

+          zkv1000.device[1].display.updateNAV({set:1});

+        </script>

+      </binding>

     </shift-action>

   </animation>