andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-08 00:39:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

autoformatting

Browse Source
This commit is contained in:
Proddy
2023-07-03 08:56:08 +02:00
parent d15de88065
commit 51769011be
5 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
interface/src/project/DashboardDevicesDialog.tsx
View File

@@ -101,7 +101,6 @@ const DashboarDevicesDialog = ({
if (dv.s) { if (dv.s) {
helperText += 'n'; helperText += 'n';
if (dv.m !== undefined && dv.x !== undefined) { if (dv.m !== undefined && dv.x !== undefined) {
helperText += ' between ' + dv.m + ' and ' + dv.x; helperText += ' between ' + dv.m + ' and ' + dv.x;
} else { } else {
helperText += ' , step ' + dv.s; helperText += ' , step ' + dv.s;

6
src/devices/thermostat.cpp
View File

@@ -1170,9 +1170,9 @@ void Thermostat::process_HPSet(std::shared_ptr<const Telegram> telegram) {
if (hc == nullptr) { if (hc == nullptr) {
return; return;
} }
has_update(telegram, hc->dewoffset, 0); // 7-35°C has_update(telegram, hc->dewoffset, 0); // 7-35°C
has_update(telegram, hc->roomtempdiff, 3); // 1-10K has_update(telegram, hc->roomtempdiff, 3); // 1-10K
has_update(telegram, hc->hpminflowtemp, 4); // 2-10K has_update(telegram, hc->hpminflowtemp, 4); // 2-10K
} }
// type 0x41 - data from the RC30 thermostat(0x10) - 14 bytes long // type 0x41 - data from the RC30 thermostat(0x10) - 14 bytes long

2
src/devices/ventilation.h
View File

@@ -45,7 +45,7 @@ class Ventilation : public EMSdevice {
void process_ModeMessage(std::shared_ptr<const Telegram> telegram); // 0x56B void process_ModeMessage(std::shared_ptr<const Telegram> telegram); // 0x56B
void process_BlowerMessage(std::shared_ptr<const Telegram> telegram); // 0x56B void process_BlowerMessage(std::shared_ptr<const Telegram> telegram); // 0x56B
void process_VOCMessage(std::shared_ptr<const Telegram> telegram); // 0x56B void process_VOCMessage(std::shared_ptr<const Telegram> telegram); // 0x56B
void process_BypassMessage(std::shared_ptr<const Telegram> telegram); // 0x56B void process_BypassMessage(std::shared_ptr<const Telegram> telegram); // 0x56B
bool set_ventMode(const char * value, const int8_t id); bool set_ventMode(const char * value, const int8_t id);
bool set_bypass(const char * value, const int8_t id); bool set_bypass(const char * value, const int8_t id);

39
src/roomcontrol.h
View File

@@ -1,4 +1,4 @@
/* SIGN_IN_ENDPOINT /*
* EMS-ESP - https://github.com/emsesp/EMS-ESP * EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020-2023 Paul Derbyshire * Copyright 2020-2023 Paul Derbyshire
* *
@@ -15,34 +15,33 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef EMSESP_ROOMCONTROL_H #ifndef EMSESP_ROOMCONTROL_H
#define EMSESP_ROOMCONTROL_H #define EMSESP_ROOMCONTROL_H
#include "emsesp.h" #include "emsesp.h"
namespace emsesp { namespace emsesp {
class Roomctrl { class Roomctrl {
public: public:
static void send(const uint8_t addr); static void send(const uint8_t addr);
static void check(const uint8_t addr, const uint8_t * data); static void check(const uint8_t addr, const uint8_t * data);
static void set_remotetemp(const uint8_t hc, const int16_t temp); static void set_remotetemp(const uint8_t hc, const int16_t temp);
private: private:
static constexpr uint8_t ADDR = 0x18; static constexpr uint8_t ADDR = 0x18;
static constexpr uint32_t SEND_INTERVAL = 60000; // 1 minute static constexpr uint32_t SEND_INTERVAL = 60000; // 1 minute
static constexpr uint8_t HCS = 4; // max 4 heating circuits static constexpr uint8_t HCS = 4; // max 4 heating circuits
static void version(uint8_t addr, uint8_t dst); static void version(uint8_t addr, uint8_t dst);
static void unknown(uint8_t addr, uint8_t dst, uint8_t type, uint8_t offset); static void unknown(uint8_t addr, uint8_t dst, uint8_t type, uint8_t offset);
static void temperature(uint8_t addr, uint8_t dst); static void temperature(uint8_t addr, uint8_t dst);
static void nack_write(); static void nack_write();
static bool switch_off_[HCS]; static bool switch_off_[HCS];
static uint32_t rc_time_[HCS]; static uint32_t rc_time_[HCS];
static int16_t remotetemp_[HCS]; static int16_t remotetemp_[HCS];
}; };
} // namespace emsesp } // namespace emsesp

11
src/system.cpp
View File

@@ -60,8 +60,15 @@ const char * const languages[] = {EMSESP_LOCALE_EN};
#elif defined(EMSESP_DE_ONLY) #elif defined(EMSESP_DE_ONLY)
const char * const languages[] = {EMSESP_LOCALE_DE}; const char * const languages[] = {EMSESP_LOCALE_DE};
#else #else
const char * const languages[] = const char * const languages[] = {EMSESP_LOCALE_EN,
{EMSESP_LOCALE_EN, EMSESP_LOCALE_DE, EMSESP_LOCALE_NL, EMSESP_LOCALE_SV, EMSESP_LOCALE_PL, EMSESP_LOCALE_NO, EMSESP_LOCALE_FR, EMSESP_LOCALE_TR, EMSESP_LOCALE_IT}; EMSESP_LOCALE_DE,
EMSESP_LOCALE_NL,
EMSESP_LOCALE_SV,
EMSESP_LOCALE_PL,
EMSESP_LOCALE_NO,
EMSESP_LOCALE_FR,
EMSESP_LOCALE_TR,
EMSESP_LOCALE_IT};
#endif #endif
static constexpr uint8_t NUM_LANGUAGES = sizeof(languages) / sizeof(const char *); static constexpr uint8_t NUM_LANGUAGES = sizeof(languages) / sizeof(const char *);