v0.8.4: do not revert fix for HDG_SET and HDG_SYNC in the Huey, it di…

…d not break any offsets
dcs-bios · Oct 31, 2019 · 4d3e137 · 4d3e137
1 parent 034bfb0
commit 4d3e137
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 25 deletions.
diff --git a/src/control-reference-json/UH-1H.json b/src/control-reference-json/UH-1H.json
@@ -4988,52 +4988,46 @@
                                                                                  "physical_variant": "toggle_switch"
                                                                           },
                                                                "HDG_SET": {
+                                                                               "api_variant": "multiturn",
                                                                                   "category": "Front Dash",
-                                                                              "control_type": "limited_dial",
+                                                                              "control_type": "analog_dial",
                                                                                "description": "HDG SET Knob",
                                                                                 "identifier": "HDG_SET",
                                                                                     "inputs": [ {
-                                                                                                  "description": "set the position of the dial",
-                                                                                                    "interface": "set_state",
-                                                                                                    "max_value": 65535
-                                                                                              }, {
                                                                                                      "description": "turn the dial left or right",
                                                                                                        "interface": "variable_step",
                                                                                                        "max_value": 65535,
                                                                                                   "suggested_step": 3200
                                                                                               } ],
                                                                                    "outputs": [ {
                                                                                                       "address": 5390,
-                                                                                                  "description": "position of the potentiometer",
+                                                                                                  "description": "the rotation of the knob in the cockpit (not the value that is controlled by this knob!)",
                                                                                                          "mask": 65535,
                                                                                                     "max_value": 65535,
                                                                                                      "shift_by": 0,
-                                                                                                       "suffix": "",
+                                                                                                       "suffix": "_KNOB_POS",
                                                                                                          "type": "integer"
                                                                                               } ]
                                                                           },
                                                               "HDG_SYNC": {
+                                                                               "api_variant": "multiturn",
                                                                                   "category": "Front Dash",
-                                                                              "control_type": "limited_dial",
+                                                                              "control_type": "analog_dial",
                                                                                "description": "Compass Synchronizing",
                                                                                 "identifier": "HDG_SYNC",
                                                                                     "inputs": [ {
-                                                                                                  "description": "set the position of the dial",
-                                                                                                    "interface": "set_state",
-                                                                                                    "max_value": 65535
-                                                                                              }, {
                                                                                                      "description": "turn the dial left or right",
                                                                                                        "interface": "variable_step",
                                                                                                        "max_value": 65535,
                                                                                                   "suggested_step": 3200
                                                                                               } ],
                                                                                    "outputs": [ {
                                                                                                       "address": 5392,
-                                                                                                  "description": "position of the potentiometer",
+                                                                                                  "description": "the rotation of the knob in the cockpit (not the value that is controlled by this knob!)",
                                                                                                          "mask": 65535,
                                                                                                     "max_value": 65535,
                                                                                                      "shift_by": 0,
-                                                                                                       "suffix": "",
+                                                                                                       "suffix": "_KNOB_POS",
                                                                                                          "type": "integer"
                                                                                               } ]
                                                                           },

diff --git a/src/dcs-lua/lib/UH1H.lua b/src/dcs-lua/lib/UH1H.lua
@@ -437,17 +437,8 @@ defineTumb("DOME_LIGHT_SW", 7, 3021, 226, 1, {-1, 1}, nil, false, "Overhead Pane
 
 defineMultipositionSwitch("BLEED_AIR_SW", 47, 3001, 236, 5, 0.1, "Overhead Panel", "Bleed Air Dial")
 
--- local dummmy = moduleBeingDefined.memoryMap:allocateInt {
---     maxValue = 65535
--- }
--- local dummmy = moduleBeingDefined.memoryMap:allocateInt {
---     maxValue = 65535
--- }
--- defineRotary("HDG_SET", 10, 3003, 163, "Front Dash", "HDG SET Knob")
-
--- defineRotary("HDG_SYNC", 10, 3005, 161, "Front Dash", "Compass Synchronizing")
-definePotentiometer("HDG_SET", 10, 3003, 163, {0, 1}, "Front Dash", "HDG SET Knob")
-definePotentiometer("HDG_SYNC", 10, 3005, 161, {0, 1}, "Front Dash", "Compass Synchronizing")
+defineRotary("HDG_SET", 10, 3003, 163, "Front Dash", "HDG SET Knob")
+defineRotary("HDG_SYNC", 10, 3005, 161, "Front Dash", "Compass Synchronizing")
 defineToggleSwitch("ADF_VOR_SW", 10, 3004, 164, "Front Dash", "ADF / VOR Switch: VOR / ADF")
 defineToggleSwitch("GYRO_MODE_SW", 10, 3002, 241, "Front Dash", "DG / Slave Gyro Mode: MAG / DG")