@@ -1,6 +1,35 @@

 var PFD = nil;

 var MFD = nil;

+data = { # set of data common to all devices

+    roll : 0,

+    pitch : 0,

+    vsi : 0,

+    ias : 0,

+    alt : 0,

+    hdg : 0,

+    wow : 1,

+    timers : {

+        '20Hz': maketimer (

+            0.05,

+            func {

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

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

+                data.vsi = getprop('/instrumentation/vertical-speed-indicator/indicated-speed-fpm');

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

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

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

+            }

+        ),

+        '1Hz': maketimer (

+            1,

+            func {

+                data.wow = getprop('/gear/gear/wow');

+            }

+        ),

+    },

+};

+

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

 var setListeners = func {

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

@@ -195,9 +195,10 @@ var displayClass = {

             me.loadGroup(groups);

+            foreach (var freq; keys(data.timers))

+                data.timers[freq].start();

+

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

-                me.update20Hz();

-                me.update1Hz();

                 me.updateAI();

                 me.updateVSI();

                 me.updateIAS();

@@ -452,36 +453,10 @@ var displayClass = {

     },

 #}}}

-    update20Hz : func {

-# 20Hz updates roll, pitch, VSI, IAS, altitude and HDG {{{

-        me._updated_roll = getprop('/orientation/roll-deg');

-        me._updated_pitch = getprop('orientation/pitch-deg');

-        me._updated_vsi = getprop('/instrumentation/vertical-speed-indicator/indicated-speed-fpm');

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

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

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

-        settimer(func me.update20Hz(), 0.05);

-     },

-    _updated_roll : 0,

-    _updated_pitch : 0,

-    _updated_vsi : 0,

-    _updated_ias : 0,

-    _updated_alt : 0,

-    _updated_hdg : 0,

-#}}}

-

-    update1Hz : func {

-# 1Hz updates {{{

-        me._updated_wow = getprop('/gear/gear/wow');

-        settimer(func me.update20Hz(), 1);

-    },

-    _updated_wow : 1,

-#}}}

-

     updateAI: func(){

 #{{{

-        var pitch = me._updated_pitch;

-        var roll = me._updated_roll;

+        var pitch = data.pitch;

+        var roll = data.roll;

         if (pitch > 80)

             pitch = 80;

         elsif (pitch < -80)

@@ -500,7 +475,7 @@ var displayClass = {

     updateVSI: func () {

 # animate VSI {{{

-        var vsi = me._updated_vsi;

+        var vsi = data.vsi;

         me.screenElements.VSIText

             .setText(num(math.round(vsi, 10)));

         if (vsi > 4500)

@@ -515,7 +490,7 @@ var displayClass = {

     updateIAS: func () {

 # animates the IAS lint (PFD) {{{

-        var ias = me._updated_ias;

+        var ias = data.ias;

         if (ias >= 10)

             me.screenElements.Speed110

                 .setText(sprintf("% 2u",num(math.floor(ias/10))));

@@ -575,7 +550,7 @@ var displayClass = {

     updateALT: func () {

 # animates the altitude lint (PFD) {{{

-        var alt = me._updated_alt;

+        var alt = data.alt;

         if (alt < 0)

             me.screenElements.Alt11100

                 .setText(sprintf("% 3i",math.ceil(alt/100)));

@@ -743,7 +718,7 @@ var displayClass = {

     updateHSI : func () {

 # rotates the compass (PFD) {{{

-        var hdg = me._updated_hdg;

+        var hdg = data.hdg;

         me.screenElements.Rose

             .setRotation(-hdg * D2R);

         me.screenElements['HDG-text']

@@ -796,7 +771,7 @@ var displayClass = {

         if (! PFD.display.screenElements['SelectedALT'].getVisible())

             return;

         var selected_alt = getprop('/instrumentation/zkv1000/afcs/selected-alt-ft');

-        var delta_alt = me._updated_alt - selected_alt;

+        var delta_alt = data.alt - selected_alt;

         if (abs(delta_alt) > 300)

             delta_alt = 300 * abs(delta_alt)/delta_alt;

         me.screenElements['SelectedALT-symbol']

@@ -825,7 +800,7 @@ var displayClass = {

         }

         else {

             var course = getprop('/instrumentation/zkv1000/cdi/course');

-            var rot = (course - me._updated_hdg) * D2R;

+            var rot = (course - data.hdg) * D2R;

             me.screenElements['CDI']

                 .setRotation(rot)

                 .show();

@@ -1037,12 +1012,12 @@ var displayClass = {

 # update the window text and arrows for OPTN1/2 {{{

         if (me._winddata_optn == 0)

             return;

-        if (me._updated_ias < 30) {

+        if (data.ias < 30) {

             me.screenElements['WindData-NODATA']

                 .hide();

             var wind_hdg = getprop('/environment/wind-from-heading-deg');

             var wind_spd = getprop('/environment/wind-speed-kt');

-            var alpha = wind_hdg - me._updated_hdg;

+            var alpha = wind_hdg - data.hdg;

             if (me._winddata_optn == 1) {

                 me.screenElements['WindData-OPTN1-HDG']

                     .setRotation((alpha + 180) * D2R)

@@ -1140,7 +1115,7 @@ var displayClass = {

                 if (info.pointer)

                     me.screenElements[el ~ '-pointer']

-                        .setRotation(-info.hdg-me._updated_hdg * D2R)

+                        .setRotation(-info.hdg - data.hdg * D2R)

                         .show();

                 else

                     me.screenElements[el ~ '-pointer']