Skip to content

Commit a650afc

Browse files
committed
Renamed AnalogValue properties
1 parent 2d42359 commit a650afc

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

Raspberry.IO.Components/Controllers/Pca9685/Pca9685Connection.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ public void SetPwmUpdateRate(int frequencyHz)
5757
preScale -= 1.0m;
5858

5959
log.Trace(m => m("Setting PWM frequency to {0} Hz", frequencyHz));
60-
log.Trace(m => m("Estimated pre-scale: {0}", preScale));
60+
log.Trace(m => m("Estimated pre-maximum: {0}", preScale));
6161

6262
var prescale = Math.Floor(preScale + 0.5m);
6363

64-
log.Trace(m => m("Final pre-scale: {0}", prescale));
64+
log.Trace(m => m("Final pre-maximum: {0}", prescale));
6565

6666
var oldmode = ReadRegister(Register.MODE1);
6767
var newmode = (byte) ((oldmode & 0x7F) | 0x10); // sleep

Raspberry.IO.Components/Converters/Mcp4822/Mcp4822AnalogPinExtensionMethods.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public static class Mcp4822AnalogPinExtensionMethods
99
/// </summary>
1010
/// <param name="connection">The connection.</param>
1111
/// <param name="channel">The channel.</param>
12-
/// <param name="scale">The scale.</param>
12+
/// <param name="scale">The maximum.</param>
1313
/// <returns>The pin.</returns>
1414
public static Mcp4822OutputAnalogPin Out(this Mcp4822SpiConnection connection, Mcp4822Channel channel)
1515
{

Raspberry.IO/AnalogValue.cs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ namespace Raspberry.IO
55
/// </summary>
66
public class AnalogValue
77
{
8-
private decimal discrete;
9-
private decimal scale;
8+
private decimal value;
9+
private decimal maximum;
1010

1111
/// <summary>
1212
/// Initializes a new instance of the <see cref="AnalogValue"/> class.
1313
/// </summary>
14-
/// <param name="scale">The scale.</param>
15-
/// <param name="discrete">The value.</param>
16-
public AnalogValue(decimal discrete, decimal scale = 1)
14+
/// <param name="maximum">The maximum.</param>
15+
/// <param name="value">The value.</param>
16+
public AnalogValue(decimal value, decimal maximum = 1)
1717
{
18-
this.scale = scale;
19-
this.discrete = discrete;
18+
this.maximum = maximum;
19+
this.value = value;
2020
}
2121

2222
/// <summary>
@@ -25,22 +25,22 @@ public AnalogValue(decimal discrete, decimal scale = 1)
2525
/// <value>
2626
/// The discrete value.
2727
/// </value>
28-
public decimal Discrete
28+
public decimal Value
2929
{
30-
get { return discrete; }
31-
set { discrete = value; }
30+
get { return value; }
31+
set { this.value = value; }
3232
}
3333

3434
/// <summary>
35-
/// Gets or sets the scale.
35+
/// Gets or sets the maximum.
3636
/// </summary>
3737
/// <value>
38-
/// The scale.
38+
/// The maximum.
3939
/// </value>
40-
public decimal Scale
40+
public decimal Maximum
4141
{
42-
get { return scale; }
43-
set { scale = value; }
42+
get { return maximum; }
43+
set { maximum = value; }
4444
}
4545

4646
/// <summary>
@@ -51,7 +51,7 @@ public decimal Scale
5151
/// </value>
5252
public decimal Relative
5353
{
54-
get { return (1.0m*discrete)/scale; }
54+
get { return value / maximum; }
5555
}
5656
}
5757
}

0 commit comments

Comments
 (0)