Skip to content

Commit 90f7e32

Browse files
authored
Merge pull request #48 from robotpy/fix-set-feedback-device
Fix various bindings issues
2 parents abbe08a + 46f866f commit 90f7e32

File tree

7 files changed

+56
-6
lines changed

7 files changed

+56
-6
lines changed

gen/CANAnalog.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
3+
classes:
4+
CANAnalog:
5+
enums:
6+
AnalogMode:
7+
methods:
8+
GetVoltage:
9+
GetPosition:
10+
GetVelocity:
11+
SetPositionConversionFactor:
12+
GetPositionConversionFactor:
13+
SetVelocityConversionFactor:
14+
GetVelocityConversionFactor:
15+
SetAverageDepth:
16+
SetMeasurementPeriod:
17+
GetAverageDepth:
18+
GetMeasurementPeriod:
19+
SetInverted:
20+
GetInverted:

gen/CANEncoder.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
3+
classes:
4+
CANEncoder:
5+
enums:
6+
EncoderType:
7+
AlternateEncoderType:
8+
methods:
9+
GetPosition:
10+
GetVelocity:
11+
SetPosition:
12+
SetPositionConversionFactor:
13+
SetVelocityConversionFactor:
14+
GetPositionConversionFactor:
15+
GetVelocityConversionFactor:
16+
SetAverageDepth:
17+
SetMeasurementPeriod:
18+
GetAverageDepth:
19+
GetMeasurementPeriod:
20+
GetCountsPerRevolution:
21+
SetInverted:
22+
GetInverted:

gen/CANSparkMax.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,12 @@ classes:
4343
- [0, 1]
4444
CANAnalog::AnalogMode:
4545
ignore: true
46+
GetAbsoluteEncoder:
47+
keepalive:
48+
- [0, 1]
4649
GetPIDController:
50+
keepalive:
51+
- [0, 1]
4752
GetForwardLimitSwitch:
4853
overloads:
4954
SparkMaxLimitSwitch::Type:

gen/RelativeEncoder.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
classes:
44
RelativeEncoder:
5-
ignored_bases:
6-
- CANEncoder
75
methods:
86
GetPosition:
97
GetVelocity:

gen/SparkMaxAnalogSensor.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
classes:
44
SparkMaxAnalogSensor:
5-
ignored_bases:
6-
- CANAnalog
75
enums:
86
Mode:
97
methods:

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ generation_data = "gen"
5858
# rev
5959
AbsoluteEncoder = "rev/AbsoluteEncoder.h"
6060
AnalogInput = "rev/AnalogInput.h"
61-
# CANAnalog = "rev/CANAnalog.h"
61+
CANAnalog = "rev/CANAnalog.h"
6262
# CANDeviceScanner = "rev/CANDeviceScanner.h"
6363
# CANDigitalInput = "rev/CANDigitalInput.h"
64-
# CANEncoder = "rev/CANEncoder.h"
64+
CANEncoder = "rev/CANEncoder.h"
6565
# CANPIDController = "rev/CANPIDController.h"
6666
CANSensor = "rev/CANSensor.h"
6767
CANSparkMax = "rev/CANSparkMax.h"

tests/test_canspark.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ def test_rev():
55
pass
66

77

8+
def test_canspark_setfeedbackdevice():
9+
s = rev.CANSparkMax(1, rev.CANSparkMaxLowLevel.MotorType.kBrushless)
10+
e = s.getEncoder()
11+
p = s.getPIDController()
12+
p.setFeedbackDevice(e)
13+
14+
815
# def test_init(rev):
916
# rev.CANSparkMax(0, rev.MotorType.kBrushless)
1017

0 commit comments

Comments
 (0)