@@ -1,7 +1,7 @@

 var buttonsClass = {

-    new : func (node) {

+    new : func (device) {

         var m = { parents: [ buttonsClass ] };

-        m.node = node;

+        m.device = device;

         return m;

     },

@@ -69,19 +69,20 @@ var setListeners = func {

 }

 var deviceClass = {

-    new: func (role) {

+    new: func (name) {

         var m = { parents: [ deviceClass ] };

-        m.role = role;

-        m.node = zkv.getNode(role, 1);

+        m.name = name;

+        m.role = substr(name, 0, 3);

+        m.node = zkv.getNode(name, 1);

         m.data = {};

         foreach (var v; ['Vx', 'Vy', 'Vr', 'Vglide']) {

             m.data[v] = alerts.getNode(v).getValue();

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

         }

-        m.display  = displayClass.new(m, m.role);

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

-        m.softkeys = softkeysClass.new(m, m.node, m.role);

-        m.buttons  = buttonsClass.new(m.node);

+        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({

@@ -99,18 +100,18 @@ var deviceClass = {

             clip : 'PitchScale',

         });

         m.windows  = pageClass.new(m);

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

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

-        msg(m.role ~ ' switched on!');

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

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

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

         return m;

     },

 };

 var powerOn = func {

-    foreach (var role; keys(flightdeck))

-        if (zkv.getNode(role) != nil)

+    foreach (var name; keys(flightdeck))

+        if (zkv.getNode(name) != nil)

 #            thread.newthread(func {

-                flightdeck[role] = deviceClass.new(role);

+                flightdeck[name] = deviceClass.new(name);

 #            });

     settimer(setListeners, 5);

 }

@@ -1,21 +1,21 @@

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

 var displayClass = {

-    new: func(device, role) {

+    new: func(device) {

 # the contructor {{{

         var m = { parents: [ displayClass ] };

         m.display = canvas.new({

-                "name"      : role,

+                "name"      : device.name,

                 "size"      : [1024, 768],

                 "view"      : [1024, 768],

                 "mipmapping": 1

         });

         m.display.addPlacement({

                 "node": "Screen",

-                "parent": role

+                "parent": device.name

         });

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

-        m.role = substr(role, 0, 3);

+        m.role = device.role;

         m.device = device;

         m.screenElements = {};

@@ -23,7 +23,7 @@ var displayClass = {

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

         m.softkeys_inactivity_delay = 45;

-        if (role == 'MFD') {

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

             m.MFDMapTiles = MapTiles.new(m.display);

             m.MFDMapNavDisplay = MapNavDisplay.new(m.display);

             var eis_dir = getprop('/sim/fg-aircraft') ~ '/Instruments-3d/zkv1000/Nasal/EIS/';

@@ -73,7 +73,7 @@ var displayClass = {

     _showInitProgress : func (p,t) {

 #{{{

         p.setText(t);

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

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

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

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

         }

@@ -104,7 +104,7 @@ var displayClass = {

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

             }

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

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

                 append(groups.show,

                     'XPDR-TIME', 

                     'FlightInstruments',

@@ -198,7 +198,7 @@ var displayClass = {

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

                 data.timers[freq].start();

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

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

                 me.updateAI();

                 me.updateVSI();

                 me.updateIAS();

@@ -227,26 +227,26 @@ var displayClass = {

             me.progress = nil;

             me.showInitProgress = nil;

             me._showInitProgress = nil;

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

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

         }

     },

 #}}}

-    showInitProgress : func (role) {

+    showInitProgress : func (name) {

 #{{{

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

         me.progress.show();

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

+        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 " ~ role ~ " init");

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

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

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

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

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

             .setTranslation(512, 484)

             .setAlignment("center-center")

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

@@ -413,7 +413,7 @@ var displayClass = {

     updateSoftKeys : func {

 # update SoftKeys boxes {{{

         # on PFD the last boxes are always BACK and ALERTS

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

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

             me.screenElements[sprintf("SoftKey%02i-text", 11)]

                 .setText('ALERTS');

             if (size(me.device.softkeys.path) != 0)

@@ -421,7 +421,7 @@ var displayClass = {

                     .setText('BACK');

         }

-        var path = keyMap[me.role];

+        var path = keyMap[me.device.role];

         foreach (var p; me.device.softkeys.path)

             path = path[p];

@@ -438,7 +438,7 @@ var displayClass = {

                 .setText(path.texts[k]);

         }

         # feeding the last boxes with empty string

-        var end = (me.role == 'PFD') ? 10 : 12;

+        var end = (me.device.role == 'PFD') ? 10 : 12;

         if (size(path.texts) + start < end) {

             start = size(path.texts) + start;

             for (var k = start; k < end; k += 1)

@@ -729,7 +729,7 @@ var displayClass = {

     updateHDG : func () {

 # moves the heading bug and display heading-deg for 3 seconds (PFD) {{{

-        if (me.role == 'MFD')

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

             return;

         var hdg = getprop('/instrumentation/zkv1000/afcs/heading-bug-deg');

         me.screenElements['Heading-bug']

@@ -747,7 +747,7 @@ var displayClass = {

     updateCRS : func () {

 # TODO: update display for NAV/GPS/BRG courses {{{

-        if (me.role == 'MFD')

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

             return;

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

         if (source == 'OFF')

@@ -1,9 +1,7 @@

 var softkeysClass = {

-    new : func (device, node, role) {

+    new : func (device) {

         var m = { parents: [ softkeysClass ] };

-        m.node = node;

         m.device = device;

-        m.role = substr(role, 0, 3);

         m.path = [];

         return m;

     },

@@ -17,7 +15,7 @@ var softkeysClass = {

         if (key == '' or key == nil)

             return;

-        var path = keyMap[me.role];

+        var path = keyMap[me.device.role];

         foreach(var p; me.path) {

             if (contains(path, p))

                 path = path[p];

@@ -25,7 +23,7 @@ var softkeysClass = {

                 break;

         }

-        var bindings = me.bindings[me.role];

+        var bindings = me.bindings[me.device.role];

         foreach(var p; me.path) {

             if (contains(bindings, p))

                 bindings = bindings[p];