Merge pull request #8 from thinkyhead/rc_negative_retract_in_menu

Replace "+mm" with "mm." Allow negative recover-swap length.
This commit is contained in:
Florian Heilmann 2016-12-20 10:31:07 +01:00 committed by GitHub
commit 780dabf32b
25 changed files with 49 additions and 49 deletions

View file

@ -141,8 +141,8 @@
#define MSG_CONTROL_RETRACT_SWAP _UxGT("Swap Retraer mm")
#define MSG_CONTROL_RETRACTF _UxGT("Retraer F")
#define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Devantar mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("DesRet +mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Swap DesRet +mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("DesRet mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Swap DesRet mm")
#define MSG_CONTROL_RETRACT_RECOVERF _UxGT("DesRet F")
#define MSG_AUTORETRACT _UxGT("Retraccion auto.")
#define MSG_FILAMENTCHANGE _UxGT("Cambear filamento")

View file

@ -142,8 +142,8 @@
#define MSG_CONTROL_RETRACT_SWAP _UxGT("Смяна Откат mm")
#define MSG_CONTROL_RETRACTF _UxGT("Откат V")
#define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Скок mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("Възврат +mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Смяна Възврат +mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("Възврат mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Смяна Възврат mm")
#define MSG_CONTROL_RETRACT_RECOVERF _UxGT("Възврат V")
#define MSG_AUTORETRACT _UxGT("Автоoткат")
#define MSG_FILAMENTCHANGE _UxGT("Смяна нишка")

View file

@ -133,8 +133,8 @@
#define MSG_CONTROL_RETRACT_SWAP _UxGT("Swap Retreure mm")
#define MSG_CONTROL_RETRACTF _UxGT("Retreure F")
#define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Aixecar mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("DesRet +mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Swap DesRet +mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("DesRet mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Swap DesRet mm")
#define MSG_CONTROL_RETRACT_RECOVERF _UxGT("DesRet F")
#define MSG_AUTORETRACT _UxGT("AutoRetr.")
#define MSG_FILAMENTCHANGE _UxGT("Canviar filament")

View file

@ -134,8 +134,8 @@
#define MSG_CONTROL_RETRACT_SWAP "Swap Re.mm"
#define MSG_CONTROL_RETRACTF "Retract V"
#define MSG_CONTROL_RETRACT_ZLIFT "Hop mm"
#define MSG_CONTROL_RETRACT_RECOVER "UnRet +mm"
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "S UnRet+mm"
#define MSG_CONTROL_RETRACT_RECOVER "UnRet mm"
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "S UnRetmm"
#define MSG_CONTROL_RETRACT_RECOVERF "UnRet V"
#define MSG_AUTORETRACT "AutoRetr."
#define MSG_FILAMENTCHANGE "Change filament"

View file

@ -145,8 +145,8 @@
#define MSG_CONTROL_RETRACT_SWAP _UxGT("Vymena Re.mm")
#define MSG_CONTROL_RETRACTF _UxGT("Retraktovat V")
#define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Zvednuti Z mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet +mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRet+mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRetmm")
#define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V")
#define MSG_AUTORETRACT _UxGT("AutoRetr.")
#define MSG_FILAMENTCHANGE _UxGT("Vymenit filament")

View file

@ -143,8 +143,8 @@
#define MSG_CONTROL_RETRACT_SWAP _UxGT("Skift Re.mm")
#define MSG_CONTROL_RETRACTF _UxGT("Tilbagetræk V")
#define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Hop mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet +mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Skift UnRet+mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Skift UnRetmm")
#define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V")
#define MSG_AUTORETRACT _UxGT("AutoRetr.")
#define MSG_FILAMENTCHANGE _UxGT("Skift filament")

View file

@ -142,8 +142,8 @@
#define MSG_CONTROL_RETRACT_SWAP _UxGT("Wechs. Retract mm")
#define MSG_CONTROL_RETRACTF _UxGT("Retract V")
#define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Z-Hop mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet +mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Wechs. UnRet +mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Wechs. UnRet mm")
#define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V")
#define MSG_AUTORETRACT _UxGT("AutoRetract")
#define MSG_FILAMENTCHANGE _UxGT("Filament wechseln")

View file

@ -141,8 +141,8 @@
#define MSG_CONTROL_RETRACT_SWAP _UxGT("Εναλλαγή ανάσυρσης μμ")
#define MSG_CONTROL_RETRACTF _UxGT("Ανάσυρση V")
#define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Μεταπήδηση μμ")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet +mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRet+mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRetmm")
#define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V")
#define MSG_AUTORETRACT _UxGT("Αυτόματη ανάσυρση")
#define MSG_FILAMENTCHANGE _UxGT("Αλλαγή νήματος")

View file

@ -141,8 +141,8 @@
#define MSG_CONTROL_RETRACT_SWAP _UxGT("Εναλλαγή ανάσυρσης μμ") //SHORTEN
#define MSG_CONTROL_RETRACTF _UxGT("Ανάσυρση V")
#define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Μεταπήδηση μμ")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet +mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRet+mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRetmm")
#define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V")
#define MSG_AUTORETRACT _UxGT("Αυτόματη ανάσυρση")
#define MSG_FILAMENTCHANGE _UxGT("Αλλαγή νήματος")

View file

@ -364,10 +364,10 @@
#define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Hop mm")
#endif
#ifndef MSG_CONTROL_RETRACT_RECOVER
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet +mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm")
#endif
#ifndef MSG_CONTROL_RETRACT_RECOVER_SWAP
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRet+mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRetmm")
#endif
#ifndef MSG_CONTROL_RETRACT_RECOVERF
#define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V")

View file

@ -139,8 +139,8 @@
#define MSG_CONTROL_RETRACT_SWAP _UxGT("Interc. Retraer mm")
#define MSG_CONTROL_RETRACTF _UxGT("Retraer V")
#define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Levantar mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("DesRet +mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Interc. DesRet +mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("DesRet mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Interc. DesRet mm")
#define MSG_CONTROL_RETRACT_RECOVERF _UxGT("DesRet V")
#define MSG_AUTORETRACT _UxGT("Retraccion Auto.")
#define MSG_FILAMENTCHANGE _UxGT("Cambiar filamento")

View file

@ -132,8 +132,8 @@
#define MSG_CONTROL_RETRACT_SWAP _UxGT("Swap Atzera egin mm")
#define MSG_CONTROL_RETRACTF _UxGT("Atzera egin V")
#define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Igo mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("Atzera egin +mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Swap Atzera egin +mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("Atzera egin mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Swap Atzera egin mm")
#define MSG_CONTROL_RETRACT_RECOVERF _UxGT("Atzera egin V")
#define MSG_AUTORETRACT _UxGT("Atzera egin")
#define MSG_FILAMENTCHANGE _UxGT("Aldatu filament.")

View file

@ -133,8 +133,8 @@
#define MSG_CONTROL_RETRACT_SWAP _UxGT("Va. Vedä mm")
#define MSG_CONTROL_RETRACTF _UxGT("Vedä V")
#define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Z mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet +mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Va. UnRet +mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Va. UnRet mm")
#define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V")
#define MSG_AUTORETRACT _UxGT("AutoVeto.")
#define MSG_FILAMENTCHANGE _UxGT("Change filament")

View file

@ -141,8 +141,8 @@
#define MSG_CONTROL_RETRACT_SWAP _UxGT("Ech. Retr. mm")
#define MSG_CONTROL_RETRACTF _UxGT("Retraction V")
#define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Hop mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet +mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Ech. UnRet +mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Ech. UnRet mm")
#define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V")
#define MSG_AUTORETRACT _UxGT("Retract. Auto.")
#define MSG_FILAMENTCHANGE _UxGT("Changer filament")

View file

@ -141,8 +141,8 @@
#define MSG_CONTROL_RETRACT_SWAP _UxGT("Swap Re.mm")
#define MSG_CONTROL_RETRACTF _UxGT("Retract V")
#define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Hop mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet +mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRet+mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRetmm")
#define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V")
#define MSG_AUTORETRACT _UxGT("AutoRetr.")
#define MSG_FILAMENTCHANGE _UxGT("Promijeni filament")

View file

@ -149,8 +149,8 @@
#define MSG_CONTROL_RETRACT_SWAP _UxGT("Scamb. Ritrai mm")
#define MSG_CONTROL_RETRACTF _UxGT("Ritrai V")
#define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Salta mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet +mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Scamb. UnRet+mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Scamb. UnRetmm")
#define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V")
#define MSG_AUTORETRACT _UxGT("AutoRitrai")
#define MSG_FILAMENTCHANGE _UxGT("Cambia filamento")

View file

@ -141,8 +141,8 @@
#define MSG_CONTROL_RETRACT_SWAP _UxGT("Ruil Retract mm")
#define MSG_CONTROL_RETRACTF _UxGT("Retract F")
#define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Hop mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet +mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Ruil UnRet +mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Ruil UnRet mm")
#define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet F")
#define MSG_AUTORETRACT _UxGT("AutoRetr.")
#define MSG_FILAMENTCHANGE _UxGT("Verv. Filament")

View file

@ -141,8 +141,8 @@
#define MSG_CONTROL_RETRACT_SWAP _UxGT("Z Wycof. mm")
#define MSG_CONTROL_RETRACTF _UxGT("Wycofaj V")
#define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Skok Z mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("Cof. wycof. +mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Z Cof. wyc. +mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("Cof. wycof. mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Z Cof. wyc. mm")
#define MSG_CONTROL_RETRACT_RECOVERF _UxGT("Cof. wycof. V")
#define MSG_AUTORETRACT _UxGT("Auto. wycofanie")
#define MSG_FILAMENTCHANGE _UxGT("Zmien filament")

View file

@ -134,8 +134,8 @@
#define MSG_CONTROL_RETRACT_SWAP "Retrair Troca mm"
#define MSG_CONTROL_RETRACTF "Retrair V"
#define MSG_CONTROL_RETRACT_ZLIFT "Levantar mm"
#define MSG_CONTROL_RETRACT_RECOVER "Des Retrair +mm"
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "Des RetTroca +mm"
#define MSG_CONTROL_RETRACT_RECOVER "Des Retrair mm"
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "Des RetTroca mm"
#define MSG_CONTROL_RETRACT_RECOVERF "Des Retrair V"
#define MSG_AUTORETRACT "Retracao Autom."
#define MSG_FILAMENTCHANGE "Trocar Filamento"

View file

@ -134,8 +134,8 @@
#define MSG_CONTROL_RETRACT_SWAP _UxGT("Retrair Troca mm")
#define MSG_CONTROL_RETRACTF _UxGT("Retrair V")
#define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Levantar mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("Des Retrair +mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Des RetTroca +mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("Des Retrair mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Des RetTroca mm")
#define MSG_CONTROL_RETRACT_RECOVERF _UxGT("Des Retrair V")
#define MSG_AUTORETRACT _UxGT("Retração Autom.")
#define MSG_FILAMENTCHANGE _UxGT("Trocar Filamento")

View file

@ -138,8 +138,8 @@
#define MSG_CONTROL_RETRACT_SWAP "Troca Retrair mm"
#define MSG_CONTROL_RETRACTF " Retrair V"
#define MSG_CONTROL_RETRACT_ZLIFT " Levantar mm"
#define MSG_CONTROL_RETRACT_RECOVER " DesRet +mm"
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "Troca DesRet +mm"
#define MSG_CONTROL_RETRACT_RECOVER " DesRet mm"
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "Troca DesRet mm"
#define MSG_CONTROL_RETRACT_RECOVERF " DesRet V"
#define MSG_AUTORETRACT " AutoRetr."
#define MSG_FILAMENTCHANGE "Trocar filamento"

View file

@ -138,8 +138,8 @@
#define MSG_CONTROL_RETRACT_SWAP _UxGT("Troca Retrair mm")
#define MSG_CONTROL_RETRACTF _UxGT(" Retrair V")
#define MSG_CONTROL_RETRACT_ZLIFT _UxGT(" Levantar mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT(" DesRet +mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Troca DesRet +mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT(" DesRet mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Troca DesRet mm")
#define MSG_CONTROL_RETRACT_RECOVERF _UxGT(" DesRet V")
#define MSG_AUTORETRACT _UxGT(" AutoRetr.")
#define MSG_FILAMENTCHANGE _UxGT("Trocar filamento")

View file

@ -138,8 +138,8 @@
#define MSG_CONTROL_RETRACT_SWAP _UxGT("Втяг. смены mm")
#define MSG_CONTROL_RETRACTF _UxGT("Втягивание V")
#define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Втяг. прыжка mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("Возврат +mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Возврат смены +mm")
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("Возврат mm")
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Возврат смены mm")
#define MSG_CONTROL_RETRACT_RECOVERF _UxGT("Возврат V")
#define MSG_AUTORETRACT _UxGT("Авто Втягивание")
#define MSG_FILAMENTCHANGE _UxGT("Смена прутка")

View file

@ -146,8 +146,8 @@
#define MSG_CONTROL_RETRACT_SWAP _UxGT("Swap Re.mm") // Swap Re.mm
#define MSG_CONTROL_RETRACTF _UxGT("Geri Çekme V") // Geri Çekme V
#define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Hop mm") // Hop mm
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet +mm") // UnRet +mm
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRet+mm") // S UnRet+mm
#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm") // UnRet mm
#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRetmm") // S UnRetmm
#define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V") // UnRet V
#define MSG_AUTORETRACT _UxGT("AutoRetr.") // AutoRetr.
#define MSG_FILAMENTCHANGE _UxGT("Filaman Değiştir") // Filaman Değiştir

View file

@ -2164,7 +2164,7 @@ KeepDrawing:
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_ZLIFT, &retract_zlift, 0, 999);
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_RECOVER, &retract_recover_length, -100, 100);
#if EXTRUDERS > 1
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_RECOVER_SWAP, &retract_recover_length_swap, 0, 100);
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_RECOVER_SWAP, &retract_recover_length_swap, -100, 100);
#endif
MENU_ITEM_EDIT(float3, MSG_CONTROL_RETRACT_RECOVERF, &retract_recover_feedrate_mm_s, 1, 999);
END_MENU();