Ignore:
Timestamp:
02/23/19 13:38:11 (4 years ago)
Author:
István Váradi <ivaradi@…>
Branch:
default
Parents:
908:fcf3c44650f1 (diff), 916:4f738ffc3596 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
hg-Phase:
(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')
Message:

Merged 0.39

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/mlx/const.py

    r907 r917  
    4949## Flight simulator type: Prepar3D
    5050SIM_P3D = 5
     51
     52## Flight simulator type: X-Plane 11
     53SIM_XPLANE11 = 6
    5154
    5255#-------------------------------------------------------------------------------
  • src/mlx/const.py

    r911 r917  
    1212
    1313## The version of the program
    14 VERSION="0.39.6"
     14VERSION="0.40.1"
    1515
    1616#-------------------------------------------------------------------------------
     
    108108## Aircraft type: British Aerospace BAe-146
    109109AIRCRAFT_B462 = 17
     110
     111## Aircraft type: British Aerospace BAe-146
     112AIRCRAFT_IL62 = 19
    110113
    111114#-------------------------------------------------------------------------------
     
    122125                 AIRCRAFT_T154, AIRCRAFT_T134,
    123126                 AIRCRAFT_YK40, AIRCRAFT_DC3,
    124                  AIRCRAFT_B462]
     127                 AIRCRAFT_B462, AIRCRAFT_IL62]
    125128
    126129#-------------------------------------------------------------------------------
     
    158161## Aircraft type family: British Aerospace BAe-146
    159162AIRCRAFT_FAMILY_B462 = 11
     163
     164## Aircraft type family: Ilyushin IL-62
     165AIRCRAFT_FAMILY_IL62 = 12
    160166
    161167#-------------------------------------------------------------------------------
     
    185191    AIRCRAFT_FAMILY_YK40: [AIRCRAFT_YK40],
    186192
    187     AIRCRAFT_FAMILY_B462: [AIRCRAFT_B462]
     193    AIRCRAFT_FAMILY_B462: [AIRCRAFT_B462],
     194
     195    AIRCRAFT_FAMILY_IL62: [AIRCRAFT_IL62]
    188196
    189197    }
     
    219227              AIRCRAFT_T154  : "T154",
    220228              AIRCRAFT_YK40  : "YK40",
    221               AIRCRAFT_B462  : "B462" }
     229              AIRCRAFT_B462  : "B462",
     230              AIRCRAFT_IL62  : "IL62" }
     231
     232#-------------------------------------------------------------------------------
     233
     234## A mapping from ICAO codes to the corresponding aircraft types
     235icao2Type = { "B736" : AIRCRAFT_B736,
     236              "B737" : AIRCRAFT_B737,
     237              "B738" : AIRCRAFT_B738,
     238              "B732" : AIRCRAFT_B732,
     239              "B733" : AIRCRAFT_B733,
     240              "B734" : AIRCRAFT_B734,
     241              "B735" : AIRCRAFT_B735,
     242              "DH8D" : AIRCRAFT_DH8D,
     243              "B762" : AIRCRAFT_B762,
     244              "B763" : AIRCRAFT_B763,
     245              "CRJ2" : AIRCRAFT_CRJ2,
     246              "F70"  : AIRCRAFT_F70,
     247              "DC3"  : AIRCRAFT_DC3,
     248              "T134" : AIRCRAFT_T134,
     249              "T154" : AIRCRAFT_T154,
     250              "YK40" : AIRCRAFT_YK40,
     251              "B462" : AIRCRAFT_B462,
     252              "IL62" : AIRCRAFT_IL62 }
    222253
    223254#-------------------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.