Skip to content
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

add outdoorTemperature to heatpump status reports #220

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,9 @@ void hpStatusChanged(heatpumpStatus currentStatus) {
const size_t bufferSizeInfo = JSON_OBJECT_SIZE(2);
DynamicJsonDocument rootInfo(bufferSizeInfo);

rootInfo["roomTemperature"] = currentStatus.roomTemperature;
rootInfo["operating"] = currentStatus.operating;
rootInfo["roomTemperature"] = currentStatus.roomTemperature;
rootInfo["outdoorTemperature"] = currentStatus.outdoorTemperature;
rootInfo["operating"] = currentStatus.operating;

char bufferInfo[512];
serializeJson(rootInfo, bufferInfo);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,9 @@ void hpStatusChanged(heatpumpStatus currentStatus) {
DynamicJsonBuffer jsonBufferInfo(bufferSizeInfo);

JsonObject& rootInfo = jsonBufferInfo.createObject();
rootInfo["roomTemperature"] = (isCelsius) ? hp.getRoomTemperature() : hp.CelsiusToFahrenheit(hp.getRoomTemperature());
rootInfo["operating"] = currentStatus.operating;
rootInfo["roomTemperature"] = (isCelsius) ? hp.getRoomTemperature() : hp.CelsiusToFahrenheit(hp.getRoomTemperature());
rootInfo["outdoorTemperature"] = (isCelsius) ? hp.getOutdoorTemperature() : hp.CelsiusToFahrenheit(hp.getOutdoorTemperature());
rootInfo["operating"] = currentStatus.operating;

char bufferInfo[512];
rootInfo.printTo(bufferInfo, sizeof(bufferInfo));
Expand Down
1 change: 1 addition & 0 deletions keywords.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ getIseeBool KEYWORD2

getStatus KEYWORD2
getRoomTemperature KEYWORD2
getOutdoorTemperature KEYWORD2
getOperating KEYWORD2

FahrenheitToCelsius KEYWORD2
Expand Down
22 changes: 22 additions & 0 deletions src/HeatPump.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,10 @@ float HeatPump::getRoomTemperature() {
return currentStatus.roomTemperature;
}

float HeatPump::getOutdoorTemperature() {
return currentStatus.outdoorTemperature;
}

bool HeatPump::getOperating() {
return currentStatus.operating;
}
Expand Down Expand Up @@ -680,6 +684,14 @@ int HeatPump::readPacket() {
case 0x03: { //Room temperature reading
heatpumpStatus receivedStatus;

if(data[5] != 0x00) {
int temp = data[5];
temp -= 128;
receivedStatus.outdoorTemperature = (float)temp / 2;
} else {
receivedStatus.outdoorTemperature = 0;
}

if(data[6] != 0x00) {
int temp = data[6];
temp -= 128;
Expand All @@ -702,6 +714,16 @@ int HeatPump::readPacket() {
currentStatus.roomTemperature = receivedStatus.roomTemperature;
}

if((statusChangedCallback) && currentStatus.outdoorTemperature != receivedStatus.outdoorTemperature) {
currentStatus.outdoorTemperature = receivedStatus.outdoorTemperature;

if(statusChangedCallback) {
statusChangedCallback(currentStatus);
}
} else {
currentStatus.outdoorTemperature = receivedStatus.outdoorTemperature;
}

return RCVD_PKT_ROOM_TEMP;
}

Expand Down
4 changes: 3 additions & 1 deletion src/HeatPump.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ bool operator!=(const heatpumpTimers& lhs, const heatpumpTimers& rhs);

struct heatpumpStatus {
float roomTemperature;
float outdoorTemperature;
bool operating; // if true, the heatpump is operating to reach the desired temperature
heatpumpTimers timers;
int compressorFrequency;
Expand Down Expand Up @@ -189,7 +190,7 @@ class HeatPump
unsigned long lastWanted;

// initialise to all off, then it will update shortly after connect;
heatpumpStatus currentStatus {0, false, {TIMER_MODE_MAP[0], 0, 0, 0, 0}, 0};
heatpumpStatus currentStatus {0, 0, false, {TIMER_MODE_MAP[0], 0, 0, 0, 0}, 0};

heatpumpFunctions functions;

Expand Down Expand Up @@ -274,6 +275,7 @@ class HeatPump
// status
heatpumpStatus getStatus();
float getRoomTemperature();
float getOutdoorTemperature();
bool getOperating();
bool isConnected();

Expand Down