Skip to content

Commit

Permalink
Version 2.3.2
Browse files Browse the repository at this point in the history
- fix: typo in javascript preventing 'don't save config flag' to get processed correctly
- fix: small code optimisations
  • Loading branch information
arjenhiemstra committed Dec 2, 2021
1 parent 2564d8a commit afbde58
Show file tree
Hide file tree
Showing 24 changed files with 64 additions and 64 deletions.
8 changes: 4 additions & 4 deletions compiled_firmware_files/firmware.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"link":"https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/hardware_rev_1/nrgitho-hw1-v2.2.1.bin"
},
"2": {
"latest_fw":"2.3.1",
"link":"https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/hardware_rev_2/nrgitho-hw2-v2.3.1.bin"
"latest_fw":"2.3.2",
"link":"https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/hardware_rev_2/nrgitho-hw2-v2.3.2.bin"
},
"NON-CVE 1": {
"latest_fw":"2.3.1",
"link":"https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/non-cve_rev_1/nrgitho-noncve-v2.3.1.bin"
"latest_fw":"2.3.2",
"link":"https://github.com/arjenhiemstra/ithowifi/raw/master/compiled_firmware_files/non-cve_rev_1/nrgitho-noncve-v2.3.2.bin"
}
}
}
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions software/NRG_itho_wifi/02_JS_UI.ino
Original file line number Diff line number Diff line change
Expand Up @@ -423,15 +423,15 @@ $(document).ready(function() {
else if ($(this).attr('id') == 'reboot') {
if (confirm("This will reboot the device, are you sure?")) {
$('#rebootscript').append(html_reboot_script);
websock.send('{\"reboot\":true,\"donsaveconf\":'+document.getElementById("dontsaveconf").checked+'}');
websock.send('{\"reboot\":true,\"dontsaveconf\":'+document.getElementById("dontsaveconf").checked+'}');
}
}
else if ($(this).attr('id') == 'format') {
if (confirm("This will erase all settings, are you sure?")) {
websock.send('{\"format\":true}');
$('#format').text('Formatting...');
}
}
}
else if ($(this).attr('id') == 'wifiscan') {
$('.ScanResults').remove();
$('.hidden').removeClass('hidden');
Expand Down
2 changes: 1 addition & 1 deletion software/NRG_itho_wifi/06_Websock_func.ino
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ void onWsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventT
}
if (parseOK) {
remotes.removeRemote(number);
int* id = remotes.getRemoteIDbyIndex(number);
const int* id = remotes.getRemoteIDbyIndex(number);
rf.setBindAllowed(true);
rf.removeRFDevice(*id, *(id + 1), *(id + 2));
rf.setBindAllowed(false);
Expand Down
2 changes: 1 addition & 1 deletion software/NRG_itho_wifi/09_init_code.ino
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ void handleFormat()
}


char* hostName() {
const char* hostName() {
static char hostName[32];

if (strcmp(wifiConfig.hostname, "") == 0) {
Expand Down
18 changes: 9 additions & 9 deletions software/NRG_itho_wifi/IthoRemote.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ void IthoRemote::updatellModeTimer() {
}
}

int IthoRemote::registerNewRemote(int* id) {
int IthoRemote::registerNewRemote(const int* id) {
if (this->checkID(id)) {
return -1; //remote already registered
}
Expand All @@ -60,7 +60,7 @@ int IthoRemote::registerNewRemote(int* id) {
return 1;
}

int IthoRemote::removeRemote(int* id) {
int IthoRemote::removeRemote(const int* id) {
if (!this->checkID(id)) {
return -1; //remote not registered
}
Expand All @@ -84,7 +84,7 @@ int IthoRemote::removeRemote(int* id) {
return 1;
}

int IthoRemote::removeRemote(uint8_t index) {
int IthoRemote::removeRemote(const uint8_t index) {

if (!(index < MAX_NUMBER_OF_REMOTES)) return -1;

Expand All @@ -101,7 +101,7 @@ int IthoRemote::removeRemote(uint8_t index) {
return 1;
}

void IthoRemote::updateRemoteName(uint8_t index, const char* remoteName) {
void IthoRemote::updateRemoteName(const uint8_t index, const char* remoteName) {
strlcpy(remotes[index].name, remoteName, sizeof(remotes[index].name));
}

Expand All @@ -116,7 +116,7 @@ void IthoRemote::addCapabilities(uint8_t remoteIndex, const char* name, int32_t

}

int IthoRemote::remoteIndex(int32_t id) {
int IthoRemote::remoteIndex(const int32_t id) {
if (id < 0) return -1;
int tempID[3];
tempID[0] = (id >> 16) & 0xFF;
Expand All @@ -125,7 +125,7 @@ int IthoRemote::remoteIndex(int32_t id) {
return remoteIndex(tempID);
}

int IthoRemote::remoteIndex(int* id) {
int IthoRemote::remoteIndex(const int* id) {
int noKnown = 0;
for (uint8_t i = 0; i < MAX_NUMBER_OF_REMOTES; i++) {
for (uint8_t y = 0; y < 3; y++) {
Expand All @@ -142,7 +142,7 @@ int IthoRemote::remoteIndex(int* id) {
return -1;
}

int * IthoRemote::getRemoteIDbyIndex(int index) {
const int * IthoRemote::getRemoteIDbyIndex(const int index) {
static int id[3];
for (uint8_t i = 0; i < 3; i++) {
id[i] = remotes[index].ID[i];
Expand All @@ -151,11 +151,11 @@ int * IthoRemote::getRemoteIDbyIndex(int index) {
}


char * IthoRemote::getRemoteNamebyIndex(int index) {
const char * IthoRemote::getRemoteNamebyIndex(const int index) {
return remotes[index].name;
}

bool IthoRemote::checkID(int* id)
bool IthoRemote::checkID(const int* id)
{
int noKnown = 0;
for (uint8_t i = 0; i < MAX_NUMBER_OF_REMOTES; i++) {
Expand Down
24 changes: 12 additions & 12 deletions software/NRG_itho_wifi/IthoRemote.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,20 @@ class IthoRemote {
uint8_t getllModeTime() {
return llModeTime;
};
void setllModeTime(int timeVal) {
void setllModeTime(const int timeVal) {
llModeTime = timeVal;
};
int registerNewRemote(int* id);
int removeRemote(int* id);
int removeRemote(uint8_t index);
void addCapabilities(uint8_t remoteIndex, const char* name, int32_t value);
void updateRemoteName(uint8_t index, const char* remoteName);
int remoteIndex(int32_t id);
int remoteIndex(int* id);
int * getRemoteIDbyIndex(int index);
char * getRemoteNamebyIndex(int index);
char * lastRemoteName;
bool checkID(int* id);
int registerNewRemote(const int* id);
int removeRemote(const int* id);
int removeRemote(const uint8_t index);
void addCapabilities(const uint8_t remoteIndex, const char* name, int32_t value);
void updateRemoteName(const uint8_t index, const char* remoteName);
int remoteIndex(const int32_t id);
int remoteIndex(const int* id);
const int * getRemoteIDbyIndex(const int index);
const char * getRemoteNamebyIndex(const int index);
const char * lastRemoteName;
bool checkID(const int* id);
bool configLoaded;
char config_struct_version[4];
bool set(JsonObjectConst);
Expand Down
30 changes: 15 additions & 15 deletions software/NRG_itho_wifi/IthoSystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ volatile uint16_t ithoCurrentVal = 0;
uint8_t id0 = 0;
uint8_t id1 = 0;
uint8_t id2 = 0;
struct ihtoDeviceType* ithoDeviceptr = nullptr;
const struct ihtoDeviceType* ithoDeviceptr = nullptr;
int16_t ithoSettingsLength = 0;
int16_t ithoStatusLabelLength = 0;
std::vector<ithoDeviceStatus> ithoStatus;
Expand Down Expand Up @@ -71,11 +71,11 @@ struct ihtoDeviceType {
const char **settingsDescriptions;
const uint8_t **statusLabelMapping;
uint8_t statusMapLen;
struct ithoLabels *settingsStatusLabels;
const struct ithoLabels *settingsStatusLabels;
};


struct ihtoDeviceType ithoDevices[] {
const struct ihtoDeviceType ithoDevices[] {
{ 0x01, "Air curtain", nullptr, 0, nullptr, nullptr, 0, nullptr },
{ 0x03, "HRU ECO-fan", ithoHRUecoFanSettingsMap, sizeof(ithoHRUecoFanSettingsMap) / sizeof(ithoHRUecoFanSettingsMap[0]), ithoHRUecoSettingsLabels, ithoHRUecoFanStatusMap, sizeof(ithoHRUecoFanStatusMap) / sizeof(ithoHRUecoFanStatusMap[0]), ithoHRUecoStatusLabels },
{ 0x08, "LoadBoiler", nullptr, 0, nullptr, nullptr, 0, nullptr },
Expand All @@ -100,11 +100,11 @@ struct ihtoDeviceType ithoDevices[] {



char* getIthoType(const uint8_t deviceID) {
const char* getIthoType(const uint8_t deviceID) {
static char ithoDeviceType[32] = "Unkown device type";

struct ihtoDeviceType* ithoDevicesptr = ithoDevices;
struct ihtoDeviceType* ithoDevicesendPtr = ithoDevices + sizeof(ithoDevices) / sizeof(ithoDevices[0]);
const struct ihtoDeviceType* ithoDevicesptr = ithoDevices;
const struct ihtoDeviceType* ithoDevicesendPtr = ithoDevices + sizeof(ithoDevices) / sizeof(ithoDevices[0]);
while ( ithoDevicesptr < ithoDevicesendPtr ) {
if (ithoDevicesptr->ID == deviceID) {
strcpy(ithoDeviceType, ithoDevicesptr->name);
Expand All @@ -116,8 +116,8 @@ char* getIthoType(const uint8_t deviceID) {

int getSettingsLength(const uint8_t deviceID, const uint8_t version) {

struct ihtoDeviceType* ithoDevicesptr = ithoDevices;
struct ihtoDeviceType* ithoDevicesendPtr = ithoDevices + sizeof(ithoDevices) / sizeof(ithoDevices[0]);
const struct ihtoDeviceType* ithoDevicesptr = ithoDevices;
const struct ihtoDeviceType* ithoDevicesendPtr = ithoDevices + sizeof(ithoDevices) / sizeof(ithoDevices[0]);
while ( ithoDevicesptr < ithoDevicesendPtr ) {
if (ithoDevicesptr->ID == deviceID) {
if (ithoDevicesptr->settingsMapping == nullptr) {
Expand Down Expand Up @@ -238,8 +238,8 @@ void getSetting(const uint8_t i, const bool updateState, const bool updateweb, c

int getStatusLabelLength(const uint8_t deviceID, const uint8_t version) {

struct ihtoDeviceType* ithoDevicesptr = ithoDevices;
struct ihtoDeviceType* ithoDevicesendPtr = ithoDevices + sizeof(ithoDevices) / sizeof(ithoDevices[0]);
const struct ihtoDeviceType* ithoDevicesptr = ithoDevices;
const struct ihtoDeviceType* ithoDevicesendPtr = ithoDevices + sizeof(ithoDevices) / sizeof(ithoDevices[0]);
while ( ithoDevicesptr < ithoDevicesendPtr ) {
if (ithoDevicesptr->ID == deviceID) {
if (ithoDevicesptr->statusLabelMapping == nullptr) {
Expand Down Expand Up @@ -317,10 +317,10 @@ void updateSetting(const uint8_t i, const int32_t value, bool webupdate) {
}
}

struct ihtoDeviceType* getDevicePtr(uint8_t deviceID) {
const struct ihtoDeviceType* getDevicePtr(const uint8_t deviceID) {

struct ihtoDeviceType* ithoDevicesptr = ithoDevices;
struct ihtoDeviceType* ithoDevicesendPtr = ithoDevices + sizeof(ithoDevices) / sizeof(ithoDevices[0]);
const struct ihtoDeviceType* ithoDevicesptr = ithoDevices;
const struct ihtoDeviceType* ithoDevicesendPtr = ithoDevices + sizeof(ithoDevices) / sizeof(ithoDevices[0]);
while ( ithoDevicesptr < ithoDevicesendPtr ) {
if (ithoDevicesptr->ID == deviceID) {
return ithoDevicesptr;
Expand Down Expand Up @@ -358,7 +358,7 @@ void sendI2CPWMinit() {

uint8_t cmdCounter = 0;

void sendButton(uint8_t number, bool & updateweb) {
void sendButton(const uint8_t number, bool & updateweb) {

uint8_t command[] = { 0x82, 0x60, 0xC1, 0x01, 0x01, 0x11, 0x00, 0x00, 0x00, 0x00, 0x16, 0xFF, 0xFF, 0xFF, 0xFF, 0x22, 0xF1, 0x03, 0x00, 0x01, 0x04, 0x00, 0x00, 0xFF };

Expand All @@ -384,7 +384,7 @@ void sendButton(uint8_t number, bool & updateweb) {

}

void sendTimer(uint8_t timer, bool & updateweb) {
void sendTimer(const uint8_t timer, bool & updateweb) {

uint8_t command[] = { 0x82, 0x60, 0xC1, 0x01, 0x01, 0x11, 0x00, 0x00, 0x00, 0x00, 0x16, 0xFF, 0xFF, 0xFF, 0xFF, 0x22, 0xF3, 0x03, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF };

Expand Down
10 changes: 5 additions & 5 deletions software/NRG_itho_wifi/IthoSystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ extern uint8_t ithoDeviceID;
extern uint8_t itho_fwversion;
extern volatile uint16_t ithoCurrentVal;
extern uint8_t id0, id1, id2;
extern struct ihtoDeviceType* ithoDeviceptr;
extern const struct ihtoDeviceType* ithoDeviceptr;
extern int16_t ithoSettingsLength;

extern bool sendI2CButton;
Expand Down Expand Up @@ -100,19 +100,19 @@ extern ithoSettings * ithoSettingsArray;



char* getIthoType(const uint8_t deviceID);
const char* getIthoType(const uint8_t deviceID);
int getSettingsLength(const uint8_t deviceID, const uint8_t version);
void getSetting(const uint8_t i, const bool updateState, const bool updateweb, const bool loop = false);
void getSetting(const uint8_t i, const bool updateState, const bool updateweb, const bool loop, const struct ihtoDeviceType* settingsPtr, const uint8_t deviceID, const uint8_t version);
int getStatusLabelLength(const uint8_t deviceID, const uint8_t version);
const char* getSatusLabel(const uint8_t i, const struct ihtoDeviceType* statusPtr, const uint8_t version) ;
void updateSetting(const uint8_t i, const int32_t value, bool webupdate);
struct ihtoDeviceType* getDevicePtr(uint8_t deviceID);
const struct ihtoDeviceType* getDevicePtr(const uint8_t deviceID);

uint8_t checksum(const uint8_t* buf, size_t buflen);
void sendI2CPWMinit();
void sendButton(uint8_t number, bool &updateweb);
void sendTimer(uint8_t timer, bool &updateweb);
void sendButton(const uint8_t number, bool &updateweb);
void sendTimer(const uint8_t timer, bool &updateweb);
void sendJoinI2C(bool &updateweb);
void sendLeaveI2C(bool &updateweb);
void sendQueryDevicetype(bool &updateweb);
Expand Down
2 changes: 1 addition & 1 deletion software/NRG_itho_wifi/NRG_itho_wifi.ino
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define FWVERSION "2.3.1"
#define FWVERSION "2.3.2"

#define LOGGING_INTERVAL 21600000 //Log system status at regular intervals
#define ENABLE_FAILSAVE_BOOT
Expand Down
2 changes: 1 addition & 1 deletion software/NRG_itho_wifi/System.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <Arduino.h>
#include "System.h"

char* System::uptime()
const char* System::uptime()
{
char buffer[65];

Expand Down
2 changes: 1 addition & 1 deletion software/NRG_itho_wifi/System.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class System {
Sample: 1:20:23:50 = 1 day, 20 hours, 23 minutes and 50 seconds
@return char *: pointer!
*/
char * uptime();
const char * uptime();

/**
Returns the free RAM
Expand Down
2 changes: 1 addition & 1 deletion software/NRG_itho_wifi/TaskCC1101.ino
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ void TaskCC1101( void * pvParameters ) {
loadRemotesConfig();
rf.setBindAllowed(true);
for (int i = 0; i < remotes.getRemoteCount(); i++) {
int *id = remotes.getRemoteIDbyIndex(i);
const int *id = remotes.getRemoteIDbyIndex(i);
rf.addRFDevice(*id, *(id + 1), *(id + 2));
}
rf.setBindAllowed(false);
Expand Down
2 changes: 1 addition & 1 deletion software/NRG_itho_wifi/TaskMQTT.ino
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ void mqttSendSettingsJSON() {
mqttClient.setBufferSize(MQTT_BUFFER_SIZE);
}

void mqttCallback(char* topic, byte* payload, unsigned int length) {
void mqttCallback(const char* topic, const byte* payload, unsigned int length) {


if (topic == NULL) return;
Expand Down
2 changes: 1 addition & 1 deletion software/NRG_itho_wifi/devices/autotemp.h
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ const uint8_t itho_AutoTempstatus2_4[] { 0,1,2,94,3,95,4,5,6,7,8,9,10,11,12,13,1
const uint8_t itho_AutoTempstatus5[] { 0,1,2,94,3,95,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,96,97,98,99,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,255};
const uint8_t itho_AutoTempstatus6_10[] { 0,1,2,94,3,95,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,125,126,127,128,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,91,92,93,129,130,131,132,133,134,135,110,136,137,113,114,115,116,117,118,119,120,121,122,123,124,255};

struct ithoLabels ithoAutoTempStatusLabels[] {
const struct ithoLabels ithoAutoTempStatusLabels[] {
{ "Mode", "mode" },
{ "Condition", "condition" },
{ "Particulars", "Particulars" },
Expand Down
2 changes: 1 addition & 1 deletion software/NRG_itho_wifi/devices/cve14.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const char* ithoCVE14SettingsLabels[] = {
const uint8_t itho_CVE14status1_4[] { 0,1,2,3,4,5,6,255};
const uint8_t itho_CVE14status5_6[] { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,255};

struct ithoLabels ithoCVE14StatusLabels[] {
const struct ithoLabels ithoCVE14StatusLabels[] {
{ "Ventilation level (%)", "ventilation-level_perc" },
{ "Fan setpoint (rpm)", "fan-setpoint_rpm" },
{ "Fan speed (rpm)", "fan-speed_rpm" },
Expand Down
2 changes: 1 addition & 1 deletion software/NRG_itho_wifi/devices/cve1B.h
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ const uint8_t itho_CVE1Bstatus22[] { 0,1,2,3,4,5,6,14,7,17,8,9,11,12,22,23,24,
const uint8_t itho_CVE1Bstatus24_27[] { 0,1,2,3,4,5,6,14,7,17,33,34,255};


struct ithoLabels ithoCVE1BStatusLabels[] = {
const struct ithoLabels ithoCVE1BStatusLabels[] = {
{ "Ventilation setpoint (%)", "ventilation-setpoint_perc" },
{ "Fan setpoint (rpm)", "fan-setpoint_rpm" },
{ "Fan speed (rpm)", "fan-speed_rpm" },
Expand Down
2 changes: 1 addition & 1 deletion software/NRG_itho_wifi/devices/demandflow.h
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ const uint8_t itho_DemandFlowstatus14[] { 67,68,0,1,79,80,81,82,83,84,2,3,85,86,
const uint8_t itho_DemandFlowstatus15_17[] { 67,68,0,1,79,80,81,82,83,84,2,3,85,86,87,88,4,89,5,6,7,8,9,10,11,12,13,14,15,16,17,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,18,61,62,63,64,65,66,69,70,71,72,73,74,75,76,77,78,255};
const uint8_t itho_DemandFlowstatus18_21[] { 67,68,0,1,79,80,81,82,83,84,2,3,85,86,87,88,4,89,5,90,6,7,8,9,10,11,12,13,14,15,16,17,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,18,61,62,63,64,65,66,91,92,69,70,71,72,73,74,75,76,77,78,255};

struct ithoLabels ithoDemandFlowStatusLabels[] {
const struct ithoLabels ithoDemandFlowStatusLabels[] {
{ "Operating status", "operating-status" },
{ "Setting", "setting" },
{ "RH bathroom 1 (%)", "rv-bathroom-1_perc" },
Expand Down
2 changes: 1 addition & 1 deletion software/NRG_itho_wifi/devices/hru350.h
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ const char* ithoHRU350SettingsLabels[] = {

const uint8_t itho_HRU350status1_4[] { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,255};

struct ithoLabels ithoHRU350StatusLabels[] {
const struct ithoLabels ithoHRU350StatusLabels[] {
{ "Requested fanspeed (%)", "requested-fanspeed_perc" },
{ "Balance (%)", "balance_perc" },
{ "Supply fan (RPM)", "supply-fan_rpm" },
Expand Down
2 changes: 1 addition & 1 deletion software/NRG_itho_wifi/devices/hrueco.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ const uint8_t itho_HRUecostatus6_7[] { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16
const uint8_t itho_HRUecostatus8[] { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,255};
const uint8_t itho_HRUecostatus10_12[] { 22,23,0,2,3,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,255};

struct ithoLabels ithoHRUecoStatusLabels[] {
const struct ithoLabels ithoHRUecoStatusLabels[] {
{ "Supply requested (rpm)", "supply-requested_rpm" },
{ "Supply fan speed (rpm)", "supply-fan speed_rpm" },
{ "Supply actual (rpm)", "supply-actual_rpm" },
Expand Down
2 changes: 1 addition & 1 deletion software/NRG_itho_wifi/devices/wpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ const uint8_t itho_WPUstatus33[] { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,104,
const uint8_t itho_WPUstatus34[] { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,104,135,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,106,107,98,99,100,45,47,48,49,50,51,52,54,53,55,56,57,58,59,60,61,69,70,108,109,110,64,101,66,71,72,73,74,75,76,77,78,79,80,105,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,111,136,137,138,139,143,103,114,115,116,122,123,124,125,126,127,128,129,147,131,130,132,134,140,141,142,144,145,146,102,148,149,150,151,152,153,154,255};
const uint8_t itho_WPUstatus37[] { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,104,155,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,106,107,98,99,100,45,47,48,49,50,51,52,54,53,55,56,57,58,59,60,61,69,70,108,109,110,64,101,66,71,72,73,74,75,76,77,78,79,80,105,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,111,136,137,138,139,143,103,114,115,116,122,123,124,125,126,127,128,129,147,131,130,132,134,140,141,142,144,145,146,102,148,149,150,151,152,153,154,255};

struct ithoLabels ithoWPUStatusLabels[] {
const struct ithoLabels ithoWPUStatusLabels[] {
{ "Outside temp (°C)", "outside-temp_c" },
{ "Boiler temp down (°C)", "boilertemp-down_c" },
{ "Boiler temp up (°C)", "boilertemp-up_c" },
Expand Down
Loading

0 comments on commit afbde58

Please sign in to comment.