Merge pull request #7 from DCSFlightpanels/M2000C

M2000 c fixes
DCS-Skunkworks · Jan 8, 2019 · 1c29195 · 1c29195
2 parents da5e866 + 035b0d5
commit 1c29195
Show file tree

Hide file tree

Showing 9 changed files with 15,892 additions and 2,770 deletions.
diff --git a/Scripts/DCS-BIOS/doc/json/AJS37.json b/Scripts/DCS-BIOS/doc/json/AJS37.json
diff --git a/Scripts/DCS-BIOS/doc/json/AJS37.jsonp b/Scripts/DCS-BIOS/doc/json/AJS37.jsonp
diff --git a/Scripts/DCS-BIOS/doc/json/F-5E.json b/Scripts/DCS-BIOS/doc/json/F-5E.json
diff --git a/Scripts/DCS-BIOS/doc/json/F-5E.jsonp b/Scripts/DCS-BIOS/doc/json/F-5E.jsonp
diff --git a/Scripts/DCS-BIOS/doc/json/M-2000C.json b/Scripts/DCS-BIOS/doc/json/M-2000C.json
diff --git a/Scripts/DCS-BIOS/doc/json/M-2000C.jsonp b/Scripts/DCS-BIOS/doc/json/M-2000C.jsonp
diff --git a/Scripts/DCS-BIOS/doc/json/MiG-15Bis.json b/Scripts/DCS-BIOS/doc/json/MiG-15Bis.json
diff --git a/Scripts/DCS-BIOS/doc/json/MiG-15Bis.jsonp b/Scripts/DCS-BIOS/doc/json/MiG-15Bis.jsonp
diff --git a/Scripts/DCS-BIOS/lib/M2000C.lua b/Scripts/DCS-BIOS/lib/M2000C.lua
@@ -1037,10 +1037,10 @@ defineFloat("SPEED_KTS_NEED", 303, {0, 1}, "SPEED", "O - SPEED - Speed Needle")
 defineFloat("SPEED_MACH", 304, {0, 1}, "SPEED", "O - SPEED - Mach")
 
 -- TACAN
+defineTumb("TAC_CH_10_SEL", 23, 3623, 623, 0.076923, {0, 0.923077}, nil, true, "TACAN", "I - TACAN Channel 10 Selector")
 defineTumb("TAC_MODE_SEL", 23, 3626, 626, 0.33, {0, 1}, nil, false, "TACAN", "I - TACAN Mode Select")
-defineBcdWheel("TAC_CH_10_SEL", 23, 623, nil, "TACAN", "I - TACAN Channel 10 Selector")
 defineToggleSwitch("TAC_X_Y_SEL", 23, 3624, 624, "TACAN", "I - TACAN X/Y Select")
-defineBcdWheel("TAC_CH_1_SEL", 23, 625, nil, "TACAN", "I - TACAN Channel 1 Selector")
+defineTumb("TAC_CH_1_SEL", 23, 3625, 625, 0.1, {0, 0.9}, nil, true, "TACAN", "I - TACAN Channel 1 Selector")
 
 -- TEST PANEL
 defineMultipositionSwitch("FBW_TEST_SW", 17, 3517, 517, 3, 0.5, "TEST PANEL", "I - TEST - FBW Test Switch")
@@ -1086,9 +1086,10 @@ defineFloat("UHF_PRESET", 436, {0, 1}, "UHF RADIO", "O - UHF - PRESET Display")
 defineString("UHF_FREQUENCY", getUHFFrequency, 5, "UHF RADIO", "O - UHF - Frequency Report Display")
 
 -- VOR / ILS
-defineBcdWheel("VORILS_FREQ_WHOLE", 24, 616, nil, "VOR / ILS", "I - VOR/ILS Frequency Change Whole")
+--This is not working OK. Jumps over 15 & 17
+defineTumb("VORILS_FREQ_WHOLE", 24, 3616, 616, 0.1, {0, 1}, nil, true, "VOR / ILS", "I - VOR/ILS Frequency Change Whole")
 defineToggleSwitch("VORILS_PWR_DIAL", 24, 3617, 617, "VOR / ILS", "I - VOR/ILS Power Dial")
-defineBcdWheel("VORILS_FREQ_DECIMAL", 24, 618, nil, "VOR / ILS", "I - VOR/ILS Frequency Change Decimal")
+defineTumb("VORILS_FREQ_DECIMAL", 24, 3618, 618, 0.05, {0, 0.95}, nil, true, "VOR / ILS", "I - VOR/ILS Frequency Change Decimal")
 defineToggleSwitch("VORILS_TEST_DIAL", 24, 3619, 619, "VOR / ILS", "I - VOR/ILS Test Dial")
 
 -- VTB