diff --git a/Aircraft/Instruments-3d/primus-1000/Primus1000.nas b/Aircraft/Instruments-3d/primus-1000/Primus1000.nas index 0a278f461..9b0dfbe69 100644 --- a/Aircraft/Instruments-3d/primus-1000/Primus1000.nas +++ b/Aircraft/Instruments-3d/primus-1000/Primus1000.nas @@ -1,10 +1,12 @@ ###### Primus 1000 system ######## FDMODE = props.globals.getNode("/instrumentation/primus1000/fdmode",1); -NavPtr1=props.globals.getNode("/instrumentation/primus1000/nav1pointer",1); -NavPtr2=props.globals.getNode("/instrumentation/primus1000/nav2pointer",1); -NavPtr1_offset=props.globals.getNode("/instrumentation/primus1000/nav1pointer-heading-offset",1); -NavPtr2_offset=props.globals.getNode("/instrumentation/primus1000/nav2pointer-heading-offset",1); -RAmode=props.globals.getNode("/instrumentation/primus1000/ra-mode",1); +NavPtr1=props.globals.getNode("/instrumentation/primus1000/dc550/nav1ptr",1); +NavPtr2=props.globals.getNode("/instrumentation/primus1000/dc550/nav2ptr",1); +NavPtr1_offset=props.globals.getNode("/instrumentation/primus1000/dc550/nav1ptr-hdg-offset",1); +NavPtr2_offset=props.globals.getNode("/instrumentation/primus1000/dc550/nav2ptr-hdg-offset",1); +RAmode=props.globals.getNode("/instrumentation/primus1000/ra-mode",1); +DC550 = props.globals.getNode("/instrumentation/primus1000/dc550",1); + NavDist=props.globals.getNode("/instrumentation/primus1000/nav-dist-nm",1); APoff=props.globals.getNode("/autopilot/locks/passive-mode",1); Hyd1=props.globals.getNode("systems/hydraulic/pump-psi[0]",1); @@ -14,34 +16,34 @@ FuelPph2=props.globals.getNode("engines/engine[1]/fuel-flow_pph",1); FuelDensity = 6.0; get_pointer_offset = func{ - var test=arg[0]; - var offset = 0; - var hdg = getprop("/orientation/heading-magnetic-deg"); - if(test==0 or test == nil){return 0.0;} - - if(test == 1){ - offset=getprop("/instrumentation/nav/heading-deg"); - offset -= hdg; - if(offset < -180){offset += 360;} - elsif(offset > 180){offset -= 360;} - }elsif(test == 2){ - offset = getprop("/instrumentation/adf/indicated-bearing-deg"); - }elsif(test == 3){ - offset = getprop("/autopilot/internal/true-heading-error-deg"); - } - return offset; - } + var test=arg[0]; + var offset = 0; + var hdg = getprop("/orientation/heading-magnetic-deg"); + if(test==0 or test == nil){return 0.0;} + + if(test == 1){ + offset=getprop("/instrumentation/nav/heading-deg"); + offset -= hdg; + if(offset < -180){offset += 360;} + elsif(offset > 180){offset -= 360;} + }elsif(test == 2){ + offset = props.globals.getNode("/instrumentation/adf/indicated-bearing-deg").getValue(); + }elsif(test == 3){ + offset = props.globals.getNode("/autopilot/internal/true-heading-error-deg").getValue(); + } + return offset; + } update_pfd = func{ - NavPtr1_offset.setValue(get_pointer_offset(NavPtr1.getValue())); - NavPtr2_offset.setValue(get_pointer_offset(NavPtr2.getValue())); + NavPtr1_offset.setValue(get_pointer_offset(NavPtr1.getValue())); + NavPtr2_offset.setValue(get_pointer_offset(NavPtr2.getValue())); - if(getprop("/instrumentation/nav/data-is-valid")=="true"){ - nm_calc = getprop("/instrumentation/nav/nav-distance"); - if(nm_calc == nil){nm_calc = 0.0;} - nm_calc = 0.000539 * nm_calc; - NavDist.setValue(nm_calc); - } + if(props.globals.getNode("/instrumentation/nav/data-is-valid").getBoolValue()){ + nm_calc = getprop("/instrumentation/nav/nav-distance"); + if(nm_calc == nil){nm_calc = 0.0;} + nm_calc = 0.000539 * nm_calc; + NavDist.setValue(nm_calc); + } } update_mfd = func{ @@ -50,65 +52,67 @@ update_mfd = func{ update_fuel = func{ var total_fuel = 0; if(getprop("/sim/flight-model")=="yasim"){ - FuelDensity=props.globals.getNode("consumables/fuel/tank[0]/density-ppg",1).getValue(); - var pph=getprop("/engines/engine[0]/fuel-flow-gph"); - if(pph == nil){pph = 0.0}; - FuelPph1.setValue(pph* FuelDensity); - pph=getprop("/engines/engine[1]/fuel-flow-gph"); - if(pph == nil){pph = 0.0}; - FuelPph2.setValue(pph* FuelDensity); - }else{ - tanks = props.globals.getNode("consumables/fuel").getChildren("tank"); - for(i=0; i 3000){hpsi=3000;} - Hyd1.setValue(hpsi); - hpsi = getprop("/engines/engine[1]/n2"); - if(hpsi == nil){hpsi=0.0;} - hpsi = hpsi * 100; - if(hpsi > 3000){hpsi=3000;} - Hyd2.setValue(hpsi); - update_fuel(); - } + var hpsi = getprop("/engines/engine[0]/n2"); + if(hpsi == nil){hpsi=0.0;} + hpsi = hpsi * 100; + if(hpsi > 3000){hpsi=3000;} + Hyd1.setValue(hpsi); + hpsi = getprop("/engines/engine[1]/n2"); + if(hpsi == nil){hpsi=0.0;} + hpsi = hpsi * 100; + if(hpsi > 3000){hpsi=3000;} + Hyd2.setValue(hpsi); + update_fuel(); + } update_p1000 = func { - update_pfd(); - update_mfd(); - update_eicas(); - settimer(update_p1000,0); - } - -settimer(update_p1000,0); + update_pfd(); + update_mfd(); + update_eicas(); + settimer(update_p1000,0); + } setlistener("/sim/signals/fdm-initialized", func { - setprop("/instrumentation/gps/wp/wp/waypoint-type","airport"); - setprop("/instrumentation/gps/wp/wp/ID",getprop("/sim/tower/airport-id")); - setprop("/instrumentation/gps/serviceable","true"); - FDMODE.setBoolValue(1); - NavPtr1.setValue(0.0); - NavPtr2.setValue(0.0); - NavPtr1_offset.setValue(0.0); - NavPtr2_offset.setValue(0.0); - RAmode.setValue(0.0); - NavDist.setValue(0.0); - Hyd1.setValue(0.0); - Hyd2.setValue(0.0); - FuelPph1.setValue(0.0); - FuelPph2.setValue(0.0); - APoff.setBoolValue(1); - print("Primus 1000 systems OK"); - }); + FDMODE.setBoolValue(1); + NavPtr1.setDoubleValue(0.0); + NavPtr2.setDoubleValue(0.0); + NavPtr1_offset.setDoubleValue(0.0); + NavPtr2_offset.setDoubleValue(0.0); + DC550.getNode("hsi",1).setBoolValue(0); + DC550.getNode("cp",1).setBoolValue(0); + DC550.getNode("hpa",1).setBoolValue(0); + DC550.getNode("ttg",1).setBoolValue(0); + DC550.getNode("et",1).setBoolValue(0); + DC550.getNode("fms",1).setBoolValue(0); + RAmode.setValue(0.0); + NavDist.setValue(0.0); + Hyd1.setValue(0.0); + Hyd2.setValue(0.0); + FuelPph1.setValue(0.0); + FuelPph2.setValue(0.0); + APoff.setBoolValue(1); + print("Primus 1000 systems ... check"); + settimer(update_p1000,1); + }); diff --git a/Aircraft/Instruments-3d/primus-1000/dc550.ac b/Aircraft/Instruments-3d/primus-1000/dc550.ac index 71205e845..67dfaf898 100644 --- a/Aircraft/Instruments-3d/primus-1000/dc550.ac +++ b/Aircraft/Instruments-3d/primus-1000/dc550.ac @@ -1,16 +1,15 @@ AC3Db MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0 MATERIAL "gloss" rgb 1 1 1 amb 0 0 0 emis 0 0 0 spec 0.504136 0.504136 0.504136 shi 32 trans 0 -MATERIAL "illum" rgb 1 1 1 amb 0 0 0 emis 0.7 0.7 0.7 spec 0 0 0 shi 0 trans 0 OBJECT world -kids 4 +kids 14 OBJECT poly name "DC-550" data 9 Plane.024 texture "dc-550.rgb" texrep 1 1 -crease 45 +crease 45.000000 numvert 32 0.002067 0.030497 -0.076876 0.002067 -0.030497 -0.076876 @@ -201,12 +200,243 @@ refs 4 24 0.387261837721 0.693654894829 kids 0 OBJECT poly +name "DC550.et" +data 9 +Plane.016 +texture "dc-550.rgb" +texrep 1 1 +crease 30.000000 +numvert 4 +0.002289 0.022547 -0.01176 +0.002289 0.010413 -0.01176 +0.002289 0.010413 -0.023894 +0.002289 0.022547 -0.023894 +numsurf 1 +SURF 0x00 +mat 1 +refs 4 +3 0.174445688725 0.334841698408 +0 0.0554378032684 0.334841698408 +1 0.0554377436638 0.215833753347 +2 0.174445688725 0.215833753347 +kids 0 +OBJECT poly +name "DC550.fms" +data 9 +Plane.031 +texture "dc-550.rgb" +texrep 1 1 +crease 30.000000 +numvert 4 +0.002289 0.022547 -0.059823 +0.002289 0.010413 -0.059823 +0.002289 0.010413 -0.047689 +0.002289 0.022547 -0.047689 +numsurf 1 +SURF 0x00 +mat 1 +refs 4 +0 0.572850584984 0.334842294455 +3 0.453842192888 0.334842294455 +2 0.453842192888 0.215833872557 +1 0.572850584984 0.215833872557 +kids 0 +OBJECT poly +name "DC550.gspd-ttg" +data 9 +Plane.013 +texture "dc-550.rgb" +texrep 1 1 +crease 30.000000 +numvert 4 +0.002289 0.022547 0.006261 +0.002289 0.010413 0.006261 +0.002289 0.010413 -0.005873 +0.002289 0.022547 -0.005873 +numsurf 1 +SURF 0x00 +mat 1 +refs 4 +3 0.773733615875 0.535929918289 +0 0.654725670815 0.535929918289 +1 0.654725670815 0.416921973228 +2 0.773733615875 0.416921973228 +kids 0 +OBJECT poly +name "DC550.hsi" +data 9 +Plane.010 +texture "dc-550.rgb" +texrep 1 1 +crease 30.000000 +numvert 4 +0.002289 0.022547 0.059759 +0.002289 0.010413 0.059759 +0.002289 0.010413 0.047625 +0.002289 0.022547 0.047625 +numsurf 1 +SURF 0x00 +mat 1 +refs 4 +3 0.172568261623 0.538762152195 +0 0.0535603500903 0.538762152195 +1 0.0535603202879 0.419754207134 +2 0.172568261623 0.419754207134 +kids 0 +OBJECT poly +name "DC550.in-hpa" +data 9 +Plane.012 +texture "dc-550.rgb" +texrep 1 1 +crease 30.000000 +numvert 4 +0.002289 0.022547 0.024112 +0.002289 0.010413 0.024112 +0.002289 0.010413 0.011978 +0.002289 0.022547 0.011978 +numsurf 1 +SURF 0x00 +mat 1 +refs 4 +3 0.575993955135 0.535929918289 +0 0.456986069679 0.535929918289 +1 0.456986010075 0.416921973228 +2 0.575993955135 0.416921973228 +kids 0 +OBJECT poly +name "DC550.nav" +data 9 +Plane.017 +texture "dc-550.rgb" +texrep 1 1 +crease 30.000000 +numvert 4 +0.002289 0.022547 -0.029893 +0.002289 0.010413 -0.029893 +0.002289 0.010413 -0.042028 +0.002289 0.022547 -0.042028 +numsurf 1 +SURF 0x00 +mat 1 +refs 4 +3 0.372828274965 0.334842294455 +0 0.253819912672 0.334842294455 +1 0.253819853067 0.215833872557 +2 0.372828274965 0.215833872557 +kids 0 +OBJECT poly +name "DC550.sc-cp" +data 9 +Plane.011 +texture "dc-550.rgb" +texrep 1 1 +crease 30.000000 +numvert 4 +0.002289 0.022547 0.041907 +0.002289 0.010413 0.041907 +0.002289 0.010413 0.029773 +0.002289 0.022547 0.029773 +numsurf 1 +SURF 0x00 +mat 1 +refs 4 +3 0.373140096664 0.535929918289 +0 0.254132181406 0.535929918289 +1 0.254132151604 0.416921973228 +2 0.373140096664 0.416921973228 +kids 0 +OBJECT poly +name "N1ptr.dwn" +data 5 +Plane +texture "dc-550.rgb" +texrep 1 1 +crease 30.000000 +numvert 4 +0.002495 -0.019248 0.061795 +0.002495 -0.004397 0.061795 +0.002495 -0.019248 0.052706 +0.002495 -0.004397 0.052706 +numsurf 1 +SURF 0x00 +mat 1 +refs 4 +0 0.0969711393118 0.675462245941 +2 0.157928466797 0.675462245941 +3 0.157928496599 0.775062561035 +1 0.0969711840153 0.775062561035 +kids 0 +OBJECT poly +name "N1ptr.up" +data 9 +Plane.001 +texture "dc-550.rgb" +texrep 1 1 +crease 30.000000 +numvert 4 +0.002495 -0.004397 0.052706 +0.002495 -0.019248 0.052706 +0.002495 -0.019248 0.043616 +0.002495 -0.004397 0.043616 +numsurf 1 +SURF 0x00 +mat 1 +refs 4 +3 0.218885794282 0.775062561035 +0 0.157928496599 0.775062561035 +1 0.157928466797 0.675462245941 +2 0.218885794282 0.675462245941 +kids 0 +OBJECT poly +name "N2ptr.dwn" +data 9 +Plane.004 +texture "dc-550.rgb" +texrep 1 1 +crease 30.000000 +numvert 4 +0.002495 -0.004397 -0.051432 +0.002495 -0.019248 -0.051432 +0.002495 -0.004397 -0.042343 +0.002495 -0.019248 -0.042343 +numsurf 1 +SURF 0x00 +mat 1 +refs 4 +0 0.836053490639 0.775062561035 +2 0.775096178055 0.775062561035 +3 0.775096178055 0.675462245941 +1 0.836053490639 0.675462245941 +kids 0 +OBJECT poly +name "N2ptr.up" +data 9 +Plane.002 +texture "dc-550.rgb" +texrep 1 1 +crease 30.000000 +numvert 4 +0.002495 -0.004397 -0.051432 +0.002495 -0.019248 -0.051432 +0.002495 -0.019248 -0.060521 +0.002495 -0.004397 -0.060521 +numsurf 1 +SURF 0x00 +mat 1 +refs 4 +3 0.897010803223 0.775062561035 +0 0.836053490639 0.775062561035 +1 0.836053490639 0.675462245941 +2 0.897010803223 0.675462245941 +kids 0 +OBJECT poly name "nav-pointer.001" data 9 Plane.014 texture "dc-550.rgb" texrep 1 1 -crease 45 +crease 45.000000 numvert 24 0.00226 -0.014254 0.04749 0.00226 -0.016536 0.049405 @@ -359,7 +589,7 @@ data 9 Plane.015 texture "dc-550.rgb" texrep 1 1 -crease 45 +crease 45.000000 numvert 24 0.010398 -0.017131 -0.048983 0.010398 -0.017648 -0.051917 @@ -506,90 +736,3 @@ refs 4 10 0.984375 0.5546875 22 0.984375 0.578125 kids 0 -OBJECT poly -name "DC-btns" -data 9 -Plane.031 -texture "dc-550.rgb" -texrep 1 1 -crease 30 -numvert 28 -0.002289 0.022547 -0.059823 -0.002289 0.010413 -0.059823 -0.002289 0.010413 -0.047689 -0.002289 0.022547 -0.047689 -0.002289 0.022547 -0.042028 -0.002289 0.010413 -0.042028 -0.002289 0.010413 -0.029893 -0.002289 0.022547 -0.029893 -0.002289 0.022547 -0.023894 -0.002289 0.010413 -0.023894 -0.002289 0.010413 -0.01176 -0.002289 0.022547 -0.01176 -0.002289 0.022547 -0.005873 -0.002289 0.010413 -0.005873 -0.002289 0.010413 0.006261 -0.002289 0.022547 0.006261 -0.002289 0.022547 0.011978 -0.002289 0.010413 0.011978 -0.002289 0.010413 0.024112 -0.002289 0.022547 0.024112 -0.002289 0.022547 0.029773 -0.002289 0.010413 0.029773 -0.002289 0.010413 0.041907 -0.002289 0.022547 0.041907 -0.002289 0.022547 0.047625 -0.002289 0.010413 0.047625 -0.002289 0.010413 0.059759 -0.002289 0.022547 0.059759 -numsurf 7 -SURF 0x00 -mat 2 -refs 4 -0 0.572850584984 0.334842294455 -3 0.453842192888 0.334842294455 -2 0.453842192888 0.215833872557 -1 0.572850584984 0.215833872557 -SURF 0x00 -mat 2 -refs 4 -4 0.372828274965 0.334842294455 -7 0.253819912672 0.334842294455 -6 0.253819853067 0.215833872557 -5 0.372828274965 0.215833872557 -SURF 0x00 -mat 2 -refs 4 -8 0.174445688725 0.334841698408 -11 0.0554378032684 0.334841698408 -10 0.0554377436638 0.215833753347 -9 0.174445688725 0.215833753347 -SURF 0x00 -mat 2 -refs 4 -12 0.773733615875 0.535929918289 -15 0.654725670815 0.535929918289 -14 0.654725670815 0.416921973228 -13 0.773733615875 0.416921973228 -SURF 0x00 -mat 2 -refs 4 -16 0.575993955135 0.535929918289 -19 0.456986069679 0.535929918289 -18 0.456986010075 0.416921973228 -17 0.575993955135 0.416921973228 -SURF 0x00 -mat 2 -refs 4 -20 0.373140096664 0.535929918289 -23 0.254132181406 0.535929918289 -22 0.254132151604 0.416921973228 -21 0.373140096664 0.416921973228 -SURF 0x00 -mat 2 -refs 4 -24 0.172568261623 0.538762152195 -27 0.0535603500903 0.538762152195 -26 0.0535603202879 0.419754207134 -25 0.172568261623 0.419754207134 -kids 0 diff --git a/Aircraft/Instruments-3d/primus-1000/dc550.xml b/Aircraft/Instruments-3d/primus-1000/dc550.xml index 6d0dbc3c1..dad1cd937 100644 --- a/Aircraft/Instruments-3d/primus-1000/dc550.xml +++ b/Aircraft/Instruments-3d/primus-1000/dc550.xml @@ -10,20 +10,12 @@ Display Control 550 rotate nav-pointer.001 - instrumentation/primus1000/nav1pointer + instrumentation/primus1000/dc550/nav1ptr - - 0.00.0 - - - 1.035.0 - - - 2.070.0 - - - 3.0100.0 - + 0.00.0 + 1.035.0 + 2.070.0 + 3.0100.0 -1.0 @@ -40,20 +32,12 @@ Display Control 550 rotate nav-pointer.002 - instrumentation/primus1000/nav2pointer + instrumentation/primus1000/dc550/nav2ptr - - 0.00.0 - - - 1.030.0 - - - 2.060.0 - - - 3.090.0 - + 0.00.0 + 1.030.0 + 2.060.0 + 3.090.0 -1.0 @@ -67,4 +51,167 @@ Display Control 550 - + + + + pick + N1ptr.dwn + + + false + + property-adjust + instrumentation/primus1000/dc550/nav1ptr + -1 + 0 + 3 + false + + + + + + pick + N1ptr.up + + + false + + property-adjust + instrumentation/primus1000/dc550/nav1ptr + 1 + 0 + 3 + false + + + + + + pick + N2ptr.dwn + + + false + + property-adjust + instrumentation/primus1000/dc550/nav2ptr + -1 + 0 + 3 + false + + + + + + pick + N2ptr.up + + + false + + property-adjust + instrumentation/primus1000/dc550/nav2ptr + 1 + 0 + 3 + false + + + + + + pick + DC550.hsi + + + false + + property-toggle + instrumentation/primus1000/dc550/hsi + + + + + + pick + DC550.sc-cp + + + false + + property-toggle + instrumentation/primus1000/dc550/cp + + + + + + pick + DC550.in-hpa + + + false + + property-toggle + instrumentation/primus1000/dc550/hpa + + + + + + pick + DC550.gspd-ttg + + + false + + property-toggle + instrumentation/primus1000/dc550/ttg + + + + + + pick + DC550.et + + + false + + property-toggle + instrumentation/primus1000/dc550/et + + + + + + pick + DC550.nav + + + false + + property-assign + instrumentation/primus1000/dc550/fms + 0 + + + + + + pick + DC550.fms + + + false + + property-assign + instrumentation/primus1000/dc550/fms + 1 + + + + + \ No newline at end of file diff --git a/Aircraft/Instruments-3d/primus-1000/fmc.ac b/Aircraft/Instruments-3d/primus-1000/fmc.ac index c0abf5156..1f05f234b 100644 --- a/Aircraft/Instruments-3d/primus-1000/fmc.ac +++ b/Aircraft/Instruments-3d/primus-1000/fmc.ac @@ -3,112 +3,85 @@ MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi MATERIAL "illum" rgb 1 1 1 amb 0 0 0 emis 0.7 0.7 0.7 spec 0 0 0 shi 0 trans 0 MATERIAL "gloss" rgb 1 1 1 amb 0 0 0 emis 0 0 0 spec 0.504136 0.504136 0.504136 shi 32 trans 0 OBJECT world -kids 2 +kids 10 OBJECT poly name "FD-btns" data 9 Plane.004 -texture "bezels.rgb" -texrep 1 1 -crease 30 -numvert 32 -0.00384 0.006511 -0.077331 -0.00384 -0.005449 -0.077331 -0.00384 -0.005449 -0.060624 -0.00384 0.006511 -0.060624 -0.00384 0.006511 -0.057732 -0.00384 -0.005449 -0.057732 -0.00384 -0.005449 -0.041025 -0.00384 0.006511 -0.041025 -0.00384 0.006511 -0.038133 -0.00384 -0.005449 -0.038133 -0.00384 -0.005449 -0.021426 -0.00384 0.006511 -0.021426 -0.00384 0.006511 -0.018638 -0.00384 -0.005449 -0.018638 -0.00384 -0.005449 -0.001348 -0.00384 0.006511 -0.001348 -0.00384 0.006511 0.001642 -0.00384 -0.005449 0.001642 -0.00384 -0.005449 0.018349 -0.00384 0.006511 0.018349 -0.00384 0.006511 0.021081 -0.00384 -0.005449 0.021081 -0.00384 -0.005449 0.037788 -0.00384 0.006511 0.037788 -0.00384 0.006511 0.040763 -0.00384 -0.005449 0.040763 -0.00384 -0.005449 0.05747 -0.00384 0.006511 0.05747 -0.00384 0.006511 0.060507 -0.00384 -0.005449 0.060507 -0.00384 -0.005449 0.077214 -0.00384 0.006511 0.077214 -numsurf 8 -SURF 0x00 -mat 1 -refs 4 -0 0.933762907982 0.605710744858 -3 0.84085392952 0.605710744858 -2 0.84085392952 0.539198756218 -1 0.933762907982 0.539198756218 -SURF 0x00 -mat 1 -refs 4 -4 0.823555231094 0.605710744858 -7 0.730646252632 0.605710744858 -6 0.730646252632 0.539198756218 -5 0.823555231094 0.539198756218 -SURF 0x00 -mat 1 -refs 4 -8 0.713347554207 0.605710744858 -11 0.620438575745 0.605710744858 -10 0.620438575745 0.539198756218 -9 0.713347554207 0.539198756218 -SURF 0x00 -mat 1 -refs 4 -12 0.603139936924 0.605710744858 -15 0.510230958462 0.605710744858 -14 0.510230958462 0.539198756218 -13 0.603139936924 0.539198756218 -SURF 0x00 -mat 1 -refs 4 -16 0.49322232604 0.605710744858 -19 0.400313317776 0.605710744858 -18 0.400313317776 0.539198756218 -17 0.49322232604 0.539198756218 -SURF 0x00 -mat 1 -refs 4 -20 0.383014678955 0.605710744858 -23 0.290105640888 0.605710744858 -22 0.290105640888 0.539198756218 -21 0.383014678955 0.539198756218 -SURF 0x00 -mat 1 -refs 4 -24 0.27542412281 0.605710744858 -27 0.182515129447 0.605710744858 -26 0.182515129447 0.539198756218 -25 0.27542412281 0.539198756218 -SURF 0x00 -mat 1 -refs 4 -28 0.163759410381 0.605710744858 -31 0.0708504021168 0.605710744858 -30 0.0708504021168 0.539198756218 -29 0.163759410381 0.539198756218 +crease 30.000000 +numvert 0 +numsurf 0 kids 0 OBJECT poly -name "FD-controller" +name "FD.alt" +data 9 +Plane.007 +texture "bezels.rgb" +texrep 1 1 +crease 30.000000 +numvert 4 +0.00384 0.006511 -0.021426 +0.00384 -0.005449 -0.021426 +0.00384 -0.005449 -0.038133 +0.00384 0.006511 -0.038133 +numsurf 1 +SURF 0x00 +mat 1 +refs 4 +3 0.713347554207 0.605710744858 +0 0.620438575745 0.605710744858 +1 0.620438575745 0.539198756218 +2 0.713347554207 0.539198756218 +kids 0 +OBJECT poly +name "FD.apr" +data 9 +Plane.002 +texture "bezels.rgb" +texrep 1 1 +crease 30.000000 +numvert 4 +0.00384 0.006511 0.037788 +0.00384 -0.005449 0.037788 +0.00384 -0.005449 0.021081 +0.00384 0.006511 0.021081 +numsurf 1 +SURF 0x00 +mat 1 +refs 4 +3 0.383014678955 0.605710744858 +0 0.290105640888 0.605710744858 +1 0.290105640888 0.539198756218 +2 0.383014678955 0.539198756218 +kids 0 +OBJECT poly +name "FD.bc" +data 9 +Plane.005 +texture "bezels.rgb" +texrep 1 1 +crease 30.000000 +numvert 4 +0.00384 0.006511 0.018349 +0.00384 -0.005449 0.018349 +0.00384 -0.005449 0.001642 +0.00384 0.006511 0.001642 +numsurf 1 +SURF 0x00 +mat 1 +refs 4 +3 0.49322232604 0.605710744858 +0 0.400313317776 0.605710744858 +1 0.400313317776 0.539198756218 +2 0.49322232604 0.539198756218 +kids 0 +OBJECT poly +name "FD.controller" data 9 Plane.003 texture "bezels.rgb" texrep 1 1 -crease 30 +crease 30.000000 numvert 8 0.0032 0.016289 -0.090258 0.0032 -0.016289 -0.090258 @@ -162,3 +135,108 @@ refs 4 7 0.000315129756927 0.659498035908 6 1.00142765045 0.659498035908 kids 0 +OBJECT poly +name "FD.hdg" +data 5 +Plane +texture "bezels.rgb" +texrep 1 1 +crease 30.000000 +numvert 4 +0.00384 0.006511 0.077214 +0.00384 -0.005449 0.077214 +0.00384 -0.005449 0.060507 +0.00384 0.006511 0.060507 +numsurf 1 +SURF 0x00 +mat 1 +refs 4 +3 0.163759410381 0.605710744858 +0 0.0708504021168 0.605710744858 +1 0.0708504021168 0.539198756218 +2 0.163759410381 0.539198756218 +kids 0 +OBJECT poly +name "FD.nav" +data 9 +Plane.001 +texture "bezels.rgb" +texrep 1 1 +crease 30.000000 +numvert 4 +0.00384 0.006511 0.05747 +0.00384 -0.005449 0.05747 +0.00384 -0.005449 0.040763 +0.00384 0.006511 0.040763 +numsurf 1 +SURF 0x00 +mat 1 +refs 4 +3 0.27542412281 0.605710744858 +0 0.182515129447 0.605710744858 +1 0.182515129447 0.539198756218 +2 0.27542412281 0.539198756218 +kids 0 +OBJECT poly +name "FD.spd" +data 9 +Plane.009 +texture "bezels.rgb" +texrep 1 1 +crease 30.000000 +numvert 4 +0.00384 0.006511 -0.060624 +0.00384 -0.005449 -0.060624 +0.00384 -0.005449 -0.077331 +0.00384 0.006511 -0.077331 +numsurf 1 +SURF 0x00 +mat 1 +refs 4 +3 0.933762907982 0.605710744858 +0 0.84085392952 0.605710744858 +1 0.84085392952 0.539198756218 +2 0.933762907982 0.539198756218 +kids 0 +OBJECT poly +name "FD.vnav" +data 9 +Plane.006 +texture "bezels.rgb" +texrep 1 1 +crease 30.000000 +numvert 4 +0.00384 0.006511 -0.001348 +0.00384 -0.005449 -0.001348 +0.00384 -0.005449 -0.018638 +0.00384 0.006511 -0.018638 +numsurf 1 +SURF 0x00 +mat 1 +refs 4 +3 0.603139936924 0.605710744858 +0 0.510230958462 0.605710744858 +1 0.510230958462 0.539198756218 +2 0.603139936924 0.539198756218 +kids 0 +OBJECT poly +name "FD.vs" +data 9 +Plane.008 +texture "bezels.rgb" +texrep 1 1 +crease 30.000000 +numvert 4 +0.00384 0.006511 -0.041025 +0.00384 -0.005449 -0.041025 +0.00384 -0.005449 -0.057732 +0.00384 0.006511 -0.057732 +numsurf 1 +SURF 0x00 +mat 1 +refs 4 +3 0.823555231094 0.605710744858 +0 0.730646252632 0.605710744858 +1 0.730646252632 0.539198756218 +2 0.823555231094 0.539198756218 +kids 0 diff --git a/Aircraft/Instruments-3d/primus-1000/fmc.xml b/Aircraft/Instruments-3d/primus-1000/fmc.xml index 8d48e523b..e4bb88876 100644 --- a/Aircraft/Instruments-3d/primus-1000/fmc.xml +++ b/Aircraft/Instruments-3d/primus-1000/fmc.xml @@ -7,4 +7,246 @@ Flight Mode Control fmc.ac + + select + FD.hdg + + + instrumentation/flightdirector/lnav + 1 + + + + + + select + FD.nav + + + instrumentation/flightdirector/lnav + 2 + + + + + + select + FD.apr + + + instrumentation/flightdirector/lnav + 3 + + + + + + select + FD.bc + + + instrumentation/flightdirector/lnav + 4 + + + + + + select + FD.vnav + + + instrumentation/flightdirector/vnav + 7 + + + + + + select + FD.alt + + + instrumentation/flightdirector/vnav + 2 + + + + + + select + FD.vs + + + instrumentation/flightdirector/vnav + 3 + + + + + + select + FD.spd + + + instrumentation/flightdirector/spd + 1 + + + + + + + + pick + FD.hdg + + + false + + nasal + + + + + + + pick + FD.nav + + + false + + nasal + + + + + + + pick + FD.apr + + + false + + nasal + + + + + + + pick + FD.bc + + + false + + nasal + + + + + + + pick + FD.vnav + + + false + + nasal + + + + + + + pick + FD.alt + + + false + + nasal + + + + + + + pick + FD.vs + + + false + + nasal + + + + + + + pick + FD.spd + + + false + + nasal + + + + + \ No newline at end of file diff --git a/Aircraft/Instruments-3d/primus-1000/primus1000-pfd.xml b/Aircraft/Instruments-3d/primus-1000/primus1000-pfd.xml index 933e17e4f..f9be8ebe3 100644 --- a/Aircraft/Instruments-3d/primus-1000/primus1000-pfd.xml +++ b/Aircraft/Instruments-3d/primus-1000/primus1000-pfd.xml @@ -354,7 +354,7 @@ Primus 1000 Primary Flight Display rotate NAV1pointer - instrumentation/primus1000/nav1pointer-heading-offset + instrumentation/primus1000/dc550/nav1ptr-hdg-offset -1.0 0.0 @@ -370,7 +370,7 @@ Primus 1000 Primary Flight Display rotate NAV2pointer - instrumentation/primus1000/nav2pointer-heading-offset + instrumentation/primus1000/dc550/nav2ptr-hdg-offset -1.0 0.0 @@ -639,7 +639,7 @@ Primus 1000 Primary Flight Display textranslate gsptext - instrumentation/gps/indicated-ground-speed-kt + velocities/groundspeed-kt 0.001 100 @@ -652,7 +652,7 @@ Primus 1000 Primary Flight Display textranslate gsptext.001 - instrumentation/gps/indicated-ground-speed-kt + velocities/groundspeed-kt 0.01 10 @@ -665,7 +665,7 @@ Primus 1000 Primary Flight Display textranslate gsptext.002 - instrumentation/gps/indicated-ground-speed-kt + velocities/groundspeed-kt 0.1 1 @@ -912,7 +912,7 @@ Primus 1000 Primary Flight Display textranslate nav1msg - instrumentation/primus1000/nav1pointer + instrumentation/primus1000/dc550/nav1ptr 0.025 1 @@ -925,7 +925,7 @@ Primus 1000 Primary Flight Display textranslate nav2msg - instrumentation/primus1000/nav2pointer + instrumentation/primus1000/dc550/nav2ptr 0.025 1 @@ -950,7 +950,7 @@ Primus 1000 Primary Flight Display textranslate crsmsg - instrumentation/primus1000/nav1pointer + instrumentation/primus1000/dc550/nav1ptr 0.0099 3 @@ -999,7 +999,7 @@ Primus 1000 Primary Flight Display NAV1pointer - instrumentation/primus1000/nav1pointer + instrumentation/primus1000/dc550/nav1ptr 0 @@ -1010,7 +1010,7 @@ Primus 1000 Primary Flight Display NAV2pointer - instrumentation/primus1000/nav2pointer + instrumentation/primus1000/dc550/nav2ptr 0