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

Fix compile error #16470

Merged
merged 32 commits into from
Jan 5, 2020
Merged

Fix compile error #16470

Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
6fa4ff6
Merge pull request #1 from MarlinFirmware/bugfix-2.0.x
Vertabreak Dec 20, 2019
be1a433
Merge pull request #2 from MarlinFirmware/bugfix-2.0.x
Vertabreak Dec 21, 2019
bfc5857
Merge pull request #3 from MarlinFirmware/bugfix-2.0.x
Vertabreak Dec 22, 2019
60f061d
Merge pull request #5 from MarlinFirmware/bugfix-2.0.x
Vertabreak Dec 23, 2019
5e1fa08
Merge pull request #7 from MarlinFirmware/bugfix-2.0.x
Vertabreak Dec 24, 2019
cd4f893
Merge pull request #9 from MarlinFirmware/bugfix-2.0.x
Vertabreak Dec 24, 2019
3e34601
Merge pull request #11 from MarlinFirmware/bugfix-2.0.x
Vertabreak Dec 25, 2019
f4eaf0b
Merge pull request #13 from MarlinFirmware/bugfix-2.0.x
Vertabreak Dec 26, 2019
21e7829
Merge pull request #15 from MarlinFirmware/bugfix-2.0.x
Vertabreak Dec 29, 2019
fc43211
Merge pull request #18 from MarlinFirmware/bugfix-2.0.x
Vertabreak Dec 31, 2019
8bc1879
Merge pull request #21 from MarlinFirmware/bugfix-2.0.x
Vertabreak Jan 3, 2020
4fcb5f3
Merge pull request #22 from MarlinFirmware/bugfix-2.0.x
Vertabreak Jan 4, 2020
b291f28
Action to check PRs
thinkyhead Dec 21, 2019
3502c10
Update maintainer funding links
thinkyhead Jan 3, 2020
f05e01b
Merge pull request #24 from MarlinFirmware/bugfix-2.0.x
Vertabreak Jan 5, 2020
016e891
Actions to check and label PRs
thinkyhead Dec 21, 2019
e2fee29
Update maintainer funding links
thinkyhead Jan 3, 2020
cecfcd2
Skip build tests on forks
thinkyhead Jan 5, 2020
cc21466
Update git helper usage
thinkyhead Jan 5, 2020
63f8acc
Fix EEPROM error with EXTRUDERS == 0 (#16464)
vector76 Jan 5, 2020
0c6934a
Add files via upload
Vertabreak Jan 5, 2020
4a0fc2b
Add files via upload
Vertabreak Jan 5, 2020
be8addd
Delete check-pr.yml
Vertabreak Jan 5, 2020
b816101
Merge pull request #30 from MarlinFirmware/bugfix-2.0.x
Vertabreak Jan 5, 2020
6a1a2d4
Fix M115 cap with EXTRUDERS == 0 (#16459)
vector76 Jan 5, 2020
f6c0424
Merge pull request #31 from MarlinFirmware/bugfix-2.0.x
Vertabreak Jan 5, 2020
df7ed34
Merge pull request #33 from MarlinFirmware/bugfix-2.0.x
Vertabreak Jan 5, 2020
714b459
Merge pull request #34 from MarlinFirmware/bugfix-2.0.x
Vertabreak Jan 5, 2020
159b667
Merge pull request #36 from MarlinFirmware/bugfix-2.0.x
Vertabreak Jan 5, 2020
c2edc79
fix compile error
Vertabreak Jan 5, 2020
d4eb5af
Delete labeler.yml
Vertabreak Jan 5, 2020
6471b74
Delete label-pr.yml
Vertabreak Jan 5, 2020
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
4 changes: 2 additions & 2 deletions Marlin/src/module/configuration_store.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1145,7 +1145,7 @@ void MarlinSettings::postprocess() {
EEPROM_WRITE(planner.extruder_advance_K);
#else
dummy = 0;
for (uint8_t q = MIN(EXTRUDERS, 1); q--;) EEPROM_WRITE(dummy);
for (uint8_t q = _MIN(EXTRUDERS, 1); q--;) EEPROM_WRITE(dummy);
#endif
}

Expand Down Expand Up @@ -1934,7 +1934,7 @@ void MarlinSettings::postprocess() {
// Linear Advance
//
{
float extruder_advance_K[MIN(EXTRUDERS, 1)];
float extruder_advance_K[_MIN(EXTRUDERS, 1)];
_FIELD_TEST(planner_extruder_advance_K);
EEPROM_READ(extruder_advance_K);
#if ENABLED(LIN_ADVANCE)
Expand Down