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

memory and flash optimizations for 3.12 PR3 #3432

Merged
merged 9 commits into from
Feb 28, 2022
Merged

memory and flash optimizations for 3.12 PR3 #3432

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3ab5708
Remove one call to dtostrf
gudnimg Feb 24, 2022
0e6ff38
Optimise strcpy calls to use strcpy_P
gudnimg Feb 25, 2022
6d98e99
Use sprintf_P for M301 instead of ftostr32
gudnimg Feb 26, 2022
8e85242
Temperature selection is int16_t. Use sprintf for PID start command.
leptun Feb 27, 2022
efde923
Purge ftostr3
gudnimg Feb 27, 2022
bb56c35
Optimise PINDA cal status Serial print
leptun Feb 27, 2022
af36f65
Optimise a few uses of SERIAL_PROTOCOLLN
gudnimg Feb 27, 2022
97c371e
Make the "ln" functions no-inline.
leptun Feb 27, 2022
4a02ff3
Change SERIAL_PROTOCOL to SERIAL_PROTOCOLPGM in a few lines
gudnimg Feb 28, 2022
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
14 changes: 7 additions & 7 deletions Firmware/Marlin_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7786,14 +7786,14 @@ SERIAL_PROTOCOLPGM("\n\n");

updatePID();
SERIAL_PROTOCOLRPGM(MSG_OK);
SERIAL_PROTOCOL(" p:");
SERIAL_PROTOCOLPGM(" p:");
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I think flash usage increases because strings in ram are optimized much more than strings in progmem. So there will be duplicates in progmem, while in ram these are deduplicated. Sadly, I couldn't find a fix for this besides using PSTR only once and using the pointer on multiple PROTOCOLRPGM functions

SERIAL_PROTOCOL(cs.Kp);
SERIAL_PROTOCOL(" i:");
SERIAL_PROTOCOLPGM(" i:");
SERIAL_PROTOCOL(unscalePID_i(cs.Ki));
SERIAL_PROTOCOL(" d:");
SERIAL_PROTOCOLPGM(" d:");
SERIAL_PROTOCOL(unscalePID_d(cs.Kd));
#ifdef PID_ADD_EXTRUSION_RATE
SERIAL_PROTOCOL(" c:");
SERIAL_PROTOCOLPGM(" c:");
//Kc does not have scaling applied above, or in resetting defaults
SERIAL_PROTOCOL(Kc);
#endif
Expand Down Expand Up @@ -7824,11 +7824,11 @@ SERIAL_PROTOCOLPGM("\n\n");

updatePID();
SERIAL_PROTOCOLRPGM(MSG_OK);
SERIAL_PROTOCOL(" p:");
SERIAL_PROTOCOLPGM(" p:");
SERIAL_PROTOCOL(cs.bedKp);
SERIAL_PROTOCOL(" i:");
SERIAL_PROTOCOLPGM(" i:");
SERIAL_PROTOCOL(unscalePID_i(cs.bedKi));
SERIAL_PROTOCOL(" d:");
SERIAL_PROTOCOLPGM(" d:");
SERIAL_PROTOCOLLN(unscalePID_d(cs.bedKd));
}
break;
Expand Down