Skip to content

Commit d40f755

Browse files
BOLL7708BOLL7708
committed
Add more chord and tracker slots, update newtonsoft.json
1 parent 5892c17 commit d40f755

File tree

6 files changed

+105
-9
lines changed

6 files changed

+105
-9
lines changed

‎OpenVR2Key/MainWindow.xaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,8 @@ private string[] InitList(Dictionary<string, Key[]> config = null)
203203
var actionKeys = new List<string>();
204204
actionKeys.AddRange(GenerateActionKeyRange(16, 'L')); // Left
205205
actionKeys.AddRange(GenerateActionKeyRange(16, 'R')); // Right
206-
actionKeys.AddRange(GenerateActionKeyRange(8, 'C')); // Chord
207-
actionKeys.AddRange(GenerateActionKeyRange(8, 'T')); // Tracker
206+
actionKeys.AddRange(GenerateActionKeyRange(16, 'C')); // Chord
207+
actionKeys.AddRange(GenerateActionKeyRange(16, 'T')); // Tracker
208208
string[] GenerateActionKeyRange(int count, char type)
209209
{
210210
var keys = new List<string>();

‎OpenVR2Key/OpenVR2Key.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@
6969
<Reference Include="GregsStack.InputSimulatorStandard, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
7070
<HintPath>..\packages\GregsStack.InputSimulatorStandard.1.1.1\lib\netstandard2.0\GregsStack.InputSimulatorStandard.dll</HintPath>
7171
</Reference>
72-
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
73-
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
72+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
73+
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
7474
</Reference>
7575
<Reference Include="System" />
7676
<Reference Include="System.Data" />

‎OpenVR2Key/Properties/Resources.Designer.cs

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎OpenVR2Key/Properties/Resources.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,6 @@
128128
<value>..\resources\logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
129129
</data>
130130
<data name="Version" xml:space="preserve">
131-
<value>v0.57</value>
131+
<value>v0.58</value>
132132
</data>
133133
</root>

‎OpenVR2Key/actions.json

Lines changed: 97 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,46 @@
246246
"requirement": "optional",
247247
"type": "boolean"
248248
},
249+
{
250+
"name": "/actions/keys/in/KeyC9",
251+
"requirement": "optional",
252+
"type": "boolean"
253+
},
254+
{
255+
"name": "/actions/keys/in/KeyC10",
256+
"requirement": "optional",
257+
"type": "boolean"
258+
},
259+
{
260+
"name": "/actions/keys/in/KeyC11",
261+
"requirement": "optional",
262+
"type": "boolean"
263+
},
264+
{
265+
"name": "/actions/keys/in/KeyC12",
266+
"requirement": "optional",
267+
"type": "boolean"
268+
},
269+
{
270+
"name": "/actions/keys/in/KeyC13",
271+
"requirement": "optional",
272+
"type": "boolean"
273+
},
274+
{
275+
"name": "/actions/keys/in/KeyC14",
276+
"requirement": "optional",
277+
"type": "boolean"
278+
},
279+
{
280+
"name": "/actions/keys/in/KeyC15",
281+
"requirement": "optional",
282+
"type": "boolean"
283+
},
284+
{
285+
"name": "/actions/keys/in/KeyC16",
286+
"requirement": "optional",
287+
"type": "boolean"
288+
},
249289
{
250290
"name": "/actions/keys/in/KeyT1",
251291
"requirement": "optional",
@@ -285,6 +325,46 @@
285325
"name": "/actions/keys/in/KeyT8",
286326
"requirement": "optional",
287327
"type": "boolean"
328+
},
329+
{
330+
"name": "/actions/keys/in/KeyT9",
331+
"requirement": "optional",
332+
"type": "boolean"
333+
},
334+
{
335+
"name": "/actions/keys/in/KeyT10",
336+
"requirement": "optional",
337+
"type": "boolean"
338+
},
339+
{
340+
"name": "/actions/keys/in/KeyT11",
341+
"requirement": "optional",
342+
"type": "boolean"
343+
},
344+
{
345+
"name": "/actions/keys/in/KeyT12",
346+
"requirement": "optional",
347+
"type": "boolean"
348+
},
349+
{
350+
"name": "/actions/keys/in/KeyT13",
351+
"requirement": "optional",
352+
"type": "boolean"
353+
},
354+
{
355+
"name": "/actions/keys/in/KeyT14",
356+
"requirement": "optional",
357+
"type": "boolean"
358+
},
359+
{
360+
"name": "/actions/keys/in/KeyT15",
361+
"requirement": "optional",
362+
"type": "boolean"
363+
},
364+
{
365+
"name": "/actions/keys/in/KeyT16",
366+
"requirement": "optional",
367+
"type": "boolean"
288368
}
289369
],
290370
"action_sets": [
@@ -337,14 +417,30 @@
337417
"/actions/keys/in/KeyC6": "Key Chord 6",
338418
"/actions/keys/in/KeyC7": "Key Chord 7",
339419
"/actions/keys/in/KeyC8": "Key Chord 8",
420+
"/actions/keys/in/KeyC9": "Key Chord 9",
421+
"/actions/keys/in/KeyC10": "Key Chord 10",
422+
"/actions/keys/in/KeyC11": "Key Chord 11",
423+
"/actions/keys/in/KeyC12": "Key Chord 12",
424+
"/actions/keys/in/KeyC13": "Key Chord 13",
425+
"/actions/keys/in/KeyC14": "Key Chord 14",
426+
"/actions/keys/in/KeyC15": "Key Chord 15",
427+
"/actions/keys/in/KeyC16": "Key Chord 16",
340428
"/actions/keys/in/KeyT1": "Key Tracker 1",
341429
"/actions/keys/in/KeyT2": "Key Tracker 2",
342430
"/actions/keys/in/KeyT3": "Key Tracker 3",
343431
"/actions/keys/in/KeyT4": "Key Tracker 4",
344432
"/actions/keys/in/KeyT5": "Key Tracker 5",
345433
"/actions/keys/in/KeyT6": "Key Tracker 6",
346434
"/actions/keys/in/KeyT7": "Key Tracker 7",
347-
"/actions/keys/in/KeyT8": "Key Tracker 8"
435+
"/actions/keys/in/KeyT8": "Key Tracker 8",
436+
"/actions/keys/in/KeyT9": "Key Tracker 9",
437+
"/actions/keys/in/KeyT10": "Key Tracker 10",
438+
"/actions/keys/in/KeyT11": "Key Tracker 11",
439+
"/actions/keys/in/KeyT12": "Key Tracker 12",
440+
"/actions/keys/in/KeyT13": "Key Tracker 13",
441+
"/actions/keys/in/KeyT14": "Key Tracker 14",
442+
"/actions/keys/in/KeyT15": "Key Tracker 15",
443+
"/actions/keys/in/KeyT16": "Key Tracker 16"
348444
}
349445
]
350446
}

‎OpenVR2Key/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
<package id="Fody" version="6.1.1" targetFramework="net472" developmentDependency="true" />
55
<package id="GregsStack.InputSimulatorStandard" version="1.1.1" targetFramework="net472" />
66
<package id="Microsoft.Net.Compilers.Toolset" version="3.5.0" targetFramework="net472" developmentDependency="true" />
7-
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
7+
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
88
</packages>

0 commit comments

Comments
 (0)