3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,558 Commits 3 Branches 78 Tags 40 MiB
2f1e968563
Commit Graph

759 Commits

Author SHA1 Message Date
PavelSindler
d1d4a8c58c whitespace 2018-11-29 17:33:36 +01:00
PavelSindler
8e239ce76f changed M220 2018-11-29 17:02:38 +01:00
PavelSindler
929e1de253 special variable for saving/restoring feedmultiply using M220 2018-11-29 17:02:10 +01:00
PavelSindler
839de141a3 resolving conflicts 2018-11-29 16:26:49 +01:00
PavelSindler
abf20ef6a2 merged changes from public upstream (Prusa-Firmware repository) 2018-11-29 13:46:58 +01:00
PavelSindler
b3ab9d0ee0
Merge pull request #1354 from XPila/V3_5 
Lang - final corrections
 2018-11-22 19:03:30 +01:00
Robert Pelnar
42f2a61416 Lang - text "TRIGGERED" removed from dictionary 2018-11-22 18:46:02 +01:00
Robert Pelnar
e9131542ca Lang - text "Sleep..." removed from dictionary 2018-11-22 18:43:21 +01:00
Robert Pelnar
72c7810641 Lang - text "Resend" removed from dictionary 2018-11-22 18:38:20 +01:00
Robert Pelnar
7426efac9b Lang - text "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" removed from dictionary 2018-11-22 18:36:38 +01:00
Robert Pelnar
123bef636a Lang - text "Printer halted. kill() called!" removed from dictionary 2018-11-22 18:33:15 +01:00
Robert Pelnar
123725edd1 Lang - duplicate text "Some problem encountered, Z-levelling enforced ..." removed 2018-11-22 18:30:53 +01:00
Robert Pelnar
0fceade481 Lang - text "PowerUp" removed from dictionary 2018-11-22 18:24:21 +01:00
Robert Pelnar
1cbb261707 Lang - text "open" removed from dictionary 2018-11-22 18:18:25 +01:00
Robert Pelnar
72d47eaeba Lang - text "ok" removed from dictionary 2018-11-22 18:12:19 +01:00
Robert Pelnar
fd3cd9b551 Lang - texts "Mxxx Invalid extruder " removed from dictionary 2018-11-22 18:06:10 +01:00
Robert Pelnar
60e567b660 Lang - text " Last Updated: " removed from dictionary 2018-11-22 17:48:12 +01:00
Robert Pelnar
a1f03e9531 Lang - text " Free Memory: " removed from dictionary 2018-11-22 17:46:44 +01:00
Robert Pelnar
104353c0c5 Lang - text " PlannerBufferBytes: " removed from dictionary 2018-11-22 17:43:11 +01:00
Robert Pelnar
099fe216b6 Lang - text "KILLED. " removed from dictionaries 2018-11-22 17:26:01 +01:00
PavelSindler
e5dd4d757a progress bar fix 2018-11-16 15:45:55 +01:00
MRprusa3d
ffe906c733 MeshBed Levelling Fail V 2018-11-14 16:45:49 +01:00
PavelSindler
51b4858a87
Merge pull request #1334 from XPila/V3_5 
PFW658 - disable extruder motor while changing filament with mmu2 (pr…
 2018-11-13 16:10:24 +01:00
Robert Pelnar
bfc343c7c5 PFW658 - disable extruder motor while changing filament with mmu2 (prevents extruder motor overheating) 2018-11-13 16:04:46 +01:00
PavelSindler
15d0b083ed whitespace 2018-11-13 15:58:21 +01:00
PavelSindler
17a1049f23 T-codes fix 2018-11-13 15:56:19 +01:00
XPila
3d97d81734
Merge pull request #1329 from PavelSindler/M600_load_fil_message 
M600 filament load progress bar changes
 2018-11-12 20:52:06 +01:00
Robert Pelnar
41b885c537 M907 fix - value in mA (PFW) 2018-11-12 20:39:25 +01:00
PavelSindler
32da5bc039 progress bar time counted from feedrate and E - distance 2018-11-12 19:55:53 +01:00
PavelSindler
f4c1e7924f M600: show progress bar during first filament load 2018-11-12 18:35:06 +01:00
PavelSindler
c991c8b314 resume print fix: wait for heater() never disable steppers 2018-11-09 18:29:35 +01:00
PavelSindler
22cf2c6b6b M600 load messages synchronization fixed 2018-11-09 15:31:44 +01:00
PavelSindler
0e7fb26dc5
Merge pull request #1316 from MRprusa3d/PFW-635 
MeshBed Levelling Fail IV
 2018-11-08 10:18:08 +01:00
MRprusa3d
ccb58ae7c9 Revert "MeshBed Levelling Fail IV" 
This reverts commit bd554df02e.
 2018-11-08 04:02:32 +01:00
MRprusa3d
bd554df02e MeshBed Levelling Fail IV 2018-11-08 03:54:05 +01:00
PavelSindler
b80a0edac0
Merge pull request #1312 from mkbel/fix_long_press_modal 
Fix long press modal
 2018-11-07 10:28:24 +01:00
Marek Bel
b4d4bfa667 Do not declare extern class in .cpp file, include appropriate header. 2018-11-06 20:54:53 +01:00
Robert Pelnar
9a68501039 MK2 variants compilable 2018-11-06 14:17:43 +01:00
PavelSindler
c3bdd21fa5
Merge pull request #1308 from MRprusa3d/PFW-635 
MeshBed Leveling Fail II
 2018-11-06 10:47:03 +01:00
MRprusa3d
46b2c93d60 MeshBed Leveling Fail III 2018-11-06 01:44:53 +01:00
MRprusa3d
9953518681 MeshBed Leveling Fail II 2018-11-06 01:28:47 +01:00
Robert Pelnar
d6b5f5a1c7 PFW643 - removed M910-M918, implemented M907 2018-11-05 16:15:27 +01:00
PavelSindler
7e43b15b54
Merge pull request #1303 from PavelSindler/m600_idler 
M600: move extruder to the left to make space for idler opening
 2018-11-05 10:38:51 +01:00
PavelSindler
78775e2f87
Merge pull request #1302 from PavelSindler/wizard_improvements 
Wizard improvements
 2018-11-05 10:38:41 +01:00
PavelSindler
0a2ad97bc6
Merge pull request #1290 from PavelSindler/mmu_improvements 
mmu improvements: load to nozzle, gcodes for single material mode, M600 fix
 2018-11-05 10:38:05 +01:00
PavelSindler
2619c6f7a1
Merge pull request #1283 from PavelSindler/crashdet_cancel 
canceling print after crash detection sets saved_priting flag to false
 2018-11-05 10:37:51 +01:00
PavelSindler
aeeb2af0a4 whitespace 2018-11-05 00:15:36 +01:00
PavelSindler
b058ec7120 whitespace 2018-11-05 00:14:16 +01:00
PavelSindler
934b76ade3 wait message added 2018-11-05 00:12:46 +01:00
PavelSindler
e2d2fb58aa Z calibraion: always ask user to clean nozzle 2018-11-04 18:47:08 +01:00
MRprusa3d
73794b56cf MeshBed Leveling Fail 
Z-leveling after MeshBed leveling failing
 2018-11-02 23:03:14 +01:00
PavelSindler
aaf65051f9 M600: "is color clear?" menu synchronization 2018-11-01 18:28:52 +01:00
PavelSindler
1342c312a0 use feedrate 200mm/min for final feed (faster and better filament sensor function), show default welcome message when load is finished 2018-11-01 16:51:18 +01:00
PavelSindler
96ce324b7c load to nozzle improved, unified feedrate and E-distance for final feed used in load filament function, M600 etc. 2018-11-01 16:29:09 +01:00
PavelSindler
e80af46503 load to nozzle and Tx and Tc codes: intial version 2018-10-31 21:48:05 +01:00
PavelSindler
f445b6018e canceling print after crash detection sets saved_priting flag to false 2018-10-28 11:06:10 +01:00
PavelSindler
4ecc00e4e3 M600: move extruder 100mm to the left to make space for opening idler 2018-10-26 18:19:00 +02:00
mkbel
cdb06c65f3
Merge pull request #1275 from PavelSindler/3_4_2_branch_merging 
3_4_2 branch merging into MK3
 2018-10-25 21:45:51 +02:00
PavelSindler
01529f18d2 upstream/MK3 merge 2018-10-25 20:57:27 +02:00
PavelSindler
d005005e22 Merge remote-tracking branch 'upstream/3_4_2' into 3_4_2_branch_merging 2018-10-22 20:33:38 +02:00
PavelSindler
940f436a5f merge MK3_dev into MK3 2018-10-22 20:25:29 +02:00
PavelSindler
bc247ca02c MK2.5 sw reset at setup function 2018-10-19 17:54:48 +02:00
Robert Pelnar
ac18eb67c0 New lang, arduino 1.8.5 - boot_app debug output 
+ variable _uartout linkage fix
+ DEBUG_DCODE5
 2018-10-18 16:20:14 +02:00
Marek Bel
9cae0c378a Rename _EEPROM_writeData to EEPROM_writeData. Rename _EEPROM_readData to EEPROM_readData. Add return value to EEPROM_writeData to detect failure to write. Do not mark data as valid, if write has failed. Remove EEPROM_WRITE_VAR and EEPROM_READ_VAR macros. Make pos input only parameter. Convert EEPROM_OFFSET macro to typed constatant EEPROM_M500_base, it was defined in two places, leave it in one place. Use Config_StoreSettings() instead of erase_eeprom_section(). Compare float with 0xff byte by byte to avoid compiler warning "Dereferencing type punned pointer will break strict aliasing rules." 2018-10-08 20:24:56 +02:00
Marek Bel
1585dc66b0 Merge remote-tracking branch 'prusa3d/MK3_dev' into simplify_EEPROM_M500 
Known limitation: Unable to compile.
 2018-10-08 15:58:49 +02:00
Robert Pelnar
7882b3c975 Update fsensor in Manage_inactivity instead of main loop. 2018-10-03 17:29:24 +02:00
Marek Bel
d80fcab66c Disable filament sensor response quality check. 2018-09-25 15:50:50 +02:00
Marek Bel
19c1ba6274 Remove duplicate condition. This condition was already in if(mmu_enabled) {} else branch. 2018-09-25 14:25:03 +02:00
Marek Bel
c38fef281d Use cs.max_feedrate_silent, cs.max_acceleration_units_per_sq_second_silent from ConfigurationStore. 2018-09-24 17:33:58 +02:00
Marek Bel
ca179a2d18 Use cs.filament_size from ConfigurationStore. 2018-09-24 17:29:02 +02:00
Marek Bel
e225e9cab0 Use cs.volumetric_enabled from ConfigurationStore. 2018-09-24 17:12:16 +02:00
Marek Bel
a201128b20 Use cs.retract_length, cs.retract_feedrate, cs.retract_zlift, cs.retract_recover_length and cs.retract_recover_feedrate from ConfigurationStore. 2018-09-24 17:10:25 +02:00
Marek Bel
7e593e6922 Use cs.autoretract_enabled from ConfigurationStore. 2018-09-24 17:03:10 +02:00
Marek Bel
20ba2b1c79 Use cs.bedKp, cs.bedKi and cs.bedKd from ConfigurationStore. 2018-09-24 16:57:48 +02:00
Marek Bel
54bcc8aa52 Use cs.Kp, cs.Ki and cs.Kd from ConfigurationStore. 2018-09-24 16:54:50 +02:00
Marek Bel
f2ae3fb1f7 Use cs.zprobe_zoffset from ConfigurationStore. 2018-09-24 16:47:57 +02:00
Marek Bel
959d0069fa Use cs.add_homing from ConfigurationStore. 2018-09-24 16:42:28 +02:00
Marek Bel
ac7c062161 Use cs.max_jerk from ConfigurationStore. 2018-09-24 16:35:33 +02:00
Marek Bel
bb66bfe6a7 Use cs.minsegmenttime from ConfigurationStore. 2018-09-24 16:22:50 +02:00
mkbel
0e7afc67ca
Merge pull request #1175 from PavelSindler/eeprom_version 
M500 EEPROM version update and M500 EEPROM block size check
 2018-09-24 16:19:55 +02:00
Marek Bel
10428b30d9 Use cs.mintravelfeedrate from ConfigurationStore. 2018-09-24 16:01:58 +02:00
Marek Bel
26e2fd1c76 Use cs.minimumfeedrate from ConfigurationStore. 2018-09-24 15:57:24 +02:00
Marek Bel
b8fefceb4d Use cs.retract_acceleration from ConfigurationStore. 2018-09-24 15:53:35 +02:00
Marek Bel
7dbe0afdc4 Use cs.acceleration from ConfigurationStore. 2018-09-24 15:47:36 +02:00
Marek Bel
cee51cf9c3 Use cs.max_acceleration_units_per_sq_second_normal from ConfigurationStore. 2018-09-24 15:40:35 +02:00
Marek Bel
02becb5e6a Use cs.max_feedrate_normal from ConfigurationStore. 2018-09-24 15:09:19 +02:00
PavelSindler
053b94b711 remove "start" duplicity in setup 2018-09-24 14:57:46 +02:00
Marek Bel
3f28632443 Use cs.axis_steps_per_unit from ConfigurationStore. 2018-09-24 14:54:41 +02:00
PavelSindler
752aec37fb M500 EEPROM version changed; if EEPROM_M500_SIZE is not updated, data are not stored 2018-09-19 14:36:26 +02:00
PavelSindler
1253fb338a wizard hotfix 2018-09-10 18:02:54 +02:00
Marek Bel
001680bbdc Merge branch 'MK3' into time_remaining_fix 
# Conflicts:
#	Firmware/Marlin_main.cpp
 2018-09-07 08:21:36 +02:00
mkbel
801f8e93e8
Merge pull request #1112 from PavelSindler/MK25_time_remaining 
MK25: always show "normal mode" remaining time (PFW-553)
 2018-09-07 08:05:16 +02:00
PavelSindler
2f02828273 time remaining fix 2018-09-07 02:02:35 +02:00
PavelSindler
66305b3e04 MK25: always show "normal mode" remaining time 2018-09-06 23:05:36 +02:00
PavelSindler
40679dcb3a
Merge branch 'MK3' into MK3 2018-09-05 00:06:48 +02:00
MRprusa3d
25a22120fb 1-st Layer Calibration correction 
filament loading improvement
 2018-08-30 03:32:33 +02:00
PavelSindler
b284c70d9b auto deplete: dont eject filament 2018-08-29 13:08:09 +02:00
PavelSindler
515e78cfd1 Eject filament feature in menu, M600: if it was envoked by FINDA, eject filament 2018-08-29 01:58:28 +02:00
PavelSindler
d290543d7d
Merge pull request #1085 from mkbel/fix_active_filament 
Fix active filament PFW-528
 2018-08-28 23:50:57 +02:00
Marek Bel
2cd8691376 Do not use global variable tmp_extruder when setting temperature. 2018-08-28 20:26:33 +02:00