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

939 Commits

Author SHA1 Message Date
PavelSindler
97aaf919a3 Merge remote-tracking branch 'upstream/MK3' into dev 2019-02-01 18:12:59 +01:00
PavelSindler
dd4d8e1277 calibrate z endstop update 2019-01-28 19:23:19 +01:00
PavelSindler
af348aa8ba compilation error fix: pin for LCD brightness 2019-01-28 17:56:44 +01:00
Robert Pelnar
eea755496b Conditional translation for SYSTEM_TIMER_2 because we want to have posibility to switch between old/new implementation. 
Timing functions (millis, micros and delay) replaced in whole source, defined in Marlin.h.
This commit enables original implementation (SYSTEM_TIMER_2 undefined)
Verified with passed complete wizard process.
 2019-01-27 22:48:51 +01:00
Robert Pelnar
434a723151 Timing functions 'micros' and 'delay' replaced in whole source with 'micros2' and 'delay2' 2019-01-27 17:37:27 +01:00
Robert Pelnar
fc0b55b213 Timing functions micros2 and delay2 + fix of delay_keep_alive(). 2019-01-27 17:23:53 +01:00
PavelSindler
7e3a1c7d45 merge changes from upstream 2019-01-25 17:57:24 +01:00
PavelSindler
6b1cf99066 conditional compilation updated 2019-01-24 16:14:02 +01:00
PavelSindler
da2c963893 conditional compilation improved: fsensor_autoload_check_stop() and fsensor_autoload_check_start(); M600 "filament not responding" error on printers with ir sensor fixed 2019-01-24 16:00:52 +01:00
PavelSindler
e0c1e4a02d version which should on all printer versions: autoload, selftest, filament detection, filament sensors initialization, filament menus 2019-01-24 01:12:30 +01:00
PavelSindler
54f8f4eb4d
Merge pull request #1460 from MRprusa3d/PFW-723 
Pfw 723
 2019-01-23 14:12:19 +01:00
Marek Bel
052ae323f8 Merge branch 'MK3' into prusa3d-DEV_MK3 2019-01-15 16:58:36 +01:00
Marek Bel
2db42c8577 Merge branch 'MK3' into auto_deplete_2 2019-01-07 21:39:46 +01:00
Marek Bel
c080b899c3 Change filament number in T command to alternative if depleted and lcd_autoDepleteEnabled(). 2019-01-04 22:32:48 +01:00
MRprusa3d
4e300fd552 minTemp 
safety heaters management during/after minTemp
 2019-01-02 18:25:41 +01:00
PavelSindler
ba57986b72 merge changes from upstream 2018-12-21 20:58:38 +01:00
Robert Pelnar
b8c5b6259e Fix - move down after calibrate Z (PFW718) 2018-12-19 14:40:10 +01:00
Robert Pelnar
16e5fb50dd Remove M601 from queue before saving state (prevent infinite loop - PFW713) 2018-12-18 20:39:38 +01:00
Robert Pelnar
34f116b4d9 Move 1mm down with disabled endstop after calibrate_z_auto (PFW718) 2018-12-18 19:57:29 +01:00
PavelSindler
2100376eb1 Merge remote-tracking branch 'upstream/MK3' into idler_sensor 2018-12-18 16:16:48 +01:00
Robert Pelnar
927898151a fix - tmc2130 conditional translation 2018-12-14 15:46:50 +01:00
Robert Pelnar
cfe83daf4a Meshbed leveling fail - move 1mm outside of colission with disabled endstop 2018-12-14 15:32:47 +01:00
PavelSindler
df71398066 statistics fix 2018-12-13 00:43:27 +01:00
PavelSindler
a9829b6a1a add statistics and idler sensor state 2018-12-13 00:12:00 +01:00
PavelSindler
29ecd4ec7a duplicit T-codes execution improved, E-stepper movements when waiting for ok from mmu, continue loading function improved, eeprom: fail stats for mmu 2018-12-12 22:32:47 +01:00
Marek Bel
3d4cb8a994 Document gcode T. 2018-12-12 20:30:28 +01:00
PavelSindler
c256af0a1c unknown filament added; the same T-code will be not executed twice in a row; continue loading 2018-12-12 14:50:55 +01:00
PavelSindler
e52e53d1eb send continue loading commands periodically if initial load fails 2018-12-12 13:54:17 +01:00
Robert Pelnar
6157c3ab32 New filament sensor 2018-12-06 15:41:53 +01:00
Robert Pelnar
41b78187ca LCD backlight - full brightnes at start 2018-12-06 15:27:05 +01:00
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
MRprusa3d
0695f3f345 Z-move correction 
Z-move inhibition after FactoryReset
 2018-08-28 19:58:03 +02:00
Marek Bel
8aeb7e04f1 Fix bound check for T0 .. T4 command. Document mmu_load_to_nozzle(). 2018-08-28 18:52:16 +02:00
Marek Bel
55eaa1de83 Fix code indentation. 2018-08-28 18:26:10 +02:00
Marek Bel
9fb68fb724 Remove usage of global variable tmp_extruder in M200. 2018-08-28 18:08:21 +02:00
PavelSindler
3e2cb72695
Merge branch 'MK3' into auto_deplete_2 2018-08-28 11:01:30 +02:00
Marek Bel
2a00e5d348 Fix loading filament screen hangs if changed automatically. 2018-08-27 20:09:22 +02:00
PavelSindler
191e5dfddd mmu M600: dont use change extruder posibility; unload starts always imidiately 2018-08-27 16:12:10 +02:00
PavelSindler
168bc74102
Merge pull request #1075 from PavelSindler/mmu_filament_sensor 
Mmu filament sensor
 2018-08-27 05:26:12 +02:00
PavelSindler
b01e2a1a22
Merge pull request #1073 from PavelSindler/M600_mmu_fix 
M600 mmu fix
 2018-08-27 05:26:00 +02:00
PavelSindler
03fffae4c3 finda runout sensor can be turned on/off from menu 2018-08-27 05:20:42 +02:00
PavelSindler
ceb49d1262 finda filament runout: initial version 2018-08-27 04:21:43 +02:00
PavelSindler
d3ed270a5a single material printer (no mmu unit) M600 hotfix: M600_check_state loop working 2018-08-26 23:52:45 +02:00
PavelSindler
2610547a48 Fixed displayed filament after load 2018-08-26 16:39:21 +02:00
PavelSindler
85358342bc
Merge pull request #1065 from PavelSindler/mmu_v2_continue_loading 
Mmu v2: continue loading command
 2018-08-25 20:03:12 +02:00
PavelSindler
f3edd37d11 removing unretract 2018-08-25 16:52:19 +02:00
PavelSindler
68f2e22dad continue loading command 2018-08-24 18:28:05 +02:00
MRprusa3d
5dc2af961b ShippingPrepare & M600 
message after ShippingPrepare
M600 :: better filament (un)retraction
 2018-08-23 00:08:14 +02:00
Robert Pelnar
315bfc43dd MMU communication fix 2018-08-21 16:41:01 +02:00
Robert Pelnar
94423e6f7e MMU communication - mmu_ready 2018-08-20 20:53:53 +02:00
Robert Pelnar
c4281b0b36 Status screen redesign - fix of flickering and text wraping on status screen 
printf formating, saved flash, reduced code size
 2018-08-20 00:27:45 +02:00
Robert Pelnar
fd9516f520 Status screen - status message logic simplification 
added definitions of custom_message_type values
removed flag custom_message (previous solution maybe caused displaying of empty status line)
fixed in Marlin_main.cpp code "custom_message = _T(MSG_TEMP_CALIBRATION)"
 2018-08-19 18:34:57 +02:00
Robert Pelnar
f1ad1d22ba Menu lcd_adjust_bed fixed (Bed level correction, PFW-499) 2018-08-19 13:59:33 +02:00
Robert Pelnar
8409a26594 Live adjust Z - display zero in case of invalid calibration status (same logic in babystep_load and _lcd_babystep) 2018-08-10 19:55:50 +02:00
Robert Pelnar
9ee7a2124b removed unused code 2018-08-09 18:43:07 +02:00
Robert Pelnar
796079bb08 MMU2 communication - connection after reset, fw versions, state machine 
+removed debug log from tmc2130
 2018-08-09 17:43:43 +02:00
Robert Pelnar
310751397c line endings + fixed declaration 2018-08-08 20:11:57 +02:00
Robert Pelnar
990a5c9119 PFW489 (github issue 1008) - time remaining variables declared as uint32 2018-08-08 19:51:50 +02:00
Robert Pelnar
23e5cea5d0 MMU - code cleaning (modularity) 
M403 set filament type
hardware reset
 2018-08-08 18:58:03 +02:00
Robert Pelnar
9e09efc9f4 Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang 
conflicts + fix
 2018-08-07 20:55:08 +02:00
Robert Pelnar
71f1a1f6db MMU - communication, check after start, code cleaning 2018-08-07 20:37:59 +02:00
PavelSindler
d21e527c73 PRUSA Fir reports also buildnumber 2018-08-05 20:17:04 +02:00
PavelSindler
cf06c5171c merge with upstream 2018-08-03 18:43:09 +02:00
PavelSindler
a1f69e0924 manage response update 2018-08-03 18:37:52 +02:00
PavelSindler
5824da8310 add more extrusion to M600 load filament 2018-08-03 15:42:06 +02:00
bubnikv
dd4c4b39b4 Added support for the upstream Marlin interpretation of the M204 code: 
M204 S.. T..:
T is interpreted the old way (as acceleration when retracting)
only if an S code is found at the same line.
This allows PrusaResearch to interpret the legacy G-codes generated
by our older Slic3r with older Slic3r profiles.

M204 P.. R.. T..:
T is ignored, P is interpreted as acceleration when extruding,
R is interpreted as acceleration when retracting.
This will be the format the Slic3r 1.41.0 will produce from
the Machine Limits page.
In the future both MK3 firmware and Slic3r will likely be extended
to support the separate travel acceleration.

This change will help us to solve the following Slic3r issue:
https://github.com/prusa3d/Slic3r/issues/1089
 2018-08-03 15:33:41 +02:00
PavelSindler
ae7561bb27 M600 fix: set hotend temperature to correct value, manage_response function fix: now works in case that user presses button on mmu unit before he is asked to do it, compiler warnings (uninitialized variables) fixed 2018-08-03 15:26:39 +02:00
Robert Pelnar
468873ec68 MMU2 - removed conditional translation for SNMM_V2, new module mmu 2018-08-02 18:54:00 +02:00
Robert Pelnar
282ff6c577 removed unused union 2018-08-02 17:09:02 +02:00
Robert Pelnar
d378575a68 SNMM_V2 - default retraction declared as variable 2018-08-02 17:07:09 +02:00
PavelSindler
ac60b3ebe7
Merge pull request #996 from PavelSindler/snmm_v2 
M600 updated
 2018-08-01 19:39:08 +02:00
XPila
618aea25d6
Merge pull request #995 from PavelSindler/filament_type 
snmm v2: send filament type to mmu
 2018-08-01 19:33:44 +02:00
PavelSindler
24e7f0d0ec mmures fix 2018-08-01 19:29:50 +02:00
PavelSindler
06063118bd M600 updated 2018-08-01 18:47:28 +02:00
Marek Bel
b0077182e5 Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings 2018-08-01 17:53:49 +02:00
PavelSindler
54adb0beea missing eol added 2018-08-01 16:54:26 +02:00
PavelSindler
b35ef498f0 comments updated 2018-08-01 16:46:46 +02:00
Marek Bel
665a885a21 Merge commit 'baddf38dbc2c72ab095deaf9b3e251ea2faeb699' into fix_compiler_warnings 2018-08-01 16:44:17 +02:00
PavelSindler
135c4db5da gcode for filemant type initial version: just re-sending information to mmu 2018-08-01 15:43:13 +02:00
PavelSindler
0e059f8da6 single material fix: remove semicolon, unload_filament() function definition 2018-08-01 11:33:58 +02:00
PavelSindler
e153a29bdb messages corrected, 5 minutes timeout when communicating with mmu 2018-08-01 10:42:09 +02:00
PavelSindler
45ac42caff snmm v2: manage response: wait for nozzle temp only when heating 2018-08-01 09:58:07 +02:00
PavelSindler
be1167fae3 M600 for multimaterial: don't check if filament unload was succesfull 2018-07-31 19:18:09 +02:00
PavelSindler
40da6deef8 timeouts used when getting response from mmu, M600 improvements, no filament sensor in variants file 2018-07-31 19:00:42 +02:00
PavelSindler
04d0178150 automatic M600 initial version 2018-07-31 12:24:22 +02:00
PavelSindler
67f56d3de9 merge with upstream 2018-07-30 17:24:58 +02:00
MRprusa3d
970ba6fa2a Sound 
all cases
 2018-07-29 22:59:14 +02:00
PavelSindler
5bc40aff85
Merge pull request #975 from XPila/MK3-new_lang 
EEPROM dump (code D3)
 2018-07-26 19:59:09 +02:00
Robert Pelnar
2f9003dbdd fsensor - better state handling 2018-07-26 19:50:33 +02:00
PavelSindler
9235ffb497 T code for SNMM_V2 fix 2018-07-26 17:03:43 +02:00
Robert Pelnar
691e7a24ed EEPROM dump (code D3) 2018-07-26 13:20:35 +02:00
PavelSindler
cadb2e9cfe
Merge pull request #973 from MRprusa3d/MK3 
PowerPanic IV
 2018-07-26 09:40:57 +02:00
MRprusa3d
5be82962ee PowerPanic IV 2018-07-25 19:24:41 +02:00
PavelSindler
59c0127b77 automatic M600 for mmu v2: work in progress 2018-07-25 16:48:39 +02:00
Marek Bel
702fa307bb Fix compiler warning sketch/Marlin_main.cpp:478:14: warning: 'delta' defined but not used [-Wunused-variable]. 
Variable was never used since "Initial commit".
 2018-07-25 15:08:17 +02:00
Marek Bel
98ba79e518 Fix out of array bounds access. 
Manifested as compiler warnings:

In file included from sketch/Marlin_main.cpp:67:0:
sketch/temperature.h: In function 'bool gcode_M45(bool, int8_t)':
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
   target_temperature[extruder] = celsius;
                              ^
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
   target_temperature[extruder] = celsius;
                              ^
sketch/temperature.h: In function 'void long_pause()':
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
   target_temperature[extruder] = celsius;
                              ^
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
   target_temperature[extruder] = celsius;
                              ^
sketch/temperature.h: In function 'void process_commands()':
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
   target_temperature[extruder] = celsius;
                              ^
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
   target_temperature[extruder] = celsius;
                              ^
 2018-07-25 12:52:02 +02:00
Marek Bel
e6dcbedf82 Fix compiler warning: sketch/Marlin_main.cpp:8833:16: warning: variable 'nplanner_blocks' set but not used [-Wunused-but-set-variable] 2018-07-25 11:58:48 +02:00
Marek Bel
b357399c6b Fix compiler warning sketch/Marlin_main.cpp:1846:1: warning: control reaches end of non-void function [-Wreturn-type]. 2018-07-25 11:54:55 +02:00
Marek Bel
c7de8a91bb Fix compiler warning sketch/Marlin_main.cpp:8811:10: warning: unused variable 'extruder_abs_pos' [-Wunused-variable] 
Variable started to be unused in commit
fde0efc75c
power panic for absolute E coordinates: initial version
and its author told me that the change was intentional.
 2018-07-25 11:33:32 +02:00
Marek Bel
0f577cace6 Fix compiler warning: sketch/Marlin_main.cpp:8759:8: warning: unused variable 'c' [-Wunused-variable] 2018-07-24 19:40:43 +02:00
Marek Bel
bd868132cc Fix compiler warnings: 
sketch/Marlin_main.cpp:8756:8: warning: unused variable 'x_rec' [-Wunused-variable]
sketch/Marlin_main.cpp:8756:15: warning: unused variable 'y_rec' [-Wunused-variable]
sketch/Marlin_main.cpp:8756:22: warning: unused variable 'z_pos' [-Wunused-variable]
 2018-07-24 19:31:18 +02:00
Marek Bel
c19bf72ba9 Fix compiler warning sketch/Marlin_main.cpp:8220:15: warning: unused variable 'k' [-Wunused-variable]. 2018-07-24 18:33:44 +02:00
Marek Bel
3f0684ea30 Fix compiler warning - remove unused variable. 2018-07-24 18:27:05 +02:00
Marek Bel
f7754faaf1 Fix compiler warning sketch/Marlin_main.cpp:7092:14: warning: variable 'make_move' set but not used [-Wunused-but-set-variable] 2018-07-24 18:06:38 +02:00
Marek Bel
68a3ae5456 Fix compiler warning sketch/Marlin_main.cpp:6331:11: warning: unused variable 'cnt' [-Wunused-variable] 2018-07-24 17:57:26 +02:00
Marek Bel
b44f71fd33 Fix compiler warning sketch/Marlin_main.cpp:6267:16: warning: variable 'TooLowZ' set but not used [-Wunused-but-set-variable] 
int8_t TooLowZ = 0;

This variable was unused even in "Initial commit".
 2018-07-24 17:30:37 +02:00
Marek Bel
d5ab657cdf Fix compiler warnings: 
file included from sketch/Configuration_prusa.h:2:0,
                 from sketch/Configuration.h:43,
                 from sketch/Marlin.h:22,
                 from sketch/Marlin_main.cpp:46:
sketch/Marlin_main.cpp: In function 'void process_commands()':
sketch/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h:106:33: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
 #define NORMAL_MAX_ACCEL_XY     2500ul  // max acceleration in normal mode in mm/s^2
                                 ^
sketch/Marlin_main.cpp:5772:16: note: in expansion of macro 'NORMAL_MAX_ACCEL_XY'
      if (val > NORMAL_MAX_ACCEL_XY)
                ^
sketch/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h:102:34: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
 #define SILENT_MAX_ACCEL_XY      960ul  // max acceleration in silent mode in mm/s^2
                                  ^
sketch/Marlin_main.cpp:5774:23: note: in expansion of macro 'SILENT_MAX_ACCEL_XY'
      if (val_silent > SILENT_MAX_ACCEL_XY)
 2018-07-24 17:22:29 +02:00
Marek Bel
3a532a46bb Fix compiler warning sketch/Marlin_main.cpp:5737:15: warning: unused variable 'area' [-Wunused-variable] 
This variable was unused even in "Initial commit".
 2018-07-24 17:17:44 +02:00
Marek Bel
97ec55b951 Fix compiler warning sketch/Marlin_main.cpp:4307:7: warning: unused variable 'Z_PROBE_FEEDRATE' [-Wunused-variable]. 
This variable was unused even in "Initial commit".
 2018-07-24 17:07:21 +02:00
Marek Bel
8575645eec Fix compiler warning: sketch/Marlin_main.cpp:4193:15: warning: statement has no effect [-Wunused-value] 
fan_speed[1];
 2018-07-24 16:56:56 +02:00
Marek Bel
9edb07afa5 Fix compiler warning sketch/Marlin_main.cpp:4218:10: warning: variable 'verbosity_level' set but not used [-Wunused-but-set-variable] 2018-07-24 16:54:12 +02:00
Marek Bel
219b98b7e1 Fix compiler warnings: sketch/Marlin_main.cpp: In function 'void setup()': 
sketch/Marlin_main.cpp:1478:57: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
  if ((farm_mode == 0xFF && farm_no == 0) || (farm_no == 0xFFFF)) farm_mode = false; //if farm_mode has not been stored to eeprom yet and farm number is set to zero or EEPROM is fresh, deactivate farm mode
                                                         ^
sketch/Marlin_main.cpp:1479:17: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
  if (farm_no == 0xFFFF) farm_no = 0;
                 ^
 2018-07-24 16:25:10 +02:00
Marek Bel
5ceece08f8 Fix compiler warning sketch/Marlin_main.cpp:1072:46: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] 
if ((state * LANGBOOT_BLOCKSIZE) < header.size)
 2018-07-24 16:07:28 +02:00
Marek Bel
3811e30df9 Fix compiler warning: sketch/Marlin_main.cpp:1042:40: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] 2018-07-24 16:04:19 +02:00
Marek Bel
0bde84983b Fix compiler warning sketch/Marlin_main.cpp:798:6: warning: unused variable 'cursor_pos' [-Wunused-variable] 2018-07-24 15:47:39 +02:00
Martin Remiš
c7d7389e27 PowerPanic & Sound 2018-07-23 20:04:47 +02:00
PavelSindler
d347cdaf1a
Merge pull request #960 from XPila/MK3-new_lang 
BOOTAPP support defined for EINSY
 2018-07-23 17:32:08 +02:00
XPila
0659cf0287
Merge pull request #953 from PavelSindler/farm_mode_fix 
G98 saves farm number
 2018-07-23 17:31:42 +02:00
Robert Pelnar
6444573c92 BOOTAPP support defined for EINSY 
W25x20CL test before entering optiboot (in some error cases it hangs in optiboot and then message not shown)
 2018-07-23 17:14:18 +02:00
Robert Pelnar
4eb4924d81 Optiboot enabled 2018-07-23 14:41:10 +02:00
PavelSindler
b688bc9294
Merge branch 'MK3' into reapply_fix_compiler_warnings 2018-07-23 14:38:43 +02:00
PavelSindler
dcf3b792be
Merge pull request #948 from XPila/MK3-new_lang 
FSensor - optical quality meassurement
 2018-07-23 14:37:16 +02:00
Marek Bel
88cce94cf9 Revert "Revert "Save 80B of flash and 8B of RAM and fix compiler warning:"" 
This reverts commit 77426b563a.
 2018-07-23 13:35:38 +02:00
PavelSindler
1a9643c892 G98 saves farm no 2018-07-23 11:49:06 +02:00
PavelSindler
18419eefc4 no timeouts when communicating with mmu (temporarily ?) 2018-07-23 10:50:58 +02:00
Robert Pelnar
60b4db15e0 FSensor - M600 fix + cond. translation + tunning filter and params 2018-07-22 16:14:13 +02:00
Robert Pelnar
c6a3f073dd FSensor - M600/autoload fix + optical quality meassurement 2018-07-21 17:04:29 +02:00
Robert Pelnar
f07d08697a max_feedrate and max_acceleration limitation fix (M201, M203) 2018-07-21 12:24:57 +02:00
Robert Pelnar
2e260aeccc FSensor - autoload fixed 2018-07-21 01:30:16 +02:00
Robert Pelnar
1309c52bcf FSensor - code cleaning + simplification 
+ removed DEBUG_DISABLE_FSENSORCHECK
+ added FILAMENT_SENSOR
 2018-07-20 23:48:00 +02:00
Robert Pelnar
ca2d69271c filament_autoload_enabled renamed to fsensor_watch_autoload 2018-07-20 20:37:50 +02:00
Robert Pelnar
328cae1147 Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang 
# Conflicts:
#	Firmware/Marlin_main.cpp
 2018-07-20 20:35:00 +02:00
Robert Pelnar
0f91bf9527 FSensor - optical quality meassurement durring load filament 2018-07-20 20:30:08 +02:00
PavelSindler
eac963e3a0 timeout prolonged 2018-07-20 18:03:52 +02:00
PavelSindler
80ca5f3d33 merge with upstream fixes 2018-07-20 17:51:44 +02:00
PavelSindler
814572fed5 merge with upstream 2018-07-20 17:22:06 +02:00
PavelSindler
5fd1acaf81
Revert "PowerPanic" 2018-07-20 15:20:57 +02:00
Robert Pelnar
fd9b9acf4e FSensor, code cleaning + optical quality meassurement 2018-07-20 14:03:22 +02:00
PavelSindler
b0ebea0c61 mmu: switching extruders simplified 2018-07-20 13:20:07 +02:00
MRprusa3d
bbec1ccfd4
Add files via upload 2018-07-20 04:34:12 +00:00
MRprusa3d
a09d44b869 PowerPanic 
experimental
 2018-07-20 04:47:33 +02:00
Robert Pelnar
5483bee885 FSensor - meassuring filament optical quality 2018-07-19 20:55:38 +02:00
PavelSindler
538f8a8858 Merge remote-tracking branch 'upstream/MK3' into snmm_v2 2018-07-19 20:27:51 +02:00
PavelSindler
231a6dcf1b M600 for single material fix 2018-07-19 20:27:39 +02:00
PavelSindler
86882ae10a M600 for snmm_v2 intial working version 2018-07-19 20:16:42 +02:00
Robert Pelnar
2a66251170 _DISABLE_M42_M226 removed 2018-07-19 19:33:28 +02:00
Robert Pelnar
fd0b7c25e5 TMC2130 speed and accel limitation (M201, M203) for stealth and normal mode 2018-07-19 19:12:46 +02:00
Robert Pelnar
2ce210a8bb TMC2130 feedrate and acceleration limitation - separate profiles for normal and stealth mode 2018-07-19 18:56:01 +02:00
PavelSindler
5fecb7a2dc M600 2018-07-19 16:17:46 +02:00
PavelSindler
3cb3ec9975
Merge pull request #940 from XPila/MK3-new_lang 
Filament sensor tunning
 2018-07-19 15:22:47 +02:00
PavelSindler
7600848533 load to nozzle function, M600 work in progress 2018-07-19 13:14:29 +02:00