Skip to content

Commit 61cc603

Browse files
committed
Update hal for 2027
1 parent 6b99cb1 commit 61cc603

23 files changed

+31
-378
lines changed

subprojects/robotpy-hal/pyproject.toml

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ scan_headers_ignore = [
4343
"hal/DMA.h",
4444
"hal/Errors.h",
4545
"hal/HAL.h",
46+
"hal/SystemServer.h",
4647
"hal/UsageReporting.h",
4748
"hal/Types.h",
4849
"hal/Value.h",
@@ -58,6 +59,8 @@ scan_headers_ignore = [
5859
"hal/handles/LimitedHandleResource.h",
5960
"hal/handles/UnlimitedHandleResource.h",
6061

62+
"hal/proto/*",
63+
6164
"hal/roborio/HMB.h",
6265
"hal/roborio/InterruptManager.h",
6366

@@ -75,23 +78,17 @@ scan_headers_ignore = [
7578
[tool.semiwrap.extension_modules."hal._wpiHal"]
7679
name = "wpihal"
7780
wraps = ["robotpy-native-wpihal"]
78-
depends = ["wpiutil"]
81+
depends = ["wpiutil", "ntcore"]
7982

8083
[tool.semiwrap.extension_modules."hal._wpiHal".headers]
8184
# hal
82-
Accelerometer = "hal/Accelerometer.h"
8385
AddressableLED = "hal/AddressableLED.h"
8486
AddressableLEDTypes = "hal/AddressableLEDTypes.h"
85-
AnalogAccumulator = "hal/AnalogAccumulator.h"
86-
AnalogGyro = "hal/AnalogGyro.h"
8787
AnalogInput = "hal/AnalogInput.h"
88-
AnalogOutput = "hal/AnalogOutput.h"
89-
AnalogTrigger = "hal/AnalogTrigger.h"
9088
CAN = "hal/CAN.h"
9189
CANAPI = "hal/CANAPI.h"
9290
CANAPITypes = "hal/CANAPITypes.h"
9391
CTREPCM = "hal/CTREPCM.h"
94-
# ChipObject = "hal/ChipObject.h"
9592
Constants = "hal/Constants.h"
9693
Counter = "hal/Counter.h"
9794
DIO = "hal/DIO.h"
@@ -102,32 +99,24 @@ DutyCycle = "hal/DutyCycle.h"
10299
Encoder = "hal/Encoder.h"
103100
# Errors = "hal/Errors.h"
104101
Extensions = "hal/Extensions.h"
105-
FRCUsageReporting = "hal/FRCUsageReporting.h"
106102
# HAL = "hal/HAL.h"
107103
HALBase = "hal/HALBase.h"
108104
I2C = "hal/I2C.h"
109105
I2CTypes = "hal/I2CTypes.h"
110-
Interrupts = "hal/Interrupts.h"
111-
LEDs = "hal/LEDs.h"
112106
Main = "hal/Main.h"
113107
Notifier = "hal/Notifier.h"
114108
PWM = "hal/PWM.h"
115109
Ports = "hal/Ports.h"
116110
Power = "hal/Power.h"
117111
PowerDistribution = "hal/PowerDistribution.h"
118112
REVPH = "hal/REVPH.h"
119-
Relay = "hal/Relay.h"
120-
SPI = "hal/SPI.h"
121-
SPITypes = "hal/SPITypes.h"
122113
SerialPort = "hal/SerialPort.h"
123114
SimDevice = "hal/SimDevice.h"
124115
Threads = "hal/Threads.h"
125116
# Types = "hal/Types.h"
126117
# Value = "hal/Value.h"
127118

128119
# hal/cpp
129-
SerialHelper = { header="hal/cpp/SerialHelper.h", enable_if="platform_machine == 'roborio'" }
130-
# UnsafeDIO = "hal/cpp/UnsafeDIO.h"
131120
# fpga_clock = "hal/cpp/fpga_clock.h"
132121

133122
# hal/handles
@@ -139,24 +128,16 @@ HandlesInternal = "hal/handles/HandlesInternal.h"
139128
# LimitedHandleResource = "hal/handles/LimitedHandleResource.h"
140129
# UnlimitedHandleResource = "hal/handles/UnlimitedHandleResource.h"
141130

142-
# hal/roborio
143-
# HMB = "hal/roborio/HMB.h"
144-
# InterruptManager = "hal/roborio/InterruptManager.h"
145-
146131

147132
[tool.semiwrap.extension_modules."hal.simulation._simulation"]
148133
name = "hal_simulation"
149134
wraps = ["robotpy-native-wpihal"]
150-
depends = ["wpiutil"]
135+
depends = ["wpiutil", "ntcore"]
151136
yaml_path = "semiwrap/simulation"
152137

153138
[tool.semiwrap.extension_modules."hal.simulation._simulation".headers]
154-
AccelerometerData = "hal/simulation/AccelerometerData.h"
155139
AddressableLEDData = "hal/simulation/AddressableLEDData.h"
156-
AnalogGyroData = "hal/simulation/AnalogGyroData.h"
157140
AnalogInData = "hal/simulation/AnalogInData.h"
158-
AnalogOutData = "hal/simulation/AnalogOutData.h"
159-
AnalogTriggerData = "hal/simulation/AnalogTriggerData.h"
160141
CTREPCMData = "hal/simulation/CTREPCMData.h"
161142
# CanData = "hal/simulation/CanData.h"
162143
DIOData = "hal/simulation/DIOData.h"
@@ -171,11 +152,8 @@ NotifierData = "hal/simulation/NotifierData.h"
171152
PWMData = "hal/simulation/PWMData.h"
172153
PowerDistributionData = "hal/simulation/PowerDistributionData.h"
173154
REVPHData = "hal/simulation/REVPHData.h"
174-
RelayData = "hal/simulation/RelayData.h"
175155
Reset = "hal/simulation/Reset.h"
176156
RoboRioData = "hal/simulation/RoboRioData.h"
177-
SPIAccelerometerData = "hal/simulation/SPIAccelerometerData.h"
178-
# SPIData = "hal/simulation/SPIData.h"
179157
# SimCallbackRegistry = "hal/simulation/SimCallbackRegistry.h"
180158
# SimDataValue = "hal/simulation/SimDataValue.h"
181159
SimDeviceData = "hal/simulation/SimDeviceData.h"

subprojects/robotpy-hal/semiwrap/Accelerometer.yml

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

subprojects/robotpy-hal/semiwrap/AnalogGyro.yml

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

subprojects/robotpy-hal/semiwrap/AnalogOutput.yml

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

subprojects/robotpy-hal/semiwrap/AnalogTrigger.yml

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

subprojects/robotpy-hal/semiwrap/CAN.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ strip_prefixes:
55

66
functions:
77
HAL_CAN_SendMessage:
8-
buffers:
9-
- { type: IN, src: data, len: dataSize }
108
HAL_CAN_ReceiveMessage:
11-
buffers:
12-
- { type: OUT, src: data, len: dataSize, minsz: 8 }
139
HAL_CAN_OpenStreamSession:
1410
HAL_CAN_CloseStreamSession:
1511
HAL_CAN_ReadStreamSession:
@@ -18,7 +14,6 @@ functions:
1814
classes:
1915
HAL_CANStreamMessage:
2016
attributes:
21-
messageID:
17+
messageId:
2218
timeStamp:
23-
data:
24-
dataSize:
19+
message:

subprojects/robotpy-hal/semiwrap/CANAPI.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,9 @@ functions:
88
HAL_InitializeCAN:
99
HAL_CleanCAN:
1010
HAL_WriteCANPacket:
11-
buffers:
12-
- { type: IN, src: data, len: length }
1311
HAL_WriteCANPacketRepeating:
14-
buffers:
15-
- { type: IN, src: data, len: length }
1612
HAL_WriteCANRTRFrame:
1713
HAL_StopCANPacketRepeating:
1814
HAL_ReadCANPacketNew:
19-
buffers:
20-
- { type: OUT, src: data, len: length, minsz: 8 }
2115
HAL_ReadCANPacketLatest:
22-
buffers:
23-
- { type: OUT, src: data, len: length, minsz: 8 }
2416
HAL_ReadCANPacketTimeout:
25-
buffers:
26-
- { type: OUT, src: data, len: length, minsz: 8 }

subprojects/robotpy-hal/semiwrap/CANAPITypes.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,14 @@ enums:
77
HAL_CANDeviceType:
88
value_prefix: HAL_CAN_Dev
99
HAL_CANManufacturer:
10-
value_prefix: HAL_CAN_Man
10+
value_prefix: HAL_CAN_Man
11+
classes:
12+
HAL_CANMessage:
13+
attributes:
14+
flags:
15+
dataSize:
16+
data:
17+
HAL_CANReceiveMessage:
18+
attributes:
19+
timeStamp:
20+
message:

subprojects/robotpy-hal/semiwrap/FRCUsageReporting.yml

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

subprojects/robotpy-hal/semiwrap/Interrupts.yml

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

0 commit comments

Comments
 (0)