diff --git a/instrument-data-link/LVars-A32NX.h b/instrument-data-link/LVars-Fbw.h similarity index 91% rename from instrument-data-link/LVars-A32NX.h rename to instrument-data-link/LVars-Fbw.h index 7b8a73d..a247555 100644 --- a/instrument-data-link/LVars-A32NX.h +++ b/instrument-data-link/LVars-Fbw.h @@ -1,16 +1,18 @@ -#ifndef _LVARS_A32NX_H_ -#define _LVARS_A32NX_H_ +#ifndef _LVARS_FBW_H_ +#define _LVARS_FBW_H_ #include -// LVars for FBW Airbus A320 +// LVars for FBW Airbus A320 & A380 const char A32NX_APU_MASTER_SW[] = "L:A32NX_OVHD_APU_MASTER_SW_PB_IS_ON, bool"; const char A32NX_APU_START[] = "L:A32NX_OVHD_APU_START_PB_IS_ON, bool"; const char A32NX_APU_START_AVAIL[] = "L:A32NX_OVHD_APU_START_PB_IS_AVAILABLE, bool"; const char A32NX_APU_BLEED[] = "L:A32NX_OVHD_PNEU_APU_BLEED_PB_IS_ON, bool"; const char A32NX_ELEC_BAT1[] = "L:A32NX_OVHD_ELEC_BAT_1_PB_IS_AUTO, bool"; const char A32NX_ELEC_BAT2[] = "L:A32NX_OVHD_ELEC_BAT_2_PB_IS_AUTO, bool"; +const char A32NX_ELEC_BAT_ESS[] = "L:A32NX_OVHD_ELEC_BAT_ESS_PB_IS_AUTO, bool"; +const char A32NX_ELEC_BAT_APU[] = "L:A32NX_OVHD_ELEC_BAT_APU_PB_IS_AUTO, bool"; const char A32NX_PARK_BRAKE_POS[] = "L:A32NX_PARK_BRAKE_LEVER_POS, bool"; const char A32NX_XPNDR_MODE[] = "L:A32NX_TRANSPONDER_MODE, enum"; const char A32NX_AUTOPILOT_1[] = "L:A32NX_AUTOPILOT_1_ACTIVE, bool"; @@ -42,7 +44,7 @@ const char A32NX_ENGINE_FUEL_FLOW2[] = "L:A32NX_ENGINE_FF:2, number"; const char A32NX_FLAPS_INDEX[] = "L:A32NX_FLAPS_HANDLE_INDEX, number"; const char A32NX_SPOILERS_HANDLE_POS[] = "L:A32NX_SPOILERS_HANDLE_POSITION, number"; -struct LVars_A320 +struct LVars_FBW { double apuStart = 0; double apuStartAvail = 0; @@ -65,4 +67,4 @@ struct LVars_A320 double engineFuelFlow2 = 0; }; -#endif // _LVARS_A32NX_H_ +#endif // _LVARS_FBW_H_ diff --git a/instrument-data-link/instrument-data-link.cpp b/instrument-data-link/instrument-data-link.cpp index 317c123..826de75 100644 --- a/instrument-data-link/instrument-data-link.cpp +++ b/instrument-data-link/instrument-data-link.cpp @@ -9,7 +9,7 @@ #include #include "simvarDefs.h" #include "LVars-A310.h" -#include "LVars-A32NX.h" +#include "LVars-Fbw.h" #include "LVars-Kodiak100.h" #include "jetbridge.h" #include "vjoy.h" @@ -81,7 +81,9 @@ bool hasFlown = false; int onStandState = 0; double skytrackState = 0; bool isA310 = false; +bool isFbw = false; bool isA320 = false; +bool isA380 = false; bool is747 = false; bool isK100 = false; bool isPA28 = false; @@ -92,7 +94,7 @@ double lastHeading = 0; int seatBeltsReplicateDelay = 0; int fixedPushback = -1; LVars_A310 a310Vars; -LVars_A320 a320Vars; +LVars_FBW fbwVars; HANDLE hSimConnect = NULL; extern const char* versionString; extern const char* SimVarDefs[][2]; @@ -157,8 +159,8 @@ void pollJetbridge() readA310Jetbridge(); Sleep(loopMillis); } - else if (simVars.connected && isA320) { - readA320Jetbridge(); + else if (simVars.connected && isFbw) { + readFbwJetbridge(); Sleep(loopMillis); } else { @@ -225,7 +227,9 @@ void CALLBACK MyDispatchProc(SIMCONNECT_RECV* pData, DWORD cbData, void* pContex // Populate internal variables simVars.skytrackState = skytrackState; isA310 = false; + isFbw = false; isA320 = false; + isA380 = false; is747 = false; isK100 = false; isPA28 = false; @@ -237,15 +241,25 @@ void CALLBACK MyDispatchProc(SIMCONNECT_RECV* pData, DWORD cbData, void* pContex isNewAircraft = true; } - if (strncmp(simVars.aircraft, "A310", 4) == 0 || strncmp(simVars.aircraft, "Airbus A310", 11) == 0) { - isA310 = true; - isAirliner = true; - } - else if (strncmp(simVars.aircraft, "FBW", 3) == 0 || strncmp(simVars.aircraft, "Airbus A320", 11) == 0) { - isA320 = true; - isAirliner = true; + char* pos = strchr(simVars.aircraft, '3'); + if (pos && *(pos - 1) == 'A') { + if (*(pos + 1) == '1') { + isA310 = true; + isAirliner = true; + } + else if (*(pos + 1) == '2') { + isFbw = true; + isA320 = true; + isAirliner = true; + } + else if (*(pos + 1) == '8') { + isFbw = true; + isA380 = true; + isAirliner = true; + } } - else if (strncmp(simVars.aircraft, "Salty", 5) == 0 || strncmp(simVars.aircraft, "Boeing 747-8", 12) == 0) { + + if (strncmp(simVars.aircraft, "Salty", 5) == 0 || strncmp(simVars.aircraft, "Boeing 747-8", 12) == 0) { is747 = true; isAirliner = true; } @@ -318,32 +332,32 @@ void CALLBACK MyDispatchProc(SIMCONNECT_RECV* pData, DWORD cbData, void* pContex simVars.nav1Standby = a310Vars.ilsFrequency / 100; simVars.vor1Obs = a310Vars.ilsCourse; } - else if (simVars.connected && isA320) { - // Map A32NX vars to real vars - simVars.apuStartSwitch = a320Vars.apuStart; - if (a320Vars.apuStartAvail) { + else if (simVars.connected && isFbw) { + // Map FBW vars to real vars + simVars.apuStartSwitch = fbwVars.apuStart; + if (fbwVars.apuStartAvail) { simVars.apuPercentRpm = 100; } else { simVars.apuPercentRpm = 0; } - simVars.tfFlapsIndex = a320Vars.flapsIndex; - simVars.parkingBrakeOn = a320Vars.parkBrakePos; - simVars.tfSpoilersPosition = a320Vars.spoilersHandlePos; - simVars.brakeLeftPedal = a320Vars.leftBrakePedal; - simVars.brakeRightPedal = a320Vars.rightBrakePedal; - simVars.rudderPosition = a320Vars.rudderPedalPos / 100.0; - simVars.autopilotEngaged = (a320Vars.autopilot1 == 0 && a320Vars.autopilot2 == 0) ? 0 : 1; - if (a320Vars.autothrust == 0) { + simVars.tfFlapsIndex = fbwVars.flapsIndex; + simVars.parkingBrakeOn = fbwVars.parkBrakePos; + simVars.tfSpoilersPosition = fbwVars.spoilersHandlePos; + simVars.brakeLeftPedal = fbwVars.leftBrakePedal; + simVars.brakeRightPedal = fbwVars.rightBrakePedal; + simVars.rudderPosition = fbwVars.rudderPedalPos / 100.0; + simVars.autopilotEngaged = (fbwVars.autopilot1 == 0 && fbwVars.autopilot2 == 0) ? 0 : 1; + if (fbwVars.autothrust == 0) { simVars.autothrottleActive = 0; } else { simVars.autothrottleActive = 1; } - simVars.transponderState = a320Vars.xpndrMode; - simVars.autopilotHeading = a320Vars.autopilotHeading; + simVars.transponderState = fbwVars.xpndrMode; + simVars.autopilotHeading = fbwVars.autopilotHeading; simVars.autopilotAltitude = simVars.autopilotAltitude3; - simVars.autopilotVerticalSpeed = a320Vars.autopilotVerticalSpeed; + simVars.autopilotVerticalSpeed = fbwVars.autopilotVerticalSpeed; if (simVars.jbVerticalMode == 14) { // V/S mode engaged simVars.autopilotVerticalHold = 1; @@ -351,7 +365,7 @@ void CALLBACK MyDispatchProc(SIMCONNECT_RECV* pData, DWORD cbData, void* pContex else if (simVars.jbVerticalMode == 15) { // FPA mode engaged simVars.autopilotVerticalHold = -1; - simVars.autopilotVerticalSpeed = a320Vars.autopilotFpa; + simVars.autopilotVerticalSpeed = fbwVars.autopilotFpa; } else { simVars.autopilotVerticalHold = 0; @@ -359,10 +373,10 @@ void CALLBACK MyDispatchProc(SIMCONNECT_RECV* pData, DWORD cbData, void* pContex simVars.autopilotApproachHold = simVars.jbLocMode; simVars.autopilotGlideslopeHold = simVars.jbApprMode; simVars.tfAutoBrake = simVars.jbAutobrake + 1; - simVars.exhaustGasTemp1 = a320Vars.engineEgt1; - simVars.exhaustGasTemp2 = a320Vars.engineEgt2; - simVars.engineFuelFlow1 = a320Vars.engineFuelFlow1; - simVars.engineFuelFlow2 = a320Vars.engineFuelFlow2; + simVars.exhaustGasTemp1 = fbwVars.engineEgt1; + simVars.exhaustGasTemp2 = fbwVars.engineEgt2; + simVars.engineFuelFlow1 = fbwVars.engineFuelFlow1; + simVars.engineFuelFlow2 = fbwVars.engineFuelFlow2; } else if (is747) { // Map Salty 747 vars to real vars @@ -502,8 +516,8 @@ void CALLBACK MyDispatchProc(SIMCONNECT_RECV* pData, DWORD cbData, void* pContex if (isA310) { updateA310FromJetbridge(packet->data); } - else if (isA320) { - updateA320FromJetbridge(packet->data); + else if (isFbw) { + updateFbwFromJetbridge(packet->data); } } break; @@ -962,9 +976,12 @@ void processRequest(int bytes) //// For testing only - Leave commented out //if (request.writeData.eventId == KEY_CABIN_SEATBELTS_ALERT_SWITCH_TOGGLE) { - // request.writeData.eventId = EVENT_RESET_DRONE_FOV; + // request.writeData.eventId = KEY_FLAPS_INCR; // request.writeData.value = 0; // printf("Intercepted event - Changed to: %d = %f\n", request.writeData.eventId, request.writeData.value); + // printf("Flaps: %f\n", simVars.tfFlapsIndex); + // readJetbridgeVar("L:A32NX_RMP_L_VHF2_STANDBY"); + // writeJetbridgeVar("K:FLAPS HANDLE INDEX, number", simVars.tfFlapsIndex + 1.0f); //} //else { // printf("Unintercepted event: %d (%d) = %f\n", request.writeData.eventId, KEY_CABIN_SEATBELTS_ALERT_SWITCH_TOGGLE, request.writeData.value); @@ -1001,7 +1018,7 @@ void processRequest(int bytes) if (isA310 && jetbridgeA310ButtonPress(request.writeData.eventId, request.writeData.value)) { return; } - else if (isA320 && jetbridgeA320ButtonPress(request.writeData.eventId, request.writeData.value)) { + else if (isFbw && jetbridgeFbwButtonPress(request.writeData.eventId, request.writeData.value)) { return; } else if (isK100 && jetbridgeK100ButtonPress(request.writeData.eventId, request.writeData.value)) { diff --git a/instrument-data-link/instrument-data-link.vcxproj b/instrument-data-link/instrument-data-link.vcxproj index 4e8b2d4..b968e80 100644 --- a/instrument-data-link/instrument-data-link.vcxproj +++ b/instrument-data-link/instrument-data-link.vcxproj @@ -188,7 +188,7 @@ - + diff --git a/instrument-data-link/instrument-data-link.vcxproj.filters b/instrument-data-link/instrument-data-link.vcxproj.filters index 1f3c469..4b8be2b 100644 --- a/instrument-data-link/instrument-data-link.vcxproj.filters +++ b/instrument-data-link/instrument-data-link.vcxproj.filters @@ -21,11 +21,11 @@ Jetbridge - + diff --git a/instrument-data-link/jetbridge.cpp b/instrument-data-link/jetbridge.cpp index e460173..6274529 100644 --- a/instrument-data-link/jetbridge.cpp +++ b/instrument-data-link/jetbridge.cpp @@ -4,7 +4,7 @@ #include "jetbridge\client.h" #include "LVars-A310.h" -#include "LVars-A32NX.h" +#include "LVars-Fbw.h" #include "LVars-Kodiak100.h" #include "LVars-PA28.h" @@ -12,7 +12,7 @@ extern SimVars simVars; extern LVars_A310 a310Vars; -extern LVars_A320 a320Vars; +extern LVars_FBW fbwVars; extern WriteEvent WriteEvents[]; jetbridge::Client* jetbridgeClient = 0; @@ -66,7 +66,7 @@ void writeJetbridgeHvar(const char* var) #endif } -void writeJetbridge_A32NX_CabinLights(double val) +void writeJetbridge_Fbw_CabinLights(double val) { const char* rpnPotentiometer = "%f %d (>K:2:LIGHT_POTENTIOMETER_SET)"; const int OVERHEAD_INTEG_LIGHT = 86; @@ -220,16 +220,16 @@ void updateA310FromJetbridge(const char* data) } } -void updateA320FromJetbridge(const char* data) +void updateFbwFromJetbridge(const char* data) { if (strncmp(&data[1], A32NX_APU_MASTER_SW, sizeof(A32NX_APU_MASTER_SW) - 1) == 0) { simVars.apuMasterSw = atof(&data[sizeof(A32NX_APU_MASTER_SW) + 1]); } else if (strncmp(&data[1], A32NX_APU_START, sizeof(A32NX_APU_START) - 1) == 0) { - a320Vars.apuStart = atof(&data[sizeof(A32NX_APU_START) + 1]); + fbwVars.apuStart = atof(&data[sizeof(A32NX_APU_START) + 1]); } else if (strncmp(&data[1], A32NX_APU_START_AVAIL, sizeof(A32NX_APU_START_AVAIL) - 1) == 0) { - a320Vars.apuStartAvail = atof(&data[sizeof(A32NX_APU_START_AVAIL) + 1]); + fbwVars.apuStartAvail = atof(&data[sizeof(A32NX_APU_START_AVAIL) + 1]); } else if (strncmp(&data[1], A32NX_APU_BLEED, sizeof(A32NX_APU_BLEED) - 1) == 0) { simVars.apuBleed = atof(&data[sizeof(A32NX_APU_BLEED) + 1]); @@ -241,34 +241,34 @@ void updateA320FromJetbridge(const char* data) simVars.elecBat2 = atof(&data[sizeof(A32NX_ELEC_BAT2) + 1]); } else if (strncmp(&data[1], A32NX_FLAPS_INDEX, sizeof(A32NX_FLAPS_INDEX) - 1) == 0) { - a320Vars.flapsIndex = atof(&data[sizeof(A32NX_FLAPS_INDEX) + 1]); + fbwVars.flapsIndex = atof(&data[sizeof(A32NX_FLAPS_INDEX) + 1]); } else if (strncmp(&data[1], A32NX_PARK_BRAKE_POS, sizeof(A32NX_PARK_BRAKE_POS) - 1) == 0) { - a320Vars.parkBrakePos = atof(&data[sizeof(A32NX_PARK_BRAKE_POS) + 1]); + fbwVars.parkBrakePos = atof(&data[sizeof(A32NX_PARK_BRAKE_POS) + 1]); } else if (strncmp(&data[1], A32NX_XPNDR_MODE, sizeof(A32NX_XPNDR_MODE) - 1) == 0) { - a320Vars.xpndrMode = atof(&data[sizeof(A32NX_XPNDR_MODE) + 1]); + fbwVars.xpndrMode = atof(&data[sizeof(A32NX_XPNDR_MODE) + 1]); } else if (strncmp(&data[1], A32NX_AUTOPILOT_1, sizeof(A32NX_AUTOPILOT_1) - 1) == 0) { - a320Vars.autopilot1 = atof(&data[sizeof(A32NX_AUTOPILOT_1) + 1]); + fbwVars.autopilot1 = atof(&data[sizeof(A32NX_AUTOPILOT_1) + 1]); } else if (strncmp(&data[1], A32NX_AUTOPILOT_2, sizeof(A32NX_AUTOPILOT_2) - 1) == 0) { - a320Vars.autopilot2 = atof(&data[sizeof(A32NX_AUTOPILOT_2) + 1]); + fbwVars.autopilot2 = atof(&data[sizeof(A32NX_AUTOPILOT_2) + 1]); } else if (strncmp(&data[1], A32NX_AUTOTHRUST, sizeof(A32NX_AUTOTHRUST) - 1) == 0) { - a320Vars.autothrust = atof(&data[sizeof(A32NX_AUTOTHRUST) + 1]); + fbwVars.autothrust = atof(&data[sizeof(A32NX_AUTOTHRUST) + 1]); } else if (strncmp(&data[1], A32NX_TCAS_MODE, sizeof(A32NX_TCAS_MODE) - 1) == 0) { simVars.jbTcasMode = atof(&data[sizeof(A32NX_TCAS_MODE) + 1]); } else if (strncmp(&data[1], A32NX_AUTOPILOT_HDG, sizeof(A32NX_AUTOPILOT_HDG) - 1) == 0) { - a320Vars.autopilotHeading = atof(&data[sizeof(A32NX_AUTOPILOT_HDG) + 1]); + fbwVars.autopilotHeading = atof(&data[sizeof(A32NX_AUTOPILOT_HDG) + 1]); } else if (strncmp(&data[1], A32NX_AUTOPILOT_VS, sizeof(A32NX_AUTOPILOT_VS) - 1) == 0) { - a320Vars.autopilotVerticalSpeed = atof(&data[sizeof(A32NX_AUTOPILOT_VS) + 1]); + fbwVars.autopilotVerticalSpeed = atof(&data[sizeof(A32NX_AUTOPILOT_VS) + 1]); } else if (strncmp(&data[1], A32NX_AUTOPILOT_FPA, sizeof(A32NX_AUTOPILOT_FPA) - 1) == 0) { - a320Vars.autopilotFpa = atof(&data[sizeof(A32NX_AUTOPILOT_FPA) + 1]); + fbwVars.autopilotFpa = atof(&data[sizeof(A32NX_AUTOPILOT_FPA) + 1]); } else if (strncmp(&data[1], A32NX_MANAGED_SPEED, sizeof(A32NX_MANAGED_SPEED) - 1) == 0) { simVars.jbManagedSpeed = atof(&data[sizeof(A32NX_MANAGED_SPEED) + 1]); @@ -298,28 +298,31 @@ void updateA320FromJetbridge(const char* data) simVars.jbAutobrake = atof(&data[sizeof(A32NX_AUTOBRAKE) + 1]); } else if (strncmp(&data[1], A32NX_LEFT_BRAKEPEDAL, sizeof(A32NX_LEFT_BRAKEPEDAL) - 1) == 0) { - a320Vars.leftBrakePedal = atof(&data[sizeof(A32NX_LEFT_BRAKEPEDAL) + 1]); + fbwVars.leftBrakePedal = atof(&data[sizeof(A32NX_LEFT_BRAKEPEDAL) + 1]); } else if (strncmp(&data[1], A32NX_SPOILERS_HANDLE_POS, sizeof(A32NX_SPOILERS_HANDLE_POS) - 1) == 0) { - a320Vars.spoilersHandlePos = atof(&data[sizeof(A32NX_SPOILERS_HANDLE_POS) + 1]); + fbwVars.spoilersHandlePos = atof(&data[sizeof(A32NX_SPOILERS_HANDLE_POS) + 1]); } else if (strncmp(&data[1], A32NX_RIGHT_BRAKEPEDAL, sizeof(A32NX_RIGHT_BRAKEPEDAL) - 1) == 0) { - a320Vars.rightBrakePedal = atof(&data[sizeof(A32NX_RIGHT_BRAKEPEDAL) + 1]); + fbwVars.rightBrakePedal = atof(&data[sizeof(A32NX_RIGHT_BRAKEPEDAL) + 1]); } else if (strncmp(&data[1], A32NX_RUDDER_PEDAL_POS, sizeof(A32NX_RUDDER_PEDAL_POS) - 1) == 0) { - a320Vars.rudderPedalPos = atof(&data[sizeof(A32NX_RUDDER_PEDAL_POS) + 1]); + fbwVars.rudderPedalPos = atof(&data[sizeof(A32NX_RUDDER_PEDAL_POS) + 1]); } else if (strncmp(&data[1], A32NX_ENGINE_EGT1, sizeof(A32NX_ENGINE_EGT1) - 1) == 0) { - a320Vars.engineEgt1 = atof(&data[sizeof(A32NX_ENGINE_EGT1) + 1]); + fbwVars.engineEgt1 = atof(&data[sizeof(A32NX_ENGINE_EGT1) + 1]); } else if (strncmp(&data[1], A32NX_ENGINE_EGT2, sizeof(A32NX_ENGINE_EGT2) - 1) == 0) { - a320Vars.engineEgt2 = atof(&data[sizeof(A32NX_ENGINE_EGT2) + 1]); + fbwVars.engineEgt2 = atof(&data[sizeof(A32NX_ENGINE_EGT2) + 1]); } else if (strncmp(&data[1], A32NX_ENGINE_FUEL_FLOW1, sizeof(A32NX_ENGINE_FUEL_FLOW1) - 1) == 0) { - a320Vars.engineFuelFlow1 = atof(&data[sizeof(A32NX_ENGINE_FUEL_FLOW1) + 1]); + fbwVars.engineFuelFlow1 = atof(&data[sizeof(A32NX_ENGINE_FUEL_FLOW1) + 1]); } else if (strncmp(&data[1], A32NX_ENGINE_FUEL_FLOW2, sizeof(A32NX_ENGINE_FUEL_FLOW2) - 1) == 0) { - a320Vars.engineFuelFlow2 = atof(&data[sizeof(A32NX_ENGINE_FUEL_FLOW2) + 1]); + fbwVars.engineFuelFlow2 = atof(&data[sizeof(A32NX_ENGINE_FUEL_FLOW2) + 1]); + } + else if (strncmp(data, "write", 5) != 0) { + printf("Uknown Fbw from Jetbridge: %s\n", data); } } @@ -482,7 +485,7 @@ bool jetbridgeA310ButtonPress(int eventId, double value) return false; } -bool jetbridgeA320ButtonPress(int eventId, double value) +bool jetbridgeFbwButtonPress(int eventId, double value) { switch (eventId) { case KEY_APU_OFF_SWITCH: @@ -496,9 +499,11 @@ bool jetbridgeA320ButtonPress(int eventId, double value) return true; case KEY_ELEC_BAT1: writeJetbridgeVar(A32NX_ELEC_BAT1, value); + writeJetbridgeVar(A32NX_ELEC_BAT_ESS, value); return true; case KEY_ELEC_BAT2: writeJetbridgeVar(A32NX_ELEC_BAT2, value); + writeJetbridgeVar(A32NX_ELEC_BAT_APU, value); return true; case KEY_AUTOBRAKE: writeJetbridgeVar(A32NX_AUTOBRAKE, value); @@ -510,7 +515,7 @@ bool jetbridgeA320ButtonPress(int eventId, double value) writeJetbridgeVar(A32NX_TCAS_SWITCH, value * 2); return true; case KEY_CABIN_LIGHTS_SET: - writeJetbridge_A32NX_CabinLights(value); + writeJetbridge_Fbw_CabinLights(value); return true; case KEY_AP_ALT_VAR_SET_ENGLISH: writeJetbridgeVar(A32NX_FCU_ALT_INCREMENT_SET, 100); @@ -604,7 +609,7 @@ void readA310Jetbridge() readJetbridgeVar(A310_ILS_COURSE); } -void readA320Jetbridge() +void readFbwJetbridge() { readJetbridgeVar(A32NX_APU_MASTER_SW); readJetbridgeVar(A32NX_APU_START); diff --git a/instrument-data-link/jetbridge.h b/instrument-data-link/jetbridge.h index 801f38a..206256a 100644 --- a/instrument-data-link/jetbridge.h +++ b/instrument-data-link/jetbridge.h @@ -23,21 +23,21 @@ const char DRONE_CAMERA_FOV[] = "A:DRONE CAMERA FOV, percent"; void jetbridgeInit(HANDLE hSimConnect); void readJetbridgeVar(const char* var); -void writeJetbridgeVar(const char* var, double val); +void writeJetbridgeVar(const char* var, double val = 0); void writeJetbridgeVar(EVENT_ID eventId, double val); void writeJetbridgeHvar(const char* var); void updateA310FromJetbridge(const char* data); -void updateA320FromJetbridge(const char* data); +void updateFbwFromJetbridge(const char* data); bool jetbridgeA310ButtonPress(int eventId, double value); -bool jetbridgeA320ButtonPress(int eventId, double value); +bool jetbridgeFbwButtonPress(int eventId, double value); bool jetbridgeK100ButtonPress(int eventId, double value); bool jetbridgePA28ButtonPress(int eventId, double value); bool jetbridgeMiscButtonPress(int eventId, double value); void readA310Jetbridge(); -void readA320Jetbridge(); +void readFbwJetbridge(); #endif diff --git a/instrument-data-link/simvarDefs.cpp b/instrument-data-link/simvarDefs.cpp index 530f912..74dfc1d 100644 --- a/instrument-data-link/simvarDefs.cpp +++ b/instrument-data-link/simvarDefs.cpp @@ -1,7 +1,7 @@ #include #include "simvarDefs.h" -const char* versionString = "v2.0.3"; +const char* versionString = "v2.0.4"; const char* SimVarDefs[][2] = { // Vars for Jetbridge (must come first)