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

Feature/fix flowmeter calculations #21959

Merged
merged 8 commits into from
May 24, 2021
Merged

Feature/fix flowmeter calculations #21959

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6e27c44
Include configuration options for Nikon IR
gjdodd Jan 12, 2020
dbc0539
Include correct define
gjdodd Jan 12, 2020
3fa9d74
update naming of define
gjdodd Jan 12, 2020
5496527
Cleanup and style
thinkyhead Jan 13, 2020
d5de0c7
Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marl…
gjdodd Jan 30, 2020
02abc7e
Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marl…
gjdodd Apr 25, 2021
4d55694
Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marl…
gjdodd May 21, 2021
de37b2a
fix calculation issue with litres per minute
gjdodd May 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions Marlin/src/feature/cooler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,8 @@ class Cooler {

// Get the total flow (in liters per minute) since the last reading
static void calc_flowrate() {
//flowmeter_interrupt_disable();
// const uint16_t pulses = flowpulses;
//flowmeter_interrupt_enable();
flowrate = flowpulses * 60.0f * (1000.0f / (FLOWMETER_INTERVAL)) * (1000.0f / (FLOWMETER_PPL));
// flowrate = (litres) * (seconds) = litres per minute
flowrate = (flowpulses / (float)FLOWMETER_PPL) * ((1000.0f / (float)FLOWMETER_INTERVAL) * 60.0f);
flowpulses = 0;
}

Expand Down