Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use an array of InstanceNames #1875

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Joysticks/honeycomb_alpha.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "Alpha Flight Controls",
"InstanceNames": ["Alpha Flight Controls"],
"Inputs": [
{
"Id": 1,
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/honeycomb_bravo.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "Bravo Throttle Quadrant",
"InstanceNames": ["Bravo Throttle Quadrant"],
"VendorId": "0x294B",
"ProductId": "0x1901",
"Inputs": [
Expand Down
17 changes: 15 additions & 2 deletions Joysticks/mfjoystick.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"$id": "https://mobiflight.com/hid.schema.json",
"title": "Root",
"type": "object",
"required": ["InstanceName"],
"required": ["InstanceNames"],
"dependentRequired": {
"Outputs": ["VendorId", "ProductId"]
},
Expand All @@ -13,7 +13,20 @@
"$id": "#root/InstanceName",
"title": "InstanceName",
"type": "string",
"description": "Instance name for the device. Required. This is used to match the definition with a connected device."
"description": "Instance name for the device. Obsolete. Use InstanceNames instead."
},
"InstanceNames": {
"$id": "#root/InstanceNames",
"title": "InstanceNames",
"description": "List of instance names for the device. Required.",
"type": "array",
"default": [],
"items": {
"$id": "#root/Inputs/items",
"title": "Items",
"type": "string",
"description": "A string that identifies a specific joystick device."
}
},
"Inputs": {
"$id": "#root/Inputs",
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/octavi.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "Octavi",
"InstanceNames": ["Octavi"],
"VendorId": "0x04D8",
"ProductId": "0xE6D6",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/s_tecs_modern_throttle_max.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "S-TECS MODERN THROTTLE MAX",
"InstanceNames": ["S-TECS MODERN THROTTLE MAX"],
"VendorId": "0x231D",
"ProductId": "0x012E",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/s_tecs_modern_throttle_max_stem.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "S-TECS MODERN THROTTLE MAX STEM",
"InstanceNames": ["S-TECS MODERN THROTTLE MAX STEM"],
"VendorId": "0x231D",
"ProductId": "0x012E",
"Inputs": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "S-TECS MODERN THROTTLE MAX STEM FSM.GA",
"InstanceNames": ["S-TECS MODERN THROTTLE MAX STEM FSM.GA"],
"VendorId": "0x231D",
"ProductId": "0x012E",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/s_tecs_modern_throttle_mini.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "S-TECS MODERN THROTTLE MINI",
"InstanceNames": ["S-TECS MODERN THROTTLE MINI"],
"VendorId": "0x231D",
"ProductId": "0x012B",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/s_tecs_modern_throttle_mini_plus.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "S-TECS MODERN THROTTLE MINI PLUS",
"InstanceNames": ["S-TECS MODERN THROTTLE MINI PLUS"],
"VendorId": "0x231D",
"ProductId": "0x012C",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/s_tecs_modern_throttle_standard.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "S-TECS MODERN THROTTLE STANDARD",
"InstanceNames": ["S-TECS MODERN THROTTLE STANDARD"],
"VendorId": "0x231D",
"ProductId": "0x012D",
"Inputs": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "S-TECS MODERN THROTTLE STANDARD STEM",
"InstanceNames": ["S-TECS MODERN THROTTLE STANDARD STEM"],
"VendorId": "0x231D",
"ProductId": "0x012D",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/saitek_aviator_stick.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "Saitek Aviator Stick",
"InstanceNames": ["Saitek Aviator Stick"],
"VendorId": 1699,
"ProductId": 1121,
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/t.a320_pilot.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "T.A320 Pilot",
"InstanceNames": ["T.A320 Pilot"],
"VendorId": "0x044F",
"ProductId": "0x0405",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_evo_f14.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator EVO F14",
"InstanceNames": ["VKBsim Gladiator EVO F14"],
"VendorId": "0x231D",
"ProductId": "0x0A00",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_evo_kg12.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator EVO KG12",
"InstanceNames": ["VKBsim Gladiator EVO KG12"],
"VendorId": "0x231D",
"ProductId": "0x0600",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_evo_l.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator EVO L",
"InstanceNames": ["VKBsim Gladiator EVO L"],
"VendorId": "0x231D",
"ProductId": "0x0201",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_evo_l_sem.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator EVO L SEM",
"InstanceNames": ["VKBsim Gladiator EVO L SEM"],
"VendorId": "0x231D",
"ProductId": "0x0205",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_evo_ot_l.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator EVO OT L",
"InstanceNames": ["VKBsim Gladiator EVO OT L"],
"VendorId": "0x231D",
"ProductId": "0x3201",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_evo_ot_l_sem.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator EVO OT L SEM",
"InstanceNames": ["VKBsim Gladiator EVO OT L SEM"],
"VendorId": "0x231D",
"ProductId": "0x3205",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_evo_ot_r.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator EVO OT R",
"InstanceNames": ["VKBsim Gladiator EVO OT R"],
"VendorId": "0x231D",
"ProductId": "0x3200",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_evo_ot_r_sem.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator EVO OT R SEM",
"InstanceNames": ["VKBsim Gladiator EVO OT R SEM"],
"VendorId": "0x231D",
"ProductId": "0x3204",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_evo_r.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator EVO R",
"InstanceNames": ["VKBsim Gladiator EVO R"],
"VendorId": "0x231D",
"ProductId": "0x0200",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_evo_r_fsm_ga.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator EVO R FSM.GA",
"InstanceNames": ["VKBsim Gladiator EVO R FSM.GA"],
"VendorId": "0x231D",
"ProductId": "0x0220",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_evo_r_sem.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator EVO R SEM",
"InstanceNames": ["VKBsim Gladiator EVO R SEM"],
"VendorId": "0x231D",
"ProductId": "0x0204",
"Inputs": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator EVO R SEM FSM.GA",
"InstanceNames": ["VKBsim Gladiator EVO R SEM FSM.GA"],
"VendorId": "0x231D",
"ProductId": "0x0224",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_evo_r_sem_thq.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator EVO R SEM THQ",
"InstanceNames": ["VKBsim Gladiator EVO R SEM THQ"],
"VendorId": "0x231D",
"ProductId": "0x0214",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_evo_r_sem_thqx2.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator EVO R SEM THQx2",
"InstanceNames": ["VKBsim Gladiator EVO R SEM THQx2"],
"VendorId": "0x231D",
"ProductId": "0x0224",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_evo_r_thq.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator EVO R THQ",
"InstanceNames": ["VKBsim Gladiator EVO R THQ"],
"VendorId": "0x231D",
"ProductId": "0x0210",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_evo_r_thqx2.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator EVO R THQx2",
"InstanceNames": ["VKBsim Gladiator EVO R THQx2"],
"VendorId": "0x231D",
"ProductId": "0x0220",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_nxt_f14.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator NXT F14",
"InstanceNames": ["VKBsim Gladiator NXT F14"],
"VendorId": "0x231D",
"ProductId": "0x0A00",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_nxt_kg12.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator NXT KG12",
"InstanceNames": ["VKBsim Gladiator NXT KG12"],
"VendorId": "0x231D",
"ProductId": "0x0600",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_nxt_l.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator NXT L",
"InstanceNames": ["VKBsim Gladiator NXT L"],
"VendorId": "0x231D",
"ProductId": "0x0201",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_nxt_l_sem.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator NXT L SEM",
"InstanceNames": ["VKBsim Gladiator NXT L SEM"],
"VendorId": "0x231D",
"ProductId": "0x0205",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_nxt_ot_l.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator NXT OT L",
"InstanceNames": ["VKBsim Gladiator NXT OT L"],
"VendorId": "0x231D",
"ProductId": "0x3201",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_nxt_ot_l_sem.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator NXT OT L SEM",
"InstanceNames": ["VKBsim Gladiator NXT OT L SEM"],
"VendorId": "0x231D",
"ProductId": "0x3205",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_nxt_ot_r.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator NXT OT R",
"InstanceNames": ["VKBsim Gladiator NXT OT R"],
"VendorId": "0x231D",
"ProductId": "0x3200",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_nxt_ot_r_sem.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator NXT OT R SEM",
"InstanceNames": ["VKBsim Gladiator NXT OT R SEM"],
"VendorId": "0x231D",
"ProductId": "0x3204",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_nxt_r.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator NXT R",
"InstanceNames": ["VKBsim Gladiator NXT R"],
"VendorId": "0x231D",
"ProductId": "0x0200",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_nxt_r_fsm_ga.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator NXT R FSM.GA",
"InstanceNames": ["VKBsim Gladiator NXT R FSM.GA"],
"VendorId": "0x231D",
"ProductId": "0x0220",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_nxt_r_sem.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator NXT R SEM",
"InstanceNames": ["VKBsim Gladiator NXT R SEM"],
"VendorId": "0x231D",
"ProductId": "0x0204",
"Inputs": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator NXT R SEM FSM.GA",
"InstanceNames": ["VKBsim Gladiator NXT R SEM FSM.GA"],
"VendorId": "0x231D",
"ProductId": "0x0224",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_nxt_r_sem_thq.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator NXT R SEM THQ",
"InstanceNames": ["VKBsim Gladiator NXT R SEM THQ"],
"VendorId": "0x231D",
"ProductId": "0x0214",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_nxt_r_sem_thqx2.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator NXT R SEM THQx2",
"InstanceNames": ["VKBsim Gladiator NXT R SEM THQx2"],
"VendorId": "0x231D",
"ProductId": "0x0224",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_nxt_r_thq.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator NXT R THQ",
"InstanceNames": ["VKBsim Gladiator NXT R THQ"],
"VendorId": "0x231D",
"ProductId": "0x0210",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_gladiator_nxt_r_thqx2.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBsim Gladiator NXT R THQx2",
"InstanceNames": ["VKBsim Gladiator NXT R THQx2"],
"VendorId": "0x231D",
"ProductId": "0x0220",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_nxt_fsm_ga.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBSim NXT FSM.GA",
"InstanceNames": ["VKBSim NXT FSM.GA"],
"VendorId": "0x231D",
"ProductId": "0x2220",
"Inputs": [
Expand Down
2 changes: 1 addition & 1 deletion Joysticks/vkbsim_nxt_sem.joystick.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./mfjoystick.schema.json",
"InstanceName": "VKBSim NXT SEM",
"InstanceNames": ["VKBSim NXT SEM"],
"VendorId": "0x231D",
"ProductId": "0x2204",
"Inputs": [
Expand Down
Loading