thomas
/
marlin
关注 1
点赞 0
派生 0
代码 工单 0 合并请求 0 版本发布 0 百科 动态
浏览代码

Merge pull request #4321 from esenapaj/Follow-up-the-PR-#4287 

Follow-up and fix the PR #4287 (Allow stopwatch and printcounter to go over 18:12:15)
Scott Lahteine 8 年前
父节点
7202383695 af9b1d79b1
当前提交
ed468e848f
共有 26 个文件被更改，包括 1 次插入 和 57 次删除
分列视图 显示文件统计
  1. 0
    2
      Marlin/language_an.h
  2. 0
    2
      Marlin/language_bg.h
  3. 0
    2
      Marlin/language_ca.h
  4. 0
    2
      Marlin/language_cn.h
  5. 0
    2
      Marlin/language_cz.h
  6. 0
    2
      Marlin/language_da.h
  7. 1
    3
      Marlin/language_de.h
  8. 0
    2
      Marlin/language_el-gr.h
  9. 0
    2
      Marlin/language_el.h
  10. 0
    6
      Marlin/language_en.h
  11. 0
    2
      Marlin/language_es.h
  12. 0
    2
      Marlin/language_eu.h
  13. 0
    2
      Marlin/language_fi.h
  14. 0
    2
      Marlin/language_fr.h
  15. 0
    2
      Marlin/language_gl.h
  16. 0
    2
      Marlin/language_hr.h
  17. 0
    2
      Marlin/language_it.h
  18. 0
    2
      Marlin/language_kana.h
  19. 0
    2
      Marlin/language_kana_utf8.h
  20. 0
    2
      Marlin/language_nl.h
  21. 0
    2
      Marlin/language_pl.h
  22. 0
    2
      Marlin/language_pt-br.h
  23. 0
    2
      Marlin/language_pt-br_utf8.h
  24. 0
    2
      Marlin/language_pt.h
  25. 0
    2
      Marlin/language_pt_utf8.h
  26. 0
    2
      Marlin/language_ru.h

+ 0
- 2
Marlin/language_an.h 查看文件 

@@ -148,8 +148,6 @@
148 148 
 #define MSG_BABYSTEP_Y                      "Babystep Y"
149 149 
 #define MSG_BABYSTEP_Z                      "Babystep Z"
150 150 
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
151 
-#define MSG_END_HOUR                        "hours"
152 
-#define MSG_END_MINUTE                      "minutes"
153 151 
 #define MSG_DELTA_CALIBRATE                 "Delta Calibration"
154 152 
 #define MSG_DELTA_CALIBRATE_X               "Calibrate X"
155 153 
 #define MSG_DELTA_CALIBRATE_Y               "Calibrate Y"

+ 0
- 2
Marlin/language_bg.h 查看文件 

@@ -150,8 +150,6 @@
150 150 
 #define MSG_BABYSTEP_Y                      "Министъпка Y"
151 151 
 #define MSG_BABYSTEP_Z                      "Министъпка Z"
152 152 
 #define MSG_ENDSTOP_ABORT                   "Стоп Кр.Изключватели"
153 
-#define MSG_END_HOUR                        "часа"
154 
-#define MSG_END_MINUTE                      "минути"
155 153 
 #define MSG_DELTA_CALIBRATE                 "Делта Калибровка"
156 154 
 #define MSG_DELTA_CALIBRATE_X               "Калибровка X"
157 155 
 #define MSG_DELTA_CALIBRATE_Y               "Калибровка Y"

+ 0
- 2
Marlin/language_ca.h 查看文件 

@@ -149,8 +149,6 @@
149 149 
 #define MSG_BABYSTEP_Y                      "Babystep Y"
150 150 
 #define MSG_BABYSTEP_Z                      "Babystep Z"
151 151 
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
152 
-#define MSG_END_HOUR                        "hours"
153 
-#define MSG_END_MINUTE                      "minutes"
154 152 
 #define MSG_DELTA_CALIBRATE                 "Delta Calibration"
155 153 
 #define MSG_DELTA_CALIBRATE_X               "Calibrate X"
156 154 
 #define MSG_DELTA_CALIBRATE_Y               "Calibrate Y"

+ 0
- 2
Marlin/language_cn.h 查看文件 

@@ -153,8 +153,6 @@
153 153 
 #define MSG_ERR_MAXTEMP                     "Err: MAXTEMP"
154 154 
 #define MSG_ERR_MINTEMP                     "Err: MINTEMP"
155 155 
 #define MSG_ERR_MAXTEMP_BED                 "Err: MAXTEMP BED"
156 
-#define MSG_END_HOUR                        "hours"
157 
-#define MSG_END_MINUTE                      "minutes"
158 156 
 #define MSG_DELTA_CALIBRATE                 "Delta Calibration"
159 157 
 #define MSG_DELTA_CALIBRATE_X               "Calibrate X"
160 158 
 #define MSG_DELTA_CALIBRATE_Y               "Calibrate Y"

+ 0
- 2
Marlin/language_cz.h 查看文件 

@@ -189,8 +189,6 @@
189 189 
 #define MSG_ERR_MINTEMP_BED                 "NIZ. TEPL. PODL."
190 190 
 #define MSG_HALTED                          "TISK. ZASTAVENA"
191 191 
 #define MSG_PLEASE_RESET                    "Provedte reset"
192 
-#define MSG_END_HOUR                        "hod"
193 
-#define MSG_END_MINUTE                      "min"
194 192 
 #define MSG_HEATING                         "Zahrivani..."
195 193 
 #define MSG_HEATING_COMPLETE                "Zahrati hotovo."
196 194 
 #define MSG_BED_HEATING                     "Zahrivani podl."

+ 0
- 2
Marlin/language_da.h 查看文件 

@@ -184,8 +184,6 @@
184 184 
 #define MSG_ERR_MINTEMP                     "Fejl: Min temp"
185 185 
 #define MSG_ERR_MAXTEMP_BED                 "Fejl: Maks Plsde temp"
186 186 
 #define MSG_ERR_MINTEMP_BED                 "Fejl: Min Plade temp"
187 
-#define MSG_END_HOUR                        "Timer"
188 
-#define MSG_END_MINUTE                      "Minutter"
189 187 
 #define MSG_HEATING                         "Opvarmer..."
190 188 
 #define MSG_HEATING_COMPLETE                "Opvarmet"
191 189 
 #define MSG_BED_HEATING                     "Opvarmer plade"

+ 1
- 3
Marlin/language_de.h 查看文件 

@@ -159,8 +159,6 @@
159 159 
 #define MSG_ERR_MINTEMP                     LCD_STR_THERMOMETER " UNTERSCHRITTEN"
160 160 
 #define MSG_ERR_MAXTEMP_BED                 "BETT " LCD_STR_THERMOMETER " ÜBERSCHRITTEN"
161 161 
 #define MSG_ERR_MINTEMP_BED                 "BETT " LCD_STR_THERMOMETER " UNTERSCHRITTEN"
162 
-#define MSG_END_HOUR                        "Stunden"
163 
-#define MSG_END_MINUTE                      "Minuten"
164 162 
 #define MSG_HEATING                         "Aufheizen..."
165 163 
 #define MSG_HEATING_COMPLETE                "Aufgeheizt"
166 164 
 #define MSG_BED_HEATING                     "Bett aufheizen"
 
@@ -181,7 +179,7 @@
181 179 
 #define MSG_INFO_PROTOCOL                   "Protokol"
182 180
183 181 
 #if LCD_WIDTH > 19
184 
-  #define MSG_INFO_TOTAL_PRINTS             "Gesamte Drucke   "
182 
+  #define MSG_INFO_PRINT_COUNT              "Gesamte Drucke   "
185 183 
   #define MSG_INFO_COMPLETED_PRINTS         "Beendete Drucke  "
186 184 
   #define MSG_INFO_PRINT_TIME               "Gesamte Druckzeit"
187 185 
 #else

+ 0
- 2
Marlin/language_el-gr.h 查看文件 

@@ -185,8 +185,6 @@
185 185 
 #define MSG_ERR_MINTEMP                     "Λάθος: ΕΛΑΧΙΣΤΗ ΘΕΡΜΟΤΗΤΑ"
186 186 
 #define MSG_ERR_MAXTEMP_BED                 "Λάθος: ΜΕΓΙΣΤΗ ΘΕΡΜΟΤΗΤΑ ΚΛΙΝΗΣ"
187 187 
 #define MSG_ERR_MINTEMP_BED                 "Λάθος: ΕΛΑΧΙΣΤΗ ΘΕΡΜΟΤΗΤΑ ΚΛΙΝΗΣ"
188 
-#define MSG_END_HOUR                        "ώρες"
189 
-#define MSG_END_MINUTE                      "λεπτά"
190 188 
 #define MSG_HEATING                         "Θερμαίνεται…"
191 189 
 #define MSG_HEATING_COMPLETE                "Η θέρμανση ολοκληρώθηκε."
192 190 
 #define MSG_BED_HEATING                     "Θέρμανση κλίνης."

+ 0
- 2
Marlin/language_el.h 查看文件 

@@ -187,8 +187,6 @@
187 187 
 #define MSG_ERR_MINTEMP_BED                 "ΕΛΑΧΙΣΤΗ ΘΕΡΜΟΚΡΑΣΙΑΣ ΕΠ. ΕΚΤΥΠΩΣΗΣ" //SHORTEN
188 188 
 #define MSG_HALTED                          "H εκτύπωση διακόπηκε"
189 189 
 #define MSG_PLEASE_RESET                    "PLEASE RESET" //TRANSLATE
190 
-#define MSG_END_HOUR                        "ώρες"
191 
-#define MSG_END_MINUTE                      "λεπτά"
192 190 
 #define MSG_HEATING                         "Θερμαίνεται…"
193 191 
 #define MSG_HEATING_COMPLETE                "Η θέρμανση ολοκληρώθηκε." //SHORTEN
194 192 
 #define MSG_BED_HEATING                     "Θέρμανση ΕΠ. Εκτύπωσης" //SHORTEN

+ 0
- 6
Marlin/language_en.h 查看文件 

@@ -491,12 +491,6 @@
491 491 
 #ifndef MSG_END_DAY
492 492 
   #define MSG_END_DAY                         "days"
493 493 
 #endif
494 
-#ifndef MSG_END_HOUR
495 
-  #define MSG_END_HOUR                        "hours"
496 
-#endif
497 
-#ifndef MSG_END_MINUTE
498 
-  #define MSG_END_MINUTE                      "minutes"
499 
-#endif
500 494 
 #ifndef MSG_PRINT_TIME
501 495 
   #define MSG_PRINT_TIME                      "Print time"
502 496 
 #endif

+ 0
- 2
Marlin/language_es.h 查看文件 

@@ -182,8 +182,6 @@
182 182 
 #define MSG_ERR_MINTEMP                     "Error: Temp Minima"
183 183 
 #define MSG_ERR_MAXTEMP_BED                 "Error: Temp Max Plataforma"
184 184 
 #define MSG_ERR_MINTEMP_BED                 "Error: Temp Min Plataforma"
185 
-#define MSG_END_HOUR                        "horas"
186 
-#define MSG_END_MINUTE                      "minutos"
187 185 
 #define MSG_HEATING                         "Calentando..."
188 186 
 #define MSG_HEATING_COMPLETE                "Calentamiento Completo"
189 187 
 #define MSG_BED_HEATING                     "Calentando plataforma ..."

+ 0
- 2
Marlin/language_eu.h 查看文件 

@@ -148,8 +148,6 @@
148 148 
 #define MSG_BABYSTEP_Y                      "Babystep Y"
149 149 
 #define MSG_BABYSTEP_Z                      "Babystep Z"
150 150 
 #define MSG_ENDSTOP_ABORT                   "Endstop deuseztat"
151 
-#define MSG_END_HOUR                        "hours"
152 
-#define MSG_END_MINUTE                      "minutes"
153 151 
 #define MSG_DELTA_CALIBRATE                 "Delta Calibration"
154 152 
 #define MSG_DELTA_CALIBRATE_X               "Calibrate X"
155 153 
 #define MSG_DELTA_CALIBRATE_Y               "Calibrate Y"

+ 0
- 2
Marlin/language_fi.h 查看文件 

@@ -149,8 +149,6 @@
149 149 
 #define MSG_BABYSTEP_Y                      "Babystep Y"
150 150 
 #define MSG_BABYSTEP_Z                      "Babystep Z"
151 151 
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
152 
-#define MSG_END_HOUR                        "hours"
153 
-#define MSG_END_MINUTE                      "minutes"
154 152 
 #define MSG_DELTA_CALIBRATE                 "Delta Kalibrointi"
155 153 
 #define MSG_DELTA_CALIBRATE_X               "Kalibroi X"
156 154 
 #define MSG_DELTA_CALIBRATE_Y               "Kalibroi Y"

+ 0
- 2
Marlin/language_fr.h 查看文件 

@@ -158,8 +158,6 @@
158 158 
 #define MSG_ERR_MINTEMP                     "Err: TEMP. MIN"
159 159 
 #define MSG_ERR_MAXTEMP_BED                 "Err: TEMP. MAX PLATEAU"
160 160 
 #define MSG_ERR_MINTEMP_BED                 "Err: TEMP. MIN PLATEAU"
161 
-#define MSG_END_HOUR                        "heures"
162 
-#define MSG_END_MINUTE                      "minutes"
163 161 
 #define MSG_HEATING                         "En chauffe..."
164 162 
 #define MSG_HEATING_COMPLETE                "Chauffe terminee"
165 163 
 #define MSG_BED_HEATING                     "Plateau en chauffe..."

+ 0
- 2
Marlin/language_gl.h 查看文件 

@@ -184,8 +184,6 @@
184 184 
 #define MSG_ERR_MINTEMP                     "Err: temp. min."
185 185 
 #define MSG_ERR_MAXTEMP_BED                 "Err: MAXTEMP BED"
186 186 
 #define MSG_ERR_MINTEMP_BED                 "Err: MINTEMP BED"
187 
-#define MSG_END_HOUR                        "horas"
188 
-#define MSG_END_MINUTE                      "minutos"
189 187 
 #define MSG_HEATING                         "Quentando..."
190 188 
 #define MSG_HEATING_COMPLETE                "Xa esta quente"
191 189 
 #define MSG_BED_HEATING                     "Quentando cama"

+ 0
- 2
Marlin/language_hr.h 查看文件 

@@ -184,8 +184,6 @@
184 184 
 #define MSG_ERR_MINTEMP                     "Err: MINTEMP"
185 185 
 #define MSG_ERR_MAXTEMP_BED                 "Err: MAXTEMP BED"
186 186 
 #define MSG_ERR_MINTEMP_BED                 "Err: MINTEMP BED"
187 
-#define MSG_END_HOUR                        "sati"
188 
-#define MSG_END_MINUTE                      "minuta"
189 187 
 #define MSG_HEATING                         "Grijanje..."
190 188 
 #define MSG_HEATING_COMPLETE                "Grijanje gotovo."
191 189 
 #define MSG_BED_HEATING                     "Grijanje Bed-a."

+ 0
- 2
Marlin/language_it.h 查看文件 

@@ -163,8 +163,6 @@
163 163 
 #define MSG_ERR_MINTEMP                     "Err: TEMP MINIMA"
164 164 
 #define MSG_ERR_MAXTEMP_BED                 "Err: TEMP MASSIMA PIATTO"
165 165 
 #define MSG_ERR_MINTEMP_BED                 "Err: TEMP MINIMA PIATTO"
166 
-#define MSG_END_HOUR                        "ore"
167 
-#define MSG_END_MINUTE                      "minuti"
168 166 
 #define MSG_HEATING                         "Riscaldamento.."
169 167 
 #define MSG_HEATING_COMPLETE                "Risc. completato"
170 168 
 #define MSG_BED_HEATING                     "Risc. Piatto.."

+ 0
- 2
Marlin/language_kana.h 查看文件 

@@ -220,8 +220,6 @@
220 220 
   #define MSG_ERR_MAXTEMP_BED               "\xb4\xd7\xb0:\xcd\xde\xaf\xc4\xde\x20\xbb\xb2\xba\xb3\xb5\xdd\xc1\xae\xb3\xb6" // "ｴﾗｰ:ﾍﾞｯﾄﾞ ｻｲｺｳｵﾝﾁｮｳｶ" ("Err: MAXTEMP BED")
221 221 
   #define MSG_ERR_MINTEMP_BED               "\xb4\xd7\xb0:\xcd\xde\xaf\xc4\xde\x20\xbb\xb2\xc3\xb2\xb5\xdd\xd0\xcf\xdd"     // "ｴﾗｰ:ﾍﾞｯﾄﾞ ｻｲﾃｲｵﾝﾐﾏﾝ" ("Err: MINTEMP BED")
222 222 
 #endif
223 
-#define MSG_END_HOUR                        "\xbc\xde\xb6\xdd"                                                 // "ｼﾞｶﾝ" ("hours")
224 
-#define MSG_END_MINUTE                      "\xcc\xdd"                                                         // "ﾌﾝ" ("minutes")
225 223 
 #define MSG_HEATING                         "\xb6\xc8\xc2\xc1\xad\xb3"                                         // "ｶﾈﾂﾁｭｳ" ("Heating...")
226 224 
 #define MSG_HEATING_COMPLETE                "\xb6\xc8\xc2\xb6\xdd\xd8\xae\xb3"                                 // "ｶﾈﾂｶﾝﾘｮｳ" ("Heating done.")
227 225 
 #define MSG_BED_HEATING                     "\xcd\xde\xaf\xc4\xde\x20\xb6\xc8\xc2\xc1\xad\xb3"                 // "ﾍﾞｯﾄﾞ ｶﾈﾂﾁｭｳ" ("Bed Heating.")

+ 0
- 2
Marlin/language_kana_utf8.h 查看文件 

@@ -169,8 +169,6 @@
169 169 
 #define MSG_ERR_MINTEMP                     "エラー:サイテイオンミマン"          // "Err: MINTEMP"
170 170 
 #define MSG_ERR_MAXTEMP_BED                 "エラー:ベッド サイコウオンチョウカ"    // "Err: MAXTEMP BED"
171 171 
 #define MSG_ERR_MINTEMP_BED                 "エラー:ベッド サイテイオンミマン"     // "Err: MINTEMP BED"
172 
-#define MSG_END_HOUR                        "ジカン"                       // "hours"
173 
-#define MSG_END_MINUTE                      "フン"                         // "minutes"
174 172 
 #define MSG_HEATING                         "カネツチュウ"                   // "Heating..."
175 173 
 #define MSG_HEATING_COMPLETE                "カネツカンリョウ"                 // "Heating done."
176 174 
 #define MSG_BED_HEATING                     "ベッド カネツチュウ"              // "Bed Heating."

+ 0
- 2
Marlin/language_nl.h 查看文件 

@@ -157,8 +157,6 @@
157 157 
 #define MSG_ERR_MINTEMP                     "Err: Min. temp"
158 158 
 #define MSG_ERR_MAXTEMP_BED                 "Err: Max.tmp bed"
159 159 
 #define MSG_ERR_MINTEMP_BED                 "Err: Min.tmp bed"
160 
-#define MSG_END_HOUR                        "uur"
161 
-#define MSG_END_MINUTE                      "minuten"
162 160 
 #define MSG_HEATING                         "Voorwarmen..."
163 161 
 #define MSG_HEATING_COMPLETE                "Voorverw. kompl."
164 162 
 #define MSG_BED_HEATING                     "Bed voorverw."

+ 0
- 2
Marlin/language_pl.h 查看文件 

@@ -180,8 +180,6 @@
180 180 
 #define MSG_ERR_MINTEMP                     "Err: min. temp."
181 181 
 #define MSG_ERR_MAXTEMP_BED                 "Err: max. temp. loza"
182 182 
 #define MSG_ERR_MINTEMP_BED                 "Err: min. temp. loza"
183 
-#define MSG_END_HOUR                        "godzin"
184 
-#define MSG_END_MINUTE                      "minut"
185 183 
 #define MSG_HEATING                         "Rozgrzewanie..."
186 184 
 #define MSG_HEATING_COMPLETE                "Rozgrzano"
187 185 
 #define MSG_BED_HEATING                     "Rozgrzewanie loza..."

+ 0
- 2
Marlin/language_pt-br.h 查看文件 

@@ -157,8 +157,6 @@
157 157 
 #define MSG_ERR_MINTEMP                     "Err: T Minima"
158 158 
 #define MSG_ERR_MAXTEMP_BED                 "Err: T Base Maxima"
159 159 
 #define MSG_ERR_MINTEMP_BED                 "Err: T Base Minima"
160 
-#define MSG_END_HOUR                        "Horas"
161 
-#define MSG_END_MINUTE                      "Minutos"
162 160 
 #define MSG_HEATING                         "Aquecendo..."
163 161 
 #define MSG_HEATING_COMPLETE                "Aquecida."
164 162 
 #define MSG_BED_HEATING                     "Aquecendo base.."

+ 0
- 2
Marlin/language_pt-br_utf8.h 查看文件 

@@ -157,8 +157,6 @@
157 157 
 #define MSG_ERR_MINTEMP                     "Err: T Mínima"
158 158 
 #define MSG_ERR_MAXTEMP_BED                 "Err: T Base Máxima"
159 159 
 #define MSG_ERR_MINTEMP_BED                 "Err: T Base Mínima"
160 
-#define MSG_END_HOUR                        "Horas"
161 
-#define MSG_END_MINUTE                      "Minutos"
162 160 
 #define MSG_HEATING                         "Aquecendo..."
163 161 
 #define MSG_HEATING_COMPLETE                "Aquecida."
164 162 
 #define MSG_BED_HEATING                     "Aquecendo base.."

+ 0
- 2
Marlin/language_pt.h 查看文件 

@@ -165,8 +165,6 @@
165 165 
 #define MSG_ERR_MINTEMP                     "Err: T Minima"
166 166 
 #define MSG_ERR_MAXTEMP_BED                 "Err: T Base Maxima"
167 167 
 #define MSG_ERR_MINTEMP_BED                 "Err: T Base Minima"
168 
-#define MSG_END_HOUR                        "horas"
169 
-#define MSG_END_MINUTE                      "minutos"
170 168 
 #define MSG_HEATING                         "Aquecendo..."
171 169 
 #define MSG_HEATING_COMPLETE                "Aquecida."
172 170 
 #define MSG_BED_HEATING                     "Aquecendo base.."

+ 0
- 2
Marlin/language_pt_utf8.h 查看文件 

@@ -165,8 +165,6 @@
165 165 
 #define MSG_ERR_MINTEMP                     "Err: T Mínima"
166 166 
 #define MSG_ERR_MAXTEMP_BED                 "Err: T Base Máxima"
167 167 
 #define MSG_ERR_MINTEMP_BED                 "Err: T Base Mínima"
168 
-#define MSG_END_HOUR                        "horas"
169 
-#define MSG_END_MINUTE                      "minutos"
170 168 
 #define MSG_HEATING                         "Aquecendo..."
171 169 
 #define MSG_HEATING_COMPLETE                "Aquecida."
172 170 
 #define MSG_BED_HEATING                     "Aquecendo base.."

+ 0
- 2
Marlin/language_ru.h 查看文件 

@@ -156,8 +156,6 @@
156 156 
 #define MSG_ERR_MINTEMP                     "Ошибка: Т мин."
157 157 
 #define MSG_ERR_MAXTEMP_BED                 "Ошибка:Т макс.стол"
158 158 
 #define MSG_ERR_MINTEMP_BED                 "Ошибка:Т мин.стол"
159 
-#define MSG_END_HOUR                        "часов"
160 
-#define MSG_END_MINUTE                      "минут"
161 159 
 #define MSG_HEATING                         "Нагреваю сопло..."
162 160 
 #define MSG_HEATING_COMPLETE                "Нагрев выполнен"
163 161 
 #define MSG_BED_HEATING                     "Нагреваю стол"

撰写 预览
正在加载...
取消
保存