Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into Release #1069

Merged
merged 99 commits into from
Aug 3, 2023
Merged

Merge master into Release #1069

merged 99 commits into from
Aug 3, 2023

Commits on Jul 3, 2023

  1. Update set-current.sh 

    snaptec/openWB#2752
    @hhoefling
    hhoefling authored Jul 3, 2023
    Configuration menu
    Copy the full SHA
    a14984e View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2023

  1. [Kia/Hyundai] - Hotfix App changes

    @Flock82
    Flock82 authored Jul 4, 2023
    Configuration menu
    Copy the full SHA
    77078fc View commit details
    Browse the repository at this point in the history

  2. [BMW] - Hotfix App changes

    @Flock82
    Flock82 authored Jul 4, 2023
    Configuration menu
    Copy the full SHA
    a1a14c0 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2755 from Flock82/soc_bmw 

    [BMW] - Hotfix App changes
    @benderl
    benderl authored Jul 4, 2023
    Configuration menu
    Copy the full SHA
    22e0faa View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2754 from Flock82/soc_kia 

    [Kia/Hyundai] - Hotfix App changes
    @benderl
    benderl authored Jul 4, 2023
    Configuration menu
    Copy the full SHA
    2c27544 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #2753 from hhoefling/patch-10 

    Update set-current.sh
    @benderl
    benderl authored Jul 4, 2023
    Configuration menu
    Copy the full SHA
    f945869 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. Umschalten auf automatisch um 23:59 

    Für Umschaltung manuell auf automatisch wird das smarthome mqtt cache ausgeschaltet, da auch im Online umgeschaltet werden kann.
    @okaegi
    okaegi committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    52e3b7a View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. Bump semver from 5.7.1 to 5.7.2 in /web/display/yourcharge 

    Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md)
- [Commits](npm/node-semver@v5.7.1...v5.7.2)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot
    dependabot[bot] authored Jul 12, 2023
    Configuration menu
    Copy the full SHA
    6eb4c3c View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2023

  1. Merge pull request #2756 from okaegi/smart190 

    Umschalten auf automatisch um 23:59
    @LKuemmel
    LKuemmel authored Jul 14, 2023
    Configuration menu
    Copy the full SHA
    2606173 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2757 from snaptec/dependabot/npm_and_yarn/web/dis… 

    …play/yourcharge/semver-5.7.2

Bump semver from 5.7.1 to 5.7.2 in /web/display/yourcharge
    @benderl
    benderl authored Jul 14, 2023
    Configuration menu
    Copy the full SHA
    7ec48a9 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

  1. Update version

    @benderl
    benderl authored Jul 17, 2023
    Configuration menu
    Copy the full SHA
    135cb48 View commit details
    Browse the repository at this point in the history

  2. fix b23

    @LKuemmel
    LKuemmel committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    9b36cf9 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. boot done after python start sequence

    @LKuemmel
    LKuemmel committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    b2e292c View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. Merge pull request #1035 from LKuemmel/boot_done 

    boot done after python start sequence
    @LKuemmel
    LKuemmel authored Jul 19, 2023
    Configuration menu
    Copy the full SHA
    86a4732 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1033 from LKuemmel/fix_b23 

    fix b23
    @LKuemmel
    LKuemmel authored Jul 19, 2023
    Configuration menu
    Copy the full SHA
    fc63edb View commit details
    Browse the repository at this point in the history

  3. evu position powerdog

    @LKuemmel
    LKuemmel committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    bac6734 View commit details
    Browse the repository at this point in the history

  4. QCells

    @LKuemmel
    LKuemmel committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    cc472eb View commit details
    Browse the repository at this point in the history

  5. Build UI

    @LKuemmel
    LKuemmel committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    6806372 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1038 from LKuemmel/web 

    Build UI
    @LKuemmel
    LKuemmel authored Jul 19, 2023
    Configuration menu
    Copy the full SHA
    1191f45 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1037 from LKuemmel/qcells 

    QCells
    @LKuemmel
    LKuemmel authored Jul 19, 2023
    Configuration menu
    Copy the full SHA
    3d1ee21 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. fix qcells

    @LKuemmel
    LKuemmel committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    53f8f95 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1039 from LKuemmel/qcells 

    fix qcells
    @LKuemmel
    LKuemmel authored Jul 20, 2023
    Configuration menu
    Copy the full SHA
    a9a56ff View commit details
    Browse the repository at this point in the history

  3. fix qcells

    @LKuemmel
    LKuemmel committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    e1a78bf View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1040 from LKuemmel/qcells 

    fix qcells
    @LKuemmel
    LKuemmel authored Jul 20, 2023
    Configuration menu
    Copy the full SHA
    4f09709 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2023

  1. Huawei smartlogger (#841) 

    * huawei smartlogger per component modbus_id

* Create manual-workflow

* Rename manual-workflow to manual-workflow.yml

* phytest correction

* fix flake8

* flix flake 8

* fix flake8

* fix flake8

* fix flake8

* Delete manual-workflow.yml

---------

Co-authored-by: Sebastian Reinhold <sebastian@k-reinhold.de>
    @sreinhold95
    sreinhold95 and Sebastian Reinhold authored Jul 24, 2023
    Configuration menu
    Copy the full SHA
    efb6585 View commit details
    Browse the repository at this point in the history

  2. fix rct device connection

    Lutz Bender committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    3d66433 View commit details
    Browse the repository at this point in the history

  3. pub bridge data

    @LKuemmel
    LKuemmel committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    7e56768 View commit details
    Browse the repository at this point in the history

  4. improve text

    @LKuemmel
    LKuemmel committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    db0fc57 View commit details
    Browse the repository at this point in the history

  5. text

    @LKuemmel
    LKuemmel committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    23e85ab View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1042 from LKuemmel/web 

    improve text
    @LKuemmel
    LKuemmel authored Jul 24, 2023
    Configuration menu
    Copy the full SHA
    a06c956 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1041 from LKuemmel/fix-cloud 

    pub bridge data
    @LKuemmel
    LKuemmel authored Jul 24, 2023
    Configuration menu
    Copy the full SHA
    8258d14 View commit details
    Browse the repository at this point in the history

  8. build UI

    @LKuemmel
    LKuemmel committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    6411d70 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #1043 from LKuemmel/web 

    build UI
    @LKuemmel
    LKuemmel authored Jul 24, 2023
    Configuration menu
    Copy the full SHA
    628eb1f View commit details
    Browse the repository at this point in the history

  10. Merge pull request #1036 from LKuemmel/powerdog 

    evu position powerdog
    @LKuemmel
    LKuemmel authored Jul 24, 2023
    Configuration menu
    Copy the full SHA
    e6f3b6c View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2023

  1. Merge pull request #2759 from benderl/bugfix 

    fix rct device connection
    @LKuemmel
    LKuemmel authored Jul 25, 2023
    Configuration menu
    Copy the full SHA
    e5d43ce View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'openWB/master' into changes_snaptec_repo

    @LKuemmel
    LKuemmel committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    26f4acf View commit details
    Browse the repository at this point in the history

  3. unique name for bridges

    @LKuemmel
    LKuemmel committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    e5df545 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1045 from LKuemmel/changes_snaptec_repo 

    Changes snaptec repo
    @LKuemmel
    LKuemmel authored Jul 25, 2023
    Configuration menu
    Copy the full SHA
    dcbad66 View commit details
    Browse the repository at this point in the history

  5. Update packages/helpermodules/command.py 

    Co-authored-by: benderl <benderl@users.noreply.github.com>
    @LKuemmel @benderl
    LKuemmel and benderl authored Jul 25, 2023
    Configuration menu
    Copy the full SHA
    dff5d13 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1046 from LKuemmel/fix-cloud 

    unique name for bridges
    @LKuemmel
    LKuemmel authored Jul 25, 2023
    Configuration menu
    Copy the full SHA
    994468d View commit details
    Browse the repository at this point in the history

  7. fix powerdog

    @LKuemmel
    LKuemmel committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    1c64221 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1048 from LKuemmel/powerdog 

    fix powerdog
    @LKuemmel
    LKuemmel authored Jul 25, 2023
    Configuration menu
    Copy the full SHA
    583bf6a View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. Update counter.py 

    Fixed obvious copy-paste bug.
    @andlem74
    andlem74 authored Jul 26, 2023
    Configuration menu
    Copy the full SHA
    8ea574d View commit details
    Browse the repository at this point in the history

  2. draft

    @LKuemmel @benderl
    LKuemmel authored and benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    71ccf37 View commit details
    Browse the repository at this point in the history

  3. draft

    @LKuemmel @benderl
    LKuemmel authored and benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    133dfbc View commit details
    Browse the repository at this point in the history

  4. draft

    @LKuemmel @benderl
    LKuemmel authored and benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    70efb33 View commit details
    Browse the repository at this point in the history

  5. snn cloud

    @LKuemmel @benderl
    LKuemmel authored and benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    b4b48bb View commit details
    Browse the repository at this point in the history

  6. data migration

    @LKuemmel @benderl
    LKuemmel authored and benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    3600775 View commit details
    Browse the repository at this point in the history

  7. fix upload dir permissions

    @benderl
    benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    2f7b3b8 View commit details
    Browse the repository at this point in the history

  8. minor fixes

    @benderl
    benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    695b251 View commit details
    Browse the repository at this point in the history

  9. improve merge, pv values

    @LKuemmel @benderl
    LKuemmel authored and benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    84a68ab View commit details
    Browse the repository at this point in the history

  10. fixes

    @LKuemmel @benderl
    LKuemmel authored and benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    0f522ec View commit details
    Browse the repository at this point in the history

  11. SN

    @LKuemmel @benderl
    LKuemmel authored and benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    e7563ec View commit details
    Browse the repository at this point in the history

  12. fixes

    @LKuemmel @benderl
    LKuemmel authored and benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    4ad66c8 View commit details
    Browse the repository at this point in the history

  13. minor fixes

    @benderl
    benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    e318b6e View commit details
    Browse the repository at this point in the history

  14. use threads

    @LKuemmel @benderl
    LKuemmel authored and benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    cbec993 View commit details
    Browse the repository at this point in the history

  15. split threads

    @LKuemmel @benderl
    LKuemmel authored and benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    0870b64 View commit details
    Browse the repository at this point in the history

  16. fixes

    @benderl
    benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    2265d61 View commit details
    Browse the repository at this point in the history

  17. remove duplicate file handling

    @benderl
    benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    c72d8ef View commit details
    Browse the repository at this point in the history

  18. fixes chargelog

    @LKuemmel @benderl
    LKuemmel authored and benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    697fce4 View commit details
    Browse the repository at this point in the history

  19. typos and charge log fix

    @benderl
    benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    4e4c9c4 View commit details
    Browse the repository at this point in the history

  20. map evs in charge log

    @LKuemmel @benderl
    LKuemmel authored and benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    218314d View commit details
    Browse the repository at this point in the history

  21. fix handling corrupt import data

    @benderl
    benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    838a116 View commit details
    Browse the repository at this point in the history

  22. Merge pull request #1052 from openWB/feature_data_migration 

    Feature data migration
    @benderl
    benderl authored Jul 26, 2023
    Configuration menu
    Copy the full SHA
    f3f7771 View commit details
    Browse the repository at this point in the history

  23. fix naming

    @benderl
    benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    8c911ee View commit details
    Browse the repository at this point in the history

  24. modify import for better readability

    @benderl
    benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    4d72e35 View commit details
    Browse the repository at this point in the history

  25. add one more line to log data

    @benderl
    benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    6c3a491 View commit details
    Browse the repository at this point in the history

  26. removed not used file

    @benderl
    benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    d1eaa64 View commit details
    Browse the repository at this point in the history

  27. add python-dateutil togithub action

    @benderl
    benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    36352e2 View commit details
    Browse the repository at this point in the history

  28. revert import change

    @benderl
    benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    7f0f9a2 View commit details
    Browse the repository at this point in the history

  29. add one dataset to yearly log data

    @benderl
    benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    3a3082d View commit details
    Browse the repository at this point in the history

  30. build settings UI

    @benderl
    benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    6ccfc0f View commit details
    Browse the repository at this point in the history

  31. Merge pull request #1030 from benderl/measurement-log 

    Measurement log
    @benderl
    benderl authored Jul 26, 2023
    Configuration menu
    Copy the full SHA
    0d9781c View commit details
    Browse the repository at this point in the history

  32. fix requirements file

    @benderl
    benderl committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    98cc873 View commit details
    Browse the repository at this point in the history

  33. Merge pull request #1053 from benderl/bugfix 

    fix requirements file
    @benderl
    benderl authored Jul 26, 2023
    Configuration menu
    Copy the full SHA
    4d05709 View commit details
    Browse the repository at this point in the history

  34. Merge pull request #1050 from andlem74/andlem74-patch-1 

    Update counter.py
    @LKuemmel
    LKuemmel authored Jul 26, 2023
    Configuration menu
    Copy the full SHA
    f61429c View commit details
    Browse the repository at this point in the history

  35. fix display standby

    @LKuemmel
    LKuemmel committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    3f44072 View commit details
    Browse the repository at this point in the history

  36. Merge pull request #1054 from LKuemmel/web 

    fix display standby
    @LKuemmel
    LKuemmel authored Jul 26, 2023
    Configuration menu
    Copy the full SHA
    65d893c View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2023

  1. build settings ui

    @benderl
    benderl committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    fc03ad6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1056 from benderl/web 

    build settings ui
    @benderl
    benderl authored Jul 28, 2023
    Configuration menu
    Copy the full SHA
    bb4893c View commit details
    Browse the repository at this point in the history

  3. fix chart link

    @LKuemmel
    LKuemmel committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    73690c7 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1057 from LKuemmel/web 

    fix chart link
    @LKuemmel
    LKuemmel authored Jul 28, 2023
    Configuration menu
    Copy the full SHA
    90b038a View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. setup network

    @benderl
    benderl committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    702d832 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1060 from benderl/web 

    setup network
    @benderl
    benderl authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    a090d50 View commit details
    Browse the repository at this point in the history

  3. Wiki Haudsverbrauchszähler

    @LKuemmel
    LKuemmel committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    5826d46 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1062 from LKuemmel/wiki 

    Wiki Hausverbrauchszähler
    @benderl
    benderl authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    9f69082 View commit details
    Browse the repository at this point in the history

  5. rename wiki pngs

    @LKuemmel
    LKuemmel committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    a44eebf View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1063 from LKuemmel/wiki 

    rename wiki pngs
    @LKuemmel
    LKuemmel authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    3c52657 View commit details
    Browse the repository at this point in the history

  7. fix wiki pages

    @benderl
    benderl committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    44dba2e View commit details
    Browse the repository at this point in the history

  8. fix code

    @benderl
    benderl committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    b1c6d6b View commit details
    Browse the repository at this point in the history

  9. fix wiki picture

    @LKuemmel
    LKuemmel committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    189cc32 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #1065 from LKuemmel/wiki 

    fix wiki picture
    @LKuemmel
    LKuemmel authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    891eff2 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. build UI

    @LKuemmel
    LKuemmel committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    526c6bc View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1067 from LKuemmel/web 

    build UI
    @LKuemmel
    LKuemmel authored Aug 2, 2023
    Configuration menu
    Copy the full SHA
    9fc4802 View commit details
    Browse the repository at this point in the history

  3. fix boot done

    @LKuemmel
    LKuemmel committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    47e93ae View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1064 from benderl/wording 

    Wording
    @LKuemmel
    LKuemmel authored Aug 2, 2023
    Configuration menu
    Copy the full SHA
    4b3ec21 View commit details
    Browse the repository at this point in the history

  5. fix test

    @LKuemmel
    LKuemmel committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    6a3421c View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1068 from LKuemmel/boot_done 

    fix boot done
    @LKuemmel
    LKuemmel authored Aug 2, 2023
    Configuration menu
    Copy the full SHA
    587e4d8 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2023

  1. Update version

    @LKuemmel
    LKuemmel authored Aug 3, 2023
    Configuration menu
    Copy the full SHA
    413557f View commit details
    Browse the repository at this point in the history