From bd6479dc29d3670b345096558f1b7b02727b543b Mon Sep 17 00:00:00 2001 From: Starlight220 <53231611+Starlight220@users.noreply.github.com> Date: Mon, 16 Jan 2023 18:26:46 +0200 Subject: [PATCH] [build] Add Spotless for JSON (#4956) --- .../wpi/first/apriltag/2022-rapidreact.json | 843 +++++++++--------- .../edu/wpi/first/fields/2018-powerup.json | 15 +- .../edu/wpi/first/fields/2019-deepspace.json | 25 +- .../first/fields/2020-infiniterecharge.json | 27 +- .../first/fields/2021-barrelracingpath.json | 27 +- .../edu/wpi/first/fields/2021-bouncepath.json | 27 +- .../first/fields/2021-galacticsearcha.json | 27 +- .../first/fields/2021-galacticsearchb.json | 27 +- .../first/fields/2021-infiniterecharge.json | 27 +- .../edu/wpi/first/fields/2021-slalompath.json | 27 +- .../edu/wpi/first/fields/2022-rapidreact.json | 27 +- .../edu/wpi/first/fields/2023-chargedup.json | 27 +- ntcore/src/generate/types.json | 720 +++++++-------- shared/java/javastyle.gradle | 8 + wpilibNewCommands/WPILibNewCommands.json | 74 +- .../src/main/cpp/examples/examples.json | 13 +- .../src/main/cpp/templates/templates.json | 15 +- .../wpi/first/wpilibj/examples/examples.json | 7 +- .../first/wpilibj/templates/templates.json | 3 +- 19 files changed, 1054 insertions(+), 912 deletions(-) diff --git a/apriltag/src/main/native/resources/edu/wpi/first/apriltag/2022-rapidreact.json b/apriltag/src/main/native/resources/edu/wpi/first/apriltag/2022-rapidreact.json index 78cb523c6a..1e6fa7fe05 100644 --- a/apriltag/src/main/native/resources/edu/wpi/first/apriltag/2022-rapidreact.json +++ b/apriltag/src/main/native/resources/edu/wpi/first/apriltag/2022-rapidreact.json @@ -1,415 +1,440 @@ { - "tags" : [ { - "ID" : 0, - "pose" : { - "translation" : { - "x" : -0.0035306, - "y" : 7.578928199999999, - "z" : 0.8858503999999999 - }, - "rotation" : { - "quaternion" : { - "W" : 1.0, - "X" : 0.0, - "Y" : 0.0, - "Z" : 0.0 + "tags": [ + { + "ID": 0, + "pose": { + "translation": { + "x": -0.0035306, + "y": 7.578928199999999, + "z": 0.8858503999999999 + }, + "rotation": { + "quaternion": { + "W": 1.0, + "X": 0.0, + "Y": 0.0, + "Z": 0.0 + } + } + } + }, + { + "ID": 1, + "pose": { + "translation": { + "x": 3.2327088, + "y": 5.486654, + "z": 1.7254728 + }, + "rotation": { + "quaternion": { + "W": 1.0, + "X": 0.0, + "Y": 0.0, + "Z": 0.0 + } + } + } + }, + { + "ID": 2, + "pose": { + "translation": { + "x": 3.067812, + "y": 5.3305202, + "z": 1.3762228 + }, + "rotation": { + "quaternion": { + "W": 0.7071067811865476, + "X": 0.0, + "Y": 0.0, + "Z": -0.7071067811865475 + } + } + } + }, + { + "ID": 3, + "pose": { + "translation": { + "x": 0.0039878, + "y": 5.058536999999999, + "z": 0.80645 + }, + "rotation": { + "quaternion": { + "W": 1.0, + "X": 0.0, + "Y": 0.0, + "Z": 0.0 + } + } + } + }, + { + "ID": 4, + "pose": { + "translation": { + "x": 0.0039878, + "y": 3.5124898, + "z": 0.80645 + }, + "rotation": { + "quaternion": { + "W": 1.0, + "X": 0.0, + "Y": 0.0, + "Z": 0.0 + } + } + } + }, + { + "ID": 5, + "pose": { + "translation": { + "x": 0.12110719999999998, + "y": 1.7178274, + "z": 0.8906002000000001 + }, + "rotation": { + "quaternion": { + "W": 0.9196502204050923, + "X": 0.0, + "Y": 0.0, + "Z": 0.39273842708457407 + } + } + } + }, + { + "ID": 6, + "pose": { + "translation": { + "x": 0.8733027999999999, + "y": 0.9412985999999999, + "z": 0.8906002000000001 + }, + "rotation": { + "quaternion": { + "W": 0.9196502204050923, + "X": 0.0, + "Y": 0.0, + "Z": 0.39273842708457407 + } + } + } + }, + { + "ID": 7, + "pose": { + "translation": { + "x": 1.6150844, + "y": 0.15725139999999999, + "z": 0.8906002000000001 + }, + "rotation": { + "quaternion": { + "W": 0.9196502204050923, + "X": 0.0, + "Y": 0.0, + "Z": 0.39273842708457407 + } + } + } + }, + { + "ID": 10, + "pose": { + "translation": { + "x": 16.4627306, + "y": 0.6506718, + "z": 0.8858503999999999 + }, + "rotation": { + "quaternion": { + "W": 6.123233995736766E-17, + "X": 0.0, + "Y": 0.0, + "Z": 1.0 + } + } + } + }, + { + "ID": 11, + "pose": { + "translation": { + "x": 13.2350002, + "y": 2.743454, + "z": 1.7254728 + }, + "rotation": { + "quaternion": { + "W": 6.123233995736766E-17, + "X": 0.0, + "Y": 0.0, + "Z": 1.0 + } + } + } + }, + { + "ID": 12, + "pose": { + "translation": { + "x": 13.391388000000001, + "y": 2.8998418, + "z": 1.3762228 + }, + "rotation": { + "quaternion": { + "W": 0.7071067811865476, + "X": 0.0, + "Y": 0.0, + "Z": 0.7071067811865475 + } + } + } + }, + { + "ID": 13, + "pose": { + "translation": { + "x": 16.4552122, + "y": 3.1755079999999998, + "z": 0.80645 + }, + "rotation": { + "quaternion": { + "W": 6.123233995736766E-17, + "X": 0.0, + "Y": 0.0, + "Z": 1.0 + } + } + } + }, + { + "ID": 14, + "pose": { + "translation": { + "x": 16.4552122, + "y": 4.7171356, + "z": 0.80645 + }, + "rotation": { + "quaternion": { + "W": 6.123233995736766E-17, + "X": 0.0, + "Y": 0.0, + "Z": 1.0 + } + } + } + }, + { + "ID": 15, + "pose": { + "translation": { + "x": 16.3350194, + "y": 6.5149729999999995, + "z": 0.8937752 + }, + "rotation": { + "quaternion": { + "W": -0.37298778257580906, + "X": -0.0, + "Y": 0.0, + "Z": 0.9278362538989199 + } + } + } + }, + { + "ID": 16, + "pose": { + "translation": { + "x": 15.5904946, + "y": 7.292695599999999, + "z": 0.8906002000000001 + }, + "rotation": { + "quaternion": { + "W": -0.37298778257580906, + "X": -0.0, + "Y": 0.0, + "Z": 0.9278362538989199 + } + } + } + }, + { + "ID": 17, + "pose": { + "translation": { + "x": 14.847188999999998, + "y": 8.0691228, + "z": 0.8906002000000001 + }, + "rotation": { + "quaternion": { + "W": -0.37298778257580906, + "X": -0.0, + "Y": 0.0, + "Z": 0.9278362538989199 + } + } + } + }, + { + "ID": 40, + "pose": { + "translation": { + "x": 7.874127, + "y": 4.9131728, + "z": 0.7032752 + }, + "rotation": { + "quaternion": { + "W": 0.5446390350150271, + "X": 0.0, + "Y": 0.0, + "Z": 0.838670567945424 + } + } + } + }, + { + "ID": 41, + "pose": { + "translation": { + "x": 7.4312271999999995, + "y": 3.759327, + "z": 0.7032752 + }, + "rotation": { + "quaternion": { + "W": -0.20791169081775934, + "X": -0.0, + "Y": 0.0, + "Z": 0.9781476007338057 + } + } + } + }, + { + "ID": 42, + "pose": { + "translation": { + "x": 8.585073, + "y": 3.3164272, + "z": 0.7032752 + }, + "rotation": { + "quaternion": { + "W": 0.838670567945424, + "X": 0.0, + "Y": 0.0, + "Z": -0.5446390350150271 + } + } + } + }, + { + "ID": 43, + "pose": { + "translation": { + "x": 9.0279728, + "y": 4.470273, + "z": 0.7032752 + }, + "rotation": { + "quaternion": { + "W": 0.9781476007338057, + "X": 0.0, + "Y": 0.0, + "Z": 0.20791169081775934 + } + } + } + }, + { + "ID": 50, + "pose": { + "translation": { + "x": 7.6790296, + "y": 4.3261534, + "z": 2.4177244 + }, + "rotation": { + "quaternion": { + "W": 0.17729273396782605, + "X": -0.22744989571511945, + "Y": 0.04215534644161733, + "Z": 0.9565859910053995 + } + } + } + }, + { + "ID": 51, + "pose": { + "translation": { + "x": 8.0182466, + "y": 3.5642296, + "z": 2.4177244 + }, + "rotation": { + "quaternion": { + "W": -0.5510435465842192, + "X": -0.19063969497246985, + "Y": -0.13102303230819815, + "Z": 0.8017733354717242 + } + } + } + }, + { + "ID": 52, + "pose": { + "translation": { + "x": 8.7801704, + "y": 3.9034466, + "z": 2.4177244 + }, + "rotation": { + "quaternion": { + "W": -0.9565859910053994, + "X": -0.04215534644161739, + "Y": -0.22744989571511942, + "Z": 0.17729273396782633 + } + } + } + }, + { + "ID": 53, + "pose": { + "translation": { + "x": 8.4409534, + "y": 4.6653704, + "z": 2.4177244 + }, + "rotation": { + "quaternion": { + "W": 0.8017733354717241, + "X": -0.1310230323081982, + "Y": 0.19063969497246983, + "Z": 0.5510435465842194 + } } } } - }, { - "ID" : 1, - "pose" : { - "translation" : { - "x" : 3.2327088, - "y" : 5.486654, - "z" : 1.7254728 - }, - "rotation" : { - "quaternion" : { - "W" : 1.0, - "X" : 0.0, - "Y" : 0.0, - "Z" : 0.0 - } - } - } - }, { - "ID" : 2, - "pose" : { - "translation" : { - "x" : 3.067812, - "y" : 5.3305202, - "z" : 1.3762228 - }, - "rotation" : { - "quaternion" : { - "W" : 0.7071067811865476, - "X" : 0.0, - "Y" : 0.0, - "Z" : -0.7071067811865475 - } - } - } - }, { - "ID" : 3, - "pose" : { - "translation" : { - "x" : 0.0039878, - "y" : 5.058536999999999, - "z" : 0.80645 - }, - "rotation" : { - "quaternion" : { - "W" : 1.0, - "X" : 0.0, - "Y" : 0.0, - "Z" : 0.0 - } - } - } - }, { - "ID" : 4, - "pose" : { - "translation" : { - "x" : 0.0039878, - "y" : 3.5124898, - "z" : 0.80645 - }, - "rotation" : { - "quaternion" : { - "W" : 1.0, - "X" : 0.0, - "Y" : 0.0, - "Z" : 0.0 - } - } - } - }, { - "ID" : 5, - "pose" : { - "translation" : { - "x" : 0.12110719999999998, - "y" : 1.7178274, - "z" : 0.8906002000000001 - }, - "rotation" : { - "quaternion" : { - "W" : 0.9196502204050923, - "X" : 0.0, - "Y" : 0.0, - "Z" : 0.39273842708457407 - } - } - } - }, { - "ID" : 6, - "pose" : { - "translation" : { - "x" : 0.8733027999999999, - "y" : 0.9412985999999999, - "z" : 0.8906002000000001 - }, - "rotation" : { - "quaternion" : { - "W" : 0.9196502204050923, - "X" : 0.0, - "Y" : 0.0, - "Z" : 0.39273842708457407 - } - } - } - }, { - "ID" : 7, - "pose" : { - "translation" : { - "x" : 1.6150844, - "y" : 0.15725139999999999, - "z" : 0.8906002000000001 - }, - "rotation" : { - "quaternion" : { - "W" : 0.9196502204050923, - "X" : 0.0, - "Y" : 0.0, - "Z" : 0.39273842708457407 - } - } - } - }, { - "ID" : 10, - "pose" : { - "translation" : { - "x" : 16.4627306, - "y" : 0.6506718, - "z" : 0.8858503999999999 - }, - "rotation" : { - "quaternion" : { - "W" : 6.123233995736766E-17, - "X" : 0.0, - "Y" : 0.0, - "Z" : 1.0 - } - } - } - }, { - "ID" : 11, - "pose" : { - "translation" : { - "x" : 13.2350002, - "y" : 2.743454, - "z" : 1.7254728 - }, - "rotation" : { - "quaternion" : { - "W" : 6.123233995736766E-17, - "X" : 0.0, - "Y" : 0.0, - "Z" : 1.0 - } - } - } - }, { - "ID" : 12, - "pose" : { - "translation" : { - "x" : 13.391388000000001, - "y" : 2.8998418, - "z" : 1.3762228 - }, - "rotation" : { - "quaternion" : { - "W" : 0.7071067811865476, - "X" : 0.0, - "Y" : 0.0, - "Z" : 0.7071067811865475 - } - } - } - }, { - "ID" : 13, - "pose" : { - "translation" : { - "x" : 16.4552122, - "y" : 3.1755079999999998, - "z" : 0.80645 - }, - "rotation" : { - "quaternion" : { - "W" : 6.123233995736766E-17, - "X" : 0.0, - "Y" : 0.0, - "Z" : 1.0 - } - } - } - }, { - "ID" : 14, - "pose" : { - "translation" : { - "x" : 16.4552122, - "y" : 4.7171356, - "z" : 0.80645 - }, - "rotation" : { - "quaternion" : { - "W" : 6.123233995736766E-17, - "X" : 0.0, - "Y" : 0.0, - "Z" : 1.0 - } - } - } - }, { - "ID" : 15, - "pose" : { - "translation" : { - "x" : 16.3350194, - "y" : 6.5149729999999995, - "z" : 0.8937752 - }, - "rotation" : { - "quaternion" : { - "W" : -0.37298778257580906, - "X" : -0.0, - "Y" : 0.0, - "Z" : 0.9278362538989199 - } - } - } - }, { - "ID" : 16, - "pose" : { - "translation" : { - "x" : 15.5904946, - "y" : 7.292695599999999, - "z" : 0.8906002000000001 - }, - "rotation" : { - "quaternion" : { - "W" : -0.37298778257580906, - "X" : -0.0, - "Y" : 0.0, - "Z" : 0.9278362538989199 - } - } - } - }, { - "ID" : 17, - "pose" : { - "translation" : { - "x" : 14.847188999999998, - "y" : 8.0691228, - "z" : 0.8906002000000001 - }, - "rotation" : { - "quaternion" : { - "W" : -0.37298778257580906, - "X" : -0.0, - "Y" : 0.0, - "Z" : 0.9278362538989199 - } - } - } - }, { - "ID" : 40, - "pose" : { - "translation" : { - "x" : 7.874127, - "y" : 4.9131728, - "z" : 0.7032752 - }, - "rotation" : { - "quaternion" : { - "W" : 0.5446390350150271, - "X" : 0.0, - "Y" : 0.0, - "Z" : 0.838670567945424 - } - } - } - }, { - "ID" : 41, - "pose" : { - "translation" : { - "x" : 7.4312271999999995, - "y" : 3.759327, - "z" : 0.7032752 - }, - "rotation" : { - "quaternion" : { - "W" : -0.20791169081775934, - "X" : -0.0, - "Y" : 0.0, - "Z" : 0.9781476007338057 - } - } - } - }, { - "ID" : 42, - "pose" : { - "translation" : { - "x" : 8.585073, - "y" : 3.3164272, - "z" : 0.7032752 - }, - "rotation" : { - "quaternion" : { - "W" : 0.838670567945424, - "X" : 0.0, - "Y" : 0.0, - "Z" : -0.5446390350150271 - } - } - } - }, { - "ID" : 43, - "pose" : { - "translation" : { - "x" : 9.0279728, - "y" : 4.470273, - "z" : 0.7032752 - }, - "rotation" : { - "quaternion" : { - "W" : 0.9781476007338057, - "X" : 0.0, - "Y" : 0.0, - "Z" : 0.20791169081775934 - } - } - } - }, { - "ID" : 50, - "pose" : { - "translation" : { - "x" : 7.6790296, - "y" : 4.3261534, - "z" : 2.4177244 - }, - "rotation" : { - "quaternion" : { - "W" : 0.17729273396782605, - "X" : -0.22744989571511945, - "Y" : 0.04215534644161733, - "Z" : 0.9565859910053995 - } - } - } - }, { - "ID" : 51, - "pose" : { - "translation" : { - "x" : 8.0182466, - "y" : 3.5642296, - "z" : 2.4177244 - }, - "rotation" : { - "quaternion" : { - "W" : -0.5510435465842192, - "X" : -0.19063969497246985, - "Y" : -0.13102303230819815, - "Z" : 0.8017733354717242 - } - } - } - }, { - "ID" : 52, - "pose" : { - "translation" : { - "x" : 8.7801704, - "y" : 3.9034466, - "z" : 2.4177244 - }, - "rotation" : { - "quaternion" : { - "W" : -0.9565859910053994, - "X" : -0.04215534644161739, - "Y" : -0.22744989571511942, - "Z" : 0.17729273396782633 - } - } - } - }, { - "ID" : 53, - "pose" : { - "translation" : { - "x" : 8.4409534, - "y" : 4.6653704, - "z" : 2.4177244 - }, - "rotation" : { - "quaternion" : { - "W" : 0.8017733354717241, - "X" : -0.1310230323081982, - "Y" : 0.19063969497246983, - "Z" : 0.5510435465842194 - } - } - } - } ], - "field" : { - "length" : 16.4592, - "width" : 8.2296 + ], + "field": { + "length": 16.4592, + "width": 8.2296 } } diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2018-powerup.json b/fieldImages/src/main/native/resources/edu/wpi/first/fields/2018-powerup.json index 1b63c2934d..74c58838fe 100644 --- a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2018-powerup.json +++ b/fieldImages/src/main/native/resources/edu/wpi/first/fields/2018-powerup.json @@ -2,9 +2,18 @@ "game": "FIRST Power Up", "field-image": "2018-field.jpg", "field-corners": { - "top-left": [125, 20], - "bottom-right": [827, 370] + "top-left": [ + 125, + 20 + ], + "bottom-right": [ + 827, + 370 + ] }, - "field-size": [54, 27], + "field-size": [ + 54, + 27 + ], "field-unit": "feet" } diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2019-deepspace.json b/fieldImages/src/main/native/resources/edu/wpi/first/fields/2019-deepspace.json index 96087f740e..a0b0fd1f69 100644 --- a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2019-deepspace.json +++ b/fieldImages/src/main/native/resources/edu/wpi/first/fields/2019-deepspace.json @@ -1,10 +1,19 @@ { -"game" : "Destination: Deep Space", -"field-image" : "2019-field.jpg", -"field-corners": { - "top-left" : [217, 40], - "bottom-right" : [1372, 615] -}, -"field-size" : [54, 27], -"field-unit" : "foot" + "game": "Destination: Deep Space", + "field-image": "2019-field.jpg", + "field-corners": { + "top-left": [ + 217, + 40 + ], + "bottom-right": [ + 1372, + 615 + ] + }, + "field-size": [ + 54, + 27 + ], + "field-unit": "foot" } diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2020-infiniterecharge.json b/fieldImages/src/main/native/resources/edu/wpi/first/fields/2020-infiniterecharge.json index 6187cae89c..7109f5c6e3 100644 --- a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2020-infiniterecharge.json +++ b/fieldImages/src/main/native/resources/edu/wpi/first/fields/2020-infiniterecharge.json @@ -1,10 +1,19 @@ { - "game" : "Infinite Recharge", - "field-image" : "2020-field.png", - "field-corners": { - "top-left" : [96, 25], - "bottom-right" : [1040, 514] - }, - "field-size" : [52.4375, 26.9375], - "field-unit" : "foot" - } + "game": "Infinite Recharge", + "field-image": "2020-field.png", + "field-corners": { + "top-left": [ + 96, + 25 + ], + "bottom-right": [ + 1040, + 514 + ] + }, + "field-size": [ + 52.4375, + 26.9375 + ], + "field-unit": "foot" +} diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-barrelracingpath.json b/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-barrelracingpath.json index c0e49dc063..b7b063c521 100644 --- a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-barrelracingpath.json +++ b/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-barrelracingpath.json @@ -1,10 +1,19 @@ { - "game": "Barrel Racing Path", - "field-image": "2021-barrel.png", - "field-corners": { - "top-left": [20, 20], - "bottom-right": [780, 400] - }, - "field-size": [30, 15], - "field-unit": "feet" - } + "game": "Barrel Racing Path", + "field-image": "2021-barrel.png", + "field-corners": { + "top-left": [ + 20, + 20 + ], + "bottom-right": [ + 780, + 400 + ] + }, + "field-size": [ + 30, + 15 + ], + "field-unit": "feet" +} diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-bouncepath.json b/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-bouncepath.json index b02b855bcd..a126e22705 100644 --- a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-bouncepath.json +++ b/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-bouncepath.json @@ -1,10 +1,19 @@ { - "game": "Bounce Path", - "field-image": "2021-bounce.png", - "field-corners": { - "top-left": [20, 20], - "bottom-right": [780, 400] - }, - "field-size": [30, 15], - "field-unit": "feet" - } + "game": "Bounce Path", + "field-image": "2021-bounce.png", + "field-corners": { + "top-left": [ + 20, + 20 + ], + "bottom-right": [ + 780, + 400 + ] + }, + "field-size": [ + 30, + 15 + ], + "field-unit": "feet" +} diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearcha.json b/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearcha.json index 063d351cbc..5bed8187fa 100644 --- a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearcha.json +++ b/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearcha.json @@ -1,10 +1,19 @@ { - "game": "Galactic Search A", - "field-image": "2021-galacticsearcha.png", - "field-corners": { - "top-left": [20, 20], - "bottom-right": [780, 400] - }, - "field-size": [30, 15], - "field-unit": "feet" - } + "game": "Galactic Search A", + "field-image": "2021-galacticsearcha.png", + "field-corners": { + "top-left": [ + 20, + 20 + ], + "bottom-right": [ + 780, + 400 + ] + }, + "field-size": [ + 30, + 15 + ], + "field-unit": "feet" +} diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearchb.json b/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearchb.json index 615ec45009..0d2d1b557e 100644 --- a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearchb.json +++ b/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-galacticsearchb.json @@ -1,10 +1,19 @@ { - "game": "Galactic Search B", - "field-image": "2021-galacticsearchb.png", - "field-corners": { - "top-left": [20, 20], - "bottom-right": [780, 400] - }, - "field-size": [30, 15], - "field-unit": "feet" - } + "game": "Galactic Search B", + "field-image": "2021-galacticsearchb.png", + "field-corners": { + "top-left": [ + 20, + 20 + ], + "bottom-right": [ + 780, + 400 + ] + }, + "field-size": [ + 30, + 15 + ], + "field-unit": "feet" +} diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-infiniterecharge.json b/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-infiniterecharge.json index d34fc6506f..9af45c0b61 100644 --- a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-infiniterecharge.json +++ b/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-infiniterecharge.json @@ -1,10 +1,19 @@ { - "game": "Infinite Recharge 2021", - "field-image": "2021-field.png", - "field-corners": { - "top-left": [127, 34], - "bottom-right": [1323, 649] - }, - "field-size": [52.4375, 26.9375], - "field-unit": "foot" - } + "game": "Infinite Recharge 2021", + "field-image": "2021-field.png", + "field-corners": { + "top-left": [ + 127, + 34 + ], + "bottom-right": [ + 1323, + 649 + ] + }, + "field-size": [ + 52.4375, + 26.9375 + ], + "field-unit": "foot" +} diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-slalompath.json b/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-slalompath.json index bb80f55b92..a728ef38a8 100644 --- a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-slalompath.json +++ b/fieldImages/src/main/native/resources/edu/wpi/first/fields/2021-slalompath.json @@ -1,10 +1,19 @@ { - "game": "Slalom Path", - "field-image": "2021-slalom.png", - "field-corners": { - "top-left": [20, 20], - "bottom-right": [780, 400] - }, - "field-size": [30, 15], - "field-unit": "feet" - } + "game": "Slalom Path", + "field-image": "2021-slalom.png", + "field-corners": { + "top-left": [ + 20, + 20 + ], + "bottom-right": [ + 780, + 400 + ] + }, + "field-size": [ + 30, + 15 + ], + "field-unit": "feet" +} diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2022-rapidreact.json b/fieldImages/src/main/native/resources/edu/wpi/first/fields/2022-rapidreact.json index 7098c12e9e..7d2428efa9 100644 --- a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2022-rapidreact.json +++ b/fieldImages/src/main/native/resources/edu/wpi/first/fields/2022-rapidreact.json @@ -1,10 +1,19 @@ { - "game": "Rapid React", - "field-image": "2022-field.png", - "field-corners": { - "top-left": [74, 50], - "bottom-right": [1774, 900] - }, - "field-size": [54, 27], - "field-unit": "foot" - } \ No newline at end of file + "game": "Rapid React", + "field-image": "2022-field.png", + "field-corners": { + "top-left": [ + 74, + 50 + ], + "bottom-right": [ + 1774, + 900 + ] + }, + "field-size": [ + 54, + 27 + ], + "field-unit": "foot" +} diff --git a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2023-chargedup.json b/fieldImages/src/main/native/resources/edu/wpi/first/fields/2023-chargedup.json index b054b77fb3..bbd9f41bdd 100644 --- a/fieldImages/src/main/native/resources/edu/wpi/first/fields/2023-chargedup.json +++ b/fieldImages/src/main/native/resources/edu/wpi/first/fields/2023-chargedup.json @@ -1,10 +1,19 @@ { - "game": "Charged Up", - "field-image": "2023-field.png", - "field-corners": { - "top-left": [46, 36], - "bottom-right": [1088, 544] - }, - "field-size": [54.27083, 26.2916], - "field-unit": "foot" - } \ No newline at end of file + "game": "Charged Up", + "field-image": "2023-field.png", + "field-corners": { + "top-left": [ + 46, + 36 + ], + "bottom-right": [ + 1088, + 544 + ] + }, + "field-size": [ + 54.27083, + 26.2916 + ], + "field-unit": "foot" +} diff --git a/ntcore/src/generate/types.json b/ntcore/src/generate/types.json index 31a71b3b12..c9d874bcfa 100644 --- a/ntcore/src/generate/types.json +++ b/ntcore/src/generate/types.json @@ -1,366 +1,366 @@ [ - { - "TypeName": "Boolean", - "TypeString": "\"boolean\"", - "c": { - "ValueType": "NT_Bool", - "ParamType": "NT_Bool" - }, - "cpp": { - "ValueType": "bool", - "ParamType": "bool", - "TYPE_NAME": "BOOLEAN" - }, - "java": { - "ValueType": "boolean", - "EmptyValue": "false", - "ConsumerFunctionPackage": "edu.wpi.first.util.function", - "FunctionTypePrefix": "Boolean", - "ToWrapObject": "Boolean.valueOf", - "FromStorageBegin": "(Boolean) " - }, - "jni": { - "jtype": "jboolean", - "jtypestr": "Z", - "JavaObject": false, - "FromJavaBegin": "", - "FromJavaEnd": " != JNI_FALSE", - "ToJavaBegin": "static_cast(", - "ToJavaEnd": ")", - "ToJavaArray": "MakeJBooleanArray" - } + { + "TypeName": "Boolean", + "TypeString": "\"boolean\"", + "c": { + "ValueType": "NT_Bool", + "ParamType": "NT_Bool" }, - { - "TypeName": "Integer", - "TypeString": "\"int\"", - "c": { - "ValueType": "int64_t", - "ParamType": "int64_t" - }, - "cpp": { - "ValueType": "int64_t", - "ParamType": "int64_t", - "TYPE_NAME": "INTEGER" - }, - "java": { - "ValueType": "long", - "EmptyValue": "0", - "FunctionTypePrefix": "Long", - "ToWrapObject": "Long.valueOf", - "FromStorageBegin": "((Number) ", - "FromStorageEnd": ").longValue()" - }, - "jni": { - "jtype": "jlong", - "jtypestr": "J", - "JavaObject": false, - "FromJavaBegin": "", - "FromJavaEnd": "", - "ToJavaBegin": "static_cast(", - "ToJavaEnd": ")", - "ToJavaArray": "MakeJLongArray" - } + "cpp": { + "ValueType": "bool", + "ParamType": "bool", + "TYPE_NAME": "BOOLEAN" }, - { - "TypeName": "Float", - "TypeString": "\"float\"", - "c": { - "ValueType": "float", - "ParamType": "float" - }, - "cpp": { - "ValueType": "float", - "ParamType": "float", - "TYPE_NAME": "FLOAT" - }, - "java": { - "ValueType": "float", - "EmptyValue": "0", - "ConsumerFunctionPackage": "edu.wpi.first.util.function", - "SupplierFunctionPackage": "edu.wpi.first.util.function", - "FunctionTypePrefix": "Float", - "ToWrapObject": "Float.valueOf", - "FromStorageBegin": "((Number) ", - "FromStorageEnd": ").floatValue()" - }, - "jni": { - "jtype": "jfloat", - "jtypestr": "F", - "JavaObject": false, - "FromJavaBegin": "", - "FromJavaEnd": "", - "ToJavaBegin": "static_cast(", - "ToJavaEnd": ")", - "ToJavaArray": "MakeJFloatArray" - } + "java": { + "ValueType": "boolean", + "EmptyValue": "false", + "ConsumerFunctionPackage": "edu.wpi.first.util.function", + "FunctionTypePrefix": "Boolean", + "ToWrapObject": "Boolean.valueOf", + "FromStorageBegin": "(Boolean) " }, - { - "TypeName": "Double", - "TypeString": "\"double\"", - "c": { - "ValueType": "double", - "ParamType": "double" - }, - "cpp": { - "ValueType": "double", - "ParamType": "double", - "TYPE_NAME": "DOUBLE" - }, - "java": { - "ValueType": "double", - "EmptyValue": "0", - "FunctionTypePrefix": "Double", - "ToWrapObject": "Double.valueOf", - "FromStorageBegin": "((Number) ", - "FromStorageEnd": ").doubleValue()" - }, - "jni": { - "jtype": "jdouble", - "jtypestr": "D", - "JavaObject": false, - "FromJavaBegin": "", - "FromJavaEnd": "", - "ToJavaBegin": "static_cast(", - "ToJavaEnd": ")", - "ToJavaArray": "MakeJDoubleArray" - } - }, - { - "TypeName": "String", - "TypeString": "\"string\"", - "c": { - "ValueType": "char*", - "ParamType": "const char*", - "IsArray": true - }, - "cpp": { - "ValueType": "std::string", - "ParamType": "std::string_view", - "TYPE_NAME": "STRING", - "INCLUDES": "#include \n#include \n#include ", - "SmallRetType": "std::string_view", - "SmallElemType": "char" - }, - "java": { - "ValueType": "String", - "EmptyValue": "\"\"", - "FunctionTypeSuffix": "", - "FromStorageBegin": "(String) " - }, - "jni": { - "jtype": "jstring", - "jtypestr": "Ljava/lang/String;", - "JavaObject": true, - "FromJavaBegin": "JStringRef{env, ", - "FromJavaEnd": "}", - "ToJavaBegin": "MakeJString(env, ", - "ToJavaEnd": ")", - "ToJavaArray": "MakeJStringArray" - } - }, - { - "TypeName": "Raw", - "c": { - "ValueType": "uint8_t*", - "ParamType": "const uint8_t*", - "IsArray": true - }, - "cpp": { - "ValueType": "std::vector", - "ParamType": "std::span", - "DefaultValueCopy": "defaultValue.begin(), defaultValue.end()", - "TYPE_NAME": "RAW", - "INCLUDES": "#include ", - "SmallRetType": "std::span", - "SmallElemType": "uint8_t" - }, - "java": { - "ValueType": "byte[]", - "EmptyValue": "new byte[] {}", - "FunctionTypeSuffix": "", - "FromStorageBegin": "(byte[]) " - }, - "jni": { - "jtype": "jbyteArray", - "jtypestr": "[B", - "JavaObject": true, - "FromJavaBegin": "CriticalJByteArrayRef{env, ", - "FromJavaEnd": "}.uarray()", - "ToJavaBegin": "MakeJByteArray(env, ", - "ToJavaEnd": ")", - "ToJavaArray": "MakeJObjectArray" - } - }, - { - "TypeName": "BooleanArray", - "TypeString": "\"boolean[]\"", - "c": { - "ValueType": "NT_Bool*", - "ParamType": "const NT_Bool*", - "IsArray": true - }, - "cpp": { - "ValueType": "std::vector", - "ParamType": "std::span", - "DefaultValueCopy": "defaultValue.begin(), defaultValue.end()", - "TYPE_NAME": "BOOLEAN_ARRAY", - "INCLUDES": "#include ", - "SmallRetType": "std::span", - "SmallElemType": "int" - }, - "java": { - "ValueType": "boolean[]", - "WrapValueType": "Boolean[]", - "EmptyValue": "new boolean[] {}", - "FunctionTypeSuffix": "", - "FromStorageBegin": "(boolean[]) " - }, - "jni": { - "jtype": "jbooleanArray", - "jtypestr": "[Z", - "JavaObject": true, - "FromJavaBegin": "FromJavaBooleanArray(env, ", - "FromJavaEnd": ")", - "ToJavaBegin": "MakeJBooleanArray(env, ", - "ToJavaEnd": ")", - "ToJavaArray": "MakeJObjectArray" - } - }, - { - "TypeName": "IntegerArray", - "TypeString": "\"int[]\"", - "c": { - "ValueType": "int64_t*", - "ParamType": "const int64_t*", - "IsArray": true - }, - "cpp": { - "ValueType": "std::vector", - "ParamType": "std::span", - "DefaultValueCopy": "defaultValue.begin(), defaultValue.end()", - "TYPE_NAME": "INTEGER_ARRAY", - "INCLUDES": "#include ", - "SmallRetType": "std::span", - "SmallElemType": "int64_t" - }, - "java": { - "ValueType": "long[]", - "WrapValueType": "Long[]", - "EmptyValue": "new long[] {}", - "FunctionTypeSuffix": "", - "FromStorageBegin": "(long[]) " - }, - "jni": { - "jtype": "jlongArray", - "jtypestr": "[J", - "JavaObject": true, - "FromJavaBegin": "CriticalJLongArrayRef{env, ", - "FromJavaEnd": "}", - "ToJavaBegin": "MakeJLongArray(env, ", - "ToJavaEnd": ")", - "ToJavaArray": "MakeJObjectArray" - } - }, - { - "TypeName": "FloatArray", - "TypeString": "\"float[]\"", - "c": { - "ValueType": "float*", - "ParamType": "const float*", - "IsArray": true - }, - "cpp": { - "ValueType": "std::vector", - "ParamType": "std::span", - "DefaultValueCopy": "defaultValue.begin(), defaultValue.end()", - "TYPE_NAME": "FLOAT_ARRAY", - "INCLUDES": "#include ", - "SmallRetType": "std::span", - "SmallElemType": "float" - }, - "java": { - "ValueType": "float[]", - "WrapValueType": "Float[]", - "EmptyValue": "new float[] {}", - "FunctionTypeSuffix": "", - "FromStorageBegin": "(float[]) " - }, - "jni": { - "jtype": "jfloatArray", - "jtypestr": "[F", - "JavaObject": true, - "FromJavaBegin": "CriticalJFloatArrayRef{env, ", - "FromJavaEnd": "}", - "ToJavaBegin": "MakeJFloatArray(env, ", - "ToJavaEnd": ")", - "ToJavaArray": "MakeJObjectArray" - } - }, - { - "TypeName": "DoubleArray", - "TypeString": "\"double[]\"", - "c": { - "ValueType": "double*", - "ParamType": "const double*", - "IsArray": true - }, - "cpp": { - "ValueType": "std::vector", - "ParamType": "std::span", - "DefaultValueCopy": "defaultValue.begin(), defaultValue.end()", - "TYPE_NAME": "DOUBLE_ARRAY", - "INCLUDES": "#include ", - "SmallRetType": "std::span", - "SmallElemType": "double" - }, - "java": { - "ValueType": "double[]", - "WrapValueType": "Double[]", - "EmptyValue": "new double[] {}", - "FunctionTypeSuffix": "", - "FromStorageBegin": "(double[]) " - }, - "jni": { - "jtype": "jdoubleArray", - "jtypestr": "[D", - "JavaObject": true, - "FromJavaBegin": "CriticalJDoubleArrayRef{env, ", - "FromJavaEnd": "}", - "ToJavaBegin": "MakeJDoubleArray(env, ", - "ToJavaEnd": ")", - "ToJavaArray": "MakeJObjectArray" - } - }, - { - "TypeName": "StringArray", - "TypeString": "\"string[]\"", - "c": { - "ValueType": "struct NT_String*", - "ParamType": "const struct NT_String*", - "IsArray": true - }, - "cpp": { - "ValueType": "std::vector", - "ParamType": "std::span", - "DefaultValueCopy": "defaultValue.begin(), defaultValue.end()", - "TYPE_NAME": "STRING_ARRAY", - "INCLUDES": "#include " - }, - "java": { - "ValueType": "String[]", - "EmptyValue": "new String[] {}", - "FunctionTypeSuffix": "", - "FromStorageBegin": "(String[]) " - }, - "jni": { - "jtype": "jobjectArray", - "jtypestr": "[Ljava/lang/Object;", - "JavaObject": true, - "FromJavaBegin": "FromJavaStringArray(env, ", - "FromJavaEnd": ")", - "ToJavaBegin": "MakeJStringArray(env, ", - "ToJavaEnd": ")", - "ToJavaArray": "MakeJObjectArray" - } + "jni": { + "jtype": "jboolean", + "jtypestr": "Z", + "JavaObject": false, + "FromJavaBegin": "", + "FromJavaEnd": " != JNI_FALSE", + "ToJavaBegin": "static_cast(", + "ToJavaEnd": ")", + "ToJavaArray": "MakeJBooleanArray" } + }, + { + "TypeName": "Integer", + "TypeString": "\"int\"", + "c": { + "ValueType": "int64_t", + "ParamType": "int64_t" + }, + "cpp": { + "ValueType": "int64_t", + "ParamType": "int64_t", + "TYPE_NAME": "INTEGER" + }, + "java": { + "ValueType": "long", + "EmptyValue": "0", + "FunctionTypePrefix": "Long", + "ToWrapObject": "Long.valueOf", + "FromStorageBegin": "((Number) ", + "FromStorageEnd": ").longValue()" + }, + "jni": { + "jtype": "jlong", + "jtypestr": "J", + "JavaObject": false, + "FromJavaBegin": "", + "FromJavaEnd": "", + "ToJavaBegin": "static_cast(", + "ToJavaEnd": ")", + "ToJavaArray": "MakeJLongArray" + } + }, + { + "TypeName": "Float", + "TypeString": "\"float\"", + "c": { + "ValueType": "float", + "ParamType": "float" + }, + "cpp": { + "ValueType": "float", + "ParamType": "float", + "TYPE_NAME": "FLOAT" + }, + "java": { + "ValueType": "float", + "EmptyValue": "0", + "ConsumerFunctionPackage": "edu.wpi.first.util.function", + "SupplierFunctionPackage": "edu.wpi.first.util.function", + "FunctionTypePrefix": "Float", + "ToWrapObject": "Float.valueOf", + "FromStorageBegin": "((Number) ", + "FromStorageEnd": ").floatValue()" + }, + "jni": { + "jtype": "jfloat", + "jtypestr": "F", + "JavaObject": false, + "FromJavaBegin": "", + "FromJavaEnd": "", + "ToJavaBegin": "static_cast(", + "ToJavaEnd": ")", + "ToJavaArray": "MakeJFloatArray" + } + }, + { + "TypeName": "Double", + "TypeString": "\"double\"", + "c": { + "ValueType": "double", + "ParamType": "double" + }, + "cpp": { + "ValueType": "double", + "ParamType": "double", + "TYPE_NAME": "DOUBLE" + }, + "java": { + "ValueType": "double", + "EmptyValue": "0", + "FunctionTypePrefix": "Double", + "ToWrapObject": "Double.valueOf", + "FromStorageBegin": "((Number) ", + "FromStorageEnd": ").doubleValue()" + }, + "jni": { + "jtype": "jdouble", + "jtypestr": "D", + "JavaObject": false, + "FromJavaBegin": "", + "FromJavaEnd": "", + "ToJavaBegin": "static_cast(", + "ToJavaEnd": ")", + "ToJavaArray": "MakeJDoubleArray" + } + }, + { + "TypeName": "String", + "TypeString": "\"string\"", + "c": { + "ValueType": "char*", + "ParamType": "const char*", + "IsArray": true + }, + "cpp": { + "ValueType": "std::string", + "ParamType": "std::string_view", + "TYPE_NAME": "STRING", + "INCLUDES": "#include \n#include \n#include ", + "SmallRetType": "std::string_view", + "SmallElemType": "char" + }, + "java": { + "ValueType": "String", + "EmptyValue": "\"\"", + "FunctionTypeSuffix": "", + "FromStorageBegin": "(String) " + }, + "jni": { + "jtype": "jstring", + "jtypestr": "Ljava/lang/String;", + "JavaObject": true, + "FromJavaBegin": "JStringRef{env, ", + "FromJavaEnd": "}", + "ToJavaBegin": "MakeJString(env, ", + "ToJavaEnd": ")", + "ToJavaArray": "MakeJStringArray" + } + }, + { + "TypeName": "Raw", + "c": { + "ValueType": "uint8_t*", + "ParamType": "const uint8_t*", + "IsArray": true + }, + "cpp": { + "ValueType": "std::vector", + "ParamType": "std::span", + "DefaultValueCopy": "defaultValue.begin(), defaultValue.end()", + "TYPE_NAME": "RAW", + "INCLUDES": "#include ", + "SmallRetType": "std::span", + "SmallElemType": "uint8_t" + }, + "java": { + "ValueType": "byte[]", + "EmptyValue": "new byte[] {}", + "FunctionTypeSuffix": "", + "FromStorageBegin": "(byte[]) " + }, + "jni": { + "jtype": "jbyteArray", + "jtypestr": "[B", + "JavaObject": true, + "FromJavaBegin": "CriticalJByteArrayRef{env, ", + "FromJavaEnd": "}.uarray()", + "ToJavaBegin": "MakeJByteArray(env, ", + "ToJavaEnd": ")", + "ToJavaArray": "MakeJObjectArray" + } + }, + { + "TypeName": "BooleanArray", + "TypeString": "\"boolean[]\"", + "c": { + "ValueType": "NT_Bool*", + "ParamType": "const NT_Bool*", + "IsArray": true + }, + "cpp": { + "ValueType": "std::vector", + "ParamType": "std::span", + "DefaultValueCopy": "defaultValue.begin(), defaultValue.end()", + "TYPE_NAME": "BOOLEAN_ARRAY", + "INCLUDES": "#include ", + "SmallRetType": "std::span", + "SmallElemType": "int" + }, + "java": { + "ValueType": "boolean[]", + "WrapValueType": "Boolean[]", + "EmptyValue": "new boolean[] {}", + "FunctionTypeSuffix": "", + "FromStorageBegin": "(boolean[]) " + }, + "jni": { + "jtype": "jbooleanArray", + "jtypestr": "[Z", + "JavaObject": true, + "FromJavaBegin": "FromJavaBooleanArray(env, ", + "FromJavaEnd": ")", + "ToJavaBegin": "MakeJBooleanArray(env, ", + "ToJavaEnd": ")", + "ToJavaArray": "MakeJObjectArray" + } + }, + { + "TypeName": "IntegerArray", + "TypeString": "\"int[]\"", + "c": { + "ValueType": "int64_t*", + "ParamType": "const int64_t*", + "IsArray": true + }, + "cpp": { + "ValueType": "std::vector", + "ParamType": "std::span", + "DefaultValueCopy": "defaultValue.begin(), defaultValue.end()", + "TYPE_NAME": "INTEGER_ARRAY", + "INCLUDES": "#include ", + "SmallRetType": "std::span", + "SmallElemType": "int64_t" + }, + "java": { + "ValueType": "long[]", + "WrapValueType": "Long[]", + "EmptyValue": "new long[] {}", + "FunctionTypeSuffix": "", + "FromStorageBegin": "(long[]) " + }, + "jni": { + "jtype": "jlongArray", + "jtypestr": "[J", + "JavaObject": true, + "FromJavaBegin": "CriticalJLongArrayRef{env, ", + "FromJavaEnd": "}", + "ToJavaBegin": "MakeJLongArray(env, ", + "ToJavaEnd": ")", + "ToJavaArray": "MakeJObjectArray" + } + }, + { + "TypeName": "FloatArray", + "TypeString": "\"float[]\"", + "c": { + "ValueType": "float*", + "ParamType": "const float*", + "IsArray": true + }, + "cpp": { + "ValueType": "std::vector", + "ParamType": "std::span", + "DefaultValueCopy": "defaultValue.begin(), defaultValue.end()", + "TYPE_NAME": "FLOAT_ARRAY", + "INCLUDES": "#include ", + "SmallRetType": "std::span", + "SmallElemType": "float" + }, + "java": { + "ValueType": "float[]", + "WrapValueType": "Float[]", + "EmptyValue": "new float[] {}", + "FunctionTypeSuffix": "", + "FromStorageBegin": "(float[]) " + }, + "jni": { + "jtype": "jfloatArray", + "jtypestr": "[F", + "JavaObject": true, + "FromJavaBegin": "CriticalJFloatArrayRef{env, ", + "FromJavaEnd": "}", + "ToJavaBegin": "MakeJFloatArray(env, ", + "ToJavaEnd": ")", + "ToJavaArray": "MakeJObjectArray" + } + }, + { + "TypeName": "DoubleArray", + "TypeString": "\"double[]\"", + "c": { + "ValueType": "double*", + "ParamType": "const double*", + "IsArray": true + }, + "cpp": { + "ValueType": "std::vector", + "ParamType": "std::span", + "DefaultValueCopy": "defaultValue.begin(), defaultValue.end()", + "TYPE_NAME": "DOUBLE_ARRAY", + "INCLUDES": "#include ", + "SmallRetType": "std::span", + "SmallElemType": "double" + }, + "java": { + "ValueType": "double[]", + "WrapValueType": "Double[]", + "EmptyValue": "new double[] {}", + "FunctionTypeSuffix": "", + "FromStorageBegin": "(double[]) " + }, + "jni": { + "jtype": "jdoubleArray", + "jtypestr": "[D", + "JavaObject": true, + "FromJavaBegin": "CriticalJDoubleArrayRef{env, ", + "FromJavaEnd": "}", + "ToJavaBegin": "MakeJDoubleArray(env, ", + "ToJavaEnd": ")", + "ToJavaArray": "MakeJObjectArray" + } + }, + { + "TypeName": "StringArray", + "TypeString": "\"string[]\"", + "c": { + "ValueType": "struct NT_String*", + "ParamType": "const struct NT_String*", + "IsArray": true + }, + "cpp": { + "ValueType": "std::vector", + "ParamType": "std::span", + "DefaultValueCopy": "defaultValue.begin(), defaultValue.end()", + "TYPE_NAME": "STRING_ARRAY", + "INCLUDES": "#include " + }, + "java": { + "ValueType": "String[]", + "EmptyValue": "new String[] {}", + "FunctionTypeSuffix": "", + "FromStorageBegin": "(String[]) " + }, + "jni": { + "jtype": "jobjectArray", + "jtypestr": "[Ljava/lang/Object;", + "JavaObject": true, + "FromJavaBegin": "FromJavaStringArray(env, ", + "FromJavaEnd": ")", + "ToJavaBegin": "MakeJStringArray(env, ", + "ToJavaEnd": ")", + "ToJavaArray": "MakeJObjectArray" + } + } ] diff --git a/shared/java/javastyle.gradle b/shared/java/javastyle.gradle index 6259c2a483..77272525e7 100644 --- a/shared/java/javastyle.gradle +++ b/shared/java/javastyle.gradle @@ -41,6 +41,14 @@ if (!project.hasProperty('skipJavaFormat')) { trimTrailingWhitespace() endWithNewline() } + json { + target fileTree('.') { + include '**/*.json' + exclude '**/build/**', '**/build-*/**' + } + gson() + .indentWithSpaces(2) + } format 'xml', { target fileTree('.') { include '**/*.xml' diff --git a/wpilibNewCommands/WPILibNewCommands.json b/wpilibNewCommands/WPILibNewCommands.json index da4bc52954..bd535bfadb 100644 --- a/wpilibNewCommands/WPILibNewCommands.json +++ b/wpilibNewCommands/WPILibNewCommands.json @@ -1,37 +1,37 @@ -{ - "fileName": "WPILibNewCommands.json", - "name": "WPILib-New-Commands", - "version": "1.0.0", - "uuid": "111e20f7-815e-48f8-9dd6-e675ce75b266", - "mavenUrls": [], - "jsonUrl": "", - "javaDependencies": [ - { - "groupId": "edu.wpi.first.wpilibNewCommands", - "artifactId": "wpilibNewCommands-java", - "version": "wpilib" - } - ], - "jniDependencies": [], - "cppDependencies": [ - { - "groupId": "edu.wpi.first.wpilibNewCommands", - "artifactId": "wpilibNewCommands-cpp", - "version": "wpilib", - "libName": "wpilibNewCommands", - "headerClassifier": "headers", - "sourcesClassifier": "sources", - "sharedLibrary": true, - "skipInvalidPlatforms": true, - "binaryPlatforms": [ - "linuxathena", - "linuxarm32", - "linuxarm64", - "windowsx86-64", - "windowsx86", - "linuxx86-64", - "osxuniversal" - ] - } - ] -} +{ + "fileName": "WPILibNewCommands.json", + "name": "WPILib-New-Commands", + "version": "1.0.0", + "uuid": "111e20f7-815e-48f8-9dd6-e675ce75b266", + "mavenUrls": [], + "jsonUrl": "", + "javaDependencies": [ + { + "groupId": "edu.wpi.first.wpilibNewCommands", + "artifactId": "wpilibNewCommands-java", + "version": "wpilib" + } + ], + "jniDependencies": [], + "cppDependencies": [ + { + "groupId": "edu.wpi.first.wpilibNewCommands", + "artifactId": "wpilibNewCommands-cpp", + "version": "wpilib", + "libName": "wpilibNewCommands", + "headerClassifier": "headers", + "sourcesClassifier": "sources", + "sharedLibrary": true, + "skipInvalidPlatforms": true, + "binaryPlatforms": [ + "linuxathena", + "linuxarm32", + "linuxarm64", + "windowsx86-64", + "windowsx86", + "linuxx86-64", + "osxuniversal" + ] + } + ] +} diff --git a/wpilibcExamples/src/main/cpp/examples/examples.json b/wpilibcExamples/src/main/cpp/examples/examples.json index eb2d25d041..c286b71cee 100644 --- a/wpilibcExamples/src/main/cpp/examples/examples.json +++ b/wpilibcExamples/src/main/cpp/examples/examples.json @@ -39,11 +39,13 @@ "commandversion": 2 }, { - "name":"Mechanism2d", - "foldername":"Mechanism2d", - "gradlebase":"cpp", - "description":"An example usage of Mechanism2d to display mechanism states on a dashboard.", - "tags":["Mechanism2d"], + "name": "Mechanism2d", + "foldername": "Mechanism2d", + "gradlebase": "cpp", + "description": "An example usage of Mechanism2d to display mechanism states on a dashboard.", + "tags": [ + "Mechanism2d" + ], "commandversion": 2 }, { @@ -290,7 +292,6 @@ "gradlebase": "cpp", "commandversion": 2 }, - { "name": "Axis Camera Sample", "description": "An example program that acquires images from an Axis network camera and adds some annotation to the image as you might do for showing operators the result of some image recognition, and sends it to the dashboard for display. This demonstrates the use of the AxisCamera class.", diff --git a/wpilibcExamples/src/main/cpp/templates/templates.json b/wpilibcExamples/src/main/cpp/templates/templates.json index 67e443822f..eb10b343d1 100644 --- a/wpilibcExamples/src/main/cpp/templates/templates.json +++ b/wpilibcExamples/src/main/cpp/templates/templates.json @@ -13,7 +13,8 @@ "name": "Command Robot Skeleton (Advanced)", "description": "Skeleton (stub) code for Command Robot", "tags": [ - "Command", "Skeleton" + "Command", + "Skeleton" ], "foldername": "commandbasedskeleton", "gradlebase": "cpp", @@ -33,7 +34,8 @@ "name": "Timed Skeleton (Advanced)", "description": "Skeleton (stub) code for TimedRobot", "tags": [ - "Timed", "Skeleton" + "Timed", + "Skeleton" ], "foldername": "timedskeleton", "gradlebase": "cpp", @@ -43,7 +45,8 @@ "name": "RobotBase Skeleton (Advanced)", "description": "Skeleton (stub) code for RobotBase", "tags": [ - "RobotBase", "Skeleton" + "RobotBase", + "Skeleton" ], "foldername": "robotbaseskeleton", "gradlebase": "cpp", @@ -53,7 +56,8 @@ "name": "Romi - Command Robot", "description": "Romi - Command style", "tags": [ - "Command", "Romi" + "Command", + "Romi" ], "foldername": "commandbased", "gradlebase": "cppromi", @@ -63,7 +67,8 @@ "name": "Romi - Timed Robot", "description": "Romi - Timed style", "tags": [ - "Timed", "Romi" + "Timed", + "Romi" ], "foldername": "timed", "gradlebase": "cppromi", diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/examples.json b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/examples.json index 69a81c1e73..69eaf9b735 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/examples.json +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/examples.json @@ -225,9 +225,12 @@ "mainclass": "Main", "commandversion": 2 }, - {"name": "Mechanism2d", + { + "name": "Mechanism2d", "description": "An example usage of Mechanism2d to display mechanism states on a dashboard.", - "tags": ["Mechanism2d"], + "tags": [ + "Mechanism2d" + ], "foldername": "mechanism2d", "gradlebase": "java", "mainclass": "Main", diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/templates.json b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/templates.json index 68e3bfb681..ad03724c7a 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/templates.json +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/templates/templates.json @@ -14,7 +14,8 @@ "name": "Command Robot Skeleton (Advanced)", "description": "Skeleton (stub) code for Command Robot", "tags": [ - "Command", "Skeleton" + "Command", + "Skeleton" ], "foldername": "commandbasedskeleton", "gradlebase": "java",