1
0
Fork 0

Emesary: tidy up default MP prooperty index and add droptanks to GeoEvent

This commit is contained in:
Richard Harrison 2016-04-25 20:40:57 +02:00
parent beb26236aa
commit b3cb0689b8
2 changed files with 11 additions and 10 deletions

View file

@ -55,6 +55,7 @@
# seperate instantiatable incoming bridge manager. # seperate instantiatable incoming bridge manager.
# #
# The outgoing bridge would usually be created within the aircraft loading Nasal. # The outgoing bridge would usually be created within the aircraft loading Nasal.
var EmesaryMPBridgeDefaultPropertyIndex=19;
var OutgoingMPBridge = var OutgoingMPBridge =
{ {
@ -62,12 +63,12 @@ var OutgoingMPBridge =
StartMessageIndex : 11, StartMessageIndex : 11,
DefaultMessageLifetime : 10, DefaultMessageLifetime : 10,
MPStringMaxLen: 50, MPStringMaxLen: 50,
new: func(_ident, _notifications_to_bridge=nil, _mpidx=18, _root="", _transmitter=nil) new: func(_ident, _notifications_to_bridge=nil, _mpidx=19, _root="", _transmitter=nil)
{ {
if (_transmitter == nil) if (_transmitter == nil)
_transmitter = emesary.GlobalTransmitter; _transmitter = emesary.GlobalTransmitter;
print("OutgoingMPBridge created for "~_ident); print("OutgoingMPBridge created for "~_ident," mp=",_mpidx);
var new_class = emesary.Recipient.new("OutgoingMPBridge "~_ident); var new_class = emesary.Recipient.new("OutgoingMPBridge "~_ident);
new_class.MessageIndex = OutgoingMPBridge.StartMessageIndex; new_class.MessageIndex = OutgoingMPBridge.StartMessageIndex;
@ -213,12 +214,12 @@ var OutgoingMPBridge =
# route messages to # route messages to
var IncomingMPBridge = var IncomingMPBridge =
{ {
new: func(_ident, _notifications_to_bridge=nil, _mpidx=18, _transmitter=nil) new: func(_ident, _notifications_to_bridge=nil, _mpidx=19, _transmitter=nil)
{ {
if (_transmitter == nil) if (_transmitter == nil)
_transmitter = emesary.GlobalTransmitter; _transmitter = emesary.GlobalTransmitter;
print("IncominggMPBridge created for "~_ident); print("IncominggMPBridge created for "~_ident," mp=",_mpidx);
var new_class = emesary.Transmitter.new("IncominggMPBridge "~_ident); var new_class = emesary.Transmitter.new("IncominggMPBridge "~_ident);
@ -347,7 +348,7 @@ var IncomingMPBridge =
if (callsign == "" or callsign == nil) if (callsign == "" or callsign == nil)
callsign = path; callsign = path;
var incomingBridge = emesary_mp_bridge.IncomingMPBridge.new(path, notification_list, 18); var incomingBridge = emesary_mp_bridge.IncomingMPBridge.new(path, notification_list);
incomingBridge.Connect(path~"/"); incomingBridge.Connect(path~"/");
incomingBridgeList[path] = incomingBridge; incomingBridgeList[path] = incomingBridge;

View file

@ -136,11 +136,11 @@ var GeoEventNotification =
# 46 0010 1110 - Fuselage Center # 46 0010 1110 - Fuselage Center
# 47 0010 1111 - Fuselage Back # 47 0010 1111 - Fuselage Back
#-------- #--------
# Type 0011 : # Type 0011 : External stores
# 48 0011 0000 - # 48 0011 0000 - Drop Tank 1
# 49 0011 0001 - # 49 0011 0001 - Drop Tank 2
# 50 0011 0010 - # 50 0011 0010 - Drop Tank 3
# 51 0011 0011 - # 51 0011 0011 - Drop Tank 4
# 52 0011 0100 - # 52 0011 0100 -
# 53 0011 0101 - # 53 0011 0101 -
# 54 0011 0110 - # 54 0011 0110 -