Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-26 01:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 2027

Browse Source
This commit is contained in:
Peter Johnson
2025-08-03 11:51:25 -07:00
parent 23f5725853 2d11946d98
commit ed7982563b
50 changed files with 1390 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hal/src/main/native/include/hal/simulation/SimCallbackRegistry.h
View File

@@ -102,7 +102,7 @@ class SimCallbackRegistry : public impl::SimCallbackRegistryBase {
*/
#define HAL_SIMCALLBACKREGISTRY_DEFINE_NAME(NAME) \
static LLVM_ATTRIBUTE_ALWAYS_INLINE constexpr const char* \
Get##NAME##Name() { \
Get##NAME##Name() { \
return #NAME; \
}

2
hal/src/main/native/include/hal/simulation/SimDataValue.h
View File

@@ -127,7 +127,7 @@ class SimDataValue final : public impl::SimDataValueBase<T, MakeValue> {
*/
#define HAL_SIMDATAVALUE_DEFINE_NAME(NAME) \
static LLVM_ATTRIBUTE_ALWAYS_INLINE constexpr const char* \
Get##NAME##Name() { \
Get##NAME##Name() { \
return #NAME; \
}

5
hal/src/main/native/systemcore/CTREPCM.cpp
View File

@@ -409,8 +409,9 @@ void HAL_SetCTREPCMOneShotDuration(HAL_CTREPCMHandle handle, int32_t index,
message.dataSize = 8;
std::scoped_lock lock{pcm->lock};
pcm->oneShot.sol10MsPerUnit[index] = (std::min)(
static_cast<uint32_t>(durMs) / 10, static_cast<uint32_t>(0xFF));
pcm->oneShot.sol10MsPerUnit[index] =
(std::min)(static_cast<uint32_t>(durMs) / 10,
static_cast<uint32_t>(0xFF));
std::memcpy(message.data, pcm->oneShot.sol10MsPerUnit, 8);
HAL_WriteCANPacketRepeating(pcm->canHandle, Control3, &message, SendPeriod,
status);