diff --git a/admin/OLD_index_m.html b/admin/OLD_index_m.html deleted file mode 100644 index bf17c43..0000000 --- a/admin/OLD_index_m.html +++ /dev/null @@ -1,144 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- -
-
- - - - -
-
- - -
- -
- - -
-
- -
-
- - -
-
- -
- - -
-
-

on save adapter restarts with new config immediately

-
-
- - - - diff --git a/admin/i18n/en/translations.json b/admin/i18n/en/translations.json index e8089d2..4d20205 100644 --- a/admin/i18n/en/translations.json +++ b/admin/i18n/en/translations.json @@ -1,6 +1,5 @@ { - "ipaddress": "Ip address", - "on save adapter restarts with new config immediately": "On save adapter restarts with new config immediately", + "ipaddress": "IP address", "password": "Password", "pollinterval": "Polling interval" } diff --git a/admin/jsonConfig.json b/admin/jsonConfig.json index 9398c15..7c12df9 100644 --- a/admin/jsonConfig.json +++ b/admin/jsonConfig.json @@ -38,19 +38,6 @@ "md": 6, "lg": 4, "xl": 4 - }, - "staticTextNote": { - "type": "staticText", - "label": "on save adapter restarts with new config immediately", - "style": { - "fontSize": 16 - }, - "newLine": true, - "xs": 12, - "sm": 12, - "md": 6, - "lg": 6, - "xl": 6 } } } \ No newline at end of file diff --git a/io-package.json b/io-package.json index 8060b99..60f9c2d 100644 --- a/io-package.json +++ b/io-package.json @@ -102,8 +102,8 @@ "condition": { "operand": "and", "rules": [ - "oldVersion<1.0.2", - "newVersion>=1.0.2" + "oldVersion<2.0.0", + "newVersion>=2.0.0" ] }, "title": { diff --git a/main.js b/main.js index 2fe8209..41c8818 100644 --- a/main.js +++ b/main.js @@ -95,27 +95,28 @@ function startAdapter(options) { } else { adapter.log.info('[START] Starting Rain Bird adapter V' + adapterVersion + '' + patchVersion); adapter.setState('info.connection', true, true); - adapter.getForeignObject('system.config', (err, obj) => { + // adapter.getForeignObject('system.config', (err, obj) => { - //Not necessary any more after changing to jsonconfig and password stored encrypted in io-packages.json: - /*if (obj && obj.native && obj.native.secret) { - //noinspection JSUnresolvedVariable - //adapter.config.password = ioBLib.decrypt(obj.native.secret, adapter.config.password); + // //Not necessary any more after changing to jsonconfig and password stored encrypted in io-packages.json: + // /*if (obj && obj.native && obj.native.secret) { + // //noinspection JSUnresolvedVariable + // //adapter.config.password = ioBLib.decrypt(obj.native.secret, adapter.config.password); - } else { - //noinspection JSUnresolvedVariable - //adapter.config.password = ioBLib.decrypt('Zgfr56gFe87jJOM', adapter.config.password); - }*/ + // } else { + // //noinspection JSUnresolvedVariable + // //adapter.config.password = ioBLib.decrypt('Zgfr56gFe87jJOM', adapter.config.password); + // }*/ - main(); - }); + // main(); + // }); + + main(); } }); return adapter; } - function main() { deviceIpAdress = adapter.config.ipaddress; devicePassword = adapter.config.password;