Skip to content

fix: sendPowerSensorEvent sets factor even when specified. #424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## Version 3.5.1
Fixed:
- Fix: sendPowerSensorEvent sets factor even when specified.

## Version 3.5.0
New:
- Support Start/Stop and Open/Close capabilities.
Expand Down
2 changes: 1 addition & 1 deletion library.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
],
"homepage": "https://sinric.pro",
"version": "3.5.0",
"version": "3.5.1",
"frameworks": "arduino",
"platforms": ["espressif8266", "espressif32", "raspberrypi"],
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=SinricPro
version=3.5.0
version=3.5.1
author=Boris Jaeger <[email protected]>
maintainer=Boris Jaeger <[email protected]>
sentence=Library for https://sinric.pro - simple way to connect your device to alexa
Expand Down
2 changes: 1 addition & 1 deletion src/Capabilities/PowerSensor.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ bool PowerSensor<T>::sendPowerSensorEvent(float voltage, float current, float po
JsonObject event_value = eventMessage[FSTR_SINRICPRO_payload][FSTR_SINRICPRO_value];
if (power == -1)
power = voltage * current;
if (apparentPower != -1)
if (factor == -1 && apparentPower != -1)
factor = power / apparentPower;

unsigned long currentTimestamp = device->getTimestamp();
Expand Down
2 changes: 1 addition & 1 deletion src/SinricProVersion.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Version Configuration
#define SINRICPRO_VERSION_MAJOR 3
#define SINRICPRO_VERSION_MINOR 5
#define SINRICPRO_VERSION_REVISION 0
#define SINRICPRO_VERSION_REVISION 1
#define SINRICPRO_VERSION STR(SINRICPRO_VERSION_MAJOR) "." STR(SINRICPRO_VERSION_MINOR) "." STR(SINRICPRO_VERSION_REVISION)
#define SINRICPRO_VERSION_STR "SinricPro (v" SINRICPRO_VERSION ")"
#define SINRICPRO_VERISON_INT SINRICPRO_VERSION_MAJOR * 1000000 + SINRICPRO_VERSION_MINOR * 1000 + SINRICPRO_VERSION_REVISION