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.

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

Update messages and po files #61

Open
wants to merge 23 commits into
base: mk3-mmu
Choose a base branch
from

Conversation

3d-gussner
Copy link
Collaborator

@3d-gussner 3d-gussner commented Aug 8, 2022

  • Add double down arrow to be processed correctly
  • Updated update-pot.sh to search also Firmware/mmu resources
  • Update new mmu2 messages
    • Remove duplicates
  • Consolidate duplicate/similar messages of IR sensor version
    • #ifdef these messages to save some bytes on MK3 / MK2.5 builds
  • fix translation warnings

ToDo:

  • Translators
    • All active messages need to be filled to avoid warnings, this means also if the translation is the same as the origin message
      • Example: origin message Auto is the same in German Auto
    • Please write the messages with diacritics in the po files. The scripts should replace these correctly and at this moment we support äöüß on LCD
    • Please verify that the messages don't exceed the character and row limits shown in the comments, like c=20 r=3 is a hard limit as the 4th row is used for selection.
    • DON'T DELETE the 🔃 or ⏬ which may be shown in POedit as dots in-front of Refresh and at the end of More

Short summary:

  • De-duplication
    • FS v0.3/0.4 or older/never de-duplicated to v0.3/0.4 or older/newer as the Support already shows FSensor
    • Finishing movements --> Finishing moves
    • Reuse existing messages in new MMU2 code
  • Removed/changed unused messages to not be translated or found by scripts
    • some _i changed to _n
    • removed ////MSG_ comments
  • use/change of _O or _n for serial output
  • Updated all found messages by scripts with comments including character and row values. We should now have all active/used and to be translated messages in the po files
  • Removed / #ifdef some code
    • #ifdef-ed IR sensor messages
    • PAT9125 Status
  • Changed mmu2 messages to fit scripts starting with MSG_ and all upper-case
  • Changed default KEEPALIVE_STATE of MMU2 to IN_PROCESS (Octoprint Plugins reading these)
    • Open Task: change to PAUSED_FOR_USER in error states or LCD interactions
  • Updated doxygen documentation
  • Added firmware_<printer type>.map files to easier find messages for different variants
  • Added current usage output of resources for each language
    • reading the reserved space from config.h
  • Fixed lang scripts thanks to @wavexx
  • added double arrow down special character

Updated update-pot.sh to search also `Firmware/mmu` resources
@3d-gussner 3d-gussner requested a review from wavexx August 8, 2022 09:53
@wavexx
Copy link
Collaborator

wavexx commented Aug 8, 2022

Looking good so far, but I think it's pointless to add a review now?

3d-gussner and others added 9 commits August 9, 2022 09:09
Don't translate unused AUTOTEMP messages
Add #ifdef to IR messages
Sync order of messages.cpp and messages.h
Update fw-build.sh
 - Output used space of each translation (easier to troubleshoot)
 - Read config.h max size per translation
 - output variant .map files (easier to troubleshoot and finding missing/unused messages)
__loc_pri_end is inclusive and needs to be accounted for in
get_lang_symbols().

This was incorrectly excluding the last translatable string from the map
file.
_R marks a raw catalog entry as Referenced (= used) for cases where the
catalog pointers are handled at a lower level.
3d-gussner and others added 12 commits August 10, 2022 13:48
Some are only used with two options and so longer than with 3
Update messages missing c= r=
Don't scan to translate serial and commented out code
Change MMU2 KEEPALIVE_STATE to IN_PROCESS
This message is never actually shown on the LCD (it's immediately
overwritten by other content). It also include g-code in a translatable
string, which is not a good idea. It's also otherwise identical to
MSG_V2_CALIBRATION, which we should have used.

Just remove it and save some space in the process.
Update po files after last change
@3d-gussner 3d-gussner marked this pull request as ready for review August 12, 2022 15:14
@3d-gussner 3d-gussner changed the title 🚧 WIP Update messages and po files Update messages and po files Aug 12, 2022
@@ -648,7 +649,7 @@ void MMU2::CheckUserInput(){
void MMU2::manage_response(const bool move_axes, const bool turn_off_nozzle) {
mmu_print_saved = SavedState::None;

KEEPALIVE_STATE(PAUSED_FOR_USER);
KEEPALIVE_STATE(IN_PROCESS);
Copy link
Owner

Choose a reason for hiding this comment

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

👍

@@ -13,7 +13,7 @@ enum class ProgressCode : uint_fast8_t {
UnloadingToFinda, // P3
UnloadingToPulley, //P4
FeedingToFinda, // P5
FeedingToBondtech, // P6
FeedingToExtruder, // P6
Copy link
Owner

Choose a reason for hiding this comment

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

we should rename the state in the MMU FW - progress_codes.h and error_codes.h are normally copied from the MMU repo

Copy link
Owner

@DRracer DRracer left a comment

Choose a reason for hiding this comment

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

Well done 👍
My only complaint about this PR is the rename of "Load/Feed to Bondtech" to "Load/Feed to Extruder". I understand the intent here but the Extruder describes usually the whole assembly and not only the gears which are grabbing the filament and pushing it into the nozzle.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants