Skip to content

Commit 1c97465

Browse files
committed
refactor: optimize data type
1 parent 4ea615d commit 1c97465

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

src/BslibEnergyMeter.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ float voltage;
3030
* @param _inPinCurrentRef pin analógico Vref del sensor
3131
* @param _factorCurrent factor de sensiblidad del sensor
3232
*/
33-
void BslibEnergyMeter::SetSensorCurrent(int _inPinCurrent, int _inPinCurrentRef, float _factorCurrent) {
33+
void BslibEnergyMeter::SetSensorCurrent(unsigned int _inPinCurrent, unsigned int _inPinCurrentRef, float _factorCurrent) {
3434
inPinCurrent = _inPinCurrent;
3535
inPinCurrentRef = _inPinCurrentRef;
3636
factorCurrent = _factorCurrent;
@@ -43,7 +43,7 @@ void BslibEnergyMeter::SetSensorCurrent(int _inPinCurrent, int _inPinCurrentRef,
4343
* @param _factorVoltage factor de sensiblidad del sensor
4444
* @param _offsetVoltage compensacion para obtener voltaje real
4545
*/
46-
void BslibEnergyMeter::SetSensorVoltage(int _inPinVoltage, float _factorVoltage, float _offsetVoltage = 0) {
46+
void BslibEnergyMeter::SetSensorVoltage(unsigned int _inPinVoltage, float _factorVoltage, float _offsetVoltage = 0) {
4747
inPinVoltage = _inPinVoltage;
4848
factorVoltage = _factorVoltage;
4949
offsetVoltage = _offsetVoltage;
@@ -55,7 +55,7 @@ void BslibEnergyMeter::SetSensorVoltage(int _inPinVoltage, float _factorVoltage,
5555
* @param _inPinVoltage pin analógico de sensor de voltaje
5656
* @param _factorVoltage factor de sensiblidad del sensor
5757
*/
58-
void BslibEnergyMeter::SetSensorVoltage(int _inPinVoltage, float _factorVoltage) {
58+
void BslibEnergyMeter::SetSensorVoltage(unsigned int _inPinVoltage, float _factorVoltage) {
5959
inPinVoltage = _inPinVoltage;
6060
factorVoltage = _factorVoltage;
6161
}
@@ -78,7 +78,7 @@ void BslibEnergyMeter::SetAnalogReference(float _analogReference) {
7878
analogReference = _analogReference;
7979
}
8080

81-
void BslibEnergyMeter::SetFilterSamples(int _numberOfSamples) {
81+
void BslibEnergyMeter::SetFilterSamples(unsigned int _numberOfSamples) {
8282
numberOfSamples = _numberOfSamples;
8383
}
8484

@@ -88,7 +88,7 @@ void BslibEnergyMeter::SetFilterSamples(int _numberOfSamples) {
8888
* @param pinADC pin analógico al cual leer
8989
* @return int
9090
*/
91-
int BslibEnergyMeter::FilterValueADC(int pinADC) {
91+
int BslibEnergyMeter::FilterValueADC(unsigned int pinADC) {
9292
unsigned long valueADC = 0;
9393
int filteredValueADC = 0;
9494
for (int i = 0; i < numberOfSamples; i++) {

src/BslibEnergyMeter.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323

2424
class BslibEnergyMeter {
2525
public:
26-
void SetSensorCurrent(int _inPinCurrent, int _inPinCurrentRef, float _factorCurrent);
27-
void SetSensorVoltage(int _inPinVoltage, float _factorVoltage, float _offsetVoltage);
28-
void SetSensorVoltage(int _inPinVoltage, float _factorVoltage);
26+
void SetSensorCurrent(unsigned int _inPinCurrent, unsigned int _inPinCurrentRef, float _factorCurrent);
27+
void SetSensorVoltage(unsigned int _inPinVoltage, float _factorVoltage, float _offsetVoltage);
28+
void SetSensorVoltage(unsigned int _inPinVoltage, float _factorVoltage);
2929

3030
void SetCurrentReference(int _currentReference);
3131
void SetAnalogReference(float _analogReference);
32-
void SetFilterSamples(int _numberOfSamples);
32+
void SetFilterSamples(unsigned int _numberOfSamples);
3333

34-
int FilterValueADC(int pinADC);
34+
int FilterValueADC(unsigned int pinADC);
3535
float SoftwareDAC(int digitalValue);
3636

3737
int AutoCalibrationCurrent(int lastVRef);
@@ -54,11 +54,11 @@ class BslibEnergyMeter {
5454
float ReadVcc();
5555

5656
private:
57-
int inPinCurrent;
58-
int inPinCurrentRef;
59-
int inPinVoltage;
57+
unsigned int inPinCurrent;
58+
unsigned int inPinCurrentRef;
59+
unsigned int inPinVoltage;
6060

61-
int numberOfSamples;
61+
unsigned int numberOfSamples;
6262
float analogReference;
6363
float factorCurrent;
6464
float factorVoltage;

0 commit comments

Comments
 (0)