Merge pull request #5436 from esenapaj/Remove-redundant-E,-etc-plan-B
Remove redundant "E", etc plan B
This commit is contained in:
		
						commit
						a1e0842c8b
					
				| @ -262,10 +262,10 @@ | |||||||
| #define MSG_N2 " 2" | #define MSG_N2 " 2" | ||||||
| #define MSG_N3 " 3" | #define MSG_N3 " 3" | ||||||
| #define MSG_N4 " 4" | #define MSG_N4 " 4" | ||||||
| #define MSG_E1 " E1" | #define MSG_E1 "E1" | ||||||
| #define MSG_E2 " E2" | #define MSG_E2 "E2" | ||||||
| #define MSG_E3 " E3" | #define MSG_E3 "E3" | ||||||
| #define MSG_E4 " E4" | #define MSG_E4 "E4" | ||||||
| #define MSG_MOVE_E1 "1" | #define MSG_MOVE_E1 "1" | ||||||
| #define MSG_MOVE_E2 "2" | #define MSG_MOVE_E2 "2" | ||||||
| #define MSG_MOVE_E3 "3" | #define MSG_MOVE_E3 "3" | ||||||
|  | |||||||
| @ -99,6 +99,10 @@ | |||||||
| #define MSG_YSTEPS                          "Y trangos/mm" | #define MSG_YSTEPS                          "Y trangos/mm" | ||||||
| #define MSG_ZSTEPS                          "Z trangos/mm" | #define MSG_ZSTEPS                          "Z trangos/mm" | ||||||
| #define MSG_ESTEPS                          "E trangos/mm" | #define MSG_ESTEPS                          "E trangos/mm" | ||||||
|  | #define MSG_E1STEPS                         "E1 trangos/mm" | ||||||
|  | #define MSG_E2STEPS                         "E2 trangos/mm" | ||||||
|  | #define MSG_E3STEPS                         "E3 trangos/mm" | ||||||
|  | #define MSG_E4STEPS                         "E4 trangos/mm" | ||||||
| #define MSG_TEMPERATURE                     "Temperatura" | #define MSG_TEMPERATURE                     "Temperatura" | ||||||
| #define MSG_MOTION                          "Movimiento" | #define MSG_MOTION                          "Movimiento" | ||||||
| #define MSG_VOLUMETRIC                      "Filament" | #define MSG_VOLUMETRIC                      "Filament" | ||||||
|  | |||||||
| @ -109,6 +109,10 @@ | |||||||
| #define MSG_YSTEPS                          "Y стъпки/mm" | #define MSG_YSTEPS                          "Y стъпки/mm" | ||||||
| #define MSG_ZSTEPS                          "Z стъпки/mm" | #define MSG_ZSTEPS                          "Z стъпки/mm" | ||||||
| #define MSG_ESTEPS                          "E стъпки/mm" | #define MSG_ESTEPS                          "E стъпки/mm" | ||||||
|  | #define MSG_E1STEPS                         "E1 стъпки/mm" | ||||||
|  | #define MSG_E2STEPS                         "E2 стъпки/mm" | ||||||
|  | #define MSG_E3STEPS                         "E3 стъпки/mm" | ||||||
|  | #define MSG_E4STEPS                         "E4 стъпки/mm" | ||||||
| #define MSG_TEMPERATURE                     "Температура" | #define MSG_TEMPERATURE                     "Температура" | ||||||
| #define MSG_MOTION                          "Движение" | #define MSG_MOTION                          "Движение" | ||||||
| #define MSG_VOLUMETRIC                      "Нишка" | #define MSG_VOLUMETRIC                      "Нишка" | ||||||
|  | |||||||
| @ -100,6 +100,10 @@ | |||||||
| #define MSG_YSTEPS                          "Ypassos/mm" | #define MSG_YSTEPS                          "Ypassos/mm" | ||||||
| #define MSG_ZSTEPS                          "Zpassos/mm" | #define MSG_ZSTEPS                          "Zpassos/mm" | ||||||
| #define MSG_ESTEPS                          "Epassos/mm" | #define MSG_ESTEPS                          "Epassos/mm" | ||||||
|  | #define MSG_E1STEPS                         "E1passos/mm" | ||||||
|  | #define MSG_E2STEPS                         "E2passos/mm" | ||||||
|  | #define MSG_E3STEPS                         "E3passos/mm" | ||||||
|  | #define MSG_E4STEPS                         "E4passos/mm" | ||||||
| #define MSG_TEMPERATURE                     "Temperatura" | #define MSG_TEMPERATURE                     "Temperatura" | ||||||
| #define MSG_MOTION                          "Moviment" | #define MSG_MOTION                          "Moviment" | ||||||
| #define MSG_VOLUMETRIC                      "Filament" | #define MSG_VOLUMETRIC                      "Filament" | ||||||
|  | |||||||
| @ -101,6 +101,10 @@ | |||||||
| #define MSG_YSTEPS                          "Ysteps/mm" | #define MSG_YSTEPS                          "Ysteps/mm" | ||||||
| #define MSG_ZSTEPS                          "Zsteps/mm" | #define MSG_ZSTEPS                          "Zsteps/mm" | ||||||
| #define MSG_ESTEPS                          "Esteps/mm" | #define MSG_ESTEPS                          "Esteps/mm" | ||||||
|  | #define MSG_E1STEPS                         "E1steps/mm" | ||||||
|  | #define MSG_E2STEPS                         "E2steps/mm" | ||||||
|  | #define MSG_E3STEPS                         "E3steps/mm" | ||||||
|  | #define MSG_E4STEPS                         "E4steps/mm" | ||||||
| #define MSG_TEMPERATURE                     "\xc9\xd2" | #define MSG_TEMPERATURE                     "\xc9\xd2" | ||||||
| #define MSG_MOTION                          "\xdf\xb2" | #define MSG_MOTION                          "\xdf\xb2" | ||||||
| #define MSG_VOLUMETRIC                      "Filament" | #define MSG_VOLUMETRIC                      "Filament" | ||||||
|  | |||||||
| @ -112,6 +112,10 @@ | |||||||
| #define MSG_YSTEPS                          "Ykroku/mm" | #define MSG_YSTEPS                          "Ykroku/mm" | ||||||
| #define MSG_ZSTEPS                          "Zkroku/mm" | #define MSG_ZSTEPS                          "Zkroku/mm" | ||||||
| #define MSG_ESTEPS                          "Ekroku/mm" | #define MSG_ESTEPS                          "Ekroku/mm" | ||||||
|  | #define MSG_E1STEPS                         "E1kroku/mm" | ||||||
|  | #define MSG_E2STEPS                         "E2kroku/mm" | ||||||
|  | #define MSG_E3STEPS                         "E3kroku/mm" | ||||||
|  | #define MSG_E4STEPS                         "E4kroku/mm" | ||||||
| #define MSG_TEMPERATURE                     "Teplota" | #define MSG_TEMPERATURE                     "Teplota" | ||||||
| #define MSG_MOTION                          "Pohyb" | #define MSG_MOTION                          "Pohyb" | ||||||
| #define MSG_VOLUMETRIC                      "Filament" | #define MSG_VOLUMETRIC                      "Filament" | ||||||
|  | |||||||
| @ -110,6 +110,10 @@ | |||||||
| #define MSG_YSTEPS                          "Ysteps/mm" | #define MSG_YSTEPS                          "Ysteps/mm" | ||||||
| #define MSG_ZSTEPS                          "Zsteps/mm" | #define MSG_ZSTEPS                          "Zsteps/mm" | ||||||
| #define MSG_ESTEPS                          "Esteps/mm" | #define MSG_ESTEPS                          "Esteps/mm" | ||||||
|  | #define MSG_E1STEPS                         "E1steps/mm" | ||||||
|  | #define MSG_E2STEPS                         "E2steps/mm" | ||||||
|  | #define MSG_E3STEPS                         "E3steps/mm" | ||||||
|  | #define MSG_E4STEPS                         "E4steps/mm" | ||||||
| #define MSG_TEMPERATURE                     "Temperatur" | #define MSG_TEMPERATURE                     "Temperatur" | ||||||
| #define MSG_MOTION                          "Bevægelse" | #define MSG_MOTION                          "Bevægelse" | ||||||
| #define MSG_VOLUMETRIC                      "Filament" | #define MSG_VOLUMETRIC                      "Filament" | ||||||
|  | |||||||
| @ -109,6 +109,10 @@ | |||||||
| #define MSG_YSTEPS                          "Y Steps/mm" | #define MSG_YSTEPS                          "Y Steps/mm" | ||||||
| #define MSG_ZSTEPS                          "Z Steps/mm" | #define MSG_ZSTEPS                          "Z Steps/mm" | ||||||
| #define MSG_ESTEPS                          "E Steps/mm" | #define MSG_ESTEPS                          "E Steps/mm" | ||||||
|  | #define MSG_E1STEPS                         "E1 Steps/mm" | ||||||
|  | #define MSG_E2STEPS                         "E2 Steps/mm" | ||||||
|  | #define MSG_E3STEPS                         "E3 Steps/mm" | ||||||
|  | #define MSG_E4STEPS                         "E4 Steps/mm" | ||||||
| #define MSG_TEMPERATURE                     "Temperatur" | #define MSG_TEMPERATURE                     "Temperatur" | ||||||
| #define MSG_MOTION                          "Bewegung" | #define MSG_MOTION                          "Bewegung" | ||||||
| #define MSG_VOLUMETRIC                      "Filament" | #define MSG_VOLUMETRIC                      "Filament" | ||||||
|  | |||||||
| @ -108,6 +108,10 @@ | |||||||
| #define MSG_YSTEPS                          "Bήματα Υ ανά μμ" | #define MSG_YSTEPS                          "Bήματα Υ ανά μμ" | ||||||
| #define MSG_ZSTEPS                          "Bήματα Ζ ανά μμ" | #define MSG_ZSTEPS                          "Bήματα Ζ ανά μμ" | ||||||
| #define MSG_ESTEPS                          "Bήματα Ε ανά μμ" | #define MSG_ESTEPS                          "Bήματα Ε ανά μμ" | ||||||
|  | #define MSG_E1STEPS                         "Bήματα Ε1 ανά μμ" | ||||||
|  | #define MSG_E2STEPS                         "Bήματα Ε2 ανά μμ" | ||||||
|  | #define MSG_E3STEPS                         "Bήματα Ε3 ανά μμ" | ||||||
|  | #define MSG_E4STEPS                         "Bήματα Ε4 ανά μμ" | ||||||
| #define MSG_TEMPERATURE                     "Θερμοκρασία" | #define MSG_TEMPERATURE                     "Θερμοκρασία" | ||||||
| #define MSG_MOTION                          "Κίνηση" | #define MSG_MOTION                          "Κίνηση" | ||||||
| #define MSG_VOLUMETRIC                      "Νήμα" | #define MSG_VOLUMETRIC                      "Νήμα" | ||||||
|  | |||||||
| @ -108,6 +108,10 @@ | |||||||
| #define MSG_YSTEPS                          "Bήματα Υ ανά μμ" | #define MSG_YSTEPS                          "Bήματα Υ ανά μμ" | ||||||
| #define MSG_ZSTEPS                          "Bήματα Ζ ανά μμ" | #define MSG_ZSTEPS                          "Bήματα Ζ ανά μμ" | ||||||
| #define MSG_ESTEPS                          "Bήματα Ε ανά μμ" | #define MSG_ESTEPS                          "Bήματα Ε ανά μμ" | ||||||
|  | #define MSG_E1STEPS                         "Bήματα Ε1 ανά μμ" | ||||||
|  | #define MSG_E2STEPS                         "Bήματα Ε2 ανά μμ" | ||||||
|  | #define MSG_E3STEPS                         "Bήματα Ε3 ανά μμ" | ||||||
|  | #define MSG_E4STEPS                         "Bήματα Ε4 ανά μμ" | ||||||
| #define MSG_TEMPERATURE                     "Θερμοκρασία" | #define MSG_TEMPERATURE                     "Θερμοκρασία" | ||||||
| #define MSG_MOTION                          "Κίνηση" | #define MSG_MOTION                          "Κίνηση" | ||||||
| #define MSG_VOLUMETRIC                      "Νήμα" | #define MSG_VOLUMETRIC                      "Νήμα" | ||||||
|  | |||||||
| @ -258,6 +258,18 @@ | |||||||
| #ifndef MSG_ESTEPS | #ifndef MSG_ESTEPS | ||||||
|   #define MSG_ESTEPS                          "Esteps/mm" |   #define MSG_ESTEPS                          "Esteps/mm" | ||||||
| #endif | #endif | ||||||
|  | #ifndef MSG_E1STEPS | ||||||
|  |   #define MSG_E1STEPS                         "E1steps/mm" | ||||||
|  | #endif | ||||||
|  | #ifndef MSG_E2STEPS | ||||||
|  |   #define MSG_E2STEPS                         "E2steps/mm" | ||||||
|  | #endif | ||||||
|  | #ifndef MSG_E3STEPS | ||||||
|  |   #define MSG_E3STEPS                         "E3steps/mm" | ||||||
|  | #endif | ||||||
|  | #ifndef MSG_E4STEPS | ||||||
|  |   #define MSG_E4STEPS                         "E4steps/mm" | ||||||
|  | #endif | ||||||
| #ifndef MSG_TEMPERATURE | #ifndef MSG_TEMPERATURE | ||||||
|   #define MSG_TEMPERATURE                     "Temperature" |   #define MSG_TEMPERATURE                     "Temperature" | ||||||
| #endif | #endif | ||||||
|  | |||||||
| @ -106,6 +106,10 @@ | |||||||
| #define MSG_YSTEPS                          "Y pasos/mm" | #define MSG_YSTEPS                          "Y pasos/mm" | ||||||
| #define MSG_ZSTEPS                          "Z pasos/mm" | #define MSG_ZSTEPS                          "Z pasos/mm" | ||||||
| #define MSG_ESTEPS                          "E pasos/mm" | #define MSG_ESTEPS                          "E pasos/mm" | ||||||
|  | #define MSG_E1STEPS                         "E1 pasos/mm" | ||||||
|  | #define MSG_E2STEPS                         "E2 pasos/mm" | ||||||
|  | #define MSG_E3STEPS                         "E3 pasos/mm" | ||||||
|  | #define MSG_E4STEPS                         "E4 pasos/mm" | ||||||
| #define MSG_TEMPERATURE                     "Temperatura" | #define MSG_TEMPERATURE                     "Temperatura" | ||||||
| #define MSG_MOTION                          "Movimiento" | #define MSG_MOTION                          "Movimiento" | ||||||
| #define MSG_VOLUMETRIC                      "Filamento" | #define MSG_VOLUMETRIC                      "Filamento" | ||||||
|  | |||||||
| @ -99,6 +99,10 @@ | |||||||
| #define MSG_YSTEPS                          "Y pausoak/mm" | #define MSG_YSTEPS                          "Y pausoak/mm" | ||||||
| #define MSG_ZSTEPS                          "Z pausoak/mm" | #define MSG_ZSTEPS                          "Z pausoak/mm" | ||||||
| #define MSG_ESTEPS                          "E pausoak/mm" | #define MSG_ESTEPS                          "E pausoak/mm" | ||||||
|  | #define MSG_E1STEPS                         "E1 pausoak/mm" | ||||||
|  | #define MSG_E2STEPS                         "E2 pausoak/mm" | ||||||
|  | #define MSG_E3STEPS                         "E3 pausoak/mm" | ||||||
|  | #define MSG_E4STEPS                         "E4 pausoak/mm" | ||||||
| #define MSG_TEMPERATURE                     "Tenperatura" | #define MSG_TEMPERATURE                     "Tenperatura" | ||||||
| #define MSG_MOTION                          "Mugimendua" | #define MSG_MOTION                          "Mugimendua" | ||||||
| #define MSG_VOLUMETRIC                      "Filament" | #define MSG_VOLUMETRIC                      "Filament" | ||||||
|  | |||||||
| @ -100,6 +100,10 @@ | |||||||
| #define MSG_YSTEPS                          "Ysteps/mm" | #define MSG_YSTEPS                          "Ysteps/mm" | ||||||
| #define MSG_ZSTEPS                          "Zsteps/mm" | #define MSG_ZSTEPS                          "Zsteps/mm" | ||||||
| #define MSG_ESTEPS                          "Esteps/mm" | #define MSG_ESTEPS                          "Esteps/mm" | ||||||
|  | #define MSG_E1STEPS                         "E1steps/mm" | ||||||
|  | #define MSG_E2STEPS                         "E2steps/mm" | ||||||
|  | #define MSG_E3STEPS                         "E3steps/mm" | ||||||
|  | #define MSG_E4STEPS                         "E4steps/mm" | ||||||
| #define MSG_TEMPERATURE                     "Lämpötila" | #define MSG_TEMPERATURE                     "Lämpötila" | ||||||
| #define MSG_MOTION                          "Liike" | #define MSG_MOTION                          "Liike" | ||||||
| #define MSG_VOLUMETRIC                      "Filament" | #define MSG_VOLUMETRIC                      "Filament" | ||||||
|  | |||||||
| @ -108,6 +108,10 @@ | |||||||
| #define MSG_YSTEPS                          "Ypas/mm" | #define MSG_YSTEPS                          "Ypas/mm" | ||||||
| #define MSG_ZSTEPS                          "Zpas/mm" | #define MSG_ZSTEPS                          "Zpas/mm" | ||||||
| #define MSG_ESTEPS                          "Epas/mm" | #define MSG_ESTEPS                          "Epas/mm" | ||||||
|  | #define MSG_E1STEPS                         "E1pas/mm" | ||||||
|  | #define MSG_E2STEPS                         "E2pas/mm" | ||||||
|  | #define MSG_E3STEPS                         "E3pas/mm" | ||||||
|  | #define MSG_E4STEPS                         "E4pas/mm" | ||||||
| #define MSG_TEMPERATURE                     "Temperature" | #define MSG_TEMPERATURE                     "Temperature" | ||||||
| #define MSG_MOTION                          "Mouvement" | #define MSG_MOTION                          "Mouvement" | ||||||
| #define MSG_VOLUMETRIC                      "Filament" | #define MSG_VOLUMETRIC                      "Filament" | ||||||
|  | |||||||
| @ -109,6 +109,10 @@ | |||||||
| #define MSG_YSTEPS                          "Ypasos/mm" | #define MSG_YSTEPS                          "Ypasos/mm" | ||||||
| #define MSG_ZSTEPS                          "Zpasos/mm" | #define MSG_ZSTEPS                          "Zpasos/mm" | ||||||
| #define MSG_ESTEPS                          "Epasos/mm" | #define MSG_ESTEPS                          "Epasos/mm" | ||||||
|  | #define MSG_E1STEPS                         "E1pasos/mm" | ||||||
|  | #define MSG_E2STEPS                         "E2pasos/mm" | ||||||
|  | #define MSG_E3STEPS                         "E3pasos/mm" | ||||||
|  | #define MSG_E4STEPS                         "E4pasos/mm" | ||||||
| #define MSG_TEMPERATURE                     "Temperatura" | #define MSG_TEMPERATURE                     "Temperatura" | ||||||
| #define MSG_MOTION                          "Movemento" | #define MSG_MOTION                          "Movemento" | ||||||
| #define MSG_VOLUMETRIC                      "Filamento" | #define MSG_VOLUMETRIC                      "Filamento" | ||||||
|  | |||||||
| @ -108,6 +108,10 @@ | |||||||
| #define MSG_YSTEPS                          "Ysteps/mm" | #define MSG_YSTEPS                          "Ysteps/mm" | ||||||
| #define MSG_ZSTEPS                          "Zsteps/mm" | #define MSG_ZSTEPS                          "Zsteps/mm" | ||||||
| #define MSG_ESTEPS                          "Esteps/mm" | #define MSG_ESTEPS                          "Esteps/mm" | ||||||
|  | #define MSG_E1STEPS                         "E1steps/mm" | ||||||
|  | #define MSG_E2STEPS                         "E2steps/mm" | ||||||
|  | #define MSG_E3STEPS                         "E3steps/mm" | ||||||
|  | #define MSG_E4STEPS                         "E4steps/mm" | ||||||
| #define MSG_TEMPERATURE                     "Temperature" | #define MSG_TEMPERATURE                     "Temperature" | ||||||
| #define MSG_MOTION                          "Gibanje" | #define MSG_MOTION                          "Gibanje" | ||||||
| #define MSG_VOLUMETRIC                      "Filament" | #define MSG_VOLUMETRIC                      "Filament" | ||||||
|  | |||||||
| @ -116,6 +116,10 @@ | |||||||
| #define MSG_YSTEPS                          "Ypassi/mm" | #define MSG_YSTEPS                          "Ypassi/mm" | ||||||
| #define MSG_ZSTEPS                          "Zpassi/mm" | #define MSG_ZSTEPS                          "Zpassi/mm" | ||||||
| #define MSG_ESTEPS                          "Epassi/mm" | #define MSG_ESTEPS                          "Epassi/mm" | ||||||
|  | #define MSG_E1STEPS                         "E1passi/mm" | ||||||
|  | #define MSG_E2STEPS                         "E2passi/mm" | ||||||
|  | #define MSG_E3STEPS                         "E3passi/mm" | ||||||
|  | #define MSG_E4STEPS                         "E4passi/mm" | ||||||
| #define MSG_TEMPERATURE                     "Temperatura" | #define MSG_TEMPERATURE                     "Temperatura" | ||||||
| #define MSG_MOTION                          "Movimento" | #define MSG_MOTION                          "Movimento" | ||||||
| #define MSG_VOLUMETRIC                      "Filamento" | #define MSG_VOLUMETRIC                      "Filamento" | ||||||
|  | |||||||
| @ -129,11 +129,19 @@ | |||||||
|   #define MSG_YSTEPS                          "Ysteps/mm" |   #define MSG_YSTEPS                          "Ysteps/mm" | ||||||
|   #define MSG_ZSTEPS                          "Zsteps/mm" |   #define MSG_ZSTEPS                          "Zsteps/mm" | ||||||
|   #define MSG_ESTEPS                          "Esteps/mm" |   #define MSG_ESTEPS                          "Esteps/mm" | ||||||
|  |   #define MSG_E1STEPS                         "E1steps/mm" | ||||||
|  |   #define MSG_E2STEPS                         "E2steps/mm" | ||||||
|  |   #define MSG_E3STEPS                         "E3steps/mm" | ||||||
|  |   #define MSG_E4STEPS                         "E4steps/mm" | ||||||
| #else | #else | ||||||
|   #define MSG_XSTEPS                          "Xsteps" |   #define MSG_XSTEPS                          "Xsteps" | ||||||
|   #define MSG_YSTEPS                          "Ysteps" |   #define MSG_YSTEPS                          "Ysteps" | ||||||
|   #define MSG_ZSTEPS                          "Zsteps" |   #define MSG_ZSTEPS                          "Zsteps" | ||||||
|   #define MSG_ESTEPS                          "Esteps" |   #define MSG_ESTEPS                          "Esteps" | ||||||
|  |   #define MSG_E1STEPS                         "E1steps" | ||||||
|  |   #define MSG_E2STEPS                         "E2steps" | ||||||
|  |   #define MSG_E3STEPS                         "E3steps" | ||||||
|  |   #define MSG_E4STEPS                         "E4steps" | ||||||
| #endif | #endif | ||||||
| #define MSG_TEMPERATURE                     "\xb5\xdd\xc4\xde"                                                 // "オンド" ("Temperature")
 | #define MSG_TEMPERATURE                     "\xb5\xdd\xc4\xde"                                                 // "オンド" ("Temperature")
 | ||||||
| #define MSG_MOTION                          "\xb3\xba\xde\xb7\xbe\xaf\xc3\xb2"                                 // "ウゴキセッテイ" ("Motion")
 | #define MSG_MOTION                          "\xb3\xba\xde\xb7\xbe\xaf\xc3\xb2"                                 // "ウゴキセッテイ" ("Motion")
 | ||||||
|  | |||||||
| @ -114,6 +114,10 @@ | |||||||
| #define MSG_YSTEPS                          "Ysteps/mm" | #define MSG_YSTEPS                          "Ysteps/mm" | ||||||
| #define MSG_ZSTEPS                          "Zsteps/mm" | #define MSG_ZSTEPS                          "Zsteps/mm" | ||||||
| #define MSG_ESTEPS                          "Esteps/mm" | #define MSG_ESTEPS                          "Esteps/mm" | ||||||
|  | #define MSG_E1STEPS                         "E1steps/mm" | ||||||
|  | #define MSG_E2STEPS                         "E2steps/mm" | ||||||
|  | #define MSG_E3STEPS                         "E3steps/mm" | ||||||
|  | #define MSG_E4STEPS                         "E4steps/mm" | ||||||
| #define MSG_TEMPERATURE                     "オンド"                      // "Temperature"
 | #define MSG_TEMPERATURE                     "オンド"                      // "Temperature"
 | ||||||
| #define MSG_MOTION                          "ウゴキセッテイ"                // "Motion"
 | #define MSG_MOTION                          "ウゴキセッテイ"                // "Motion"
 | ||||||
| #define MSG_VOLUMETRIC                      "フィラメント"                   // "Filament"
 | #define MSG_VOLUMETRIC                      "フィラメント"                   // "Filament"
 | ||||||
|  | |||||||
| @ -101,6 +101,10 @@ | |||||||
| #define MSG_YSTEPS                          "Ysteps/mm" | #define MSG_YSTEPS                          "Ysteps/mm" | ||||||
| #define MSG_ZSTEPS                          "Zsteps/mm" | #define MSG_ZSTEPS                          "Zsteps/mm" | ||||||
| #define MSG_ESTEPS                          "Esteps/mm" | #define MSG_ESTEPS                          "Esteps/mm" | ||||||
|  | #define MSG_E1STEPS                         "E1steps/mm" | ||||||
|  | #define MSG_E2STEPS                         "E2steps/mm" | ||||||
|  | #define MSG_E3STEPS                         "E3steps/mm" | ||||||
|  | #define MSG_E4STEPS                         "E4steps/mm" | ||||||
| #define MSG_TEMPERATURE                     "Temperatuur" | #define MSG_TEMPERATURE                     "Temperatuur" | ||||||
| #define MSG_MOTION                          "Beweging" | #define MSG_MOTION                          "Beweging" | ||||||
| #define MSG_VOLUMETRIC                      "Filament" | #define MSG_VOLUMETRIC                      "Filament" | ||||||
|  | |||||||
| @ -108,6 +108,10 @@ | |||||||
| #define MSG_YSTEPS                          "krokiY/mm" | #define MSG_YSTEPS                          "krokiY/mm" | ||||||
| #define MSG_ZSTEPS                          "krokiZ/mm" | #define MSG_ZSTEPS                          "krokiZ/mm" | ||||||
| #define MSG_ESTEPS                          "krokiE/mm" | #define MSG_ESTEPS                          "krokiE/mm" | ||||||
|  | #define MSG_E1STEPS                         "krokiE1/mm" | ||||||
|  | #define MSG_E2STEPS                         "krokiE2/mm" | ||||||
|  | #define MSG_E3STEPS                         "krokiE3/mm" | ||||||
|  | #define MSG_E4STEPS                         "krokiE4/mm" | ||||||
| #define MSG_TEMPERATURE                     "Temperatura" | #define MSG_TEMPERATURE                     "Temperatura" | ||||||
| #define MSG_MOTION                          "Ruch" | #define MSG_MOTION                          "Ruch" | ||||||
| #define MSG_VOLUMETRIC                      "Filament" | #define MSG_VOLUMETRIC                      "Filament" | ||||||
|  | |||||||
| @ -101,6 +101,10 @@ | |||||||
| #define MSG_YSTEPS                          "Passo Y/mm" | #define MSG_YSTEPS                          "Passo Y/mm" | ||||||
| #define MSG_ZSTEPS                          "Passo Z/mm" | #define MSG_ZSTEPS                          "Passo Z/mm" | ||||||
| #define MSG_ESTEPS                          "E/mm" | #define MSG_ESTEPS                          "E/mm" | ||||||
|  | #define MSG_E1STEPS                         "E1/mm" | ||||||
|  | #define MSG_E2STEPS                         "E2/mm" | ||||||
|  | #define MSG_E3STEPS                         "E3/mm" | ||||||
|  | #define MSG_E4STEPS                         "E4/mm" | ||||||
| #define MSG_TEMPERATURE                     "Temperatura" | #define MSG_TEMPERATURE                     "Temperatura" | ||||||
| #define MSG_MOTION                          "Movimento" | #define MSG_MOTION                          "Movimento" | ||||||
| #define MSG_VOLUMETRIC                      "Filamento" | #define MSG_VOLUMETRIC                      "Filamento" | ||||||
|  | |||||||
| @ -101,6 +101,10 @@ | |||||||
| #define MSG_YSTEPS                          "Passo Y/mm" | #define MSG_YSTEPS                          "Passo Y/mm" | ||||||
| #define MSG_ZSTEPS                          "Passo Z/mm" | #define MSG_ZSTEPS                          "Passo Z/mm" | ||||||
| #define MSG_ESTEPS                          "E/mm" | #define MSG_ESTEPS                          "E/mm" | ||||||
|  | #define MSG_E1STEPS                         "E1/mm" | ||||||
|  | #define MSG_E2STEPS                         "E2/mm" | ||||||
|  | #define MSG_E3STEPS                         "E3/mm" | ||||||
|  | #define MSG_E4STEPS                         "E4/mm" | ||||||
| #define MSG_TEMPERATURE                     "Temperatura" | #define MSG_TEMPERATURE                     "Temperatura" | ||||||
| #define MSG_MOTION                          "Movimento" | #define MSG_MOTION                          "Movimento" | ||||||
| #define MSG_VOLUMETRIC                      "Filamento" | #define MSG_VOLUMETRIC                      "Filamento" | ||||||
|  | |||||||
| @ -105,6 +105,10 @@ | |||||||
| #define MSG_YSTEPS                          "Y passo/mm" | #define MSG_YSTEPS                          "Y passo/mm" | ||||||
| #define MSG_ZSTEPS                          "Z passo/mm" | #define MSG_ZSTEPS                          "Z passo/mm" | ||||||
| #define MSG_ESTEPS                          "E passo/mm" | #define MSG_ESTEPS                          "E passo/mm" | ||||||
|  | #define MSG_E1STEPS                         "E1 passo/mm" | ||||||
|  | #define MSG_E2STEPS                         "E2 passo/mm" | ||||||
|  | #define MSG_E3STEPS                         "E3 passo/mm" | ||||||
|  | #define MSG_E4STEPS                         "E4 passo/mm" | ||||||
| #define MSG_TEMPERATURE                     "Temperatura" | #define MSG_TEMPERATURE                     "Temperatura" | ||||||
| #define MSG_MOTION                          "Movimento" | #define MSG_MOTION                          "Movimento" | ||||||
| #define MSG_VOLUMETRIC                      "Filamento" | #define MSG_VOLUMETRIC                      "Filamento" | ||||||
|  | |||||||
| @ -105,6 +105,10 @@ | |||||||
| #define MSG_YSTEPS                          "Y passo/mm" | #define MSG_YSTEPS                          "Y passo/mm" | ||||||
| #define MSG_ZSTEPS                          "Z passo/mm" | #define MSG_ZSTEPS                          "Z passo/mm" | ||||||
| #define MSG_ESTEPS                          "E passo/mm" | #define MSG_ESTEPS                          "E passo/mm" | ||||||
|  | #define MSG_E1STEPS                         "E1 passo/mm" | ||||||
|  | #define MSG_E2STEPS                         "E2 passo/mm" | ||||||
|  | #define MSG_E3STEPS                         "E3 passo/mm" | ||||||
|  | #define MSG_E4STEPS                         "E4 passo/mm" | ||||||
| #define MSG_TEMPERATURE                     "Temperatura" | #define MSG_TEMPERATURE                     "Temperatura" | ||||||
| #define MSG_MOTION                          "Movimento" | #define MSG_MOTION                          "Movimento" | ||||||
| #define MSG_VOLUMETRIC                      "Filamento" | #define MSG_VOLUMETRIC                      "Filamento" | ||||||
|  | |||||||
| @ -105,6 +105,10 @@ | |||||||
| #define MSG_YSTEPS                          "Y шаг/мм" | #define MSG_YSTEPS                          "Y шаг/мм" | ||||||
| #define MSG_ZSTEPS                          "Z шаг/мм" | #define MSG_ZSTEPS                          "Z шаг/мм" | ||||||
| #define MSG_ESTEPS                          "E шаг/мм" | #define MSG_ESTEPS                          "E шаг/мм" | ||||||
|  | #define MSG_E1STEPS                         "E1 шаг/мм" | ||||||
|  | #define MSG_E2STEPS                         "E2 шаг/мм" | ||||||
|  | #define MSG_E3STEPS                         "E3 шаг/мм" | ||||||
|  | #define MSG_E4STEPS                         "E4 шаг/мм" | ||||||
| #define MSG_TEMPERATURE                     "Температура" | #define MSG_TEMPERATURE                     "Температура" | ||||||
| #define MSG_MOTION                          "Механика" | #define MSG_MOTION                          "Механика" | ||||||
| #define MSG_VOLUMETRIC                      "Пруток" | #define MSG_VOLUMETRIC                      "Пруток" | ||||||
|  | |||||||
| @ -109,6 +109,10 @@ | |||||||
| #define MSG_YSTEPS                          "Ysteps/mm"                                                  //Ysteps/mm
 | #define MSG_YSTEPS                          "Ysteps/mm"                                                  //Ysteps/mm
 | ||||||
| #define MSG_ZSTEPS                          "Zsteps/mm"                                                  //Zsteps/mm
 | #define MSG_ZSTEPS                          "Zsteps/mm"                                                  //Zsteps/mm
 | ||||||
| #define MSG_ESTEPS                          "Esteps/mm"                                                  //Esteps/mm
 | #define MSG_ESTEPS                          "Esteps/mm"                                                  //Esteps/mm
 | ||||||
|  | #define MSG_E1STEPS                         "E1steps/mm"                                                 //E1steps/mm
 | ||||||
|  | #define MSG_E2STEPS                         "E2steps/mm"                                                 //E2steps/mm
 | ||||||
|  | #define MSG_E3STEPS                         "E3steps/mm"                                                 //E3steps/mm
 | ||||||
|  | #define MSG_E4STEPS                         "E4steps/mm"                                                 //E4steps/mm
 | ||||||
| #define MSG_TEMPERATURE                     "S\xfd\x63\x61kl\xfdk"                                       //Sıcaklık
 | #define MSG_TEMPERATURE                     "S\xfd\x63\x61kl\xfdk"                                       //Sıcaklık
 | ||||||
| #define MSG_MOTION                          "Hareket"                                                    //Hareket
 | #define MSG_MOTION                          "Hareket"                                                    //Hareket
 | ||||||
| #define MSG_VOLUMETRIC                      "Filaman"                                                    //Filaman
 | #define MSG_VOLUMETRIC                      "Filaman"                                                    //Filaman
 | ||||||
|  | |||||||
| @ -109,6 +109,10 @@ | |||||||
| #define MSG_YSTEPS                          "Ysteps/mm"                                                  //Ysteps/mm
 | #define MSG_YSTEPS                          "Ysteps/mm"                                                  //Ysteps/mm
 | ||||||
| #define MSG_ZSTEPS                          "Zsteps/mm"                                                  //Zsteps/mm
 | #define MSG_ZSTEPS                          "Zsteps/mm"                                                  //Zsteps/mm
 | ||||||
| #define MSG_ESTEPS                          "Esteps/mm"                                                  //Esteps/mm
 | #define MSG_ESTEPS                          "Esteps/mm"                                                  //Esteps/mm
 | ||||||
|  | #define MSG_E1STEPS                         "E1steps/mm"                                                 //E1steps/mm
 | ||||||
|  | #define MSG_E2STEPS                         "E2steps/mm"                                                 //E2steps/mm
 | ||||||
|  | #define MSG_E3STEPS                         "E3steps/mm"                                                 //E3steps/mm
 | ||||||
|  | #define MSG_E4STEPS                         "E4steps/mm"                                                 //E4steps/mm
 | ||||||
| #define MSG_TEMPERATURE                     "Sıcaklık"                                                   //Sıcaklık
 | #define MSG_TEMPERATURE                     "Sıcaklık"                                                   //Sıcaklık
 | ||||||
| #define MSG_MOTION                          "Hareket"                                                    //Hareket
 | #define MSG_MOTION                          "Hareket"                                                    //Hareket
 | ||||||
| #define MSG_VOLUMETRIC                      "Filaman"                                                    //Filaman
 | #define MSG_VOLUMETRIC                      "Filaman"                                                    //Filaman
 | ||||||
|  | |||||||
| @ -109,6 +109,10 @@ | |||||||
| #define MSG_YSTEPS                          "Yкроків/мм" | #define MSG_YSTEPS                          "Yкроків/мм" | ||||||
| #define MSG_ZSTEPS                          "Zкроків/мм" | #define MSG_ZSTEPS                          "Zкроків/мм" | ||||||
| #define MSG_ESTEPS                          "Eкроків/мм" | #define MSG_ESTEPS                          "Eкроків/мм" | ||||||
|  | #define MSG_E1STEPS                         "E1кроків/мм" | ||||||
|  | #define MSG_E2STEPS                         "E2кроків/мм" | ||||||
|  | #define MSG_E3STEPS                         "E3кроків/мм" | ||||||
|  | #define MSG_E4STEPS                         "E4кроків/мм" | ||||||
| #define MSG_TEMPERATURE                     "Температура" | #define MSG_TEMPERATURE                     "Температура" | ||||||
| #define MSG_MOTION                          "Рух" | #define MSG_MOTION                          "Рух" | ||||||
| #define MSG_VOLUMETRIC                      "Волокно" | #define MSG_VOLUMETRIC                      "Волокно" | ||||||
|  | |||||||
| @ -1515,9 +1515,9 @@ void kill_screen(const char* lcd_msg) { | |||||||
| 
 | 
 | ||||||
|       #if ENABLED(SWITCHING_EXTRUDER) |       #if ENABLED(SWITCHING_EXTRUDER) | ||||||
|         if (active_extruder) |         if (active_extruder) | ||||||
|           MENU_ITEM(gcode, MSG_SELECT MSG_E1, PSTR("T0")); |           MENU_ITEM(gcode, MSG_SELECT " " MSG_E1, PSTR("T0")); | ||||||
|         else |         else | ||||||
|           MENU_ITEM(gcode, MSG_SELECT MSG_E2, PSTR("T1")); |           MENU_ITEM(gcode, MSG_SELECT " " MSG_E2, PSTR("T1")); | ||||||
|       #endif |       #endif | ||||||
| 
 | 
 | ||||||
|       MENU_ITEM(submenu, MSG_MOVE_E, lcd_move_e); |       MENU_ITEM(submenu, MSG_MOVE_E, lcd_move_e); | ||||||
| @ -1786,12 +1786,12 @@ void kill_screen(const char* lcd_msg) { | |||||||
|       #endif |       #endif | ||||||
| 
 | 
 | ||||||
|       #if ENABLED(PID_PARAMS_PER_HOTEND) && HOTENDS > 1 |       #if ENABLED(PID_PARAMS_PER_HOTEND) && HOTENDS > 1 | ||||||
|         PID_MENU_ITEMS(MSG_E1, 0); |         PID_MENU_ITEMS(" " MSG_E1, 0); | ||||||
|         PID_MENU_ITEMS(MSG_E2, 1); |         PID_MENU_ITEMS(" " MSG_E2, 1); | ||||||
|         #if HOTENDS > 2 |         #if HOTENDS > 2 | ||||||
|           PID_MENU_ITEMS(MSG_E3, 2); |           PID_MENU_ITEMS(" " MSG_E3, 2); | ||||||
|           #if HOTENDS > 3 |           #if HOTENDS > 3 | ||||||
|             PID_MENU_ITEMS(MSG_E4, 3); |             PID_MENU_ITEMS(" " MSG_E4, 3); | ||||||
|           #endif //HOTENDS > 3
 |           #endif //HOTENDS > 3
 | ||||||
|         #endif //HOTENDS > 2
 |         #endif //HOTENDS > 2
 | ||||||
|       #else //!PID_PARAMS_PER_HOTEND || HOTENDS == 1
 |       #else //!PID_PARAMS_PER_HOTEND || HOTENDS == 1
 | ||||||
| @ -1968,12 +1968,12 @@ void kill_screen(const char* lcd_msg) { | |||||||
| 
 | 
 | ||||||
|     #if ENABLED(DISTINCT_E_FACTORS) |     #if ENABLED(DISTINCT_E_FACTORS) | ||||||
|       MENU_ITEM_EDIT_CALLBACK(float62, MSG_ESTEPS, &planner.axis_steps_per_mm[E_AXIS + active_extruder], 5, 9999, _planner_refresh_positioning); |       MENU_ITEM_EDIT_CALLBACK(float62, MSG_ESTEPS, &planner.axis_steps_per_mm[E_AXIS + active_extruder], 5, 9999, _planner_refresh_positioning); | ||||||
|       MENU_ITEM_EDIT_CALLBACK(float62, MSG_ESTEPS MSG_E1, &planner.axis_steps_per_mm[E_AXIS], 5, 9999, _planner_refresh_e0_positioning); |       MENU_ITEM_EDIT_CALLBACK(float62, MSG_E1STEPS, &planner.axis_steps_per_mm[E_AXIS], 5, 9999, _planner_refresh_e0_positioning); | ||||||
|       MENU_ITEM_EDIT_CALLBACK(float62, MSG_ESTEPS MSG_E2, &planner.axis_steps_per_mm[E_AXIS + 1], 5, 9999, _planner_refresh_e1_positioning); |       MENU_ITEM_EDIT_CALLBACK(float62, MSG_E2STEPS, &planner.axis_steps_per_mm[E_AXIS + 1], 5, 9999, _planner_refresh_e1_positioning); | ||||||
|       #if E_STEPPERS > 2 |       #if E_STEPPERS > 2 | ||||||
|         MENU_ITEM_EDIT_CALLBACK(float62, MSG_ESTEPS MSG_E3, &planner.axis_steps_per_mm[E_AXIS + 2], 5, 9999, _planner_refresh_e2_positioning); |         MENU_ITEM_EDIT_CALLBACK(float62, MSG_E3STEPS, &planner.axis_steps_per_mm[E_AXIS + 2], 5, 9999, _planner_refresh_e2_positioning); | ||||||
|         #if E_STEPPERS > 3 |         #if E_STEPPERS > 3 | ||||||
|           MENU_ITEM_EDIT_CALLBACK(float62, MSG_ESTEPS MSG_E4, &planner.axis_steps_per_mm[E_AXIS + 3], 5, 9999, _planner_refresh_e3_positioning); |           MENU_ITEM_EDIT_CALLBACK(float62, MSG_E4STEPS, &planner.axis_steps_per_mm[E_AXIS + 3], 5, 9999, _planner_refresh_e3_positioning); | ||||||
|         #endif |         #endif | ||||||
|       #endif |       #endif | ||||||
|     #else |     #else | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user