-
Notifications
You must be signed in to change notification settings - Fork 145
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
Start dimmer experiments #441
Draft
FabianSperrle
wants to merge
3
commits into
rancilio-pid:master
Choose a base branch
from
FabianSperrle:dimmer-pump-control
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| #pragma once | ||
|
|
||
| // used to debounce the interrupts | ||
| unsigned long lastZCInterrupt = 0; | ||
| int currentPowerLevel = 0; | ||
| int power = 0; | ||
|
|
||
| /** | ||
| * When starting a new shot, we have to reset the counter to clear any values left over from the last shot. | ||
| */ | ||
| void resetDimmerCounter() { | ||
| currentPowerLevel = 0; | ||
| } | ||
|
|
||
| /** | ||
| * Power must be set as a percentage (i.e. between 0 and 100, inclusive). | ||
| */ | ||
| void setPower(int newPower) { | ||
| // Illeagal value range, turn pump off to be on the safe side. | ||
| if (newPower < 0 || newPower > 100) { | ||
| power = 0; | ||
| return; | ||
| } | ||
| debugPrintf("Setting new power %d\n", newPower); | ||
| power = newPower; | ||
| } | ||
|
|
||
| /* | ||
| Idea: each time we get a ZC interrupt after a full sine wave, we increment the currentPowerLevel by the set power percentage. | ||
| If we have reached 100%, we turn on the pump. | ||
| This method should provide even distribution of "on" and "off" cycles without having to implement arrays or similar to keep track of previous on/off phases. | ||
| */ | ||
| void handleZC() { | ||
| unsigned long time = millis(); | ||
| if (time - lastZCInterrupt < 15) { | ||
| return; | ||
| } | ||
| lastZCInterrupt = time; | ||
|
|
||
| // increment power level by the set power level | ||
| currentPowerLevel += power; | ||
|
|
||
| // if the power level has reached 100, we turn the pump on | ||
| if (currentPowerLevel >= 100) { | ||
| digitalWrite(PIN_PUMP, HIGH); | ||
| // Decrease power level by 100 to be ready for the next increments | ||
| currentPowerLevel -= 100; | ||
| } | ||
| // Power level is not yet 100 --> we wait for it to increase further and keep the pump off. | ||
| else { | ||
| digitalWrite(PIN_PUMP, LOW); | ||
| } | ||
| } | ||
|
|
||
| void setupDimmer() { | ||
| pinMode(PIN_ZC, INPUT_PULLUP); | ||
| attachInterrupt(digitalPinToInterrupt(PIN_ZC), handleZC, RISING); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Integrated 2 new Brewmodes for Dimmer including and excluding scale. During brew pressure PID is calculating and giving the power
#if (BREWMODE == 3) // old Brew MODE
/**
@brief PreInfusion, Brew Normal
*/
void brew() {
if (OnlyPID == 0) {
checkbrewswitch();
unsigned long currentMillistemp = millis();
}
}
#endif
#if (BREWMODE == 4)
/**
@brief Scale brew mode
*/
void brew() {
if (OnlyPID == 0) {
checkbrewswitch();
unsigned long currentMillistemp = millis();
}
}