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

Made changes to enable high power output #5

Draft
wants to merge 14 commits into
base: master
Choose a base branch
from
Draft

Made changes to enable high power output #5

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e4732b0
Add "high power" setting
Jan 20, 2021
b5ed3de
Add High Power menu item
Jan 20, 2021
b96ebd8
Update power output bar for RTU
Jan 20, 2021
12af161
Add Tip Type and allow for variable max power
Jan 20, 2021
b4c83aa
Merge pull request #2 from swissfreek/swissfreek-high-power
Jan 23, 2021
e8df2f3
Merge pull request #3 from swissfreek/swissfreek-high-power-menu
Jan 23, 2021
013b607
Merge pull request #4 from swissfreek/swissfreek-high-power-bar
Jan 23, 2021
11c9108
Merge pull request #5 from swissfreek/swissfreek-variable-max-power
Jan 23, 2021
c292649
Revert "Update power output bar for RTU"
Jan 23, 2021
2c8cdbe
Update main.hpp
Jan 23, 2021
def71f5
Update main.hpp
Jan 23, 2021
f819793
Update heating.hpp
Jan 23, 2021
0459449
Merge branch 'master' into revert-4-swissfreek-high-power-bar
Jan 23, 2021
f023445
Merge pull request #6 from swissfreek/revert-4-swissfreek-high-power-bar
Jan 23, 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
7 changes: 6 additions & 1 deletion src/screen/main.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,12 @@ class Main : public Screen {
if (_preset.is_standby()) return;

int power = _heating.get_power_mw();
int len = power * 15 / 40000;
int len = power * 15 / 40000; // default for 40W power limit

/* account for 150W power limit of RTU tips */
if (_heating.getTipType() == Heating::TipType::TRU) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TRU - RTU ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this was a typo. I fixed it in my code, but couldn't figure out how to correct it in here. That's why I was opening and closing the pull requests... 🤦🏻‍♂️

len = power * 15 / 150000;
}

if (len == 0 && power > 0) len = 1;
if (len > 15) len = 15;
Expand Down