@@ -42,6 +42,12 @@ var setListeners = func {

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

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

             }, 1, 2);

+    setlistener('/instrumentation/zkv1000/radios/nav-tune',

+            func {

+                setNavTune();

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

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

+            }, 1, 2);

 }

 var deviceClass = {

@@ -429,14 +429,18 @@ var displayClass = {

             }

         }

         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, (arg[0]['tune'] - 1) * 25);

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

+                .setTranslation(0, n * 25);

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

                 .setColor(0,1,1);

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

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

                 .setColor(1,1,1);

         }

         if (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 = '';

@@ -444,17 +448,20 @@ var displayClass = {

                     .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'));

         }

         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);

@@ -2,15 +2,14 @@

 # the order could be important as some files need other one to be loaded first

 files_to_load = [

     'lib.nas',     # some useful functions, should stay first loaded

-    'menu.nas',    # manages menu entries andd perform some simple actions

+    'radios.nas',  # all about radios COMM, NAV, XPDR

     'knobs.nas',   # handles knobs

     'buttons.nas', # handles knobs and buttons

     'softkeys.nas',# handles softkeys and menus items

     'display.nas',

-    'canvas.nas',

     'core.nas',    # the scheduler and switch on button

 ];

-#    'radios.nas',  # all about radios COMM, NAV, XPDR

+#    'menu.nas',    # manages menu entries andd perform some simple actions

 #    'afcs.nas',    # Automatic Flight Control System

 #    'routes.nas',  # manages flightplans and routes

 #    'display.nas', # display messages and popups