Merge remote-tracking branch 'origin/python3' into python3
authorEdouard Tisserant <edouard.tisserant@gmail.com>
Tue, 17 Dec 2024 21:18:40 +0100 (2 months ago)
changeset 4077 03ed01134858
parent 4075 69114ac20de8 (current diff)
parent 4076 86ad03993ae9 (diff)
child 4078 5a1593e27171
child 4086 0f5a69ab57a1
Merge remote-tracking branch 'origin/python3' into python3
--- a/.github/workflows/run_tests_in_docker.yml	Mon Dec 16 11:40:55 2024 +0100
+++ b/.github/workflows/run_tests_in_docker.yml	Tue Dec 17 21:18:40 2024 +0100
@@ -18,7 +18,7 @@
     - uses: actions/checkout@v3
       with:
           repository: beremiz/matiec
-          ref: bc38335298d4faa949ddbefedaa55cccfcf94eda
+          ref: 97d311d9b8aba5339b00bb18bbc16dcdd44d5b20
           path: matiec
 
     - uses: actions/checkout@v3
--- a/README.md	Mon Dec 16 11:40:55 2024 +0100
+++ b/README.md	Tue Dec 17 21:18:40 2024 +0100
@@ -11,12 +11,17 @@
 
 With Beremiz, you conform to standards, avoid vendor lock, and contribute to the better future of Automation. 
 
-Beremiz consists of two components:
-
-* Integrated Development Environment (IDE), Beremiz.py. It is running on user's computer and is used to write/compile/debug PLC programs and control PLC runtime.
-* Reference runtime implementation in python, Beremiz_service.py. It's running on target platform, communicates with I/O and executes PLC program.
-
-See official [Beremiz website](http://www.beremiz.org/) for more information.
+Beremiz provides:
+
+* Integrated Development Environment (IDE). GUI to configure, write, build and debug PLC programs and control PLC runtime.
+* Command Line Interface (CLI). Build PLC and control PLC runtime in a terminal or from a script.
+* Runtimes, running on target platform communicates with I/O and executes PLC program.
+    * Python reference runtime implementation.
+    * C runtime for smaller targets.
+
+See official [Beremiz website](https://beremiz.org/) for more information.
+
+[Beremiz company](https://beremiz.fr/) develops and maintains the Beremiz Free Software project while also providing professional support services.
 
 ## Install latest release ##