@@ -39,13 +39,16 @@ var displayClass = {

                     'SoftKeysTexts', 

                     'COMM', 

                     'NAV', 

+                    'nav-freq-switch',

+                    'comm-freq-switch',

                 ],

-                hide : [ ],

                 text: [

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

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

-                    'nav-freq-switch',

+                    'comm1-standby-freq', 'comm1-selected-freq',

+                    'comm2-standby-freq', 'comm2-selected-freq',

                 ],

+                hide : [ ],

                 clip: [ ],

             };

             if (me.role == 'PFD') {

@@ -99,7 +102,8 @@ var displayClass = {

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

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

             }

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

+            me._updateRadio({auto:'nav'});

+            me._updateRadio({auto:'comm'});

             me.progress.removeAllChildren();

             me.progress = nil;

             me.showInitProgress = nil;

@@ -402,37 +406,85 @@ var displayClass = {

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

     },

+    _updateRadio: func {

+        # arg[0]._r = <comm|nav>

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

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

+                me.screenElements[arg[0]._r ~ '1-selected-freq']

+                    .setColor(1,1,1);

+                me.screenElements[arg[0]._r ~ '2-selected-freq']

+                    .setColor(1,1,1);

+            }

+            else {

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

+                    .setColor(0,1,0);

+                me.screenElements[arg[0]._r ~ arg[0].inactive ~ '-selected-freq']

+                    .setColor(1,1,1);

+            }

+        }

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

+            # n = 0 -> NAV1/COMM1

+            # n = 1 -> NAV1/COMM2

+            me.screenElements[arg[0]._r ~ '-freq-switch']

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

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

+                .setColor(0,1,1);

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

+                .setColor(1,1,1);

+        }

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

+            # rafraichi une seule ligne NAV1/COMM1 ou NAV2/COMM2

+            var fmt = (arg[0]._r == 'nav') ? '%.2f' : '%.3f';

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

+                .setText(sprintf(fmt, getprop('/instrumentation/'

+                               ~ arg[0]._r ~ '[' ~ (arg[0].refresh - 1) ~ ']/frequencies/selected-mhz')));

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

+                .setText(sprintf(fmt, getprop('/instrumentation/'

+                               ~ arg[0]._r ~ '[' ~ (arg[0].refresh - 1) ~ ']/frequencies/standby-mhz')));

+        }

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

+            # positionne la valeur modifiée, les listeners "trigguent" en permanence ces propriétés, donc exit

+            var n = getprop('/instrumentation/zkv1000/radios/' ~ arg[0]._r ~ '-tune');

+            var fmt = (arg[0]._r == 'nav') ? '%.2f' : '%.3f';

+            me.screenElements[arg[0]._r ~ (n + 1) ~ '-standby-freq']

+                .setText(getprop('/instrumentation/' ~ arg[0]._r ~ '[' ~ n ~ ']/frequencies/standby-mhz'));

+        }

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

+            # pour rafraichir automagiquement, toutes les deux secondes un refresh pour un NAV

+            var radio = arg[0].auto;

+            me._updateRadio({refresh: 1, _r: radio});

+            settimer(func me._updateRadio({refresh: 2, _r: radio}), 1);

+            settimer(func me._updateRadio({auto: radio}), 2);

+        }

+    },

+

     updateNAV : func {

         # made active via menu

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

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

+                arg[0]._r = 'nav';

+                me._updateRadio(arg[0]);

                 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;

+                arg[0]._r = 'nav';

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

+                me._updateRadio(arg[0]);

                 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['nav' ~ arg[0].inactive ~ '-id']

+                    .setColor(1,1,1);

 #                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' ])

@@ -440,43 +492,21 @@ var displayClass = {

 #                        .hide();

             }

         }

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

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

-            # n = 0 -> NAV1

-            # n = 1 -> NAV2

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

-                .setTranslation(0, n * 25);

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

-                .setColor(0,1,1);

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

-                .setColor(1,1,1);

-        }

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

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

             # TODO: récupérer la valeur via les paramètres transmis du listener

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

-            if (navid == nil)

-                navid = '';

+            if (arg[0].val == nil)

+                arg[0].val = '';

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

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

-        }

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

-            # rafraichi une seule ligne NAV1 ou NAV2

-            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')) {

-            # positionne la valeur modifiée, les listeners "trigguent" en permanence ces propriétés, donc exit

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

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

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

+                    .setText(arg[0].val);

         }

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

-            # pour rafraichir automagiquement, toutes les deux secondes un refresh pour un NAV

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

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

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

+        else {

+            arg[0]._r = 'nav';

+            me._updateRadio(arg[0]);

         }

     },

+

+    updateCOMM: func {

+        arg[0]._r = 'comm';

+        me._updateRadio(arg[0]);

+    },

 };

@@ -6718,28 +6718,12 @@

      id="COMM"

      inkscape:label="COMM"

      style="display:inline">

-    <rect

-       y="4.5491962"

-       x="760.00391"

-       height="22.948854"

-       width="86.902672"

-       id="comm1-selected-tuning"

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

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

-    <rect

-       y="4.5455642"

-       x="870.99341"

-       height="22.952444"

-       width="86.902588"

-       id="comm1-standby-tuning"

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

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

     <path

        inkscape:connector-curvature="0"

-       id="comm1-switch"

+       id="comm-freq-switch"

        d="m 853.98671,12.608238 -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="display:inline;fill:#9bd8d9;fill-opacity:1;stroke:#9bd8d9;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"

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

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

     <text

        transform="scale(0.85708105,1.1667508)"

        id="comm1-standby-freq"

@@ -6766,28 +6750,6 @@

          x="937.43207"

          id="tspan4111-8-3"

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

-    <rect

-       y="28.549196"

-       x="760.00391"

-       height="22.948854"

-       width="86.902672"

-       id="comm2-selected-tuning"

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

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

-    <rect

-       y="28.545565"

-       x="870.99341"

-       height="22.952444"

-       width="86.902588"

-       id="comm2-standby-tuning"

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

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

-    <path

-       inkscape:connector-curvature="0"

-       id="comm2-switch"

-       d="m 853.98342,35.605668 -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="display:inline;fill:#9bd8d9;fill-opacity:1;stroke:#9bd8d9;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"

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

     <text

        transform="scale(0.85708105,1.1667508)"

        id="comm2-standby-freq"

@@ -420,12 +420,13 @@

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

         </condition>

         <command>property-toggle</command>

-        <property>/intrumentation/zkv1000/radios/comm-selected</property>

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

       </binding>

     </action>

   </animation>

   <animation>

     <type>knob</type>

+    <object-name>ComInner</object-name>

     <action>

       <binding>

         <condition>

@@ -431,12 +431,13 @@

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

         </condition>

         <command>property-toggle</command>

-        <property>/intrumentation/zkv1000/radios/comm-selected</property>

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

       </binding>

     </action>

   </animation>

   <animation>

     <type>knob</type>

+    <object-name>ComInner</object-name>

     <action>

       <binding>

         <condition>