Skip to content

Commit

Permalink
Merge pull request #258 from AllenNeuralDynamics:bruno-f-cruz/issue256
Browse files Browse the repository at this point in the history
Fix typo
  • Loading branch information
bruno-f-cruz authored Jun 21, 2024
2 parents 4a23bdf + 0f18a0c commit da2da12
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions src/DataSchemas/aind_behavior_vr_foraging/rig.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@


class Treadmill(rig.Treadmill):
break_lookup_calibration: List[ValuePair] = Field(
brake_lookup_calibration: List[ValuePair] = Field(
default=[[0, 0], [1, 65535]],
validate_default=True,
min_length=2,
description="Break lookup calibration. Each Tuple is (0-1 (percent), 0-full-scale). \
description="Brake lookup calibration. Each Tuple is (0-1 (percent), 0-full-scale). \
Values are linearly interpolated",
)

Expand Down
8 changes: 4 additions & 4 deletions src/DataSchemas/aind_vr_foraging_rig.json
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@
"wheel_diameter": 15.0,
"pulses_per_revolution": 28800,
"invert_direction": false,
"break_lookup_calibration": [
"brake_lookup_calibration": [
[
0.0,
0.0
Expand Down Expand Up @@ -996,7 +996,7 @@
"title": "Invert Direction",
"type": "boolean"
},
"break_lookup_calibration": {
"brake_lookup_calibration": {
"default": [
[
0,
Expand All @@ -1007,7 +1007,7 @@
65535
]
],
"description": "Break lookup calibration. Each Tuple is (0-1 (percent), 0-full-scale). Values are linearly interpolated",
"description": "Brake lookup calibration. Each Tuple is (0-1 (percent), 0-full-scale). Values are linearly interpolated",
"items": {
"description": "A tuple of two values",
"items": {
Expand All @@ -1018,7 +1018,7 @@
"type": "array"
},
"minItems": 2,
"title": "Break Lookup Calibration",
"title": "Brake Lookup Calibration",
"type": "array"
}
},
Expand Down
18 changes: 9 additions & 9 deletions src/Extensions/AindVrForagingRig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2657,7 +2657,7 @@ public partial class Treadmill

private bool _invertDirection = false;

private System.Collections.Generic.List<System.Collections.Generic.List<double>> _breakLookupCalibration = new System.Collections.Generic.List<System.Collections.Generic.List<double>>();
private System.Collections.Generic.List<System.Collections.Generic.List<double>> _brakeLookupCalibration = new System.Collections.Generic.List<System.Collections.Generic.List<double>>();

public Treadmill()
{
Expand All @@ -2668,7 +2668,7 @@ protected Treadmill(Treadmill other)
_wheelDiameter = other._wheelDiameter;
_pulsesPerRevolution = other._pulsesPerRevolution;
_invertDirection = other._invertDirection;
_breakLookupCalibration = other._breakLookupCalibration;
_brakeLookupCalibration = other._brakeLookupCalibration;
}

/// <summary>
Expand Down Expand Up @@ -2723,21 +2723,21 @@ public bool InvertDirection
}

/// <summary>
/// Break lookup calibration. Each Tuple is (0-1 (percent), 0-full-scale). Values are linearly interpolated
/// Brake lookup calibration. Each Tuple is (0-1 (percent), 0-full-scale). Values are linearly interpolated
/// </summary>
[System.Xml.Serialization.XmlIgnoreAttribute()]
[Newtonsoft.Json.JsonPropertyAttribute("break_lookup_calibration")]
[System.ComponentModel.DescriptionAttribute("Break lookup calibration. Each Tuple is (0-1 (percent), 0-full-scale). " +
[Newtonsoft.Json.JsonPropertyAttribute("brake_lookup_calibration")]
[System.ComponentModel.DescriptionAttribute("Brake lookup calibration. Each Tuple is (0-1 (percent), 0-full-scale). " +
" Values are linearly interpolated")]
public System.Collections.Generic.List<System.Collections.Generic.List<double>> BreakLookupCalibration
public System.Collections.Generic.List<System.Collections.Generic.List<double>> BrakeLookupCalibration
{
get
{
return _breakLookupCalibration;
return _brakeLookupCalibration;
}
set
{
_breakLookupCalibration = value;
_brakeLookupCalibration = value;
}
}

Expand All @@ -2756,7 +2756,7 @@ protected virtual bool PrintMembers(System.Text.StringBuilder stringBuilder)
stringBuilder.Append("wheel_diameter = " + _wheelDiameter + ", ");
stringBuilder.Append("pulses_per_revolution = " + _pulsesPerRevolution + ", ");
stringBuilder.Append("invert_direction = " + _invertDirection + ", ");
stringBuilder.Append("break_lookup_calibration = " + _breakLookupCalibration);
stringBuilder.Append("brake_lookup_calibration = " + _brakeLookupCalibration);
return true;
}

Expand Down
2 changes: 1 addition & 1 deletion src/vr-foraging.bonsai
Original file line number Diff line number Diff line change
Expand Up @@ -7289,7 +7289,7 @@ Value as IsStopped)</scr:Expression>
<Selector>HarpTreadmill.Calibration</Selector>
</Expression>
<Expression xsi:type="MemberSelector">
<Selector>BreakLookupCalibration</Selector>
<Selector>BrakeLookupCalibration</Selector>
</Expression>
<Expression xsi:type="Index">
<Operand xsi:type="IntProperty">
Expand Down

0 comments on commit da2da12

Please sign in to comment.