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

Jump to bottom

Refactor brew detection and brew handling #512

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open

Refactor brew detection and brew handling #512

wants to merge 21 commits into from

Commits on Oct 22, 2024

  1. remove brewdetection 

    remove brewdetection
works only with brewcontrol
rename isbrewdetected to brewOn
    @LoQue90
    LoQue90 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    31f7264 View commit details
    Browse the repository at this point in the history

  2. adding brewtimer 

    adds brewtimer without controlling pump/valve
    @LoQue90
    LoQue90 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    a405529 View commit details
    Browse the repository at this point in the history

  3. remove more SW Brew detection and cleanup 

    remove more SW brew detection stuff
rename brewtimesoftware to brewPidTime to clarify its function
fix debug log output for disable PID while brew is running
clang formated
    @LoQue90
    LoQue90 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    977a44a View commit details
    Browse the repository at this point in the history

  4. remove Brew PID Time 

    remove brew PID time (former Brew SW Time) because it isn´t used anymore after removing sw brew detection
    @LoQue90
    LoQue90 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    b65409f View commit details
    Browse the repository at this point in the history

  5. fix makros for brew() and brewTimer()

    @LoQue90
    LoQue90 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    99bff94 View commit details
    Browse the repository at this point in the history

  6. clean checkbrewswitch()

    @LoQue90
    LoQue90 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    bdf5ba6 View commit details
    Browse the repository at this point in the history

  7. move shot timer log to brewHandler

    @LoQue90
    LoQue90 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    fa6d900 View commit details
    Browse the repository at this point in the history

  8. add brewOn to brewTimer 

    now with brewControl 0 mashine goes to kBrew when a brew is running
    @LoQue90
    LoQue90 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    7f1706a View commit details
    Browse the repository at this point in the history

  9. remove more optocoupler makro

    @LoQue90
    LoQue90 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    6b1703b View commit details
    Browse the repository at this point in the history

  10. move brewOn from brewswitch to brew()

    @LoQue90
    LoQue90 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    c4c7329 View commit details
    Browse the repository at this point in the history

  11. remove mashine state kShotTimerAfterBrew 

    SHOTTIMERDISPLAYDELAY is now broken, needs to be reworked
    @LoQue90
    LoQue90 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    fd91f6e View commit details
    Browse the repository at this point in the history

  12. rework displayed brewTime 

    if brew is finished, by target or by hand, lastBrewTimeMillis is set from brewtimer() or brew()
displayshottimer() uses lastBrewTimeMillis to show as long as SHOTTIMERDISPLAYDELAY is
same is for standard, minimal template
upright and rotate upright is still broken
remove lastBrewTime
store brew time always in timeBrewed and only reset timeBrewed on the a new brew
brew time in all templates will only be shown when brew is running
add timeBrewed to MQTT
    @LoQue90
    LoQue90 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    0cb44f1 View commit details
    Browse the repository at this point in the history

  13. include backflush if BREWCONTROL == 1

    @LoQue90
    LoQue90 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    cf326e0 View commit details
    Browse the repository at this point in the history

  14. add manual flush as own function 

    take manual flush out of checkbrewswitch
manual flush with own mashineState kManualFlush
manual flush reset standby time and ends standby
remove any brew stuff out of checkbrewswitch()
rename brewState and brewswitchstate
add manualFlush to display templates and shottimer
    @LoQue90
    LoQue90 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    69b98de View commit details
    Browse the repository at this point in the history

  15. fixes after rebase

    @LoQue90
    LoQue90 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    0e7bb98 View commit details
    Browse the repository at this point in the history

  16. rework brew() and backflush() 

    clean up and less states for brew() and backflush()
removed brewOn and used bool brew()
removed manualFlushOn and used bool manualFlush()
move all backflush related stuff into brewHandler
fix includes for brewHandler.h
backflush() is now only called if mashineState is kBackflush
if mashine is in kBackflush brewswitch controls backflush and it is not possible to start a brew
removed boolean, use bool

moved PID and Heater disable into mashine state kBachflush
    @LoQue90
    LoQue90 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    4687343 View commit details
    Browse the repository at this point in the history

  17. bring brewcontrol setting onto website 

    disable PID for backflush with global PID ON/OFF
    @LoQue90
    LoQue90 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    22561c9 View commit details
    Browse the repository at this point in the history

  18. clean up MQTT Brew stuff 

    adding case kInteger to assignMQTTParam() so backflushCycles could be changed thru MQTT
    @LoQue90
    LoQue90 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    3516b53 View commit details
    Browse the repository at this point in the history

  19. don´t start backflush from kSteam 

    if mashine is in any other state then kPidNormal, it should not be possible to switch to states like kBrew, kManualFlush, kBackflush, etc.
    @LoQue90
    LoQue90 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    05a8132 View commit details
    Browse the repository at this point in the history

  20. bring display settings onto the website 

    FEATURE_SHOT_TIMER
SHOT_TIMER_DISPLAY_DELAY
FEATURE_HEATING_LOGO
FEATURE_PID_OFF_LOGO

bump ESPAsyncWebServer:
another change in release structure -> new version -> broke build check
    @LoQue90
    LoQue90 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    f3d1c1f View commit details
    Browse the repository at this point in the history

  21. rework scale shottimer 

    cleanup in main.cpp
adding translations
rename some scale vars to be more precice
do not  show weight in full screen shot timer during manual flush
add weightBrewed to MQTT sensors and HA auto discovery
    @LoQue90
    LoQue90 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    f39a2c9 View commit details
    Browse the repository at this point in the history