Skip to content

Commit e11f707

Browse files
committed
Update wpilib for 2027
1 parent c1ee7a5 commit e11f707

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+60
-1596
lines changed

subprojects/robotpy-wpilib/meson.build

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@ wpilib_interfaces_sources += files(
2828
'wpilib/interfaces/interfaces.cpp',
2929
)
3030

31-
wpilib_shuffleboard_sources += files(
32-
'wpilib/shuffleboard/shuffleboard.cpp',
33-
'wpilib/shuffleboard/ShuffleboardData.cpp',
34-
)
35-
3631
wpilib_simulation_sources += files(
3732
'wpilib/simulation/simulation.cpp',
3833
)

subprojects/robotpy-wpilib/pyproject.toml

Lines changed: 5 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ update_init = [
5454
"wpilib.drive",
5555
"wpilib.event",
5656
"wpilib.interfaces",
57-
"wpilib.shuffleboard",
5857
"wpilib.simulation",
5958
"wpilib.sysid wpilib._wpilib.sysid",
6059
]
@@ -64,27 +63,18 @@ scan_headers_ignore = [
6463
# needs a python wrapper
6564
"frc/AsynchronousInterrupt.h",
6665

67-
# Needs HAL object support, not sure if this is a good idea for python
68-
"frc/DMA.h",
69-
"frc/DMASample.h",
70-
7166
"frc/Filesystem.h",
7267
"frc/Notifier.h", # wrapped separately
7368
"frc/Resource.h",
7469
"frc/ScopedTracer.h", # not useful for python
7570

7671
"frc/motorcontrol/MotorControllerGroup.h", # wrapped separately
7772

78-
# Not possible
79-
"frc/shuffleboard/RecordingController.h",
80-
"frc/shuffleboard/SendableCameraWrapper.h",
81-
8273
"frc/smartdashboard/ListenerExecutor.h", # internal detail
8374

8475
# Internals
8576
"rpy/ControlWord.h",
8677
"rpy/SmartDashboardData.h",
87-
"ShuffleboardData.h",
8878
]
8979

9080
[tool.semiwrap.extension_modules."wpilib._wpilib"]
@@ -102,34 +92,21 @@ DYNAMIC_CAMERA_SERVER = 1
10292

10393
[tool.semiwrap.extension_modules."wpilib._wpilib".headers]
10494
# frc
105-
ADIS16448_IMU = "frc/ADIS16448_IMU.h"
106-
ADIS16470_IMU = "frc/ADIS16470_IMU.h"
10795
ADXL345_I2C = "frc/ADXL345_I2C.h"
108-
ADXL345_SPI = "frc/ADXL345_SPI.h"
109-
ADXL362 = "frc/ADXL362.h"
110-
ADXRS450_Gyro = "frc/ADXRS450_Gyro.h"
11196
AddressableLED = "frc/AddressableLED.h"
11297
Alert = "frc/Alert.h"
11398
AnalogAccelerometer = "frc/AnalogAccelerometer.h"
11499
AnalogEncoder = "frc/AnalogEncoder.h"
115100
AnalogGyro = "frc/AnalogGyro.h"
116101
AnalogInput = "frc/AnalogInput.h"
117-
AnalogOutput = "frc/AnalogOutput.h"
118102
AnalogPotentiometer = "frc/AnalogPotentiometer.h"
119-
AnalogTrigger = "frc/AnalogTrigger.h"
120-
AnalogTriggerOutput = "frc/AnalogTriggerOutput.h"
121-
AnalogTriggerType = "frc/AnalogTriggerType.h"
122-
BuiltInAccelerometer = "frc/BuiltInAccelerometer.h"
123103
CAN = "frc/CAN.h"
124104
Compressor = "frc/Compressor.h"
125105
CompressorConfigType = "frc/CompressorConfigType.h"
126-
Counter = "frc/Counter.h"
127106
DataLogManager = "frc/DataLogManager.h"
128107
DSControlWord = "frc/DSControlWord.h"
129-
DigitalGlitchFilter = "frc/DigitalGlitchFilter.h"
130108
DigitalInput = "frc/DigitalInput.h"
131109
DigitalOutput = "frc/DigitalOutput.h"
132-
DigitalSource = "frc/DigitalSource.h"
133110
DoubleSolenoid = "frc/DoubleSolenoid.h"
134111
DriverStation = "frc/DriverStation.h"
135112
DutyCycle = "frc/DutyCycle.h"
@@ -152,39 +129,33 @@ PneumaticsControlModule = "frc/PneumaticsControlModule.h"
152129
PneumaticsModuleType = "frc/PneumaticsModuleType.h"
153130
PowerDistribution = "frc/PowerDistribution.h"
154131
Preferences = "frc/Preferences.h"
155-
Relay = "frc/Relay.h"
156132
RobotBase = "frc/RobotBase.h"
157133
RobotController = "frc/RobotController.h"
158134
RobotState = "frc/RobotState.h"
159135
RuntimeType = "frc/RuntimeType.h"
160-
SPI = "frc/SPI.h"
161136
SensorUtil = "frc/SensorUtil.h"
162137
SerialPort = "frc/SerialPort.h"
163138
Servo = "frc/Servo.h"
164139
SharpIR = "frc/SharpIR.h"
165140
Solenoid = "frc/Solenoid.h"
166141
StadiaController = "frc/StadiaController.h"
167-
SynchronousInterrupt = "frc/SynchronousInterrupt.h"
142+
SystemServer = "frc/SystemServer.h"
168143
Threads = "frc/Threads.h"
169144
TimedRobot = "frc/TimedRobot.h"
170145
Timer = "frc/Timer.h"
171146
TimesliceRobot = "frc/TimesliceRobot.h"
172147
Tracer = "frc/Tracer.h"
173-
Ultrasonic = "frc/Ultrasonic.h"
174148
Watchdog = "frc/Watchdog.h"
175149
XboxController = "frc/XboxController.h"
176150

177151
# frc/internal
178152
DriverStationModeThread = "frc/internal/DriverStationModeThread.h"
179153

180-
# frc/livewindow
181-
LiveWindow = "frc/livewindow/LiveWindow.h"
182-
183154
# frc/motorcontrol
184155
DMC60 = "frc/motorcontrol/DMC60.h"
185156
Jaguar = "frc/motorcontrol/Jaguar.h"
157+
Koors40 = "frc/motorcontrol/Koors40.h"
186158
MotorControllerGroup = "rpy/MotorControllerGroup.h"
187-
NidecBrushless = "frc/motorcontrol/NidecBrushless.h"
188159
PWMMotorController = "frc/motorcontrol/PWMMotorController.h"
189160
PWMSparkFlex = "frc/motorcontrol/PWMSparkFlex.h"
190161
PWMSparkMax = "frc/motorcontrol/PWMSparkMax.h"
@@ -194,6 +165,7 @@ PWMVenom = "frc/motorcontrol/PWMVenom.h"
194165
PWMVictorSPX = "frc/motorcontrol/PWMVictorSPX.h"
195166
SD540 = "frc/motorcontrol/SD540.h"
196167
Spark = "frc/motorcontrol/Spark.h"
168+
SparkMini = "frc/motorcontrol/SparkMini.h"
197169
Talon = "frc/motorcontrol/Talon.h"
198170
Victor = "frc/motorcontrol/Victor.h"
199171
VictorSP = "frc/motorcontrol/VictorSP.h"
@@ -227,7 +199,6 @@ yaml_path = "semiwrap/counter"
227199
[tool.semiwrap.extension_modules."wpilib.counter._counter".headers]
228200
# frc/counter
229201
EdgeConfiguration = "frc/counter/EdgeConfiguration.h"
230-
ExternalDirectionCounter = "frc/counter/ExternalDirectionCounter.h"
231202
Tachometer = "frc/counter/Tachometer.h"
232203
UpDownCounter = "frc/counter/UpDownCounter.h"
233204

@@ -272,41 +243,6 @@ GenericHID = "frc/GenericHID.h"
272243
MotorController = "frc/motorcontrol/MotorController.h"
273244

274245

275-
[tool.semiwrap.extension_modules."wpilib.shuffleboard._shuffleboard"]
276-
name = "wpilib_shuffleboard"
277-
wraps = ["robotpy-native-wpilib"]
278-
depends = ["wpilib", "wpilib_interfaces"]
279-
yaml_path = "semiwrap/shuffleboard"
280-
281-
[tool.semiwrap.extension_modules."wpilib.shuffleboard._shuffleboard".defines]
282-
DYNAMIC_CAMERA_SERVER = 1
283-
284-
285-
[tool.semiwrap.extension_modules."wpilib.shuffleboard._shuffleboard".headers]
286-
# frc/shuffleboard
287-
288-
BuiltInLayouts = "frc/shuffleboard/BuiltInLayouts.h"
289-
BuiltInWidgets = "frc/shuffleboard/BuiltInWidgets.h"
290-
ComplexWidget = "frc/shuffleboard/ComplexWidget.h"
291-
LayoutType = "frc/shuffleboard/LayoutType.h"
292-
# RecordingController = "frc/shuffleboard/RecordingController.h"
293-
# SendableCameraWrapper = "frc/shuffleboard/SendableCameraWrapper.h"
294-
Shuffleboard = "frc/shuffleboard/Shuffleboard.h"
295-
ShuffleboardComponent = "frc/shuffleboard/ShuffleboardComponent.h"
296-
ShuffleboardComponentBase = "frc/shuffleboard/ShuffleboardComponentBase.h"
297-
ShuffleboardContainer = "frc/shuffleboard/ShuffleboardContainer.h"
298-
ShuffleboardEventImportance = "frc/shuffleboard/ShuffleboardEventImportance.h"
299-
ShuffleboardInstance = "frc/shuffleboard/ShuffleboardInstance.h"
300-
ShuffleboardLayout = "frc/shuffleboard/ShuffleboardLayout.h"
301-
ShuffleboardRoot = "frc/shuffleboard/ShuffleboardRoot.h"
302-
ShuffleboardTab = "frc/shuffleboard/ShuffleboardTab.h"
303-
ShuffleboardValue = "frc/shuffleboard/ShuffleboardValue.h"
304-
ShuffleboardWidget = "frc/shuffleboard/ShuffleboardWidget.h"
305-
SimpleWidget = "frc/shuffleboard/SimpleWidget.h"
306-
SuppliedValueWidget = "frc/shuffleboard/SuppliedValueWidget.h"
307-
WidgetType = "frc/shuffleboard/WidgetType.h"
308-
309-
310246
[tool.semiwrap.extension_modules."wpilib.simulation._simulation"]
311247
name = "wpilib_simulation"
312248
wraps = ["robotpy-native-wpilib"]
@@ -315,19 +251,11 @@ yaml_path = "semiwrap/simulation"
315251

316252
[tool.semiwrap.extension_modules."wpilib.simulation._simulation".headers]
317253
# frc/simulation
318-
ADIS16448_IMUSim = "frc/simulation/ADIS16448_IMUSim.h"
319-
ADIS16470_IMUSim = "frc/simulation/ADIS16470_IMUSim.h"
320254
ADXL345Sim = "frc/simulation/ADXL345Sim.h"
321-
ADXL362Sim = "frc/simulation/ADXL362Sim.h"
322-
ADXRS450_GyroSim = "frc/simulation/ADXRS450_GyroSim.h"
323255
AddressableLEDSim = "frc/simulation/AddressableLEDSim.h"
324256
AnalogEncoderSim = "frc/simulation/AnalogEncoderSim.h"
325-
AnalogGyroSim = "frc/simulation/AnalogGyroSim.h"
326257
AnalogInputSim = "frc/simulation/AnalogInputSim.h"
327-
AnalogOutputSim = "frc/simulation/AnalogOutputSim.h"
328-
AnalogTriggerSim = "frc/simulation/AnalogTriggerSim.h"
329258
BatterySim = "frc/simulation/BatterySim.h"
330-
BuiltInAccelerometerSim = "frc/simulation/BuiltInAccelerometerSim.h"
331259
CTREPCMSim = "frc/simulation/CTREPCMSim.h"
332260
CallbackStore = "frc/simulation/CallbackStore.h"
333261
DCMotorSim = "frc/simulation/DCMotorSim.h"
@@ -349,16 +277,15 @@ PS5ControllerSim = "frc/simulation/PS5ControllerSim.h"
349277
PWMSim = "frc/simulation/PWMSim.h"
350278
PneumaticsBaseSim = "frc/simulation/PneumaticsBaseSim.h"
351279
PowerDistributionSim = "frc/simulation/PowerDistributionSim.h"
280+
PWMMotorControllerSim = "frc/simulation/PWMMotorControllerSim.h"
352281
REVPHSim = "frc/simulation/REVPHSim.h"
353-
RelaySim = "frc/simulation/RelaySim.h"
354282
RoboRioSim = "frc/simulation/RoboRioSim.h"
355-
SPIAccelerometerSim = "frc/simulation/SPIAccelerometerSim.h"
356283
SendableChooserSim = "frc/simulation/SendableChooserSim.h"
284+
ServoSim = "frc/simulation/ServoSim.h"
357285
SharpIRSim = "frc/simulation/SharpIRSim.h"
358286
SimDeviceSim = "frc/simulation/SimDeviceSim.h"
359287
SimHooks = "frc/simulation/SimHooks.h"
360288
SingleJointedArmSim = "frc/simulation/SingleJointedArmSim.h"
361289
SolenoidSim = "frc/simulation/SolenoidSim.h"
362290
StadiaControllerSim = "frc/simulation/StadiaControllerSim.h"
363-
UltrasonicSim = "frc/simulation/UltrasonicSim.h"
364291
XboxControllerSim = "frc/simulation/XboxControllerSim.h"

subprojects/robotpy-wpilib/semiwrap/ADIS16448_IMU.yml

Lines changed: 0 additions & 45 deletions
This file was deleted.

subprojects/robotpy-wpilib/semiwrap/ADIS16470_IMU.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

subprojects/robotpy-wpilib/semiwrap/ADXL345_SPI.yml

Lines changed: 0 additions & 40 deletions
This file was deleted.

subprojects/robotpy-wpilib/semiwrap/ADXL362.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)