Browse Source

sns: revert "Power factor fixes" (#2304)

This reverts commit d57eb0721b.

We can use raw value as-is. While the lack of unit is true for the value represented as cos θ , we don't specifically have any other sensors using it as such. As comment suggest (huh), we want to express the thing as a percentage.
mcspr-patch-1
Max Prokhorov 4 years ago
committed by GitHub
parent
commit
2dcb5ea748
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
  1. +2
    -1
      code/espurna/sensors/BaseSensor.h
  2. +3
    -4
      code/espurna/sensors/PZEM004TV30Sensor.h

+ 2
- 1
code/espurna/sensors/BaseSensor.h View File

@ -95,7 +95,8 @@ class BaseSensor {
switch (type(index)) { switch (type(index)) {
case MAGNITUDE_TEMPERATURE: case MAGNITUDE_TEMPERATURE:
return sensor::Unit::Celcius; return sensor::Unit::Celcius;
case MAGNITUDE_HUMIDITY:
case MAGNITUDE_HUMIDITY:
case MAGNITUDE_POWER_FACTOR:
return sensor::Unit::Percentage; return sensor::Unit::Percentage;
case MAGNITUDE_PRESSURE: case MAGNITUDE_PRESSURE:
return sensor::Unit::Hectopascal; return sensor::Unit::Hectopascal;


+ 3
- 4
code/espurna/sensors/PZEM004TV30Sensor.h View File

@ -362,8 +362,8 @@ class PZEM004TV30Sensor : public BaseEmonSensor {
if (std::distance(it, end) >= 2) { if (std::distance(it, end) >= 2) {
value = (static_cast<uint32_t>(*(it)) << 8) value = (static_cast<uint32_t>(*(it)) << 8)
| static_cast<uint32_t>(*(it + 1)); | static_cast<uint32_t>(*(it + 1));
it += 2;
} }
it += 2;
return value; return value;
}; };
@ -375,8 +375,8 @@ class PZEM004TV30Sensor : public BaseEmonSensor {
| (static_cast<uint32_t>(*(it + 3)) << 16)) | (static_cast<uint32_t>(*(it + 3)) << 16))
| ((static_cast<uint32_t>(*it) << 8) | ((static_cast<uint32_t>(*it) << 8)
| static_cast<uint32_t>(*(it + 1)))); | static_cast<uint32_t>(*(it + 1))));
it += 4;
} }
it += 4;
return value; return value;
}; };
@ -400,9 +400,8 @@ class PZEM004TV30Sensor : public BaseEmonSensor {
_frequency = take_2(); _frequency = take_2();
_frequency /= 10.0; _frequency /= 10.0;
// - Power Factor: 2 bytes in 0.1% (we return %)
// - Power Factor: 2 bytes in 0.01 (we return %)
_power_factor = take_2(); _power_factor = take_2();
_power_factor /= 100.0;
// - Alarms: 2 bytes, (NOT IMPLEMENTED) // - Alarms: 2 bytes, (NOT IMPLEMENTED)
// XXX: it seems it can only be either 0xffff or 0 for ON and OFF respectively // XXX: it seems it can only be either 0xffff or 0 for ON and OFF respectively


Loading…
Cancel
Save