Fix build #2901
Open
Fix build #2901
Conversation
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
DRracer
reviewed
Nov 24, 2020
| @@ -334,7 +334,7 @@ bool bSettings; // flag (i.e. 'fake parameter' | |||
| const char STR_SEPARATOR[] PROGMEM = "------------"; | |||
|
|
|||
|
|
|||
| static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, const char* filename, char* longFilename) | |||
| static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, char* filename, char* longFilename) | |||
There was a problem hiding this comment.
please don't touch this function, we know there is a problem and a correct solution is being prepared
scottmudge
added a commit
to scottmudge/Prusa-Firmware-MeatPack
that referenced
this pull request
Jan 9, 2021
… this shouldn't be touched.
erik434
added a commit
to erik434/Prusa-Firmware
that referenced
this pull request
Feb 10, 2022
commit d74e562 Merge: a81ad68 5d35d76 Author: Scott Mudge <[email protected]> Date: Fri May 21 09:40:20 2021 -0400 Merge branch 'MK3_sm_MeatPack' into sm_gcode_meatpacking commit a81ad68 Merge: e276e53 f5ca799 Author: Scott Mudge <[email protected]> Date: Fri May 21 09:35:45 2021 -0400 Merge remote-tracking branch 'prusa3d/MK3' into sm_gcode_meatpacking commit 5d35d76 Author: Scott Mudge <[email protected]> Date: Tue Jan 26 13:06:19 2021 -0500 * Fix strtod() -> strtod_noE() after merge. commit c8b9d3d Merge: 5f69ec5 c28e5a9 Author: Scott Mudge <[email protected]> Date: Tue Jan 26 10:04:40 2021 -0500 Merge remote-tracking branch 'prusa3d/MK3' into MK3_sm_MeatPack Merge, fix conflict. commit 5f69ec5 Author: Scott Mudge <[email protected]> Date: Mon Jan 25 12:00:06 2021 -0500 Remove unused toggle command. commit 820d67b Author: Scott Mudge <[email protected]> Date: Sat Jan 23 03:21:03 2021 -0500 Fixed filename case sensitivity... issue with Windows being case insensitive. commit e276e53 Author: Scott Mudge <[email protected]> Date: Wed Jan 20 22:10:51 2021 -0500 Update README.md commit ce8fb56 Author: Scott Mudge <[email protected]> Date: Wed Jan 20 18:33:13 2021 -0500 - remove volatile from lookup table. commit 70dab3f Merge: 18112f9 2a16ac3 Author: Scott Mudge <[email protected]> Date: Wed Jan 20 18:25:12 2021 -0500 Merge branch 'MK3_sm_MeatPack' into sm_gcode_meatpacking commit 18112f9 Author: Scott Mudge <[email protected]> Date: Wed Jan 20 15:00:29 2021 -0500 Update README.md commit 2a16ac3 Merge: b45d0ec ebf039c Author: Scott Mudge <[email protected]> Date: Wed Jan 20 14:34:54 2021 -0500 Merge branch 'MK3_sm_MeatPack_WhiteSpace' into MK3_sm_MeatPack commit ebf039c Author: Scott Mudge <[email protected]> Date: Sun Jan 17 18:36:23 2021 -0500 Added custom strtod() method which excludes "E", to prevent errors parsing "E" commands in G1 codes. commit f701f19 Merge: 3fb29f2 b71f1be Author: Scott Mudge <[email protected]> Date: Sun Jan 17 11:02:39 2021 -0500 Merge branch 'MK3' into MK3_sm_MeatPack_WhiteSpace commit 3fb29f2 Author: Scott Mudge <[email protected]> Date: Sun Jan 17 11:02:06 2021 -0500 testing. commit 55d1141 Author: Scott Mudge <[email protected]> Date: Sat Jan 16 18:03:59 2021 -0500 debugging. commit b45d0ec Author: Scott Mudge <[email protected]> Date: Fri Jan 15 08:47:13 2021 -0500 Refactoring for whitespace omission and using 'E' instead of ' ' in lookup table. commit 4bd80c6 Author: Scott Mudge <[email protected]> Date: Thu Jan 14 11:01:44 2021 -0500 - Compatibility fix for older plugin version. commit 4c2040c Author: Scott Mudge <[email protected]> Date: Thu Jan 14 10:59:21 2021 -0500 - Refactored configuration bytes. - Refactored config sync output. - Added support for whitespace omission. - Removed debug output unless preprocessor directive is enabled. commit ef5922e Author: Scott Mudge <[email protected]> Date: Tue Jan 12 10:53:56 2021 -0500 General refactoring - Removed unneeded 'volatile' qualifiers. - Removed unused public interfaces. - Moved ENABLE_MEATPACK to Configuration.h - Corrected inlining with AVR-specific macro. commit 567dfec Author: Scott Mudge <[email protected]> Date: Sat Jan 9 18:48:11 2021 -0500 * Fixed compiler switch/pre-processor directive to disable MeatPack. commit 4e48717 Author: Scott Mudge <[email protected]> Date: Sat Jan 9 01:51:11 2021 -0500 Reverting change to fix compiler warning. According to PR prusa3d#2901, this shouldn't be touched. commit 9a66278 Author: Scott Mudge <[email protected]> Date: Sat Jan 9 00:01:29 2021 -0500 * Revert formatting change. commit 35ca6f4 Author: Scott Mudge <[email protected]> Date: Sat Jan 9 00:00:07 2021 -0500 * Revert formatting back to that used by Prusa. commit e562018 Author: Scott Mudge <[email protected]> Date: Thu Jan 7 22:08:52 2021 -0500 Update README.md commit 900bd41 Author: Scott Mudge <[email protected]> Date: Thu Jan 7 22:04:08 2021 -0500 Update README.md commit a76fdaa Author: Scott Mudge <[email protected]> Date: Thu Jan 7 21:54:26 2021 -0500 Update README.md commit 62c3a45 Author: Scott Mudge <[email protected]> Date: Thu Jan 7 21:52:53 2021 -0500 Update README.md commit beece1d Author: Scott Mudge <[email protected]> Date: Thu Jan 7 13:29:30 2021 -0500 Only send appropriate M73 response depending on what is active. commit 061da4a Author: Scott Mudge <[email protected]> Date: Thu Jan 7 13:25:05 2021 -0500 a commit 705b3b8 Author: Scott Mudge <[email protected]> Date: Thu Jan 7 13:24:38 2021 -0500 . commit 8a7f46b Author: Scott Mudge <[email protected]> Date: Thu Jan 7 13:20:21 2021 -0500 Undoing old changes. commit f46fa15 Merge: 3efa1cb 0ed6b53 Author: Scott Mudge <[email protected]> Date: Thu Jan 7 13:17:06 2021 -0500 Merge remote-tracking branch 'prusa3d/MK3_3.9.3' into sm_gcode_meatpacking commit 3efa1cb Author: Scott Mudge <[email protected]> Date: Tue Jan 5 02:22:51 2021 -0500 Finished. commit 4c8f13c Author: Scott Mudge <[email protected]> Date: Sun Jan 3 00:03:14 2021 -0500 First implementation. * Fixed pre-existing compiler warning. * Implemented meat-pack. * Added code to properly handle file seek in SD file check. * Added proper control code elsewhere.
erik434
added a commit
to erik434/Prusa-Firmware
that referenced
this pull request
May 9, 2022
commit d74e562 Merge: a81ad68 5d35d76 Author: Scott Mudge <[email protected]> Date: Fri May 21 09:40:20 2021 -0400 Merge branch 'MK3_sm_MeatPack' into sm_gcode_meatpacking commit a81ad68 Merge: e276e53 f5ca799 Author: Scott Mudge <[email protected]> Date: Fri May 21 09:35:45 2021 -0400 Merge remote-tracking branch 'prusa3d/MK3' into sm_gcode_meatpacking commit 5d35d76 Author: Scott Mudge <[email protected]> Date: Tue Jan 26 13:06:19 2021 -0500 * Fix strtod() -> strtod_noE() after merge. commit c8b9d3d Merge: 5f69ec5 c28e5a9 Author: Scott Mudge <[email protected]> Date: Tue Jan 26 10:04:40 2021 -0500 Merge remote-tracking branch 'prusa3d/MK3' into MK3_sm_MeatPack Merge, fix conflict. commit 5f69ec5 Author: Scott Mudge <[email protected]> Date: Mon Jan 25 12:00:06 2021 -0500 Remove unused toggle command. commit 820d67b Author: Scott Mudge <[email protected]> Date: Sat Jan 23 03:21:03 2021 -0500 Fixed filename case sensitivity... issue with Windows being case insensitive. commit e276e53 Author: Scott Mudge <[email protected]> Date: Wed Jan 20 22:10:51 2021 -0500 Update README.md commit ce8fb56 Author: Scott Mudge <[email protected]> Date: Wed Jan 20 18:33:13 2021 -0500 - remove volatile from lookup table. commit 70dab3f Merge: 18112f9 2a16ac3 Author: Scott Mudge <[email protected]> Date: Wed Jan 20 18:25:12 2021 -0500 Merge branch 'MK3_sm_MeatPack' into sm_gcode_meatpacking commit 18112f9 Author: Scott Mudge <[email protected]> Date: Wed Jan 20 15:00:29 2021 -0500 Update README.md commit 2a16ac3 Merge: b45d0ec ebf039c Author: Scott Mudge <[email protected]> Date: Wed Jan 20 14:34:54 2021 -0500 Merge branch 'MK3_sm_MeatPack_WhiteSpace' into MK3_sm_MeatPack commit ebf039c Author: Scott Mudge <[email protected]> Date: Sun Jan 17 18:36:23 2021 -0500 Added custom strtod() method which excludes "E", to prevent errors parsing "E" commands in G1 codes. commit f701f19 Merge: 3fb29f2 b71f1be Author: Scott Mudge <[email protected]> Date: Sun Jan 17 11:02:39 2021 -0500 Merge branch 'MK3' into MK3_sm_MeatPack_WhiteSpace commit 3fb29f2 Author: Scott Mudge <[email protected]> Date: Sun Jan 17 11:02:06 2021 -0500 testing. commit 55d1141 Author: Scott Mudge <[email protected]> Date: Sat Jan 16 18:03:59 2021 -0500 debugging. commit b45d0ec Author: Scott Mudge <[email protected]> Date: Fri Jan 15 08:47:13 2021 -0500 Refactoring for whitespace omission and using 'E' instead of ' ' in lookup table. commit 4bd80c6 Author: Scott Mudge <[email protected]> Date: Thu Jan 14 11:01:44 2021 -0500 - Compatibility fix for older plugin version. commit 4c2040c Author: Scott Mudge <[email protected]> Date: Thu Jan 14 10:59:21 2021 -0500 - Refactored configuration bytes. - Refactored config sync output. - Added support for whitespace omission. - Removed debug output unless preprocessor directive is enabled. commit ef5922e Author: Scott Mudge <[email protected]> Date: Tue Jan 12 10:53:56 2021 -0500 General refactoring - Removed unneeded 'volatile' qualifiers. - Removed unused public interfaces. - Moved ENABLE_MEATPACK to Configuration.h - Corrected inlining with AVR-specific macro. commit 567dfec Author: Scott Mudge <[email protected]> Date: Sat Jan 9 18:48:11 2021 -0500 * Fixed compiler switch/pre-processor directive to disable MeatPack. commit 4e48717 Author: Scott Mudge <[email protected]> Date: Sat Jan 9 01:51:11 2021 -0500 Reverting change to fix compiler warning. According to PR prusa3d#2901, this shouldn't be touched. commit 9a66278 Author: Scott Mudge <[email protected]> Date: Sat Jan 9 00:01:29 2021 -0500 * Revert formatting change. commit 35ca6f4 Author: Scott Mudge <[email protected]> Date: Sat Jan 9 00:00:07 2021 -0500 * Revert formatting back to that used by Prusa. commit e562018 Author: Scott Mudge <[email protected]> Date: Thu Jan 7 22:08:52 2021 -0500 Update README.md commit 900bd41 Author: Scott Mudge <[email protected]> Date: Thu Jan 7 22:04:08 2021 -0500 Update README.md commit a76fdaa Author: Scott Mudge <[email protected]> Date: Thu Jan 7 21:54:26 2021 -0500 Update README.md commit 62c3a45 Author: Scott Mudge <[email protected]> Date: Thu Jan 7 21:52:53 2021 -0500 Update README.md commit beece1d Author: Scott Mudge <[email protected]> Date: Thu Jan 7 13:29:30 2021 -0500 Only send appropriate M73 response depending on what is active. commit 061da4a Author: Scott Mudge <[email protected]> Date: Thu Jan 7 13:25:05 2021 -0500 a commit 705b3b8 Author: Scott Mudge <[email protected]> Date: Thu Jan 7 13:24:38 2021 -0500 . commit 8a7f46b Author: Scott Mudge <[email protected]> Date: Thu Jan 7 13:20:21 2021 -0500 Undoing old changes. commit f46fa15 Merge: 3efa1cb 0ed6b53 Author: Scott Mudge <[email protected]> Date: Thu Jan 7 13:17:06 2021 -0500 Merge remote-tracking branch 'prusa3d/MK3_3.9.3' into sm_gcode_meatpacking commit 3efa1cb Author: Scott Mudge <[email protected]> Date: Tue Jan 5 02:22:51 2021 -0500 Finished. commit 4c8f13c Author: Scott Mudge <[email protected]> Date: Sun Jan 3 00:03:14 2021 -0500 First implementation. * Fixed pre-existing compiler warning. * Implemented meat-pack. * Added code to properly handle file seek in SD file check. * Added proper control code elsewhere.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.