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.

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

Development #77

Merged
merged 66 commits into from
Dec 10, 2022
Merged

Development #77

merged 66 commits into from
Dec 10, 2022

Commits on Jun 7, 2022

  1. Set Power to Zero if Switched Off

    Set power to Zero if the actor is switched off.
    chappo authored Jun 7, 2022
    Configuration menu
    Copy the full SHA
    55db17e View commit details
    Browse the repository at this point in the history
  2. Set power to Zero if the actor is switched off.

    Set power to Zero if the actor is switched off.
    chappo authored Jun 7, 2022
    Configuration menu
    Copy the full SHA
    a4f1de3 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2022

  1. Merge pull request #53 from phylax2020/master

    Missing string conversion of value in log_data function.
    avollkopf authored Jul 10, 2022
    Configuration menu
    Copy the full SHA
    82e2c1b View commit details
    Browse the repository at this point in the history
  2. Merge pull request #52 from chappo/master

    Set MQTT Actor Power Level to Zero if Switched Off
    avollkopf authored Jul 10, 2022
    Configuration menu
    Copy the full SHA
    459c420 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2022

  1. Update minor version

    avollkopf committed Jul 16, 2022
    Configuration menu
    Copy the full SHA
    4d85c4c View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2022

  1. Configuration menu
    Copy the full SHA
    c85b929 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5ea4160 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    313f9d4 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    752d9a2 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    ff0ba76 View commit details
    Browse the repository at this point in the history
  6. Merge branch 'master' of https://github.com/phylax2020/craftbeerpi4

    # Conflicts:
    #	cbpi/controller/log_file_controller.py
    phylax2020 committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    4101818 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    1619012 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #57 from phylax2020/master

    log_file_controller.py and __init__.py in ConfigUpdate reloaded
    avollkopf authored Jul 19, 2022
    Configuration menu
    Copy the full SHA
    205389f View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2022

  1. Configuration menu
    Copy the full SHA
    c0997ff View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2022

  1. Merge pull request #58 from phylax2020/master

    Add parameter in settings to slow down pipe animation in dashboard
    avollkopf authored Aug 7, 2022
    Configuration menu
    Copy the full SHA
    635ea36 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2022

  1. Configuration menu
    Copy the full SHA
    c7d01c3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9c6ede1 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2022

  1. actor update api for WS

    avollkopf committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    ac3c880 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2022

  1. extends cbpi-dev-config to be a complete set.

    cbpi requires empty folders inside the config folder to fully function, and this commit adds them.
    There are also some more extensive checks on missing files and folders newly implemented.
    As well as checking for restored_config.zip is now done before checking for config.yaml.
    On unsuccessfull restore the zip file is renamed instead of deleted.
    prash3r committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    2f08596 View commit details
    Browse the repository at this point in the history
  2. imports the whirlpool hop addition kbh with timer

    previously the whirlpool step has been ignored when importing from a kbh database.
    on creation the whirlpoolstep would only be on a hardcoded 15 minute timer.
    I added the optional timer as argument to create_Whirlpool_Cooldown().
    And made use of it for negative hops timer imported from KBH.
    For KBH databases this is valid because if the hops timer value is negative it can only be the whirlpool timer
    and the value is the time that is set for the brewing device for getting from boil to below 80°C.
    I did only test the data and not the functionality,
    but it sucessfully replaces the hardcoded "15" timer with the value
    from the first whirlpool hop addition while getting rid of the sign.
    prash3r committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    76b11a7 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2022

  1. uploaded restored_config.zip is now placed in provided config folder …

    …and not the working directory where it will be ignored on restart
    prash3r committed Sep 3, 2022
    Configuration menu
    Copy the full SHA
    2076c66 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2022

  1. extends #62

    reorders the .vscode tasks so run is the default hopefully.
    removes code that was commented out anyway.
    prash3r committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    e61fbdb View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2022

  1. Merge branch 'dev-config-changes' of github.com:prash3r/craftbeerpi4 …

    …into dev-config-changes
    prash3r committed Sep 9, 2022
    Configuration menu
    Copy the full SHA
    b5ca644 View commit details
    Browse the repository at this point in the history
  2. logs folder is next to the active config folder.

    It was wherever 'cbpi setup' was run from.
    and if no config folder path is provided its still the same.
    This also adds a file based global logger placed in the logs folder.
    The sensor loggers respect the new logs folder location.
    prash3r committed Sep 9, 2022
    Configuration menu
    Copy the full SHA
    4952861 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2022

  1. Configuration menu
    Copy the full SHA
    c56d7cc View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2022

  1. adds journalctl arg '--output cat' (log exports),

    because cbpi already writes timestamps into the logs
    and we dont need two timestamps when exporting.
    This commit also reverts to using the same formatter for all logHandlers.
    prash3r committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    f924e1a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cfc876f View commit details
    Browse the repository at this point in the history
  3. keeps default dev config unchanged.

    this commit moves the default config into a seperate folder.
    And it adds a preLaunchTask
    which copies the default dev config to the used dev config.
    This is done with the cp option '-ru'
    so if the files in the target dir (current config)
    are newer they are not overwritten.
    prash3r committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    706bbac View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ac9b599 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2022

  1. adds the 'cbpi create' command to vscode.

    also initilizes plugin names with dashes instead of underscores.
    everything now runs as root inside the dev container
    (otherwise the permissions for cbpi create wouldnt be sufficient).
    prash3r committed Sep 16, 2022
    Configuration menu
    Copy the full SHA
    1fa3f88 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6bf1b14 View commit details
    Browse the repository at this point in the history
  3. corrected some more places where ./logs was used

    instead of the dynamically given logs path.
    prash3r committed Sep 16, 2022
    Configuration menu
    Copy the full SHA
    fea1ba0 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2022

  1. additional requirements.txt for devcontainer only

    inside the dev container default config there now is a
    'additional-dev-requirements.txt' file that allows us to
    ship additional python packages requirements
    with a default development config.
    prash3r committed Sep 24, 2022
    Configuration menu
    Copy the full SHA
    e0d809c View commit details
    Browse the repository at this point in the history
  2. repairs log_file_controller.py.

    I seem to have exidentally search and replaced some
    needed glob.glob calls when adding dinamic log location,
    which should now be repaired.
    There also was a mysterious cbpi_dashboard_1.json appearing
    in the wrong folder which now inside the dashboard folder.
    I also figured out how to run tests locally,
    they should now respect the dynamic folder paths.
    prash3r committed Sep 24, 2022
    Configuration menu
    Copy the full SHA
    e7aa0a6 View commit details
    Browse the repository at this point in the history
  3. repairs plugin creation inside the devcontainer

    strange windows volume behaviour needs a small delay
    between template folder unzip and rename.
    reverts user changes of the dev container
    which werent the cause of this problem.
    prash3r committed Sep 24, 2022
    Configuration menu
    Copy the full SHA
    50fa87d View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2022

  1. add hop text

    lopelex committed Sep 28, 2022
    Configuration menu
    Copy the full SHA
    2bc5bbb View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2022

  1. Configuration menu
    Copy the full SHA
    d1c38af View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2022

  1. remove unused import

    lopelex authored Sep 30, 2022
    Configuration menu
    Copy the full SHA
    89da0be View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2022

  1. Merge pull request #62 from prash3r/dev-config-changes

    changes to cbpi-dev-config, logs and the devcontainer.
    avollkopf authored Oct 2, 2022
    Configuration menu
    Copy the full SHA
    781f68d View commit details
    Browse the repository at this point in the history
  2. Merge pull request #63 from prash3r/kbh-whirlpool-step

    imports the whirlpool hop addition kbh with timer
    avollkopf authored Oct 2, 2022
    Configuration menu
    Copy the full SHA
    24ae034 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #65 from prash3r/notify-log-events

    notify clients on log events worse than INFO
    avollkopf authored Oct 2, 2022
    Configuration menu
    Copy the full SHA
    8c8d09e View commit details
    Browse the repository at this point in the history
  4. moves cbpi_dashboard_*.json to dashboard folder.

    if the file cbpi_dashboard_1.json doesnt exist in the dashboard folder
    every cbpi_dashboard_*.json file from the config folder is moved to the dashboard folder.
    This also removes the empty default cbpi_dashboard_1.json file from the template folder,
    because the file is not needed for cbpi to function and can be created when editing the dashboard online.
    prash3r committed Oct 2, 2022
    Configuration menu
    Copy the full SHA
    2a0daf3 View commit details
    Browse the repository at this point in the history
  5. not copying empty cbpi_dashboard_1.json anymore.

    will be created on first dashboard save instead.
    prash3r committed Oct 2, 2022
    Configuration menu
    Copy the full SHA
    7f16a8b View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2022

  1. Merge pull request #69 from prash3r/move-dashboard-files

    moves cbpi_dashboard_*.json to subfolder dashboard.
    avollkopf authored Oct 3, 2022
    Configuration menu
    Copy the full SHA
    7c87a2b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cb60b6d View commit details
    Browse the repository at this point in the history
  3. Merge pull request #68 from lopelex/hop_text

    add hop name to BoilStep and UploadController
    avollkopf authored Oct 3, 2022
    Configuration menu
    Copy the full SHA
    6e1f1fa View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    92ddb2a View commit details
    Browse the repository at this point in the history
  5. Merge pull request #70 from avollkopf/revert-68-hop_text

    Revert "add hop name to BoilStep and UploadController"
    avollkopf authored Oct 3, 2022
    Configuration menu
    Copy the full SHA
    7021131 View commit details
    Browse the repository at this point in the history
  6. update version number

    avollkopf committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    21ce9ed View commit details
    Browse the repository at this point in the history
  7. fix conflicts with #62

    lopelex committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    2ebc659 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2022

  1. Merge pull request #71 from lopelex/hop_text

    add hop name to BoilStep and UploadController
    avollkopf authored Oct 22, 2022
    Configuration menu
    Copy the full SHA
    f13c8de View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0b0ee24 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #74 from avollkopf/hop-name-test

    Hop name test
    avollkopf authored Oct 22, 2022
    Configuration menu
    Copy the full SHA
    9a1e457 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    17a2d40 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8b2e0fb View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2022

  1. add hop text

    lopelex committed Nov 5, 2022
    Configuration menu
    Copy the full SHA
    4e234f4 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2022

  1. update requirements

    avollkopf committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    f38697d View commit details
    Browse the repository at this point in the history
  2. bump rev

    avollkopf committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    afeba81 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2022

  1. Merge pull request #75 from lopelex/development

    add hop text
    avollkopf authored Nov 19, 2022
    Configuration menu
    Copy the full SHA
    a9f3bef View commit details
    Browse the repository at this point in the history
  2. bump rev

    avollkopf committed Nov 19, 2022
    Configuration menu
    Copy the full SHA
    f83ee71 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2022

  1. Configuration menu
    Copy the full SHA
    f13993d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    05b70e3 View commit details
    Browse the repository at this point in the history
  3. bump rev

    avollkopf committed Nov 27, 2022
    Configuration menu
    Copy the full SHA
    7e0eb0f View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2022

  1. Configuration menu
    Copy the full SHA
    9f655c9 View commit details
    Browse the repository at this point in the history
  2. fix notify on error

    avollkopf committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    cde20f6 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2022

  1. bump rev from rc to major

    avollkopf committed Dec 10, 2022
    Configuration menu
    Copy the full SHA
    6a356c6 View commit details
    Browse the repository at this point in the history