Skip to content

Commit 13d283e

Browse files
committed
Merge branch 'main' into 2027
2 parents 93e73ea + 80bffec commit 13d283e

37 files changed

+62
-1005
lines changed

.readthedocs.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ build:
99
python: "3.11"
1010
jobs:
1111
post_install:
12-
- python -m robotpy_sphinx.download_and_install robotpy mostrobotpy main dist pypi-other-X64-3.11
13-
- python -m robotpy_sphinx.download_and_install robotpy mostrobotpy main dist pypi-Linux-X64-3.11
12+
- python -m robotpy_sphinx.download_and_install robotpy mostrobotpy main dist pypi-meson-Linux-X64-3.11
1413
post_build:
1514
- mkdir --parents _readthedocs/htmlzip
1615
- cp --recursive _readthedocs/html _readthedocs/$READTHEDOCS_PROJECT

README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,15 @@ Next install dependencies using pip:
3131
pip install -r rdev_requirements.txt
3232
pip install numpy
3333

34-
Then run this command to build all the wheels.
34+
Then run these commands to build all the wheels for the current operating system.
3535

36-
./rdev.sh ci run
36+
./rdev.sh ci build-other-wheels
37+
./rdev.sh ci build-meson-wheels
3738

3839
All the resulting wheels are in `dist`, which can be installed using `pip`.
3940

41+
To build wheels for the robot platform, you need to use a crossenv docker image.
42+
See `.github/workflows/dist.yml` for details.
4043

4144
Development environment
4245
-----------------------

subprojects/robotpy-hal/pyproject.toml

Lines changed: 7 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -40,31 +40,12 @@ packages = ["hal"]
4040

4141
[tool.semiwrap]
4242
update_init = []
43+
44+
# NOTE: By default we ignore all HAL APIs, as most of them are exposed in WPILib
45+
# somewhere. If you find something that you need, file a bug and we can add it!
46+
4347
scan_headers_ignore = [
44-
"wpi/hal/Errors.h",
45-
"wpi/hal/HAL.h",
46-
"wpi/hal/IMU.h",
47-
"wpi/hal/IMUTypes.h",
48-
"wpi/hal/SystemServer.h",
49-
"wpi/hal/Types.h",
50-
"wpi/hal/Value.h",
51-
52-
"wpi/hal/cpp/fpga_clock.h",
53-
54-
"wpi/hal/handles/DigitalHandleResource.h",
55-
"wpi/hal/handles/IndexedClassedHandleResource.h",
56-
"wpi/hal/handles/IndexedHandleResource.h",
57-
"wpi/hal/handles/LimitedClassedHandleResource.h",
58-
"wpi/hal/handles/LimitedHandleResource.h",
59-
"wpi/hal/handles/UnlimitedHandleResource.h",
60-
61-
"wpi/hal/proto/*",
62-
63-
"wpi/hal/simulation/CanData.h",
64-
"wpi/hal/simulation/I2CData.h",
65-
"wpi/hal/simulation/NotifyListener.h",
66-
"wpi/hal/simulation/SimCallbackRegistry.h",
67-
"wpi/hal/simulation/SimDataValue.h",
48+
"wpi/hal/*",
6849

6950
# TODO: might want this in the future
7051
"mrc/*",
@@ -81,55 +62,19 @@ depends = ["wpiutil", "ntcore"]
8162

8263
[tool.semiwrap.extension_modules."hal._wpiHal".headers]
8364
# hal
84-
AddressableLED = "wpi/hal/AddressableLED.h"
85-
AddressableLEDTypes = "wpi/hal/AddressableLEDTypes.h"
86-
AnalogInput = "wpi/hal/AnalogInput.h"
87-
CAN = "wpi/hal/CAN.h"
88-
CANAPI = "wpi/hal/CANAPI.h"
8965
CANAPITypes = "wpi/hal/CANAPITypes.h"
90-
CTREPCM = "wpi/hal/CTREPCM.h"
91-
Constants = "wpi/hal/Constants.h"
92-
Counter = "wpi/hal/Counter.h"
93-
DIO = "wpi/hal/DIO.h"
94-
# DMA = "hal/DMA.h"
9566
DriverStation = "wpi/hal/DriverStation.h"
9667
DriverStationTypes = "wpi/hal/DriverStationTypes.h"
97-
DutyCycle = "wpi/hal/DutyCycle.h"
98-
Encoder = "wpi/hal/Encoder.h"
99-
# Errors = "wpi/hal/Errors.h"
10068
Extensions = "wpi/hal/Extensions.h"
101-
# HAL = "wpi/hal/HAL.h"
10269
HALBase = "wpi/hal/HALBase.h"
103-
I2C = "wpi/hal/I2C.h"
104-
I2CTypes = "wpi/hal/I2CTypes.h"
105-
# IMU = "wpi/hal/IMU.h"
106-
# IMUTypes = "wpi/hal/IMUTypes.h"
10770
Main = "wpi/hal/Main.h"
10871
Notifier = "wpi/hal/Notifier.h"
109-
PWM = "wpi/hal/PWM.h"
110-
Ports = "wpi/hal/Ports.h"
111-
Power = "wpi/hal/Power.h"
112-
PowerDistribution = "wpi/hal/PowerDistribution.h"
113-
REVPH = "wpi/hal/REVPH.h"
114-
SerialPort = "wpi/hal/SerialPort.h"
11572
SimDevice = "wpi/hal/SimDevice.h"
116-
UsageReporting = "wpi/hal/UsageReporting.h"
11773
Threads = "wpi/hal/Threads.h"
118-
# Types = "wpi/hal/Types.h"
119-
# Value = "wpi/hal/Value.h"
74+
UsageReporting = "wpi/hal/UsageReporting.h"
12075

12176
# hal/cpp
122-
# fpga_clock = "wpi/hal/cpp/fpga_clock.h"
123-
124-
# hal/handles
125-
# DigitalHandleResource = "wpi/hal/handles/DigitalHandleResource.h"
126-
HandlesInternal = "wpi/hal/handles/HandlesInternal.h"
127-
# IndexedClassedHandleResource = "wpi/hal/handles/IndexedClassedHandleResource.h"
128-
# IndexedHandleResource = "wpi/hal/handles/IndexedHandleResource.h"
129-
# LimitedClassedHandleResource = "wpi/hal/handles/LimitedClassedHandleResource.h"
130-
# LimitedHandleResource = "wpi/hal/handles/LimitedHandleResource.h"
131-
# UnlimitedHandleResource = "wpi/hal/handles/UnlimitedHandleResource.h"
132-
77+
SerialHelper = { header="wpi/hal/cpp/SerialHelper.h", enable_if="platform_machine == 'roborio'" }
13378

13479
[tool.semiwrap.extension_modules."hal.simulation._simulation"]
13580
name = "hal_simulation"
@@ -138,24 +83,8 @@ depends = ["wpiutil", "ntcore"]
13883
yaml_path = "semiwrap/simulation"
13984

14085
[tool.semiwrap.extension_modules."hal.simulation._simulation".headers]
141-
AddressableLEDData = "wpi/hal/simulation/AddressableLEDData.h"
142-
AnalogInData = "wpi/hal/simulation/AnalogInData.h"
143-
CTREPCMData = "wpi/hal/simulation/CTREPCMData.h"
144-
# CanData = "wpi/hal/simulation/CanData.h"
145-
DIOData = "wpi/hal/simulation/DIOData.h"
146-
DigitalPWMData = "wpi/hal/simulation/DigitalPWMData.h"
14786
DriverStationData = "wpi/hal/simulation/DriverStationData.h"
148-
DutyCycleData = "wpi/hal/simulation/DutyCycleData.h"
149-
EncoderData = "wpi/hal/simulation/EncoderData.h"
150-
# I2CData = "wpi/hal/simulation/I2CData.h"
15187
MockHooks = "wpi/hal/simulation/MockHooks.h"
15288
NotifierData = "wpi/hal/simulation/NotifierData.h"
153-
# NotifyListener = "wpi/hal/simulation/NotifyListener.h"
154-
PWMData = "wpi/hal/simulation/PWMData.h"
155-
PowerDistributionData = "wpi/hal/simulation/PowerDistributionData.h"
156-
REVPHData = "wpi/hal/simulation/REVPHData.h"
15789
Reset = "wpi/hal/simulation/Reset.h"
158-
RoboRioData = "wpi/hal/simulation/RoboRioData.h"
159-
# SimCallbackRegistry = "wpi/hal/simulation/SimCallbackRegistry.h"
160-
# SimDataValue = "wpi/hal/simulation/SimDataValue.h"
16190
SimDeviceData = "wpi/hal/simulation/SimDeviceData.h"

subprojects/robotpy-hal/semiwrap/AddressableLED.yml

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

subprojects/robotpy-hal/semiwrap/AddressableLEDTypes.yml

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

subprojects/robotpy-hal/semiwrap/AnalogInput.yml

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

subprojects/robotpy-hal/semiwrap/CAN.yml

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

subprojects/robotpy-hal/semiwrap/CANAPI.yml

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

subprojects/robotpy-hal/semiwrap/CTREPCM.yml

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

subprojects/robotpy-hal/semiwrap/Constants.yml

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

0 commit comments

Comments
 (0)