Skip to content

Commit 910d02a

Browse files
committed
Update wpilib for 2027
1 parent 2796536 commit 910d02a

File tree

77 files changed

+96
-1628
lines changed

Some content is hidden

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

77 files changed

+96
-1628
lines changed

subprojects/robotpy-wpilib/meson.build

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,6 @@ wpilib_event_sources += files(
2424
'wpilib/event/event.cpp',
2525
)
2626

27-
wpilib_interfaces_sources += files(
28-
'wpilib/interfaces/interfaces.cpp',
29-
)
30-
31-
wpilib_shuffleboard_sources += files(
32-
'wpilib/shuffleboard/shuffleboard.cpp',
33-
'wpilib/shuffleboard/ShuffleboardData.cpp',
34-
)
35-
3627
wpilib_simulation_sources += files(
3728
'wpilib/simulation/simulation.cpp',
3829
)

subprojects/robotpy-wpilib/pyproject.toml

Lines changed: 12 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ update_init = [
5353
"wpilib.counter",
5454
"wpilib.drive",
5555
"wpilib.event",
56-
"wpilib.interfaces",
57-
"wpilib.shuffleboard",
56+
"wpilib.interfaces wpilib._wpilib.interfaces",
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"]
@@ -93,7 +83,7 @@ wraps = ["robotpy-native-wpilib"]
9383
depends = [
9484
"wpihal", "wpiutil", "ntcore",
9585
"wpimath", "wpimath_geometry", "wpimath_controls",
96-
"wpilib_interfaces", "wpilib_event"
86+
"wpilib_event"
9787
]
9888
includes = ["wpilib/src"]
9989

@@ -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"
@@ -143,6 +120,7 @@ Joystick = "frc/Joystick.h"
143120
LEDPattern = "frc/LEDPattern.h"
144121
MotorSafety = "frc/MotorSafety.h"
145122
Notifier = "rpy/Notifier.h"
123+
OnboardIMU = "frc/OnboardIMU.h"
146124
PS4Controller = "frc/PS4Controller.h"
147125
PS5Controller = "frc/PS5Controller.h"
148126
PWM = "frc/PWM.h"
@@ -152,40 +130,38 @@ PneumaticsControlModule = "frc/PneumaticsControlModule.h"
152130
PneumaticsModuleType = "frc/PneumaticsModuleType.h"
153131
PowerDistribution = "frc/PowerDistribution.h"
154132
Preferences = "frc/Preferences.h"
155-
Relay = "frc/Relay.h"
156133
RobotBase = "frc/RobotBase.h"
157134
RobotController = "frc/RobotController.h"
158135
RobotState = "frc/RobotState.h"
159136
RuntimeType = "frc/RuntimeType.h"
160-
SPI = "frc/SPI.h"
161137
SensorUtil = "frc/SensorUtil.h"
162138
SerialPort = "frc/SerialPort.h"
163139
Servo = "frc/Servo.h"
164140
SharpIR = "frc/SharpIR.h"
165141
Solenoid = "frc/Solenoid.h"
166142
StadiaController = "frc/StadiaController.h"
167-
SynchronousInterrupt = "frc/SynchronousInterrupt.h"
143+
SystemServer = "frc/SystemServer.h"
168144
Threads = "frc/Threads.h"
169145
TimedRobot = "frc/TimedRobot.h"
170146
Timer = "frc/Timer.h"
171147
TimesliceRobot = "frc/TimesliceRobot.h"
172148
Tracer = "frc/Tracer.h"
173-
Ultrasonic = "frc/Ultrasonic.h"
174149
Watchdog = "frc/Watchdog.h"
175150
XboxController = "frc/XboxController.h"
176151

152+
# frc (interfaces)
153+
CounterBase = "frc/CounterBase.h"
154+
GenericHID = "frc/GenericHID.h"
155+
MotorController = "frc/motorcontrol/MotorController.h"
156+
177157
# frc/internal
178158
DriverStationModeThread = "frc/internal/DriverStationModeThread.h"
179159

180-
# frc/livewindow
181-
LiveWindow = "frc/livewindow/LiveWindow.h"
182-
183160
# frc/motorcontrol
184161
DMC60 = "frc/motorcontrol/DMC60.h"
185162
Jaguar = "frc/motorcontrol/Jaguar.h"
186163
Koors40 = "frc/motorcontrol/Koors40.h"
187164
MotorControllerGroup = "rpy/MotorControllerGroup.h"
188-
NidecBrushless = "frc/motorcontrol/NidecBrushless.h"
189165
PWMMotorController = "frc/motorcontrol/PWMMotorController.h"
190166
PWMSparkFlex = "frc/motorcontrol/PWMSparkFlex.h"
191167
PWMSparkMax = "frc/motorcontrol/PWMSparkMax.h"
@@ -195,6 +171,7 @@ PWMVenom = "frc/motorcontrol/PWMVenom.h"
195171
PWMVictorSPX = "frc/motorcontrol/PWMVictorSPX.h"
196172
SD540 = "frc/motorcontrol/SD540.h"
197173
Spark = "frc/motorcontrol/Spark.h"
174+
SparkMini = "frc/motorcontrol/SparkMini.h"
198175
Talon = "frc/motorcontrol/Talon.h"
199176
Victor = "frc/motorcontrol/Victor.h"
200177
VictorSP = "frc/motorcontrol/VictorSP.h"
@@ -228,7 +205,6 @@ yaml_path = "semiwrap/counter"
228205
[tool.semiwrap.extension_modules."wpilib.counter._counter".headers]
229206
# frc/counter
230207
EdgeConfiguration = "frc/counter/EdgeConfiguration.h"
231-
ExternalDirectionCounter = "frc/counter/ExternalDirectionCounter.h"
232208
Tachometer = "frc/counter/Tachometer.h"
233209
UpDownCounter = "frc/counter/UpDownCounter.h"
234210

@@ -260,54 +236,6 @@ EventLoop = "frc/event/EventLoop.h"
260236
NetworkBooleanEvent = "frc/event/NetworkBooleanEvent.h"
261237

262238

263-
[tool.semiwrap.extension_modules."wpilib.interfaces._interfaces"]
264-
name = "wpilib_interfaces"
265-
wraps = ["robotpy-native-wpilib"]
266-
depends = ["wpilib_event", "wpimath_geometry"]
267-
yaml_path = "semiwrap/interfaces"
268-
269-
[tool.semiwrap.extension_modules."wpilib.interfaces._interfaces".headers]
270-
# frc
271-
CounterBase = "frc/CounterBase.h"
272-
GenericHID = "frc/GenericHID.h"
273-
MotorController = "frc/motorcontrol/MotorController.h"
274-
275-
276-
[tool.semiwrap.extension_modules."wpilib.shuffleboard._shuffleboard"]
277-
name = "wpilib_shuffleboard"
278-
wraps = ["robotpy-native-wpilib"]
279-
depends = ["wpilib", "wpilib_interfaces"]
280-
yaml_path = "semiwrap/shuffleboard"
281-
282-
[tool.semiwrap.extension_modules."wpilib.shuffleboard._shuffleboard".defines]
283-
DYNAMIC_CAMERA_SERVER = 1
284-
285-
286-
[tool.semiwrap.extension_modules."wpilib.shuffleboard._shuffleboard".headers]
287-
# frc/shuffleboard
288-
289-
BuiltInLayouts = "frc/shuffleboard/BuiltInLayouts.h"
290-
BuiltInWidgets = "frc/shuffleboard/BuiltInWidgets.h"
291-
ComplexWidget = "frc/shuffleboard/ComplexWidget.h"
292-
LayoutType = "frc/shuffleboard/LayoutType.h"
293-
# RecordingController = "frc/shuffleboard/RecordingController.h"
294-
# SendableCameraWrapper = "frc/shuffleboard/SendableCameraWrapper.h"
295-
Shuffleboard = "frc/shuffleboard/Shuffleboard.h"
296-
ShuffleboardComponent = "frc/shuffleboard/ShuffleboardComponent.h"
297-
ShuffleboardComponentBase = "frc/shuffleboard/ShuffleboardComponentBase.h"
298-
ShuffleboardContainer = "frc/shuffleboard/ShuffleboardContainer.h"
299-
ShuffleboardEventImportance = "frc/shuffleboard/ShuffleboardEventImportance.h"
300-
ShuffleboardInstance = "frc/shuffleboard/ShuffleboardInstance.h"
301-
ShuffleboardLayout = "frc/shuffleboard/ShuffleboardLayout.h"
302-
ShuffleboardRoot = "frc/shuffleboard/ShuffleboardRoot.h"
303-
ShuffleboardTab = "frc/shuffleboard/ShuffleboardTab.h"
304-
ShuffleboardValue = "frc/shuffleboard/ShuffleboardValue.h"
305-
ShuffleboardWidget = "frc/shuffleboard/ShuffleboardWidget.h"
306-
SimpleWidget = "frc/shuffleboard/SimpleWidget.h"
307-
SuppliedValueWidget = "frc/shuffleboard/SuppliedValueWidget.h"
308-
WidgetType = "frc/shuffleboard/WidgetType.h"
309-
310-
311239
[tool.semiwrap.extension_modules."wpilib.simulation._simulation"]
312240
name = "wpilib_simulation"
313241
wraps = ["robotpy-native-wpilib"]
@@ -316,19 +244,11 @@ yaml_path = "semiwrap/simulation"
316244

317245
[tool.semiwrap.extension_modules."wpilib.simulation._simulation".headers]
318246
# frc/simulation
319-
ADIS16448_IMUSim = "frc/simulation/ADIS16448_IMUSim.h"
320-
ADIS16470_IMUSim = "frc/simulation/ADIS16470_IMUSim.h"
321247
ADXL345Sim = "frc/simulation/ADXL345Sim.h"
322-
ADXL362Sim = "frc/simulation/ADXL362Sim.h"
323-
ADXRS450_GyroSim = "frc/simulation/ADXRS450_GyroSim.h"
324248
AddressableLEDSim = "frc/simulation/AddressableLEDSim.h"
325249
AnalogEncoderSim = "frc/simulation/AnalogEncoderSim.h"
326-
AnalogGyroSim = "frc/simulation/AnalogGyroSim.h"
327250
AnalogInputSim = "frc/simulation/AnalogInputSim.h"
328-
AnalogOutputSim = "frc/simulation/AnalogOutputSim.h"
329-
AnalogTriggerSim = "frc/simulation/AnalogTriggerSim.h"
330251
BatterySim = "frc/simulation/BatterySim.h"
331-
BuiltInAccelerometerSim = "frc/simulation/BuiltInAccelerometerSim.h"
332252
CTREPCMSim = "frc/simulation/CTREPCMSim.h"
333253
CallbackStore = "frc/simulation/CallbackStore.h"
334254
DCMotorSim = "frc/simulation/DCMotorSim.h"
@@ -350,16 +270,15 @@ PS5ControllerSim = "frc/simulation/PS5ControllerSim.h"
350270
PWMSim = "frc/simulation/PWMSim.h"
351271
PneumaticsBaseSim = "frc/simulation/PneumaticsBaseSim.h"
352272
PowerDistributionSim = "frc/simulation/PowerDistributionSim.h"
273+
PWMMotorControllerSim = "frc/simulation/PWMMotorControllerSim.h"
353274
REVPHSim = "frc/simulation/REVPHSim.h"
354-
RelaySim = "frc/simulation/RelaySim.h"
355275
RoboRioSim = "frc/simulation/RoboRioSim.h"
356-
SPIAccelerometerSim = "frc/simulation/SPIAccelerometerSim.h"
357276
SendableChooserSim = "frc/simulation/SendableChooserSim.h"
277+
ServoSim = "frc/simulation/ServoSim.h"
358278
SharpIRSim = "frc/simulation/SharpIRSim.h"
359279
SimDeviceSim = "frc/simulation/SimDeviceSim.h"
360280
SimHooks = "frc/simulation/SimHooks.h"
361281
SingleJointedArmSim = "frc/simulation/SingleJointedArmSim.h"
362282
SolenoidSim = "frc/simulation/SolenoidSim.h"
363283
StadiaControllerSim = "frc/simulation/StadiaControllerSim.h"
364-
UltrasonicSim = "frc/simulation/UltrasonicSim.h"
365284
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.

0 commit comments

Comments
 (0)