@@ -17,12 +17,12 @@ displayClass.MFD = {

                 {text: 'DATA FIELD NUMBER', type: 'normal'},

                 {text: '  1 >', type: 'selected|end-of-line', choices: ['  1 >', '< 2 >', '< 3 >', '< 4  ']},

             ];

-            var column = 0;

-            var colmax = 5;

-            foreach (var text; me.device.display.updateNavigationBox(1)) {

+            foreach (var item; keys(me.device.display.navbox)) {

+                if (item == 'LEG') # LEG only displayed on PFD navigation box

+                    continue;

                 append(obj_infos, {

-                    text: sprintf('%-5s', text),

-                    type: 'editable' ~ ((column == colmax) ? '|end-of-line' : ''),

+                    text: sprintf('%-3s ', item),

+                    type: 'editable',

                     callback: func (id, selected) {

                         var field = string.trim(me.device.windows.state[id].objects[3].text,

                                                 0,

@@ -31,7 +31,10 @@ displayClass.MFD = {

                             .setText(string.trim(me.device.windows.state[id].objects[selected].text, 1));

                     }

                 });

-                column += (column < colmax) ? 1 : -column;

+                append(obj_infos, {

+                    text: sprintf('(%s)', me.device.display.navbox[item][1]),

+                    type: 'normal|end-of-line',

+                });

             }

             var windowId = 'SYSTEM SETUP';

             me.device.windows.draw( windowId, obj_infos );

@@ -213,6 +213,95 @@ var displayClass = {

                 left: contains(m.screenElements, 'EIS') ? math.ceil(m.screenElements['EIS'].getTransformedBounds()[2]) : 0,

             };

         }

+

+        m.navbox = {

+# {{{ the data to show info in navbox

+            DTK: [func {

+                var dtk = getprop('/instrumentation/gps/wp/wp[1]/desired-course-deg');

+                if (dtk == nil)

+                    return '---°';

+                else

+                    return sprintf('%03i°', dtk);

+            }, 'Desired Track'],

+            ETE: [func {

+                if (data.fpSize == 0) return '--:--';

+                var eta = getprop('/autopilot/route-manager/wp/eta');

+                return sprintf('%5s', eta != nil ? eta : '--:--');

+            }, 'Estimated Time Enroute'],

+            TDR: [func {

+                if (data.fpSize == 0) return '---NM';

+                var dist = getprop('/autopilot/route-manager/distance-remaining-nm');

+                if (dist != nil)

+                    return sprintf(dist < 100 ? '%2.1fNM' : '%3iNM', dist);

+                else

+                    return '---NM';

+            }, 'Total Distance Remaining'],

+            DIS: [func {

+                if (data.fpSize == 0) return '---NM';

+                var dist = getprop('/autopilot/route-manager/wp/dist');

+                if (dist != nil)

+                    return sprintf(dist < 100 ? '%2.1fNM' : '%3iNM', dist);

+                else

+                    return '---NM';

+            }, 'Distance remaining'],

+            LEG: [func {

+                if (data.fpSize == 0) return '';

+                var route = m.device.map.layers.route;

+                var wp = route.flightPlan[route.currentLeg.index];

+                return sprintf(' %s %s %s', wp[0].name, utf8.chstr(9658), wp[1].name);

+            }, ''], # not listed in MFD menu, on PFD only the leg is shown not the item

+            LDG: [func {

+                var eteSeconds = getprop('/autopilot/route-manager/ete');

+                var eteHours = math.floor(eteSeconds / 3600);

+                var eteMinutes = int((eteSeconds - (eteHours * 3600)) / 60);

+                return sprintf(eteHours > 99 ? '--:--' : '%02i:%02i', eteHours, eteMinutes);

+            }, 'ETA at Final Destination'],

+            END: [func {

+                var total_fuel = getprop('/consumables/fuel/total-fuel-gals');

+                var gs = getprop('/velocities/groundspeed-kt');

+                var consumption = 0;

+                foreach(var engine; props.globals.getNode('/engines').getChildren('engine')) {

+                    var ec = engine.getValue('fuel-flow-gph');

+                    consumption += ec != nil ? ec : 0;

+                }

+                if (consumption > 0 and gs > 0)

+                    return sprintf('%3iNM', (total_fuel * gs) / consumption);

+                else

+                    return '---NM';

+            }, 'Endurance'],

+            ETA: [func {

+                var eteSeconds = getprop('/autopilot/route-manager/ete');

+                var eta_hours = getprop('/sim/time/utc/hour');

+                var eteHours = math.floor(eteSeconds / 3600);

+                if (eteHours > 12)

+                    return '--:--';

+                var eta_minutes = int((eteSeconds - (eteHours * 3600)) / 60) + getprop('/sim/time/utc/minute');

+                if (eta_minutes > 59) {

+                    eta_minutes -= 60;

+                    eta_hours += 1;

+                }

+                eta_hours += eteHours;

+                if (eta_hours > 23)

+                    eta_hours -= 24;

+                return sprintf('%02i:%02i', eta_hours, eta_minutes);

+            }, 'Estimated Time of Arrival'],

+            GS:  [func return sprintf('%3iKT', getprop('/velocities/groundspeed-kt')), 'Ground Speed'],

+            TRK: [func return sprintf('%03i°', getprop('/orientation/track-deg')), 'Track'],

+            TAS: [func return sprintf('%i', getprop('/instrumentation/airspeed-indicator/true-speed-kt')), 'True Air Speed'],

+            FOB: [func { return sprintf('%3ilbs', getprop('/consumables/fuel/total-fuel-lbs')); }, 'Fuel on Board'],

+#            BRG: [func return '---°', 'Bearing'],

+#            ESA: [func return '-----', 'Enroute Safe Altitude'],

+#            ISA: [func return '-----', 'ISA Relative Temperature'],

+#            MSA: [func return '----ft', 'Minimum Safe Altitude'],

+#            TKE: [func return ' ---°', 'Track Angle Error'],

+#            VSR: [func return ' ----', 'Vertical Speed Required'],

+#            XTK: [func return ' ---NM', 'Crosstrack Error'],

+# }}}

+        };

+        if (m.device.role == 'PFD')

+            foreach (var item; keys(m.navbox))

+                if (item != 'LEG' and item != 'DIS' and item != 'ETE')

+                    delete(m.navbox, item);

         return m;

     },

 #}}}

@@ -448,67 +537,25 @@ var displayClass = {

     },

 #}}}

-    updateNavigationBox : func (getDataFields = 0) {

+    updateNavigationBox : func {

 # update Navigation Box on MFD and PFD header {{{

         var enroute = getprop('/autopilot/route-manager/current-wp') > -1;

         var route = me.device.map.layers.route;

-        var fpSize = size(route.flightPlan);

-        var navbox = {

-            DTK: func {

-                var dtk = getprop('/instrumentation/gps/wp/wp[1]/desired-course-deg');

-                if (dtk == nil)

-                    return '---°';

-                else

-                    return sprintf('%03i°', dtk);

-            },

-            ETE: func {

-                if (fpSize == 0) return '--:--';

-                var eteSeconds = getprop('/autopilot/route-manager/ete');

-                var eteHours = math.floor(eteSeconds / 3600);

-                var eteMinutes = int((eteSeconds - (eteHours * 3600)) / 60);

-                return sprintf(eteHours > 99 ? '--:--' : '%02i:%02i', eteHours, eteMinutes);

-            },

-            DIS: func {

-                if (fpSize == 0) return '---NM';

-                var dist = getprop('/autopilot/route-manager/distance-remaining-nm');

-                return sprintf(dist < 100 ? '%2.1fNM' : '%3iNM', dist);

-            },

-            LEG: func {

-                if (fpSize == 0) return '';

-                var wp = route.flightPlan[route.currentLeg.index];

-                return sprintf(' %s %s %s', wp[0].name, utf8.chstr(9658), wp[1].name);

-            },

-            GS : func return sprintf('%iKT', getprop('/velocities/groundspeed-kt')),

-            TRK: func return sprintf('%03i°', getprop('/orientation/track-deg')),

-            TAS: func return sprintf('%i', getprop('/instrumentation/airspeed-indicator/true-speed-kt')),

-            BRG: func return '---°',

-            END: func return '---NM',

-            ESA: func return '-----',

-            ETA: func return '--:--',

-            FOB: func return '---lbs',

-            ISA: func return '-----',

-            LDG: func return '--:--',

-            MSA: func return '----ft',

-            TKE: func return '---°',

-            VSR: func return '----',

-            XTK: func return '---NM',

-        };

-        if (getDataFields)

-            return keys(navbox);

+        data.fpSize = size(route.flightPlan);

         if (me.device.role == 'MFD') {

             for (var i=1; i<=4; i+=1)

                 me.screenElements['DATA-FIELD' ~ i ~ '-VAL-text']

                     .setVisible(enroute)

                     .setText(

-                        navbox[me.screenElements['DATA-FIELD' ~ i ~ '-ID-text'].setVisible(enroute).get('text')]()

+                        me.navbox[me.screenElements['DATA-FIELD' ~ i ~ '-ID-text'].setVisible(enroute).get('text')][0]()

                     );

         }

         else { # PFD

             me.screenElements['ETE'].setVisible(enroute);

             me.screenElements['DIS'].setVisible(enroute);

-            me.screenElements['ETE-text'].setVisible(enroute).setText(navbox.ETE());

-            me.screenElements['DIS-text'].setVisible(enroute).setText(navbox.DIS());

-            me.screenElements['LEG-text'].setVisible(enroute).setText(navbox.LEG());

+            me.screenElements['ETE-text'].setVisible(enroute).setText(me.navbox.ETE[0]());

+            me.screenElements['DIS-text'].setVisible(enroute).setText(me.navbox.DIS[0]());

+            me.screenElements['LEG-text'].setVisible(enroute).setText(me.navbox.LEG[0]());

         }

     },

 #}}}