CH-47F: Add Aircraft and Center Misc Panel

Fixes DCS-Skunkworks#927

Scripts/DCS-BIOS/BIOS.lua

@@ -32,6 +32,7 @@ local modules = {
 	require("Scripts.DCS-BIOS.lib.modules.aircraft_modules.AV8BNA"),
 	require("Scripts.DCS-BIOS.lib.modules.aircraft_modules.Bf-109K-4"),
 	require("Scripts.DCS-BIOS.lib.modules.aircraft_modules.C-101"),
+	require("Scripts.DCS-BIOS.lib.modules.aircraft_modules.CH-47F"),
 	require("Scripts.DCS-BIOS.lib.modules.aircraft_modules.Christen Eagle II"),
 	require("Scripts.DCS-BIOS.lib.modules.aircraft_modules.Edge540"),
 	require("Scripts.DCS-BIOS.lib.modules.aircraft_modules.F-14"),

Scripts/DCS-BIOS/doc/Addresses.h

@@ -5689,6 +5689,15 @@
 #define Bf_109K_4_WNG_DRP_ON_AM 0x4200, 0x2000
 #define Bf_109K_4_WNG_DRP_ON_OFF 0x4200, 0x1000, 12
 #define Bf_109K_4_WNG_DRP_ON_OFF_AM 0x4200, 0x1000
+#define CH_47F_MISC_CENTER_ANTENNAE_SELECT 0x9C00, 0x0008, 3
+#define CH_47F_MISC_CENTER_ANTENNAE_SELECT_AM 0x9C00, 0x0008
+#define CH_47F_MISC_CENTER_ANT_FM1_VHF 0x9C02, 0xFFFF, 0
+#define CH_47F_MISC_CENTER_ANT_FM1_VHF_A 0x9C02
+#define CH_47F_MISC_CENTER_ANT_VHF_FM1 0x9C04, 0xFFFF, 0
+#define CH_47F_MISC_CENTER_ANT_VHF_FM1_A 0x9C04
+#define CH_47F_MISC_CENTER_BACKUP_RADIO 0x9C00, 0x0004, 2
+#define CH_47F_MISC_CENTER_BACKUP_RADIO_AM 0x9C00, 0x0004
+#define CH_47F_MISC_CENTER_CGI_TEST 0x9C00, 0x0003, 0
 #define C_101_BACK_ABORT 0x3628, 0x8000, 15
 #define C_101_BACK_ABORT_AM 0x3628, 0x8000
 #define C_101_BACK_AIR_VENT 0x3684, 0xFFFF, 0

Scripts/DCS-BIOS/doc/addresses.txt

@@ -74,7 +74,7 @@ F-15E				0x9200
 C-130J				0x9800  
 
 			0x9a00
-			0x9c00
+CH-47F			0x9c00
 			0x9e00
 			0xa000
 			0xa200

Scripts/DCS-BIOS/lib/modules/aircraft_modules/CH-47F.lua

@@ -0,0 +1,294 @@
+module("CH-47F", package.seeall)
+
+local Module = require("Scripts.DCS-BIOS.lib.modules.Module")
+
+--- @class CH_47F: Module
+local CH_47F = Module:new("CH-47F", 0x9C00, { "CH-47Fbl1" })
+
+local devices = {
+	MCPU = 1,
+	CDU_LEFT = 2,
+	CDU_RIGHT = 3,
+	MFD_COPILOT_OUTBOARD = 4,
+	MFD_COPILOT_INBOARD = 5,
+	MFD_CENTER = 6,
+	MFD_PILOT_INBOARD = 7,
+	MFD_PILOT_OUTBOARD = 8,
+	ADC = 9,
+	DTU = 10,
+	CAAS = 11,
+	FADEC1 = 12,
+	FADEC2 = 13,
+	FM_PROXY = 14,
+	CONTROLS = 15,
+	GUNNER_STATIONS = 16,
+	PDP1 = 17,
+	PDP2 = 18,
+	OVERHEAD_CONSOLE = 19,
+	CENTRAL_CONSOLE = 20,
+	CANTED_CONSOLE = 21,
+	SFD1 = 22,
+	SFD2 = 23,
+	MAINTENANCE_PANEL = 24,
+	CHRONOMETER = 25,
+	COMPASS = 26,
+	EXTERNAL_CARGO_EQUIPMENT = 27,
+	GRIPS = 28,
+	EMERGENCY_PANEL = 29,
+	LIGHTING_REFLECTS = 30,
+	TERTIARY_REFLECTS = 31,
+	FD = 32,
+	TURN = 33,
+	GPS1 = 34,
+	GPS2 = 35,
+	EGI1 = 36,
+	EGI2 = 37,
+	TACAN = 38,
+	ILS = 39,
+	MLS = 40,
+	MARKER_BEACON = 41,
+	ARN_147 = 42,
+	ARN_149 = 43,
+	APN_209 = 44,
+	ANV_241A = 45,
+	ARC_164 = 46,
+	ARC_186 = 47,
+	ARC_201 = 48,
+	ARC_220 = 49,
+	COMM_PANEL_LEFT = 50,
+	COMM_PANEL_RIGHT = 51,
+	COMM_PANEL_TROOP_COMMANDER = 52,
+	COMM_PANEL_LH_GUNNER = 53,
+	COMM_PANEL_RH_GUNNER = 54,
+	COMM_PANEL_AFT_ENGINEER = 55,
+	INTERCOM = 56,
+	CREWE = 57,
+	WORKSTATIONS = 58,
+	AFT_WORKSTATION = 59,
+	HELMET_DEVICE = 60,
+	MACROS = 61,
+	ARCADE = 62,
+	KNEEBOARD = 63,
+	AN_APR39 = 64,
+	AN_AVR2A = 65,
+	AN_AAR57 = 66,
+	AN_ALE47 = 67,
+}
+
+--- Adds a rocker switch with momentary on and off positions controlled by a single command
+--- @param identifier string the unique identifier for the control
+--- @param device_id integer the dcs device id
+--- @param command integer the dcs command
+--- @param arg_number integer the dcs argument number
+--- @param category string the category in which the control should appear
+--- @param description string additional information about the control
+--- @return Control
+function CH_47F:defineSingleCommandRocker(identifier, device_id, command, arg_number, category, description)
+	self:defineRockerSwitch(identifier, device_id, command, command, command, command, arg_number, category, description)
+end
+
+-- Center Console
+-- Miscellaneous Switch Control Panel
+local CENTER_MISC_SWITCH_PANEL = "Center Console Misc Switch Control Panel"
+
+CH_47F:defineSingleCommandRocker("MISC_CENTER_CGI_TEST", devices.CENTRAL_CONSOLE, 3025, 1465, CENTER_MISC_SWITCH_PANEL, "CGI Test")
+CH_47F:defineToggleSwitch("MISC_CENTER_BACKUP_RADIO", devices.CENTRAL_CONSOLE, 3026, 1466, CENTER_MISC_SWITCH_PANEL, "Backup Radio Select")
+CH_47F:defineToggleSwitch("MISC_CENTER_ANTENNAE_SELECT", devices.CENTRAL_CONSOLE, 3028, 1467, CENTER_MISC_SWITCH_PANEL, "Antennae Select")
+
+CH_47F:defineFloat("MISC_CENTER_ANT_FM1_VHF", 1395, { 0, 1 }, CENTER_MISC_SWITCH_PANEL, "FM1 (Top) / VHF (Bot) Lamp (Green)")
+CH_47F:defineFloat("MISC_CENTER_ANT_VHF_FM1", 1396, { 0, 1 }, CENTER_MISC_SWITCH_PANEL, "VHF (Top) / FM1 (Bot) Lamp (Green)")
+
+-- ASE Control Panel
+-- local ASE_PANEL = "ASE Control Panel"
+
+-- ARC-186 Control Panel
+-- local ARC_186 = "ARC-186"
+
+-- Steering Control Panel
+-- local STEERING_PANEL = "Steering Control Panel"
+
+-- Pilot Low Profile Control Audio Panel
+-- local PILOT_AUDIO_PANEL = "PLT Low Profile Audio Panel"
+
+-- Copilot Low Profile Control Audio Panel
+-- local COPILOT_AUDIO_PANEL = "CPLT Low Profile Audio Panel"
+
+-- Troop Commander Low Profile Control Audio Panel
+-- local TC_AUDIO_PANEL = "TC Low Profile Audio Panel"
+
+-- Left Gunner Low Profile Control Audio Panel
+-- local LG_AUDIO_PANEL = "Gunner (L) Low Profile Audio Panel"
+
+-- Right Gunner Low Profile Control Audio Panel
+-- local RG_AUDIO_PANEL = "Gunner (R) Low Profile Audio Panel"
+
+-- Aft Engineer Low Profile Control Audio Panel
+-- local AE_AUDIO_PANEL = "Ramp Low Profile Audio Panel"
+
+-- Pilot Cyclic
+-- local PILOT_CYCLIC = "PLT Cyclic"
+
+-- Copilot Cyclic
+-- local COPILOT_CYCLIC = "CPLT Cyclic"
+
+-- Pilot Thrust Lever
+-- local PILOT_THRUST = "PLT Thrust Lever"
+
+-- Copilot Thrust Lever
+-- local COPILOT_THRUST = "CPLT Thrust Lever"
+
+-- Pilot Multi-Function Control Unit
+-- local PILOT_MF_UNIT = "PLT Multi-Function Control Unit"
+
+-- Copilot Multi-Function Control Unit
+-- local COPILOT_MF_UNIT = "CPLT Multi-Function Control Unit"
+
+-- Canted Console
+-- Pilot CDU
+-- local PILOT_CDU = "PLT CDU"
+
+-- Copilot CDU
+-- local COPILOT_CDU = "CPLT CDU"
+
+-- Miscellaneous Switch Control Panel
+-- local CANTED_MISC_SWITCH_PANEL = "Canted Console Misc Switch Control Panel"
+
+-- Emergency/Auxiliary Control Panel
+-- local EMERGENCY_AUX_PANEL = "Emergency/Auxiliary Control Panel"
+
+-- DAFCS Panel
+-- local DAFCS_PANEL = "DAFCS Panel"
+
+-- Pilot Instrument Panel
+-- local PILOT_INSTRUMENT_PANEL = "PLT Instrument Panel"
+-- master caution, cabin air pull
+
+-- Copilot Instrument Panel
+-- local COPILOT_INSTRUMENT_PANEL = "CPLT Instrument Panel"
+-- master caution, cabin air pull
+
+-- Center Instrument Panel
+-- local CENTER_INSTRUMENT_PANEL = "Center Instrument Panel"
+-- battery low light
+
+-- Pilot Inboard MFD
+-- local PILOT_MFD_INNER = "PLT Inboard MFD"
+
+-- Copilot Inboard MFD
+-- local COPILOT_MFD_INNER = "CPLT Inboard MFD"
+
+-- Pilot Outboard MFD
+-- local PILOT_MFD_OUTER = "PLT Outboard MFD"
+
+-- Copilot Outboard MFD
+-- local COPILOT_MFD_OUTER = "CPLT Outboard MFD"
+
+-- Center MFD
+-- local CENTER_MFD = "Center MFD"
+
+-- Fire handles
+-- local FIRE_PANEL = "Fire Handle Panel"
+
+-- Pilot Standby Flight Display
+-- local PILOT_STANDBY_FLIGHT_DISPLAY = "PLT Standby Flight Display"
+
+-- Copilot Standby Flight Display
+-- local COPILOT_STANDBY_FLIGHT_DISPLAY = "CPLT Standby Flight Display"
+
+-- Pilot Inclinometer
+-- local PILOT_INCLINOMETER = "PLT Inclinometer"
+
+-- Copilot Inclinometer
+-- local COPILOT_INCLINOMETER = "CPLT Inclinometer"
+
+-- Radar Altimeter
+-- local RADAR_ALTIMETER = "Radar Altimeter"
+
+-- Longitudinal Stick Position Indicator
+-- local LONG_STICK_INDICATOR = "Longitudinal Stick Position Indicator"
+
+-- Chronometer
+-- local CHRONOMETER = "Chronometer"
+
+-- AN/APR-39
+-- local RWR = "AN/APR-39"
+
+-- Magnetic Compass
+-- local COMPASS = "Magnetic Compass"
+
+-- Overhead Switch Panel
+-- EAPS Control Panel
+-- local EAPS_PANEL = "EAPS Control Panel"
+
+-- Exterior Light Panel
+-- local EXTERIOR_LIGHT_PANEL = "Exterior Light Panel"
+
+-- Interior Light Panel
+-- local INTERIOR_LIGHT_PANEL = "Interior Light Panel"
+
+-- Light Panel
+-- local LIGHT_PANEL = "Light Panel"
+
+-- Pilot Light Panel
+-- local PILOT_LIGHT_PANEL = "PLT Light Panel"
+
+-- Copilot Light Panel
+-- local COPILOT_LIGHT_PANEL = "CPLT Light Panel"
+
+-- Fuel Control Panel
+-- local FUEL_PANEL = "Fuel Control Panel"
+
+-- Anti-Ice Panel
+-- local ANTI_ICE_PANEL = "Anti-Ice Panel"
+
+-- Eng Cond Panel
+-- local ENGINE_COND_PANEL = "Engine Cond Panel"
+
+-- Hoist Control Panel
+-- local HOIST_PANEL = "Hoist Control Panel"
+
+-- Troop Warn/Heating Control Panel
+-- local TROOP_WARN_HEATING_PANEL = "Troop Warn/Heating Control Panel"
+
+-- Electrical Power Panel
+-- local ELECTRICAL_POWER_PANEL = "Electrical Power Panel"
+
+-- FADEC Panel
+-- local FADEC_PANEL = "FADEC Panel"
+
+-- Hydraulic Control Panel
+-- local HYDRAULIC_PANEL = "Hydraulic Control Panel"
+
+-- Interior Lights
+-- local INTERIOR_LIGHTS = "Interior Lights"
+-- includes utility light controls, jump light, etc
+
+-- Free Air Temperature Gauge
+-- local FREE_AIR_TEMP = "Free Air Temperature Gauge"
+
+-- Pilot Circuit Breakers
+-- local PILOT_CIRCUIT_BREAKERS = "PLT Circuit Breakers"
+
+-- Copilot Circuit Breakers
+-- local COPILOT_CIRCUIT_BREAKERS = "CPLT Circuit Breakers"
+
+-- Ramp Controls
+-- local RAMP_CONTROLS = "Ramp Controls"
+-- includes misc controls around the ramp
+
+-- Ramp Maintenance Panel
+-- local RAMP_MAINTENANCE_PANEL = "Ramp Maintenance Panel"
+
+-- Interior Model
+-- local INTERIOR_MODEL = "Interior Model"
+-- seats, hatches, etc
+
+-- Exterior Lights
+-- local EXTERIOR_LIGHTS = "Exterior Lights"
+
+-- Exterior Model
+-- local EXTERIOR_MODEL = "Exterior Model"
+
+-- Radios
+
+return CH_47F

Scripts/DCS-BIOS/test/AircraftTest.lua

@@ -44,7 +44,11 @@ function TestAircraft:testC101()
 	self:validateModule(require("Scripts.DCS-BIOS.lib.modules.aircraft_modules.C-101"), "C-101", 0x3600)
 end
 
-function TestAircraft:testCEII()
+function TestAircraft:testCH_47F()
+	self:validateModule(require("Scripts.DCS-BIOS.lib.modules.aircraft_modules.CH_47F"), "CH-47F", 0x9C00)
+end
+
+function TestAircraft:testChristenEagleII()
 	self:validateModule(require("Scripts.DCS-BIOS.lib.modules.aircraft_modules.Christen Eagle II"), "Christen Eagle II", 0x2800)
 end