@@ -91,20 +91,20 @@ var APClass = {

 # Many thanks to the great work on the FG1000

             _blink_count: 0,

             updateDisplay: func {

+                var annunciator = props.globals.getNode('/autopilot/annunciator');

+                var ap_enabled  = annunciator.getValue('autopilot-enabled');

+

+                var latmod         = annunciator.getValue('lateral-mode');

+                var latmod_armed   = annunciator.getValue('lateral-mode-armed');

+                var vertmod        = annunciator.getValue('vertical-mode');

+                var vertmod_armed  = annunciator.getValue('vertical-mode-armed');

+                var vertmod_target = annunciator.getValue('vertical-mode-target');

+                if (vertmod_target != nil) {

+                    vertmod_target = string.replace(vertmod_target, '+', utf8.chstr(9650));

+                    vertmod_target = string.replace(vertmod_target, '-', utf8.chstr(9660));

+                }

                 foreach (var terminal; me.terminals) {

                     var se = flightdeck[terminal].display.screenElements;

-                    var annunciator = props.globals.getNode('/autopilot/annunciator');

-                    var ap_enabled  = annunciator.getValue('autopilot-enabled');

-

-                    var latmod         = annunciator.getValue('lateral-mode');

-                    var latmod_armed   = annunciator.getValue('lateral-mode-armed');

-                    var vertmod        = annunciator.getValue('vertical-mode');

-                    var vertmod_armed  = annunciator.getValue('vertical-mode-armed');

-                    var vertmod_target = annunciator.getValue('vertical-mode-target');

-                    if (vertmod_target != nil) {

-                        vertmod_target = string.replace(vertmod_target, '+', utf8.chstr(9650));

-                        vertmod_target = string.replace(vertmod_target, '-', utf8.chstr(9660));

-                    }

                     se['LATMOD-Active-text'].setVisible(latmod != nil and ap_enabled).setText(latmod);

                     se['LATMOD-Armed-text'].setVisible(latmod_armed != nil and ap_enabled).setText(latmod_armed);

@@ -207,26 +207,6 @@ var APClass = {

                 setprop('/it-stec55x/input/ap-master-sw', 1);

             },

             updateDisplay: func {

-                var se = flightdeck[me.terminal].display.screenElements;

-                se['AP-Status-text'].setVisible(stec55x.rollMode  != -1 or stec55x.pitchMode != -1);

-                se['YD-Status-text'].setVisible(stec55x.yaw.getValue() != -1);

-                if (stec55x.rollMode  != -1) {

-                    se['LATMOD-Active-text'].setVisible(1).setText('ROL');

-                    var armed = '';

-                    foreach (var m; [ 'NAV', 'CNAV', 'REV', 'CREV' ])

-                        if (stec55x[m]) armed = m;

-                    if (stec55x.roll.getValue() == 0) armed = 'HDG';

-                    elsif (stec55x.roll.getValue() == 2) armed = 'GPS';

-                    elsif (stec55x.APR_annun.getValue()) armed = 'APR';

-                    se['LATMOD-Armed-text']

-                        .setVisible(size(armed))

-                        .setText(armed);

-                }

-                else {

-                    se['LATMOD-Active-text'].setVisible(0);

-                    se['LATMOD-Armed-text'].setVisible(0);

-                }

-

                 if (stec55x.pitchMode != 1) {

                     var armed     = '';

                     var active    = '';

@@ -259,10 +239,33 @@ var APClass = {

 #                        active = 'ALT';

 #                        reference = sprintf("%d°", autopilot.systems.STEC55X.trim);

 #                    }

+                }

+

+                foreach (var terminal; me.terminals) {

+                    var se = flightdeck[me.terminal].display.screenElements;

                     se['VERMOD-Active-text'].setVisible(size(active)).setText(active);

                     se['VERMOD-Armed-text'].setVisible(size(armed)).setText(armed);

                     se['VERMOD-Reference-text'].setVisible(size(reference)).setText(reference);

+                    se['AP-Status-text'].setVisible(stec55x.rollMode  != -1 or stec55x.pitchMode != -1);

+                    se['YD-Status-text'].setVisible(stec55x.yaw.getValue() != -1);

+                    if (stec55x.rollMode  != -1) {

+                        se['LATMOD-Active-text'].setVisible(1).setText('ROL');

+                        var armed = '';

+                        foreach (var m; [ 'NAV', 'CNAV', 'REV', 'CREV' ])

+                            if (stec55x[m]) armed = m;

+                        if (stec55x.roll.getValue() == 0) armed = 'HDG';

+                        elsif (stec55x.roll.getValue() == 2) armed = 'GPS';

+                        elsif (stec55x.APR_annun.getValue()) armed = 'APR';

+                        se['LATMOD-Armed-text']

+                            .setVisible(size(armed))

+                            .setText(armed);

+                    }

+                    else {

+                        se['LATMOD-Active-text'].setVisible(0);

+                        se['LATMOD-Armed-text'].setVisible(0);

+                    }

                 }

+

             },

             L: [

                 func,