Commit Graph

523 Commits

Author SHA1 Message Date
3d-gussner d5a0a58c68 Merge branch 'MK2-Private_build' of https://github.com/3d-gussner/Prusa-Firmware into MK2-Private_build 2017-12-29 15:52:46 +01:00
3d-gussner 3a0093f4be New langtool file for MultiMaterial, due to limits and need of debug info was missing 2017-12-29 15:51:39 +01:00
3d-gussner bb3079b3bf Updated language limits
Final French translation by jean-pierre.g
Fixed compiling warnings for MultMaterial withou FRS
2017-12-29 15:47:23 +01:00
3d-gussner 27f20536f5
PET 2nd preheat
Merge with MK3 preheat menu
2017-12-29 14:16:31 +01:00
3d-gussner b43e0ca0c1 Merge branch 'MK2-Private_build' of https://github.com/3d-gussner/Prusa-Firmware into MK2-Private_build 2017-12-29 14:07:34 +01:00
3d-gussner 0191dd3fc9
Merge pull request #41 from 3d-gussner/MK2
Make M110 command compatible with Marlin, etc.
2017-12-29 14:06:43 +01:00
3d-gussner c6f68afb0f Merge branch 'MK2' into MK2-Private_build 2017-12-23 09:01:03 +01:00
PavelSindler f91ace6fec
Merge pull request #283 from thess/M110-fix
Make M110 command compatible with Marlin, etc.
2017-12-22 22:32:45 +01:00
Ted Hess 5107b59c87 Make M110 command compatible with Marlin, etc. 2017-11-17 17:06:41 -05:00
3d-gussner ecde4ae64c Minor typos in Dutch translation...
French translation is still ongoing.
2017-11-15 13:51:33 +01:00
3d-gussner b9ad12d5dc Hyperfine messages only in...
... English, German and Dutch
2017-11-14 12:07:14 +01:00
3d-gussner fbf2211596 Added new MGSs to...
... Dutch and Portuguese
2017-11-14 11:57:40 +01:00
3d-gussner fa11347e33 Merge branch 'mk2' into MK2-Private_build 2017-11-14 11:39:35 +01:00
3d-gussner e3b8d73577 BUILDING.md 2017-11-14 11:35:34 +01:00
3d-gussner bbf1004d5e Merge to 3.1.0 and BUILDING.md 2017-11-14 11:34:23 +01:00
PavelSindler ba4cc16e11
Merge pull request #275 from PavelSindler/MK2
first layer cal. gcode corrections
2017-11-12 10:49:24 +01:00
PavelSindler 4c5f9c8bf1 first layer cal. gcode corrections 2017-11-12 10:48:14 +01:00
PavelSindler 100c800dc8
Merge pull request #274 from PavelSindler/MK2
gcode correction in first layer calibration
2017-11-12 09:41:10 +01:00
PavelSindler 19a952137d gcode correction in first layer calibration 2017-11-12 09:40:26 +01:00
PavelSindler b6d8918ffe
Merge pull request #271 from PavelSindler/MK2
version change
2017-11-10 18:53:18 +01:00
PavelSindler 1047854afa version change 2017-11-10 18:39:16 +01:00
PavelSindler 48f716a7c1
Merge pull request #270 from PavelSindler/MK2
listing files reverted; M117 message during first layer cal. has language variants, pause print
2017-11-10 15:53:54 +01:00
PavelSindler 18c107ba77 listing filenames reverted to short filenames, because of compatibility; massge shown during first layer cal. has all language variations now, not possible to pause print when print is paused 2017-11-10 15:42:57 +01:00
PavelSindler d319ddf21a
Merge pull request #265 from PavelSindler/MK2
PL updated
2017-11-09 16:19:54 +01:00
PavelSindler 417dff8574 removed redundant code 2017-11-09 16:14:14 +01:00
PavelSindler 858bd7f9ac another changes in languages 2017-11-09 15:22:20 +01:00
PavelSindler 03fdb06e89 initial 2017-11-09 15:14:31 +01:00
3d-gussner bf434e6a8b Added Dutch, Portuguese and ...
French (has to be continued)
2017-11-08 09:40:46 +01:00
3d-gussner 0e36525fa7 Last fixes...
... disabled FRs for Multi Material Upgrade
2017-11-07 19:59:41 +01:00
3d-gussner ceae62a29a Fixes and typos 2017-11-07 11:01:01 +01:00
3d-gussner b1886cbb98
Merge pull request #37 from 3d-gussner/MK2-Hyperfine
Mk2 hyperfine
2017-11-06 17:03:06 +01:00
3d-gussner 044be52ed4
Merge branch 'MK2-Private_build' into MK2-Hyperfine 2017-11-06 17:02:55 +01:00
3d-gussner f3da4a06b4
Merge pull request #36 from 3d-gussner/MK2-FRS
Mk2 frs
2017-11-06 17:01:01 +01:00
3d-gussner a04af278bc
Merge branch 'MK2-Private_build' into MK2-FRS 2017-11-06 17:00:51 +01:00
3d-gussner 38ba04d58f
Merge branch 'MK2-Private_build' into MK2-FRS 2017-11-06 16:59:07 +01:00
3d-gussner ff81cad666
Merge pull request #35 from 3d-gussner/MK2-PLA_1st
Mk2 pla 1st
2017-11-06 16:57:17 +01:00
3d-gussner fa8939bf9a
Merge pull request #34 from 3d-gussner/MK2-ChangePos
Mk2 change pos
2017-11-06 16:56:24 +01:00
3d-gussner 2a2a3999f8 Modified version info...
to see differences to stock version.
Behind the version info 3 letters can be used, i have chosen to use that to identify 3 projects:
- 'H'yperfine Tuning as 1st project and 1st letter
- 'F'ilament Runout Sensor as 2nd project and 2nd letter
- 'M'ulti Languages as 3rd project and 3rd letter
As i merge one or all projects in one version the result will be <stock version info><1st project><2nd project><3rd project>
Example: Having all 3 projects together the actual firmware version will be shown as 'FW - 3.1.0-RC2HFM'

Also added time and author to the support view.
2017-11-06 16:46:39 +01:00
3d-gussner 40b06e28f2 Modified version info...
to see differences to stock version.
Behind the version info 3 letters can be used, i have chosen to use that to identify 3 projects:
- 'H'yperfine Tuning as 1st project and 1st letter
- 'F'ilament Runout Sensor as 2nd project and 2nd letter
- 'M'ulti Languages as 3rd project and 3rd letter
As i merge one or all projects in one version the result will be <stock version info><1st project><2nd project><3rd project>
Example: Having all 3 projects together the actual firmware version will be shown as 'FW - 3.1.0-RC2HFM'

Also added time and author to the support view.
2017-11-06 16:37:23 +01:00
3d-gussner 0d9f95bd35 Modified FRS menu...
... in a single line.
While 'Fil.RS [S to VCC]' is chosen the invert and pullup are false
While 'Fil.RS [S to GND]' is chosen the invert and pullup are ture
2017-11-06 16:23:08 +01:00
3d-gussner a77b5cf981 Merge hyperfine to MK2 3.1.0-RC2 2017-11-06 16:21:32 +01:00
PavelSindler b5e42e2934 PL updated 2017-11-06 12:01:17 +01:00
3d-gussner a2c5fc3c22 Merge branch 'MK2' into MK2-ChangePos 2017-11-04 10:51:58 +01:00
3d-gussner 822fbb676f Merge branch 'MK2' into MK2-PLA_1st 2017-11-04 10:51:37 +01:00
PavelSindler f2d9c00103
Merge pull request #260 from PavelSindler/presort_after_print
presort files when print is finished
2017-11-03 16:18:47 +01:00
PavelSindler 6a253b60fb
Merge pull request #264 from PavelSindler/language_corrections
PID safety check and Language corrections
2017-11-03 16:18:35 +01:00
PavelSindler 6728e425cc whitespace correction 2017-11-03 16:13:01 +01:00
PavelSindler 30cbee774e
Merge pull request #263 from PavelSindler/incomplete_file_fix
filecheck fix: check gcodes which remains in buffer after finding end of file
2017-11-03 16:02:16 +01:00
PavelSindler 4114a7844d pl and it corrections 2017-11-03 16:00:44 +01:00
3d-gussner 24af82d428 PLA 1st in Preheat menu 2017-11-03 08:23:04 +01:00