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

code formatting

Browse Source
This commit is contained in:
Paul
2019-11-13 10:22:46 +01:00
parent ae5290131d
commit 81af418294
1 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/ems.h
View File

@@ -239,7 +239,7 @@ typedef struct {
_EMS_DEVICE_TYPE device_type; // type (see above) _EMS_DEVICE_TYPE device_type; // type (see above)
uint8_t product_id; // product id uint8_t product_id; // product id
uint8_t device_id; // device_id uint8_t device_id; // device_id
const char * device_desc_p; // pointer to description string in EMS_Devices table const char * device_desc_p; // pointer to description string in EMS_Devices table
char version[10]; // the version number XX.XX char version[10]; // the version number XX.XX
bool known; // is this a known device? bool known; // is this a known device?
} _Detected_Device; } _Detected_Device;
@@ -263,11 +263,11 @@ typedef struct {
*/ */
typedef struct { typedef struct {
// settings // settings
uint8_t device_id; // this is typically always 0x08 uint8_t device_id; // this is typically always 0x08
uint8_t device_flags; uint8_t device_flags;
const char * device_desc_p; const char * device_desc_p;
uint8_t product_id; uint8_t product_id;
char version[10]; char version[10];
// UBAParameterWW // UBAParameterWW
uint8_t wWActivated; // Warm Water activated uint8_t wWActivated; // Warm Water activated
@@ -327,13 +327,13 @@ typedef struct {
* Telegram package defintions for Other EMS devices * Telegram package defintions for Other EMS devices
*/ */
typedef struct { typedef struct {
uint8_t device_id; // the device ID of the Heat Pump (e.g. 0x30) uint8_t device_id; // the device ID of the Heat Pump (e.g. 0x30)
uint8_t device_flags; uint8_t device_flags;
const char * device_desc_p; const char * device_desc_p;
uint8_t product_id; uint8_t product_id;
char version[10]; char version[10];
uint8_t HPModulation; // heatpump modulation in % uint8_t HPModulation; // heatpump modulation in %
uint8_t HPSpeed; // speed 0-100 % uint8_t HPSpeed; // speed 0-100 %
} _EMS_HeatPump; } _EMS_HeatPump;
// Mixing Module per HC // Mixing Module per HC
@@ -349,7 +349,7 @@ typedef struct {
typedef struct { typedef struct {
uint8_t device_id; uint8_t device_id;
uint8_t device_flags; uint8_t device_flags;
const char * device_desc_p; const char * device_desc_p;
uint8_t product_id; uint8_t product_id;
char version[10]; char version[10];
bool detected; bool detected;
@@ -358,20 +358,20 @@ typedef struct {
// Solar Module - SM10/SM100/ISM1 // Solar Module - SM10/SM100/ISM1
typedef struct { typedef struct {
uint8_t device_id; // the device ID of the Solar Module uint8_t device_id; // the device ID of the Solar Module
uint8_t device_flags; // Solar Module flags uint8_t device_flags; // Solar Module flags
const char * device_desc_p; const char * device_desc_p;
uint8_t product_id; uint8_t product_id;
char version[10]; char version[10];
int16_t collectorTemp; // collector temp int16_t collectorTemp; // collector temp
int16_t bottomTemp; // bottom temp int16_t bottomTemp; // bottom temp
uint8_t pumpModulation; // modulation solar pump uint8_t pumpModulation; // modulation solar pump
uint8_t pump; // pump active uint8_t pump; // pump active
int16_t setpoint_maxBottomTemp; // setpoint for maximum collector temp int16_t setpoint_maxBottomTemp; // setpoint for maximum collector temp
uint16_t EnergyLastHour; uint16_t EnergyLastHour;
uint16_t EnergyToday; uint16_t EnergyToday;
uint16_t EnergyTotal; uint16_t EnergyTotal;
uint32_t pumpWorkMin; // Total solar pump operating time uint32_t pumpWorkMin; // Total solar pump operating time
} _EMS_SolarModule; } _EMS_SolarModule;
// heating circuit // heating circuit
@@ -395,7 +395,7 @@ typedef struct {
typedef struct { typedef struct {
uint8_t device_id; // the device ID of the thermostat uint8_t device_id; // the device ID of the thermostat
uint8_t device_flags; // thermostat model flags uint8_t device_flags; // thermostat model flags
const char * device_desc_p; const char * device_desc_p;
uint8_t product_id; uint8_t product_id;
char version[10]; char version[10];
char datetime[25]; // HH:MM:SS DD/MM/YYYY char datetime[25]; // HH:MM:SS DD/MM/YYYY