beremiz

Merge remote-tracking branch 'origin/python3' into python3

18 months ago, Edouard Tisserant
03ed01134858
Parents 69114ac20de886ad03993ae9
Children 5a1593e271710f5a69ab57a1
Merge remote-tracking branch 'origin/python3' into python3
2 files changed, 10 insertions(+), 5 deletions(-)
  • +1 -1
    .github/workflows/run_tests_in_docker.yml
  • +9 -4
    README.md
    • --- 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:
    +Beremiz provides:
    -* 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.
    +* 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](http://www.beremiz.org/) for more information.
    +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 ##