@@ -1,2 +1,3 @@

 .*.swp

 *.pdf

+Docs/*

@@ -14,48 +14,51 @@ displayClass.showEIS = func (groups) {

 displayClass.updateEIS = func {

 # displays Engine Informations System

-    var power = getprop('/controls/engines/engine/throttle') * getprop('/engines/engine/running');

-    me.screenElements['POWER-pointer']

-        .setRotation(D2R * 140 * power);

-    me.screenElements['POWER-PERCENT-text']

-        .setText(sprintf('% 3u', power * 100));

-    me.screenElements['RPM-text']

-        .setText(sprintf(math.round(getprop('/engines/engine/rpm'), 50)));

-    me.screenElements['MAN-Hg-text']

-        .setText(sprintf('%.1d', getprop('/engines/engine/mp-inhg')));

-    me.screenElements['FUEL-FLOW-text']

-        .setText(sprintf('%.1f', getprop('/engines/engine/fuel-flow-gph')));

-    if (math.mod(me._eis_count, 10) == 0) {

-        var psi = getprop('/engines/engine/oil-pressure-psi');

-        me.screenElements['PSI-text']

-            .setText(psi == nil ? '--' : sprintf('%u', psi));

-        me.screenElements['OIL-TEMP-text']

-            .setText(sprintf('%i', getprop('/engines/engine/oil-temperature-degf')));

-        var full = getprop('/instrumentation/zkv1000/eis/fuel-qty-at-start');

-        var right = getprop('/consumables/fuel/tank/level-gal_us');

-        var left = getprop('/consumables/fuel/tank[1]/level-gal_us');

-        var used_fuel = full - (right + left);

-        me.screenElements['FUEL-USED-text']

-            .setText(sprintf('%.1d', used_fuel > 0 ? used_fuel : 0));

-        me.screenElements['FUEL-RIGHT-pointer']

-            .setTranslation(

-                    0,

-                    (1 - right / (full/2)) * -80

-                );

-        me.screenElements['FUEL-LEFT-pointer']

-            .setTranslation(

-                    0,

-                    (1 - left / (full/2)) * -80

-                );

-        me.screenElements['BUS-V-text']

-            .setText(sprintf('%.1i', getprop('/systems/electrical/outputs/bus')));

-        me.screenElements['BATT-text']

-            .setText(sprintf('%+i', getprop('/systems/electrical/amps')));

-        var cht = getprop('/engines/engine/cht-degf');

-        me.screenElements['CHT-text']

-            .setText(cht == nil ? '--' : sprintf('%i', cht));

-        me.screenElements['EGT-text']

-            .setText(sprintf('%i', getprop('/engines/engine/egt-degf')));

+    var running = getprop('/engines/engine/running');

+    if (running != nil) {

+        var power = getprop('/controls/engines/engine/throttle') * running;

+        me.screenElements['POWER-pointer']

+            .setRotation(D2R * 140 * power);

+        me.screenElements['POWER-PERCENT-text']

+            .setText(sprintf('% 3u', power * 100));

+        me.screenElements['RPM-text']

+            .setText(sprintf(math.round(getprop('/engines/engine/rpm'), 50)));

+        me.screenElements['MAN-Hg-text']

+            .setText(sprintf('%.1d', getprop('/engines/engine/mp-inhg')));

+        me.screenElements['FUEL-FLOW-text']

+            .setText(sprintf('%.1f', getprop('/engines/engine/fuel-flow-gph')));

+        if (math.mod(me._eis_count, 10) == 0) {

+            var psi = getprop('/engines/engine/oil-pressure-psi');

+            me.screenElements['PSI-text']

+                .setText(psi == nil ? '--' : sprintf('%u', psi));

+            me.screenElements['OIL-TEMP-text']

+                .setText(sprintf('%i', getprop('/engines/engine/oil-temperature-degf')));

+            var full = getprop('/instrumentation/zkv1000/eis/fuel-qty-at-start');

+            var right = getprop('/consumables/fuel/tank/level-gal_us');

+            var left = getprop('/consumables/fuel/tank[1]/level-gal_us');

+            var used_fuel = full - (right + left);

+            me.screenElements['FUEL-USED-text']

+                .setText(sprintf('%.1d', used_fuel > 0 ? used_fuel : 0));

+            me.screenElements['FUEL-RIGHT-pointer']

+                .setTranslation(

+                        0,

+                        (1 - right / (full/2)) * -80

+                    );

+            me.screenElements['FUEL-LEFT-pointer']

+                .setTranslation(

+                        0,

+                        (1 - left / (full/2)) * -80

+                    );

+            me.screenElements['BUS-V-text']

+                .setText(sprintf('%.1i', getprop('/systems/electrical/outputs/bus')));

+            me.screenElements['BATT-text']

+                .setText(sprintf('%+i', getprop('/systems/electrical/amps')));

+            var cht = getprop('/engines/engine/cht-degf');

+            me.screenElements['CHT-text']

+                .setText(cht == nil ? '--' : sprintf('%i', cht));

+            me.screenElements['EGT-text']

+                .setText(sprintf('%i', getprop('/engines/engine/egt-degf')));

+        }

     }

     settimer(func me.updateEIS(), 0.2);

     me._eis_count += 1;

@@ -94,6 +94,71 @@ var buttonsClass = {

         me.device.knobs.FmsInner = func;

     },

+    MapMenu : func (a = 0) {

+        if (a == 1)

+            return;

+        var menu_label = 'MAP MENU';

+        if (!contains(me.device.windows.window, menu_label ~ '-bg')) {

+            var level_min = 13;

+            var level_max = 7;

+            var levels = [ sprintf('  % 2u >', level_max) ];

+            for (var i = level_max + 1; i <= level_min; i += 1)

+                append(levels, sprintf(i < level_min ? '< % 2u >' : '< % 2u  ', i));

+            var orientation = [ '  NORTH UP >', '<  TRK UP  >' ];

+            if (getprop('/instrumentation/gps/route-distance-nm') != nil)

+                append(orientation, '<  DTK UP  >');

+            append(orientation, '<  HDG UP   ');

+            me.device.windows.draw(

+                    menu_label,

+                    {x: 720, y: 100, w: 300, l:3, sep: 1},

+                    [

+                        {text: menu_label, type: 'title'},

+                        {type: 'separator'},

+                        {text: 'ZOOM LEVEL', type: 'normal'},

+                        {text: sprintf('%s % 2u %s',

+                                me.device.data.zoom > level_max ? '<' : ' ',

+                                me.device.data.zoom,

+                                me.device.data.zoom < level_min ? '>' : ' '),

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

+                         choices: levels,

+                         callback: func (id, selected) {

+                             var z = me.device.windows.state[id].objects[selected].text;

+                             foreach (var c; [' ', '<', '>'])

+                                 z = string.replace(z, c, '');

+                             me.device.data.zoom = z;

+                             me.device.map.changeZoom();

+                             me.device.map.update();

+                         }

+                        },

+                        {text: 'ORIENTATION', type: 'normal'},

+                        {text: (func foreach (var o; orientation) if (find(me.device.data.orientation.text, o) > -1) return o;)(),

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

+                         choices: orientation,

+                         callback: func (id, selected) {

+                             var o = me.device.windows.state[id].objects[selected].text;

+                             o = substr(o, 2);

+                             o = substr(o, 0, size(o) - 2);

+                             o = string.trim(o);

+                             me.device.data.orientation.text = o;

+                             me.device.map.update();

+                         }

+                        },

+                    ]

+                );

+            me.device.knobs.FmsOuter = me.device.knobs.NavigateMenu;

+            me.device.knobs.FmsInner = me.device.knobs.MenuSettings;

+            me.device.buttons.CLR = me.device.buttons.MapMenu;

+            me.device.buttons.ENT = me.device.buttons.ValidateTMRREF;

+        }

+        else {

+            me.device.buttons.ENT = func;

+            me.device.buttons.CLR = func;

+            me.device.knobs.FmsInner = func;

+            me.device.knobs.FmsOuter = me.device.knobs.MFD_select_page_group;

+            me.device.windows.del(menu_label);

+        }

+    },

+

     DirectTo : void,

     MENU : void,

     FPL : void,

@@ -51,28 +51,32 @@ var deviceClass = {

             m.data[v ~ '-visible'] = 1;

         foreach (var v; ['screen-object', 'screen-view', 'screen-size'])

             m.data[v] = getprop('/instrumentation/zkv1000/' ~ name ~ '/' ~ v);

+

         m.display  = displayClass.new(m);

-        m.display.showInitProgress(m.name);

         m.softkeys = softkeysClass.new(m);

         m.buttons  = buttonsClass.new(m);

         m.knobs    = knobsClass.new(m);

-        m.display.loadsvg();

-        m.display.loadGroup({

-            hide : [

-                'Failures',

-                'SoftKeysTexts',

-                'PFD-Widgets', 

-                'COMM',

-                'XPDR-TIME', 

-                'NAV',

-                'FlightInstruments', 

-                'VDI',

-                'OMI',

-            ],

-            clip : 'PitchScale',

-        });

+        m.map = mapClass.new(m);

         m.windows  = pageClass.new(m);

-        zkv.getNode(m.name ~ '-init').setIntValue(0);

+

+        if (! contains(data.timers, 'map')) {

+            data.timers.map = maketimer(1, m, func {

+                    foreach (var d; keys(flightdeck))

+                        flightdeck[d].map.update();

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

+                    if (gspd != 0)

+                        var next = (me.data['range-nm']/(gspd/3600))/(me.display.display.get('view[1]')/2);

+                    else

+                        var next = 10;

+                    if (next > 10)

+                        next = 10;

+                    data.timers.map.restart(next);

+                });

+            data.timers.map.singleShot = 1;

+            data.timers.map.start();

+        }

+        m.display.showInitProgress();

+

         setprop('/instrumentation/zkv1000/' ~ m.name ~ '/status', 1);

         msg(m.name ~ ' switched on!');

         return m;

@@ -6,66 +6,26 @@ var displayClass = {

         m.display = canvas.new({

                 "name"      : device.name,

-                "size"      : device.data['screen-size'] != nil ? split(',', device.data['screen-size']) : [1024, 768],

-                "view"      : device.data['screen-view'] != nil ? split(',', device.data['screen-view']) : [1024, 768],

+                "size"      : [1280, 1280],

+                "view"      : [1024, 768],

                 "mipmapping": 1

         });

         m.display.addPlacement({

                 "node": device.data['screen-object'] != nil ? device.data['screen-object'] : "Screen",

                 "parent": device.name

-        });

+            });

         m.display.setColorBackground(0,0,0);

         m.role = device.role;

         m.device = device;

         m.screenElements = {};

+        m.screen = m.display

+            .createGroup()

+            .show();

         m.timers2 = {}; # tho old timer implementation use already a named timer hash

         # Softkeys revert to the previous level after 45 seconds of inactivity.

         m.softkeys_inactivity_delay = 45;

-        return m;

-    },

-#}}}

-

-# timers stuff {{{

-    timers : {},

-

-    timerTrigger : func {

-        var now = systime();

-        foreach (var id; keys(me.timers)) {

-            if (me.timers[id] < now) {

-                me.screenElements[id].hide();

-                delete(me.timers, id);

-            }

-        }

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

-    },

-

-    addTimer : func (duration, element) {

-        if (typeof(element) == 'scalar')

-            element = [ element ];

-        var end = systime() + duration;

-        foreach (var e; element)

-            me.timers[e] = end;

-    },

-#}}}

-

-    loadsvg : func () {

-        me.screen = me.display.createGroup();

-        me.screen.hide();

-        canvas.parsesvg(me.screen, data.zkv1000_reldir ~ 'Systems/screen.svg');

-    },

-

-    _showInitProgress : func (p,t) {

-#{{{

-        p.setText(t);

-        if (zkv.getNode(me.device.name ~ '-init').getValue() != 0) {

-            if (size(t) >= 10) t = '';

-            settimer(func { me._showInitProgress(p, t ~ '.'); }, 0.1);

-        }

-        else {

-            me.progress.hide();

-            me.screen.show();

             var groups = {

                 show : [

                     'Header',

@@ -81,7 +41,7 @@ var displayClass = {

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

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

                 ],

-                hide : [ ],

+                hide : [ 'Failures', 'NAV-COMM-Failures' ],

                 clip: [ ],

             };

@@ -90,7 +50,7 @@ var displayClass = {

                 append(groups.show, sprintf("SoftKey%02i-bg", k));

             }

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

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

                 append(groups.show,

 # {{{

                     'XPDR-TIME', 

@@ -118,6 +78,7 @@ var displayClass = {

                     'EIS',

                     'CDI',

                     'OMI', 'MarkerBG', 'MarkerText',

+                    'VDI',

                     'NAV1-pointer', 'NAV1-CDI', 'NAV1-FROM', 'NAV1-TO',

                     'NAV2-pointer', 'NAV2-CDI', 'NAV2-FROM', 'NAV2-TO',

                     'GPS-pointer', 'GPS-CDI', 'GPS-CTI', 'GPS-CTI-diamond', 'GPS-FROM', 'GPS-TO',

@@ -150,7 +111,8 @@ var displayClass = {

                     'SpeedLint1',

                     'SpeedTape',

                     'LintAlt',

-                    'AltLint00011'

+                    'AltLint00011',

+                    'PitchScale',

 # }}}

                 );

                 append(groups.text,

@@ -182,8 +144,7 @@ var displayClass = {

                         'AltSmallD' ~ place

                     );

                 }

-                me.device.data.aoa = 0;

-                me.device.data['aoa-auto'] = 0;

+                canvas.parsesvg(m.screen, data.zkv1000_reldir ~ 'Systems/PFD.svg');

             }

             else {

                 var eis_file = getprop('/instrumentation/zkv1000/eis/type');

@@ -212,174 +173,156 @@ var displayClass = {

                     eis_file = data.zkv1000_dir ~ 'Nasal/EIS/none.nas';

                 io.load_nasal(eis_file, 'zkv1000');

-                if (contains(me.parents[0], 'showEIS'))

-                    me.showEIS(groups);

+                if (contains(m.parents[0], 'showEIS'))

+                    m.showEIS(groups);

             }

-            me.loadGroup(groups);

+            canvas.parsesvg(m.screen, data.zkv1000_reldir ~ 'Systems/softkeys.svg');

+            canvas.parsesvg(m.screen, data.zkv1000_reldir ~ 'Systems/header-nav-comm.svg');

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

-                me.updateAI();

-                me.updateVSI();

-                me.updateIAS();

-                me.updateALT();

-                me.updateHSI();

-                me.updateTIME();

-                me.updateOAT();

-                me.updateTAS();

-                me.updateBRG();

-                me.updateXPDR();

-                me.updateBARO();

-                me.updateOMI();

-                me.timerTrigger();

-                me.device.data.mapclip = {

-                    top: math.ceil(me.screenElements['PFD-Map-bg'].getTransformedBounds()[1]) - 1,

-                    right: math.ceil(me.screenElements['PFD-Map-bg'].getTransformedBounds()[2]) - 1,

-                    bottom: math.ceil(me.screenElements['PFD-Map-bg'].getTransformedBounds()[3]) - 1,

-                    left: math.ceil(me.screenElements['PFD-Map-bg'].getTransformedBounds()[0]) - 1,

+            m.loadGroup(groups);

+

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

+                m.device.data.aoa = 0;

+                m.device.data['aoa-auto'] = 0;

+                m.device.data.mapclip = {

+                    top: math.ceil(m.screenElements['PFD-Map-bg'].getTransformedBounds()[1]) - 1,

+                    right: math.ceil(m.screenElements['PFD-Map-bg'].getTransformedBounds()[2]) - 1,

+                    bottom: math.ceil(m.screenElements['PFD-Map-bg'].getTransformedBounds()[3]) - 1,

+                    left: math.ceil(m.screenElements['PFD-Map-bg'].getTransformedBounds()[0]) - 1,

                 };

-                me.device.data.mapsize = [

-                    me.device.data.mapclip.right - me.device.data.mapclip.left,

-                    me.device.data.mapclip.bottom - me.device.data.mapclip.top,

-                ];

             }

             else {

-                me.updateEIS();

-                me.device.data.mapclip = {

-                    top: math.ceil(me.screenElements['Header'].getTransformedBounds()[3]),

-                    right: me.display.get('view[0]'),

-                    bottom: math.ceil(me.screenElements['SoftKeysTexts'].getTransformedBounds()[1]),

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

+                m.device.data.mapclip = {

+                    top: math.ceil(m.screenElements['Header'].getTransformedBounds()[3]),

+                    right: m.display.get('view[0]'),

+                    bottom: math.ceil(m.screenElements['SoftKeysTexts'].getTransformedBounds()[1]),

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

                 };

-                me.device.data.mapsize = [

-                    me.device.data.mapclip.right - me.device.data.mapclip.left,

-                    me.device.data.mapclip.bottom - me.device.data.mapclip.top,

-                ];

-                io.load_nasal(data.zkv1000_dir ~ 'Nasal/MFD.pages.nas', 'zkv1000');

-                me['page selected'] = 0;

-                me.device.data['page selection'] = [

-# {{{

-                    {

-                        name: 'MAP',

-                        objects: [

-                            {text: 'NAVIGATION MAP'},

-                            {text: 'TRAFFIC MAP'},

-                            {text: 'STORMSCOPE'},

-                            {text: 'WEATHER DATA LINK'},

-                            {text: 'TAWS-B'},

-                        ],

-                    },

-                    {

-                        name: 'WPT',

-                        objects: [

-                            {text: 'AIRPORT INFORMATION'},

-                            {text: 'AIRPORT DIRECTORY'},

-                            {text: 'DEPARTURE INFORMATION'},

-                            {text: 'ARRIVAL INFORMATION'},

-                            {text: 'APPROACH INFORMATION'},

-                            {text: 'WEATHER INFORMATION'},

-                            {text: 'INTERSECTION INFORMATION'},

-                            {text: 'NDB INFORMATION'},

-                            {text: 'VOR INFORMATION'},

-                            {text: 'USER WAYPOINT INFORMATION'},

-                        ],

-                    },

-                    {

-                        name: 'AUX',

-                        objects: [

-                            {text: 'TRIP PLANNING'},

-                            {text: 'UTILITY'},

-                            {text: 'GPS STATUS'},

-                            {text: 'SYSTEM SETUP'},

-                        ],

-                    },

-                    {

-                        name: 'FPL',

-                        objects: [

-                            {text: 'ACTIVE FLIGHT PLAN'},

-                            {text: 'WIDE VIEW, NARROW VIEW'},

-                            {text: 'FLIGHT PLAN CATALOG'},

-                        ],

-                    },

-                    {

-                        name: 'PROC',

-                        objects: [

-                            {text: 'DEPARTURE LOADING'},

-                            {text: 'ARRIVAL LOADING'},

-                            {text: 'APPROACH LOADING'},

-                        ],

-                    },

-                    {

-                        name: 'NRST',

-                        objects: [

-                            {text: 'NEAREST AIRPORTS'},

-                            {text: 'NEAREST INTERSECTIONS'},

-                            {text: 'NEAREST NDB'},

-                            {text: 'NEAREST VOR'},

-                            {text: 'NEAREST USER WAYPOINTS'},

-                            {text: 'NEAREST FREQUENCIES'},

-                            {text: 'NEAREST AIRSPACES'},

-                        ],

-                    },

-# }}}

-                ];

-                me.setMFDPages();

-            }

-            me.device.data.zoom = 10;

-            me.MapTiles = MapTiles.new(me.device);

-            me.MapNavaids = PositionedLayer.new(me.device);

-            if (! contains(data.timers, 'map')) {

-                data.timers.map = maketimer(1, me, func {

-                        foreach (var d; keys(flightdeck)) {

-                            flightdeck[d].display.MapTiles.update();

-                            flightdeck[d].display.MapNavaids.update();

-                        }

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

-                        if (gspd != 0)

-                            var next = (me.device.data['range-nm']/(gspd/3600))/(me.display.get('view[1]')/2);

-                        else

-                            var next = 10;

-                        if (next > 10)

-                            next = 10;

-                        data.timers.map.restart(next);

-                    });

-                data.timers.map.singleShot = 1;

-                data.timers.map.start();

             }

+        return m;

+    },

+#}}}

-            me.updateNAV({auto:'nav', tune: radios.getNode('nav-tune').getValue()});

-            me.updateCOMM({auto:'comm', tune: radios.getNode('comm-tune').getValue()});

-            me.softkeys_inactivity();

-            me.updateSoftKeys();

-            me.progress.removeAllChildren();

-            me.progress = nil;

-            me.showInitProgress = nil;

-            me._showInitProgress = nil;

-            zkv.removeChild(me.device.role ~ 'init', 0);

+# timers stuff {{{

+    timers : {},

+

+    timerTrigger : func {

+        var now = systime();

+        foreach (var id; keys(me.timers)) {

+            if (me.timers[id] < now) {

+                me.screenElements[id].hide();

+                delete(me.timers, id);

+            }

         }

+        settimer(func me.timerTrigger(), 1);

+    },

+

+    addTimer : func (duration, element) {

+        if (typeof(element) == 'scalar')

+            element = [ element ];

+        var end = systime() + duration;

+        foreach (var e; element)

+            me.timers[e] = end;

     },

 #}}}

-    showInitProgress : func (name) {

+    showInitProgress : func {

 #{{{

-        me.progress = me.display.createGroup();

-        me.progress.show();

-        me.progress.createChild("text", name ~ " title")

-            .setTranslation(512, 384)

-            .setAlignment("center-center")

-            .setFont("LiberationFonts/LiberationSans-Italic.ttf")

-            .setFontSize(64, 1)

-            .setColor(1,1,1)

-            .setText("ZKV1000 " ~ name ~ " init");

-

-        zkv.getNode(name ~ '-init',1).setIntValue(1);

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

+            me.updateAI();

+            me.updateVSI();

+            me.updateIAS();

+            me.updateALT();

+            me.updateHSI();

+            me.updateTIME();

+            me.updateOAT();

+            me.updateTAS();

+            me.updateBRG();

+            me.updateXPDR();

+            me.updateBARO();

+            me.updateOMI();

+            me.timerTrigger();

+            me.screen.show();

+        }

+        else {

+            me.updateEIS();

+            io.load_nasal(data.zkv1000_dir ~ 'Nasal/MFD.pages.nas', 'zkv1000');

+            me['page selected'] = 0;

+            me.device.data['page selection'] = [

+# {{{

+                {

+                    name: 'MAP',

+                    objects: [

+                        {text: 'NAVIGATION MAP'},

+                        {text: 'TRAFFIC MAP'},

+                        {text: 'STORMSCOPE'},

+                        {text: 'WEATHER DATA LINK'},

+                        {text: 'TAWS-B'},

+                    ],

+                },

+                {

+                    name: 'WPT',

+                    objects: [

+                        {text: 'AIRPORT INFORMATION'},

+                        {text: 'AIRPORT DIRECTORY'},

+                        {text: 'DEPARTURE INFORMATION'},

+                        {text: 'ARRIVAL INFORMATION'},

+                        {text: 'APPROACH INFORMATION'},

+                        {text: 'WEATHER INFORMATION'},

+                        {text: 'INTERSECTION INFORMATION'},

+                        {text: 'NDB INFORMATION'},

+                        {text: 'VOR INFORMATION'},

+                        {text: 'USER WAYPOINT INFORMATION'},

+                    ],

+                },

+                {

+                    name: 'AUX',

+                    objects: [

+                        {text: 'TRIP PLANNING'},

+                        {text: 'UTILITY'},

+                        {text: 'GPS STATUS'},

+                        {text: 'SYSTEM SETUP'},

+                    ],

+                },

+                {

+                    name: 'FPL',

+                    objects: [

+                        {text: 'ACTIVE FLIGHT PLAN'},

+                        {text: 'WIDE VIEW, NARROW VIEW'},

+                        {text: 'FLIGHT PLAN CATALOG'},

+                    ],

+                },

+                {

+                    name: 'PROC',

+                    objects: [

+                        {text: 'DEPARTURE LOADING'},

+                        {text: 'ARRIVAL LOADING'},

+                        {text: 'APPROACH LOADING'},

+                    ],

+                },

+                {

+                    name: 'NRST',

+                    objects: [

+                        {text: 'NEAREST AIRPORTS'},

+                        {text: 'NEAREST INTERSECTIONS'},

+                        {text: 'NEAREST NDB'},

+                        {text: 'NEAREST VOR'},

+                        {text: 'NEAREST USER WAYPOINTS'},

+                        {text: 'NEAREST FREQUENCIES'},

+                        {text: 'NEAREST AIRSPACES'},

+                    ],

+                },

+# }}}

+            ];

+            me.setMFDPages();

+            me.device.buttons.MENU = me.device.buttons.MapMenu;

+        }

-        me._showInitProgress(me.progress.createChild("text", name ~ "progress")

-            .setTranslation(512, 484)

-            .setAlignment("center-center")

-            .setFont("LiberationFonts/LiberationSans-Bold.ttf")

-            .setFontSize(128, 1)

-            .setColor(1,0,0), '.');

+        me.updateNAV({auto:'nav', tune: radios.getNode('nav-tune').getValue()});

+        me.updateCOMM({auto:'comm', tune: radios.getNode('comm-tune').getValue()});

+        me.softkeys_inactivity();

+        me.updateSoftKeys();

     },

 #}}}

@@ -1331,73 +1274,3 @@ var displayClass = {

     },

 #}}}

 };

-

-var keyMap = {

-# softkeys map for PFD and MFD {{{

-    PFD : {

-        first : 1,

-        texts : ['INSET', 'SENSOR', 'PFD', 'OBS', 'CDI', 'DME', 'XPDR', 'IDENT', 'TMR/REF', 'NRST' ],

-        INSET : {

-            texts : ['OFF', 'DCLTR', 'WXLGND', 'TRAFFIC', 'TOPO', 'TERRAIN', 'STRMSCP', 'NEXRAD-C', 'XM LTNG', 'METAR'],

-        },

-        SENSOR : {

-            first : 2,

-            texts : [ 'ADC1', 'ADC2', '', 'AHRS1', 'AHRS2'],

-        },

-        PFD : {

-            texts : [ 'SYN VIS', 'DFLTS', 'AOA/WIND', 'DME', 'BRG1', 'HSI FMT', 'BRG2', '', 'ALT UNIT', 'STD BARO' ],

-            'SYN VIS' : {

-                texts : [ 'PATHWAY', 'SYN TERR', 'HR2NHDG', 'APTSIGNS', 'FPM'],

-            },

-            'AOA/WIND' : {

-                first : 4,

-                texts : ['AOA', 'WIND'],

-                AOA : {

-                    first : 5,

-                    texts : ['AOA ON', 'AOA AUTO'],

-                },

-                WIND : {

-                    first : 2,

-                    texts : ['OPTN1', 'OPTN2', '', 'OFF'],

-                },

-            },

-            'HSI FMT' : {

-                first : 6,

-                texts : ['360 HSI', 'ARC HSI'],

-            },

-            'ALT UNIT' : {

-                first : 5,

-                texts : ['METERS', '', 'IN', 'HPA'],

-            },

-        },

-        XPDR : {

-            first : 2,

-            texts : ['STBY', 'ON', 'ALT', '', 'VFR', 'CODE', 'IDENT'],

-            CODE : {

-                texts : ['0', '1', '2', '3', '4', '5', '6', '7', 'IDENT', 'BKSP'],

-            },

-        },

-    },

-    MFD : {

-        texts : ['ENGINE', '', 'MAP', '', '', '', '', '', '', 'DCLTR', 'SHW CHRT', 'CHKLIST'],

-        MAP : {

-            texts: ['TRAFFIC', 'PROFILE', 'TOPO', 'TERRAIN', 'AIRWAYS', 'STRMSCP','NEXRAD-C', 'XM LTNG', 'METAR', 'LEGEND', 'BACK'],

-        },

-        CHKLIST : {

-            texts : ['ENGINE', '', '', '', '', 'DONE', '', '', '', '', 'EXIT', 'EMERGCY'],

-        },

-        ENGINE : {

-            texts : ['ENGINE', 'ANTI-ICE', '', 'DCLTR', '', 'ASSIST', '', '', '', '', 'FUEL'],

-            'ANTI-ICE' : {

-                texts : ['LEFT', 'AUTO', 'RIGHT', '', '', '', '', '', '', '', '', 'BACK'],

-            },

-            FUEL : {

-                first : 1,

-                texts : ['FULL', 'TABS', '', '', '', '', '', '', '', 'UNDO', 'ENTER'],

-            },

-        },

-    },

-};

-if (data['stall-aoa'] == 9999)

-    keyMap.PFD.PFD['AOA/WIND'].texts = ['', 'WIND'];

-#}}}

@@ -1,8 +1,105 @@

 # vim: set foldmethod=marker foldmarker={{{,}}} :

+var mapClass = {

+# main class for maps {{{

+    new : func (device) {

+        var m = { parents : [ mapClass ] };

+        m.device = device;

+

+        m.device.data.mapview = [

+            m.device.display.display.get('view[0]'),

+            m.device.display.display.get('view[1]')

+        ];

+        m.device.data.mapsize = [

+            m.device.display.display.get('size[0]'),

+            m.device.display.display.get('size[1]')

+        ];

+        m.device.data.zoom = 10;

+        m.device.data.orientation = {

+            text: 'NORTH UP',

+            map: 0,

+            airplane: data.hdg,

+        };

+        m.changeZoom();

+        

+        m.group = m.device.display.display.createGroup()

+            .set('clip',

+                    'rect('

+                        ~ m.device.data.mapclip.top ~','

+                        ~ m.device.data.mapclip.right ~','

+                        ~ m.device.data.mapclip.bottom ~','

+                        ~ m.device.data.mapclip.left ~')')

+            .setCenter(

+                (m.device.data.mapclip.right + m.device.data.mapclip.left) / 2,

+                (m.device.data.mapclip.bottom + m.device.data.mapclip.top) / 2);

+

+        m.tiles = MapTiles.new(m.device, m.group);

+        m.navaids = MapNavaids.new(m.device, m.group);

+

+#        m.device.display.display.createGroup().createChild('path')

+#            .setColor(1,0,0)

+#            .setColorFill(1,0,0)

+#            .setStrokeLineWidth(2)

+#            .moveTo(

+#                m.device.data.mapclip.left + (m.device.data.mapclip.right-m.device.data.mapclip.left)/2,

+#                m.device.data.mapclip.top +50)

+#            .vertTo(

+#                m.device.data.mapclip.bottom -50)

+#            .close()

+#            .moveTo(

+#                m.device.data.mapclip.left +50,

+#                m.device.data.mapclip.top + (m.device.data.mapclip.bottom-m.device.data.mapclip.top)/2)

+#            .horizTo(

+#                m.device.data.mapclip.right-50)

+#            .close();

+

+        return m;

+    },

+    changeZoom : func (d = 0) {

+        me.device.data.zoom = math.max(2, math.min(19, me.device.data.zoom + d));

+        me.device.data['range-nm'] = me.device.display.display.get('view[1]') / 2 * 84.53 * math.cos(data.lat) / math.pow(2, me.device.data.zoom);

+        me.device.data['range-factor'] = math.pow(2,13 - me.device.data.zoom) * 1.6875;

+    },

+    update : func {

+        if (me.device.data.orientation.text == 'NORTH UP') {

+            me.device.data.orientation.map = 0;

+            me.device.data.orientation.airplane = data.hdg;

+        }

+        elsif (me.device.data.orientation.text == 'TRK UP') {

+            if (data.wow) {

+                me.device.data.orientation.map = -data.hdg;

+                me.device.data.orientation.airplane = data.hdg;

+            }

+            else {

+                var track = getprop('/orientation/track-deg');

+                me.device.data.orientation.map = -track;

+                me.device.data.orientation.airplane = data.hdg;

+            }

+        }

+        elsif (me.device.data.orientation.text == 'DTK UP') {

+            me.device.data.orientation.map = 0;

+            me.device.data.orientation.airplane = 0;

+        }

+        elsif (me.device.data.orientation.text == 'HDG UP') {

+            me.device.data.orientation.map = -data.hdg;

+            me.device.data.orientation.airplane = data.hdg;

+        }

+

+        me.group.setRotation(me.device.data.orientation.map * D2R);

+

+        me.tiles.update();

+        me.navaids.update();

+    },

+    setVisible : func (v) {

+        me.tiles.setVisible(v);

+        me.navaids.setVisible(v);

+    },

+};

+# }}}

+

 var MapTiles = {

 # displays maps background from web tiles {{{

 # code from http://wiki.flightgear.org/Canvas_Snippets#A_simple_tile_map

-    new : func (device) {

+    new : func (device, group) {

         var m = { parents: [MapTiles] };

         m.device = device;

         m.display = m.device.display.display;

@@ -19,37 +116,18 @@ var MapTiles = {

             (m.num_tiles[1] - 1) / 2

         ];

         m.visibility = m.device.role == 'MFD';

-        m.group = m.display.createGroup()

-            .setCenter(

-                    m.device.data.mapsize[0] / 2 + m.device.data.mapclip.left,

-                    m.device.data.mapsize[1] / 2 + m.device.data.mapclip.top

-                )

+        m.group = group.createChild('group', 'tiles')

             .setTranslation(

-                    m.device.data.mapclip.left / 2,

-                    m.device.data.mapclip.top / 2

-                )

-            .set('clip',

-                    'rect('

-                        ~ m.device.data.mapclip.top ~','

-                        ~ m.device.data.mapclip.right ~','

-                        ~ m.device.data.mapclip.bottom ~','

-                        ~ m.device.data.mapclip.left ~')'

-                )

+                    m.device.role == 'MFD' ? (m.device.data.mapview[0] - m.device.data.mapsize[0] + m.device.data.mapclip.left)/2 : -520,

+                    m.device.role == 'MFD' ? -250 : -45)

             .setVisible(m.visibility);

         m.tiles = setsize([], m.num_tiles[0]);

         m.last_tile = [-1,-1];

         m.last_type = data['tiles-type'];

-        m.changeZoom(0);

         m.initialize_grid();

         return m;

     },

-# Simple user interface (Buttons for zoom and label for displaying it)

-    changeZoom : func (d) {

-        me.device.data.zoom = math.max(2, math.min(19, me.device.data.zoom + d));

-        me.device.data['range-nm'] = me.display.get('view[1]') / 2 * 84.53 * math.cos(data.lat) / math.pow(2, me.device.data.zoom);

-    },

-

     setVisible : func (v) {

         if (v != me.visibility) {

             me.visibility = v;

@@ -70,7 +148,6 @@ var MapTiles = {

     update : func {

          if (! me.visibility)

              return;

-#        me.group.setRotation(-data.hdg * D2R);

         var n = math.pow(2, me.device.data.zoom);

         var offset = [

@@ -82,14 +159,16 @@ var MapTiles = {

         var ox = tile_index[0] - offset[0];

         var oy = tile_index[1] - offset[1];

-        for(var x = 0; x < me.num_tiles[0]; x += 1)

+        for (var x = 0; x < me.num_tiles[0]; x += 1)

             for(var y = 0; y < me.num_tiles[1]; y += 1)

                 me.tiles[x][y]

-                    .setTranslation(int((ox + x) * me.tile_size + 0.5), int((oy + y) * me.tile_size + 0.5));

+                    .setTranslation(

+                        int((ox + x) * me.tile_size + 0.5),

+                        int((oy + y) * me.tile_size + 0.5));

-        if(    tile_index[0] != me.last_tile[0]

-                or tile_index[1] != me.last_tile[1]

-                or data['tiles-type'] != me.last_type ) {

+        if (tile_index[0] != me.last_tile[0]

+         or tile_index[1] != me.last_tile[1]

+         or data['tiles-type'] != me.last_type) {

             for(var x = 0; x < me.num_tiles[0]; x += 1)

                 for(var y = 0; y < me.num_tiles[1]; y += 1) {

                     var pos = {

@@ -106,7 +185,7 @@ var MapTiles = {

                         printlog('debug', 'img_path: ', img_path);

                         var tile = me.tiles[x][y];

-                        if( io.stat(img_path) == nil ) { # image not found, save in $FG_HOME

+                        if (io.stat(img_path) == nil) { # image not found, save in $FG_HOME

                             var img_url = me.makeUrl(pos);

                             printlog('debug', 'requesting ' ~ img_url);

                             http.save(img_url, img_path)

@@ -264,7 +343,7 @@ var MapAirportItem = {

         return me._can.group;

     },

     draw : func (apt, mapOptions) {

-        me._mapAirportIcon.near = mapOptions.range > 30 ? 0 : 1;

+        me._mapAirportIcon.near = mapOptions.range > 32 ? 0 : 1;

         me._mapAirportIcon.surface  = 0;

         me._mapAirportIcon.tower    = 0;

         me._mapAirportIcon.center   = 0;

@@ -298,7 +377,7 @@ var MapAirportItem = {

                         'N' ~ runway.reciprocal.lat, 'E' ~ runway.reciprocal.lon,

                     ]);

             }

-            elsif (mapOptions.range <= 30) {     #draw icon runways

+            elsif (mapOptions.range <= 32) {     #draw icon runways

                 me._can.layoutIcon.setGeoPosition(apt.lat, apt.lon);

                 me._can.layoutIcon.createChild('path', 'airport-runway-' ~ me._id ~ '-' ~ runway.id)

                     .setStrokeLineWidth(7)

@@ -322,13 +401,15 @@ var MapAirportItem = {

             ~ me._mapAirportIcon.center;

         if (me._mapAirportIcon.displayed) {

-            me._can.label.setText(apt.id);

+            me._can.label

+                .setText(apt.id)

+                .setRotation(-mapOptions.orientation * D2R);

             me._can.group.setGeoPosition(apt.lat, apt.lon);

             if (mapOptions.range <= 10) {

                 me._can.image.setVisible(0);

                 me._can.layout.setVisible(1);

             }

-            elsif (mapOptions.range <= 30) {

+            elsif (mapOptions.range <= 32) {

                 mapIconCache.boundIconToImage(me._mapAirportIcon.icon, me._can.image);

                 me._can.image.setVisible(1);

                 me._can.layout.setVisible(1);

@@ -344,7 +425,7 @@ var MapAirportItem = {

     },

     update : func (mapOptions) {

         if (mapOptions.range <= 10) { }

-        elsif (mapOptions.range <= 30)

+        elsif (mapOptions.range <= 32)

             me._can.layoutIcon.setRotation(-mapOptions.orientation * D2R);

         else { }

     },

@@ -390,9 +471,11 @@ var MapNavaidItem = {

         return me._can.group;

     },

-    setData : func (navaid, type) {

+    setData : func (navaid, type, mapOptions) {

         mapIconCache.boundIconToImage('Navaid_' ~ type, me._can.image);

-        me._can.label.setText(navaid.id);

+        me._can.label

+            .setText(navaid.id)

+            .setRotation(-mapOptions.orientation * D2R);

         me._can.group.setGeoPosition(navaid.lat, navaid.lon);

     },

     setVisible : func (visibility) {

@@ -402,6 +485,7 @@ var MapNavaidItem = {

 # }}}

 var MapAirplaneItem = {

+# set airplane on ND {{{

     new : func {

         var m = {parents:[MapAirplaneItem]};

         m._can = {

@@ -418,16 +502,17 @@ var MapAirplaneItem = {

             .setSourceRect(0,0,0,0,0);

         return me._can.group;

     },

-    setData : func {

+    setData : func (orientation) {

         mapIconCache.boundIconToImage('airplane', me._can.image);

         me._can.group

             .setGeoPosition(data.lat, data.lon)

-            .setRotation(data.hdg * D2R);

+            .setRotation(orientation * D2R);

     },

     setVisible : func (visibility) {

         me._can.group.setVisible(visibility);

     },

 };

+# }}}

 var MAP_RUNWAY_SURFACE =  {0:0, 1:1, 2:1, 3:0, 4:0, 5:0, 6:1, 7:1, 8:0, 9:0, 10:0, 11:0, 12:0};

 var MAP_RUNWAY_AT_RANGE = func (range) {

@@ -459,30 +544,22 @@ var MAP_TXRANGE_VOR = func (range) {

 #       2 : 'Obstacles'

 #       3 : 'Navaids'

-var PositionedLayer = {

+var MapNavaids = {

 # the layer to show navaids, airports and airplane symbol {{{

-    new : func (device) {

-        var m = {parents : [PositionedLayer]};

+    new : func (device, group) {

+        var m = {parents : [MapNavaids]};

         m._model = nil;

         m.device = device;

         m._visibility = m.device.role == 'MFD';

-        var display = m.device.display.display;

-        m._group = display.createGroup().createChild('map', 'MFD map')

-            .set('clip',

-                    'rect('

-                        ~ m.device.data.mapclip.top ~','

-                        ~ m.device.data.mapclip.right ~','

-                        ~ m.device.data.mapclip.bottom ~','

-                        ~ m.device.data.mapclip.left ~')')

+        m._group = group.createChild('map', 'MFD map')

             .setTranslation(

-                    m.device.data.mapsize[0] / 2 + m.device.data.mapclip.left,

-                    m.device.data.mapsize[1] / 2 + m.device.data.mapclip.top

-                )

+                m.device.role == 'MFD' ? (m.device.data.mapview[0] + m.device.data.mapclip.left)/2 : 120,

+                m.device.role == 'MFD' ? 400 : 600)

             .setVisible(m._visibility);

             m._group._node

-                .getNode('range', 1).setDoubleValue(13.5); # TODO find a far less esoteric way to get range value

+                .getNode('range', 1).setDoubleValue(m.device.data['range-factor']);

         m._can = {};

         m._cache = {};

@@ -509,7 +586,7 @@ var PositionedLayer = {

             range         : m.device.data['range-nm'],

             rangeLow      : m.device.data['range-nm'] / 2,

             runwayLength  : -1,

-            orientation   : 0,

+            orientation   : m.device.data.orientation.map,

         };

         m._results = nil;

@@ -520,6 +597,10 @@ var PositionedLayer = {

         me._group._node.getNode('ref-lat', 1).setDoubleValue(data.lat);

         me._group._node.getNode('ref-lon', 1).setDoubleValue(data.lon);

+        me._group._node

+            .getNode('range', 1).setDoubleValue(me.device.data['range-factor']);

+        me._mapOptions.orientation = me.device.data.orientation.map;

+

         if (me._visibility == 1) {

             me.loadAirport();

             foreach (var n; ['VOR', 'TACAN', 'NDB', 'DME'])

@@ -613,12 +694,12 @@ var PositionedLayer = {

                 if (size(me._cache[type].data) > me._cache[type].index) {

                     item = me._cache[type].data[me._cache[type].index];

-                    item.setData(n, type);

+                    item.setData(n, type, me._mapOptions);

                 }

                 else {

                     item = MapNavaidItem.new(me._cache[type].index, type);

                     item.create(me._can[type]);

-                    item.setData(n, type);

+                    item.setData(n, type, me._mapOptions);

                     append(me._cache[type].data, item);

                 }

                 item.setVisible(1);

@@ -636,7 +717,7 @@ var PositionedLayer = {

             me._cache.airplane.item.create(me._can['airplane']);

             me._cache.airplane.displayed = 1;

         }

-        me._cache.airplane.item.setData();

+        me._cache.airplane.item.setData(me.device.data.orientation.airplane);

         me._cache.airplane.item.setVisible(1);

     },

 };

@@ -1,3 +1,4 @@

+# vim: set foldmethod=marker foldmarker={{{,}}} :

 var softkeysClass = {

     new : func (device) {

         var m = { parents: [ softkeysClass ] };

@@ -57,16 +58,16 @@ var softkeysClass = {

         PFD : {

             INSET: {

                 OFF: func {

-                    me.device.display.MapTiles.setVisible(0);

-                    me.device.display.MapNavaids.setVisible(0);

+                    me.device.map.tiles.setVisible(0);

+                    me.device.map.navaids.setVisible(0);

                     me.device.display.screenElements['PFD-Map-bg'].hide();

                 },

                 hook : func {

                     me.device.display.screenElements['PFD-Map-bg'].show();

-                    me.device.display.MapTiles.setVisible(1);

-                    me.device.display.MapNavaids.setVisible(1);

-                    me.device.display.MapTiles.update();

-                    me.device.display.MapNavaids.update();

+                    me.device.map.tiles.setVisible(1);

+                    me.device.map.navaids.setVisible(1);

+                    me.device.map.tiles.update();

+                    me.device.map.navaids.update();

                 },

             },

             PFD: {

@@ -497,3 +498,73 @@ var softkeysClass = {

         },

     },

 };

+

+var keyMap = {

+# softkeys map for PFD and MFD {{{

+    PFD : {

+        first : 1,

+        texts : ['INSET', 'SENSOR', 'PFD', 'OBS', 'CDI', 'DME', 'XPDR', 'IDENT', 'TMR/REF', 'NRST' ],

+        INSET : {

+            texts : ['OFF', 'DCLTR', 'WXLGND', 'TRAFFIC', 'TOPO', 'TERRAIN', 'STRMSCP', 'NEXRAD-C', 'XM LTNG', 'METAR'],

+        },

+        SENSOR : {

+            first : 2,

+            texts : [ 'ADC1', 'ADC2', '', 'AHRS1', 'AHRS2'],

+        },

+        PFD : {

+            texts : [ 'SYN VIS', 'DFLTS', 'AOA/WIND', 'DME', 'BRG1', 'HSI FMT', 'BRG2', '', 'ALT UNIT', 'STD BARO' ],

+            'SYN VIS' : {

+                texts : [ 'PATHWAY', 'SYN TERR', 'HR2NHDG', 'APTSIGNS', 'FPM'],

+            },

+            'AOA/WIND' : {

+                first : 4,

+                texts : ['AOA', 'WIND'],

+                AOA : {

+                    first : 5,

+                    texts : ['AOA ON', 'AOA AUTO'],

+                },

+                WIND : {

+                    first : 2,

+                    texts : ['OPTN1', 'OPTN2', '', 'OFF'],

+                },

+            },

+            'HSI FMT' : {

+                first : 6,

+                texts : ['360 HSI', 'ARC HSI'],

+            },

+            'ALT UNIT' : {

+                first : 5,

+                texts : ['METERS', '', 'IN', 'HPA'],

+            },

+        },

+        XPDR : {

+            first : 2,

+            texts : ['STBY', 'ON', 'ALT', '', 'VFR', 'CODE', 'IDENT'],

+            CODE : {

+                texts : ['0', '1', '2', '3', '4', '5', '6', '7', 'IDENT', 'BKSP'],

+            },

+        },

+    },

+    MFD : {

+        texts : ['ENGINE', '', 'MAP', '', '', '', '', '', '', 'DCLTR', 'SHW CHRT', 'CHKLIST'],

+        MAP : {

+            texts: ['TRAFFIC', 'PROFILE', 'TOPO', 'TERRAIN', 'AIRWAYS', 'STRMSCP','NEXRAD-C', 'XM LTNG', 'METAR', 'LEGEND', 'BACK'],

+        },

+        CHKLIST : {

+            texts : ['ENGINE', '', '', '', '', 'DONE', '', '', '', '', 'EXIT', 'EMERGCY'],

+        },

+        ENGINE : {

+            texts : ['ENGINE', 'ANTI-ICE', '', 'DCLTR', '', 'ASSIST', '', '', '', '', 'FUEL'],

+            'ANTI-ICE' : {

+                texts : ['LEFT', 'AUTO', 'RIGHT', '', '', '', '', '', '', '', '', 'BACK'],

+            },

+            FUEL : {

+                first : 1,

+                texts : ['FULL', 'TABS', '', '', '', '', '', '', '', 'UNDO', 'ENTER'],

+            },

+        },

+    },

+};

+if (data['stall-aoa'] == 9999)

+    keyMap.PFD.PFD['AOA/WIND'].texts = ['', 'WIND'];

+#}}}

@@ -96,6 +96,7 @@ Please report bug at <seb.marque@free.fr>.

   * Setting pages (MFD): pages/sub-pages selection via FMS knob ![][done], pages content implementation ![][ongoing]

 * ![][10%]

   * multikey for every part of the device (actually only power on)

+  * Aircraft Maintainer's Guide

 * ![][0%] (TODO list, unsorted)

   * CDI/GPS: scale depending of the flight phase

   * Alerts

@@ -111,6 +112,7 @@ Please report bug at <seb.marque@free.fr>.

   * VNAV

   * scrolling lift in menus

   * tutorials

+  * User's Guide

   * make any Vspeed available (not only Vx, Vy, Vr and Vglide), depending of their presence in aircraft config

   * [touchable screen](http://wiki.flightgear.org/Canvas_Event_Handling)

   * many more...

@@ -10,7 +10,7 @@

    xmlns:xlink="http://www.w3.org/1999/xlink"

    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"

    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

-   sodipodi:docname="screen.svg"

+   sodipodi:docname="PFD.svg"

    inkscape:version="0.92.1 r15371"

    version="1.1"

    id="svg3140"

@@ -24,11 +24,11 @@

      borderopacity="1"

      inkscape:pageopacity="1"

      inkscape:pageshadow="2"

-     inkscape:zoom="5.259107"

-     inkscape:cx="701.99873"

-     inkscape:cy="619.42441"

+     inkscape:zoom="0.32869419"

+     inkscape:cx="320.83771"

+     inkscape:cy="302.5405"

      inkscape:document-units="px"

-     inkscape:current-layer="SelectedALT"

+     inkscape:current-layer="Failures"

      showgrid="false"

      showguides="false"

      inkscape:guide-bbox="true"

@@ -6490,205 +6490,6 @@

          style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />

     </g>

   </g>

-  <g

-     id="Header"

-     inkscape:label="Header"

-     style="display:inline">

-    <rect

-       style="fill:#000000;fill-opacity:1;stroke:none"

-       id="rect4259"

-       width="1024"

-       height="55.494141"

-       x="0"

-       y="0" />

-    <path

-       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 0,55.49414 H 1025.0039"

-       id="path4083"

-       inkscape:connector-curvature="0" />

-    <path

-       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

-       d="M 263.50196,27.49805 H 760.00391"

-       id="path4089"

-       inkscape:connector-curvature="0" />

-    <text

-       transform="scale(0.95985917,1.0418195)"

-       id="text4261-5"

-       y="47.036842"

-       x="3.711482"

-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'Ubuntu Mono';-inkscape-font-specification:'Ubuntu Mono 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"><tspan

-         style="font-size:19.44536018px;line-height:1.25"

-         y="47.036842"

-         x="3.711482"

-         id="tspan4263-5"

-         sodipodi:role="line">NAV2</tspan></text>

-    <text

-       transform="scale(0.95985919,1.0418195)"

-       id="text4261"

-       y="24.000223"

-       x="3.7114818"

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

-       xml:space="preserve"><tspan

-         style="font-size:19.44536018px;line-height:1.25"

-         y="24.000223"

-         x="3.7114818"

-         id="tspan4263"

-         sodipodi:role="line">NAV1</tspan></text>

-    <path

-       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"

-       d="M 263.00638,55.49414 V 0"

-       id="path4087"

-       inkscape:connector-curvature="0" />

-    <text

-       transform="scale(0.98049433,1.0198937)"

-       id="text4290-4"

-       y="46.475105"

-       x="979.46912"

-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:'Ubuntu Mono';-inkscape-font-specification:'Ubuntu Mono 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"><tspan

-         style="font-size:19.53494453px;line-height:1.25"

-         y="46.475105"

-         x="979.46912"

-         id="tspan4292-0"

-         sodipodi:role="line">COM2</tspan></text>

-    <text

-       transform="scale(0.98049433,1.0198937)"

-       id="text4290"

-       y="22.938923"

-       x="979.48126"

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

-       xml:space="preserve"><tspan

-         style="font-size:19.53494453px;line-height:1.25"

-         y="22.938923"

-         x="979.48126"

-         id="tspan4292"

-         sodipodi:role="line">COM1</tspan></text>

-    <path

-       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"

-       d="M 760.00391,55.494139 V -6.8969723e-7 v 0"

-       id="path4085"

-       inkscape:connector-curvature="0" />

-  </g>

-  <g

-     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="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"

-       x="181.57742"

-       height="22.993343"

-       width="72.99334"

-       id="nav1-selected-tuning"

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

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

-    <text

-       transform="scale(0.85708105,1.1667508)"

-       id="nav1-selected-freq"

-       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="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="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="20.658087"

-         x="112.3863"

-         id="tspan4111-8"

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

-    <text

-       transform="scale(0.85708105,1.1667508)"

-       id="nav2-selected-freq"

-       y="41.656574"

-       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="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="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="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

      style="display:inline"

      id="XPDR-TIME"

@@ -6798,70 +6599,6 @@

          y="737.74677"

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

   </g>

-  <g

-     transform="translate(-2.8722382e-6,1.8800354e-6)"

-     id="COMM"

-     inkscape:label="COMM"

-     style="display:inline">

-    <path

-       inkscape:connector-curvature="0"

-       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="comm-freq-switch" />

-    <text

-       transform="scale(0.85708105,1.1667508)"

-       id="comm1-standby-freq"

-       y="21.470406"

-       x="1066.9291"

-       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="comm1-standby-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.470406"

-         x="1066.9291"

-         id="tspan4111-83"

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

-    <text

-       transform="scale(0.85708105,1.1667508)"

-       id="comm1-selected-freq"

-       y="21.470411"

-       x="937.43207"

-       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="comm1-selected-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.470411"

-         x="937.43207"

-         id="tspan4111-8-3"

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

-    <text

-       transform="scale(0.85708105,1.1667508)"

-       id="comm2-standby-freq"

-       y="42.040348"

-       x="1066.9291"

-       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="comm2-standby-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="42.040348"

-         x="1066.9291"

-         id="tspan4111-9-0"

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

-    <text

-       transform="scale(0.85708105,1.1667508)"

-       id="comm2-selected-freq"

-       y="42.040352"

-       x="937.43207"

-       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="comm2-selected-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="42.040352"

-         x="937.43207"

-         id="tspan4111-9-4-9"

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

-  </g>

   <g

      id="PFD-Widgets"

      inkscape:label="PFD-Widgets"

@@ -7573,326 +7310,6 @@

          inkscape:label="SelectedALT-symbol" />

     </g>

   </g>

-  <g

-     id="SoftKeysTexts"

-     inkscape:label="SoftKeysTexts"

-     style="display:inline"

-     transform="matrix(1.0043796,0,0,0.99999999,-0.01052084,9.8311945e-6)">

-    <rect

-       y="743.99927"

-       x="172.49872"

-       height="24.000597"

-       width="83.8013"

-       id="SoftKey02-bg"

-       style="display:inline;fill:#000000;fill-opacity:1;stroke:none"

-       inkscape:label="SoftKey02-bg" />

-    <path

-       inkscape:connector-curvature="0"