Skip to content

Commit

Permalink
AJS-37 FR22 fix for device number (#517)
Browse files Browse the repository at this point in the history
* AJS-37 FR22, device changed from 31 to 30

Former didn't work.

* #516
  • Loading branch information
jdahlblom authored Jan 28, 2024
1 parent e40bb5d commit abd2bf5
Showing 1 changed file with 23 additions and 23 deletions.
46 changes: 23 additions & 23 deletions Scripts/DCS-BIOS/lib/modules/aircraft_modules/AJS37.lua
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ AJS37:defineRotary("FR22_INNER_LEFT_KNOB", 30, 3003, 172, "FR22 Radio", "Radio F
AJS37:defineRotary("FR22_OUTER_LEFT_KNOB", 30, 3004, 171, "FR22 Radio", "Radio Frequency Knob Outer Left")
AJS37:defineRotary("FR22_INNER_RIGHT_KNOB", 30, 3005, 174, "FR22 Radio", "Radio Frequency Knob Inner Right")
AJS37:defineRotary("FR22_OUTER_RIGHT_KNOB", 30, 3006, 173, "FR22 Radio", "Radio Frequency Knob Outer Right")
AJS37:defineToggleSwitch("FR22_SET_MODULATION", 31, 3014, 170, "FR22 Radio", "Radio Manual Frequency Setting Modulation")
AJS37:defineToggleSwitch("FR22_SET_MODULATION", 30, 3014, 170, "FR22 Radio", "Radio Manual Frequency Setting Modulation")

--Raw Gauge Values
AJS37:defineFloat("STICK_PITCH", 2, { -1, 1 }, "Raw Gauge Values", "Stick Pitch")
Expand Down Expand Up @@ -341,27 +341,27 @@ AJS37:defineRotary("MAG_CORRECTION", 22, 3724, 1201, "Flight Data Unit", "Magnet
AJS37:definePotentiometer("AUTO_YAW_TRIM", 22, 3732, 211, { -1, 1 }, "Flight Data Unit", "Autopilot Yaw Trim")
AJS37:defineRotary("CLOCK_SET", 22, 3801, 135, "Flight Data Unit", "Clock Setting")

AJS37:definePushButton("FR22_FLIGHT_0", 31, 3210, 372, "FR22 Radio", "Flight 0")
AJS37:definePushButton("FR22_FLIGHT_1", 31, 3211, 373, "FR22 Radio", "Flight 1")
AJS37:definePushButton("FR22_FLIGHT_2", 31, 3212, 374, "FR22 Radio", "Flight 2")
AJS37:definePushButton("FR22_FLIGHT_3", 31, 3213, 375, "FR22 Radio", "Flight 3")
AJS37:definePushButton("FR22_FLIGHT_4", 31, 3214, 376, "FR22 Radio", "Flight 4")
AJS37:definePushButton("FR22_FLIGHT_5", 31, 3215, 377, "FR22 Radio", "Flight 5")
AJS37:definePushButton("FR22_FLIGHT_6", 31, 3216, 378, "FR22 Radio", "Flight 6")
AJS37:definePushButton("FR22_FLIGHT_7", 31, 3217, 379, "FR22 Radio", "Flight 7")
AJS37:definePushButton("FR22_FLIGHT_8", 31, 3218, 380, "FR22 Radio", "Flight 8")
AJS37:definePushButton("FR22_FLIGHT_9", 31, 3219, 381, "FR22 Radio", "Flight 9")
AJS37:definePushButton("FR22_CHANNEL_H", 31, 3200, 362, "FR22 Radio", "Channel H")
AJS37:definePushButton("FR22_SPECIAL_1", 31, 3201, 363, "FR22 Radio", "Special 1")
AJS37:definePushButton("FR22_SPECIAL_2", 31, 3202, 364, "FR22 Radio", "Special 2")
AJS37:definePushButton("FR22_SPECIAL_3", 31, 3203, 365, "FR22 Radio", "Special 3")
AJS37:definePushButton("FR22_MINUS", 31, 3204, 366, "FR22 Radio", "Minus")
AJS37:definePushButton("FR22_CHANNEL_AG", 31, 3205, 367, "FR22 Radio", "Channel A/G")
AJS37:definePushButton("FR22_CHANNEL_B", 31, 3206, 368, "FR22 Radio", "Channel B")
AJS37:definePushButton("FR22_CHANNEL_CF", 31, 3207, 369, "FR22 Radio", "Channel C/F")
AJS37:definePushButton("FR22_CHANNEL_C2", 31, 3208, 370, "FR22 Radio", "Channel C2")
AJS37:definePushButton("FR22_CHANNEL_DE", 31, 3209, 371, "FR22 Radio", "Channel D/E")
AJS37:definePushButton("FR22_GROUND_COM", 31, 3011, 382, "FR22 Radio", "Ground Intercom")
AJS37:definePushButton("FR22_FLIGHT_0", 30, 3210, 372, "FR22 Radio", "Flight 0")
AJS37:definePushButton("FR22_FLIGHT_1", 30, 3211, 373, "FR22 Radio", "Flight 1")
AJS37:definePushButton("FR22_FLIGHT_2", 30, 3212, 374, "FR22 Radio", "Flight 2")
AJS37:definePushButton("FR22_FLIGHT_3", 30, 3213, 375, "FR22 Radio", "Flight 3")
AJS37:definePushButton("FR22_FLIGHT_4", 30, 3214, 376, "FR22 Radio", "Flight 4")
AJS37:definePushButton("FR22_FLIGHT_5", 30, 3215, 377, "FR22 Radio", "Flight 5")
AJS37:definePushButton("FR22_FLIGHT_6", 30, 3216, 378, "FR22 Radio", "Flight 6")
AJS37:definePushButton("FR22_FLIGHT_7", 30, 3217, 379, "FR22 Radio", "Flight 7")
AJS37:definePushButton("FR22_FLIGHT_8", 30, 3218, 380, "FR22 Radio", "Flight 8")
AJS37:definePushButton("FR22_FLIGHT_9", 30, 3219, 381, "FR22 Radio", "Flight 9")
AJS37:definePushButton("FR22_CHANNEL_H", 30, 3200, 362, "FR22 Radio", "Channel H")
AJS37:definePushButton("FR22_SPECIAL_1", 30, 3201, 363, "FR22 Radio", "Special 1")
AJS37:definePushButton("FR22_SPECIAL_2", 30, 3202, 364, "FR22 Radio", "Special 2")
AJS37:definePushButton("FR22_SPECIAL_3", 30, 3203, 365, "FR22 Radio", "Special 3")
AJS37:definePushButton("FR22_MINUS", 30, 3204, 366, "FR22 Radio", "Minus")
AJS37:definePushButton("FR22_CHANNEL_AG", 30, 3205, 367, "FR22 Radio", "Channel A/G")
AJS37:definePushButton("FR22_CHANNEL_B", 30, 3206, 368, "FR22 Radio", "Channel B")
AJS37:definePushButton("FR22_CHANNEL_CF", 30, 3207, 369, "FR22 Radio", "Channel C/F")
AJS37:definePushButton("FR22_CHANNEL_C2", 30, 3208, 370, "FR22 Radio", "Channel C2")
AJS37:definePushButton("FR22_CHANNEL_DE", 30, 3209, 371, "FR22 Radio", "Channel D/E")
AJS37:definePushButton("FR22_GROUND_COM", 30, 3011, 382, "FR22 Radio", "Ground Intercom")
AJS37:defineTumb("FR24_MODE", 30, 3110, 386, 0.1, { 0.0, 0.5 }, nil, false, "FR22 Radio", "FR24 Mode Selector")
-- AJS37:defineTumb("FR22_BASE", 30, 3230, 492, 0.05, { 0, 1 }, nil, false, "FR22 Radio", "FR22 Base Selector")
AJS37:reserveIntValue(20) -- corrected control requires more space, so reserve this space and add corrected control to the end
Expand All @@ -388,7 +388,7 @@ AJS37:definePotentiometer("CI_FILTER", 5, 3801, 6905, { 0, 1 }, "Radar", "CI fil
-- AJS37:definePushButton("MISL_SEL_BTN", 2, 3800, 400, "Test", "Missile Select Button (IR-RB FRAMSTEGN)")
AJS37:reserveIntValue(1) -- above control duplicated by "MISSILE_SELECT_BUTTON"

-- parse nav indicator
-- parse nav indicator
local nav_data = {}
AJS37:addExportHook(function()
nav_data = Module.parse_indication(2)
Expand Down

0 comments on commit abd2bf5

Please sign in to comment.