Skip to content

Commit

Permalink
Add tooltips
Browse files Browse the repository at this point in the history
  • Loading branch information
GermanBluefox committed Jun 17, 2021
1 parent 4352387 commit 559c850
Show file tree
Hide file tree
Showing 74 changed files with 1,309 additions and 4,961 deletions.
48 changes: 23 additions & 25 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,23 @@

[![NPM](https://nodei.co/npm/iobroker.s7.png?downloads=true)](https://nodei.co/npm/iobroker.s7/)

## English
The Siemens S7 adapter is based on Snap7, with Snap7 when the
S7 adapter is also installed and the actual S7 communication between ioBroker and the S7 is organized via TCP / IP.

## Deutsch
Der Siemens S7 Adapter basiert auf Snap7, wobei Snap7 bei der Erstinstallation des
S7 Adapters mitinstalliert wird und die eigentliche S7-Kommunikation zwischen ioBroker und der S7 über TCP/IP organisiert.

Es ist also notwendig, dass die S7 über eine Ethernet-Schnittstelle verfügt
(in der CPU integriert oder als separater CP) und über TCP/IP mit der Hardware kommunizieren kann, auf der ioBroker läuft.

Es wird vorausgesetzt, dass der Anwender über die notwendigen Kenntnisse zur TCP/IP-Kommunikation verfügt
und in der Lage ist, die S7 mittels Step7 entsprechend zu konfigurieren und zu programmieren.
Der geübte Umgang mit PC und verschiedenen Betriebssystem ist ebenfalls Voraussetzung.
Diese Anforderungen stellen sicherlich keine Herausforderung für jemanden dar,
der die Kommunikation zwischen ioBroker und einer S7 in Erwägung zieht.
It is therefore necessary that the S7 has an Ethernet interface
(integrated in the CPU or as a separate CP) and can communicate via TCP / IP with the hardware on which ioBroker is running.

### Installation
Unter Linux braucht man `make` Umgebung um die binaries zu bauen. Das kann man mit folgendem Kommando installieren:
It is assumed that the user has the necessary knowledge of TCP / IP communication
and is able to configure and program the S7 accordingly using Step7.
Proficient use of a PC and various operating systems is also a prerequisite.
These requirements are certainly not a challenge for someone
who is considering communication between ioBroker and an S7.

```
sudo apt-get update
sudo apt-get install build-essential
```

Unter windows braucht man Visual Studio 2013 (Community Edition ist genug) oder später. Auch Python 2.7 (nicht 3.x) muss installiert werden.
## English
Format of the addresses for Inputs, Outputs or markers is "X.Y", where X is byte offset and Y is the bit offset in the byte.
Format of the addresses for DBs is "DBZ +X.Y", where z is number of DB, like "DB34 +12.0"
Format of the addresses for DBs is `DBZ +X.Y`, where `z` is number of `DB`, like `DB34 +12.0`

### Install
### Installation
On some Linux systems the build essentials must be installed to get this adapter work. You can install it with:

```
Expand All @@ -55,12 +44,20 @@ You can use 4 time offset modes for S7TIME:
## S5TIME
S5 decoded as described here: http://www.plccenter.cn/Siemens_Step7/Format_des_Datentyps_S5TIME_Zeitdauer.htm

## More information
More description could be found [here](https://github.com/ioBroker/ioBroker.s7/blob/master/docs/en/s7.md).

## Deutsch
[German documentation](https://github.com/ioBroker/ioBroker.s7/blob/master/docs/de/s7.md)

<!--
Placeholder for the next version (at the beginning of the line):
### __WORK IN PROGRESS__
-->

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

### 1.2.5 (2021-04-17)
* (Apollon77) Fix pot crash case (Sentry IOBROKER-S7-16)
Expand Down Expand Up @@ -210,10 +207,11 @@ S5 decoded as described here: http://www.plccenter.cn/Siemens_Step7/Format_des_D
* Bugfix start file

## License

The MIT License (MIT)

Copyright (c) 2014-2021 smiling_Jack <[email protected]>, bluefox <[email protected]>
Copyright (c) 2014-2021 bluefox <[email protected]>,

Copyright (c) 2014-2016 smiling_Jack <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
23 changes: 23 additions & 0 deletions admin/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"files": {
"main.css": "./static/css/main.c9480e85.chunk.css",
"main.js": "./static/js/main.27f6d84e.chunk.js",
"main.js.map": "./static/js/main.27f6d84e.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",
"static/js/2.b3a8d548.chunk.js": "./static/js/2.b3a8d548.chunk.js",
"static/js/2.b3a8d548.chunk.js.map": "./static/js/2.b3a8d548.chunk.js.map",
"index.html": "./index.html",
"static/css/2.c04f2d9d.chunk.css.map": "./static/css/2.c04f2d9d.chunk.css.map",
"static/css/main.c9480e85.chunk.css.map": "./static/css/main.c9480e85.chunk.css.map",
"static/js/2.b3a8d548.chunk.js.LICENSE.txt": "./static/js/2.b3a8d548.chunk.js.LICENSE.txt"
},
"entrypoints": [
"static/js/runtime-main.0b37ba43.js",
"static/css/2.c04f2d9d.chunk.css",
"static/js/2.b3a8d548.chunk.js",
"static/css/main.c9480e85.chunk.css",
"static/js/main.27f6d84e.chunk.js"
]
}
Binary file added admin/favicon.ico
Binary file not shown.
57 changes: 0 additions & 57 deletions admin/i18n/de/translations.json

This file was deleted.

57 changes: 0 additions & 57 deletions admin/i18n/en/translations.json

This file was deleted.

57 changes: 0 additions & 57 deletions admin/i18n/es/translations.json

This file was deleted.

57 changes: 0 additions & 57 deletions admin/i18n/fr/translations.json

This file was deleted.

Loading

0 comments on commit 559c850

Please sign in to comment.