mirror of
https://github.com/Laxilef/OTGateway.git
synced 2025-12-12 11:14:28 +05:00
Compare commits
3 Commits
otc_fix
...
0213582464
| Author | SHA1 | Date | |
|---|---|---|---|
|
0213582464 | ||
|
|
396dc7f7e3 | ||
|
|
9d38525251 |
22
.github/workflows/pio-dependabot.yaml
vendored
Normal file
22
.github/workflows/pio-dependabot.yaml
vendored
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
name: PlatformIO Dependabot
|
||||||
|
on:
|
||||||
|
workflow_dispatch: # option to manually trigger the workflow
|
||||||
|
schedule:
|
||||||
|
# Runs every day at 00:00
|
||||||
|
- cron: "0 0 * * *"
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
pull-requests: write
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
dependabot:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
name: run PlatformIO Dependabot
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v5
|
||||||
|
- name: run PlatformIO Dependabot
|
||||||
|
uses: peterus/platformio_dependabot@v1.2.0
|
||||||
|
with:
|
||||||
|
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
@@ -27,9 +27,6 @@ let paths = {
|
|||||||
'src_data/scripts/i18n.min.js',
|
'src_data/scripts/i18n.min.js',
|
||||||
'src_data/scripts/lang.js',
|
'src_data/scripts/lang.js',
|
||||||
'src_data/scripts/utils.js'
|
'src_data/scripts/utils.js'
|
||||||
],
|
|
||||||
'chart.js': [
|
|
||||||
'src_data/scripts/chart.js'
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
63
lib/Equitherm/Equitherm.h
Normal file
63
lib/Equitherm/Equitherm.h
Normal file
@@ -0,0 +1,63 @@
|
|||||||
|
#include <Arduino.h>
|
||||||
|
|
||||||
|
#if defined(EQUITHERM_INTEGER)
|
||||||
|
// расчёты с целыми числами
|
||||||
|
typedef int datatype;
|
||||||
|
#else
|
||||||
|
// расчёты с float числами
|
||||||
|
typedef float datatype;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
class Equitherm {
|
||||||
|
public:
|
||||||
|
datatype targetTemp = 0;
|
||||||
|
datatype indoorTemp = 0;
|
||||||
|
datatype outdoorTemp = 0;
|
||||||
|
float Kn = 0.0;
|
||||||
|
float Kk = 0.0;
|
||||||
|
float Kt = 0.0;
|
||||||
|
|
||||||
|
Equitherm() = default;
|
||||||
|
|
||||||
|
// kn, kk, kt
|
||||||
|
Equitherm(float new_kn, float new_kk, float new_kt) {
|
||||||
|
Kn = new_kn;
|
||||||
|
Kk = new_kk;
|
||||||
|
Kt = new_kt;
|
||||||
|
}
|
||||||
|
|
||||||
|
// лимит выходной величины
|
||||||
|
void setLimits(unsigned short min_output, unsigned short max_output) {
|
||||||
|
_minOut = min_output;
|
||||||
|
_maxOut = max_output;
|
||||||
|
}
|
||||||
|
|
||||||
|
// возвращает новое значение при вызове
|
||||||
|
datatype getResult() {
|
||||||
|
datatype output = getResultN() + getResultK() + getResultT();
|
||||||
|
output = constrain(output, _minOut, _maxOut); // ограничиваем выход
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
unsigned short _minOut = 20, _maxOut = 90;
|
||||||
|
|
||||||
|
// температура контура отопления в зависимости от наружной температуры
|
||||||
|
datatype getResultN() {
|
||||||
|
float a = (-0.21 * Kn) - 0.06; // a = -0,21k — 0,06
|
||||||
|
float b = (6.04 * Kn) + 1.98; // b = 6,04k + 1,98
|
||||||
|
float c = (-5.06 * Kn) + 18.06; // с = -5,06k + 18,06
|
||||||
|
float x = (-0.2 * outdoorTemp) + 5; // x = -0.2*t1 + 5
|
||||||
|
return (a * x * x) + (b * x) + c; // Tn = ax2 + bx + c
|
||||||
|
}
|
||||||
|
|
||||||
|
// поправка на желаемую комнатную температуру
|
||||||
|
datatype getResultK() {
|
||||||
|
return (targetTemp - 20) * Kk;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Расчет поправки (ошибки) термостата
|
||||||
|
datatype getResultT() {
|
||||||
|
return constrain((targetTemp - indoorTemp), -3, 3) * Kt;
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -147,19 +147,8 @@ public:
|
|||||||
return topic;
|
return topic;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <class DT, class VT>
|
|
||||||
String getEntityIdWithPrefix(DT domain, VT value, char separator = '_') {
|
|
||||||
String topic = "";
|
|
||||||
topic.concat(domain);
|
|
||||||
topic.concat('.');
|
|
||||||
topic.concat(this->devicePrefix);
|
|
||||||
topic.concat(separator);
|
|
||||||
topic.concat(value);
|
|
||||||
return topic;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class T>
|
template <class T>
|
||||||
String getUniqueIdWithPrefix(T value, char separator = '_') {
|
String getObjectIdWithPrefix(T value, char separator = '_') {
|
||||||
String topic = "";
|
String topic = "";
|
||||||
topic.concat(this->devicePrefix);
|
topic.concat(this->devicePrefix);
|
||||||
topic.concat(separator);
|
topic.concat(separator);
|
||||||
|
|||||||
@@ -12,67 +12,66 @@ const char HA_ENTITY_SELECT[] PROGMEM = "select";
|
|||||||
const char HA_ENTITY_SENSOR[] PROGMEM = "sensor";
|
const char HA_ENTITY_SENSOR[] PROGMEM = "sensor";
|
||||||
const char HA_ENTITY_SWITCH[] PROGMEM = "switch";
|
const char HA_ENTITY_SWITCH[] PROGMEM = "switch";
|
||||||
|
|
||||||
// https://www.home-assistant.io/integrations/mqtt/#supported-abbreviations-in-mqtt-discovery-messages
|
const char HA_DEVICE[] PROGMEM = "device";
|
||||||
const char HA_DEFAULT_ENTITY_ID[] PROGMEM = "def_ent_id"; // "default_entity_id "
|
const char HA_IDENTIFIERS[] PROGMEM = "identifiers";
|
||||||
const char HA_DEVICE[] PROGMEM = "dev"; // "device"
|
const char HA_SW_VERSION[] PROGMEM = "sw_version";
|
||||||
const char HA_IDENTIFIERS[] PROGMEM = "ids"; // "identifiers"
|
const char HA_MANUFACTURER[] PROGMEM = "manufacturer";
|
||||||
const char HA_SW_VERSION[] PROGMEM = "sw"; // "sw_version"
|
const char HA_MODEL[] PROGMEM = "model";
|
||||||
const char HA_MANUFACTURER[] PROGMEM = "mf"; // "manufacturer"
|
|
||||||
const char HA_MODEL[] PROGMEM = "mdl"; // "model"
|
|
||||||
const char HA_NAME[] PROGMEM = "name";
|
const char HA_NAME[] PROGMEM = "name";
|
||||||
const char HA_CONF_URL[] PROGMEM = "cu"; // "configuration_url"
|
const char HA_CONF_URL[] PROGMEM = "configuration_url";
|
||||||
const char HA_COMMAND_TOPIC[] PROGMEM = "cmd_t"; // "command_topic"
|
const char HA_COMMAND_TOPIC[] PROGMEM = "command_topic";
|
||||||
const char HA_COMMAND_TEMPLATE[] PROGMEM = "cmd_tpl"; // "command_template"
|
const char HA_COMMAND_TEMPLATE[] PROGMEM = "command_template";
|
||||||
const char HA_ENABLED_BY_DEFAULT[] PROGMEM = "en"; // "enabled_by_default"
|
const char HA_ENABLED_BY_DEFAULT[] PROGMEM = "enabled_by_default";
|
||||||
const char HA_UNIQUE_ID[] PROGMEM = "uniq_id"; // "unique_id"
|
const char HA_UNIQUE_ID[] PROGMEM = "unique_id";
|
||||||
const char HA_ENTITY_CATEGORY[] PROGMEM = "ent_cat"; // "entity_category"
|
const char HA_OBJECT_ID[] PROGMEM = "object_id";
|
||||||
|
const char HA_ENTITY_CATEGORY[] PROGMEM = "entity_category";
|
||||||
const char HA_ENTITY_CATEGORY_DIAGNOSTIC[] PROGMEM = "diagnostic";
|
const char HA_ENTITY_CATEGORY_DIAGNOSTIC[] PROGMEM = "diagnostic";
|
||||||
const char HA_ENTITY_CATEGORY_CONFIG[] PROGMEM = "config";
|
const char HA_ENTITY_CATEGORY_CONFIG[] PROGMEM = "config";
|
||||||
const char HA_STATE_TOPIC[] PROGMEM = "stat_t"; // "state_topic"
|
const char HA_STATE_TOPIC[] PROGMEM = "state_topic";
|
||||||
const char HA_VALUE_TEMPLATE[] PROGMEM = "val_tpl"; // "value_template"
|
const char HA_VALUE_TEMPLATE[] PROGMEM = "value_template";
|
||||||
const char HA_OPTIONS[] PROGMEM = "ops"; // "options"
|
const char HA_OPTIONS[] PROGMEM = "options";
|
||||||
const char HA_AVAILABILITY[] PROGMEM = "avty"; // "availability"
|
const char HA_AVAILABILITY[] PROGMEM = "availability";
|
||||||
const char HA_AVAILABILITY_MODE[] PROGMEM = "avty_mode"; // "availability_mode"
|
const char HA_AVAILABILITY_MODE[] PROGMEM = "availability_mode";
|
||||||
const char HA_TOPIC[] PROGMEM = "t"; // "topic"
|
const char HA_TOPIC[] PROGMEM = "topic";
|
||||||
const char HA_DEVICE_CLASS[] PROGMEM = "dev_cla"; // "device_class"
|
const char HA_DEVICE_CLASS[] PROGMEM = "device_class";
|
||||||
const char HA_UNIT_OF_MEASUREMENT[] PROGMEM = "unit_of_meas"; // "unit_of_measurement"
|
const char HA_UNIT_OF_MEASUREMENT[] PROGMEM = "unit_of_measurement";
|
||||||
const char HA_UNIT_OF_MEASUREMENT_C[] PROGMEM = "°C";
|
const char HA_UNIT_OF_MEASUREMENT_C[] PROGMEM = "°C";
|
||||||
const char HA_UNIT_OF_MEASUREMENT_F[] PROGMEM = "°F";
|
const char HA_UNIT_OF_MEASUREMENT_F[] PROGMEM = "°F";
|
||||||
const char HA_UNIT_OF_MEASUREMENT_PERCENT[] PROGMEM = "%";
|
const char HA_UNIT_OF_MEASUREMENT_PERCENT[] PROGMEM = "%";
|
||||||
const char HA_UNIT_OF_MEASUREMENT_L_MIN[] PROGMEM = "L/min";
|
const char HA_UNIT_OF_MEASUREMENT_L_MIN[] PROGMEM = "L/min";
|
||||||
const char HA_UNIT_OF_MEASUREMENT_GAL_MIN[] PROGMEM = "gal/min";
|
const char HA_UNIT_OF_MEASUREMENT_GAL_MIN[] PROGMEM = "gal/min";
|
||||||
const char HA_ICON[] PROGMEM = "ic"; // "icon"
|
const char HA_ICON[] PROGMEM = "icon";
|
||||||
const char HA_MIN[] PROGMEM = "min";
|
const char HA_MIN[] PROGMEM = "min";
|
||||||
const char HA_MAX[] PROGMEM = "max";
|
const char HA_MAX[] PROGMEM = "max";
|
||||||
const char HA_STEP[] PROGMEM = "step";
|
const char HA_STEP[] PROGMEM = "step";
|
||||||
const char HA_MODE[] PROGMEM = "mode";
|
const char HA_MODE[] PROGMEM = "mode";
|
||||||
const char HA_MODE_BOX[] PROGMEM = "box";
|
const char HA_MODE_BOX[] PROGMEM = "box";
|
||||||
const char HA_STATE_ON[] PROGMEM = "stat_on"; // "state_on"
|
const char HA_STATE_ON[] PROGMEM = "state_on";
|
||||||
const char HA_STATE_OFF[] PROGMEM = "stat_off"; // "state_off"
|
const char HA_STATE_OFF[] PROGMEM = "state_off";
|
||||||
const char HA_PAYLOAD_ON[] PROGMEM = "pl_on"; // "payload_on"
|
const char HA_PAYLOAD_ON[] PROGMEM = "payload_on";
|
||||||
const char HA_PAYLOAD_OFF[] PROGMEM = "pl_off"; // "payload_off"
|
const char HA_PAYLOAD_OFF[] PROGMEM = "payload_off";
|
||||||
const char HA_STATE_CLASS[] PROGMEM = "stat_cla"; // "state_class"
|
const char HA_STATE_CLASS[] PROGMEM = "state_class";
|
||||||
const char HA_STATE_CLASS_MEASUREMENT[] PROGMEM = "measurement";
|
const char HA_STATE_CLASS_MEASUREMENT[] PROGMEM = "measurement";
|
||||||
const char HA_EXPIRE_AFTER[] PROGMEM = "exp_aft"; // "expire_after"
|
const char HA_EXPIRE_AFTER[] PROGMEM = "expire_after";
|
||||||
const char HA_CURRENT_TEMPERATURE_TOPIC[] PROGMEM = "curr_temp_t"; // "current_temperature_topic"
|
const char HA_CURRENT_TEMPERATURE_TOPIC[] PROGMEM = "current_temperature_topic";
|
||||||
const char HA_CURRENT_TEMPERATURE_TEMPLATE[] PROGMEM = "curr_temp_tpl"; // "current_temperature_template"
|
const char HA_CURRENT_TEMPERATURE_TEMPLATE[] PROGMEM = "current_temperature_template";
|
||||||
const char HA_TEMPERATURE_COMMAND_TOPIC[] PROGMEM = "temp_cmd_t"; // "temperature_command_topic"
|
const char HA_TEMPERATURE_COMMAND_TOPIC[] PROGMEM = "temperature_command_topic";
|
||||||
const char HA_TEMPERATURE_COMMAND_TEMPLATE[] PROGMEM = "temp_cmd_tpl"; // "temperature_command_template"
|
const char HA_TEMPERATURE_COMMAND_TEMPLATE[] PROGMEM = "temperature_command_template";
|
||||||
const char HA_TEMPERATURE_STATE_TOPIC[] PROGMEM = "temp_stat_t"; // "temperature_state_topic"
|
const char HA_TEMPERATURE_STATE_TOPIC[] PROGMEM = "temperature_state_topic";
|
||||||
const char HA_TEMPERATURE_STATE_TEMPLATE[] PROGMEM = "temp_stat_tpl"; // "temperature_state_template"
|
const char HA_TEMPERATURE_STATE_TEMPLATE[] PROGMEM = "temperature_state_template";
|
||||||
const char HA_TEMPERATURE_UNIT[] PROGMEM = "temp_unit"; // "temperature_unit"
|
const char HA_TEMPERATURE_UNIT[] PROGMEM = "temperature_unit";
|
||||||
const char HA_MODE_COMMAND_TOPIC[] PROGMEM = "mode_cmd_t"; // "mode_command_topic"
|
const char HA_MODE_COMMAND_TOPIC[] PROGMEM = "mode_command_topic";
|
||||||
const char HA_MODE_COMMAND_TEMPLATE[] PROGMEM = "mode_cmd_tpl"; // "mode_command_template"
|
const char HA_MODE_COMMAND_TEMPLATE[] PROGMEM = "mode_command_template";
|
||||||
const char HA_MODE_STATE_TOPIC[] PROGMEM = "mode_stat_t"; // "mode_state_topic"
|
const char HA_MODE_STATE_TOPIC[] PROGMEM = "mode_state_topic";
|
||||||
const char HA_MODE_STATE_TEMPLATE[] PROGMEM = "mode_stat_tpl"; // "mode_state_template"
|
const char HA_MODE_STATE_TEMPLATE[] PROGMEM = "mode_state_template";
|
||||||
const char HA_MODES[] PROGMEM = "modes";
|
const char HA_MODES[] PROGMEM = "modes";
|
||||||
const char HA_ACTION_TOPIC[] PROGMEM = "act_t"; // "action_topic"
|
const char HA_ACTION_TOPIC[] PROGMEM = "action_topic";
|
||||||
const char HA_ACTION_TEMPLATE[] PROGMEM = "act_tpl"; // "action_template"
|
const char HA_ACTION_TEMPLATE[] PROGMEM = "action_template";
|
||||||
const char HA_MIN_TEMP[] PROGMEM = "min_temp";
|
const char HA_MIN_TEMP[] PROGMEM = "min_temp";
|
||||||
const char HA_MAX_TEMP[] PROGMEM = "max_temp";
|
const char HA_MAX_TEMP[] PROGMEM = "max_temp";
|
||||||
const char HA_TEMP_STEP[] PROGMEM = "temp_step";
|
const char HA_TEMP_STEP[] PROGMEM = "temp_step";
|
||||||
const char HA_PRESET_MODE_COMMAND_TOPIC[] PROGMEM = "pr_mode_cmd_t"; // "preset_mode_command_topic"
|
const char HA_PRESET_MODE_COMMAND_TOPIC[] PROGMEM = "preset_mode_command_topic";
|
||||||
const char HA_PRESET_MODE_COMMAND_TEMPLATE[] PROGMEM = "pr_mode_cmd_tpl"; // "preset_mode_command_template"
|
const char HA_PRESET_MODE_COMMAND_TEMPLATE[] PROGMEM = "preset_mode_command_template";
|
||||||
const char HA_PRESET_MODE_STATE_TOPIC[] PROGMEM = "pr_mode_stat_t"; // "preset_mode_state_topic"
|
const char HA_PRESET_MODE_STATE_TOPIC[] PROGMEM = "preset_mode_state_topic";
|
||||||
const char HA_PRESET_MODE_VALUE_TEMPLATE[] PROGMEM = "pr_mode_val_tpl"; // "preset_mode_value_template"
|
const char HA_PRESET_MODE_VALUE_TEMPLATE[] PROGMEM = "preset_mode_value_template";
|
||||||
const char HA_PRESET_MODES[] PROGMEM = "pr_modes"; // "preset_modes"
|
const char HA_PRESET_MODES[] PROGMEM = "preset_modes";
|
||||||
|
|||||||
580
platformio.ini
580
platformio.ini
@@ -1,379 +1,269 @@
|
|||||||
; PlatformIO Project Configuration File
|
|
||||||
;
|
|
||||||
; Build options: build flags, source filter
|
|
||||||
; Upload options: custom upload port, speed and extra flags
|
|
||||||
; Library options: dependencies, extra library storages
|
|
||||||
; Advanced options: extra scripting
|
|
||||||
;
|
|
||||||
; Please visit documentation for the other options and examples
|
|
||||||
; https://docs.platformio.org/page/projectconf.html
|
|
||||||
|
|
||||||
[platformio]
|
[platformio]
|
||||||
;extra_configs = secrets.ini
|
;extra_configs = secrets.ini
|
||||||
extra_configs = secrets.default.ini
|
extra_configs = secrets.default.ini
|
||||||
core_dir = .pio
|
core_dir = .pio
|
||||||
|
|
||||||
[env]
|
[env]
|
||||||
version = 1.6.0
|
version = 1.5.7-passiveble
|
||||||
framework = arduino
|
framework = arduino
|
||||||
lib_deps =
|
lib_deps = bblanchon/ArduinoJson@^7.4.2
|
||||||
bblanchon/ArduinoJson@^7.4.2
|
;ihormelnyk/OpenTherm Library@^1.1.5
|
||||||
;ihormelnyk/OpenTherm Library@^1.1.5
|
https://github.com/Laxilef/opentherm_library#esp32_timer
|
||||||
https://github.com/Laxilef/opentherm_library#esp32_timer
|
arduino-libraries/ArduinoMqttClient@^0.1.8
|
||||||
arduino-libraries/ArduinoMqttClient@^0.1.8
|
lennarthennigs/ESP Telnet@^2.2.3
|
||||||
lennarthennigs/ESP Telnet@^2.2.3
|
gyverlibs/FileData@^1.0.3
|
||||||
gyverlibs/FileData@^1.0.3
|
gyverlibs/GyverPID@^3.3.2
|
||||||
gyverlibs/GyverPID@^3.3.2
|
gyverlibs/GyverBlinker@^1.1.1
|
||||||
gyverlibs/GyverBlinker@^1.1.1
|
https://github.com/pstolarz/Arduino-Temperature-Control-Library.git#OneWireNg
|
||||||
https://github.com/pstolarz/Arduino-Temperature-Control-Library.git#OneWireNg
|
laxilef/TinyLogger@^1.1.1
|
||||||
laxilef/TinyLogger@^1.1.1
|
build_type = ${secrets.build_type}
|
||||||
build_type = ${secrets.build_type}
|
build_flags = -mtext-section-literals
|
||||||
build_flags =
|
-Wno-deprecated-declarations
|
||||||
-mtext-section-literals
|
-D MQTT_CLIENT_STD_FUNCTION_CALLBACK=1
|
||||||
-D MQTT_CLIENT_STD_FUNCTION_CALLBACK=1
|
;-D DEBUG_ESP_CORE -D DEBUG_ESP_WIFI -D DEBUG_ESP_HTTP_SERVER -D DEBUG_ESP_PORT=Serial
|
||||||
;-D DEBUG_ESP_CORE -D DEBUG_ESP_WIFI -D DEBUG_ESP_HTTP_SERVER -D DEBUG_ESP_PORT=Serial
|
-D BUILD_VERSION='"${this.version}"'
|
||||||
-D BUILD_VERSION='"${this.version}"'
|
-D BUILD_ENV='"$PIOENV"'
|
||||||
-D BUILD_ENV='"$PIOENV"'
|
-D DEFAULT_SERIAL_ENABLED=${secrets.serial_enabled}
|
||||||
-D DEFAULT_SERIAL_ENABLED=${secrets.serial_enabled}
|
-D DEFAULT_SERIAL_BAUD=${secrets.serial_baud}
|
||||||
-D DEFAULT_SERIAL_BAUD=${secrets.serial_baud}
|
-D DEFAULT_TELNET_ENABLED=${secrets.telnet_enabled}
|
||||||
-D DEFAULT_TELNET_ENABLED=${secrets.telnet_enabled}
|
-D DEFAULT_TELNET_PORT=${secrets.telnet_port}
|
||||||
-D DEFAULT_TELNET_PORT=${secrets.telnet_port}
|
-D DEFAULT_LOG_LEVEL=${secrets.log_level}
|
||||||
-D DEFAULT_LOG_LEVEL=${secrets.log_level}
|
-D DEFAULT_HOSTNAME='"${secrets.hostname}"'
|
||||||
-D DEFAULT_HOSTNAME='"${secrets.hostname}"'
|
-D DEFAULT_AP_SSID='"${secrets.ap_ssid}"'
|
||||||
-D DEFAULT_AP_SSID='"${secrets.ap_ssid}"'
|
-D DEFAULT_AP_PASSWORD='"${secrets.ap_password}"'
|
||||||
-D DEFAULT_AP_PASSWORD='"${secrets.ap_password}"'
|
-D DEFAULT_STA_SSID='"${secrets.sta_ssid}"'
|
||||||
-D DEFAULT_STA_SSID='"${secrets.sta_ssid}"'
|
-D DEFAULT_STA_PASSWORD='"${secrets.sta_password}"'
|
||||||
-D DEFAULT_STA_PASSWORD='"${secrets.sta_password}"'
|
-D DEFAULT_PORTAL_LOGIN='"${secrets.portal_login}"'
|
||||||
-D DEFAULT_PORTAL_LOGIN='"${secrets.portal_login}"'
|
-D DEFAULT_PORTAL_PASSWORD='"${secrets.portal_password}"'
|
||||||
-D DEFAULT_PORTAL_PASSWORD='"${secrets.portal_password}"'
|
-D DEFAULT_MQTT_ENABLED=${secrets.mqtt_enabled}
|
||||||
-D DEFAULT_MQTT_ENABLED=${secrets.mqtt_enabled}
|
-D DEFAULT_MQTT_SERVER='"${secrets.mqtt_server}"'
|
||||||
-D DEFAULT_MQTT_SERVER='"${secrets.mqtt_server}"'
|
-D DEFAULT_MQTT_PORT=${secrets.mqtt_port}
|
||||||
-D DEFAULT_MQTT_PORT=${secrets.mqtt_port}
|
-D DEFAULT_MQTT_USER='"${secrets.mqtt_user}"'
|
||||||
-D DEFAULT_MQTT_USER='"${secrets.mqtt_user}"'
|
-D DEFAULT_MQTT_PASSWORD='"${secrets.mqtt_password}"'
|
||||||
-D DEFAULT_MQTT_PASSWORD='"${secrets.mqtt_password}"'
|
-D DEFAULT_MQTT_PREFIX='"${secrets.mqtt_prefix}"'
|
||||||
-D DEFAULT_MQTT_PREFIX='"${secrets.mqtt_prefix}"'
|
upload_speed = 921600
|
||||||
upload_speed = 921600
|
monitor_speed = 115200
|
||||||
monitor_speed = 115200
|
;monitor_filters = direct
|
||||||
;monitor_filters = direct
|
monitor_filters = esp32_exception_decoder
|
||||||
monitor_filters =
|
esp8266_exception_decoder
|
||||||
esp32_exception_decoder
|
board_build.flash_mode = dio
|
||||||
esp8266_exception_decoder
|
board_build.filesystem = littlefs
|
||||||
board_build.flash_mode = dio
|
check_tool = ;pvs-studio
|
||||||
board_build.filesystem = littlefs
|
check_flags = ;pvs-studio: --analysis-mode=4 --exclude-path=./.pio/libdeps
|
||||||
check_tool = ; pvs-studio
|
|
||||||
check_flags =
|
|
||||||
; pvs-studio:
|
|
||||||
; --analysis-mode=4
|
|
||||||
; --exclude-path=./.pio/libdeps
|
|
||||||
|
|
||||||
; Defaults
|
; Defaults
|
||||||
[esp8266_defaults]
|
[esp8266_defaults]
|
||||||
platform = espressif8266@^4.2.1
|
platform = espressif8266@^4.2.1
|
||||||
platform_packages = ${env.platform_packages}
|
platform_packages = ${env.platform_packages}
|
||||||
lib_deps =
|
lib_deps = ${env.lib_deps}
|
||||||
${env.lib_deps}
|
nrwiersma/ESP8266Scheduler@^1.2
|
||||||
nrwiersma/ESP8266Scheduler@^1.2
|
lib_ignore =
|
||||||
lib_ignore =
|
extra_scripts = post:tools/build.py
|
||||||
extra_scripts =
|
build_type = ${env.build_type}
|
||||||
post:tools/build.py
|
build_flags = ${env.build_flags}
|
||||||
build_type = ${env.build_type}
|
-D PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
|
||||||
build_flags =
|
;-D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
|
||||||
${env.build_flags}
|
-D PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK305
|
||||||
-D PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
|
board_build.ldscript = eagle.flash.4m1m.ld
|
||||||
;-D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
|
check_tool = ${env.check_tool}
|
||||||
-D PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK305
|
check_flags = ${env.check_flags}
|
||||||
board_build.ldscript = eagle.flash.4m1m.ld
|
|
||||||
check_tool = ${env.check_tool}
|
|
||||||
check_flags = ${env.check_flags}
|
|
||||||
|
|
||||||
[esp32_defaults]
|
[esp32_defaults]
|
||||||
;platform = espressif32@^6.7
|
platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.32/platform-espressif32.zip
|
||||||
;platform = https://github.com/platformio/platform-espressif32.git
|
platform_packages = ${env.platform_packages}
|
||||||
;platform_packages =
|
board_build.partitions = esp32_partitions.csv
|
||||||
; framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.5
|
lib_deps = ${env.lib_deps}
|
||||||
; framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-33fbade6.zip
|
laxilef/ESP32Scheduler@^1.0.1
|
||||||
platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.34/platform-espressif32.zip
|
nimble_lib = h2zero/NimBLE-Arduino@2.3.6
|
||||||
platform_packages = ${env.platform_packages}
|
lib_ignore = ble
|
||||||
board_build.partitions = esp32_partitions.csv
|
BluetoothSerial
|
||||||
lib_deps =
|
SimpleBLE
|
||||||
${env.lib_deps}
|
ESP RainMaker
|
||||||
laxilef/ESP32Scheduler@^1.0.1
|
RainMaker
|
||||||
nimble_lib = h2zero/NimBLE-Arduino@2.3.7
|
ESP Insights
|
||||||
lib_ignore =
|
Insights
|
||||||
extra_scripts =
|
Zigbee
|
||||||
post:tools/esp32.py
|
Matter
|
||||||
post:tools/build.py
|
OpenThread
|
||||||
build_type = ${env.build_type}
|
dsp
|
||||||
build_flags =
|
custom_component_remove = espressif/esp_hosted
|
||||||
${env.build_flags}
|
espressif/esp_wifi_remote
|
||||||
-D CORE_DEBUG_LEVEL=0
|
espressif/esp-dsp
|
||||||
-Wl,--wrap=esp_panic_handler
|
espressif/esp_modem
|
||||||
check_tool = ${env.check_tool}
|
espressif/esp_rainmaker
|
||||||
check_flags = ${env.check_flags}
|
espressif/rmaker_common
|
||||||
|
espressif/esp_insights
|
||||||
|
espressif/esp_diag_data_store
|
||||||
|
espressif/esp_diagnostics
|
||||||
|
espressif/libsodium
|
||||||
|
espressif/esp-modbus
|
||||||
|
espressif/esp-cbor
|
||||||
|
espressif/esp-sr
|
||||||
|
espressif/esp32-camera
|
||||||
|
espressif/qrcode
|
||||||
|
espressif/esp-zboss-lib
|
||||||
|
espressif/esp-zigbee-lib
|
||||||
|
chmorgan/esp-libhelix-mp3
|
||||||
|
extra_scripts = post:tools/esp32.py
|
||||||
|
post:tools/build.py
|
||||||
|
build_type = ${env.build_type}
|
||||||
|
build_flags = ${env.build_flags}
|
||||||
|
-D CORE_DEBUG_LEVEL=0
|
||||||
|
-Wl,--wrap=esp_panic_handler
|
||||||
|
check_tool = ${env.check_tool}
|
||||||
|
check_flags = ${env.check_flags}
|
||||||
|
|
||||||
|
|
||||||
; Boards
|
; Boards
|
||||||
[env:d1_mini]
|
[env:d1_mini]
|
||||||
platform = ${esp8266_defaults.platform}
|
extends = esp8266_defaults
|
||||||
platform_packages = ${esp8266_defaults.platform_packages}
|
board = d1_mini
|
||||||
board = d1_mini
|
build_flags = ${esp8266_defaults.build_flags}
|
||||||
lib_deps = ${esp8266_defaults.lib_deps}
|
-D DEFAULT_OT_IN_GPIO=4
|
||||||
lib_ignore = ${esp8266_defaults.lib_ignore}
|
-D DEFAULT_OT_OUT_GPIO=5
|
||||||
extra_scripts = ${esp8266_defaults.extra_scripts}
|
-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
|
||||||
board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
|
-D DEFAULT_SENSOR_INDOOR_GPIO=14
|
||||||
build_type = ${esp8266_defaults.build_type}
|
-D DEFAULT_STATUS_LED_GPIO=13
|
||||||
build_flags =
|
-D DEFAULT_OT_RX_LED_GPIO=15
|
||||||
${esp8266_defaults.build_flags}
|
|
||||||
-D DEFAULT_OT_IN_GPIO=4
|
|
||||||
-D DEFAULT_OT_OUT_GPIO=5
|
|
||||||
-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
|
|
||||||
-D DEFAULT_SENSOR_INDOOR_GPIO=14
|
|
||||||
-D DEFAULT_STATUS_LED_GPIO=13
|
|
||||||
-D DEFAULT_OT_RX_LED_GPIO=15
|
|
||||||
check_tool = ${esp8266_defaults.check_tool}
|
|
||||||
check_flags = ${esp8266_defaults.check_flags}
|
|
||||||
|
|
||||||
[env:d1_mini_lite]
|
[env:d1_mini_lite]
|
||||||
platform = ${esp8266_defaults.platform}
|
extends = esp8266_defaults
|
||||||
platform_packages = ${esp8266_defaults.platform_packages}
|
board = d1_mini_lite
|
||||||
board = d1_mini_lite
|
build_flags = ${esp8266_defaults.build_flags}
|
||||||
lib_deps = ${esp8266_defaults.lib_deps}
|
-D DEFAULT_OT_IN_GPIO=4
|
||||||
lib_ignore = ${esp8266_defaults.lib_ignore}
|
-D DEFAULT_OT_OUT_GPIO=5
|
||||||
extra_scripts = ${esp8266_defaults.extra_scripts}
|
-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
|
||||||
board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
|
-D DEFAULT_SENSOR_INDOOR_GPIO=14
|
||||||
build_type = ${esp8266_defaults.build_type}
|
-D DEFAULT_STATUS_LED_GPIO=13
|
||||||
build_flags =
|
-D DEFAULT_OT_RX_LED_GPIO=15
|
||||||
${esp8266_defaults.build_flags}
|
|
||||||
-D DEFAULT_OT_IN_GPIO=4
|
|
||||||
-D DEFAULT_OT_OUT_GPIO=5
|
|
||||||
-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
|
|
||||||
-D DEFAULT_SENSOR_INDOOR_GPIO=14
|
|
||||||
-D DEFAULT_STATUS_LED_GPIO=13
|
|
||||||
-D DEFAULT_OT_RX_LED_GPIO=15
|
|
||||||
check_tool = ${esp8266_defaults.check_tool}
|
|
||||||
check_flags = ${esp8266_defaults.check_flags}
|
|
||||||
|
|
||||||
[env:d1_mini_pro]
|
[env:d1_mini_pro]
|
||||||
platform = ${esp8266_defaults.platform}
|
extends = esp8266_defaults
|
||||||
platform_packages = ${esp8266_defaults.platform_packages}
|
board = d1_mini_pro
|
||||||
board = d1_mini_pro
|
build_flags = ${esp8266_defaults.build_flags}
|
||||||
lib_deps = ${esp8266_defaults.lib_deps}
|
-D DEFAULT_OT_IN_GPIO=4
|
||||||
lib_ignore = ${esp8266_defaults.lib_ignore}
|
-D DEFAULT_OT_OUT_GPIO=5
|
||||||
extra_scripts = ${esp8266_defaults.extra_scripts}
|
-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
|
||||||
board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
|
-D DEFAULT_SENSOR_INDOOR_GPIO=14
|
||||||
build_type = ${esp8266_defaults.build_type}
|
-D DEFAULT_STATUS_LED_GPIO=13
|
||||||
build_flags =
|
-D DEFAULT_OT_RX_LED_GPIO=15
|
||||||
${esp8266_defaults.build_flags}
|
|
||||||
-D DEFAULT_OT_IN_GPIO=4
|
|
||||||
-D DEFAULT_OT_OUT_GPIO=5
|
|
||||||
-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
|
|
||||||
-D DEFAULT_SENSOR_INDOOR_GPIO=14
|
|
||||||
-D DEFAULT_STATUS_LED_GPIO=13
|
|
||||||
-D DEFAULT_OT_RX_LED_GPIO=15
|
|
||||||
check_tool = ${esp8266_defaults.check_tool}
|
|
||||||
check_flags = ${esp8266_defaults.check_flags}
|
|
||||||
|
|
||||||
[env:nodemcu_8266]
|
[env:nodemcu_8266]
|
||||||
platform = ${esp8266_defaults.platform}
|
extends = esp8266_defaults
|
||||||
platform_packages = ${esp8266_defaults.platform_packages}
|
board = nodemcuv2
|
||||||
board = nodemcuv2
|
build_flags = ${esp8266_defaults.build_flags}
|
||||||
lib_deps = ${esp8266_defaults.lib_deps}
|
-D DEFAULT_OT_IN_GPIO=13
|
||||||
lib_ignore = ${esp8266_defaults.lib_ignore}
|
-D DEFAULT_OT_OUT_GPIO=15
|
||||||
extra_scripts = ${esp8266_defaults.extra_scripts}
|
-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
|
||||||
board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
|
-D DEFAULT_SENSOR_INDOOR_GPIO=4
|
||||||
build_type = ${esp8266_defaults.build_type}
|
-D DEFAULT_STATUS_LED_GPIO=2
|
||||||
build_flags =
|
-D DEFAULT_OT_RX_LED_GPIO=16
|
||||||
${esp8266_defaults.build_flags}
|
|
||||||
-D DEFAULT_OT_IN_GPIO=13
|
|
||||||
-D DEFAULT_OT_OUT_GPIO=15
|
|
||||||
-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
|
|
||||||
-D DEFAULT_SENSOR_INDOOR_GPIO=4
|
|
||||||
-D DEFAULT_STATUS_LED_GPIO=2
|
|
||||||
-D DEFAULT_OT_RX_LED_GPIO=16
|
|
||||||
check_tool = ${esp8266_defaults.check_tool}
|
|
||||||
check_flags = ${esp8266_defaults.check_flags}
|
|
||||||
|
|
||||||
[env:s2_mini]
|
[env:s2_mini]
|
||||||
platform = ${esp32_defaults.platform}
|
extends = esp32_defaults
|
||||||
platform_packages = ${esp32_defaults.platform_packages}
|
board = lolin_s2_mini
|
||||||
board = lolin_s2_mini
|
build_unflags = -DARDUINO_USB_MODE=1
|
||||||
board_build.partitions = ${esp32_defaults.board_build.partitions}
|
build_flags = ${esp32_defaults.build_flags}
|
||||||
lib_deps = ${esp32_defaults.lib_deps}
|
-D ARDUINO_USB_MODE=0
|
||||||
lib_ignore = ${esp32_defaults.lib_ignore}
|
-D ARDUINO_USB_CDC_ON_BOOT=1
|
||||||
extra_scripts = ${esp32_defaults.extra_scripts}
|
-D DEFAULT_OT_IN_GPIO=33
|
||||||
build_unflags =
|
-D DEFAULT_OT_OUT_GPIO=35
|
||||||
-DARDUINO_USB_MODE=1
|
-D DEFAULT_SENSOR_OUTDOOR_GPIO=9
|
||||||
build_type = ${esp32_defaults.build_type}
|
-D DEFAULT_SENSOR_INDOOR_GPIO=7
|
||||||
build_flags =
|
-D DEFAULT_STATUS_LED_GPIO=11
|
||||||
${esp32_defaults.build_flags}
|
-D DEFAULT_OT_RX_LED_GPIO=12
|
||||||
-D ARDUINO_USB_MODE=0
|
|
||||||
-D ARDUINO_USB_CDC_ON_BOOT=1
|
|
||||||
-D DEFAULT_OT_IN_GPIO=33
|
|
||||||
-D DEFAULT_OT_OUT_GPIO=35
|
|
||||||
-D DEFAULT_SENSOR_OUTDOOR_GPIO=9
|
|
||||||
-D DEFAULT_SENSOR_INDOOR_GPIO=7
|
|
||||||
-D DEFAULT_STATUS_LED_GPIO=11
|
|
||||||
-D DEFAULT_OT_RX_LED_GPIO=12
|
|
||||||
check_tool = ${esp32_defaults.check_tool}
|
|
||||||
check_flags = ${esp32_defaults.check_flags}
|
|
||||||
|
|
||||||
[env:s3_mini]
|
[env:s3_mini]
|
||||||
platform = ${esp32_defaults.platform}
|
extends = esp32_defaults
|
||||||
platform_packages = ${esp32_defaults.platform_packages}
|
board = lolin_s3_mini
|
||||||
board = lolin_s3_mini
|
lib_deps = ${esp32_defaults.lib_deps}
|
||||||
board_build.partitions = ${esp32_defaults.board_build.partitions}
|
${esp32_defaults.nimble_lib}
|
||||||
lib_deps =
|
build_unflags = -DARDUINO_USB_MODE=1
|
||||||
${esp32_defaults.lib_deps}
|
build_flags = ${esp32_defaults.build_flags}
|
||||||
${esp32_defaults.nimble_lib}
|
-D ARDUINO_USB_MODE=0
|
||||||
lib_ignore = ${esp32_defaults.lib_ignore}
|
-D ARDUINO_USB_CDC_ON_BOOT=1
|
||||||
extra_scripts = ${esp32_defaults.extra_scripts}
|
-D USE_BLE=1
|
||||||
build_unflags =
|
-D DEFAULT_OT_IN_GPIO=35
|
||||||
-DARDUINO_USB_MODE=1
|
-D DEFAULT_OT_OUT_GPIO=36
|
||||||
build_type = ${esp32_defaults.build_type}
|
-D DEFAULT_SENSOR_OUTDOOR_GPIO=13
|
||||||
build_flags =
|
-D DEFAULT_SENSOR_INDOOR_GPIO=12
|
||||||
${esp32_defaults.build_flags}
|
-D DEFAULT_STATUS_LED_GPIO=11
|
||||||
-D ARDUINO_USB_MODE=0
|
-D DEFAULT_OT_RX_LED_GPIO=10
|
||||||
-D ARDUINO_USB_CDC_ON_BOOT=1
|
|
||||||
-D MYNEWT_VAL_BLE_EXT_ADV=1
|
|
||||||
-D USE_BLE=1
|
|
||||||
-D DEFAULT_OT_IN_GPIO=35
|
|
||||||
-D DEFAULT_OT_OUT_GPIO=36
|
|
||||||
-D DEFAULT_SENSOR_OUTDOOR_GPIO=13
|
|
||||||
-D DEFAULT_SENSOR_INDOOR_GPIO=12
|
|
||||||
-D DEFAULT_STATUS_LED_GPIO=11
|
|
||||||
-D DEFAULT_OT_RX_LED_GPIO=10
|
|
||||||
check_tool = ${esp32_defaults.check_tool}
|
|
||||||
check_flags = ${esp32_defaults.check_flags}
|
|
||||||
|
|
||||||
[env:c3_mini]
|
[env:c3_mini]
|
||||||
platform = ${esp32_defaults.platform}
|
extends = esp32_defaults
|
||||||
platform_packages = ${esp32_defaults.platform_packages}
|
board = lolin_c3_mini
|
||||||
board = lolin_c3_mini
|
lib_deps = ${esp32_defaults.lib_deps}
|
||||||
board_build.partitions = ${esp32_defaults.board_build.partitions}
|
${esp32_defaults.nimble_lib}
|
||||||
lib_deps =
|
build_unflags = -mtext-section-literals
|
||||||
${esp32_defaults.lib_deps}
|
build_flags = ${esp32_defaults.build_flags}
|
||||||
${esp32_defaults.nimble_lib}
|
-D USE_BLE=1
|
||||||
lib_ignore = ${esp32_defaults.lib_ignore}
|
-D DEFAULT_OT_IN_GPIO=8
|
||||||
extra_scripts = ${esp32_defaults.extra_scripts}
|
-D DEFAULT_OT_OUT_GPIO=10
|
||||||
build_unflags =
|
-D DEFAULT_SENSOR_OUTDOOR_GPIO=0
|
||||||
-mtext-section-literals
|
-D DEFAULT_SENSOR_INDOOR_GPIO=1
|
||||||
build_type = ${esp32_defaults.build_type}
|
-D DEFAULT_STATUS_LED_GPIO=4
|
||||||
build_flags =
|
-D DEFAULT_OT_RX_LED_GPIO=5
|
||||||
${esp32_defaults.build_flags}
|
|
||||||
-D MYNEWT_VAL_BLE_EXT_ADV=1
|
|
||||||
-D USE_BLE=1
|
|
||||||
-D DEFAULT_OT_IN_GPIO=8
|
|
||||||
-D DEFAULT_OT_OUT_GPIO=10
|
|
||||||
-D DEFAULT_SENSOR_OUTDOOR_GPIO=0
|
|
||||||
-D DEFAULT_SENSOR_INDOOR_GPIO=1
|
|
||||||
-D DEFAULT_STATUS_LED_GPIO=4
|
|
||||||
-D DEFAULT_OT_RX_LED_GPIO=5
|
|
||||||
check_tool = ${esp32_defaults.check_tool}
|
|
||||||
check_flags = ${esp32_defaults.check_flags}
|
|
||||||
|
|
||||||
[env:nodemcu_32]
|
[env:nodemcu_32]
|
||||||
platform = ${esp32_defaults.platform}
|
extends = esp32_defaults
|
||||||
platform_packages = ${esp32_defaults.platform_packages}
|
board = nodemcu-32s
|
||||||
board = nodemcu-32s
|
lib_deps = ${esp32_defaults.lib_deps}
|
||||||
board_build.partitions = ${esp32_defaults.board_build.partitions}
|
${esp32_defaults.nimble_lib}
|
||||||
lib_deps =
|
build_flags = ${esp32_defaults.build_flags}
|
||||||
${esp32_defaults.lib_deps}
|
-D USE_BLE=1
|
||||||
${esp32_defaults.nimble_lib}
|
-D DEFAULT_OT_IN_GPIO=16
|
||||||
lib_ignore = ${esp32_defaults.lib_ignore}
|
-D DEFAULT_OT_OUT_GPIO=4
|
||||||
extra_scripts = ${esp32_defaults.extra_scripts}
|
-D DEFAULT_SENSOR_OUTDOOR_GPIO=15
|
||||||
build_type = ${esp32_defaults.build_type}
|
-D DEFAULT_SENSOR_INDOOR_GPIO=26
|
||||||
build_flags =
|
-D DEFAULT_STATUS_LED_GPIO=2
|
||||||
${esp32_defaults.build_flags}
|
-D DEFAULT_OT_RX_LED_GPIO=19
|
||||||
-D USE_BLE=1
|
|
||||||
-D DEFAULT_OT_IN_GPIO=16
|
|
||||||
-D DEFAULT_OT_OUT_GPIO=4
|
|
||||||
-D DEFAULT_SENSOR_OUTDOOR_GPIO=15
|
|
||||||
-D DEFAULT_SENSOR_INDOOR_GPIO=26
|
|
||||||
-D DEFAULT_STATUS_LED_GPIO=2
|
|
||||||
-D DEFAULT_OT_RX_LED_GPIO=19
|
|
||||||
check_tool = ${esp32_defaults.check_tool}
|
|
||||||
check_flags = ${esp32_defaults.check_flags}
|
|
||||||
|
|
||||||
[env:nodemcu_32_160mhz]
|
[env:nodemcu_32_160mhz]
|
||||||
extends = env:nodemcu_32
|
extends = env:nodemcu_32
|
||||||
board_build.f_cpu = 160000000L ; set frequency to 160MHz
|
board_build.f_cpu = 160000000L ; set frequency to 160MHz
|
||||||
|
|
||||||
[env:d1_mini32]
|
[env:d1_mini32]
|
||||||
platform = ${esp32_defaults.platform}
|
extends = esp32_defaults
|
||||||
platform_packages = ${esp32_defaults.platform_packages}
|
board = wemos_d1_mini32
|
||||||
board = wemos_d1_mini32
|
lib_deps = ${esp32_defaults.lib_deps}
|
||||||
board_build.partitions = ${esp32_defaults.board_build.partitions}
|
${esp32_defaults.nimble_lib}
|
||||||
lib_deps =
|
build_flags = ${esp32_defaults.build_flags}
|
||||||
${esp32_defaults.lib_deps}
|
-D USE_BLE=1
|
||||||
${esp32_defaults.nimble_lib}
|
-D DEFAULT_OT_IN_GPIO=21
|
||||||
lib_ignore = ${esp32_defaults.lib_ignore}
|
-D DEFAULT_OT_OUT_GPIO=22
|
||||||
extra_scripts = ${esp32_defaults.extra_scripts}
|
-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
|
||||||
build_type = ${esp32_defaults.build_type}
|
-D DEFAULT_SENSOR_INDOOR_GPIO=18
|
||||||
build_flags =
|
-D DEFAULT_STATUS_LED_GPIO=2
|
||||||
${esp32_defaults.build_flags}
|
-D DEFAULT_OT_RX_LED_GPIO=19
|
||||||
-D USE_BLE=1
|
|
||||||
-D DEFAULT_OT_IN_GPIO=21
|
|
||||||
-D DEFAULT_OT_OUT_GPIO=22
|
|
||||||
-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
|
|
||||||
-D DEFAULT_SENSOR_INDOOR_GPIO=18
|
|
||||||
-D DEFAULT_STATUS_LED_GPIO=2
|
|
||||||
-D DEFAULT_OT_RX_LED_GPIO=19
|
|
||||||
check_tool = ${esp32_defaults.check_tool}
|
|
||||||
check_flags = ${esp32_defaults.check_flags}
|
|
||||||
|
|
||||||
[env:esp32_c6]
|
[env:esp32_c6]
|
||||||
platform = ${esp32_defaults.platform}
|
extends = esp32_defaults
|
||||||
framework = arduino, espidf
|
board = esp32-c6-devkitc-1
|
||||||
platform_packages = ${esp32_defaults.platform_packages}
|
lib_deps = ${esp32_defaults.lib_deps}
|
||||||
board = esp32-c6-devkitm-1
|
${esp32_defaults.nimble_lib}
|
||||||
board_build.partitions = ${esp32_defaults.board_build.partitions}
|
build_unflags = -mtext-section-literals
|
||||||
board_build.embed_txtfiles =
|
build_flags = ${esp32_defaults.build_flags}
|
||||||
managed_components/espressif__esp_insights/server_certs/https_server.crt
|
-D USE_BLE=1
|
||||||
managed_components/espressif__esp_rainmaker/server_certs/rmaker_mqtt_server.crt
|
-D DEFAULT_OT_IN_GPIO=15
|
||||||
managed_components/espressif__esp_rainmaker/server_certs/rmaker_claim_service_server.crt
|
-D DEFAULT_OT_OUT_GPIO=23
|
||||||
managed_components/espressif__esp_rainmaker/server_certs/rmaker_ota_server.crt
|
-D DEFAULT_SENSOR_OUTDOOR_GPIO=0
|
||||||
lib_deps = ${esp32_defaults.lib_deps}
|
-D DEFAULT_SENSOR_INDOOR_GPIO=0
|
||||||
lib_ignore =
|
-D DEFAULT_STATUS_LED_GPIO=11
|
||||||
${esp32_defaults.lib_ignore}
|
-D DEFAULT_OT_RX_LED_GPIO=10
|
||||||
extra_scripts = ${esp32_defaults.extra_scripts}
|
|
||||||
build_unflags =
|
|
||||||
-mtext-section-literals
|
|
||||||
build_type = ${esp32_defaults.build_type}
|
|
||||||
build_flags =
|
|
||||||
${esp32_defaults.build_flags}
|
|
||||||
-D USE_BLE=1
|
|
||||||
-D DEFAULT_OT_IN_GPIO=15
|
|
||||||
-D DEFAULT_OT_OUT_GPIO=23
|
|
||||||
-D DEFAULT_SENSOR_OUTDOOR_GPIO=0
|
|
||||||
-D DEFAULT_SENSOR_INDOOR_GPIO=0
|
|
||||||
-D DEFAULT_STATUS_LED_GPIO=11
|
|
||||||
-D DEFAULT_OT_RX_LED_GPIO=10
|
|
||||||
check_tool = ${esp32_defaults.check_tool}
|
|
||||||
check_flags = ${esp32_defaults.check_flags}
|
|
||||||
|
|
||||||
[env:otthing]
|
[env:otthing]
|
||||||
platform = ${esp32_defaults.platform}
|
extends = esp32_defaults
|
||||||
platform_packages = ${esp32_defaults.platform_packages}
|
board = lolin_c3_mini
|
||||||
board = lolin_c3_mini
|
lib_deps = ${esp32_defaults.lib_deps}
|
||||||
board_build.partitions = ${esp32_defaults.board_build.partitions}
|
${esp32_defaults.nimble_lib}
|
||||||
lib_deps =
|
build_unflags = -mtext-section-literals
|
||||||
${esp32_defaults.lib_deps}
|
build_flags = ${esp32_defaults.build_flags}
|
||||||
${esp32_defaults.nimble_lib}
|
-D USE_BLE=1
|
||||||
lib_ignore = ${esp32_defaults.lib_ignore}
|
-D DEFAULT_OT_IN_GPIO=3
|
||||||
extra_scripts = ${esp32_defaults.extra_scripts}
|
-D DEFAULT_OT_OUT_GPIO=1
|
||||||
build_unflags =
|
;-D DEFAULT_SENSOR_OUTDOOR_GPIO=0
|
||||||
-mtext-section-literals
|
;-D DEFAULT_SENSOR_INDOOR_GPIO=1
|
||||||
build_type = ${esp32_defaults.build_type}
|
-D DEFAULT_STATUS_LED_GPIO=8
|
||||||
build_flags =
|
-D DEFAULT_OT_RX_LED_GPIO=2
|
||||||
${esp32_defaults.build_flags}
|
-D OT_BYPASS_RELAY_GPIO=20
|
||||||
-D MYNEWT_VAL_BLE_EXT_ADV=1
|
|
||||||
-D USE_BLE=1
|
|
||||||
-D DEFAULT_OT_IN_GPIO=3
|
|
||||||
-D DEFAULT_OT_OUT_GPIO=1
|
|
||||||
; -D DEFAULT_SENSOR_OUTDOOR_GPIO=0
|
|
||||||
; -D DEFAULT_SENSOR_INDOOR_GPIO=1
|
|
||||||
-D DEFAULT_STATUS_LED_GPIO=8
|
|
||||||
-D DEFAULT_OT_RX_LED_GPIO=2
|
|
||||||
-D OT_BYPASS_RELAY_GPIO=20
|
|
||||||
check_tool = ${esp32_defaults.check_tool}
|
|
||||||
check_flags = ${esp32_defaults.check_flags}
|
|
||||||
|
|||||||
257
src/HaHelper.h
257
src/HaHelper.h
@@ -261,13 +261,8 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
// object id's
|
// object id's
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(objId.c_str());
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(objId.c_str());
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
sSensor.type == Sensors::Type::MANUAL
|
|
||||||
? FPSTR(HA_ENTITY_NUMBER)
|
|
||||||
: FPSTR(HA_ENTITY_SENSOR),
|
|
||||||
objId.c_str()
|
|
||||||
);
|
|
||||||
|
|
||||||
const String& configTopic = this->makeConfigTopic(
|
const String& configTopic = this->makeConfigTopic(
|
||||||
sSensor.type == Sensors::Type::MANUAL ? FPSTR(HA_ENTITY_NUMBER) : FPSTR(HA_ENTITY_SENSOR),
|
sSensor.type == Sensors::Type::MANUAL ? FPSTR(HA_ENTITY_NUMBER) : FPSTR(HA_ENTITY_SENSOR),
|
||||||
@@ -328,8 +323,8 @@ public:
|
|||||||
String objId = Sensors::makeObjectIdWithSuffix(sSensor.name, F("connected"));
|
String objId = Sensors::makeObjectIdWithSuffix(sSensor.name, F("connected"));
|
||||||
|
|
||||||
// object id's
|
// object id's
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(objId.c_str());
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(objId.c_str());
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), objId.c_str());
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
|
|
||||||
// state topic
|
// state topic
|
||||||
doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(
|
doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(
|
||||||
@@ -375,8 +370,8 @@ public:
|
|||||||
String objId = Sensors::makeObjectIdWithSuffix(sSensor.name, F("signal_quality"));
|
String objId = Sensors::makeObjectIdWithSuffix(sSensor.name, F("signal_quality"));
|
||||||
|
|
||||||
// object id's
|
// object id's
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(objId.c_str());
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(objId.c_str());
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), objId.c_str());
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
|
|
||||||
// state topic
|
// state topic
|
||||||
doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(
|
doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(
|
||||||
@@ -412,6 +407,7 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool deleteSignalQualityDynamicSensor(Sensors::Settings& sSensor) {
|
bool deleteSignalQualityDynamicSensor(Sensors::Settings& sSensor) {
|
||||||
|
JsonDocument doc;
|
||||||
const String& configTopic = this->makeConfigTopic(
|
const String& configTopic = this->makeConfigTopic(
|
||||||
FPSTR(HA_ENTITY_SENSOR),
|
FPSTR(HA_ENTITY_SENSOR),
|
||||||
Sensors::makeObjectIdWithSuffix(sSensor.name, F("signal_quality")).c_str()
|
Sensors::makeObjectIdWithSuffix(sSensor.name, F("signal_quality")).c_str()
|
||||||
@@ -425,8 +421,8 @@ public:
|
|||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating_turbo"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating_turbo"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SWITCH), F("heating_turbo"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
||||||
doc[FPSTR(HA_NAME)] = F("Turbo heating");
|
doc[FPSTR(HA_NAME)] = F("Turbo heating");
|
||||||
doc[FPSTR(HA_ICON)] = F("mdi:rocket-launch-outline");
|
doc[FPSTR(HA_ICON)] = F("mdi:rocket-launch-outline");
|
||||||
@@ -443,34 +439,12 @@ public:
|
|||||||
return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_SWITCH), F("heating_turbo")).c_str(), doc);
|
return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_SWITCH), F("heating_turbo")).c_str(), doc);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool publishSwitchHeatingHysteresis(bool enabledByDefault = true) {
|
|
||||||
JsonDocument doc;
|
|
||||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating_hysteresis"));
|
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SWITCH), F("heating_hysteresis"));
|
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
|
||||||
doc[FPSTR(HA_NAME)] = F("Use heating hysteresis");
|
|
||||||
doc[FPSTR(HA_ICON)] = F("mdi:altimeter");
|
|
||||||
doc[FPSTR(HA_STATE_TOPIC)] = this->settingsTopic.c_str();
|
|
||||||
doc[FPSTR(HA_STATE_ON)] = true;
|
|
||||||
doc[FPSTR(HA_STATE_OFF)] = false;
|
|
||||||
doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.heating.hysteresis.enabled }}");
|
|
||||||
doc[FPSTR(HA_COMMAND_TOPIC)] = this->setSettingsTopic.c_str();
|
|
||||||
doc[FPSTR(HA_PAYLOAD_ON)] = F("{\"heating\": {\"hysteresis\" : {\"enabled\" : true}}}");
|
|
||||||
doc[FPSTR(HA_PAYLOAD_OFF)] = F("{\"heating\": {\"hysteresis\" : {\"enabled\" : false}}}");
|
|
||||||
doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
|
|
||||||
doc.shrinkToFit();
|
|
||||||
|
|
||||||
return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_SWITCH), F("heating_hysteresis")).c_str(), doc);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool publishInputHeatingHysteresis(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
|
bool publishInputHeatingHysteresis(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
|
||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating_hysteresis"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating_hysteresis"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("heating_hysteresis"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
||||||
doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
|
doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
|
||||||
|
|
||||||
@@ -484,9 +458,9 @@ public:
|
|||||||
doc[FPSTR(HA_NAME)] = F("Heating hysteresis");
|
doc[FPSTR(HA_NAME)] = F("Heating hysteresis");
|
||||||
doc[FPSTR(HA_ICON)] = F("mdi:altimeter");
|
doc[FPSTR(HA_ICON)] = F("mdi:altimeter");
|
||||||
doc[FPSTR(HA_STATE_TOPIC)] = this->settingsTopic.c_str();
|
doc[FPSTR(HA_STATE_TOPIC)] = this->settingsTopic.c_str();
|
||||||
doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.heating.hysteresis.value|float(0)|round(2) }}");
|
doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.heating.hysteresis|float(0)|round(2) }}");
|
||||||
doc[FPSTR(HA_COMMAND_TOPIC)] = this->setSettingsTopic.c_str();
|
doc[FPSTR(HA_COMMAND_TOPIC)] = this->setSettingsTopic.c_str();
|
||||||
doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"heating\": {\"hysteresis\" : {\"value\" : {{ value }}}}}");
|
doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"heating\": {\"hysteresis\" : {{ value }}}}");
|
||||||
doc[FPSTR(HA_MIN)] = 0;
|
doc[FPSTR(HA_MIN)] = 0;
|
||||||
doc[FPSTR(HA_MAX)] = 15;
|
doc[FPSTR(HA_MAX)] = 15;
|
||||||
doc[FPSTR(HA_STEP)] = 0.01f;
|
doc[FPSTR(HA_STEP)] = 0.01f;
|
||||||
@@ -501,8 +475,8 @@ public:
|
|||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating_turbo_factor"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating_turbo_factor"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("heating_turbo_factor"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
||||||
doc[FPSTR(HA_DEVICE_CLASS)] = F("power_factor");
|
doc[FPSTR(HA_DEVICE_CLASS)] = F("power_factor");
|
||||||
doc[FPSTR(HA_NAME)] = F("Heating turbo factor");
|
doc[FPSTR(HA_NAME)] = F("Heating turbo factor");
|
||||||
@@ -525,8 +499,8 @@ public:
|
|||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating_min_temp"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating_min_temp"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("heating_min_temp"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
||||||
doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
|
doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
|
||||||
|
|
||||||
@@ -559,8 +533,8 @@ public:
|
|||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating_max_temp"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating_max_temp"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("heating_max_temp"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
||||||
doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
|
doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
|
||||||
|
|
||||||
@@ -594,8 +568,8 @@ public:
|
|||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("dhw_min_temp"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("dhw_min_temp"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("dhw_min_temp"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
||||||
doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
|
doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
|
||||||
|
|
||||||
@@ -628,8 +602,8 @@ public:
|
|||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("dhw_max_temp"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("dhw_max_temp"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("dhw_max_temp"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
||||||
doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
|
doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
|
||||||
|
|
||||||
@@ -663,8 +637,8 @@ public:
|
|||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("pid"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SWITCH), F("pid"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
||||||
doc[FPSTR(HA_NAME)] = F("PID");
|
doc[FPSTR(HA_NAME)] = F("PID");
|
||||||
doc[FPSTR(HA_ICON)] = F("mdi:chart-bar-stacked");
|
doc[FPSTR(HA_ICON)] = F("mdi:chart-bar-stacked");
|
||||||
@@ -685,8 +659,8 @@ public:
|
|||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_p"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("pid_p"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_p"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
||||||
doc[FPSTR(HA_NAME)] = F("PID factor P");
|
doc[FPSTR(HA_NAME)] = F("PID factor P");
|
||||||
doc[FPSTR(HA_ICON)] = F("mdi:alpha-p-circle-outline");
|
doc[FPSTR(HA_ICON)] = F("mdi:alpha-p-circle-outline");
|
||||||
@@ -708,8 +682,8 @@ public:
|
|||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_i"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("pid_i"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_i"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
||||||
doc[FPSTR(HA_NAME)] = F("PID factor I");
|
doc[FPSTR(HA_NAME)] = F("PID factor I");
|
||||||
doc[FPSTR(HA_ICON)] = F("mdi:alpha-i-circle-outline");
|
doc[FPSTR(HA_ICON)] = F("mdi:alpha-i-circle-outline");
|
||||||
@@ -731,8 +705,8 @@ public:
|
|||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_d"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("pid_d"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_d"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
||||||
doc[FPSTR(HA_NAME)] = F("PID factor D");
|
doc[FPSTR(HA_NAME)] = F("PID factor D");
|
||||||
doc[FPSTR(HA_ICON)] = F("mdi:alpha-d-circle-outline");
|
doc[FPSTR(HA_ICON)] = F("mdi:alpha-d-circle-outline");
|
||||||
@@ -754,8 +728,8 @@ public:
|
|||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_dt"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("pid_dt"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_dt"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
||||||
doc[FPSTR(HA_DEVICE_CLASS)] = F("duration");
|
doc[FPSTR(HA_DEVICE_CLASS)] = F("duration");
|
||||||
doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("s");
|
doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("s");
|
||||||
@@ -779,8 +753,8 @@ public:
|
|||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_min_temp"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("pid_min_temp"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_min_temp"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
||||||
doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
|
doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
|
||||||
|
|
||||||
@@ -813,8 +787,8 @@ public:
|
|||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("pid_max_temp"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("pid_max_temp"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("pid_max_temp"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
||||||
doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
|
doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
|
||||||
|
|
||||||
@@ -848,8 +822,8 @@ public:
|
|||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("equitherm"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("equitherm"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SWITCH), F("equitherm"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
||||||
doc[FPSTR(HA_NAME)] = F("Equitherm");
|
doc[FPSTR(HA_NAME)] = F("Equitherm");
|
||||||
doc[FPSTR(HA_ICON)] = F("mdi:sun-snowflake-variant");
|
doc[FPSTR(HA_ICON)] = F("mdi:sun-snowflake-variant");
|
||||||
@@ -866,19 +840,19 @@ public:
|
|||||||
return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_SWITCH), F("equitherm")).c_str(), doc);
|
return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_SWITCH), F("equitherm")).c_str(), doc);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool publishInputEquithermSlope(bool enabledByDefault = true) {
|
bool publishInputEquithermFactorN(bool enabledByDefault = true) {
|
||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("equitherm_slope"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("equitherm_n"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("equitherm_slope"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
||||||
doc[FPSTR(HA_NAME)] = F("Equitherm slope");
|
doc[FPSTR(HA_NAME)] = F("Equitherm factor N");
|
||||||
doc[FPSTR(HA_ICON)] = F("mdi:slope-uphill");
|
doc[FPSTR(HA_ICON)] = F("mdi:alpha-n-circle-outline");
|
||||||
doc[FPSTR(HA_STATE_TOPIC)] = this->settingsTopic.c_str();
|
doc[FPSTR(HA_STATE_TOPIC)] = this->settingsTopic.c_str();
|
||||||
doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.equitherm.slope|float(0)|round(3) }}");
|
doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.equitherm.n_factor|float(0)|round(3) }}");
|
||||||
doc[FPSTR(HA_COMMAND_TOPIC)] = this->setSettingsTopic.c_str();
|
doc[FPSTR(HA_COMMAND_TOPIC)] = this->setSettingsTopic.c_str();
|
||||||
doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"equitherm\": {\"slope\" : {{ value }}}}");
|
doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"equitherm\": {\"n_factor\" : {{ value }}}}");
|
||||||
doc[FPSTR(HA_MIN)] = 0.001f;
|
doc[FPSTR(HA_MIN)] = 0.001f;
|
||||||
doc[FPSTR(HA_MAX)] = 10;
|
doc[FPSTR(HA_MAX)] = 10;
|
||||||
doc[FPSTR(HA_STEP)] = 0.001f;
|
doc[FPSTR(HA_STEP)] = 0.001f;
|
||||||
@@ -886,88 +860,64 @@ public:
|
|||||||
doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
|
doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
|
||||||
doc.shrinkToFit();
|
doc.shrinkToFit();
|
||||||
|
|
||||||
return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_NUMBER), F("equitherm_slope")).c_str(), doc);
|
return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_NUMBER), F("equitherm_n_factor")).c_str(), doc);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool publishInputEquithermExponent(bool enabledByDefault = true) {
|
bool publishInputEquithermFactorK(bool enabledByDefault = true) {
|
||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("equitherm_exponent"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("equitherm_k"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("equitherm_exponent"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
||||||
doc[FPSTR(HA_NAME)] = F("Equitherm exponent");
|
doc[FPSTR(HA_NAME)] = F("Equitherm factor K");
|
||||||
doc[FPSTR(HA_ICON)] = F("mdi:exponent");
|
doc[FPSTR(HA_ICON)] = F("mdi:alpha-k-circle-outline");
|
||||||
doc[FPSTR(HA_STATE_TOPIC)] = this->settingsTopic.c_str();
|
doc[FPSTR(HA_STATE_TOPIC)] = this->settingsTopic.c_str();
|
||||||
doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.equitherm.exponent|float(0)|round(3) }}");
|
doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.equitherm.k_factor|float(0)|round(2) }}");
|
||||||
doc[FPSTR(HA_COMMAND_TOPIC)] = this->setSettingsTopic.c_str();
|
doc[FPSTR(HA_COMMAND_TOPIC)] = this->setSettingsTopic.c_str();
|
||||||
doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"equitherm\": {\"exponent\" : {{ value }}}}");
|
doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"equitherm\": {\"k_factor\" : {{ value }}}}");
|
||||||
doc[FPSTR(HA_MIN)] = 0.1;
|
doc[FPSTR(HA_MIN)] = 0;
|
||||||
doc[FPSTR(HA_MAX)] = 2;
|
doc[FPSTR(HA_MAX)] = 10;
|
||||||
doc[FPSTR(HA_STEP)] = 0.001f;
|
|
||||||
doc[FPSTR(HA_MODE)] = FPSTR(HA_MODE_BOX);
|
|
||||||
doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
|
|
||||||
doc.shrinkToFit();
|
|
||||||
|
|
||||||
return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_NUMBER), F("equitherm_exponent")).c_str(), doc);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool publishInputEquithermShift(bool enabledByDefault = true) {
|
|
||||||
JsonDocument doc;
|
|
||||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("equitherm_shift"));
|
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("equitherm_shift"));
|
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
|
||||||
doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
|
|
||||||
doc[FPSTR(HA_NAME)] = F("Equitherm shift");
|
|
||||||
doc[FPSTR(HA_ICON)] = F("mdi:chart-areaspline");
|
|
||||||
doc[FPSTR(HA_STATE_TOPIC)] = this->settingsTopic.c_str();
|
|
||||||
doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.equitherm.shift|float(0)|round(2) }}");
|
|
||||||
doc[FPSTR(HA_COMMAND_TOPIC)] = this->setSettingsTopic.c_str();
|
|
||||||
doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"equitherm\": {\"shift\" : {{ value }}}}");
|
|
||||||
doc[FPSTR(HA_MIN)] = -15;
|
|
||||||
doc[FPSTR(HA_MAX)] = 15;
|
|
||||||
doc[FPSTR(HA_STEP)] = 0.01f;
|
doc[FPSTR(HA_STEP)] = 0.01f;
|
||||||
doc[FPSTR(HA_MODE)] = FPSTR(HA_MODE_BOX);
|
doc[FPSTR(HA_MODE)] = FPSTR(HA_MODE_BOX);
|
||||||
doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
|
doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
|
||||||
doc.shrinkToFit();
|
doc.shrinkToFit();
|
||||||
|
|
||||||
return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_NUMBER), F("equitherm_shift")).c_str(), doc);
|
return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_NUMBER), F("equitherm_k_factor")).c_str(), doc);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool publishInputEquithermTargetDiffFactor(bool enabledByDefault = true) {
|
bool publishInputEquithermFactorT(bool enabledByDefault = true) {
|
||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc[FPSTR(HA_AVAILABILITY)][0][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
doc[FPSTR(HA_AVAILABILITY)][0][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||||
doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = this->settingsTopic.c_str();
|
doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = this->settingsTopic.c_str();
|
||||||
doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.pid.enabled, 'offline', 'online') }}");
|
doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.pid.enabled, 'offline', 'online') }}");
|
||||||
doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
|
doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("equitherm_target_diff_factor"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("equitherm_t"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_NUMBER), F("equitherm_target_diff_factor"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
||||||
doc[FPSTR(HA_NAME)] = F("Equitherm target diff factor");
|
doc[FPSTR(HA_NAME)] = F("Equitherm factor T");
|
||||||
doc[FPSTR(HA_ICON)] = F("mdi:chart-timeline-variant-shimmer");
|
doc[FPSTR(HA_ICON)] = F("mdi:alpha-t-circle-outline");
|
||||||
doc[FPSTR(HA_STATE_TOPIC)] = this->settingsTopic.c_str();
|
doc[FPSTR(HA_STATE_TOPIC)] = this->settingsTopic.c_str();
|
||||||
doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.equitherm.targetDiffFactor|float(0)|round(3) }}");
|
doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.equitherm.t_factor|float(0)|round(2) }}");
|
||||||
doc[FPSTR(HA_COMMAND_TOPIC)] = this->setSettingsTopic.c_str();
|
doc[FPSTR(HA_COMMAND_TOPIC)] = this->setSettingsTopic.c_str();
|
||||||
doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"equitherm\": {\"targetDiffFactor\" : {{ value }}}}");
|
doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"equitherm\": {\"t_factor\" : {{ value }}}}");
|
||||||
doc[FPSTR(HA_MIN)] = 0;
|
doc[FPSTR(HA_MIN)] = 0;
|
||||||
doc[FPSTR(HA_MAX)] = 10;
|
doc[FPSTR(HA_MAX)] = 10;
|
||||||
doc[FPSTR(HA_STEP)] = 0.001f;
|
doc[FPSTR(HA_STEP)] = 0.01f;
|
||||||
doc[FPSTR(HA_MODE)] = FPSTR(HA_MODE_BOX);
|
doc[FPSTR(HA_MODE)] = FPSTR(HA_MODE_BOX);
|
||||||
doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
|
doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
|
||||||
doc.shrinkToFit();
|
doc.shrinkToFit();
|
||||||
|
|
||||||
return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_NUMBER), F("equitherm_target_diff_factor")).c_str(), doc);
|
return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_NUMBER), F("equitherm_t_factor")).c_str(), doc);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool publishStatusState(bool enabledByDefault = true) {
|
bool publishStatusState(bool enabledByDefault = true) {
|
||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("status"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("status"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("status"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
|
||||||
doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
|
doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
|
||||||
doc[FPSTR(HA_NAME)] = F("Status");
|
doc[FPSTR(HA_NAME)] = F("Status");
|
||||||
@@ -984,8 +934,8 @@ public:
|
|||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("emergency"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("emergency"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("emergency"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
|
||||||
doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
|
doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
|
||||||
doc[FPSTR(HA_NAME)] = F("Emergency");
|
doc[FPSTR(HA_NAME)] = F("Emergency");
|
||||||
@@ -1002,8 +952,8 @@ public:
|
|||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("ot_status"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("ot_status"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("ot_status"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
|
||||||
doc[FPSTR(HA_DEVICE_CLASS)] = F("connectivity");
|
doc[FPSTR(HA_DEVICE_CLASS)] = F("connectivity");
|
||||||
doc[FPSTR(HA_NAME)] = F("Opentherm status");
|
doc[FPSTR(HA_NAME)] = F("Opentherm status");
|
||||||
@@ -1023,8 +973,9 @@ public:
|
|||||||
doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
|
doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
|
||||||
doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
|
doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("heating"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
|
//doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
|
||||||
doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
|
doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
|
||||||
doc[FPSTR(HA_NAME)] = F("Heating");
|
doc[FPSTR(HA_NAME)] = F("Heating");
|
||||||
doc[FPSTR(HA_ICON)] = F("mdi:radiator");
|
doc[FPSTR(HA_ICON)] = F("mdi:radiator");
|
||||||
@@ -1043,8 +994,9 @@ public:
|
|||||||
doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
|
doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
|
||||||
doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
|
doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("dhw"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("dhw"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("dhw"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
|
//doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
|
||||||
doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
|
doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
|
||||||
doc[FPSTR(HA_NAME)] = F("DHW");
|
doc[FPSTR(HA_NAME)] = F("DHW");
|
||||||
doc[FPSTR(HA_ICON)] = F("mdi:faucet");
|
doc[FPSTR(HA_ICON)] = F("mdi:faucet");
|
||||||
@@ -1063,8 +1015,9 @@ public:
|
|||||||
doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
|
doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
|
||||||
doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
|
doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("flame"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("flame"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("flame"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
|
//doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
|
||||||
doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
|
doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
|
||||||
doc[FPSTR(HA_NAME)] = F("Flame");
|
doc[FPSTR(HA_NAME)] = F("Flame");
|
||||||
doc[FPSTR(HA_ICON)] = F("mdi:gas-burner");
|
doc[FPSTR(HA_ICON)] = F("mdi:gas-burner");
|
||||||
@@ -1083,8 +1036,8 @@ public:
|
|||||||
doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
|
doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
|
||||||
doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
|
doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("fault"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("fault"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("fault"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
|
||||||
doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
|
doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
|
||||||
doc[FPSTR(HA_NAME)] = F("Fault");
|
doc[FPSTR(HA_NAME)] = F("Fault");
|
||||||
@@ -1104,8 +1057,8 @@ public:
|
|||||||
doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
|
doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_OT_CONN, true);
|
||||||
doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
|
doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
|
||||||
doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
|
doc[FPSTR(HA_DEVICE_CLASS)] = F("problem");
|
||||||
doc[FPSTR(HA_NAME)] = F("Diagnostic");
|
doc[FPSTR(HA_NAME)] = F("Diagnostic");
|
||||||
@@ -1122,8 +1075,8 @@ public:
|
|||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("ext_pump"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("ext_pump"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BINARY_SENSOR), F("ext_pump"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
|
||||||
doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
|
doc[FPSTR(HA_DEVICE_CLASS)] = F("running");
|
||||||
doc[FPSTR(HA_NAME)] = F("External pump");
|
doc[FPSTR(HA_NAME)] = F("External pump");
|
||||||
@@ -1143,8 +1096,8 @@ public:
|
|||||||
doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.slave.connected and value_json.slave.fault.active, 'online', 'offline') }}");
|
doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.slave.connected and value_json.slave.fault.active, 'online', 'offline') }}");
|
||||||
doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
|
doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("fault_code"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("fault_code"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), F("fault_code"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
|
||||||
doc[FPSTR(HA_NAME)] = F("Fault code");
|
doc[FPSTR(HA_NAME)] = F("Fault code");
|
||||||
doc[FPSTR(HA_ICON)] = F("mdi:cog-box");
|
doc[FPSTR(HA_ICON)] = F("mdi:cog-box");
|
||||||
@@ -1163,8 +1116,8 @@ public:
|
|||||||
doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.slave.connected and value_json.slave.fault.active or value_json.slave.diag.active, 'online', 'offline') }}");
|
doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.slave.connected and value_json.slave.fault.active or value_json.slave.diag.active, 'online', 'offline') }}");
|
||||||
doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
|
doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("diagnostic_code"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("diagnostic_code"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), F("diagnostic_code"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
|
||||||
doc[FPSTR(HA_NAME)] = F("Diagnostic code");
|
doc[FPSTR(HA_NAME)] = F("Diagnostic code");
|
||||||
doc[FPSTR(HA_ICON)] = F("mdi:information-box");
|
doc[FPSTR(HA_ICON)] = F("mdi:information-box");
|
||||||
@@ -1180,8 +1133,8 @@ public:
|
|||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(FPSTR(S_RSSI));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(FPSTR(S_RSSI));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), FPSTR(S_RSSI));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
|
||||||
doc[FPSTR(HA_DEVICE_CLASS)] = F("signal_strength");
|
doc[FPSTR(HA_DEVICE_CLASS)] = F("signal_strength");
|
||||||
doc[FPSTR(HA_STATE_CLASS)] = FPSTR(HA_STATE_CLASS_MEASUREMENT);
|
doc[FPSTR(HA_STATE_CLASS)] = FPSTR(HA_STATE_CLASS_MEASUREMENT);
|
||||||
@@ -1200,8 +1153,8 @@ public:
|
|||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("uptime"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("uptime"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_SENSOR), F("uptime"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
|
||||||
doc[FPSTR(HA_DEVICE_CLASS)] = F("duration");
|
doc[FPSTR(HA_DEVICE_CLASS)] = F("duration");
|
||||||
doc[FPSTR(HA_STATE_CLASS)] = F("total_increasing");
|
doc[FPSTR(HA_STATE_CLASS)] = F("total_increasing");
|
||||||
@@ -1221,8 +1174,8 @@ public:
|
|||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("heating"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("heating"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_CLIMATE), F("heating"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_NAME)] = F("Heating");
|
doc[FPSTR(HA_NAME)] = F("Heating");
|
||||||
doc[FPSTR(HA_ICON)] = F("mdi:radiator");
|
doc[FPSTR(HA_ICON)] = F("mdi:radiator");
|
||||||
|
|
||||||
@@ -1273,8 +1226,8 @@ public:
|
|||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("dhw"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("dhw"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_CLIMATE), F("dhw"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_NAME)] = F("DHW");
|
doc[FPSTR(HA_NAME)] = F("DHW");
|
||||||
doc[FPSTR(HA_ICON)] = F("mdi:faucet");
|
doc[FPSTR(HA_ICON)] = F("mdi:faucet");
|
||||||
|
|
||||||
@@ -1318,8 +1271,8 @@ public:
|
|||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(FPSTR(S_RESTART));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(FPSTR(S_RESTART));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BUTTON), FPSTR(S_RESTART));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
||||||
doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_RESTART);
|
doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_RESTART);
|
||||||
doc[FPSTR(HA_NAME)] = F("Restart");
|
doc[FPSTR(HA_NAME)] = F("Restart");
|
||||||
@@ -1338,8 +1291,8 @@ public:
|
|||||||
doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.slave.fault.active, 'online', 'offline') }}");
|
doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.slave.fault.active, 'online', 'offline') }}");
|
||||||
doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
|
doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("reset_fault"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("reset_fault"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BUTTON), F("reset_fault"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
||||||
doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_RESTART);
|
doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_RESTART);
|
||||||
doc[FPSTR(HA_NAME)] = F("Reset fault");
|
doc[FPSTR(HA_NAME)] = F("Reset fault");
|
||||||
@@ -1358,8 +1311,8 @@ public:
|
|||||||
doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.slave.diag.active, 'online', 'offline') }}");
|
doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.slave.diag.active, 'online', 'offline') }}");
|
||||||
doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
|
doc[FPSTR(HA_AVAILABILITY_MODE)] = F("all");
|
||||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||||
doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(F("reset_diagnostic"));
|
doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("reset_diagnostic"));
|
||||||
doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(FPSTR(HA_ENTITY_BUTTON), F("reset_diagnostic"));
|
doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
|
||||||
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
|
||||||
doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_RESTART);
|
doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_RESTART);
|
||||||
doc[FPSTR(HA_NAME)] = F("Reset diagnostic");
|
doc[FPSTR(HA_NAME)] = F("Reset diagnostic");
|
||||||
|
|||||||
@@ -609,12 +609,7 @@ protected:
|
|||||||
if (GPIO_IS_VALID(settings.externalPump.gpio)) {
|
if (GPIO_IS_VALID(settings.externalPump.gpio)) {
|
||||||
configuredGpio = settings.externalPump.gpio;
|
configuredGpio = settings.externalPump.gpio;
|
||||||
pinMode(configuredGpio, OUTPUT);
|
pinMode(configuredGpio, OUTPUT);
|
||||||
digitalWrite(
|
digitalWrite(configuredGpio, LOW);
|
||||||
configuredGpio,
|
|
||||||
settings.externalPump.invertState
|
|
||||||
? HIGH
|
|
||||||
: LOW
|
|
||||||
);
|
|
||||||
|
|
||||||
} else if (configuredGpio != GPIO_IS_NOT_CONFIGURED) {
|
} else if (configuredGpio != GPIO_IS_NOT_CONFIGURED) {
|
||||||
configuredGpio = GPIO_IS_NOT_CONFIGURED;
|
configuredGpio = GPIO_IS_NOT_CONFIGURED;
|
||||||
@@ -642,12 +637,7 @@ protected:
|
|||||||
|
|
||||||
if (!settings.externalPump.use) {
|
if (!settings.externalPump.use) {
|
||||||
if (vars.externalPump.state) {
|
if (vars.externalPump.state) {
|
||||||
digitalWrite(
|
digitalWrite(configuredGpio, LOW);
|
||||||
configuredGpio,
|
|
||||||
settings.externalPump.invertState
|
|
||||||
? HIGH
|
|
||||||
: LOW
|
|
||||||
);
|
|
||||||
|
|
||||||
vars.externalPump.state = false;
|
vars.externalPump.state = false;
|
||||||
vars.externalPump.lastEnabledTime = millis();
|
vars.externalPump.lastEnabledTime = millis();
|
||||||
@@ -660,12 +650,7 @@ protected:
|
|||||||
|
|
||||||
if (vars.externalPump.state && !this->heatingEnabled) {
|
if (vars.externalPump.state && !this->heatingEnabled) {
|
||||||
if (this->extPumpStartReason == MainTask::PumpStartReason::HEATING && millis() - this->heatingDisabledTime > (settings.externalPump.postCirculationTime * 1000u)) {
|
if (this->extPumpStartReason == MainTask::PumpStartReason::HEATING && millis() - this->heatingDisabledTime > (settings.externalPump.postCirculationTime * 1000u)) {
|
||||||
digitalWrite(
|
digitalWrite(configuredGpio, LOW);
|
||||||
configuredGpio,
|
|
||||||
settings.externalPump.invertState
|
|
||||||
? HIGH
|
|
||||||
: LOW
|
|
||||||
);
|
|
||||||
|
|
||||||
vars.externalPump.state = false;
|
vars.externalPump.state = false;
|
||||||
vars.externalPump.lastEnabledTime = millis();
|
vars.externalPump.lastEnabledTime = millis();
|
||||||
@@ -673,12 +658,7 @@ protected:
|
|||||||
Log.sinfoln(FPSTR(L_EXTPUMP), F("Disabled: expired post circulation time"));
|
Log.sinfoln(FPSTR(L_EXTPUMP), F("Disabled: expired post circulation time"));
|
||||||
|
|
||||||
} else if (this->extPumpStartReason == MainTask::PumpStartReason::ANTISTUCK && millis() - this->externalPumpStartTime >= (settings.externalPump.antiStuckTime * 1000u)) {
|
} else if (this->extPumpStartReason == MainTask::PumpStartReason::ANTISTUCK && millis() - this->externalPumpStartTime >= (settings.externalPump.antiStuckTime * 1000u)) {
|
||||||
digitalWrite(
|
digitalWrite(configuredGpio, LOW);
|
||||||
configuredGpio,
|
|
||||||
settings.externalPump.invertState
|
|
||||||
? HIGH
|
|
||||||
: LOW
|
|
||||||
);
|
|
||||||
|
|
||||||
vars.externalPump.state = false;
|
vars.externalPump.state = false;
|
||||||
vars.externalPump.lastEnabledTime = millis();
|
vars.externalPump.lastEnabledTime = millis();
|
||||||
@@ -694,12 +674,7 @@ protected:
|
|||||||
this->externalPumpStartTime = millis();
|
this->externalPumpStartTime = millis();
|
||||||
this->extPumpStartReason = MainTask::PumpStartReason::HEATING;
|
this->extPumpStartReason = MainTask::PumpStartReason::HEATING;
|
||||||
|
|
||||||
digitalWrite(
|
digitalWrite(configuredGpio, HIGH);
|
||||||
configuredGpio,
|
|
||||||
settings.externalPump.invertState
|
|
||||||
? LOW
|
|
||||||
: HIGH
|
|
||||||
);
|
|
||||||
|
|
||||||
Log.sinfoln(FPSTR(L_EXTPUMP), F("Enabled: heating on"));
|
Log.sinfoln(FPSTR(L_EXTPUMP), F("Enabled: heating on"));
|
||||||
|
|
||||||
@@ -708,12 +683,7 @@ protected:
|
|||||||
this->externalPumpStartTime = millis();
|
this->externalPumpStartTime = millis();
|
||||||
this->extPumpStartReason = MainTask::PumpStartReason::ANTISTUCK;
|
this->extPumpStartReason = MainTask::PumpStartReason::ANTISTUCK;
|
||||||
|
|
||||||
digitalWrite(
|
digitalWrite(configuredGpio, HIGH);
|
||||||
configuredGpio,
|
|
||||||
settings.externalPump.invertState
|
|
||||||
? LOW
|
|
||||||
: HIGH
|
|
||||||
);
|
|
||||||
|
|
||||||
Log.sinfoln(FPSTR(L_EXTPUMP), F("Enabled: anti stuck"));
|
Log.sinfoln(FPSTR(L_EXTPUMP), F("Enabled: anti stuck"));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -486,7 +486,6 @@ protected:
|
|||||||
void publishHaEntities() {
|
void publishHaEntities() {
|
||||||
// heating
|
// heating
|
||||||
this->haHelper->publishSwitchHeatingTurbo(false);
|
this->haHelper->publishSwitchHeatingTurbo(false);
|
||||||
this->haHelper->publishSwitchHeatingHysteresis();
|
|
||||||
this->haHelper->publishInputHeatingHysteresis(settings.system.unitSystem);
|
this->haHelper->publishInputHeatingHysteresis(settings.system.unitSystem);
|
||||||
this->haHelper->publishInputHeatingTurboFactor(false);
|
this->haHelper->publishInputHeatingTurboFactor(false);
|
||||||
this->haHelper->publishInputHeatingMinTemp(settings.system.unitSystem);
|
this->haHelper->publishInputHeatingMinTemp(settings.system.unitSystem);
|
||||||
@@ -503,10 +502,9 @@ protected:
|
|||||||
|
|
||||||
// equitherm
|
// equitherm
|
||||||
this->haHelper->publishSwitchEquitherm();
|
this->haHelper->publishSwitchEquitherm();
|
||||||
this->haHelper->publishInputEquithermSlope(false);
|
this->haHelper->publishInputEquithermFactorN(false);
|
||||||
this->haHelper->publishInputEquithermExponent(false);
|
this->haHelper->publishInputEquithermFactorK(false);
|
||||||
this->haHelper->publishInputEquithermShift(false);
|
this->haHelper->publishInputEquithermFactorT(false);
|
||||||
this->haHelper->publishInputEquithermTargetDiffFactor(false);
|
|
||||||
|
|
||||||
// states
|
// states
|
||||||
this->haHelper->publishStatusState();
|
this->haHelper->publishStatusState();
|
||||||
|
|||||||
@@ -171,7 +171,7 @@ protected:
|
|||||||
vars.master.heating.enabled = this->isReady()
|
vars.master.heating.enabled = this->isReady()
|
||||||
&& settings.heating.enabled
|
&& settings.heating.enabled
|
||||||
&& vars.cascadeControl.input
|
&& vars.cascadeControl.input
|
||||||
&& (!vars.master.heating.blocking || settings.heating.hysteresis.action != HysteresisAction::DISABLE_HEATING)
|
&& !vars.master.heating.blocking
|
||||||
&& !vars.master.heating.overheat;
|
&& !vars.master.heating.overheat;
|
||||||
|
|
||||||
// DHW settings
|
// DHW settings
|
||||||
@@ -1209,8 +1209,8 @@ protected:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set indoor temp for Native heating control/Always set indoor temp
|
// Native heating control
|
||||||
if (settings.opentherm.options.nativeHeatingControl || settings.opentherm.options.alwaysSetIndoorTemp) {
|
if (settings.opentherm.options.nativeHeatingControl) {
|
||||||
// Converted current indoor temp
|
// Converted current indoor temp
|
||||||
float convertedTemp = convertTemp(vars.master.heating.indoorTemp, settings.system.unitSystem, settings.opentherm.unitSystem);
|
float convertedTemp = convertTemp(vars.master.heating.indoorTemp, settings.system.unitSystem, settings.opentherm.unitSystem);
|
||||||
|
|
||||||
@@ -1237,13 +1237,10 @@ protected:
|
|||||||
Log.swarningln(FPSTR(L_OT_HEATING), F("Failed set current CH2 indoor temp"));
|
Log.swarningln(FPSTR(L_OT_HEATING), F("Failed set current CH2 indoor temp"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Native heating control
|
|
||||||
if (settings.opentherm.options.nativeHeatingControl) {
|
|
||||||
// Converted target indoor temp
|
// Converted target indoor temp
|
||||||
float convertedTemp = convertTemp(vars.master.heating.targetTemp, settings.system.unitSystem, settings.opentherm.unitSystem);
|
convertedTemp = convertTemp(vars.master.heating.targetTemp, settings.system.unitSystem, settings.opentherm.unitSystem);
|
||||||
|
|
||||||
// Set target indoor temp
|
// Set target indoor temp
|
||||||
if (this->needSetHeatingTemp(convertedTemp)) {
|
if (this->needSetHeatingTemp(convertedTemp)) {
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
|
#include <Equitherm.h>
|
||||||
#include <GyverPID.h>
|
#include <GyverPID.h>
|
||||||
|
|
||||||
|
Equitherm etRegulator;
|
||||||
GyverPID pidRegulator(0, 0, 0);
|
GyverPID pidRegulator(0, 0, 0);
|
||||||
|
|
||||||
|
|
||||||
@@ -57,23 +59,12 @@ protected:
|
|||||||
this->turbo();
|
this->turbo();
|
||||||
this->hysteresis();
|
this->hysteresis();
|
||||||
|
|
||||||
if (vars.master.heating.blocking && settings.heating.hysteresis.action == HysteresisAction::SET_ZERO_TARGET) {
|
vars.master.heating.targetTemp = settings.heating.target;
|
||||||
vars.master.heating.targetTemp = 0.0f;
|
vars.master.heating.setpointTemp = roundf(constrain(
|
||||||
vars.master.heating.setpointTemp = 0.0f;
|
this->getHeatingSetpointTemp(),
|
||||||
|
this->getHeatingMinSetpointTemp(),
|
||||||
// tick if PID enabled
|
this->getHeatingMaxSetpointTemp()
|
||||||
if (settings.pid.enabled) {
|
), 0);
|
||||||
this->getHeatingSetpointTemp();
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
vars.master.heating.targetTemp = settings.heating.target;
|
|
||||||
vars.master.heating.setpointTemp = roundf(constrain(
|
|
||||||
this->getHeatingSetpointTemp(),
|
|
||||||
this->getHeatingMinSetpointTemp(),
|
|
||||||
this->getHeatingMaxSetpointTemp()
|
|
||||||
), 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
Sensors::setValueByType(
|
Sensors::setValueByType(
|
||||||
Sensors::Type::HEATING_SETPOINT_TEMP, vars.master.heating.setpointTemp,
|
Sensors::Type::HEATING_SETPOINT_TEMP, vars.master.heating.setpointTemp,
|
||||||
@@ -101,15 +92,15 @@ protected:
|
|||||||
|
|
||||||
void hysteresis() {
|
void hysteresis() {
|
||||||
bool useHyst = false;
|
bool useHyst = false;
|
||||||
if (settings.heating.hysteresis.enabled && this->indoorSensorsConnected) {
|
if (settings.heating.hysteresis > 0.01f && this->indoorSensorsConnected) {
|
||||||
useHyst = settings.equitherm.enabled || settings.pid.enabled || settings.opentherm.options.nativeHeatingControl;
|
useHyst = settings.equitherm.enabled || settings.pid.enabled || settings.opentherm.options.nativeHeatingControl;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (useHyst) {
|
if (useHyst) {
|
||||||
if (!vars.master.heating.blocking && vars.master.heating.indoorTemp - settings.heating.target + 0.0001f >= settings.heating.hysteresis.value) {
|
if (!vars.master.heating.blocking && vars.master.heating.indoorTemp - settings.heating.target + 0.0001f >= settings.heating.hysteresis) {
|
||||||
vars.master.heating.blocking = true;
|
vars.master.heating.blocking = true;
|
||||||
|
|
||||||
} else if (vars.master.heating.blocking && vars.master.heating.indoorTemp - settings.heating.target - 0.0001f <= -(settings.heating.hysteresis.value)) {
|
} else if (vars.master.heating.blocking && vars.master.heating.indoorTemp - settings.heating.target - 0.0001f <= -(settings.heating.hysteresis)) {
|
||||||
vars.master.heating.blocking = false;
|
vars.master.heating.blocking = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -155,32 +146,39 @@ protected:
|
|||||||
|
|
||||||
// if use equitherm
|
// if use equitherm
|
||||||
if (settings.equitherm.enabled) {
|
if (settings.equitherm.enabled) {
|
||||||
float tempDelta = settings.heating.target - vars.master.heating.outdoorTemp;
|
unsigned short minTemp = settings.heating.minTemp;
|
||||||
float maxPoint = settings.heating.target - (
|
unsigned short maxTemp = settings.heating.maxTemp;
|
||||||
settings.heating.maxTemp - settings.heating.target
|
float targetTemp = settings.heating.target;
|
||||||
) / settings.equitherm.slope;
|
float indoorTemp = vars.master.heating.indoorTemp;
|
||||||
|
float outdoorTemp = vars.master.heating.outdoorTemp;
|
||||||
|
|
||||||
float sf = (settings.heating.maxTemp - settings.heating.target) / pow(
|
if (settings.system.unitSystem == UnitSystem::IMPERIAL) {
|
||||||
settings.heating.target - maxPoint,
|
minTemp = f2c(minTemp);
|
||||||
1.0f / settings.equitherm.exponent
|
maxTemp = f2c(maxTemp);
|
||||||
);
|
targetTemp = f2c(targetTemp);
|
||||||
float etResult = settings.heating.target + settings.equitherm.shift + sf * (
|
indoorTemp = f2c(indoorTemp);
|
||||||
tempDelta >= 0
|
outdoorTemp = f2c(outdoorTemp);
|
||||||
? pow(tempDelta, 1.0f / settings.equitherm.exponent)
|
|
||||||
: -(pow(-(tempDelta), 1.0f / settings.equitherm.exponent))
|
|
||||||
);
|
|
||||||
|
|
||||||
// add diff
|
|
||||||
if (this->indoorSensorsConnected && !settings.pid.enabled && !settings.heating.turbo) {
|
|
||||||
etResult += constrain(
|
|
||||||
settings.heating.target - vars.master.heating.indoorTemp,
|
|
||||||
-3.0f,
|
|
||||||
3.0f
|
|
||||||
) * settings.equitherm.targetDiffFactor;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// limit
|
if (!this->indoorSensorsConnected || settings.pid.enabled) {
|
||||||
etResult = constrain(etResult, settings.heating.minTemp, settings.heating.maxTemp);
|
etRegulator.Kt = 0.0f;
|
||||||
|
etRegulator.indoorTemp = 0.0f;
|
||||||
|
|
||||||
|
} else {
|
||||||
|
etRegulator.Kt = settings.heating.turbo ? 0.0f : settings.equitherm.t_factor;
|
||||||
|
etRegulator.indoorTemp = indoorTemp;
|
||||||
|
}
|
||||||
|
|
||||||
|
etRegulator.setLimits(minTemp, maxTemp);
|
||||||
|
etRegulator.Kn = settings.equitherm.n_factor;
|
||||||
|
etRegulator.Kk = settings.equitherm.k_factor;
|
||||||
|
etRegulator.targetTemp = targetTemp;
|
||||||
|
etRegulator.outdoorTemp = outdoorTemp;
|
||||||
|
float etResult = etRegulator.getResult();
|
||||||
|
|
||||||
|
if (settings.system.unitSystem == UnitSystem::IMPERIAL) {
|
||||||
|
etResult = c2f(etResult);
|
||||||
|
}
|
||||||
|
|
||||||
if (fabsf(prevEtResult - etResult) > 0.09f) {
|
if (fabsf(prevEtResult - etResult) > 0.09f) {
|
||||||
prevEtResult = etResult;
|
prevEtResult = etResult;
|
||||||
|
|||||||
@@ -329,12 +329,12 @@ public:
|
|||||||
|
|
||||||
static float getMeanValueByPurpose(Purpose purpose, const ValueType valueType, bool onlyConnected = true) {
|
static float getMeanValueByPurpose(Purpose purpose, const ValueType valueType, bool onlyConnected = true) {
|
||||||
if (settings == nullptr || results == nullptr) {
|
if (settings == nullptr || results == nullptr) {
|
||||||
return 0.0f;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint8_t valueId = (uint8_t) valueType;
|
uint8_t valueId = (uint8_t) valueType;
|
||||||
if (!isValidValueId(valueId)) {
|
if (!isValidValueId(valueId)) {
|
||||||
return 0.0f;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
float value = 0.0f;
|
float value = 0.0f;
|
||||||
@@ -363,7 +363,7 @@ public:
|
|||||||
|
|
||||||
static bool existsConnectedSensorsByPurpose(Purpose purpose) {
|
static bool existsConnectedSensorsByPurpose(Purpose purpose) {
|
||||||
if (settings == nullptr || results == nullptr) {
|
if (settings == nullptr || results == nullptr) {
|
||||||
return false;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (uint8_t id = 0; id <= getMaxSensorId(); id++) {
|
for (uint8_t id = 0; id <= getMaxSensorId(); id++) {
|
||||||
|
|||||||
@@ -9,41 +9,136 @@
|
|||||||
extern FileData fsSensorsSettings;
|
extern FileData fsSensorsSettings;
|
||||||
|
|
||||||
#if USE_BLE
|
#if USE_BLE
|
||||||
class BluetoothClientCallbacks : public NimBLEClientCallbacks {
|
class BluetoothScanCallbacks : public NimBLEScanCallbacks {
|
||||||
public:
|
public:
|
||||||
BluetoothClientCallbacks(uint8_t sensorId) : sensorId(sensorId) {}
|
void onDiscovered(const NimBLEAdvertisedDevice* device) override {
|
||||||
|
auto& deviceAddress = device->getAddress();
|
||||||
|
|
||||||
void onConnect(NimBLEClient* pClient) {
|
bool found = false;
|
||||||
auto& sSensor = Sensors::settings[this->sensorId];
|
uint8_t sensorId;
|
||||||
|
for (sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
|
||||||
|
auto& sSensor = Sensors::settings[sensorId];
|
||||||
|
if (!sSensor.enabled || sSensor.type != Sensors::Type::BLUETOOTH || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
Log.sinfoln(
|
const auto sensorAddress = NimBLEAddress(sSensor.address, deviceAddress.getType());
|
||||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': connected to %s"),
|
if (sensorAddress.isNull() || sensorAddress != deviceAddress) {
|
||||||
sensorId, sSensor.name, pClient->getPeerAddress().toString().c_str()
|
continue;
|
||||||
);
|
}
|
||||||
}
|
|
||||||
|
|
||||||
void onDisconnect(NimBLEClient* pClient, int reason) {
|
found = true;
|
||||||
auto& sSensor = Sensors::settings[this->sensorId];
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
Log.sinfoln(
|
if (!found) {
|
||||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': disconnected, reason %i"),
|
return;
|
||||||
sensorId, sSensor.name, reason
|
}
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
void onConnectFail(NimBLEClient* pClient, int reason) {
|
auto& sSensor = Sensors::settings[sensorId];
|
||||||
auto& sSensor = Sensors::settings[this->sensorId];
|
auto& rSensor = Sensors::results[sensorId];
|
||||||
|
auto deviceName = device->getName();
|
||||||
|
auto deviceRssi = device->getRSSI();
|
||||||
|
|
||||||
Log.sinfoln(
|
Log.straceln(
|
||||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to connect, reason %i"),
|
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': discovered device %s, name: %s, RSSI: %hhd"),
|
||||||
sensorId, sSensor.name, reason
|
sensorId, sSensor.name,
|
||||||
|
deviceAddress.toString().c_str(), deviceName.c_str(), deviceRssi
|
||||||
);
|
);
|
||||||
|
|
||||||
pClient->cancelConnect();
|
if (!device->haveServiceData()) {
|
||||||
}
|
Log.straceln(
|
||||||
|
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': not found service data"),
|
||||||
|
sensorId, sSensor.name
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
protected:
|
auto serviceDataCount = device->getServiceDataCount();
|
||||||
uint8_t sensorId;
|
Log.straceln(
|
||||||
|
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found %hhu service data"),
|
||||||
|
sensorId, sSensor.name, serviceDataCount
|
||||||
|
);
|
||||||
|
|
||||||
|
NimBLEUUID serviceUuid((uint16_t) 0x181A);
|
||||||
|
auto serviceData = device->getServiceData(serviceUuid);
|
||||||
|
if (!serviceData.size()) {
|
||||||
|
Log.straceln(
|
||||||
|
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': NOT found %s env service data"),
|
||||||
|
sensorId, sSensor.name, serviceUuid.toString().c_str()
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.straceln(
|
||||||
|
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found %s env service data"),
|
||||||
|
sensorId, sSensor.name, serviceUuid.toString().c_str()
|
||||||
|
);
|
||||||
|
|
||||||
|
float temperature, humidity;
|
||||||
|
uint16_t batteryMv;
|
||||||
|
uint8_t batteryLevel;
|
||||||
|
|
||||||
|
if (serviceData.size() == 13) {
|
||||||
|
// atc1441 format
|
||||||
|
|
||||||
|
// Temperature (2 bytes, big-endian)
|
||||||
|
temperature = (
|
||||||
|
(static_cast<uint8_t>(serviceData[6]) << 8) | static_cast<uint8_t>(serviceData[7])
|
||||||
|
) * 0.1f;
|
||||||
|
|
||||||
|
// Humidity (1 byte)
|
||||||
|
humidity = static_cast<uint8_t>(serviceData[8]);
|
||||||
|
|
||||||
|
// Battery mV (2 bytes, big-endian)
|
||||||
|
batteryMv = (static_cast<uint8_t>(serviceData[10]) << 8) | static_cast<uint8_t>(serviceData[11]);
|
||||||
|
|
||||||
|
// Battery level (1 byte)
|
||||||
|
batteryLevel = static_cast<uint8_t>(serviceData[9]);
|
||||||
|
|
||||||
|
} else if (serviceData.size() == 15) {
|
||||||
|
// custom pvvx format
|
||||||
|
|
||||||
|
// Temperature (2 bytes, little-endian)
|
||||||
|
temperature = (
|
||||||
|
(static_cast<uint8_t>(serviceData[7]) << 8) | static_cast<uint8_t>(serviceData[6])
|
||||||
|
) * 0.01f;
|
||||||
|
|
||||||
|
// Humidity (2 bytes, little-endian)
|
||||||
|
humidity = (
|
||||||
|
(static_cast<uint8_t>(serviceData[9]) << 8) | static_cast<uint8_t>(serviceData[8])
|
||||||
|
) * 0.01f;
|
||||||
|
|
||||||
|
// Battery mV (2 bytes, little-endian)
|
||||||
|
batteryMv = (static_cast<uint8_t>(serviceData[11]) << 8) | static_cast<uint8_t>(serviceData[10]);
|
||||||
|
|
||||||
|
// Battery level (1 byte)
|
||||||
|
batteryLevel = static_cast<uint8_t>(serviceData[12]);
|
||||||
|
|
||||||
|
} else {
|
||||||
|
// unknown format
|
||||||
|
Log.straceln(
|
||||||
|
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': unknown data format (size: %i)"),
|
||||||
|
sensorId, sSensor.name, serviceData.size()
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.straceln(
|
||||||
|
FPSTR(L_SENSORS_BLE),
|
||||||
|
F("Sensor #%hhu '%s', received temp: %.2f; humidity: %.2f, battery voltage: %hu, battery level: %hhu"),
|
||||||
|
sensorId, sSensor.name,
|
||||||
|
temperature, humidity, batteryMv, batteryLevel
|
||||||
|
);
|
||||||
|
|
||||||
|
// update data
|
||||||
|
Sensors::setValueById(sensorId, temperature, Sensors::ValueType::TEMPERATURE, true, true);
|
||||||
|
Sensors::setValueById(sensorId, humidity, Sensors::ValueType::HUMIDITY, true, true);
|
||||||
|
Sensors::setValueById(sensorId, batteryLevel, Sensors::ValueType::BATTERY, true, true);
|
||||||
|
|
||||||
|
// update rssi
|
||||||
|
Sensors::setValueById(sensorId, deviceRssi, Sensors::ValueType::RSSI, false, false);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -55,6 +150,10 @@ public:
|
|||||||
this->dallasSearchTime.reserve(2);
|
this->dallasSearchTime.reserve(2);
|
||||||
this->dallasPolling.reserve(2);
|
this->dallasPolling.reserve(2);
|
||||||
this->dallasLastPollingTime.reserve(2);
|
this->dallasLastPollingTime.reserve(2);
|
||||||
|
|
||||||
|
#if USE_BLE
|
||||||
|
this->bluetoothScanCallbacks = new BluetoothScanCallbacks();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
~SensorsTask() {
|
~SensorsTask() {
|
||||||
@@ -63,16 +162,17 @@ public:
|
|||||||
this->dallasSearchTime.clear();
|
this->dallasSearchTime.clear();
|
||||||
this->dallasPolling.clear();
|
this->dallasPolling.clear();
|
||||||
this->dallasLastPollingTime.clear();
|
this->dallasLastPollingTime.clear();
|
||||||
|
|
||||||
|
#if USE_BLE
|
||||||
|
delete this->bluetoothScanCallbacks;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
const unsigned int disconnectedTimeout = 120000;
|
const unsigned int disconnectedTimeout = 180000u;
|
||||||
const unsigned short dallasSearchInterval = 60000;
|
const unsigned short dallasSearchInterval = 60000u;
|
||||||
const unsigned short dallasPollingInterval = 10000;
|
const unsigned short dallasPollingInterval = 10000u;
|
||||||
const unsigned short globalPollingInterval = 15000;
|
const unsigned short globalPollingInterval = 15000u;
|
||||||
#if USE_BLE
|
|
||||||
const unsigned int bleSetDtInterval = 7200000;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
std::unordered_map<uint8_t, OneWire> owInstances;
|
std::unordered_map<uint8_t, OneWire> owInstances;
|
||||||
std::unordered_map<uint8_t, DallasTemperature> dallasInstances;
|
std::unordered_map<uint8_t, DallasTemperature> dallasInstances;
|
||||||
@@ -80,9 +180,8 @@ protected:
|
|||||||
std::unordered_map<uint8_t, bool> dallasPolling;
|
std::unordered_map<uint8_t, bool> dallasPolling;
|
||||||
std::unordered_map<uint8_t, unsigned long> dallasLastPollingTime;
|
std::unordered_map<uint8_t, unsigned long> dallasLastPollingTime;
|
||||||
#if USE_BLE
|
#if USE_BLE
|
||||||
std::unordered_map<uint8_t, NimBLEClient*> bleClients;
|
NimBLEScan* pBLEScan = nullptr;
|
||||||
std::unordered_map<uint8_t, bool> bleSubscribed;
|
BluetoothScanCallbacks* bluetoothScanCallbacks = nullptr;
|
||||||
std::unordered_map<uint8_t, unsigned long> bleLastSetDtTime;
|
|
||||||
#endif
|
#endif
|
||||||
unsigned long globalLastPollingTime = 0;
|
unsigned long globalLastPollingTime = 0;
|
||||||
|
|
||||||
@@ -131,8 +230,7 @@ protected:
|
|||||||
this->yield();
|
this->yield();
|
||||||
|
|
||||||
#if USE_BLE
|
#if USE_BLE
|
||||||
cleanBleInstances();
|
scanBleSensors();
|
||||||
pollingBleSensors();
|
|
||||||
this->yield();
|
this->yield();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -444,549 +542,62 @@ protected:
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if USE_BLE
|
#if USE_BLE
|
||||||
void cleanBleInstances() {
|
void scanBleSensors() {
|
||||||
if (!NimBLEDevice::isInitialized()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (auto& [sensorId, pClient]: this->bleClients) {
|
|
||||||
if (pClient == nullptr) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto& sSensor = Sensors::settings[sensorId];
|
|
||||||
const auto sAddress = NimBLEAddress(sSensor.address, 0);
|
|
||||||
|
|
||||||
if (sAddress.isNull() || !sSensor.enabled || sSensor.type != Sensors::Type::BLUETOOTH || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
|
|
||||||
Log.sinfoln(
|
|
||||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s', deleted unused client"),
|
|
||||||
sensorId, sSensor.name
|
|
||||||
);
|
|
||||||
|
|
||||||
NimBLEDevice::deleteClient(pClient);
|
|
||||||
pClient = nullptr;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void pollingBleSensors() {
|
|
||||||
if (!Sensors::getAmountByType(Sensors::Type::BLUETOOTH, true)) {
|
if (!Sensors::getAmountByType(Sensors::Type::BLUETOOTH, true)) {
|
||||||
|
if (NimBLEDevice::isInitialized()) {
|
||||||
|
if (this->pBLEScan != nullptr) {
|
||||||
|
if (this->pBLEScan->isScanning()) {
|
||||||
|
this->pBLEScan->stop();
|
||||||
|
|
||||||
|
} else {
|
||||||
|
this->pBLEScan = nullptr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this->pBLEScan == nullptr) {
|
||||||
|
if (NimBLEDevice::deinit(true)) {
|
||||||
|
Log.sinfoln(FPSTR(L_SENSORS_BLE), F("Deinitialized"));
|
||||||
|
|
||||||
|
} else {
|
||||||
|
Log.swarningln(FPSTR(L_SENSORS_BLE), F("Unable to deinitialize!"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!NimBLEDevice::isInitialized() && millis() > 5000) {
|
if (!NimBLEDevice::isInitialized() && millis() > 5000) {
|
||||||
Log.sinfoln(FPSTR(L_SENSORS_BLE), F("Initialized"));
|
Log.sinfoln(FPSTR(L_SENSORS_BLE), F("Initialized"));
|
||||||
BLEDevice::init("");
|
BLEDevice::init("");
|
||||||
NimBLEDevice::setPower(9);
|
|
||||||
|
#if defined(ESP_PWR_LVL_P20)
|
||||||
|
NimBLEDevice::setPower(ESP_PWR_LVL_P20);
|
||||||
|
#elif defined(ESP_PWR_LVL_P9)
|
||||||
|
NimBLEDevice::setPower(ESP_PWR_LVL_P9);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
|
if (this->pBLEScan == nullptr) {
|
||||||
auto& sSensor = Sensors::settings[sensorId];
|
this->pBLEScan = NimBLEDevice::getScan();
|
||||||
auto& rSensor = Sensors::results[sensorId];
|
this->pBLEScan->setScanCallbacks(this->bluetoothScanCallbacks);
|
||||||
|
this->pBLEScan->setActiveScan(false);
|
||||||
|
this->pBLEScan->setDuplicateFilter(false);
|
||||||
|
this->pBLEScan->setMaxResults(0);
|
||||||
|
this->pBLEScan->setInterval(100);
|
||||||
|
this->pBLEScan->setWindow(100);
|
||||||
|
|
||||||
if (!sSensor.enabled || sSensor.type != Sensors::Type::BLUETOOTH || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
|
Log.sinfoln(FPSTR(L_SENSORS_BLE), F("Scanning initialized"));
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
const auto address = NimBLEAddress(sSensor.address, 0);
|
|
||||||
if (address.isNull()) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto pClient = this->getBleClient(sensorId);
|
|
||||||
if (pClient == nullptr) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pClient->getPeerAddress() != address) {
|
|
||||||
if (pClient->isConnected()) {
|
|
||||||
if (!pClient->disconnect()) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pClient->setPeerAddress(address);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!pClient->isConnected()) {
|
|
||||||
this->bleSubscribed[sensorId] = false;
|
|
||||||
this->bleLastSetDtTime[sensorId] = 0;
|
|
||||||
|
|
||||||
if (pClient->connect(false, true, true)) {
|
|
||||||
Log.sinfoln(
|
|
||||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': trying connecting to %s..."),
|
|
||||||
sensorId, sSensor.name, pClient->getPeerAddress().toString().c_str()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!this->bleSubscribed[sensorId]) {
|
|
||||||
if (this->subscribeToBleDevice(sensorId, pClient)) {
|
|
||||||
this->bleSubscribed[sensorId] = true;
|
|
||||||
|
|
||||||
} else {
|
|
||||||
this->bleSubscribed[sensorId] = false;
|
|
||||||
pClient->disconnect();
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Mark connected
|
|
||||||
Sensors::setConnectionStatusById(sensorId, true, true);
|
|
||||||
|
|
||||||
if (!this->bleLastSetDtTime[sensorId] || millis() - this->bleLastSetDtTime[sensorId] > this->bleSetDtInterval) {
|
|
||||||
struct tm ti;
|
|
||||||
|
|
||||||
if (getLocalTime(&ti)) {
|
|
||||||
if (this->setDateOnBleSensor(pClient, &ti)) {
|
|
||||||
Log.sinfoln(
|
|
||||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s', successfully set date: %02d.%02d.%04d %02d:%02d:%02d"),
|
|
||||||
sensorId, sSensor.name,
|
|
||||||
ti.tm_mday, ti.tm_mon + 1, ti.tm_year + 1900, ti.tm_hour, ti.tm_min, ti.tm_sec
|
|
||||||
);
|
|
||||||
|
|
||||||
} else {
|
|
||||||
Log.swarningln(
|
|
||||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s', failed set date: %02d.%02d.%04d %02d:%02d:%02d"),
|
|
||||||
sensorId, sSensor.name,
|
|
||||||
ti.tm_mday, ti.tm_mon + 1, ti.tm_year + 1900, ti.tm_hour, ti.tm_min, ti.tm_sec
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
this->bleLastSetDtTime[sensorId] = millis();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
NimBLEClient* getBleClient(const uint8_t sensorId) {
|
|
||||||
if (!NimBLEDevice::isInitialized()) {
|
|
||||||
return nullptr;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
auto& sSensor = Sensors::settings[sensorId];
|
if (!this->pBLEScan->isScanning()) {
|
||||||
auto& rSensor = Sensors::results[sensorId];
|
if (this->pBLEScan->start(0, false, true)) {
|
||||||
|
Log.sinfoln(FPSTR(L_SENSORS_BLE), F("Scanning started"));
|
||||||
if (!sSensor.enabled || sSensor.type != Sensors::Type::BLUETOOTH || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this->bleClients[sensorId] && this->bleClients[sensorId] != nullptr) {
|
|
||||||
return this->bleClients[sensorId];
|
|
||||||
}
|
|
||||||
|
|
||||||
auto pClient = NimBLEDevice::createClient();
|
|
||||||
if (pClient == nullptr) {
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
//pClient->setConnectionParams(BLE_GAP_CONN_ITVL_MS(10), BLE_GAP_CONN_ITVL_MS(100), 10, 150);
|
|
||||||
pClient->setConnectTimeout(30000);
|
|
||||||
pClient->setSelfDelete(false, false);
|
|
||||||
pClient->setClientCallbacks(new BluetoothClientCallbacks(sensorId), true);
|
|
||||||
|
|
||||||
this->bleClients[sensorId] = pClient;
|
|
||||||
|
|
||||||
return pClient;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool subscribeToBleDevice(const uint8_t sensorId, NimBLEClient* pClient) {
|
|
||||||
auto& sSensor = Sensors::settings[sensorId];
|
|
||||||
auto pAddress = pClient->getPeerAddress().toString();
|
|
||||||
|
|
||||||
NimBLERemoteService* pService = nullptr;
|
|
||||||
NimBLERemoteCharacteristic* pChar = nullptr;
|
|
||||||
|
|
||||||
// ENV Service (0x181A)
|
|
||||||
NimBLEUUID serviceUuid((uint16_t) 0x181AU);
|
|
||||||
pService = pClient->getService(serviceUuid);
|
|
||||||
if (!pService) {
|
|
||||||
Log.straceln(
|
|
||||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to find env service (%s) on device %s"),
|
|
||||||
sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress.c_str()
|
|
||||||
);
|
|
||||||
|
|
||||||
} else {
|
|
||||||
Log.straceln(
|
|
||||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found env service (%s) on device %s"),
|
|
||||||
sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress.c_str()
|
|
||||||
);
|
|
||||||
|
|
||||||
// 0x2A6E - Notify temperature x0.01C (pvvx)
|
|
||||||
bool tempNotifyCreated = false;
|
|
||||||
if (!tempNotifyCreated) {
|
|
||||||
NimBLEUUID charUuid((uint16_t) 0x2A6E);
|
|
||||||
pChar = pService->getCharacteristic(charUuid);
|
|
||||||
|
|
||||||
if (pChar && (pChar->canNotify() || pChar->canIndicate())) {
|
|
||||||
Log.straceln(
|
|
||||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found temp char (%s) in env service on device %s"),
|
|
||||||
sensorId, sSensor.name, charUuid.toString().c_str(), pAddress.c_str()
|
|
||||||
);
|
|
||||||
|
|
||||||
pChar->unsubscribe();
|
|
||||||
tempNotifyCreated = pChar->subscribe(
|
|
||||||
pChar->canNotify(),
|
|
||||||
[sensorId](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
|
|
||||||
if (pChar == nullptr) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const NimBLERemoteService* pService = pChar->getRemoteService();
|
|
||||||
if (pService == nullptr) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
NimBLEClient* pClient = pService->getClient();
|
|
||||||
if (pClient == nullptr) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto& sSensor = Sensors::settings[sensorId];
|
|
||||||
|
|
||||||
if (length != 2) {
|
|
||||||
Log.swarningln(
|
|
||||||
FPSTR(L_SENSORS_BLE),
|
|
||||||
F("Sensor #%hhu '%s': invalid notification data at temp char (%s) on device %s"),
|
|
||||||
sensorId,
|
|
||||||
sSensor.name,
|
|
||||||
pChar->getUUID().toString().c_str(),
|
|
||||||
pClient->getPeerAddress().toString().c_str()
|
|
||||||
);
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
float rawTemp = (pChar->getValue<int16_t>() * 0.01f);
|
|
||||||
Log.straceln(
|
|
||||||
FPSTR(L_SENSORS_BLE),
|
|
||||||
F("Sensor #%hhu '%s': received temp: %.2f"),
|
|
||||||
sensorId, sSensor.name, rawTemp
|
|
||||||
);
|
|
||||||
|
|
||||||
// set temp
|
|
||||||
Sensors::setValueById(sensorId, rawTemp, Sensors::ValueType::TEMPERATURE, true, true);
|
|
||||||
|
|
||||||
// update rssi
|
|
||||||
Sensors::setValueById(sensorId, pClient->getRssi(), Sensors::ValueType::RSSI, false, false);
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
if (tempNotifyCreated) {
|
|
||||||
Log.straceln(
|
|
||||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to temp char (%s) in env service on device %s"),
|
|
||||||
sensorId, sSensor.name,
|
|
||||||
charUuid.toString().c_str(), pAddress.c_str()
|
|
||||||
);
|
|
||||||
|
|
||||||
} else {
|
|
||||||
Log.swarningln(
|
|
||||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to temp char (%s) in env service on device %s"),
|
|
||||||
sensorId, sSensor.name,
|
|
||||||
charUuid.toString().c_str(), pAddress.c_str()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// 0x2A1F - Notify temperature x0.1C (atc1441/pvvx)
|
|
||||||
if (!tempNotifyCreated) {
|
|
||||||
NimBLEUUID charUuid((uint16_t) 0x2A1F);
|
|
||||||
pChar = pService->getCharacteristic(charUuid);
|
|
||||||
|
|
||||||
if (pChar && (pChar->canNotify() || pChar->canIndicate())) {
|
|
||||||
Log.straceln(
|
|
||||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found temp char (%s) in env service on device %s"),
|
|
||||||
sensorId, sSensor.name, charUuid.toString().c_str(), pAddress.c_str()
|
|
||||||
);
|
|
||||||
|
|
||||||
pChar->unsubscribe();
|
|
||||||
tempNotifyCreated = pChar->subscribe(
|
|
||||||
pChar->canNotify(),
|
|
||||||
[sensorId](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
|
|
||||||
if (pChar == nullptr) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const NimBLERemoteService* pService = pChar->getRemoteService();
|
|
||||||
if (pService == nullptr) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
NimBLEClient* pClient = pService->getClient();
|
|
||||||
if (pClient == nullptr) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto& sSensor = Sensors::settings[sensorId];
|
|
||||||
|
|
||||||
if (length != 2) {
|
|
||||||
Log.swarningln(
|
|
||||||
FPSTR(L_SENSORS_BLE),
|
|
||||||
F("Sensor #%hhu '%s': invalid notification data at temp char (%s) on device %s"),
|
|
||||||
sensorId,
|
|
||||||
sSensor.name,
|
|
||||||
pChar->getUUID().toString().c_str(),
|
|
||||||
pClient->getPeerAddress().toString().c_str()
|
|
||||||
);
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
float rawTemp = (pChar->getValue<int16_t>() * 0.1f);
|
|
||||||
Log.straceln(
|
|
||||||
FPSTR(L_SENSORS_BLE),
|
|
||||||
F("Sensor #%hhu '%s': received temp: %.2f"),
|
|
||||||
sensorId, sSensor.name, rawTemp
|
|
||||||
);
|
|
||||||
|
|
||||||
// set temp
|
|
||||||
Sensors::setValueById(sensorId, rawTemp, Sensors::ValueType::TEMPERATURE, true, true);
|
|
||||||
|
|
||||||
// update rssi
|
|
||||||
Sensors::setValueById(sensorId, pClient->getRssi(), Sensors::ValueType::RSSI, false, false);
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
if (tempNotifyCreated) {
|
|
||||||
Log.straceln(
|
|
||||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to temp char (%s) in env service on device %s"),
|
|
||||||
sensorId, sSensor.name,
|
|
||||||
charUuid.toString().c_str(), pAddress.c_str()
|
|
||||||
);
|
|
||||||
|
|
||||||
} else {
|
|
||||||
Log.swarningln(
|
|
||||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to temp char (%s) in env service on device %s"),
|
|
||||||
sensorId, sSensor.name,
|
|
||||||
charUuid.toString().c_str(), pAddress.c_str()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!tempNotifyCreated) {
|
|
||||||
Log.swarningln(
|
|
||||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': not found supported temp chars in env service on device %s"),
|
|
||||||
sensorId, sSensor.name, pAddress.c_str()
|
|
||||||
);
|
|
||||||
|
|
||||||
pClient->disconnect();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// 0x2A6F - Notify about humidity x0.01% (pvvx)
|
|
||||||
{
|
|
||||||
bool humidityNotifyCreated = false;
|
|
||||||
if (!humidityNotifyCreated) {
|
|
||||||
NimBLEUUID charUuid((uint16_t) 0x2A6F);
|
|
||||||
pChar = pService->getCharacteristic(charUuid);
|
|
||||||
|
|
||||||
if (pChar && (pChar->canNotify() || pChar->canIndicate())) {
|
|
||||||
Log.straceln(
|
|
||||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found humidity char (%s) in env service on device %s"),
|
|
||||||
sensorId, sSensor.name, charUuid.toString().c_str(), pAddress.c_str()
|
|
||||||
);
|
|
||||||
|
|
||||||
pChar->unsubscribe();
|
|
||||||
humidityNotifyCreated = pChar->subscribe(
|
|
||||||
pChar->canNotify(),
|
|
||||||
[sensorId](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
|
|
||||||
if (pChar == nullptr) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const NimBLERemoteService* pService = pChar->getRemoteService();
|
|
||||||
if (pService == nullptr) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
NimBLEClient* pClient = pService->getClient();
|
|
||||||
if (pClient == nullptr) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto& sSensor = Sensors::settings[sensorId];
|
|
||||||
|
|
||||||
if (length != 2) {
|
|
||||||
Log.swarningln(
|
|
||||||
FPSTR(L_SENSORS_BLE),
|
|
||||||
F("Sensor #%hhu '%s': invalid notification data at humidity char (%s) on device %s"),
|
|
||||||
sensorId,
|
|
||||||
sSensor.name,
|
|
||||||
pChar->getUUID().toString().c_str(),
|
|
||||||
pClient->getPeerAddress().toString().c_str()
|
|
||||||
);
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
float rawHumidity = (pChar->getValue<uint16_t>() * 0.01f);
|
|
||||||
Log.straceln(
|
|
||||||
FPSTR(L_SENSORS_BLE),
|
|
||||||
F("Sensor #%hhu '%s': received humidity: %.2f"),
|
|
||||||
sensorId, sSensor.name, rawHumidity
|
|
||||||
);
|
|
||||||
|
|
||||||
// set humidity
|
|
||||||
Sensors::setValueById(sensorId, rawHumidity, Sensors::ValueType::HUMIDITY, true, true);
|
|
||||||
|
|
||||||
// update rssi
|
|
||||||
Sensors::setValueById(sensorId, pClient->getRssi(), Sensors::ValueType::RSSI, false, false);
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
if (humidityNotifyCreated) {
|
|
||||||
Log.straceln(
|
|
||||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to humidity char (%s) in env service on device %s"),
|
|
||||||
sensorId, sSensor.name,
|
|
||||||
charUuid.toString().c_str(), pAddress.c_str()
|
|
||||||
);
|
|
||||||
|
|
||||||
} else {
|
|
||||||
Log.swarningln(
|
|
||||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to humidity char (%s) in env service on device %s"),
|
|
||||||
sensorId, sSensor.name,
|
|
||||||
charUuid.toString().c_str(), pAddress.c_str()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!humidityNotifyCreated) {
|
|
||||||
Log.swarningln(
|
|
||||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': not found supported humidity chars in env service on device %s"),
|
|
||||||
sensorId, sSensor.name, pAddress.c_str()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Battery Service (0x180F)
|
|
||||||
{
|
|
||||||
NimBLEUUID serviceUuid((uint16_t) 0x180F);
|
|
||||||
pService = pClient->getService(serviceUuid);
|
|
||||||
if (!pService) {
|
|
||||||
Log.straceln(
|
|
||||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to find battery service (%s) on device %s"),
|
|
||||||
sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress.c_str()
|
|
||||||
);
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
Log.straceln(
|
Log.sinfoln(FPSTR(L_SENSORS_BLE), F("Unable to start scanning"));
|
||||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found battery service (%s) on device %s"),
|
|
||||||
sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress.c_str()
|
|
||||||
);
|
|
||||||
|
|
||||||
// 0x2A19 - Notify the battery charge level 0..99% (pvvx)
|
|
||||||
bool batteryNotifyCreated = false;
|
|
||||||
if (!batteryNotifyCreated) {
|
|
||||||
NimBLEUUID charUuid((uint16_t) 0x2A19);
|
|
||||||
pChar = pService->getCharacteristic(charUuid);
|
|
||||||
|
|
||||||
if (pChar && (pChar->canNotify() || pChar->canIndicate())) {
|
|
||||||
Log.straceln(
|
|
||||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found battery char (%s) in battery service on device %s"),
|
|
||||||
sensorId, sSensor.name, charUuid.toString().c_str(), pAddress.c_str()
|
|
||||||
);
|
|
||||||
|
|
||||||
pChar->unsubscribe();
|
|
||||||
batteryNotifyCreated = pChar->subscribe(
|
|
||||||
pChar->canNotify(),
|
|
||||||
[sensorId](NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify) {
|
|
||||||
if (pChar == nullptr) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const NimBLERemoteService* pService = pChar->getRemoteService();
|
|
||||||
if (pService == nullptr) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
NimBLEClient* pClient = pService->getClient();
|
|
||||||
if (pClient == nullptr) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto& sSensor = Sensors::settings[sensorId];
|
|
||||||
|
|
||||||
if (length != 1) {
|
|
||||||
Log.swarningln(
|
|
||||||
FPSTR(L_SENSORS_BLE),
|
|
||||||
F("Sensor #%hhu '%s': invalid notification data at battery char (%s) on device %s"),
|
|
||||||
sensorId,
|
|
||||||
sSensor.name,
|
|
||||||
pChar->getUUID().toString().c_str(),
|
|
||||||
pClient->getPeerAddress().toString().c_str()
|
|
||||||
);
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto rawBattery = pChar->getValue<uint8_t>();
|
|
||||||
Log.straceln(
|
|
||||||
FPSTR(L_SENSORS_BLE),
|
|
||||||
F("Sensor #%hhu '%s': received battery: %hhu"),
|
|
||||||
sensorId, sSensor.name, rawBattery
|
|
||||||
);
|
|
||||||
|
|
||||||
// set battery
|
|
||||||
Sensors::setValueById(sensorId, rawBattery, Sensors::ValueType::BATTERY, true, true);
|
|
||||||
|
|
||||||
// update rssi
|
|
||||||
Sensors::setValueById(sensorId, pClient->getRssi(), Sensors::ValueType::RSSI, false, false);
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
if (batteryNotifyCreated) {
|
|
||||||
Log.straceln(
|
|
||||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to battery char (%s) in battery service on device %s"),
|
|
||||||
sensorId, sSensor.name,
|
|
||||||
charUuid.toString().c_str(), pAddress.c_str()
|
|
||||||
);
|
|
||||||
|
|
||||||
} else {
|
|
||||||
Log.swarningln(
|
|
||||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to battery char (%s) in battery service on device %s"),
|
|
||||||
sensorId, sSensor.name,
|
|
||||||
charUuid.toString().c_str(), pAddress.c_str()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!batteryNotifyCreated) {
|
|
||||||
Log.swarningln(
|
|
||||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': not found supported battery chars in battery service on device %s"),
|
|
||||||
sensorId, sSensor.name, pAddress.c_str()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool setDateOnBleSensor(NimBLEClient* pClient, const struct tm *ptm) {
|
|
||||||
auto ts = mkgmtime(ptm);
|
|
||||||
|
|
||||||
uint8_t data[5] = {};
|
|
||||||
data[0] = 0x23;
|
|
||||||
data[1] = ts & 0xff;
|
|
||||||
data[2] = (ts >> 8) & 0xff;
|
|
||||||
data[3] = (ts >> 16) & 0xff;
|
|
||||||
data[4] = (ts >> 24) & 0xff;
|
|
||||||
|
|
||||||
return pClient->setValue(
|
|
||||||
NimBLEUUID((uint16_t) 0x1f10),
|
|
||||||
NimBLEUUID((uint16_t) 0x1f1f),
|
|
||||||
NimBLEAttValue(data, sizeof(data))
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -78,7 +78,6 @@ struct Settings {
|
|||||||
bool autoFaultReset = false;
|
bool autoFaultReset = false;
|
||||||
bool autoDiagReset = false;
|
bool autoDiagReset = false;
|
||||||
bool setDateAndTime = false;
|
bool setDateAndTime = false;
|
||||||
bool alwaysSetIndoorTemp = true;
|
|
||||||
bool nativeHeatingControl = false;
|
bool nativeHeatingControl = false;
|
||||||
bool immergasFix = false;
|
bool immergasFix = false;
|
||||||
} options;
|
} options;
|
||||||
@@ -104,17 +103,12 @@ struct Settings {
|
|||||||
bool enabled = true;
|
bool enabled = true;
|
||||||
bool turbo = false;
|
bool turbo = false;
|
||||||
float target = DEFAULT_HEATING_TARGET_TEMP;
|
float target = DEFAULT_HEATING_TARGET_TEMP;
|
||||||
|
float hysteresis = 0.5f;
|
||||||
float turboFactor = 7.5f;
|
float turboFactor = 7.5f;
|
||||||
uint8_t minTemp = DEFAULT_HEATING_MIN_TEMP;
|
uint8_t minTemp = DEFAULT_HEATING_MIN_TEMP;
|
||||||
uint8_t maxTemp = DEFAULT_HEATING_MAX_TEMP;
|
uint8_t maxTemp = DEFAULT_HEATING_MAX_TEMP;
|
||||||
uint8_t maxModulation = 100;
|
uint8_t maxModulation = 100;
|
||||||
|
|
||||||
struct {
|
|
||||||
bool enabled = true;
|
|
||||||
float value = 0.5f;
|
|
||||||
HysteresisAction action = HysteresisAction::DISABLE_HEATING;
|
|
||||||
} hysteresis;
|
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
uint8_t highTemp = 95;
|
uint8_t highTemp = 95;
|
||||||
uint8_t lowTemp = 90;
|
uint8_t lowTemp = 90;
|
||||||
@@ -160,16 +154,14 @@ struct Settings {
|
|||||||
|
|
||||||
struct {
|
struct {
|
||||||
bool enabled = false;
|
bool enabled = false;
|
||||||
float slope = 0.7f;
|
float n_factor = 0.7f;
|
||||||
float exponent = 1.3f;
|
float k_factor = 3.0f;
|
||||||
float shift = 0.0f;
|
float t_factor = 2.0f;
|
||||||
float targetDiffFactor = 2.0f;
|
|
||||||
} equitherm;
|
} equitherm;
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
bool use = false;
|
bool use = false;
|
||||||
uint8_t gpio = DEFAULT_EXT_PUMP_GPIO;
|
uint8_t gpio = DEFAULT_EXT_PUMP_GPIO;
|
||||||
bool invertState = false;
|
|
||||||
unsigned short postCirculationTime = 600;
|
unsigned short postCirculationTime = 600;
|
||||||
unsigned int antiStuckInterval = 2592000;
|
unsigned int antiStuckInterval = 2592000;
|
||||||
unsigned short antiStuckTime = 300;
|
unsigned short antiStuckTime = 300;
|
||||||
|
|||||||
@@ -163,9 +163,4 @@ enum class UnitSystem : uint8_t {
|
|||||||
IMPERIAL = 1
|
IMPERIAL = 1
|
||||||
};
|
};
|
||||||
|
|
||||||
enum class HysteresisAction : uint8_t {
|
|
||||||
DISABLE_HEATING = 0,
|
|
||||||
SET_ZERO_TARGET = 1
|
|
||||||
};
|
|
||||||
|
|
||||||
char buffer[255];
|
char buffer[255];
|
||||||
@@ -34,11 +34,9 @@ const char L_CASCADE_OUTPUT[] PROGMEM = "CASCADE.OUTPUT";
|
|||||||
const char L_EXTPUMP[] PROGMEM = "EXTPUMP";
|
const char L_EXTPUMP[] PROGMEM = "EXTPUMP";
|
||||||
|
|
||||||
|
|
||||||
const char S_ACTION[] PROGMEM = "action";
|
|
||||||
const char S_ACTIONS[] PROGMEM = "actions";
|
const char S_ACTIONS[] PROGMEM = "actions";
|
||||||
const char S_ACTIVE[] PROGMEM = "active";
|
const char S_ACTIVE[] PROGMEM = "active";
|
||||||
const char S_ADDRESS[] PROGMEM = "address";
|
const char S_ADDRESS[] PROGMEM = "address";
|
||||||
const char S_ALWAYS_SET_INDOOR_TEMP[] PROGMEM = "alwaysSetIndoorTemp";
|
|
||||||
const char S_ANTI_STUCK_INTERVAL[] PROGMEM = "antiStuckInterval";
|
const char S_ANTI_STUCK_INTERVAL[] PROGMEM = "antiStuckInterval";
|
||||||
const char S_ANTI_STUCK_TIME[] PROGMEM = "antiStuckTime";
|
const char S_ANTI_STUCK_TIME[] PROGMEM = "antiStuckTime";
|
||||||
const char S_AP[] PROGMEM = "ap";
|
const char S_AP[] PROGMEM = "ap";
|
||||||
@@ -83,7 +81,6 @@ const char S_ENABLED[] PROGMEM = "enabled";
|
|||||||
const char S_ENV[] PROGMEM = "env";
|
const char S_ENV[] PROGMEM = "env";
|
||||||
const char S_EPC[] PROGMEM = "epc";
|
const char S_EPC[] PROGMEM = "epc";
|
||||||
const char S_EQUITHERM[] PROGMEM = "equitherm";
|
const char S_EQUITHERM[] PROGMEM = "equitherm";
|
||||||
const char S_EXPONENT[] PROGMEM = "exponent";
|
|
||||||
const char S_EXTERNAL_PUMP[] PROGMEM = "externalPump";
|
const char S_EXTERNAL_PUMP[] PROGMEM = "externalPump";
|
||||||
const char S_FACTOR[] PROGMEM = "factor";
|
const char S_FACTOR[] PROGMEM = "factor";
|
||||||
const char S_FAULT[] PROGMEM = "fault";
|
const char S_FAULT[] PROGMEM = "fault";
|
||||||
@@ -120,6 +117,7 @@ const char S_INVERT_STATE[] PROGMEM = "invertState";
|
|||||||
const char S_IP[] PROGMEM = "ip";
|
const char S_IP[] PROGMEM = "ip";
|
||||||
const char S_I_FACTOR[] PROGMEM = "i_factor";
|
const char S_I_FACTOR[] PROGMEM = "i_factor";
|
||||||
const char S_I_MULTIPLIER[] PROGMEM = "i_multiplier";
|
const char S_I_MULTIPLIER[] PROGMEM = "i_multiplier";
|
||||||
|
const char S_K_FACTOR[] PROGMEM = "k_factor";
|
||||||
const char S_LOGIN[] PROGMEM = "login";
|
const char S_LOGIN[] PROGMEM = "login";
|
||||||
const char S_LOG_LEVEL[] PROGMEM = "logLevel";
|
const char S_LOG_LEVEL[] PROGMEM = "logLevel";
|
||||||
const char S_LOW_TEMP[] PROGMEM = "lowTemp";
|
const char S_LOW_TEMP[] PROGMEM = "lowTemp";
|
||||||
@@ -145,6 +143,7 @@ const char S_NAME[] PROGMEM = "name";
|
|||||||
const char S_NATIVE_HEATING_CONTROL[] PROGMEM = "nativeHeatingControl";
|
const char S_NATIVE_HEATING_CONTROL[] PROGMEM = "nativeHeatingControl";
|
||||||
const char S_NETWORK[] PROGMEM = "network";
|
const char S_NETWORK[] PROGMEM = "network";
|
||||||
const char S_NTP[] PROGMEM = "ntp";
|
const char S_NTP[] PROGMEM = "ntp";
|
||||||
|
const char S_N_FACTOR[] PROGMEM = "n_factor";
|
||||||
const char S_OFFSET[] PROGMEM = "offset";
|
const char S_OFFSET[] PROGMEM = "offset";
|
||||||
const char S_ON_ENABLED_HEATING[] PROGMEM = "onEnabledHeating";
|
const char S_ON_ENABLED_HEATING[] PROGMEM = "onEnabledHeating";
|
||||||
const char S_ON_FAULT[] PROGMEM = "onFault";
|
const char S_ON_FAULT[] PROGMEM = "onFault";
|
||||||
@@ -183,11 +182,9 @@ const char S_SERIAL[] PROGMEM = "serial";
|
|||||||
const char S_SERVER[] PROGMEM = "server";
|
const char S_SERVER[] PROGMEM = "server";
|
||||||
const char S_SETTINGS[] PROGMEM = "settings";
|
const char S_SETTINGS[] PROGMEM = "settings";
|
||||||
const char S_SET_DATE_AND_TIME[] PROGMEM = "setDateAndTime";
|
const char S_SET_DATE_AND_TIME[] PROGMEM = "setDateAndTime";
|
||||||
const char S_SHIFT[] PROGMEM = "shift";
|
|
||||||
const char S_SIGNAL_QUALITY[] PROGMEM = "signalQuality";
|
const char S_SIGNAL_QUALITY[] PROGMEM = "signalQuality";
|
||||||
const char S_SIZE[] PROGMEM = "size";
|
const char S_SIZE[] PROGMEM = "size";
|
||||||
const char S_SLAVE[] PROGMEM = "slave";
|
const char S_SLAVE[] PROGMEM = "slave";
|
||||||
const char S_SLOPE[] PROGMEM = "slope";
|
|
||||||
const char S_SSID[] PROGMEM = "ssid";
|
const char S_SSID[] PROGMEM = "ssid";
|
||||||
const char S_STA[] PROGMEM = "sta";
|
const char S_STA[] PROGMEM = "sta";
|
||||||
const char S_STATE[] PROGMEM = "state";
|
const char S_STATE[] PROGMEM = "state";
|
||||||
@@ -199,7 +196,6 @@ const char S_SUBNET[] PROGMEM = "subnet";
|
|||||||
const char S_SUMMER_WINTER_MODE[] PROGMEM = "summerWinterMode";
|
const char S_SUMMER_WINTER_MODE[] PROGMEM = "summerWinterMode";
|
||||||
const char S_SYSTEM[] PROGMEM = "system";
|
const char S_SYSTEM[] PROGMEM = "system";
|
||||||
const char S_TARGET[] PROGMEM = "target";
|
const char S_TARGET[] PROGMEM = "target";
|
||||||
const char S_TARGET_DIFF_FACTOR[] PROGMEM = "targetDiffFactor";
|
|
||||||
const char S_TARGET_TEMP[] PROGMEM = "targetTemp";
|
const char S_TARGET_TEMP[] PROGMEM = "targetTemp";
|
||||||
const char S_TELNET[] PROGMEM = "telnet";
|
const char S_TELNET[] PROGMEM = "telnet";
|
||||||
const char S_TEMPERATURE[] PROGMEM = "temperature";
|
const char S_TEMPERATURE[] PROGMEM = "temperature";
|
||||||
@@ -212,6 +208,7 @@ const char S_TRESHOLD_TIME[] PROGMEM = "tresholdTime";
|
|||||||
const char S_TURBO[] PROGMEM = "turbo";
|
const char S_TURBO[] PROGMEM = "turbo";
|
||||||
const char S_TURBO_FACTOR[] PROGMEM = "turboFactor";
|
const char S_TURBO_FACTOR[] PROGMEM = "turboFactor";
|
||||||
const char S_TYPE[] PROGMEM = "type";
|
const char S_TYPE[] PROGMEM = "type";
|
||||||
|
const char S_T_FACTOR[] PROGMEM = "t_factor";
|
||||||
const char S_UNIT_SYSTEM[] PROGMEM = "unitSystem";
|
const char S_UNIT_SYSTEM[] PROGMEM = "unitSystem";
|
||||||
const char S_UPTIME[] PROGMEM = "uptime";
|
const char S_UPTIME[] PROGMEM = "uptime";
|
||||||
const char S_USE[] PROGMEM = "use";
|
const char S_USE[] PROGMEM = "use";
|
||||||
|
|||||||
98
src/utils.h
98
src/utils.h
@@ -468,7 +468,6 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
|
|||||||
otOptions[FPSTR(S_AUTO_FAULT_RESET)] = src.opentherm.options.autoFaultReset;
|
otOptions[FPSTR(S_AUTO_FAULT_RESET)] = src.opentherm.options.autoFaultReset;
|
||||||
otOptions[FPSTR(S_AUTO_DIAG_RESET)] = src.opentherm.options.autoDiagReset;
|
otOptions[FPSTR(S_AUTO_DIAG_RESET)] = src.opentherm.options.autoDiagReset;
|
||||||
otOptions[FPSTR(S_SET_DATE_AND_TIME)] = src.opentherm.options.setDateAndTime;
|
otOptions[FPSTR(S_SET_DATE_AND_TIME)] = src.opentherm.options.setDateAndTime;
|
||||||
otOptions[FPSTR(S_ALWAYS_SET_INDOOR_TEMP)] = src.opentherm.options.alwaysSetIndoorTemp;
|
|
||||||
otOptions[FPSTR(S_NATIVE_HEATING_CONTROL)] = src.opentherm.options.nativeHeatingControl;
|
otOptions[FPSTR(S_NATIVE_HEATING_CONTROL)] = src.opentherm.options.nativeHeatingControl;
|
||||||
otOptions[FPSTR(S_IMMERGAS_FIX)] = src.opentherm.options.immergasFix;
|
otOptions[FPSTR(S_IMMERGAS_FIX)] = src.opentherm.options.immergasFix;
|
||||||
|
|
||||||
@@ -491,9 +490,7 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
|
|||||||
heating[FPSTR(S_ENABLED)] = src.heating.enabled;
|
heating[FPSTR(S_ENABLED)] = src.heating.enabled;
|
||||||
heating[FPSTR(S_TURBO)] = src.heating.turbo;
|
heating[FPSTR(S_TURBO)] = src.heating.turbo;
|
||||||
heating[FPSTR(S_TARGET)] = roundf(src.heating.target, 2);
|
heating[FPSTR(S_TARGET)] = roundf(src.heating.target, 2);
|
||||||
heating[FPSTR(S_HYSTERESIS)][FPSTR(S_ENABLED)] = src.heating.hysteresis.enabled;
|
heating[FPSTR(S_HYSTERESIS)] = roundf(src.heating.hysteresis, 3);
|
||||||
heating[FPSTR(S_HYSTERESIS)][FPSTR(S_VALUE)] = roundf(src.heating.hysteresis.value, 3);
|
|
||||||
heating[FPSTR(S_HYSTERESIS)][FPSTR(S_ACTION)] = static_cast<uint8_t>(src.heating.hysteresis.action);
|
|
||||||
heating[FPSTR(S_TURBO_FACTOR)] = roundf(src.heating.turboFactor, 3);
|
heating[FPSTR(S_TURBO_FACTOR)] = roundf(src.heating.turboFactor, 3);
|
||||||
heating[FPSTR(S_MIN_TEMP)] = src.heating.minTemp;
|
heating[FPSTR(S_MIN_TEMP)] = src.heating.minTemp;
|
||||||
heating[FPSTR(S_MAX_TEMP)] = src.heating.maxTemp;
|
heating[FPSTR(S_MAX_TEMP)] = src.heating.maxTemp;
|
||||||
@@ -520,10 +517,9 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
|
|||||||
|
|
||||||
auto equitherm = dst[FPSTR(S_EQUITHERM)].to<JsonObject>();
|
auto equitherm = dst[FPSTR(S_EQUITHERM)].to<JsonObject>();
|
||||||
equitherm[FPSTR(S_ENABLED)] = src.equitherm.enabled;
|
equitherm[FPSTR(S_ENABLED)] = src.equitherm.enabled;
|
||||||
equitherm[FPSTR(S_SLOPE)] = roundf(src.equitherm.slope, 3);
|
equitherm[FPSTR(S_N_FACTOR)] = roundf(src.equitherm.n_factor, 3);
|
||||||
equitherm[FPSTR(S_EXPONENT)] = roundf(src.equitherm.exponent, 3);
|
equitherm[FPSTR(S_K_FACTOR)] = roundf(src.equitherm.k_factor, 3);
|
||||||
equitherm[FPSTR(S_SHIFT)] = roundf(src.equitherm.shift, 2);
|
equitherm[FPSTR(S_T_FACTOR)] = roundf(src.equitherm.t_factor, 3);
|
||||||
equitherm[FPSTR(S_TARGET_DIFF_FACTOR)] = roundf(src.equitherm.targetDiffFactor, 3);
|
|
||||||
|
|
||||||
auto pid = dst[FPSTR(S_PID)].to<JsonObject>();
|
auto pid = dst[FPSTR(S_PID)].to<JsonObject>();
|
||||||
pid[FPSTR(S_ENABLED)] = src.pid.enabled;
|
pid[FPSTR(S_ENABLED)] = src.pid.enabled;
|
||||||
@@ -546,7 +542,6 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
|
|||||||
auto externalPump = dst[FPSTR(S_EXTERNAL_PUMP)].to<JsonObject>();
|
auto externalPump = dst[FPSTR(S_EXTERNAL_PUMP)].to<JsonObject>();
|
||||||
externalPump[FPSTR(S_USE)] = src.externalPump.use;
|
externalPump[FPSTR(S_USE)] = src.externalPump.use;
|
||||||
externalPump[FPSTR(S_GPIO)] = src.externalPump.gpio;
|
externalPump[FPSTR(S_GPIO)] = src.externalPump.gpio;
|
||||||
externalPump[FPSTR(S_INVERT_STATE)] = src.externalPump.invertState;
|
|
||||||
externalPump[FPSTR(S_POST_CIRCULATION_TIME)] = roundf(src.externalPump.postCirculationTime / 60, 0);
|
externalPump[FPSTR(S_POST_CIRCULATION_TIME)] = roundf(src.externalPump.postCirculationTime / 60, 0);
|
||||||
externalPump[FPSTR(S_ANTI_STUCK_INTERVAL)] = roundf(src.externalPump.antiStuckInterval / 86400, 0);
|
externalPump[FPSTR(S_ANTI_STUCK_INTERVAL)] = roundf(src.externalPump.antiStuckInterval / 86400, 0);
|
||||||
externalPump[FPSTR(S_ANTI_STUCK_TIME)] = roundf(src.externalPump.antiStuckTime / 60, 0);
|
externalPump[FPSTR(S_ANTI_STUCK_TIME)] = roundf(src.externalPump.antiStuckTime / 60, 0);
|
||||||
@@ -1004,15 +999,6 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_ALWAYS_SET_INDOOR_TEMP)].is<bool>()) {
|
|
||||||
bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_ALWAYS_SET_INDOOR_TEMP)].as<bool>();
|
|
||||||
|
|
||||||
if (value != dst.opentherm.options.alwaysSetIndoorTemp) {
|
|
||||||
dst.opentherm.options.alwaysSetIndoorTemp = value;
|
|
||||||
changed = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_NATIVE_HEATING_CONTROL)].is<bool>()) {
|
if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_NATIVE_HEATING_CONTROL)].is<bool>()) {
|
||||||
bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_NATIVE_HEATING_CONTROL)].as<bool>();
|
bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_NATIVE_HEATING_CONTROL)].as<bool>();
|
||||||
|
|
||||||
@@ -1140,38 +1126,29 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!src[FPSTR(S_EQUITHERM)][FPSTR(S_SLOPE)].isNull()) {
|
if (!src[FPSTR(S_EQUITHERM)][FPSTR(S_N_FACTOR)].isNull()) {
|
||||||
float value = src[FPSTR(S_EQUITHERM)][FPSTR(S_SLOPE)].as<float>();
|
float value = src[FPSTR(S_EQUITHERM)][FPSTR(S_N_FACTOR)].as<float>();
|
||||||
|
|
||||||
if (value > 0.0f && value <= 10.0f && fabsf(value - dst.equitherm.slope) > 0.0001f) {
|
if (value > 0 && value <= 10 && fabsf(value - dst.equitherm.n_factor) > 0.0001f) {
|
||||||
dst.equitherm.slope = roundf(value, 3);
|
dst.equitherm.n_factor = roundf(value, 3);
|
||||||
changed = true;
|
changed = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!src[FPSTR(S_EQUITHERM)][FPSTR(S_EXPONENT)].isNull()) {
|
if (!src[FPSTR(S_EQUITHERM)][FPSTR(S_K_FACTOR)].isNull()) {
|
||||||
float value = src[FPSTR(S_EQUITHERM)][FPSTR(S_EXPONENT)].as<float>();
|
float value = src[FPSTR(S_EQUITHERM)][FPSTR(S_K_FACTOR)].as<float>();
|
||||||
|
|
||||||
if (value > 0.0f && value <= 2.0f && fabsf(value - dst.equitherm.exponent) > 0.0001f) {
|
if (value >= 0 && value <= 10 && fabsf(value - dst.equitherm.k_factor) > 0.0001f) {
|
||||||
dst.equitherm.exponent = roundf(value, 3);
|
dst.equitherm.k_factor = roundf(value, 3);
|
||||||
changed = true;
|
changed = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!src[FPSTR(S_EQUITHERM)][FPSTR(S_SHIFT)].isNull()) {
|
if (!src[FPSTR(S_EQUITHERM)][FPSTR(S_T_FACTOR)].isNull()) {
|
||||||
float value = src[FPSTR(S_EQUITHERM)][FPSTR(S_SHIFT)].as<float>();
|
float value = src[FPSTR(S_EQUITHERM)][FPSTR(S_T_FACTOR)].as<float>();
|
||||||
|
|
||||||
if (value >= -15.0f && value <= 15.0f && fabsf(value - dst.equitherm.shift) > 0.0001f) {
|
if (value >= 0 && value <= 10 && fabsf(value - dst.equitherm.t_factor) > 0.0001f) {
|
||||||
dst.equitherm.shift = roundf(value, 2);
|
dst.equitherm.t_factor = roundf(value, 3);
|
||||||
changed = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!src[FPSTR(S_EQUITHERM)][FPSTR(S_TARGET_DIFF_FACTOR)].isNull()) {
|
|
||||||
float value = src[FPSTR(S_EQUITHERM)][FPSTR(S_TARGET_DIFF_FACTOR)].as<float>();
|
|
||||||
|
|
||||||
if (value >= 0.0f && value <= 10.0f && fabsf(value - dst.equitherm.targetDiffFactor) > 0.0001f) {
|
|
||||||
dst.equitherm.targetDiffFactor = roundf(value, 3);
|
|
||||||
changed = true;
|
changed = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1326,41 +1303,15 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)][FPSTR(S_ENABLED)].is<bool>()) {
|
if (!src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)].isNull()) {
|
||||||
bool value = src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)][FPSTR(S_ENABLED)].as<bool>();
|
float value = src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)].as<float>();
|
||||||
|
|
||||||
if (value != dst.heating.hysteresis.enabled) {
|
if (value >= 0.0f && value <= 15.0f && fabsf(value - dst.heating.hysteresis) > 0.0001f) {
|
||||||
dst.heating.hysteresis.enabled = value;
|
dst.heating.hysteresis = roundf(value, 2);
|
||||||
changed = true;
|
changed = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)][FPSTR(S_VALUE)].isNull()) {
|
|
||||||
float value = src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)][FPSTR(S_VALUE)].as<float>();
|
|
||||||
|
|
||||||
if (value >= 0.0f && value <= 15.0f && fabsf(value - dst.heating.hysteresis.value) > 0.0001f) {
|
|
||||||
dst.heating.hysteresis.value = roundf(value, 2);
|
|
||||||
changed = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)][FPSTR(S_ACTION)].isNull()) {
|
|
||||||
uint8_t value = src[FPSTR(S_HEATING)][FPSTR(S_HYSTERESIS)][FPSTR(S_ACTION)].as<uint8_t>();
|
|
||||||
|
|
||||||
switch (value) {
|
|
||||||
case static_cast<uint8_t>(HysteresisAction::DISABLE_HEATING):
|
|
||||||
case static_cast<uint8_t>(HysteresisAction::SET_ZERO_TARGET):
|
|
||||||
if (static_cast<uint8_t>(dst.heating.hysteresis.action) != value) {
|
|
||||||
dst.heating.hysteresis.action = static_cast<HysteresisAction>(value);
|
|
||||||
changed = true;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!src[FPSTR(S_HEATING)][FPSTR(S_TURBO_FACTOR)].isNull()) {
|
if (!src[FPSTR(S_HEATING)][FPSTR(S_TURBO_FACTOR)].isNull()) {
|
||||||
float value = src[FPSTR(S_HEATING)][FPSTR(S_TURBO_FACTOR)].as<float>();
|
float value = src[FPSTR(S_HEATING)][FPSTR(S_TURBO_FACTOR)].as<float>();
|
||||||
|
|
||||||
@@ -1541,15 +1492,6 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (src[FPSTR(S_EXTERNAL_PUMP)][FPSTR(S_INVERT_STATE)].is<bool>()) {
|
|
||||||
bool value = src[FPSTR(S_EXTERNAL_PUMP)][FPSTR(S_INVERT_STATE)].as<bool>();
|
|
||||||
|
|
||||||
if (value != dst.externalPump.invertState) {
|
|
||||||
dst.externalPump.invertState = value;
|
|
||||||
changed = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!src[FPSTR(S_EXTERNAL_PUMP)][FPSTR(S_POST_CIRCULATION_TIME)].isNull()) {
|
if (!src[FPSTR(S_EXTERNAL_PUMP)][FPSTR(S_POST_CIRCULATION_TIME)].isNull()) {
|
||||||
unsigned short value = src[FPSTR(S_EXTERNAL_PUMP)][FPSTR(S_POST_CIRCULATION_TIME)].as<unsigned short>();
|
unsigned short value = src[FPSTR(S_EXTERNAL_PUMP)][FPSTR(S_POST_CIRCULATION_TIME)].as<unsigned short>();
|
||||||
|
|
||||||
|
|||||||
@@ -356,16 +356,7 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
"heating": {
|
"heating": {
|
||||||
"hyst": {
|
"hyst": "滞后值<small>(单位：度)</small>",
|
||||||
"title": "滞回",
|
|
||||||
"desc": "滞回有助于维持设定的室内温度（在使用«Equitherm»和/或«PID»时）。强制禁用加热当<code>current indoor > target + value</code>，启用加热当<code>current indoor < (target - value)</code>。",
|
|
||||||
"value": "值 <small>(以度为单位)</small>",
|
|
||||||
"action": {
|
|
||||||
"title": "行动",
|
|
||||||
"disableHeating": "禁用加热",
|
|
||||||
"set0target": "设置空目标"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"turboFactor": "Turbo 模式系数"
|
"turboFactor": "Turbo 模式系数"
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -380,26 +371,11 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
"equitherm": {
|
"equitherm": {
|
||||||
"slope": {
|
"n": "N 系数",
|
||||||
"title": "斜率",
|
"k": "K 系数",
|
||||||
"note": "热损失补偿。主要调谐参数。"
|
"t": {
|
||||||
},
|
"title": "T 系数",
|
||||||
"exponent": {
|
"note": "启用PID时此参数无效"
|
||||||
"title": "指数",
|
|
||||||
"note": "散热器效率。典型值：<code>1.1</code> - 地板采暖，<code>1.2</code> - 铸铁，<code>1.3</code> - 面板散热器，<code>1.4</code> - 对流器。"
|
|
||||||
},
|
|
||||||
"shift": {
|
|
||||||
"title": "偏移",
|
|
||||||
"note": "补偿额外热损失（例如，在管道中）或额外热源。"
|
|
||||||
},
|
|
||||||
"targetDiffFactor": {
|
|
||||||
"title": "T 因子",
|
|
||||||
"note": "如果启用 PID，则不使用。将目标和当前室内温度之间的差值添加到设定点：<code>setpoint = setpoint + ((target - indoor) * T)</code>。"
|
|
||||||
},
|
|
||||||
"chart": {
|
|
||||||
"targetTemp": "目标室内温度",
|
|
||||||
"setpointTemp": "热载体温度",
|
|
||||||
"outdoorTemp": "室外温度"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -479,7 +455,6 @@
|
|||||||
"extPump": {
|
"extPump": {
|
||||||
"use": "使用外置循环泵",
|
"use": "使用外置循环泵",
|
||||||
"gpio": "继电器 GPIO引脚",
|
"gpio": "继电器 GPIO引脚",
|
||||||
"invertState": "切换 GPIO 状态",
|
|
||||||
"postCirculationTime": "后循环时间 <small>(分钟)</small>",
|
"postCirculationTime": "后循环时间 <small>(分钟)</small>",
|
||||||
"antiStuckInterval": "防卡死间隔时间<small>(天)</small>",
|
"antiStuckInterval": "防卡死间隔时间<small>(天)</small>",
|
||||||
"antiStuckTime": "防卡死运行时长<small>(分钟)</small>"
|
"antiStuckTime": "防卡死运行时长<small>(分钟)</small>"
|
||||||
|
|||||||
@@ -356,16 +356,7 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
"heating": {
|
"heating": {
|
||||||
"hyst": {
|
"hyst": "Hysteresis <small>(in degrees)</small>",
|
||||||
"title": "Hysteresis",
|
|
||||||
"desc": "Hysteresis is useful for maintaining a set indoor temp (when using «Equitherm» and/or «PID»). Forces disable heating when <code>current indoor > target + value</code> and enable heating when <code>current indoor < (target - value)</code>.",
|
|
||||||
"value": "Value <small>(in degrees)</small>",
|
|
||||||
"action": {
|
|
||||||
"title": "Action",
|
|
||||||
"disableHeating": "Disable heating",
|
|
||||||
"set0target": "Set null target"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"turboFactor": "Turbo mode coeff."
|
"turboFactor": "Turbo mode coeff."
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -380,26 +371,11 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
"equitherm": {
|
"equitherm": {
|
||||||
"slope": {
|
"n": "N factor",
|
||||||
"title": "Slope",
|
"k": "K factor",
|
||||||
"note": "Heat loss compensation. Main tuning parameter."
|
"t": {
|
||||||
},
|
|
||||||
"exponent": {
|
|
||||||
"title": "Exponent",
|
|
||||||
"note": "Radiator efficiency. Typical values: <code>1.1</code> - Floor heating, <code>1.2</code> - Cast iron, <code>1.3</code> - Panel radiators, <code>1.4</code> - Convectors."
|
|
||||||
},
|
|
||||||
"shift": {
|
|
||||||
"title": "Shift",
|
|
||||||
"note": "Compensates for additional heat losses (e.g., in pipes) or extra heat sources."
|
|
||||||
},
|
|
||||||
"targetDiffFactor": {
|
|
||||||
"title": "T factor",
|
"title": "T factor",
|
||||||
"note": "Not used if PID is enabled. Adds to the setpoint the difference between the target and current indoor temp: <code>setpoint = setpoint + ((target - indoor) * T)</code>."
|
"note": "Not used if PID is enabled"
|
||||||
},
|
|
||||||
"chart": {
|
|
||||||
"targetTemp": "Target indoor temperature",
|
|
||||||
"setpointTemp": "Heat carrier temperature",
|
|
||||||
"outdoorTemp": "Outdoor temperature"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -457,7 +433,6 @@
|
|||||||
"autoFaultReset": "Auto fault reset <small>(not recommended!)</small>",
|
"autoFaultReset": "Auto fault reset <small>(not recommended!)</small>",
|
||||||
"autoDiagReset": "Auto diag reset <small>(not recommended!)</small>",
|
"autoDiagReset": "Auto diag reset <small>(not recommended!)</small>",
|
||||||
"setDateAndTime": "Set date & time on boiler",
|
"setDateAndTime": "Set date & time on boiler",
|
||||||
"alwaysSetIndoorTemp": "Always set indoor temperature",
|
|
||||||
"immergasFix": "Fix for Immergas boilers"
|
"immergasFix": "Fix for Immergas boilers"
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -480,7 +455,6 @@
|
|||||||
"extPump": {
|
"extPump": {
|
||||||
"use": "Use external pump",
|
"use": "Use external pump",
|
||||||
"gpio": "Relay GPIO",
|
"gpio": "Relay GPIO",
|
||||||
"invertState": "Invert GPIO state",
|
|
||||||
"postCirculationTime": "Post circulation time <small>(min)</small>",
|
"postCirculationTime": "Post circulation time <small>(min)</small>",
|
||||||
"antiStuckInterval": "Anti stuck interval <small>(days)</small>",
|
"antiStuckInterval": "Anti stuck interval <small>(days)</small>",
|
||||||
"antiStuckTime": "Anti stuck time <small>(min)</small>"
|
"antiStuckTime": "Anti stuck time <small>(min)</small>"
|
||||||
|
|||||||
@@ -356,16 +356,7 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
"heating": {
|
"heating": {
|
||||||
"hyst": {
|
"hyst": "Isteresi <small>(in gradi)</small>",
|
||||||
"title": "Isteresi",
|
|
||||||
"desc": "L'isteresi è utile per mantenere una temperatura interna impostata (quando si utilizza «Equitherm» e/o «PID»). Forza la disabilitazione del riscaldamento quando <code>current indoor > target + value</code> e abilita il riscaldamento quando <code>current indoor < (target - value)</code>.",
|
|
||||||
"value": "Valore <small>(in gradi)</small>",
|
|
||||||
"action": {
|
|
||||||
"title": "Azione",
|
|
||||||
"disableHeating": "Disabilita riscaldamento",
|
|
||||||
"set0target": "Imposta target nullo"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"turboFactor": "Turbo mode coeff."
|
"turboFactor": "Turbo mode coeff."
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -380,26 +371,11 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
"equitherm": {
|
"equitherm": {
|
||||||
"slope": {
|
"n": "Fattore N",
|
||||||
"title": "Pendenza",
|
"k": "Fattore K",
|
||||||
"note": "Compensazione della perdita di calore. Parametro di regolazione principale."
|
"t": {
|
||||||
},
|
|
||||||
"exponent": {
|
|
||||||
"title": "Esponente",
|
|
||||||
"note": "Efficienza del radiatore. Valori tipici: <code>1.1</code> - Riscaldamento a pavimento, <code>1.2</code> - Ghisa, <code>1.3</code> - Radiatori a pannello, <code>1.4</code> - Convettori."
|
|
||||||
},
|
|
||||||
"shift": {
|
|
||||||
"title": "Spostamento",
|
|
||||||
"note": "Compensa perdite di calore aggiuntive (ad es., nelle tubature) o fonti di calore extra."
|
|
||||||
},
|
|
||||||
"targetDiffFactor": {
|
|
||||||
"title": "Fattore T",
|
"title": "Fattore T",
|
||||||
"note": "Non utilizzato se PID è abilitato. Aggiunge al setpoint la differenza tra la temperatura target e quella interna attuale: <code>setpoint = setpoint + ((target - indoor) * T)</code>."
|
"note": "Non usato se PID è attivato"
|
||||||
},
|
|
||||||
"chart": {
|
|
||||||
"targetTemp": "Temperatura interna target",
|
|
||||||
"setpointTemp": "Temperatura del vettore termico",
|
|
||||||
"outdoorTemp": "Temperatura esterna"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -479,7 +455,6 @@
|
|||||||
"extPump": {
|
"extPump": {
|
||||||
"use": "Usa pompa/circolatore esterno",
|
"use": "Usa pompa/circolatore esterno",
|
||||||
"gpio": "GPIO relè",
|
"gpio": "GPIO relè",
|
||||||
"invertState": "Inverti stato GPIO",
|
|
||||||
"postCirculationTime": "Tempo di post circolazione <small>(min)</small>",
|
"postCirculationTime": "Tempo di post circolazione <small>(min)</small>",
|
||||||
"antiStuckInterval": "Intervallo antiblocco <small>(days)</small>",
|
"antiStuckInterval": "Intervallo antiblocco <small>(days)</small>",
|
||||||
"antiStuckTime": "Tempo antiblocco <small>(min)</small>"
|
"antiStuckTime": "Tempo antiblocco <small>(min)</small>"
|
||||||
|
|||||||
@@ -327,16 +327,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"heating": {
|
"heating": {
|
||||||
"hyst": {
|
"hyst": "Hysterese <small>(in graden)</small>",
|
||||||
"title": "Hysterese",
|
|
||||||
"desc": "Hysterese is nuttig voor het handhaven van een ingestelde binnentemperatuur (bij gebruik van «Equitherm» en/of «PID»). Forceert uitschakelen van verwarming wanneer <code>current indoor > target + value</code> en inschakelen van verwarming wanneer <code>current indoor < (target - value)</code>.",
|
|
||||||
"value": "Waarde <small>(in graden)</small>",
|
|
||||||
"action": {
|
|
||||||
"title": "Actie",
|
|
||||||
"disableHeating": "Verwarming uitschakelen",
|
|
||||||
"set0target": "Stel null target in"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"turboFactor": "Turbomodus coëff."
|
"turboFactor": "Turbomodus coëff."
|
||||||
},
|
},
|
||||||
"emergency": {
|
"emergency": {
|
||||||
@@ -348,26 +339,11 @@
|
|||||||
"treshold": "Drempeltijd <small>(sec)</small>"
|
"treshold": "Drempeltijd <small>(sec)</small>"
|
||||||
},
|
},
|
||||||
"equitherm": {
|
"equitherm": {
|
||||||
"slope": {
|
"n": "N-factor",
|
||||||
"title": "Helling",
|
"k": "K-factor",
|
||||||
"note": "Compensatie voor warmteverlies. Hoofdafstelparameter."
|
"t": {
|
||||||
},
|
"title": "T-factor",
|
||||||
"exponent": {
|
"note": "Niet gebruikt als PID is ingeschakeld"
|
||||||
"title": "Exponent",
|
|
||||||
"note": "Radiator efficiëntie. Typische waarden: <code>1.1</code> - Vloerverwarming, <code>1.2</code> - Gietijzer, <code>1.3</code> - Paneelradiatoren, <code>1.4</code> - Convectors."
|
|
||||||
},
|
|
||||||
"shift": {
|
|
||||||
"title": "Verschuiving",
|
|
||||||
"note": "Compenseert voor extra warmteverliezen (bijv. in leidingen) of extra warmtebronnen."
|
|
||||||
},
|
|
||||||
"targetDiffFactor": {
|
|
||||||
"title": "T factor",
|
|
||||||
"note": "Niet gebruikt als PID is ingeschakeld. Voegt aan de setpoint de verschil tussen de target en huidige binnentemperatuur toe: <code>setpoint = setpoint + ((target - indoor) * T)</code>."
|
|
||||||
},
|
|
||||||
"chart": {
|
|
||||||
"targetTemp": "Doel binnentemperatuur",
|
|
||||||
"setpointTemp": "Warmtedrager temperatuur",
|
|
||||||
"outdoorTemp": "Buitentemperatuur"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"pid": {
|
"pid": {
|
||||||
@@ -441,7 +417,6 @@
|
|||||||
"extPump": {
|
"extPump": {
|
||||||
"use": "Gebruik externe pomp",
|
"use": "Gebruik externe pomp",
|
||||||
"gpio": "Relais GPIO",
|
"gpio": "Relais GPIO",
|
||||||
"invertState": "Inverteer GPIO-status",
|
|
||||||
"postCirculationTime": "Nacirculatietijd <small>(min)</small>",
|
"postCirculationTime": "Nacirculatietijd <small>(min)</small>",
|
||||||
"antiStuckInterval": "Anti-vastloopinterval <small>(dagen)</small>",
|
"antiStuckInterval": "Anti-vastloopinterval <small>(dagen)</small>",
|
||||||
"antiStuckTime": "Anti-vastlooptijd <small>(min)</small>"
|
"antiStuckTime": "Anti-vastlooptijd <small>(min)</small>"
|
||||||
|
|||||||
@@ -356,16 +356,7 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
"heating": {
|
"heating": {
|
||||||
"hyst": {
|
"hyst": "Гистерезис <small>(в градусах)</small>",
|
||||||
"title": "Гистерезис",
|
|
||||||
"desc": "Гистерезис полезен для поддержания заданной внутр. темп. (при использовании «ПЗА» и/или «ПИД»). Принудительно откл. отопление, когда <code>current indoor > target + value</code>, и вкл. отопление, когда <code>current indoor < (target - value)</code>.",
|
|
||||||
"value": "Значение <small>(в градусах)</small>",
|
|
||||||
"action": {
|
|
||||||
"title": "Действие",
|
|
||||||
"disableHeating": "Отключить отопление",
|
|
||||||
"set0target": "Установить 0 в качестве целевой темп."
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"turboFactor": "Коэфф. турбо режима"
|
"turboFactor": "Коэфф. турбо режима"
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -380,26 +371,11 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
"equitherm": {
|
"equitherm": {
|
||||||
"slope": {
|
"n": "Коэффициент N",
|
||||||
"title": "Наклон",
|
"k": "Коэффициент K",
|
||||||
"note": "Компенсация теплопотерь. Основной параметр настройки."
|
"t": {
|
||||||
},
|
|
||||||
"exponent": {
|
|
||||||
"title": "Экспонента",
|
|
||||||
"note": "Эффективность радиатора. Типичные значения: <code>1.1</code> - Тёплый пол, <code>1.2</code> - Чугунные радиаторы, <code>1.3</code> - Панельные радиаторы, <code>1.4</code> - Конвекторы."
|
|
||||||
},
|
|
||||||
"shift": {
|
|
||||||
"title": "Смещение",
|
|
||||||
"note": "Компенсирует дополнительные теплопотери (например, в трубах) или дополнительные источники тепла."
|
|
||||||
},
|
|
||||||
"targetDiffFactor": {
|
|
||||||
"title": "Коэффициент T",
|
"title": "Коэффициент T",
|
||||||
"note": "Не используется, если ПИД включен. Добавляет разницу между целевой и текущей температурой в помещении: <code>setpoint = setpoint + ((target - indoor) * T)</code>."
|
"note": "Не используется, если ПИД включен"
|
||||||
},
|
|
||||||
"chart": {
|
|
||||||
"targetTemp": "Целевая внутренняя температура",
|
|
||||||
"setpointTemp": "Температура теплоносителя",
|
|
||||||
"outdoorTemp": "Наружная температура"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -479,7 +455,6 @@
|
|||||||
"extPump": {
|
"extPump": {
|
||||||
"use": "Использовать доп. насос",
|
"use": "Использовать доп. насос",
|
||||||
"gpio": "GPIO реле",
|
"gpio": "GPIO реле",
|
||||||
"invertState": "Инвертировать состояние GPIO",
|
|
||||||
"postCirculationTime": "Время постциркуляции <small>(в минутах)</small>",
|
"postCirculationTime": "Время постциркуляции <small>(в минутах)</small>",
|
||||||
"antiStuckInterval": "Интервал защиты от блокировки <small>(в днях)</small>",
|
"antiStuckInterval": "Интервал защиты от блокировки <small>(в днях)</small>",
|
||||||
"antiStuckTime": "Время работы насоса <small>(в минутах)</small>"
|
"antiStuckTime": "Время работы насоса <small>(в минутах)</small>"
|
||||||
|
|||||||
@@ -241,9 +241,7 @@
|
|||||||
setCheckboxValue("[name='filtering']", data.filtering, sensorForm);
|
setCheckboxValue("[name='filtering']", data.filtering, sensorForm);
|
||||||
setInputValue("[name='filteringFactor']", data.filteringFactor, {}, sensorForm);
|
setInputValue("[name='filteringFactor']", data.filteringFactor, {}, sensorForm);
|
||||||
|
|
||||||
setTimeout(() => {
|
sensorForm.querySelector("[name='type']").dispatchEvent(new Event("change"));
|
||||||
sensorForm.querySelector("[name='type']").dispatchEvent(new Event("change"));
|
|
||||||
}, 10);
|
|
||||||
|
|
||||||
setBusy(".form-busy", "form", false, sensorNode);
|
setBusy(".form-busy", "form", false, sensorNode);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -106,7 +106,7 @@
|
|||||||
<option disabled selected data-i18n>settings.system.ntp.timezonePresets</option>
|
<option disabled selected data-i18n>settings.system.ntp.timezonePresets</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</label>
|
</label>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
<fieldset>
|
<fieldset>
|
||||||
@@ -194,47 +194,20 @@
|
|||||||
|
|
||||||
<div class="grid">
|
<div class="grid">
|
||||||
<label>
|
<label>
|
||||||
<span data-i18n>settings.heating.turboFactor</span>
|
<span data-i18n>settings.heating.hyst</span>
|
||||||
<input type="number" inputmode="decimal" name="heating[turboFactor]" min="1.5" max="10" step="0.1" required>
|
<input type="number" inputmode="decimal" name="heating[hysteresis]" min="0" max="5" step="0.05" required>
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<label>
|
<label>
|
||||||
<span data-i18n>settings.maxModulation</span>
|
<span data-i18n>settings.heating.turboFactor</span>
|
||||||
<input type="number" inputmode="numeric" name="heating[maxModulation]" min="1" max="100" step="1" required>
|
<input type="number" inputmode="decimal" name="heating[turboFactor]" min="1.5" max="10" step="0.1" required>
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<hr />
|
<label>
|
||||||
|
<span data-i18n>settings.maxModulation</span>
|
||||||
<details>
|
<input type="number" inputmode="numeric" name="heating[maxModulation]" min="1" max="100" step="1" required>
|
||||||
<summary><b data-i18n>settings.heating.hyst.title</b></summary>
|
</label>
|
||||||
|
|
||||||
<div>
|
|
||||||
<fieldset>
|
|
||||||
<label>
|
|
||||||
<input type="checkbox" name="heating[hysteresis][enabled]" value="true">
|
|
||||||
<span data-i18n>settings.enable</span>
|
|
||||||
</label>
|
|
||||||
</fieldset>
|
|
||||||
|
|
||||||
<div class="grid">
|
|
||||||
<label>
|
|
||||||
<span data-i18n>settings.heating.hyst.value</span>
|
|
||||||
<input type="number" inputmode="decimal" name="heating[hysteresis][value]" min="0" max="5" step="0.05" required>
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<label>
|
|
||||||
<span data-i18n>settings.heating.hyst.action.title</span>
|
|
||||||
<select name="heating[hysteresis][action]">
|
|
||||||
<option value="0" data-i18n>settings.heating.hyst.action.disableHeating</option>
|
|
||||||
<option value="1" data-i18n>settings.heating.hyst.action.set0target</option>
|
|
||||||
</select>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<small data-i18n>settings.heating.hyst.desc</small>
|
|
||||||
</details>
|
|
||||||
|
|
||||||
<hr />
|
<hr />
|
||||||
|
|
||||||
@@ -381,44 +354,21 @@
|
|||||||
</label>
|
</label>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
<div>
|
|
||||||
<div>
|
|
||||||
<canvas id="etChart"></canvas>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<label>
|
|
||||||
<div>
|
|
||||||
<span data-i18n>settings.equitherm.chart.targetTemp</span>: <b class="etChartTargetTempValue"></b>°
|
|
||||||
</div>
|
|
||||||
<input class="etChartTargetTemp" type="range" value="0" min="0" max="0" step="0.5">
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="grid">
|
<div class="grid">
|
||||||
<label>
|
<label>
|
||||||
<span data-i18n>settings.equitherm.slope.title</span>
|
<span data-i18n>settings.equitherm.n</span>
|
||||||
<input type="number" inputmode="decimal" name="equitherm[slope]" min="0.001" max="10" step="0.001" required>
|
<input type="number" inputmode="decimal" name="equitherm[n_factor]" min="0.001" max="10" step="0.001" required>
|
||||||
<small data-i18n>settings.equitherm.slope.note</small>
|
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<label>
|
<label>
|
||||||
<span data-i18n>settings.equitherm.exponent.title</span>
|
<span data-i18n>settings.equitherm.k</span>
|
||||||
<input type="number" inputmode="decimal" name="equitherm[exponent]" min="0.1" max="2" step="0.001" required>
|
<input type="number" inputmode="decimal" name="equitherm[k_factor]" min="0" max="10" step="0.01" required>
|
||||||
<small data-i18n>settings.equitherm.exponent.note</small>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="grid">
|
|
||||||
<label>
|
|
||||||
<span data-i18n>settings.equitherm.shift.title</span>
|
|
||||||
<input type="number" inputmode="decimal" name="equitherm[shift]" min="-15" max="15" step="0.01" required>
|
|
||||||
<small data-i18n>settings.equitherm.shift.note</small>
|
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<label>
|
<label>
|
||||||
<span data-i18n>settings.equitherm.targetDiffFactor.title</span>
|
<span data-i18n>settings.equitherm.t.title</span>
|
||||||
<input type="number" inputmode="decimal" name="equitherm[targetDiffFactor]" min="0" max="10" step="0.01" required>
|
<input type="number" inputmode="decimal" name="equitherm[t_factor]" min="0" max="10" step="0.01" required>
|
||||||
<small data-i18n>settings.equitherm.targetDiffFactor.note</small>
|
<small data-i18n>settings.equitherm.t.note</small>
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -687,11 +637,6 @@
|
|||||||
<span data-i18n>settings.ot.options.setDateAndTime</span>
|
<span data-i18n>settings.ot.options.setDateAndTime</span>
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<label>
|
|
||||||
<input type="checkbox" name="opentherm[options][alwaysSetIndoorTemp]" value="true">
|
|
||||||
<span data-i18n>settings.ot.options.alwaysSetIndoorTemp</span>
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<label>
|
<label>
|
||||||
<input type="checkbox" name="opentherm[options][immergasFix]" value="true">
|
<input type="checkbox" name="opentherm[options][immergasFix]" value="true">
|
||||||
<span data-i18n>settings.ot.options.immergasFix</span>
|
<span data-i18n>settings.ot.options.immergasFix</span>
|
||||||
@@ -786,11 +731,6 @@
|
|||||||
<input type="checkbox" name="externalPump[use]" value="true">
|
<input type="checkbox" name="externalPump[use]" value="true">
|
||||||
<span data-i18n>settings.extPump.use</span>
|
<span data-i18n>settings.extPump.use</span>
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<label>
|
|
||||||
<input type="checkbox" name="externalPump[invertState]" value="true">
|
|
||||||
<span data-i18n>settings.externalPump.invertState</span>
|
|
||||||
</label>
|
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
<div class="grid">
|
<div class="grid">
|
||||||
@@ -921,163 +861,11 @@
|
|||||||
</footer>
|
</footer>
|
||||||
|
|
||||||
<script src="/static/app.js?{BUILD_TIME}"></script>
|
<script src="/static/app.js?{BUILD_TIME}"></script>
|
||||||
<script src="/static/chart.js?{BUILD_TIME}"></script>
|
|
||||||
<script>
|
<script>
|
||||||
document.addEventListener('DOMContentLoaded', async () => {
|
document.addEventListener('DOMContentLoaded', async () => {
|
||||||
const lang = new Lang(document.getElementById('lang'));
|
const lang = new Lang(document.getElementById('lang'));
|
||||||
lang.build();
|
lang.build();
|
||||||
|
|
||||||
let etChart = null;
|
|
||||||
let etChartConfig = {
|
|
||||||
slope: null,
|
|
||||||
exponent: null,
|
|
||||||
shift: null,
|
|
||||||
unitSystem: null,
|
|
||||||
targetTemp: null,
|
|
||||||
minTemp: null,
|
|
||||||
maxTemp: null,
|
|
||||||
decimated: false
|
|
||||||
};
|
|
||||||
|
|
||||||
const hasNeedDecimationChart = () => {
|
|
||||||
return window.innerWidth <= 800;
|
|
||||||
}
|
|
||||||
|
|
||||||
const makeEquithermChart = () => {
|
|
||||||
if (etChart == null) {
|
|
||||||
const ctx = document.getElementById('etChart').getContext('2d');
|
|
||||||
|
|
||||||
try {
|
|
||||||
etChart = new Chart(ctx, {
|
|
||||||
type: 'line',
|
|
||||||
data: {
|
|
||||||
datasets: [{
|
|
||||||
borderColor: (context) => {
|
|
||||||
const chart = context.chart;
|
|
||||||
const { ctx, chartArea } = chart;
|
|
||||||
|
|
||||||
if (!chartArea) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const gradient = ctx.createLinearGradient(0, chartArea.bottom, 0, chartArea.top);
|
|
||||||
gradient.addColorStop(0, 'rgba(1, 114, 173, 1)');
|
|
||||||
gradient.addColorStop(0.5, 'rgba(255, 99, 132, 1)');
|
|
||||||
|
|
||||||
return gradient;
|
|
||||||
},
|
|
||||||
borderWidth: 3,
|
|
||||||
fill: false,
|
|
||||||
tension: 0.1,
|
|
||||||
pointRadius: 2,
|
|
||||||
pointHoverRadius: 4,
|
|
||||||
indexAxis: "x",
|
|
||||||
data: []
|
|
||||||
}]
|
|
||||||
},
|
|
||||||
options: {
|
|
||||||
responsive: true,
|
|
||||||
resizeDelay: 500,
|
|
||||||
parsing: false,
|
|
||||||
interaction: {
|
|
||||||
mode: 'nearest',
|
|
||||||
intersect: false
|
|
||||||
},
|
|
||||||
plugins: {
|
|
||||||
tooltip: {
|
|
||||||
enabled: true,
|
|
||||||
position: 'nearest',
|
|
||||||
displayColors: false,
|
|
||||||
callbacks: {
|
|
||||||
title: (items) => {
|
|
||||||
return `${i18n("settings.equitherm.chart.outdoorTemp")}: ${items[0].label}`;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
legend: {
|
|
||||||
display: false
|
|
||||||
}
|
|
||||||
},
|
|
||||||
scales: {
|
|
||||||
x: {
|
|
||||||
display: true,
|
|
||||||
type: "linear",
|
|
||||||
reverse: true,
|
|
||||||
title: {
|
|
||||||
display: true
|
|
||||||
},
|
|
||||||
ticks: {
|
|
||||||
stepSize: 1,
|
|
||||||
format: {
|
|
||||||
style: "unit",
|
|
||||||
unit: "degree",
|
|
||||||
unitDisplay: "narrow"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
y: {
|
|
||||||
display: true,
|
|
||||||
title: {
|
|
||||||
display: true
|
|
||||||
},
|
|
||||||
ticks: {
|
|
||||||
format: {
|
|
||||||
style: "unit",
|
|
||||||
unit: "degree",
|
|
||||||
unitDisplay: "narrow"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
} catch (error) {
|
|
||||||
console.log(error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!etChart) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
let data = [];
|
|
||||||
etChartConfig.decimated = hasNeedDecimationChart();
|
|
||||||
for (let value = 30; value >= -30; value -= etChartConfig.decimated ? 2 : 1) {
|
|
||||||
const outdoorTemp = etChartConfig.unitSystem == 0 ? value : c2f(value);
|
|
||||||
|
|
||||||
data.push({
|
|
||||||
x: parseFloat(outdoorTemp.toFixed(1)),
|
|
||||||
y: parseFloat(calculateEquithermTemp(outdoorTemp).toFixed(1))
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
etChart.data.datasets[0].data = data;
|
|
||||||
etChart.data.datasets[0].label = i18n("settings.equitherm.chart.setpointTemp");
|
|
||||||
etChart.options.scales.x.title.text = i18n("settings.equitherm.chart.outdoorTemp");
|
|
||||||
etChart.options.scales.y.title.text = i18n("settings.equitherm.chart.setpointTemp");
|
|
||||||
etChart.update();
|
|
||||||
}
|
|
||||||
|
|
||||||
const calculateEquithermTemp = (outdoorTemp) => {
|
|
||||||
const tempDelta = etChartConfig.targetTemp - outdoorTemp;
|
|
||||||
const maxPoint = etChartConfig.targetTemp - (
|
|
||||||
etChartConfig.maxTemp - etChartConfig.targetTemp
|
|
||||||
) / etChartConfig.slope;
|
|
||||||
|
|
||||||
const sf = (etChartConfig.maxTemp - etChartConfig.targetTemp) / Math.pow(
|
|
||||||
etChartConfig.targetTemp - maxPoint,
|
|
||||||
1 / etChartConfig.exponent
|
|
||||||
);
|
|
||||||
const result = etChartConfig.targetTemp + etChartConfig.shift + sf * (
|
|
||||||
tempDelta >= 0
|
|
||||||
? Math.pow(tempDelta, 1 / etChartConfig.exponent)
|
|
||||||
: -(Math.pow(-(tempDelta), 1 / etChartConfig.exponent))
|
|
||||||
);
|
|
||||||
|
|
||||||
return Math.max(Math.min(result, etChartConfig.maxTemp), etChartConfig.minTemp);
|
|
||||||
}
|
|
||||||
|
|
||||||
const fillData = (data) => {
|
const fillData = (data) => {
|
||||||
// System
|
// System
|
||||||
setSelectValue("[name='system[logLevel]']", data.system.logLevel);
|
setSelectValue("[name='system[logLevel]']", data.system.logLevel);
|
||||||
@@ -1122,7 +910,6 @@
|
|||||||
setCheckboxValue("[name='opentherm[options][autoFaultReset]']", data.opentherm.options.autoFaultReset);
|
setCheckboxValue("[name='opentherm[options][autoFaultReset]']", data.opentherm.options.autoFaultReset);
|
||||||
setCheckboxValue("[name='opentherm[options][autoDiagReset]']", data.opentherm.options.autoDiagReset);
|
setCheckboxValue("[name='opentherm[options][autoDiagReset]']", data.opentherm.options.autoDiagReset);
|
||||||
setCheckboxValue("[name='opentherm[options][setDateAndTime]']", data.opentherm.options.setDateAndTime);
|
setCheckboxValue("[name='opentherm[options][setDateAndTime]']", data.opentherm.options.setDateAndTime);
|
||||||
setCheckboxValue("[name='opentherm[options][alwaysSetIndoorTemp]']", data.opentherm.options.alwaysSetIndoorTemp);
|
|
||||||
setCheckboxValue("[name='opentherm[options][nativeHeatingControl]']", data.opentherm.options.nativeHeatingControl);
|
setCheckboxValue("[name='opentherm[options][nativeHeatingControl]']", data.opentherm.options.nativeHeatingControl);
|
||||||
setCheckboxValue("[name='opentherm[options][immergasFix]']", data.opentherm.options.immergasFix);
|
setCheckboxValue("[name='opentherm[options][immergasFix]']", data.opentherm.options.immergasFix);
|
||||||
setBusy('#ot-settings-busy', '#ot-settings', false);
|
setBusy('#ot-settings-busy', '#ot-settings', false);
|
||||||
@@ -1141,7 +928,6 @@
|
|||||||
// Extpump
|
// Extpump
|
||||||
setCheckboxValue("[name='externalPump[use]']", data.externalPump.use);
|
setCheckboxValue("[name='externalPump[use]']", data.externalPump.use);
|
||||||
setInputValue("[name='externalPump[gpio]']", data.externalPump.gpio < 255 ? data.externalPump.gpio : '');
|
setInputValue("[name='externalPump[gpio]']", data.externalPump.gpio < 255 ? data.externalPump.gpio : '');
|
||||||
setCheckboxValue("[name='externalPump[invertState]']", data.externalPump.invertState);
|
|
||||||
setInputValue("[name='externalPump[postCirculationTime]']", data.externalPump.postCirculationTime);
|
setInputValue("[name='externalPump[postCirculationTime]']", data.externalPump.postCirculationTime);
|
||||||
setInputValue("[name='externalPump[antiStuckInterval]']", data.externalPump.antiStuckInterval);
|
setInputValue("[name='externalPump[antiStuckInterval]']", data.externalPump.antiStuckInterval);
|
||||||
setInputValue("[name='externalPump[antiStuckTime]']", data.externalPump.antiStuckTime);
|
setInputValue("[name='externalPump[antiStuckTime]']", data.externalPump.antiStuckTime);
|
||||||
@@ -1171,9 +957,7 @@
|
|||||||
"min": data.system.unitSystem == 0 ? 1 : 33,
|
"min": data.system.unitSystem == 0 ? 1 : 33,
|
||||||
"max": data.system.unitSystem == 0 ? 100 : 212
|
"max": data.system.unitSystem == 0 ? 100 : 212
|
||||||
});
|
});
|
||||||
setCheckboxValue("[name='heating[hysteresis][enabled]']", data.heating.hysteresis.enabled);
|
setInputValue("[name='heating[hysteresis]']", data.heating.hysteresis);
|
||||||
setInputValue("[name='heating[hysteresis][value]']", data.heating.hysteresis.value);
|
|
||||||
setSelectValue("[name='heating[hysteresis][action]']", data.heating.hysteresis.action);
|
|
||||||
setInputValue("[name='heating[turboFactor]']", data.heating.turboFactor);
|
setInputValue("[name='heating[turboFactor]']", data.heating.turboFactor);
|
||||||
setInputValue("[name='heating[maxModulation]']", data.heating.maxModulation);
|
setInputValue("[name='heating[maxModulation]']", data.heating.maxModulation);
|
||||||
setInputValue("[name='heating[overheatProtection][highTemp]']", data.heating.overheatProtection.highTemp, {
|
setInputValue("[name='heating[overheatProtection][highTemp]']", data.heating.overheatProtection.highTemp, {
|
||||||
@@ -1229,10 +1013,9 @@
|
|||||||
|
|
||||||
// Equitherm
|
// Equitherm
|
||||||
setCheckboxValue("[name='equitherm[enabled]']", data.equitherm.enabled);
|
setCheckboxValue("[name='equitherm[enabled]']", data.equitherm.enabled);
|
||||||
setInputValue("[name='equitherm[slope]']", data.equitherm.slope);
|
setInputValue("[name='equitherm[n_factor]']", data.equitherm.n_factor);
|
||||||
setInputValue("[name='equitherm[exponent]']", data.equitherm.exponent);
|
setInputValue("[name='equitherm[k_factor]']", data.equitherm.k_factor);
|
||||||
setInputValue("[name='equitherm[shift]']", data.equitherm.shift);
|
setInputValue("[name='equitherm[t_factor]']", data.equitherm.t_factor);
|
||||||
setInputValue("[name='equitherm[targetDiffFactor]']", data.equitherm.targetDiffFactor);
|
|
||||||
setBusy('#equitherm-settings-busy', '#equitherm-settings', false);
|
setBusy('#equitherm-settings-busy', '#equitherm-settings', false);
|
||||||
|
|
||||||
// PID
|
// PID
|
||||||
@@ -1256,24 +1039,6 @@
|
|||||||
setInputValue("[name='pid[deadband][thresholdHigh]']", data.pid.deadband.thresholdHigh);
|
setInputValue("[name='pid[deadband][thresholdHigh]']", data.pid.deadband.thresholdHigh);
|
||||||
setInputValue("[name='pid[deadband][thresholdLow]']", data.pid.deadband.thresholdLow);
|
setInputValue("[name='pid[deadband][thresholdLow]']", data.pid.deadband.thresholdLow);
|
||||||
setBusy('#pid-settings-busy', '#pid-settings', false);
|
setBusy('#pid-settings-busy', '#pid-settings', false);
|
||||||
|
|
||||||
const etMinTemp = parseInt(data.system.unitSystem == 0 ? 5 : 41);
|
|
||||||
const etMaxTemp = parseInt(data.system.unitSystem == 0 ? 30 : 86);
|
|
||||||
const etTargetTemp = constrain(parseFloat(data.heating.target), etMinTemp, etMaxTemp);
|
|
||||||
|
|
||||||
setInputValue(".etChartTargetTemp", etTargetTemp.toFixed(1), {
|
|
||||||
"min": etMinTemp,
|
|
||||||
"max": etMaxTemp
|
|
||||||
});
|
|
||||||
|
|
||||||
etChartConfig.slope = data.equitherm.slope;
|
|
||||||
etChartConfig.exponent = data.equitherm.exponent;
|
|
||||||
etChartConfig.shift = data.equitherm.shift;
|
|
||||||
etChartConfig.unitSystem = data.system.unitSystem;
|
|
||||||
etChartConfig.minTemp = data.heating.minTemp;
|
|
||||||
etChartConfig.maxTemp = data.heating.maxTemp;
|
|
||||||
|
|
||||||
makeEquithermChart();
|
|
||||||
};
|
};
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -1326,57 +1091,6 @@
|
|||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log(error);
|
console.log(error);
|
||||||
}
|
}
|
||||||
|
|
||||||
document.querySelector(".etChartTargetTemp").addEventListener("input", async (event) => {
|
|
||||||
setValue('.etChartTargetTempValue', parseFloat(event.target.value).toFixed(1));
|
|
||||||
});
|
|
||||||
|
|
||||||
document.querySelector(".etChartTargetTemp").addEventListener("change", async (event) => {
|
|
||||||
if (!event.target.checkValidity()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
etChartConfig.targetTemp = parseFloat(event.target.value);
|
|
||||||
setValue('.etChartTargetTempValue', etChartConfig.targetTemp.toFixed(1));
|
|
||||||
makeEquithermChart();
|
|
||||||
});
|
|
||||||
|
|
||||||
document.querySelector("[name='equitherm[slope]']").addEventListener("change", async (event) => {
|
|
||||||
if (!event.target.checkValidity()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
etChartConfig.slope = parseFloat(event.target.value);
|
|
||||||
makeEquithermChart();
|
|
||||||
});
|
|
||||||
|
|
||||||
document.querySelector("[name='equitherm[exponent]']").addEventListener("change", async (event) => {
|
|
||||||
if (!event.target.checkValidity()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
etChartConfig.exponent = parseFloat(event.target.value);
|
|
||||||
makeEquithermChart();
|
|
||||||
});
|
|
||||||
|
|
||||||
document.querySelector("[name='equitherm[shift]']").addEventListener("change", async (event) => {
|
|
||||||
if (!event.target.checkValidity()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
etChartConfig.shift = parseFloat(event.target.value);
|
|
||||||
makeEquithermChart();
|
|
||||||
});
|
|
||||||
|
|
||||||
window.addEventListener('resize', async (event) => {
|
|
||||||
if (etChart) {
|
|
||||||
etChart.resize();
|
|
||||||
|
|
||||||
if (etChartConfig.decimated != hasNeedDecimationChart()) {
|
|
||||||
makeEquithermChart();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -5,13 +5,8 @@ const setupForm = (formSelector, onResultCallback = null, noCastItems = []) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
form.querySelectorAll('input').forEach(item => {
|
form.querySelectorAll('input').forEach(item => {
|
||||||
item.addEventListener('change', (event) => {
|
item.addEventListener('change', (e) => {
|
||||||
if (!event.target.checkValidity()) {
|
e.target.setAttribute('aria-invalid', !e.target.checkValidity());
|
||||||
event.target.setAttribute('aria-invalid', true);
|
|
||||||
|
|
||||||
} else if (event.target.hasAttribute('aria-invalid')) {
|
|
||||||
event.target.removeAttribute('aria-invalid');
|
|
||||||
}
|
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -635,10 +630,6 @@ const setCheckboxValue = (selector, value, parent = undefined) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
item.checked = value;
|
item.checked = value;
|
||||||
|
|
||||||
setTimeout(() => {
|
|
||||||
item.dispatchEvent(new Event("change"));
|
|
||||||
}, 10);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const setRadioValue = (selector, value, parent = undefined) => {
|
const setRadioValue = (selector, value, parent = undefined) => {
|
||||||
@@ -652,14 +643,7 @@ const setRadioValue = (selector, value, parent = undefined) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (let item of items) {
|
for (let item of items) {
|
||||||
const checked = item.value == value;
|
item.checked = item.value == value;
|
||||||
if (item.checked != checked) {
|
|
||||||
item.checked = checked;
|
|
||||||
|
|
||||||
setTimeout(() => {
|
|
||||||
item.dispatchEvent(new Event("change"));
|
|
||||||
}, 10);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -674,17 +658,13 @@ const setInputValue = (selector, value, attrs = {}, parent = undefined) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (let item of items) {
|
for (let item of items) {
|
||||||
|
item.value = value;
|
||||||
|
|
||||||
if (attrs instanceof Object) {
|
if (attrs instanceof Object) {
|
||||||
for (let attrKey of Object.keys(attrs)) {
|
for (let attrKey of Object.keys(attrs)) {
|
||||||
item.setAttribute(attrKey, attrs[attrKey]);
|
item.setAttribute(attrKey, attrs[attrKey]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
item.value = value;
|
|
||||||
|
|
||||||
setTimeout(() => {
|
|
||||||
item.dispatchEvent(new Event("change"));
|
|
||||||
}, 10);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -874,11 +854,3 @@ function dec2hex(i) {
|
|||||||
function constrain(amt, low, high) {
|
function constrain(amt, low, high) {
|
||||||
return ((amt) < (low) ? (low) : ((amt) > (high) ? (high) : (amt)));
|
return ((amt) < (low) ? (low) : ((amt) > (high) ? (high) : (amt)));
|
||||||
}
|
}
|
||||||
|
|
||||||
function c2f(value) {
|
|
||||||
return (9 / 5) * value + 32;
|
|
||||||
}
|
|
||||||
|
|
||||||
function f2c(value) {
|
|
||||||
return (value - 32) * (5 / 9);
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user