Skip to content

Commit

Permalink
chore: release v1.3.1
Browse files Browse the repository at this point in the history 
Corrected the type of states
  • Loading branch information
@GermanBluefox
GermanBluefox committed Jun 23, 2021
1 parent 7f3370f commit ce5e84b
Show file tree
Hide file tree
Showing 16 changed files with 41 additions and 34 deletions.
3 changes: 3 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ More description could be found [here](https://github.com/ioBroker/ioBroker.s7/b
-->

## Changelog
### 1.3.1 (2021-06-23)
* (bluefox) Corrected the type of states

### 1.3.0 (2021-06-17)
* (bluefox) New configuration page on react

Expand Down
6 changes: 3 additions & 3 deletions admin/asset-manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"files": {
"main.css": "./static/css/main.c9480e85.chunk.css",
"main.js": "./static/js/main.9a5704e2.chunk.js",
"main.js.map": "./static/js/main.9a5704e2.chunk.js.map",
"main.js": "./static/js/main.18bc685c.chunk.js",
"main.js.map": "./static/js/main.18bc685c.chunk.js.map",
"runtime-main.js": "./static/js/runtime-main.0b37ba43.js",
"runtime-main.js.map": "./static/js/runtime-main.0b37ba43.js.map",
"static/css/2.c04f2d9d.chunk.css": "./static/css/2.c04f2d9d.chunk.css",
Expand All @@ -18,6 +18,6 @@
"static/css/2.c04f2d9d.chunk.css",
"static/js/2.b3a8d548.chunk.js",
"static/css/main.c9480e85.chunk.css",
"static/js/main.9a5704e2.chunk.js"
"static/js/main.18bc685c.chunk.js"
]
}
2 changes: 1 addition & 1 deletion admin/index_m.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="./manifest.json"/><script type="text/javascript" src="./../../lib/js/socket.io.js"></script><title>s7</title><link href="./static/css/2.c04f2d9d.chunk.css" rel="stylesheet"><link href="./static/css/main.c9480e85.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,i,l=r[0],a=r[1],f=r[2],c=0,s=[];c<l.length;c++)i=l[c],Object.prototype.hasOwnProperty.call(o,i)&&o[i]&&s.push(o[i][0]),o[i]=0;for(n in a)Object.prototype.hasOwnProperty.call(a,n)&&(e[n]=a[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,f||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var a=t[l];0!==o[a]&&(n=!1)}n&&(u.splice(r--,1),e=i(i.s=t[0]))}return e}var n={},o={1:0},u=[];function i(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,i),t.l=!0,t.exports}i.m=e,i.c=n,i.d=function(e,r,t){i.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,r){if(1&r&&(e=i(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(i.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)i.d(t,n,function(r){return e[r]}.bind(null,n));return t},i.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(r,"a",r),r},i.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},i.p="./";var l=this["webpackJsonpmodebus-admin"]=this["webpackJsonpmodebus-admin"]||[],a=l.push.bind(l);l.push=r,l=l.slice();for(var f=0;f<l.length;f++)r(l[f]);var p=a;t()}([])</script><script src="./static/js/2.b3a8d548.chunk.js"></script><script src="./static/js/main.9a5704e2.chunk.js"></script></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="./manifest.json"/><script type="text/javascript" src="./../../lib/js/socket.io.js"></script><title>s7</title><link href="./static/css/2.c04f2d9d.chunk.css" rel="stylesheet"><link href="./static/css/main.c9480e85.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,i,l=r[0],a=r[1],f=r[2],c=0,s=[];c<l.length;c++)i=l[c],Object.prototype.hasOwnProperty.call(o,i)&&o[i]&&s.push(o[i][0]),o[i]=0;for(n in a)Object.prototype.hasOwnProperty.call(a,n)&&(e[n]=a[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,f||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var a=t[l];0!==o[a]&&(n=!1)}n&&(u.splice(r--,1),e=i(i.s=t[0]))}return e}var n={},o={1:0},u=[];function i(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,i),t.l=!0,t.exports}i.m=e,i.c=n,i.d=function(e,r,t){i.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,r){if(1&r&&(e=i(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(i.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)i.d(t,n,function(r){return e[r]}.bind(null,n));return t},i.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(r,"a",r),r},i.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},i.p="./";var l=this["webpackJsonpmodebus-admin"]=this["webpackJsonpmodebus-admin"]||[],a=l.push.bind(l);l.push=r,l=l.slice();for(var f=0;f<l.length;f++)r(l[f]);var p=a;t()}([])</script><script src="./static/js/2.b3a8d548.chunk.js"></script><script src="./static/js/main.18bc685c.chunk.js"></script></body></html>
2 changes: 2 additions & 0 deletions admin/static/js/main.18bc685c.chunk.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion admin/static/js/main.9a5704e2.chunk.js.map → admin/static/js/main.18bc685c.chunk.js.map
View file

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions admin/static/js/main.9a5704e2.chunk.js
View file

This file was deleted.

28 changes: 15 additions & 13 deletions io-package.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
{
"common": {
"name": "s7",
"version": "1.3.0",
"version": "1.3.1",
"news": {
"1.3.1": {
"en": "Corrected the type of states",
"de": "Die Art der Zustände wurde korrigiert",
"ru": "Исправлен тип состояний",
"pt": "Corrigido o tipo de estado",
"nl": "Het type toestanden gecorrigeerd",
"fr": "Correction du type d'états",
"it": "Corretto il tipo di stati",
"es": "Corregido el tipo de estados",
"pl": "Poprawiono rodzaj stanów",
"zh-cn": "更正了状态类型"
},
"1.3.0": {
"en": "New configuration page on react",
"de": "Neue Konfigurationsseite auf React",
Expand Down Expand Up @@ -230,18 +242,6 @@
"es": "El error de la importación de la base de datos se solucionó",
"pl": "Naprawiono błąd importu bazy danych",
"zh-cn": "数据库导入错误已修复"
},
"1.0.4": {
"en": "Reading of DB (range error) fixed",
"de": "Lesen von DB (range error) behobent",
"ru": "чтение DB (ошибка диапазона) исправлено",
"pt": "Leitura de DB (erro de alcance) corrigido",
"nl": "Lezen van DB (bereikfout) opgelost",
"fr": "Correction de la lecture du DB (erreur de plage)",
"it": "Lettura del DB (errore di range) corretta",
"es": "Lectura de DB (error de rango) fijo",
"pl": "Poprawiono odczyt DB (błąd zakresu)",
"zh-cn": "读取数据库（范围错误）的问题已修复"
}
},
"title": "Siemens Simatic S7",
Expand Down Expand Up @@ -286,6 +286,8 @@
"adminUI": {
"config": "materialize"
},
"connectionType": "local",
"dataSource": "poll",
"compact": true,
"plugins": {
"sentry": {
Expand Down
11 changes: 7 additions & 4 deletions main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,7 @@ const convertS7type = {
DWORD: 'number',
INT: 'number',
DINT: 'number',
REAL: 'number',
STRING: 'string',
S7STRING: 'string',
S5TIME: 'number',
Expand Down Expand Up @@ -813,7 +814,7 @@ const main = {
common: {
name: main.ac.inputs[i].Description,
role: main.ac.inputs[i].Role,
type: convertS7type[main.ac.inputs[i].Type],
type: convertS7type[main.ac.inputs[i].Type] || 'number',
unit: main.ac.inputs[i].Unit || ((main.ac.inputs[i].Type === 'S5TIME') ? 's' : main.ac.inputs[i].Unit),
read: true,
write: main.ac.inputs[i].RW
Expand All @@ -833,7 +834,9 @@ const main = {

main.newObjects.push(`${adapter.namespace}.${main.ac.inputs[i].id}`);
}

channels = [];

for (i = 0; main.ac.outputs.length > i; i++) {
const name = 'Outputs.' + main.ac.outputs[i].offsetByte;
if (!channels.includes(name)) {
Expand All @@ -852,7 +855,7 @@ const main = {
common: {
name: main.ac.outputs[i].Description,
role: main.ac.outputs[i].Role,
type: convertS7type[main.ac.outputs[i].Type],
type: convertS7type[main.ac.outputs[i].Type] || 'number',
unit: main.ac.outputs[i].Unit || ((main.ac.outputs[i].Type === 'S5TIME') ? 's' : main.ac.outputs[i].Unit),
read: true,
write: main.ac.outputs[i].RW
Expand Down Expand Up @@ -891,7 +894,7 @@ const main = {
common: {
name: main.ac.markers[i].Description,
role: main.ac.markers[i].Role,
type: convertS7type[main.ac.markers[i].Type],
type: convertS7type[main.ac.markers[i].Type] || 'number',
unit: main.ac.markers[i].Unit || ((main.ac.markers[i].Type === 'S5TIME') ? 's' : main.ac.markers[i].Unit),
read: true,
write: main.ac.markers[i].RW
Expand Down Expand Up @@ -933,7 +936,7 @@ const main = {
common: {
name: main.ac.dbs[i].Description,
role: main.ac.dbs[i].Role,
type: convertS7type[main.ac.dbs[i].Type],
type: convertS7type[main.ac.dbs[i].Type] || 'number',
unit: main.ac.dbs[i].Unit || ((main.ac.dbs[i].Type === 'S5TIME') ? 's' : main.ac.dbs[i].Unit),
read: true,
write: main.ac.dbs[i].RW
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "iobroker.s7",
"version": "1.3.0",
"version": "1.3.1",
"description": "Siemens S7 over Snap7",
"author": {
"name": "smiling_Jack",
Expand Down
6 changes: 3 additions & 3 deletions src/build/asset-manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"files": {
"main.css": "./static/css/main.c9480e85.chunk.css",
"main.js": "./static/js/main.9a5704e2.chunk.js",
"main.js.map": "./static/js/main.9a5704e2.chunk.js.map",
"main.js": "./static/js/main.18bc685c.chunk.js",
"main.js.map": "./static/js/main.18bc685c.chunk.js.map",
"runtime-main.js": "./static/js/runtime-main.0b37ba43.js",
"runtime-main.js.map": "./static/js/runtime-main.0b37ba43.js.map",
"static/css/2.c04f2d9d.chunk.css": "./static/css/2.c04f2d9d.chunk.css",
Expand All @@ -18,6 +18,6 @@
"static/css/2.c04f2d9d.chunk.css",
"static/js/2.b3a8d548.chunk.js",
"static/css/main.c9480e85.chunk.css",
"static/js/main.9a5704e2.chunk.js"
"static/js/main.18bc685c.chunk.js"
]
}
2 changes: 1 addition & 1 deletion src/build/index.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="./manifest.json"/><script type="text/javascript" src="./../../lib/js/socket.io.js"></script><title>s7</title><link href="./static/css/2.c04f2d9d.chunk.css" rel="stylesheet"><link href="./static/css/main.c9480e85.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,i,l=r[0],a=r[1],f=r[2],c=0,s=[];c<l.length;c++)i=l[c],Object.prototype.hasOwnProperty.call(o,i)&&o[i]&&s.push(o[i][0]),o[i]=0;for(n in a)Object.prototype.hasOwnProperty.call(a,n)&&(e[n]=a[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,f||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var a=t[l];0!==o[a]&&(n=!1)}n&&(u.splice(r--,1),e=i(i.s=t[0]))}return e}var n={},o={1:0},u=[];function i(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,i),t.l=!0,t.exports}i.m=e,i.c=n,i.d=function(e,r,t){i.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,r){if(1&r&&(e=i(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(i.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)i.d(t,n,function(r){return e[r]}.bind(null,n));return t},i.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(r,"a",r),r},i.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},i.p="./";var l=this["webpackJsonpmodebus-admin"]=this["webpackJsonpmodebus-admin"]||[],a=l.push.bind(l);l.push=r,l=l.slice();for(var f=0;f<l.length;f++)r(l[f]);var p=a;t()}([])</script><script src="./static/js/2.b3a8d548.chunk.js"></script><script src="./static/js/main.9a5704e2.chunk.js"></script></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="./manifest.json"/><script type="text/javascript" src="./../../lib/js/socket.io.js"></script><title>s7</title><link href="./static/css/2.c04f2d9d.chunk.css" rel="stylesheet"><link href="./static/css/main.c9480e85.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,i,l=r[0],a=r[1],f=r[2],c=0,s=[];c<l.length;c++)i=l[c],Object.prototype.hasOwnProperty.call(o,i)&&o[i]&&s.push(o[i][0]),o[i]=0;for(n in a)Object.prototype.hasOwnProperty.call(a,n)&&(e[n]=a[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,f||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var a=t[l];0!==o[a]&&(n=!1)}n&&(u.splice(r--,1),e=i(i.s=t[0]))}return e}var n={},o={1:0},u=[];function i(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,i),t.l=!0,t.exports}i.m=e,i.c=n,i.d=function(e,r,t){i.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,r){if(1&r&&(e=i(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(i.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)i.d(t,n,function(r){return e[r]}.bind(null,n));return t},i.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(r,"a",r),r},i.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},i.p="./";var l=this["webpackJsonpmodebus-admin"]=this["webpackJsonpmodebus-admin"]||[],a=l.push.bind(l);l.push=r,l=l.slice();for(var f=0;f<l.length;f++)r(l[f]);var p=a;t()}([])</script><script src="./static/js/2.b3a8d548.chunk.js"></script><script src="./static/js/main.18bc685c.chunk.js"></script></body></html>
2 changes: 2 additions & 0 deletions src/build/static/js/main.18bc685c.chunk.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...uild/static/js/main.9a5704e2.chunk.js.map → ...uild/static/js/main.18bc685c.chunk.js.map
View file

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions src/build/static/js/main.9a5704e2.chunk.js
View file

This file was deleted.

2 changes: 1 addition & 1 deletion src/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "modebus-admin",
"version": "1.3.0",
"version": "1.3.1",
"private": true,
"dependencies": {
"@iobroker/adapter-react": "^1.6.28",
Expand Down
1 change: 0 additions & 1 deletion src/src/data/types.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
{"value": "S7STRING", "title": "S7STRING"},
{"value": "STRING", "title": "STRING"},
{"value": "ARRAY", "title": "ARRAY"},
{"value": "REAL", "title": "REAL"},
{"value": "S5TIME", "title": "S5TIME"},
{"value": "S7TIME", "title": "S7TIME"}
]

0 comments on commit ce5e84b

Please sign in to comment.