From b56d775d5ddca6ddc5e43a164f171e57c65cbab5 Mon Sep 17 00:00:00 2001 From: Paul Date: Sat, 29 Jun 2019 08:56:50 +0200 Subject: [PATCH] formatting --- src/ems.h | 24 ++++++++++++------------ src/emsuart.h | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/ems.h b/src/ems.h index cc5d0f3ce..5b6ade639 100644 --- a/src/ems.h +++ b/src/ems.h @@ -268,19 +268,19 @@ typedef struct { // SM Solar Module - SM10/SM100/ISM1 typedef struct { - int16_t collectorTemp; // collector temp - int16_t bottomTemp; // bottom temp - uint8_t pumpModulation; // modulation solar pump - uint8_t pump; // pump active - int16_t setpoint_maxBottomTemp; // setpoint for maximum collector temp - int16_t EnergyLastHour; - int16_t EnergyToday; - int16_t EnergyTotal; + int16_t collectorTemp; // collector temp + int16_t bottomTemp; // bottom temp + uint8_t pumpModulation; // modulation solar pump + uint8_t pump; // pump active + int16_t setpoint_maxBottomTemp; // setpoint for maximum collector temp + int16_t EnergyLastHour; + int16_t EnergyToday; + int16_t EnergyTotal; uint32_t pumpWorkMin; // Total solar pump operating time - uint8_t device_id; // the device ID of the Solar Module / Heat Pump (e.g. 0x30) - uint8_t model_id; // Solar Module / Heat Pump model (e.g. 3 > EMS_MODEL_OTHER ) - uint8_t product_id; // (e.g. 101) - char version[10]; + uint8_t device_id; // the device ID of the Solar Module / Heat Pump (e.g. 0x30) + uint8_t model_id; // Solar Module / Heat Pump model (e.g. 3 > EMS_MODEL_OTHER ) + uint8_t product_id; // (e.g. 101) + char version[10]; } _EMS_SolarModule; // Thermostat data diff --git a/src/emsuart.h b/src/emsuart.h index 8fd0c14b3..c49e2f6a8 100644 --- a/src/emsuart.h +++ b/src/emsuart.h @@ -13,7 +13,7 @@ #define EMSUART_CONFIG 0x1C // 8N1 (8 bits, no stop bits, 1 parity) #define EMSUART_BAUD 9600 // uart baud rate for the EMS circuit -#define EMS_MAXBUFFERS 5 // buffers for circular filling to avoid collisions +#define EMS_MAXBUFFERS 5 // buffers for circular filling to avoid collisions #define EMS_MAXBUFFERSIZE 32 // max size of the buffer. packets are max 32 bytes to support EMS 1.0 #define EMSUART_BIT_TIME 104 // bit time @9600 baud @@ -22,7 +22,7 @@ #define EMSUART_TX_WAIT_BYTE EMSUART_BIT_TIME * 10 // Time to send one Byte (8 Bits, 1 Start Bit, 1 Stop Bit) #define EMSUART_TX_WAIT_BRK EMSUART_BIT_TIME * 11 // Time to send a BRK Signal (11 Bit) #define EMSUART_TX_WAIT_GAP EMSUART_BIT_TIME * 7 // Gap between to Bytes -#define EMSUART_TX_LAG 8 +#define EMSUART_TX_LAG 8 #define EMSUART_recvTaskPrio 1 #define EMSUART_recvTaskQueueLen 64