Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

main to dev #117

Merged
merged 17 commits into from
Oct 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,10 @@ browse in the [wiki](https://github.com/bolliy/ioBroker.sun2000/wiki)
Placeholder for the next version (at the beginning of the line):
### **WORK IN PROGRESS**
-->
### **WORK IN PROGRESS**
### 0.12.1 (2024-09-29)
* no warning from check the valid number during standby: "no irradiation"

### 0.12.0 (2024-09-23)
* Requirements from ioBroker Check and Service Bot #104
* added battery packs #85
* added config panel `Further Register`
Expand Down
56 changes: 28 additions & 28 deletions io-package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,34 @@
{
"common": {
"name": "sun2000",
"version": "0.11.0",
"version": "0.12.1",
"news": {
"0.12.1": {
"en": "no warning from check the valid number during standby: \"no irradiation\"",
"de": "keine warnung vor der prüfung der gültigen nummer im standby: \"keine bestrahlung\"",
"ru": "не предупредить проверить действительный номер во время ожидания: «без облучения»",
"pt": "sem aviso de verificar o número válido durante o standby: \"nenhuma irradiação\"",
"nl": "geen waarschuwing van controle van het geldige nummer tijdens standby: \"geen bestraling\"",
"fr": "aucun avertissement de vérifier le nombre valide en attente: \"pas d'irradiation\"",
"it": "nessun avviso da controllare il numero valido durante la standby: \"nessuna irradiazione\"",
"es": "no hay advertencia de comprobar el número válido durante la espera: \"no irradiación\"",
"pl": "brak ostrzeżenia z sprawdzenia poprawnego numeru podczas czuwania: \"brak napromieniowania\"",
"uk": "без попередження про перевірку дійсного числа під час очікування: \"не опромінення\"",
"zh-cn": "在待命时不检查有效号码的警告 : “ 不辐射 ”"
},
"0.12.0": {
"en": "Requirements from ioBroker Check and Service Bot #104\nadded battery packs #85\nadded config panel `Further Register`",
"de": "Anforderungen an ioBroker Check und Service Bot #104\nakkupacks #85\nhinzufügen config panel `Weiter registrieren `",
"ru": "Требования от ioBroker Check and Service Bot #104\n#85\nдобавленная панель конфигурации `Further Register \"",
"pt": "Requisitos de ioBroker Check e Service Bot #104\npacotes de bateria adicionados #85\nadicionado painel de configuração `Further Register \"",
"nl": "Vereisten van ioBroker Check and Service Bot #104\ntoegevoegde batterijpakketten #85\ntoegevoegd config paneel \"Verder registreren\" Wat",
"fr": "Exigences de ioBroker Check and Service Bot #104\npacks de batterie supplémentaires #85\najouté panneau de configuration `Plus grand registre \"",
"it": "Requisiti da ioBroker Check and Service Bot #104\nbatterie aggiunte #85\naggiunto pannello di configurazione `Further Register #",
"es": "Requisitos de ioBroker Check and Service Bot #104\nañadir paquetes de batería #85\npanel de configuración añadido `Más registro `",
"pl": "Wymagania dotyczące kontroli ioBroker i serwisu Bot # 104\ndodany zestaw baterii # 85\ndodany panel konfiguracyjny \"Dalszy rejestr '",
"uk": "Вимоги до ioBroker Check and Service Bot #104\nдоданий акумуляторний пакет #85\nдодано панель налаштувань `Further Реєстр й",
"zh-cn": "ioBroker检查和服务瓶的所需经费#104\n添加电池包# 85\n添加配置面板“ 进一步登记” `"
},
"0.11.0": {
"en": "added a donation link in the adapter settings\ndependency updated",
"de": "einen spendenlink in den adaptereinstellungen hinzugefügt\naktualisierte abhängigkeit",
Expand Down Expand Up @@ -67,32 +93,6 @@
"pl": "inverter model nazwa zbyt wiele znaków # 73",
"uk": "ім'я інвертора занадто багато символів #73",
"zh-cn": "翻转模型名称过多字符 # 73"
},
"0.7.0": {
"en": "breaking changes\nNode.js 18.x or higher required\nioBroker host (js-controller) 5.x or higher",
"de": "änderungen\nNode.js 18.x oder höher erforderlich\nioBroker Host (js-controller) 5.x oder höher",
"ru": "изменения\nNode.js 18.x или выше требуется\nioBroker host (js-controller) 5.x или выше",
"pt": "alterações de ruptura\nNode.js 18.x ou superior requerido\nhospedeiro ioBroker (js-controller) 5.x ou superior",
"nl": "wijzigingen breken\nNode.js 18.x of hoger vereist\nioBroker host (js-controller) 5.x of hoger",
"fr": "casser les changements\nNode.js 18.x ou plus requis\nioBroker host (js-controller) 5.x ou plus",
"it": "cambiamenti di rottura\nNode.js 18.x o superiore richiesto\nioBroker host (js-controller) 5.x o superiore",
"es": "cambios de ruptura\nNode.js 18.x o superior requerido\nioBroker host (js-controller) 5.x o superior",
"pl": "łamanie zmian\nNode.js 18,x lub wyższa wymagana\njoBroker host (kontroler js-) 5.x lub wyższy",
"uk": "поломка змін\nNode.js 18.x або вище потрібно\nioBroker host (js-controller) 5.x або вище",
"zh-cn": "断开更改\n所需节点.js 18.x或更高\nioBroker 主机(js-controller) 5.x或更高"
},
"0.6.2": {
"en": "standby detection adjusted\nImprovement of logs",
"de": "standby-erkennung angepasst\nVerbesserung der Protokolle",
"ru": "резервное обнаружение с поправкой\nСовершенствование журналов",
"pt": "detecção de espera ajustada\nMelhoria dos logs",
"nl": "stand-by detectie aangepast\nVerbetering van de logs",
"fr": "réglage de la détection en attente\nAmélioration des registres",
"it": "rilevamento standby regolato\nMiglioramento dei registri",
"es": "detección de reserva ajustada\nMejora de los registros",
"pl": "korekta detekcji czuwania\nPoprawa dzienników",
"uk": "автономне виявлення\nУдосконалення колод",
"zh-cn": "经调整的备用检测\n改进日志"
}
},
"titleLang": {
Expand Down Expand Up @@ -247,7 +247,7 @@
"ms_log": false,
"sl_active": false,
"sl_meterId": 11,
"ds_bu" : true
"ds_bu": true
},
"objects": [],
"instanceObjects": [
Expand Down
7 changes: 4 additions & 3 deletions lib/drivers/driver_inverter.js
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ class InverterSun2000 extends DriverBase{
{
address : 38233,
length : 3,
info : 'Battery Pck 1 Charge And Discharge Power',
info : 'Battery Pack 1 Charge And Discharge Power',
refresh : dataRefreshRate.high,
type : deviceType.battery,
states : [{
Expand Down Expand Up @@ -936,7 +936,7 @@ class InverterSun2000 extends DriverBase{
if (value >= from && value <= until) {
return value;
}
this.log.warn('_checkValidNumber '+value+' from: '+from+' until: '+until);
this.log.debug('_checkValidNumber '+value+' from: '+from+' until: '+until);
return substWith;
}
return value;
Expand Down Expand Up @@ -974,7 +974,8 @@ class InverterSun2000 extends DriverBase{
}
if (modbusAllowed) {
//430 = SUN2000-8KTL-M2
if (this._modelId < 430) modbusAllowed = this.deviceStatus !== 0x0002;
if (this.deviceStatus === 0x0002 && this._modelId < 430) modbusAllowed = false;
//if (this._modelId < 430) modbusAllowed = this.deviceStatus !== 0x0002;
if (this._errorCount > 3) modbusAllowed = false;
}

Expand Down
5 changes: 5 additions & 0 deletions lib/tools.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ class Logging {
else this.adapter.log.info(msg);
}

silly(msg) {
if (this._quiet) this.debug('Warn: '+msg);
else this.adapter.log.silly(msg);
}

warn(msg) {
if (this._quiet) this.debug('Warn: '+msg);
else this.adapter.log.warn(msg);
Expand Down
2 changes: 1 addition & 1 deletion main.js
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ class Sun2000 extends utils.Adapter {
this.settings.sl.meterId = this.config.sl_meterId;
//battery charge control
this.settings.cb.tou = this.config.cb_tou;
//data scope
//further battery register
this.settings.ds.batteryUnits = this.config.ds_bu;
this.settings.ds.batteryPacks = this.config.ds_bp;

Expand Down
Loading