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

Merge branch 'main' into 2027

Browse Source
This commit is contained in:
Peter Johnson
2025-01-16 23:17:59 -08:00
parent 1cad4f64a4 a9f3fc6b2c
commit d9f8fded09
92 changed files with 2748 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hal/src/generate/ResourceType.txt
View File

@@ -122,6 +122,6 @@ kResourceType_ChoreoTrigger = 120
kResourceType_PathWeaverTrajectory = 121
kResourceType_Koors40 = 122
kResourceType_ThriftyNova = 123
kResourceType_PWFSEN36005 = 124
kResourceType_LaserShark = 125
kResourceType_RevServoHub = 126
kResourceType_RevServoHub = 124
kResourceType_PWFSEN36005 = 125
kResourceType_LaserShark = 126

12
hal/src/generated/main/java/edu/wpi/first/hal/FRCNetComm.java generated
View File

@@ -267,12 +267,12 @@ public final class FRCNetComm {
public static final int kResourceType_Koors40 = 122;
/** kResourceType_ThriftyNova = 123. */
public static final int kResourceType_ThriftyNova = 123;
/** kResourceType_PWFSEN36005 = 124. */
public static final int kResourceType_PWFSEN36005 = 124;
/** kResourceType_LaserShark = 125. */
public static final int kResourceType_LaserShark = 125;
/** kResourceType_RevServoHub = 126. */
public static final int kResourceType_RevServoHub = 126;
/** kResourceType_RevServoHub = 124. */
public static final int kResourceType_RevServoHub = 124;
/** kResourceType_PWFSEN36005 = 125. */
public static final int kResourceType_PWFSEN36005 = 125;
/** kResourceType_LaserShark = 126. */
public static final int kResourceType_LaserShark = 126;
}
/**

6
hal/src/generated/main/native/include/hal/FRCUsageReporting.h generated
View File

@@ -175,9 +175,9 @@ namespace HALUsageReporting {
kResourceType_PathWeaverTrajectory = 121,
kResourceType_Koors40 = 122,
kResourceType_ThriftyNova = 123,
kResourceType_PWFSEN36005 = 124,
kResourceType_LaserShark = 125,
kResourceType_RevServoHub = 126,
kResourceType_RevServoHub = 124,
kResourceType_PWFSEN36005 = 125,
kResourceType_LaserShark = 126,
};
enum tInstances : int32_t {
kLanguage_LabVIEW = 1,

6
hal/src/generated/main/native/include/hal/UsageReporting.h generated
View File

@@ -144,9 +144,9 @@ typedef enum
kResourceType_PathWeaverTrajectory = 121,
kResourceType_Koors40 = 122,
kResourceType_ThriftyNova = 123,
kResourceType_PWFSEN36005 = 124,
kResourceType_LaserShark = 125,
kResourceType_RevServoHub = 126,
kResourceType_RevServoHub = 124,
kResourceType_PWFSEN36005 = 125,
kResourceType_LaserShark = 126,
// kResourceType_MaximumID = 255,
} tResourceType;

5
hal/src/main/java/edu/wpi/first/hal/AddressableLEDJNI.java
View File

@@ -53,7 +53,8 @@ public class AddressableLEDJNI extends JNIWrapper {
/**
* Sets the bit timing.
*
* <p>By default, the driver is set up to drive WS2812Bs, so nothing needs to be set for those.
* <p>By default, the driver is set up to drive WS2812B and WS2815, so nothing needs to be set for
* those.
*
* @param handle the Addressable LED handle
* @param highTime0NanoSeconds high time for 0 bit (default 400ns)
@@ -72,7 +73,7 @@ public class AddressableLEDJNI extends JNIWrapper {
/**
* Sets the sync time.
*
* <p>The sync time is the time to hold output so LEDs enable. Default set for WS2812B.
* <p>The sync time is the time to hold output so LEDs enable. Default set for WS2812B and WS2815.
*
* @param handle the Addressable LED handle
* @param syncTimeMicroSeconds the sync time (default 280us)

6
hal/src/main/native/include/hal/AddressableLED.h
View File

@@ -77,8 +77,8 @@ void HAL_WriteAddressableLEDData(HAL_AddressableLEDHandle handle,
/**
* Sets the bit timing.
*
* <p>By default, the driver is set up to drive WS2812Bs, so nothing needs to
* be set for those.
* <p>By default, the driver is set up to drive WS2812B and WS2815, so nothing
* needs to be set for those.
*
* @param[in] handle the Addressable LED handle
* @param[in] highTime0NanoSeconds high time for 0 bit (default 400ns)
@@ -98,7 +98,7 @@ void HAL_SetAddressableLEDBitTiming(HAL_AddressableLEDHandle handle,
* Sets the sync time.
*
* <p>The sync time is the time to hold output so LEDs enable. Default set for
* WS2812B.
* WS2812B and WS2815.
*
* @param[in] handle the Addressable LED handle
* @param[in] syncTimeMicroSeconds the sync time (default 280us)