mirror of
https://github.com/Laxilef/OTGateway.git
synced 2025-12-11 18:54:28 +05:00
Compare commits
13 Commits
1.5.6
...
cc5bbb7a87
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cc5bbb7a87 | ||
|
|
dda79151f3 | ||
|
|
1375d8c7a5 | ||
|
|
d4addf887f | ||
|
|
9d77256051 | ||
|
|
d3e7a13e1f | ||
|
|
14826c10cd | ||
|
|
28a5218b7c | ||
|
|
f3ba43adbd | ||
|
|
062c6714d1 | ||
|
|
502f73db0e | ||
|
|
c2ee30d1ab | ||
|
|
9217bb7448 |
2
.github/workflows/stale.yaml
vendored
2
.github/workflows/stale.yaml
vendored
@@ -7,7 +7,7 @@ jobs:
|
||||
stale:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/stale@v9
|
||||
- uses: actions/stale@v10
|
||||
with:
|
||||
stale-issue-message: >
|
||||
This issue is stale because it has been open 15 days with no activity. Remove stale label or comment or this will be closed in 5 days.
|
||||
|
||||
@@ -72,7 +72,7 @@ All available information and instructions can be found in the wiki:
|
||||
* [Leds on board](https://github.com/Laxilef/OTGateway/wiki/OT-adapters#leds-on-board)
|
||||
|
||||
## Gratitude
|
||||
* To the developers of the libraries used: [OpenTherm Library](https://github.com/ihormelnyk/opentherm_library), [ESP8266Scheduler](https://github.com/nrwiersma/ESP8266Scheduler), [ArduinoJson](https://github.com/bblanchon/ArduinoJson), [NimBLE-Arduino](https://github.com/h2zero/NimBLE-Arduino), [ArduinoMqttClient](https://github.com/arduino-libraries/ArduinoMqttClient), [ESPTelnet](https://github.com/LennartHennigs/ESPTelnet), [FileData](https://github.com/GyverLibs/FileData), [GyverPID](https://github.com/GyverLibs/GyverPID), [GyverBlinker](https://github.com/GyverLibs/GyverBlinker), [FileData](https://github.com/GyverLibs/FileData), [OneWireNg](https://github.com/pstolarz/OneWireNg) & [OneWire](https://github.com/PaulStoffregen/OneWire)
|
||||
* To the developers of the libraries used: [OpenTherm Library](https://github.com/ihormelnyk/opentherm_library), [ESP8266Scheduler](https://github.com/nrwiersma/ESP8266Scheduler), [ArduinoJson](https://github.com/bblanchon/ArduinoJson), [NimBLE-Arduino](https://github.com/h2zero/NimBLE-Arduino), [ArduinoMqttClient](https://github.com/arduino-libraries/ArduinoMqttClient), [ESPTelnet](https://github.com/LennartHennigs/ESPTelnet), [FileData](https://github.com/GyverLibs/FileData), [GyverPID](https://github.com/GyverLibs/GyverPID), [GyverBlinker](https://github.com/GyverLibs/GyverBlinker), [OneWireNg](https://github.com/pstolarz/OneWireNg) & [OneWire](https://github.com/PaulStoffregen/OneWire)
|
||||
* To the [PlatformIO](https://platformio.org/) Team
|
||||
* To the team and contributors of the [pioarduino](https://github.com/pioarduino/platform-espressif32) project
|
||||
* To the [BrowserStack](https://www.browserstack.com/) team. This project is tested with BrowserStack.
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
class CustomOpenTherm : public OpenTherm {
|
||||
public:
|
||||
typedef std::function<void(unsigned int)> DelayCallback;
|
||||
typedef std::function<void(unsigned long, byte)> BeforeSendRequestCallback;
|
||||
typedef std::function<void(unsigned long, unsigned long, OpenThermResponseStatus, byte)> AfterSendRequestCallback;
|
||||
typedef std::function<void(unsigned long, uint8_t)> BeforeSendRequestCallback;
|
||||
typedef std::function<void(unsigned long, unsigned long, OpenThermResponseStatus, uint8_t)> AfterSendRequestCallback;
|
||||
|
||||
CustomOpenTherm(int inPin = 4, int outPin = 5, bool isSlave = false, bool alwaysReceive = false) : OpenTherm(inPin, outPin, isSlave, alwaysReceive) {}
|
||||
~CustomOpenTherm() {}
|
||||
@@ -106,15 +106,14 @@ public:
|
||||
return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::RemoteRequest);
|
||||
}
|
||||
|
||||
static bool isCh2Active(unsigned long response)
|
||||
{
|
||||
static bool isCh2Active(unsigned long response) {
|
||||
return response & 0x20;
|
||||
}
|
||||
|
||||
static bool isValidResponseId(unsigned long response, OpenThermMessageID id) {
|
||||
byte responseId = (response >> 16) & 0xFF;
|
||||
uint8_t responseId = (response >> 16) & 0xFF;
|
||||
|
||||
return (byte)id == responseId;
|
||||
return (uint8_t)id == responseId;
|
||||
}
|
||||
|
||||
static uint8_t getResponseMessageTypeId(unsigned long response) {
|
||||
|
||||
@@ -35,7 +35,7 @@ namespace NetworkUtils {
|
||||
return this;
|
||||
}
|
||||
|
||||
NetworkMgr* setApCredentials(const char* ssid, const char* password = nullptr, byte channel = 0) {
|
||||
NetworkMgr* setApCredentials(const char* ssid, const char* password = nullptr, uint8_t channel = 0) {
|
||||
this->apName = ssid;
|
||||
this->apPassword = password;
|
||||
this->apChannel = channel;
|
||||
@@ -43,7 +43,7 @@ namespace NetworkUtils {
|
||||
return this;
|
||||
}
|
||||
|
||||
NetworkMgr* setStaCredentials(const char* ssid = nullptr, const char* password = nullptr, byte channel = 0) {
|
||||
NetworkMgr* setStaCredentials(const char* ssid = nullptr, const char* password = nullptr, uint8_t channel = 0) {
|
||||
this->staSsid = ssid;
|
||||
this->staPassword = password;
|
||||
this->staChannel = channel;
|
||||
@@ -140,7 +140,7 @@ namespace NetworkUtils {
|
||||
return this->staPassword;
|
||||
}
|
||||
|
||||
byte getStaChannel() {
|
||||
uint8_t getStaChannel() {
|
||||
return this->staChannel;
|
||||
}
|
||||
|
||||
@@ -377,7 +377,7 @@ namespace NetworkUtils {
|
||||
}
|
||||
}
|
||||
|
||||
static byte rssiToSignalQuality(short int rssi) {
|
||||
static uint8_t rssiToSignalQuality(short int rssi) {
|
||||
return constrain(map(rssi, -100, -50, 0, 100), 0, 100);
|
||||
}
|
||||
|
||||
@@ -397,11 +397,11 @@ namespace NetworkUtils {
|
||||
const char* hostname = "esp";
|
||||
const char* apName = "ESP";
|
||||
const char* apPassword = nullptr;
|
||||
byte apChannel = 1;
|
||||
uint8_t apChannel = 1;
|
||||
|
||||
const char* staSsid = nullptr;
|
||||
const char* staPassword = nullptr;
|
||||
byte staChannel = 0;
|
||||
uint8_t staChannel = 0;
|
||||
|
||||
bool useDhcp = true;
|
||||
IPAddress staticIp;
|
||||
|
||||
@@ -17,12 +17,12 @@ core_dir = .pio
|
||||
version = 1.5.6
|
||||
framework = arduino
|
||||
lib_deps =
|
||||
bblanchon/ArduinoJson@^7.3.0
|
||||
bblanchon/ArduinoJson@^7.4.2
|
||||
;ihormelnyk/OpenTherm Library@^1.1.5
|
||||
https://github.com/Laxilef/opentherm_library#esp32_timer
|
||||
arduino-libraries/ArduinoMqttClient@^0.1.8
|
||||
lennarthennigs/ESP Telnet@^2.2
|
||||
gyverlibs/FileData@^1.0.2
|
||||
lennarthennigs/ESP Telnet@^2.2.3
|
||||
gyverlibs/FileData@^1.0.3
|
||||
gyverlibs/GyverPID@^3.3.2
|
||||
gyverlibs/GyverBlinker@^1.1.1
|
||||
https://github.com/pstolarz/Arduino-Temperature-Control-Library.git#OneWireNg
|
||||
@@ -92,13 +92,13 @@ check_flags = ${env.check_flags}
|
||||
;platform_packages =
|
||||
; framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.5
|
||||
; 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
|
||||
platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.30-2/platform-espressif32.zip
|
||||
platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.32/platform-espressif32.zip
|
||||
platform_packages = ${env.platform_packages}
|
||||
board_build.partitions = esp32_partitions.csv
|
||||
lib_deps =
|
||||
${env.lib_deps}
|
||||
laxilef/ESP32Scheduler@^1.0.1
|
||||
nimble_lib = h2zero/NimBLE-Arduino@^2.1.0
|
||||
nimble_lib = h2zero/NimBLE-Arduino@2.3.3
|
||||
lib_ignore =
|
||||
extra_scripts =
|
||||
post:tools/esp32.py
|
||||
@@ -294,6 +294,10 @@ build_flags =
|
||||
check_tool = ${esp32_defaults.check_tool}
|
||||
check_flags = ${esp32_defaults.check_flags}
|
||||
|
||||
[env:nodemcu_32_160mhz]
|
||||
extends = env:nodemcu_32
|
||||
board_build.f_cpu = 160000000L ; set frequency to 160MHz
|
||||
|
||||
[env:d1_mini32]
|
||||
platform = ${esp32_defaults.platform}
|
||||
platform_packages = ${esp32_defaults.platform_packages}
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
|
||||
class HaHelper : public HomeAssistantHelper {
|
||||
public:
|
||||
static const byte TEMP_SOURCE_HEATING = 0;
|
||||
static const byte TEMP_SOURCE_INDOOR = 1;
|
||||
static const uint8_t TEMP_SOURCE_HEATING = 0;
|
||||
static const uint8_t TEMP_SOURCE_INDOOR = 1;
|
||||
static const char AVAILABILITY_OT_CONN[];
|
||||
static const char AVAILABILITY_SENSOR_CONN[];
|
||||
|
||||
@@ -1170,7 +1170,7 @@ public:
|
||||
}
|
||||
|
||||
|
||||
bool publishClimateHeating(UnitSystem unit = UnitSystem::METRIC, byte minTemp = 20, byte maxTemp = 90, bool enabledByDefault = true) {
|
||||
bool publishClimateHeating(UnitSystem unit = UnitSystem::METRIC, uint8_t minTemp = 20, uint8_t maxTemp = 90, bool enabledByDefault = true) {
|
||||
JsonDocument doc;
|
||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||
@@ -1222,7 +1222,7 @@ public:
|
||||
return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_CLIMATE), F("heating"), '_').c_str(), doc);
|
||||
}
|
||||
|
||||
bool publishClimateDhw(UnitSystem unit = UnitSystem::METRIC, byte minTemp = 40, byte maxTemp = 60, bool enabledByDefault = true) {
|
||||
bool publishClimateDhw(UnitSystem unit = UnitSystem::METRIC, uint8_t minTemp = 40, uint8_t maxTemp = 60, bool enabledByDefault = true) {
|
||||
JsonDocument doc;
|
||||
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
|
||||
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
|
||||
|
||||
@@ -557,7 +557,7 @@ protected:
|
||||
}
|
||||
|
||||
bool publishNonStaticHaEntities(bool force = false) {
|
||||
static byte _heatingMinTemp, _heatingMaxTemp, _dhwMinTemp, _dhwMaxTemp = 0;
|
||||
static uint8_t _heatingMinTemp, _heatingMaxTemp, _dhwMinTemp, _dhwMaxTemp = 0;
|
||||
static bool _indoorTempControl, _dhwSupport = false;
|
||||
|
||||
bool published = false;
|
||||
|
||||
@@ -19,8 +19,8 @@ protected:
|
||||
|
||||
CustomOpenTherm* instance = nullptr;
|
||||
unsigned long instanceCreatedTime = 0;
|
||||
byte instanceInGpio = 0;
|
||||
byte instanceOutGpio = 0;
|
||||
uint8_t instanceInGpio = 0;
|
||||
uint8_t instanceOutGpio = 0;
|
||||
bool initialized = false;
|
||||
unsigned long connectedTime = 0;
|
||||
unsigned long disconnectedTime = 0;
|
||||
@@ -31,7 +31,7 @@ protected:
|
||||
unsigned long heatingSetTempTime = 0;
|
||||
unsigned long dhwSetTempTime = 0;
|
||||
unsigned long ch2SetTempTime = 0;
|
||||
byte configuredRxLedGpio = GPIO_IS_NOT_CONFIGURED;
|
||||
uint8_t configuredRxLedGpio = GPIO_IS_NOT_CONFIGURED;
|
||||
|
||||
#if defined(ARDUINO_ARCH_ESP32)
|
||||
const char* getTaskName() override {
|
||||
@@ -90,7 +90,7 @@ protected:
|
||||
|
||||
Log.sinfoln(FPSTR(L_OT), F("Started. GPIO IN: %hhu, GPIO OUT: %hhu"), settings.opentherm.inGpio, settings.opentherm.outGpio);
|
||||
|
||||
this->instance->setAfterSendRequestCallback([this](unsigned long request, unsigned long response, OpenThermResponseStatus status, byte attempt) {
|
||||
this->instance->setAfterSendRequestCallback([this](unsigned long request, unsigned long response, OpenThermResponseStatus status, uint8_t attempt) {
|
||||
Log.sverboseln(
|
||||
FPSTR(L_OT),
|
||||
F("ID: %4d Request: %8lx Response: %8lx Msg type: %s Attempt: %2d Status: %s"),
|
||||
|
||||
@@ -213,7 +213,8 @@ protected:
|
||||
}*/
|
||||
|
||||
float error = pidRegulator.setpoint - pidRegulator.input;
|
||||
bool hasDeadband = (error > -(settings.pid.deadband.thresholdHigh))
|
||||
bool hasDeadband = settings.pid.deadband.enabled
|
||||
&& (error > -(settings.pid.deadband.thresholdHigh))
|
||||
&& (error < settings.pid.deadband.thresholdLow);
|
||||
|
||||
if (hasDeadband) {
|
||||
|
||||
@@ -334,7 +334,7 @@ public:
|
||||
|
||||
uint8_t valueId = (uint8_t) valueType;
|
||||
if (!isValidValueId(valueId)) {
|
||||
return false;
|
||||
return 0;
|
||||
}
|
||||
|
||||
float value = 0.0f;
|
||||
|
||||
@@ -8,6 +8,45 @@
|
||||
|
||||
extern FileData fsSensorsSettings;
|
||||
|
||||
#if USE_BLE
|
||||
class BluetoothClientCallbacks : public NimBLEClientCallbacks {
|
||||
public:
|
||||
BluetoothClientCallbacks(uint8_t sensorId) : sensorId(sensorId) {}
|
||||
|
||||
void onConnect(NimBLEClient* pClient) {
|
||||
auto& sSensor = Sensors::settings[this->sensorId];
|
||||
|
||||
Log.sinfoln(
|
||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': connected to %s"),
|
||||
sensorId, sSensor.name, pClient->getPeerAddress().toString().c_str()
|
||||
);
|
||||
}
|
||||
|
||||
void onDisconnect(NimBLEClient* pClient, int reason) {
|
||||
auto& sSensor = Sensors::settings[this->sensorId];
|
||||
|
||||
Log.sinfoln(
|
||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': disconnected, reason %i"),
|
||||
sensorId, sSensor.name, reason
|
||||
);
|
||||
}
|
||||
|
||||
void onConnectFail(NimBLEClient* pClient, int reason) {
|
||||
auto& sSensor = Sensors::settings[this->sensorId];
|
||||
|
||||
Log.sinfoln(
|
||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to connect, reason %i"),
|
||||
sensorId, sSensor.name, reason
|
||||
);
|
||||
|
||||
pClient->cancelConnect();
|
||||
}
|
||||
|
||||
protected:
|
||||
uint8_t sensorId;
|
||||
};
|
||||
#endif
|
||||
|
||||
class SensorsTask : public LeanTask {
|
||||
public:
|
||||
SensorsTask(bool _enabled = false, unsigned long _interval = 0) : LeanTask(_enabled, _interval) {
|
||||
@@ -41,6 +80,7 @@ protected:
|
||||
std::unordered_map<uint8_t, bool> dallasPolling;
|
||||
std::unordered_map<uint8_t, unsigned long> dallasLastPollingTime;
|
||||
#if USE_BLE
|
||||
std::unordered_map<uint8_t, NimBLEClient*> bleClients;
|
||||
std::unordered_map<uint8_t, bool> bleSubscribed;
|
||||
std::unordered_map<uint8_t, unsigned long> bleLastSetDtTime;
|
||||
#endif
|
||||
@@ -385,7 +425,7 @@ protected:
|
||||
continue;
|
||||
}
|
||||
|
||||
const float sensorResistance = value > 0.001f
|
||||
const float sensorResistance = value > 1
|
||||
? DEFAULT_NTC_REF_RESISTANCE / (DEFAULT_NTC_VREF / (float) value - 1.0f)
|
||||
: 0.0f;
|
||||
const float rawTemp = 1.0f / (
|
||||
@@ -405,47 +445,31 @@ protected:
|
||||
|
||||
#if USE_BLE
|
||||
void cleanBleInstances() {
|
||||
#if USE_BLE
|
||||
if (!NimBLEDevice::isInitialized()) {
|
||||
return;
|
||||
}
|
||||
|
||||
for (auto client : NimBLEDevice::getConnectedClients()) {
|
||||
auto address = client->getPeerAddress();
|
||||
bool used = false;
|
||||
for (auto& [sensorId, pClient]: this->bleClients) {
|
||||
auto& sSensor = Sensors::settings[sensorId];
|
||||
|
||||
for (uint8_t 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;
|
||||
}
|
||||
|
||||
auto pAddress = address.getVal();
|
||||
uint8_t addr[] = {
|
||||
pAddress[5], pAddress[4], pAddress[3],
|
||||
pAddress[2], pAddress[1], pAddress[0]
|
||||
};
|
||||
|
||||
if (isEqualAddress(addr, sSensor.address, sizeof(addr))) {
|
||||
used = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!used) {
|
||||
if (!sSensor.enabled || sSensor.type != Sensors::Type::BLUETOOTH || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
|
||||
Log.sinfoln(
|
||||
FPSTR(L_SENSORS_BLE), F("Deleted unused client connected to %s"),
|
||||
address.toString().c_str()
|
||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s', deleted unused client, address: %s"),
|
||||
sensorId, sSensor.name,
|
||||
pClient->getPeerAddress().toString().c_str()
|
||||
);
|
||||
|
||||
NimBLEDevice::deleteClient(client);
|
||||
NimBLEDevice::deleteClient(pClient);
|
||||
pClient = nullptr;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void pollingBleSensors() {
|
||||
if (!Sensors::getAmountByType(Sensors::Type::BLUETOOTH, true)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!NimBLEDevice::isInitialized() && millis() > 5000) {
|
||||
Log.sinfoln(FPSTR(L_SENSORS_BLE), F("Initialized"));
|
||||
BLEDevice::init("");
|
||||
@@ -460,38 +484,27 @@ protected:
|
||||
continue;
|
||||
}
|
||||
|
||||
auto client = this->getBleClient(sensorId);
|
||||
if (client == nullptr) {
|
||||
auto pClient = this->getBleClient(sensorId);
|
||||
if (pClient == nullptr) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!client->isConnected()) {
|
||||
if (!pClient->isConnected()) {
|
||||
this->bleSubscribed[sensorId] = false;
|
||||
this->bleLastSetDtTime[sensorId] = 0;
|
||||
|
||||
if (client->connect()) {
|
||||
Log.sinfoln(
|
||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': connected to %s"),
|
||||
sensorId, sSensor.name, client->getPeerAddress().toString().c_str()
|
||||
);
|
||||
pClient->connect(true, true, true);
|
||||
|
||||
} else {
|
||||
Log.swarningln(
|
||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed connecting to %s"),
|
||||
sensorId, sSensor.name, client->getPeerAddress().toString().c_str()
|
||||
);
|
||||
|
||||
continue;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!this->bleSubscribed[sensorId]) {
|
||||
if (this->subscribeToBleDevice(sensorId, client)) {
|
||||
if (this->subscribeToBleDevice(sensorId, pClient)) {
|
||||
this->bleSubscribed[sensorId] = true;
|
||||
|
||||
} else {
|
||||
this->bleSubscribed[sensorId] = false;
|
||||
client->disconnect();
|
||||
pClient->disconnect();
|
||||
continue;
|
||||
}
|
||||
}
|
||||
@@ -503,7 +516,7 @@ protected:
|
||||
struct tm ti;
|
||||
|
||||
if (getLocalTime(&ti)) {
|
||||
if (this->setDateOnBleSensor(client, &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,
|
||||
@@ -536,48 +549,39 @@ protected:
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
uint8_t addr[6] = {
|
||||
sSensor.address[0], sSensor.address[1], sSensor.address[2],
|
||||
sSensor.address[3], sSensor.address[4], sSensor.address[5]
|
||||
};
|
||||
const auto address = NimBLEAddress(addr, 0);
|
||||
|
||||
NimBLEClient* pClient = NimBLEDevice::getClientByPeerAddress(address);
|
||||
const auto address = NimBLEAddress(sSensor.address, 0);
|
||||
if (address.isNull()) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
if (this->bleClients[sensorId] && this->bleClients[sensorId] != nullptr) {
|
||||
return this->bleClients[sensorId];
|
||||
}
|
||||
|
||||
auto pClient = NimBLEDevice::createClient(address);
|
||||
if (pClient == nullptr) {
|
||||
pClient = NimBLEDevice::getDisconnectedClient();
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
if (pClient == nullptr) {
|
||||
if (NimBLEDevice::getCreatedClientCount() >= NIMBLE_MAX_CONNECTIONS) {
|
||||
return nullptr;
|
||||
}
|
||||
/**
|
||||
* Set initial connection parameters:
|
||||
* These settings are safe for 3 clients to connect reliably, can go faster if you have less
|
||||
* connections. Timeout should be a multiple of the interval, minimum is 100ms.
|
||||
* Min interval: 12 * 1.25ms = 15, Max interval: 12 * 1.25ms = 15, 0 latency, 1000 * 10ms = 10000ms timeout
|
||||
*/
|
||||
pClient->setConnectionParams(12, 12, 0, 1000);
|
||||
pClient->setConnectTimeout(10000);
|
||||
pClient->setSelfDelete(false, false);
|
||||
pClient->setClientCallbacks(new BluetoothClientCallbacks(sensorId), true);
|
||||
|
||||
pClient = NimBLEDevice::createClient();
|
||||
if (pClient == nullptr) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set initial connection parameters:
|
||||
* These settings are safe for 3 clients to connect reliably, can go faster if you have less
|
||||
* connections. Timeout should be a multiple of the interval, minimum is 100ms.
|
||||
* Min interval: 12 * 1.25ms = 15, Max interval: 12 * 1.25ms = 15, 0 latency, 1000 * 10ms = 10000ms timeout
|
||||
*/
|
||||
pClient->setConnectionParams(12, 12, 0, 1000);
|
||||
pClient->setConnectTimeout(5000);
|
||||
pClient->setSelfDelete(false, true);
|
||||
}
|
||||
|
||||
if (!pClient->isConnected()) {
|
||||
pClient->setPeerAddress(address);
|
||||
}
|
||||
this->bleClients[sensorId] = pClient;
|
||||
|
||||
return pClient;
|
||||
}
|
||||
|
||||
bool subscribeToBleDevice(const uint8_t sensorId, NimBLEClient* pClient) {
|
||||
auto& sSensor = Sensors::settings[sensorId];
|
||||
auto pAddress = pClient->getPeerAddress().toString().c_str();
|
||||
auto pAddress = pClient->getPeerAddress().toString();
|
||||
|
||||
NimBLERemoteService* pService = nullptr;
|
||||
NimBLERemoteCharacteristic* pChar = nullptr;
|
||||
@@ -588,13 +592,13 @@ protected:
|
||||
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
|
||||
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
|
||||
sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress.c_str()
|
||||
);
|
||||
|
||||
// 0x2A6E - Notify temperature x0.01C (pvvx)
|
||||
@@ -606,7 +610,7 @@ protected:
|
||||
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
|
||||
sensorId, sSensor.name, charUuid.toString().c_str(), pAddress.c_str()
|
||||
);
|
||||
|
||||
pChar->unsubscribe();
|
||||
@@ -661,14 +665,14 @@ protected:
|
||||
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
|
||||
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
|
||||
charUuid.toString().c_str(), pAddress.c_str()
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -683,7 +687,7 @@ protected:
|
||||
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
|
||||
sensorId, sSensor.name, charUuid.toString().c_str(), pAddress.c_str()
|
||||
);
|
||||
|
||||
pChar->unsubscribe();
|
||||
@@ -738,14 +742,14 @@ protected:
|
||||
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
|
||||
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
|
||||
charUuid.toString().c_str(), pAddress.c_str()
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -754,7 +758,7 @@ protected:
|
||||
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
|
||||
sensorId, sSensor.name, pAddress.c_str()
|
||||
);
|
||||
|
||||
pClient->disconnect();
|
||||
@@ -772,7 +776,7 @@ protected:
|
||||
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
|
||||
sensorId, sSensor.name, charUuid.toString().c_str(), pAddress.c_str()
|
||||
);
|
||||
|
||||
pChar->unsubscribe();
|
||||
@@ -827,14 +831,14 @@ protected:
|
||||
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
|
||||
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
|
||||
charUuid.toString().c_str(), pAddress.c_str()
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -843,7 +847,7 @@ protected:
|
||||
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
|
||||
sensorId, sSensor.name, pAddress.c_str()
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -857,13 +861,13 @@ protected:
|
||||
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
|
||||
sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress.c_str()
|
||||
);
|
||||
|
||||
} else {
|
||||
Log.straceln(
|
||||
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found battery service (%s) on device %s"),
|
||||
sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress
|
||||
sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress.c_str()
|
||||
);
|
||||
|
||||
// 0x2A19 - Notify the battery charge level 0..99% (pvvx)
|
||||
@@ -875,7 +879,7 @@ protected:
|
||||
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
|
||||
sensorId, sSensor.name, charUuid.toString().c_str(), pAddress.c_str()
|
||||
);
|
||||
|
||||
pChar->unsubscribe();
|
||||
@@ -930,14 +934,14 @@ protected:
|
||||
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
|
||||
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
|
||||
charUuid.toString().c_str(), pAddress.c_str()
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -946,7 +950,7 @@ protected:
|
||||
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
|
||||
sensorId, sSensor.name, pAddress.c_str()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,13 +12,13 @@ struct NetworkSettings {
|
||||
struct {
|
||||
char ssid[33] = DEFAULT_AP_SSID;
|
||||
char password[65] = DEFAULT_AP_PASSWORD;
|
||||
byte channel = 6;
|
||||
uint8_t channel = 6;
|
||||
} ap;
|
||||
|
||||
struct {
|
||||
char ssid[33] = DEFAULT_STA_SSID;
|
||||
char password[65] = DEFAULT_STA_PASSWORD;
|
||||
byte channel = 0;
|
||||
uint8_t channel = 0;
|
||||
} sta;
|
||||
} networkSettings;
|
||||
|
||||
@@ -42,7 +42,7 @@ struct Settings {
|
||||
} ntp;
|
||||
|
||||
UnitSystem unitSystem = UnitSystem::METRIC;
|
||||
byte statusLedGpio = DEFAULT_STATUS_LED_GPIO;
|
||||
uint8_t statusLedGpio = DEFAULT_STATUS_LED_GPIO;
|
||||
} system;
|
||||
|
||||
struct {
|
||||
@@ -54,9 +54,9 @@ struct Settings {
|
||||
|
||||
struct {
|
||||
UnitSystem unitSystem = UnitSystem::METRIC;
|
||||
byte inGpio = DEFAULT_OT_IN_GPIO;
|
||||
byte outGpio = DEFAULT_OT_OUT_GPIO;
|
||||
byte rxLedGpio = DEFAULT_OT_RX_LED_GPIO;
|
||||
uint8_t inGpio = DEFAULT_OT_IN_GPIO;
|
||||
uint8_t outGpio = DEFAULT_OT_OUT_GPIO;
|
||||
uint8_t rxLedGpio = DEFAULT_OT_RX_LED_GPIO;
|
||||
uint8_t memberId = 0;
|
||||
uint8_t flags = 0;
|
||||
float minPower = 0.0f;
|
||||
@@ -105,8 +105,8 @@ struct Settings {
|
||||
float target = DEFAULT_HEATING_TARGET_TEMP;
|
||||
float hysteresis = 0.5f;
|
||||
float turboFactor = 7.5f;
|
||||
byte minTemp = DEFAULT_HEATING_MIN_TEMP;
|
||||
byte maxTemp = DEFAULT_HEATING_MAX_TEMP;
|
||||
uint8_t minTemp = DEFAULT_HEATING_MIN_TEMP;
|
||||
uint8_t maxTemp = DEFAULT_HEATING_MAX_TEMP;
|
||||
uint8_t maxModulation = 100;
|
||||
|
||||
struct {
|
||||
@@ -123,8 +123,8 @@ struct Settings {
|
||||
struct {
|
||||
bool enabled = true;
|
||||
float target = DEFAULT_DHW_TARGET_TEMP;
|
||||
byte minTemp = DEFAULT_DHW_MIN_TEMP;
|
||||
byte maxTemp = DEFAULT_DHW_MAX_TEMP;
|
||||
uint8_t minTemp = DEFAULT_DHW_MIN_TEMP;
|
||||
uint8_t maxTemp = DEFAULT_DHW_MAX_TEMP;
|
||||
uint8_t maxModulation = 100;
|
||||
|
||||
struct {
|
||||
@@ -161,7 +161,7 @@ struct Settings {
|
||||
|
||||
struct {
|
||||
bool use = false;
|
||||
byte gpio = DEFAULT_EXT_PUMP_GPIO;
|
||||
uint8_t gpio = DEFAULT_EXT_PUMP_GPIO;
|
||||
unsigned short postCirculationTime = 600;
|
||||
unsigned int antiStuckInterval = 2592000;
|
||||
unsigned short antiStuckTime = 300;
|
||||
@@ -170,15 +170,15 @@ struct Settings {
|
||||
struct {
|
||||
struct {
|
||||
bool enabled = false;
|
||||
byte gpio = GPIO_IS_NOT_CONFIGURED;
|
||||
byte invertState = false;
|
||||
uint8_t gpio = GPIO_IS_NOT_CONFIGURED;
|
||||
bool invertState = false;
|
||||
unsigned short thresholdTime = 60;
|
||||
} input;
|
||||
|
||||
struct {
|
||||
bool enabled = false;
|
||||
byte gpio = GPIO_IS_NOT_CONFIGURED;
|
||||
byte invertState = false;
|
||||
uint8_t gpio = GPIO_IS_NOT_CONFIGURED;
|
||||
bool invertState = false;
|
||||
unsigned short thresholdTime = 60;
|
||||
bool onFault = true;
|
||||
bool onLossConnection = true;
|
||||
|
||||
@@ -72,7 +72,7 @@ time_t mkgmtime(const struct tm *ptm) {
|
||||
|
||||
inline bool isDigit(const char* ptr) {
|
||||
char* endPtr;
|
||||
strtol(ptr, &endPtr, 10);
|
||||
auto tmp = strtol(ptr, &endPtr, 10);
|
||||
return *endPtr == 0;
|
||||
}
|
||||
|
||||
@@ -1324,7 +1324,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
|
||||
if (!src[FPSTR(S_HEATING)][FPSTR(S_MIN_TEMP)].isNull()) {
|
||||
unsigned char value = src[FPSTR(S_HEATING)][FPSTR(S_MIN_TEMP)].as<unsigned char>();
|
||||
|
||||
if (value != dst.heating.minTemp && value >= vars.slave.heating.minTemp && value < vars.slave.heating.maxTemp && value != dst.heating.minTemp) {
|
||||
if (value != dst.heating.minTemp && value >= vars.slave.heating.minTemp && value < vars.slave.heating.maxTemp && value != dst.heating.maxTemp) {
|
||||
dst.heating.minTemp = value;
|
||||
changed = true;
|
||||
}
|
||||
@@ -1333,7 +1333,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
|
||||
if (!src[FPSTR(S_HEATING)][FPSTR(S_MAX_TEMP)].isNull()) {
|
||||
unsigned char value = src[FPSTR(S_HEATING)][FPSTR(S_MAX_TEMP)].as<unsigned char>();
|
||||
|
||||
if (value != dst.heating.maxTemp && value > vars.slave.heating.minTemp && value <= vars.slave.heating.maxTemp && value != dst.heating.maxTemp) {
|
||||
if (value != dst.heating.maxTemp && value > vars.slave.heating.minTemp && value <= vars.slave.heating.maxTemp && value != dst.heating.minTemp) {
|
||||
dst.heating.maxTemp = value;
|
||||
changed = true;
|
||||
}
|
||||
@@ -1894,7 +1894,7 @@ bool jsonToSensorSettings(const uint8_t sensorId, const JsonVariantConst src, Se
|
||||
|
||||
// gpio
|
||||
if (!src[FPSTR(S_GPIO)].isNull()) {
|
||||
if (dst.type != Sensors::Type::DALLAS_TEMP && dst.type == Sensors::Type::BLUETOOTH && dst.type == Sensors::Type::NTC_10K_TEMP) {
|
||||
if (dst.type != Sensors::Type::DALLAS_TEMP && dst.type != Sensors::Type::NTC_10K_TEMP) {
|
||||
if (dst.gpio != GPIO_IS_NOT_CONFIGURED) {
|
||||
dst.gpio = GPIO_IS_NOT_CONFIGURED;
|
||||
changed = true;
|
||||
|
||||
464
src_data/locales/nl.json
Normal file
464
src_data/locales/nl.json
Normal file
@@ -0,0 +1,464 @@
|
||||
{
|
||||
"values": {
|
||||
"logo": "OpenTherm Gateway",
|
||||
"nav": {
|
||||
"license": "Licentie",
|
||||
"source": "Broncode",
|
||||
"help": "Help",
|
||||
"issues": "Problemen & vragen",
|
||||
"releases": "Releases"
|
||||
},
|
||||
"dbm": "dBm",
|
||||
"kw": "kW",
|
||||
"time": {
|
||||
"days": "d.",
|
||||
"hours": "u.",
|
||||
"min": "min.",
|
||||
"sec": "sec."
|
||||
},
|
||||
"button": {
|
||||
"upgrade": "Upgraden",
|
||||
"restart": "Herstarten",
|
||||
"save": "Opslaan",
|
||||
"saved": "Opgeslagen",
|
||||
"refresh": "Vernieuwen",
|
||||
"restore": "Herstellen",
|
||||
"restored": "Hersteld",
|
||||
"backup": "Back-up",
|
||||
"wait": "Even wachten...",
|
||||
"uploading": "Uploaden...",
|
||||
"success": "Succes",
|
||||
"error": "Fout"
|
||||
},
|
||||
"index": {
|
||||
"title": "OpenTherm Gateway",
|
||||
"section": {
|
||||
"network": "Netwerk",
|
||||
"system": "Systeem"
|
||||
},
|
||||
"system": {
|
||||
"build": {
|
||||
"title": "Build",
|
||||
"version": "Versie",
|
||||
"date": "Datum",
|
||||
"core": "Core",
|
||||
"sdk": "SDK"
|
||||
},
|
||||
"uptime": "Uptime",
|
||||
"memory": {
|
||||
"title": "Vrij geheugen",
|
||||
"maxFreeBlock": "max. vrij blok",
|
||||
"min": "min"
|
||||
},
|
||||
"board": "Board",
|
||||
"chip": {
|
||||
"model": "Chip",
|
||||
"cores": "Kernen",
|
||||
"freq": "frequentie"
|
||||
},
|
||||
"flash": {
|
||||
"size": "Flash-grootte",
|
||||
"realSize": "werkelijke grootte"
|
||||
},
|
||||
"lastResetReason": "Reden laatste herstart"
|
||||
}
|
||||
},
|
||||
"dashboard": {
|
||||
"name": "Dashboard",
|
||||
"title": "Dashboard - OpenTherm Gateway",
|
||||
"section": {
|
||||
"control": "Bediening",
|
||||
"states": "Statussen",
|
||||
"sensors": "Sensoren",
|
||||
"diag": "OpenTherm diagnose"
|
||||
},
|
||||
"thermostat": {
|
||||
"heating": "Verwarming",
|
||||
"dhw": "Warm water",
|
||||
"temp.current": "Huidig",
|
||||
"enable": "Inschakelen",
|
||||
"turbo": "Turbomodus"
|
||||
},
|
||||
"notify": {
|
||||
"fault": {
|
||||
"title": "Ketelstoring is actief!",
|
||||
"note": "Het wordt aanbevolen de ketel te inspecteren en de documentatie te raadplegen om de storingscode te interpreteren:"
|
||||
},
|
||||
"diag": {
|
||||
"title": "Keteldiagnose is actief!",
|
||||
"note": "Heeft uw ketel misschien een inspectie nodig? Het wordt aanbevolen de documentatie te raadplegen om de diagnosecode te interpreteren:"
|
||||
},
|
||||
"reset": "Probeer te resetten"
|
||||
},
|
||||
"states": {
|
||||
"mNetworkConnected": "Netwerkverbinding",
|
||||
"mMqttConnected": "MQTT-verbinding",
|
||||
"mEmergencyState": "Noodmodus",
|
||||
"mExtPumpState": "Externe pomp",
|
||||
"mCascadeControlInput": "Cascaderegeling (ingang)",
|
||||
"mCascadeControlOutput": "Cascaderegeling (uitgang)",
|
||||
"sConnected": "OpenTherm-verbinding",
|
||||
"sFlame": "Vlam",
|
||||
"sCooling": "Koeling",
|
||||
"sFaultActive": "Storing",
|
||||
"sFaultCode": "Storingscode",
|
||||
"sDiagActive": "Diagnose",
|
||||
"sDiagCode": "Diagnosecode",
|
||||
"mHeatEnabled": "Verwarming ingeschakeld",
|
||||
"mHeatBlocking": "Verwarming geblokkeerd",
|
||||
"mHeatOverheat": "Verwarming oververhit",
|
||||
"sHeatActive": "Verwarming actief",
|
||||
"mHeatSetpointTemp": "Insteltemperatuur verwarming",
|
||||
"mHeatTargetTemp": "Doeltemperatuur verwarming",
|
||||
"mHeatCurrTemp": "Huidige temperatuur verwarming",
|
||||
"mHeatRetTemp": "Retourtemperatuur verwarming",
|
||||
"mHeatIndoorTemp": "Verwarming, binnentemperatuur",
|
||||
"mHeatOutdoorTemp": "Verwarming, buitentemperatuur",
|
||||
"mDhwEnabled": "Warm water ingeschakeld",
|
||||
"mDhwOverheat": "Warm water oververhit",
|
||||
"sDhwActive": "Warm water actief",
|
||||
"mDhwTargetTemp": "Doeltemperatuur warm water",
|
||||
"mDhwCurrTemp": "Huidige temperatuur warm water",
|
||||
"mDhwRetTemp": "Retourtemperatuur warm water"
|
||||
},
|
||||
"sensors": {
|
||||
"values": {
|
||||
"temp": "Temperatuur",
|
||||
"humidity": "Luchtvochtigheid",
|
||||
"battery": "Batterij",
|
||||
"rssi": "RSSI"
|
||||
}
|
||||
}
|
||||
},
|
||||
"network": {
|
||||
"title": "Netwerk - OpenTherm Gateway",
|
||||
"name": "Netwerkinstellingen",
|
||||
"section": {
|
||||
"static": "Statische instellingen",
|
||||
"availableNetworks": "Beschikbare netwerken",
|
||||
"staSettings": "WiFi-instellingen",
|
||||
"apSettings": "AP-instellingen"
|
||||
},
|
||||
"scan": {
|
||||
"pos": "#",
|
||||
"info": "Info"
|
||||
},
|
||||
"wifi": {
|
||||
"ssid": "SSID",
|
||||
"password": "Wachtwoord",
|
||||
"channel": "Kanaal",
|
||||
"signal": "Signaal",
|
||||
"connected": "Verbonden"
|
||||
},
|
||||
"params": {
|
||||
"hostname": "Hostnaam",
|
||||
"dhcp": "Gebruik DHCP",
|
||||
"mac": "MAC",
|
||||
"ip": "IP",
|
||||
"subnet": "Subnet",
|
||||
"gateway": "Gateway",
|
||||
"dns": "DNS"
|
||||
},
|
||||
"sta": {
|
||||
"channel.note": "zet op 0 voor automatische selectie"
|
||||
}
|
||||
},
|
||||
"sensors": {
|
||||
"title": "Sensorinstellingen - OpenTherm Gateway",
|
||||
"name": "Sensorinstellingen",
|
||||
"enabled": "Ingeschakeld",
|
||||
"sensorName": {
|
||||
"title": "Sensornaam",
|
||||
"note": "Mag alleen bevatten: a-z, A-Z, 0-9, _ en spatie"
|
||||
},
|
||||
"purpose": "Doel",
|
||||
"purposes": {
|
||||
"outdoorTemp": "Buitentemperatuur",
|
||||
"indoorTemp": "Binnentemperatuur",
|
||||
"heatTemp": "Verwarming, temperatuur",
|
||||
"heatRetTemp": "Verwarming, retourtemperatuur",
|
||||
"dhwTemp": "Warm water, temperatuur",
|
||||
"dhwRetTemp": "Warm water, retourtemperatuur",
|
||||
"dhwFlowRate": "Warm water, doorstroomsnelheid",
|
||||
"exhaustTemp": "Rookgastemperatuur",
|
||||
"modLevel": "Modulatieniveau (in procenten)",
|
||||
"number": "Getal (ruw)",
|
||||
"powerFactor": "Vermogen (in procent)",
|
||||
"power": "Vermogen (in kWt)",
|
||||
"fanSpeed": "Ventilatorsnelheid",
|
||||
"co2": "CO2",
|
||||
"pressure": "Druk",
|
||||
"humidity": "Luchtvochtigheid",
|
||||
"temperature": "Temperatuur",
|
||||
"notConfigured": "Niet geconfigureerd"
|
||||
},
|
||||
"type": "Type/bron",
|
||||
"types": {
|
||||
"otOutdoorTemp": "OpenTherm, buitentemp.",
|
||||
"otHeatTemp": "OpenTherm, verwarming, temp.",
|
||||
"otHeatRetTemp": "OpenTherm, verwarming, retourtemp.",
|
||||
"otDhwTemp": "OpenTherm, warm water, temperatuur",
|
||||
"otDhwTemp2": "OpenTherm, warm water, temperatuur 2",
|
||||
"otDhwFlowRate": "OpenTherm, warm water, doorstroomsnelheid",
|
||||
"otCh2Temp": "OpenTherm, kanaal 2, temp.",
|
||||
"otExhaustTemp": "OpenTherm, rookgastemp.",
|
||||
"otHeatExchangerTemp": "OpenTherm, warmtewisselaar temp.",
|
||||
"otPressure": "OpenTherm, druk",
|
||||
"otModLevel": "OpenTherm, modulatieniveau",
|
||||
"otCurrentPower": "OpenTherm, huidig vermogen",
|
||||
"otExhaustCo2": "OpenTherm, rookgas CO2",
|
||||
"otExhaustFanSpeed": "OpenTherm, rookgasventilator snelheid",
|
||||
"otSupplyFanSpeed": "OpenTherm, toevoerventilator snelheid",
|
||||
"otSolarStorageTemp": "OpenTherm, zonneboiler opslagtemp.",
|
||||
"otSolarCollectorTemp": "OpenTherm, zonnecollector temp.",
|
||||
"otFanSpeedSetpoint": "OpenTherm, instelpunt ventilatorsnelheid",
|
||||
"otFanSpeedCurrent": "OpenTherm, huidige ventilatorsnelheid",
|
||||
"otBurnerStarts": "OpenTherm, aantal branderstarts",
|
||||
"otDhwBurnerStarts": "OpenTherm, aantal branderstarts (warm water)",
|
||||
"otHeatingPumpStarts": "OpenTherm, aantal pompstarts (verwarming)",
|
||||
"otDhwPumpStarts": "OpenTherm, aantal pompstarts (warm water)",
|
||||
"otBurnerHours": "OpenTherm, aantal branderuren",
|
||||
"otDhwBurnerHours": "OpenTherm, aantal branderuren (warm water)",
|
||||
"otHeatingPumpHours": "OpenTherm, aantal pompuren (verwarming)",
|
||||
"otDhwPumpHours": "OpenTherm, aantal pompuren (warm water)",
|
||||
"ntcTemp": "NTC-sensor",
|
||||
"dallasTemp": "DALLAS-sensor",
|
||||
"bluetooth": "BLE-sensor",
|
||||
"heatSetpointTemp": "Verwarming, insteltemperatuur",
|
||||
"manual": "Handmatig via MQTT/API",
|
||||
"notConfigured": "Niet geconfigureerd"
|
||||
},
|
||||
"gpio": "GPIO",
|
||||
"address": {
|
||||
"title": "Sensoradres",
|
||||
"note": "Laat leeg voor automatische detectie van DALLAS-sensoren. Voor BLE-apparaten is een MAC-adres vereist."
|
||||
},
|
||||
"correction": {
|
||||
"desc": "Correctie van waarden",
|
||||
"offset": "Compensatie (offset)",
|
||||
"factor": "Vermenigvuldiger"
|
||||
},
|
||||
"filtering": {
|
||||
"desc": "Filteren van waarden",
|
||||
"enabled": {
|
||||
"title": "Filteren ingeschakeld",
|
||||
"note": "Kan handig zijn bij veel scherpe ruis in de grafieken. Het gebruikte filter is \"Voortschrijdend gemiddelde\"."
|
||||
},
|
||||
"factor": {
|
||||
"title": "Filterfactor",
|
||||
"note": "Hoe lager de waarde, hoe vloeiender en <u>langer</u> de verandering in numerieke waarden."
|
||||
}
|
||||
}
|
||||
},
|
||||
"settings": {
|
||||
"title": "Instellingen - OpenTherm Gateway",
|
||||
"name": "Instellingen",
|
||||
"section": {
|
||||
"portal": "Portaalinstellingen",
|
||||
"system": "Systeeminstellingen",
|
||||
"diag": "Diagnose",
|
||||
"heating": "Verwarmingsinstellingen",
|
||||
"dhw": "Warmwaterinstellingen",
|
||||
"emergency": "Instellingen noodmodus",
|
||||
"equitherm": "Equitherm-instellingen",
|
||||
"pid": "PID-instellingen",
|
||||
"ot": "OpenTherm-instellingen",
|
||||
"mqtt": "MQTT-instellingen",
|
||||
"extPump": "Instellingen externe pomp",
|
||||
"cascadeControl": "Instellingen cascaderegeling"
|
||||
},
|
||||
"enable": "Inschakelen",
|
||||
"note": {
|
||||
"restart": "Na het wijzigen van deze instellingen moet het apparaat opnieuw worden opgestart om de wijzigingen door te voeren.",
|
||||
"blankNotUse": "leeg - niet gebruiken",
|
||||
"bleDevice": "BLE-apparaat kan <u>alleen</u> worden gebruikt met sommige ESP32-boards met BLE-ondersteuning!"
|
||||
},
|
||||
"temp": {
|
||||
"min": "Minimumtemperatuur",
|
||||
"max": "Maximumtemperatuur"
|
||||
},
|
||||
"maxModulation": "Max. modulatieniveau",
|
||||
"ohProtection": {
|
||||
"title": "Oververhittingsbeveiliging",
|
||||
"desc": "<b>Let op:</b> Deze functie kan handig zijn als de ingebouwde oververhittingsbeveiliging van de ketel niet of niet correct werkt en de warmtedrager kookt. Om uit te schakelen, stel 0 in als <b>hoge</b> en <b>lage</b> temperatuur.",
|
||||
"highTemp": {
|
||||
"title": "Drempelwaarde hoge temperatuur",
|
||||
"note": "Drempelwaarde waarbij de brander geforceerd wordt uitgeschakeld"
|
||||
},
|
||||
"lowTemp": {
|
||||
"title": "Drempelwaarde lage temperatuur",
|
||||
"note": "Drempelwaarde waarbij de brander weer ingeschakeld kan worden"
|
||||
}
|
||||
},
|
||||
"freezeProtection": {
|
||||
"title": "Vorstbeveiliging",
|
||||
"desc": "De verwarming wordt geforceerd ingeschakeld als de temperatuur van de warmtedrager of de binnentemperatuur onder de <b>Lage temperatuur</b> daalt gedurende de <b>Wachttijd</b>.",
|
||||
"lowTemp": "Drempelwaarde lage temperatuur",
|
||||
"thresholdTime": "Wachttijd <small>(sec)</small>"
|
||||
},
|
||||
"portal": {
|
||||
"login": "Gebruikersnaam",
|
||||
"password": "Wachtwoord",
|
||||
"auth": "Authenticatie vereisen",
|
||||
"mdns": "Gebruik mDNS"
|
||||
},
|
||||
"system": {
|
||||
"unit": "Eenheidssysteem",
|
||||
"metric": "Metrisch <small>(celsius, liters, bar)</small>",
|
||||
"imperial": "Imperiaal <small>(fahrenheit, gallons, psi)</small>",
|
||||
"statusLedGpio": "Status LED GPIO",
|
||||
"logLevel": "Logniveau",
|
||||
"serial": {
|
||||
"enable": "Seriële poort ingeschakeld",
|
||||
"baud": "Baudrate seriële poort"
|
||||
},
|
||||
"telnet": {
|
||||
"enable": "Telnet ingeschakeld",
|
||||
"port": {
|
||||
"title": "Telnet-poort",
|
||||
"note": "Standaard: 23"
|
||||
}
|
||||
},
|
||||
"ntp": {
|
||||
"server": "NTP-server",
|
||||
"timezone": "Tijdzone",
|
||||
"timezonePresets": "Selecteer voorinstelling..."
|
||||
}
|
||||
},
|
||||
"heating": {
|
||||
"hyst": "Hysterese <small>(in graden)</small>",
|
||||
"turboFactor": "Turbomodus coëff."
|
||||
},
|
||||
"emergency": {
|
||||
"desc": "Noodmodus wordt automatisch geactiveerd wanneer «PID» of «Equitherm» het instelpunt van de warmtedrager niet kan berekenen:<br />- als «Equitherm» is ingeschakeld en de buitentemperatuursensor is losgekoppeld;<br />- als «PID» of OT-optie <i>«Natuurlijke verwarmingsregeling»</i> is ingeschakeld en de binnentemperatuursensor is losgekoppeld.<br /><b>Let op:</b> Bij een netwerk- of MQTT-storing krijgen sensoren van het type <i>«Handmatig via MQTT/API»</i> de status ONVERBONDEN.",
|
||||
"target": {
|
||||
"title": "Doeltemperatuur",
|
||||
"note": "<b>Belangrijk:</b> <u>Doel binnentemperatuur</u> als OT-optie <i>«Natuurlijke verwarmingsregeling»</i> is ingeschakeld.<br />In alle andere gevallen, de <u>doel warmtedragertemperatuur</u>."
|
||||
},
|
||||
"treshold": "Drempeltijd <small>(sec)</small>"
|
||||
},
|
||||
"equitherm": {
|
||||
"n": "N-factor",
|
||||
"k": "K-factor",
|
||||
"t": {
|
||||
"title": "T-factor",
|
||||
"note": "Niet gebruikt als PID is ingeschakeld"
|
||||
}
|
||||
},
|
||||
"pid": {
|
||||
"p": "P-factor",
|
||||
"i": "I-factor",
|
||||
"d": "D-factor",
|
||||
"dt": "DT <small>in seconden</small>",
|
||||
"limits": {
|
||||
"title": "Limieten",
|
||||
"note": "<b>Belangrijk:</b> Bij gelijktijdig gebruik van «Equitherm» en «PID» beperken de min- en maxtemperaturen de invloed op de resulterende «Equitherm»-temperatuur.<br />Dus, als de min-temperatuur is ingesteld op -15 en de max-temperatuur op 15, zal het uiteindelijke instelpunt van de warmtedrager liggen tussen <code>equitherm_resultaat - 15</code> en <code>equitherm_resultaat + 15</code>."
|
||||
},
|
||||
"deadband": {
|
||||
"title": "Deadband",
|
||||
"note": "Deadband is een bereik rond de doeltemperatuur waarbinnen de PID-regeling minder actief wordt. Binnen dit bereik kan het algoritme de intensiteit verminderen of aanpassingen pauzeren om overreactie op kleine schommelingen te voorkomen.<br /><br />Bijvoorbeeld, met een doeltemperatuur van 22°, een onderdrempel van 1.0 en een bovendrempel van 0.5, werkt de deadband tussen 21° en 22.5°. Als de I-coëfficiënt 0.0005 is en de I-vermenigvuldiger 0.05, dan wordt de I-coëfficiënt binnen de deadband: <code>0.0005 * 0.05 = 0.000025</code>",
|
||||
"p_multiplier": "Vermenigvuldiger voor P-factor",
|
||||
"i_multiplier": "Vermenigvuldiger voor I-factor",
|
||||
"d_multiplier": "Vermenigvuldiger voor D-factor",
|
||||
"thresholdHigh": "Bovendrempel",
|
||||
"thresholdLow": "Onderdrempel"
|
||||
}
|
||||
},
|
||||
"ot": {
|
||||
"advanced": "Geavanceerde instellingen",
|
||||
"inGpio": "In GPIO",
|
||||
"outGpio": "Uit GPIO",
|
||||
"ledGpio": "RX LED GPIO",
|
||||
"memberId": "Master member ID",
|
||||
"flags": "Master flags",
|
||||
"minPower": {
|
||||
"title": "Min. ketelvermogen <small>(kW)</small>",
|
||||
"note": "Deze waarde is bij 0-1% modulatieniveau van de ketel. Typisch te vinden in de ketelspecificatie als \"minimum nuttig warmtevermogen\"."
|
||||
},
|
||||
"maxPower": {
|
||||
"title": "Max. ketelvermogen <small>(kW)</small>",
|
||||
"note": "<b>0</b> - probeer automatisch te detecteren. Typisch te vinden in de ketelspecificatie als \"maximum nuttig warmtevermogen\"."
|
||||
},
|
||||
"options": {
|
||||
"title": "Opties (aanvullende instellingen)",
|
||||
"desc": "Opties kunnen de logica van de ketel veranderen. Niet alle opties zijn gedocumenteerd in het protocol, dus dezelfde optie kan verschillende effecten hebben op verschillende ketels.<br /><b>Let op:</b> Het is niet nodig om iets te veranderen als alles goed werkt.",
|
||||
"dhwSupport": "Warm water ondersteuning",
|
||||
"coolingSupport": "Koeling ondersteuning",
|
||||
"summerWinterMode": "Zomer/wintermodus",
|
||||
"heatingStateToSummerWinterMode": "Verwarmingsstatus als zomer/wintermodus",
|
||||
"ch2AlwaysEnabled": "CH2 altijd ingeschakeld",
|
||||
"heatingToCh2": "Dupliceer verwarming naar CH2",
|
||||
"dhwToCh2": "Dupliceer warm water naar CH2",
|
||||
"dhwBlocking": "Blokkering warm water",
|
||||
"dhwStateAsDhwBlocking": "Status warm water als blokkering warm water",
|
||||
"maxTempSyncWithTargetTemp": "Synchroniseer max. verwarmingstemp. met doeltemp.",
|
||||
"getMinMaxTemp": "Haal min/max temp. op van ketel",
|
||||
"ignoreDiagState": "Negeer diagnosestatus",
|
||||
"autoFaultReset": "Automatische storingsreset <small>(niet aanbevolen!)</small>",
|
||||
"autoDiagReset": "Automatische diagnosereset <small>(niet aanbevolen!)</small>",
|
||||
"setDateAndTime": "Stel datum & tijd in op ketel",
|
||||
"immergasFix": "Fix voor Immergas-ketels"
|
||||
},
|
||||
"nativeHeating": {
|
||||
"title": "Natuurlijke verwarmingsregeling (ketel)",
|
||||
"note": "Werkt <u>ALLEEN</u> als de ketel de gewenste kamertemperatuur vereist en zelf de temperatuur van de warmtedrager regelt. Niet compatibel met PID- en Equitherm-regelaars in de firmware."
|
||||
}
|
||||
},
|
||||
"mqtt": {
|
||||
"homeAssistantDiscovery": "Home Assistant Discovery",
|
||||
"server": "Server",
|
||||
"port": "Poort",
|
||||
"user": "Gebruiker",
|
||||
"password": "Wachtwoord",
|
||||
"prefix": "Prefix",
|
||||
"interval": "Publicatie-interval <small>(sec)</small>"
|
||||
},
|
||||
"extPump": {
|
||||
"use": "Gebruik externe pomp",
|
||||
"gpio": "Relais GPIO",
|
||||
"postCirculationTime": "Nacirculatietijd <small>(min)</small>",
|
||||
"antiStuckInterval": "Anti-vastloopinterval <small>(dagen)</small>",
|
||||
"antiStuckTime": "Anti-vastlooptijd <small>(min)</small>"
|
||||
},
|
||||
"cascadeControl": {
|
||||
"input": {
|
||||
"desc": "Kan worden gebruikt om de verwarming alleen in te schakelen als een andere ketel defect is. De besturing van de andere ketel moet de status van de GPIO-ingang wijzigen in geval van een storing.",
|
||||
"enable": "Ingang ingeschakeld",
|
||||
"gpio": "GPIO",
|
||||
"invertState": "Inverteer GPIO-status",
|
||||
"thresholdTime": "Drempeltijd statuswijziging <small>(sec)</small>"
|
||||
},
|
||||
"output": {
|
||||
"desc": "Kan worden gebruikt om een andere ketel in te schakelen <u>via een relais</u>.",
|
||||
"enable": "Uitgang ingeschakeld",
|
||||
"gpio": "GPIO",
|
||||
"invertState": "Inverteer GPIO-status",
|
||||
"thresholdTime": "Drempeltijd statuswijziging <small>(sec)</small>",
|
||||
"events": {
|
||||
"desc": "Gebeurtenissen",
|
||||
"onFault": "Als de storingsstatus actief is",
|
||||
"onLossConnection": "Als de verbinding via Opentherm is verbroken",
|
||||
"onEnabledHeating": "Als de verwarming is ingeschakeld"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"upgrade": {
|
||||
"title": "Upgrade - OpenTherm Gateway",
|
||||
"name": "Upgrade",
|
||||
"section": {
|
||||
"backupAndRestore": "Back-up & herstel",
|
||||
"backupAndRestore.desc": "In deze sectie kunt u een back-up van ALLE instellingen opslaan en herstellen.",
|
||||
"upgrade": "Upgrade",
|
||||
"upgrade.desc": "In deze sectie kunt u de firmware en het bestandssysteem van uw apparaat upgraden.<br />De nieuwste releases kunnen worden gedownload van de <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Releases-pagina</a> van de projectrepository."
|
||||
},
|
||||
"note": {
|
||||
"disclaimer1": "Na een succesvolle upgrade van het bestandssysteem worden ALLE instellingen teruggezet naar de standaardwaarden! Sla een back-up op voordat u gaat upgraden.",
|
||||
"disclaimer2": "Na een succesvolle upgrade zal het apparaat automatisch herstarten na 15 seconden."
|
||||
},
|
||||
"settingsFile": "Instellingenbestand",
|
||||
"fw": "Firmware",
|
||||
"fs": "Bestandssysteem"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -23,6 +23,7 @@
|
||||
<option value="en" selected>EN</option>
|
||||
<option value="cn">CN</option>
|
||||
<option value="it">IT</option>
|
||||
<option value="nl">NL</option>
|
||||
<option value="ru">RU</option>
|
||||
</select>
|
||||
</li>
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
<option value="en" selected>EN</option>
|
||||
<option value="cn">CN</option>
|
||||
<option value="it">IT</option>
|
||||
<option value="nl">NL</option>
|
||||
<option value="ru">RU</option>
|
||||
</select>
|
||||
</li>
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
<option value="en" selected>EN</option>
|
||||
<option value="cn">CN</option>
|
||||
<option value="it">IT</option>
|
||||
<option value="nl">NL</option>
|
||||
<option value="ru">RU</option>
|
||||
</select>
|
||||
</li>
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
<option value="en" selected>EN</option>
|
||||
<option value="cn">CN</option>
|
||||
<option value="it">IT</option>
|
||||
<option value="nl">NL</option>
|
||||
<option value="ru">RU</option>
|
||||
</select>
|
||||
</li>
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
<option value="en" selected>EN</option>
|
||||
<option value="cn">CN</option>
|
||||
<option value="it">IT</option>
|
||||
<option value="nl">NL</option>
|
||||
<option value="ru">RU</option>
|
||||
</select>
|
||||
</li>
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
<option value="en" selected>EN</option>
|
||||
<option value="cn">CN</option>
|
||||
<option value="it">IT</option>
|
||||
<option value="nl">NL</option>
|
||||
<option value="ru">RU</option>
|
||||
</select>
|
||||
</li>
|
||||
|
||||
Reference in New Issue
Block a user