Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-27 02:01:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 2027

Browse Source
This commit is contained in:
Peter Johnson
2025-02-20 00:26:23 -08:00
parent da47f06d70 0c3c2c1fda
commit 98f933eca5
123 changed files with 4634 additions and 2291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
wpilibj/src/generate/hids.json
View File

@@ -59,28 +59,32 @@
"left",
"X"
],
"value": 0
"value": 0,
"PositiveDirection": "Right"
},
{
"NameParts": [
"right",
"X"
],
"value": 4
"value": 4,
"PositiveDirection": "Right"
},
{
"NameParts": [
"left",
"Y"
],
"value": 1
"value": 1,
"PositiveDirection": "Back"
},
{
"NameParts": [
"right",
"Y"
],
"value": 5
"value": 5,
"PositiveDirection": "Back"
}
],
"triggers": [
@@ -173,28 +177,32 @@
"left",
"X"
],
"value": 0
"value": 0,
"PositiveDirection": "Right"
},
{
"NameParts": [
"left",
"Y"
],
"value": 1
"value": 1,
"PositiveDirection": "Back"
},
{
"NameParts": [
"right",
"X"
],
"value": 2
"value": 2,
"PositiveDirection": "Right"
},
{
"NameParts": [
"right",
"Y"
],
"value": 5
"value": 5,
"PositiveDirection": "Back"
}
],
"triggers": [
@@ -287,28 +295,32 @@
"left",
"X"
],
"value": 0
"value": 0,
"PositiveDirection": "Right"
},
{
"NameParts": [
"left",
"Y"
],
"value": 1
"value": 1,
"PositiveDirection": "Back"
},
{
"NameParts": [
"right",
"X"
],
"value": 2
"value": 2,
"PositiveDirection": "Right"
},
{
"NameParts": [
"right",
"Y"
],
"value": 5
"value": 5,
"PositiveDirection": "Back"
}
],
"triggers": [
@@ -408,28 +420,32 @@
"left",
"X"
],
"value": 0
"value": 0,
"PositiveDirection": "Right"
},
{
"NameParts": [
"right",
"X"
],
"value": 3
"value": 3,
"PositiveDirection": "Right"
},
{
"NameParts": [
"left",
"Y"
],
"value": 1
"value": 1,
"PositiveDirection": "Back"
},
{
"NameParts": [
"right",
"Y"
],
"value": 4
"value": 4,
"PositiveDirection": "Back"
}
]
}

7
wpilibj/src/generate/hids.schema.json
View File

@@ -62,7 +62,8 @@
"type": "object",
"required": [
"NameParts",
"value"
"value",
"PositiveDirection"
],
"properties": {
"NameParts": {
@@ -76,6 +77,10 @@
"value": {
"description": "The axis value",
"type": "integer"
},
"PositiveDirection": {
"description": "The positive direction of the axis.",
"type": "string"
}
}
}

2
wpilibj/src/generate/main/java/hid.java.jinja
View File

@@ -102,7 +102,7 @@ public class {{ ConsoleName }}Controller extends GenericHID implements Sendable
}
{% for stick in sticks %}
/**
* Get the {{ stick.NameParts[1] }} axis value of {{ stick.NameParts[0] }} side of the controller.
* Get the {{ stick.NameParts[1] }} axis value of {{ stick.NameParts[0] }} side of the controller. {{ stick.PositiveDirection }} is positive.
*
* @return The axis value.
*/