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

Formalize DAC percent per-axis strings #16176

Merged
merged 1 commit into from
Dec 11, 2019
Merged

Formalize DAC percent per-axis strings #16176

merged 1 commit into from
Dec 11, 2019

Conversation

0r31
Copy link
Contributor

@0r31 0r31 commented Dec 10, 2019

Description

The purpose of this pull request is to fix issue #15803 . The compilation fails when mixing screen and dac steppers usage as the way to build the menu label was not correct (concatenation of two labels of different types -one which is not translatable, the other which must be translated first).

Notes

It might not be the best solution (maybe there is a trick in building the label), but this is the only one i see for now.

@thinkyhead thinkyhead merged commit 1c4f672 into MarlinFirmware:bugfix-2.0.x Dec 11, 2019
@thinkyhead thinkyhead changed the title Fix issue #15803. Formalize DAC percent per-axis strings Dec 11, 2019
LinoBarreca pushed a commit to LinoBarreca/Marlin that referenced this pull request Dec 18, 2019
@0r31 @LinoBarreca
Formalize DAC percent strings (MarlinFirmware#16176)
a78ece0
philippniethammer pushed a commit to philippniethammer/Marlin that referenced this pull request Dec 21, 2019
@0r31 @philippniethammer
Formalize DAC percent strings (MarlinFirmware#16176)
7e712ef
christran206 pushed a commit to christran206/Marlin2.0-SKR-Mini-E3-1.2 that referenced this pull request Dec 30, 2019
@0r31 @christran206
Formalize DAC percent strings (MarlinFirmware#16176)
3871e46
webs1821 added a commit to webs1821/Marlin that referenced this pull request Jan 2, 2020
@webs1821 @thinkyhead
@randellhodges @sjasonsmith @anttix @thisiskeithb @tpruvot @shitcreek @AJMartel @AndersSahlman @0r31 @GMagician @MS1987 @MangaValk @AndKe @tobiasschuerg @jeffeb3 @ManuelMcLure @InsanityAutomation @dseven @boelle @luc-github @danym21 @chzj333 @Vertabreak @MoshiBin @salami738 @elementfoundry @teemuatlut @mjscosta @bigtreetech @mtowara @FLYmaker @ferengi82 @petrzjunior
Update forked repo (#1)
340ae70 
* [cron] Bump distribution date

* STM32F1 Flash-based EEPROM fixes (MarlinFirmware#16118)

* Disable PRINTCOUNTER in SKR Mini E3 examples (MarlinFirmware#16110)

* Fix compile error with disabled PIDTEMP (MarlinFirmware#16108)

* Wanhao D6 uses TINYBOY2 (MarlinFirmware#16117)

* Improve touch buttons behavior (MarlinFirmware#16109)

* Update AZSMZ LCD link (MarlinFirmware#16106)

* [cron] Bump distribution date

* Update 3DFabXYZ settings (MarlinFirmware#16139)

* [cron] Bump distribution date

* Fix controller and SD on Robin Nano (MarlinFirmware#16187)

* Correct MKS Robin Mini pins (MarlinFirmware#16178)

* Formalize DAC percent strings (MarlinFirmware#16176)

* Update Italian language (MarlinFirmware#16147)

* Update french (objects, retract...)

* Superscript 3 for mm3

* [cron] Bump distribution date

* Add MKS Robin Pro, MKS Robin Lite3 (MarlinFirmware#16163)

* Fix multiple servos with STM32 (MarlinFirmware#16151)

* Use error message !! hints (MarlinFirmware#16145)

* Update BTT comments for USB/SD Composite (MarlinFirmware#16130)

* MKS 12864 OLED pins for SGEN-L (MarlinFirmware#16188)

* Invert E dir of Geeetech A10 (MarlinFirmware#16149)

* Disable SD_CHECK_AND_RETRY in BTT E3 configs (MarlinFirmware#16143)

* Add a CI test for RAMBo + CNC (MarlinFirmware#16126)

* Onboard (always-on) pullups support (MarlinFirmware#16144)

* Tweak ExtUI Probeless Babystepping (MarlinFirmware#16177)

* Fix RAMBo CNC test

* Flsun QQ-S example config (MarlinFirmware#16204)

* Add MKS Robin Mini EEPROM defines (MarlinFirmware#16203)

* Fix compile error (macro substitution typo) (MarlinFirmware#16194)

* Update M503 MBL G29 report (MarlinFirmware#16199)

* Include Z in SCARA steps feedrate (MarlinFirmware#16193)

* Cardreader read/write open methods

* Tweak some config names

* Improve A20M config

* Move status screen defines

* Fix bad #ifdef (MarlinFirmware#16227)

* TOUCH_MI_DEPLOY_XPOS fallback to X_MIN_POS (MarlinFirmware#16226)

* Fix MKS SGen-L SD detect pin (MarlinFirmware#16224)

* Improve ESP32 HAL (EEPROM, watchdog) (MarlinFirmware#16228)

* Fix G28 debug line, M569 calls (MarlinFirmware#16213)

* Add SKR Mini E3 + Zonestar LCD warning (MarlinFirmware#16214)

* STM32 Touch UI timings, Longer onboard pullups (MarlinFirmware#16219)

* Update BTT002 platform (fixing SD init) (MarlinFirmware#16217)

* Define more FAN pins for GT2560 (MarlinFirmware#16235)

* Tweak E180 config

* Update product links

* [cron] Bump distribution date

* Add dev-2.1.x to 'mfinfo' script

* Move AutoBuildMarlin to its own repo

* [cron] Bump distribution date

* Tweak G34, fix a declaration

* Sanity-check Z_STEPPER_AUTO_ALIGN coordinates (MarlinFirmware#16231)

* Improve SKR mini E3 + Ender 3 settings (MarlinFirmware#16247)

* Tweak code formatting

* Allow TMC2209 to save/restore spreadCycle (MarlinFirmware#16153)

Co-Authored-By: teemuatlut <[email protected]>

* Spindle/Laser pins for RADDS (MarlinFirmware#16119)

* Improve pulse timing and step reliability (MarlinFirmware#16128)

* BigTreeTech SKR v1.4 support (MarlinFirmware#16236)

* Followup to TMC2209 spreadcycle patch

* Remove obsolete TMC2209 comment

* HOME_USING_SPREADCYCLE is obsolete

Co-Authored-By: teemuatlut <[email protected]>

* Use MYSERIAL0 (not SerialUSB) for Malyan LCD

* Followup for step timing (MarlinFirmware#16128)

* Fix broken M100_dump_routine

* Tweak sanity checks

* Update test scripts to error on unknown (MarlinFirmware#16229)

* Kossel Clear configuration (MarlinFirmware#16198)

* Move pins debug condition

* Use Github Actions for CI, date bump (MarlinFirmware#16269)

* Fix HAL_STM32 + Arduino IDE SoftwareSerial conflict (MarlinFirmware#16266)

* Improve Anet A6 config (MarlinFirmware#16280)

* Fix G34 with Z_DUAL_STEPPER_DRIVERS compile (MarlinFirmware#16274)

* Fix planner compile error (MarlinFirmware#16272)

* Fix axis CS sanity check (MarlinFirmware#16271)

* Add Tevo Nereus (w/ Robin Nano) config (MarlinFirmware#16207)

* Don't test certain changes

* Reset runout.ran_out on resume (MarlinFirmware#16230)

* Step timing cleanup and rounding fix (MarlinFirmware#16258)

* Add MRR_ESPA/_ESPE (ESP32) boards (MarlinFirmware#16238)

* Add Ender-5 Pro config (MarlinFirmware#16221)

* Add FLYBOARD (STM32F407ZG) (MarlinFirmware#16257)

* Fix STM32 flush of TX (used by UBL) (MarlinFirmware#16197)

* Flash leveling (for some STM32) (MarlinFirmware#16174)

* Some ESP32 patches (MarlinFirmware#16297)

* MKS SGen-L pins EEBF or EFBF scheme (MarlinFirmware#16296)

* Release version 2.0.0

* Add Rumba32 support for PIO (MarlinFirmware#16202)

* MKS Robin 2 (STM32F407ZE) base support (MarlinFirmware#16270)

* Update Czech language (MarlinFirmware#16305)

* Sync SKR E3 configs (MarlinFirmware#16301)

* Add NOZZLE_AS_PROBE (no probe offsets) (MarlinFirmware#15929)

* Version 2.0.1

* Update build status url

Co-authored-by: Scott Lahteine <[email protected]>
Co-authored-by: randellhodges <[email protected]>
Co-authored-by: Jason Smith <[email protected]>
Co-authored-by: Antti Andreimann <[email protected]>
Co-authored-by: thisiskeithb <[email protected]>
Co-authored-by: Tanguy Pruvot <[email protected]>
Co-authored-by: Luu Lac <[email protected]>
Co-authored-by: Alain Martel <[email protected]>
Co-authored-by: Anders Sahlman <[email protected]>
Co-authored-by: dagorel <[email protected]>
Co-authored-by: Giuliano Zaro <[email protected]>
Co-authored-by: MS1987 <[email protected]>
Co-authored-by: MangaValk <[email protected]>
Co-authored-by: André Kjellstrup <[email protected]>
Co-authored-by: Tobias Schürg <[email protected]>
Co-authored-by: Jeff Eberl <[email protected]>
Co-authored-by: ManuelMcLure <[email protected]>
Co-authored-by: InsanityAutomation <[email protected]>
Co-authored-by: iain MacDonnell <[email protected]>
Co-authored-by: Bo Herrmannsen <[email protected]>
Co-authored-by: Luc <[email protected]>
Co-authored-by: danym21 <[email protected]>
Co-authored-by: chzj333 <[email protected]>
Co-authored-by: Vertabreaker <[email protected]>
Co-authored-by: Moshi Binyamini <[email protected]>
Co-authored-by: salami738 <[email protected]>
Co-authored-by: elementfoundry <[email protected]>
Co-authored-by: teemuatlut <[email protected]>
Co-authored-by: Mario Costa <[email protected]>
Co-authored-by: BigTreeTech <[email protected]>
Co-authored-by: Markus Towara <[email protected]>
Co-authored-by: FLYmaker <[email protected]>
Co-authored-by: ferengi82 <[email protected]>
Co-authored-by: petrzjunior <[email protected]>
@0r31 0r31 deleted the issue-15803 branch January 20, 2020 12:10
griehsler pushed a commit to griehsler/Marlin that referenced this pull request Jan 30, 2020
@0r31 @griehsler
Formalize DAC percent strings (MarlinFirmware#16176)
56efa50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
C: Language C: LCD & Controllers PR: Bug Fix
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@0r31 @thinkyhead