ff35119ef3
preHeat @ filament management
...
another funcionality III / autoLoad
2019-02-26 17:33:37 +01:00
be0ed46335
preHeat @ filament management
...
another funcionality III
2019-02-22 03:09:50 +01:00
da0867cfc5
preHeat @ filament management
...
another funcionality
2019-02-20 03:01:33 +01:00
afc86a1363
missing ;
2019-02-18 05:50:29 +02:00
11d19879fc
Merge pull request #1533 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload / autoLoad / MMU
2019-02-15 17:45:38 +01:00
4835b9b220
7x7 points mesh bed leveling
2019-02-14 10:57:58 +02:00
80c3420a12
Merge branch 'MK3' into PFW-210
2019-02-14 00:05:50 +01:00
ef1f82627e
preHeat @ filament load / unload / autoLoad / MMU
...
MMU options added
2019-02-13 23:53:00 +01:00
daaec0ef04
Convert MmuCmd to enum class.
2019-02-13 17:12:35 +01:00
9e873ac0f7
Use enum for mmu_cmd instead of plain integer type.
2019-02-13 01:51:39 +01:00
27d002a46f
Merge remote-tracking branch 'robert/MK3-variants' into variants
2019-02-06 09:20:21 +01:00
860e6f9994
Merge remote-tracking branch 'upstream/MK3' into variants
2019-02-06 09:19:38 +01:00
fcb7dd90cf
Merge pull request #1505 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload / autoLoad
2019-02-06 09:14:03 +01:00
a53d150903
preHeat @ filament load / unload / autoLoad
...
autoLoad option added
2019-02-06 01:58:05 +01:00
93d4128163
Fixed timer2 colission with arduino framework around "tone" function.
2019-02-05 19:08:57 +01:00
62e253edd0
fanSpeed -> fanSpeedSoftPwm (fixes fan speed menu)
2019-02-05 18:21:44 +01:00
903028e574
fix fan speed measuring for PWM = 255
2019-02-05 17:46:31 +01:00
f9298b37b8
fan check hotfix (selftest, measuring RPM, fan errors)
2019-02-05 04:02:38 +01:00
9a51a7be29
Merge branch 'bed_correction_fix' into variants
2019-02-04 12:47:06 +01:00
fba207e0ec
crash detection: don't wait for heater if target temp = 0; new priting type
2019-02-04 01:13:46 +01:00
5324181bf7
maximum bed level correction value enlarged from 50um to 100um and is now used in menus and mesh bed leveling itself
2019-02-03 20:56:14 +01:00
4444b155f1
M600: prevention of blob; massage changed when autoload is active
2019-02-01 21:08:34 +01:00
97aaf919a3
Merge remote-tracking branch 'upstream/MK3' into dev
2019-02-01 18:12:59 +01:00
dd4d8e1277
calibrate z endstop update
2019-01-28 19:23:19 +01:00
af348aa8ba
compilation error fix: pin for LCD brightness
2019-01-28 17:56:44 +01:00
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
434a723151
Timing functions 'micros' and 'delay' replaced in whole source with 'micros2' and 'delay2'
2019-01-27 17:37:27 +01:00
fc0b55b213
Timing functions micros2 and delay2 + fix of delay_keep_alive().
2019-01-27 17:23:53 +01:00
7e3a1c7d45
merge changes from upstream
2019-01-25 17:57:24 +01:00
6b1cf99066
conditional compilation updated
2019-01-24 16:14:02 +01:00
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
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
54f8f4eb4d
Merge pull request #1460 from MRprusa3d/PFW-723
...
Pfw 723
2019-01-23 14:12:19 +01:00
052ae323f8
Merge branch 'MK3' into prusa3d-DEV_MK3
2019-01-15 16:58:36 +01:00
2db42c8577
Merge branch 'MK3' into auto_deplete_2
2019-01-07 21:39:46 +01:00
c080b899c3
Change filament number in T command to alternative if depleted and lcd_autoDepleteEnabled().
2019-01-04 22:32:48 +01:00
4e300fd552
minTemp
...
safety heaters management during/after minTemp
2019-01-02 18:25:41 +01:00
ba57986b72
merge changes from upstream
2018-12-21 20:58:38 +01:00
b8c5b6259e
Fix - move down after calibrate Z (PFW718)
2018-12-19 14:40:10 +01:00
16e5fb50dd
Remove M601 from queue before saving state (prevent infinite loop - PFW713)
2018-12-18 20:39:38 +01:00
34f116b4d9
Move 1mm down with disabled endstop after calibrate_z_auto (PFW718)
2018-12-18 19:57:29 +01:00
2100376eb1
Merge remote-tracking branch 'upstream/MK3' into idler_sensor
2018-12-18 16:16:48 +01:00
927898151a
fix - tmc2130 conditional translation
2018-12-14 15:46:50 +01:00
cfe83daf4a
Meshbed leveling fail - move 1mm outside of colission with disabled endstop
2018-12-14 15:32:47 +01:00
df71398066
statistics fix
2018-12-13 00:43:27 +01:00
a9829b6a1a
add statistics and idler sensor state
2018-12-13 00:12:00 +01:00
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
3d4cb8a994
Document gcode T.
2018-12-12 20:30:28 +01:00
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
e52e53d1eb
send continue loading commands periodically if initial load fails
2018-12-12 13:54:17 +01:00
6157c3ab32
New filament sensor
2018-12-06 15:41:53 +01:00
41b78187ca
LCD backlight - full brightnes at start
2018-12-06 15:27:05 +01:00
d1d4a8c58c
whitespace
2018-11-29 17:33:36 +01:00
8e239ce76f
changed M220
2018-11-29 17:02:38 +01:00
929e1de253
special variable for saving/restoring feedmultiply using M220
2018-11-29 17:02:10 +01:00
839de141a3
resolving conflicts
2018-11-29 16:26:49 +01:00
abf20ef6a2
merged changes from public upstream (Prusa-Firmware repository)
2018-11-29 13:46:58 +01:00
b3ab9d0ee0
Merge pull request #1354 from XPila/V3_5
...
Lang - final corrections
2018-11-22 19:03:30 +01:00
42f2a61416
Lang - text "TRIGGERED" removed from dictionary
2018-11-22 18:46:02 +01:00
e9131542ca
Lang - text "Sleep..." removed from dictionary
2018-11-22 18:43:21 +01:00
72c7810641
Lang - text "Resend" removed from dictionary
2018-11-22 18:38:20 +01:00
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
123bef636a
Lang - text "Printer halted. kill() called!" removed from dictionary
2018-11-22 18:33:15 +01:00
123725edd1
Lang - duplicate text "Some problem encountered, Z-levelling enforced ..." removed
2018-11-22 18:30:53 +01:00
0fceade481
Lang - text "PowerUp" removed from dictionary
2018-11-22 18:24:21 +01:00
1cbb261707
Lang - text "open" removed from dictionary
2018-11-22 18:18:25 +01:00
72d47eaeba
Lang - text "ok" removed from dictionary
2018-11-22 18:12:19 +01:00
fd3cd9b551
Lang - texts "Mxxx Invalid extruder " removed from dictionary
2018-11-22 18:06:10 +01:00
60e567b660
Lang - text " Last Updated: " removed from dictionary
2018-11-22 17:48:12 +01:00
a1f03e9531
Lang - text " Free Memory: " removed from dictionary
2018-11-22 17:46:44 +01:00
104353c0c5
Lang - text " PlannerBufferBytes: " removed from dictionary
2018-11-22 17:43:11 +01:00
099fe216b6
Lang - text "KILLED. " removed from dictionaries
2018-11-22 17:26:01 +01:00
e5dd4d757a
progress bar fix
2018-11-16 15:45:55 +01:00
ffe906c733
MeshBed Levelling Fail V
2018-11-14 16:45:49 +01:00
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
bfc343c7c5
PFW658 - disable extruder motor while changing filament with mmu2 (prevents extruder motor overheating)
2018-11-13 16:04:46 +01:00
15d0b083ed
whitespace
2018-11-13 15:58:21 +01:00
17a1049f23
T-codes fix
2018-11-13 15:56:19 +01:00
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
41b885c537
M907 fix - value in mA (PFW)
2018-11-12 20:39:25 +01:00
32da5bc039
progress bar time counted from feedrate and E - distance
2018-11-12 19:55:53 +01:00
f4c1e7924f
M600: show progress bar during first filament load
2018-11-12 18:35:06 +01:00
c991c8b314
resume print fix: wait for heater() never disable steppers
2018-11-09 18:29:35 +01:00
22cf2c6b6b
M600 load messages synchronization fixed
2018-11-09 15:31:44 +01:00
0e7fb26dc5
Merge pull request #1316 from MRprusa3d/PFW-635
...
MeshBed Levelling Fail IV
2018-11-08 10:18:08 +01:00
ccb58ae7c9
Revert "MeshBed Levelling Fail IV"
...
This reverts commit bd554df02e
2018-11-08 04:02:32 +01:00
bd554df02e
MeshBed Levelling Fail IV
2018-11-08 03:54:05 +01:00
b80a0edac0
Merge pull request #1312 from mkbel/fix_long_press_modal
...
Fix long press modal
2018-11-07 10:28:24 +01:00
b4d4bfa667
Do not declare extern class in .cpp file, include appropriate header.
2018-11-06 20:54:53 +01:00
9a68501039
MK2 variants compilable
2018-11-06 14:17:43 +01:00
c3bdd21fa5
Merge pull request #1308 from MRprusa3d/PFW-635
...
MeshBed Leveling Fail II
2018-11-06 10:47:03 +01:00
46b2c93d60
MeshBed Leveling Fail III
2018-11-06 01:44:53 +01:00
9953518681
MeshBed Leveling Fail II
2018-11-06 01:28:47 +01:00
d6b5f5a1c7
PFW643 - removed M910-M918, implemented M907
2018-11-05 16:15:27 +01:00
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
78775e2f87
Merge pull request #1302 from PavelSindler/wizard_improvements
...
Wizard improvements
2018-11-05 10:38:41 +01:00
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
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
aeeb2af0a4
whitespace
2018-11-05 00:15:36 +01:00
b058ec7120
whitespace
2018-11-05 00:14:16 +01:00
934b76ade3
wait message added
2018-11-05 00:12:46 +01:00
e2d2fb58aa
Z calibraion: always ask user to clean nozzle
2018-11-04 18:47:08 +01:00
73794b56cf
MeshBed Leveling Fail
...
Z-leveling after MeshBed leveling failing
2018-11-02 23:03:14 +01:00
aaf65051f9
M600: "is color clear?" menu synchronization
2018-11-01 18:28:52 +01:00
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
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
e80af46503
load to nozzle and Tx and Tc codes: intial version
2018-10-31 21:48:05 +01:00
f445b6018e
canceling print after crash detection sets saved_priting flag to false
2018-10-28 11:06:10 +01:00
4ecc00e4e3
M600: move extruder 100mm to the left to make space for opening idler
2018-10-26 18:19:00 +02:00
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
01529f18d2
upstream/MK3 merge
2018-10-25 20:57:27 +02:00
d005005e22
Merge remote-tracking branch 'upstream/3_4_2' into 3_4_2_branch_merging
2018-10-22 20:33:38 +02:00
940f436a5f
merge MK3_dev into MK3
2018-10-22 20:25:29 +02:00
bc247ca02c
MK2.5 sw reset at setup function
2018-10-19 17:54:48 +02:00
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
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
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
7882b3c975
Update fsensor in Manage_inactivity instead of main loop.
2018-10-03 17:29:24 +02:00
d80fcab66c
Disable filament sensor response quality check.
2018-09-25 15:50:50 +02:00
19c1ba6274
Remove duplicate condition. This condition was already in if(mmu_enabled) {} else branch.
2018-09-25 14:25:03 +02:00
c38fef281d
Use cs.max_feedrate_silent, cs.max_acceleration_units_per_sq_second_silent from ConfigurationStore.
2018-09-24 17:33:58 +02:00
ca179a2d18
Use cs.filament_size from ConfigurationStore.
2018-09-24 17:29:02 +02:00
e225e9cab0
Use cs.volumetric_enabled from ConfigurationStore.
2018-09-24 17:12:16 +02:00
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
7e593e6922
Use cs.autoretract_enabled from ConfigurationStore.
2018-09-24 17:03:10 +02:00
20ba2b1c79
Use cs.bedKp, cs.bedKi and cs.bedKd from ConfigurationStore.
2018-09-24 16:57:48 +02:00
54bcc8aa52
Use cs.Kp, cs.Ki and cs.Kd from ConfigurationStore.
2018-09-24 16:54:50 +02:00
f2ae3fb1f7
Use cs.zprobe_zoffset from ConfigurationStore.
2018-09-24 16:47:57 +02:00
959d0069fa
Use cs.add_homing from ConfigurationStore.
2018-09-24 16:42:28 +02:00
ac7c062161
Use cs.max_jerk from ConfigurationStore.
2018-09-24 16:35:33 +02:00
bb66bfe6a7
Use cs.minsegmenttime from ConfigurationStore.
2018-09-24 16:22:50 +02:00
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
10428b30d9
Use cs.mintravelfeedrate from ConfigurationStore.
2018-09-24 16:01:58 +02:00
26e2fd1c76
Use cs.minimumfeedrate from ConfigurationStore.
2018-09-24 15:57:24 +02:00
b8fefceb4d
Use cs.retract_acceleration from ConfigurationStore.
2018-09-24 15:53:35 +02:00
7dbe0afdc4
Use cs.acceleration from ConfigurationStore.
2018-09-24 15:47:36 +02:00
cee51cf9c3
Use cs.max_acceleration_units_per_sq_second_normal from ConfigurationStore.
2018-09-24 15:40:35 +02:00
02becb5e6a
Use cs.max_feedrate_normal from ConfigurationStore.
2018-09-24 15:09:19 +02:00
053b94b711
remove "start" duplicity in setup
2018-09-24 14:57:46 +02:00
3f28632443
Use cs.axis_steps_per_unit from ConfigurationStore.
2018-09-24 14:54:41 +02:00
752aec37fb
M500 EEPROM version changed; if EEPROM_M500_SIZE is not updated, data are not stored
2018-09-19 14:36:26 +02:00
1253fb338a
wizard hotfix
2018-09-10 18:02:54 +02:00
001680bbdc
Merge branch 'MK3' into time_remaining_fix
...
# Conflicts:
# Firmware/Marlin_main.cpp
2018-09-07 08:21:36 +02:00
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
2f02828273
time remaining fix
2018-09-07 02:02:35 +02:00
66305b3e04
MK25: always show "normal mode" remaining time
2018-09-06 23:05:36 +02:00
40679dcb3a
Merge branch 'MK3' into MK3
2018-09-05 00:06:48 +02:00
25a22120fb
1-st Layer Calibration correction
...
filament loading improvement
2018-08-30 03:32:33 +02:00
b284c70d9b
auto deplete: dont eject filament
2018-08-29 13:08:09 +02:00
515e78cfd1
Eject filament feature in menu, M600: if it was envoked by FINDA, eject filament
2018-08-29 01:58:28 +02:00
d290543d7d
Merge pull request #1085 from mkbel/fix_active_filament
...
Fix active filament PFW-528
2018-08-28 23:50:57 +02:00
2cd8691376
Do not use global variable tmp_extruder when setting temperature.
2018-08-28 20:26:33 +02:00
0695f3f345
Z-move correction
...
Z-move inhibition after FactoryReset
2018-08-28 19:58:03 +02:00
8aeb7e04f1
Fix bound check for T0 .. T4 command. Document mmu_load_to_nozzle().
2018-08-28 18:52:16 +02:00
55eaa1de83
Fix code indentation.
2018-08-28 18:26:10 +02:00
9fb68fb724
Remove usage of global variable tmp_extruder in M200.
2018-08-28 18:08:21 +02:00
3e2cb72695
Merge branch 'MK3' into auto_deplete_2
2018-08-28 11:01:30 +02:00
2a00e5d348
Fix loading filament screen hangs if changed automatically.
2018-08-27 20:09:22 +02:00
191e5dfddd
mmu M600: dont use change extruder posibility; unload starts always imidiately
2018-08-27 16:12:10 +02:00
168bc74102
Merge pull request #1075 from PavelSindler/mmu_filament_sensor
...
Mmu filament sensor
2018-08-27 05:26:12 +02:00
b01e2a1a22
Merge pull request #1073 from PavelSindler/M600_mmu_fix
...
M600 mmu fix
2018-08-27 05:26:00 +02:00
03fffae4c3
finda runout sensor can be turned on/off from menu
2018-08-27 05:20:42 +02:00
ceb49d1262
finda filament runout: initial version
2018-08-27 04:21:43 +02:00
d3ed270a5a
single material printer (no mmu unit) M600 hotfix: M600_check_state loop working
2018-08-26 23:52:45 +02:00
2610547a48
Fixed displayed filament after load
2018-08-26 16:39:21 +02:00
85358342bc
Merge pull request #1065 from PavelSindler/mmu_v2_continue_loading
...
Mmu v2: continue loading command
2018-08-25 20:03:12 +02:00
f3edd37d11
removing unretract
2018-08-25 16:52:19 +02:00
68f2e22dad
continue loading command
2018-08-24 18:28:05 +02:00
5dc2af961b
ShippingPrepare & M600
...
message after ShippingPrepare
M600 :: better filament (un)retraction
2018-08-23 00:08:14 +02:00
315bfc43dd
MMU communication fix
2018-08-21 16:41:01 +02:00
94423e6f7e
MMU communication - mmu_ready
2018-08-20 20:53:53 +02:00
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
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
f1ad1d22ba
Menu lcd_adjust_bed fixed (Bed level correction, PFW-499)
2018-08-19 13:59:33 +02:00
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
9ee7a2124b
removed unused code
2018-08-09 18:43:07 +02:00
796079bb08
MMU2 communication - connection after reset, fw versions, state machine
...
+removed debug log from tmc2130
2018-08-09 17:43:43 +02:00
310751397c
line endings + fixed declaration
2018-08-08 20:11:57 +02:00
990a5c9119
PFW489 (github issue 1008) - time remaining variables declared as uint32
2018-08-08 19:51:50 +02:00
23e5cea5d0
MMU - code cleaning (modularity)
...
M403 set filament type
hardware reset
2018-08-08 18:58:03 +02:00
9e09efc9f4
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
...
conflicts + fix
2018-08-07 20:55:08 +02:00
71f1a1f6db
MMU - communication, check after start, code cleaning
2018-08-07 20:37:59 +02:00
d21e527c73
PRUSA Fir reports also buildnumber
2018-08-05 20:17:04 +02:00
cf06c5171c
merge with upstream
2018-08-03 18:43:09 +02:00
a1f69e0924
manage response update
2018-08-03 18:37:52 +02:00
5824da8310
add more extrusion to M600 load filament
2018-08-03 15:42:06 +02:00
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
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
468873ec68
MMU2 - removed conditional translation for SNMM_V2, new module mmu
2018-08-02 18:54:00 +02:00
282ff6c577
removed unused union
2018-08-02 17:09:02 +02:00
d378575a68
SNMM_V2 - default retraction declared as variable
2018-08-02 17:07:09 +02:00
ac60b3ebe7
Merge pull request #996 from PavelSindler/snmm_v2
...
M600 updated
2018-08-01 19:39:08 +02:00
618aea25d6
Merge pull request #995 from PavelSindler/filament_type
...
snmm v2: send filament type to mmu
2018-08-01 19:33:44 +02:00
24e7f0d0ec
mmures fix
2018-08-01 19:29:50 +02:00
06063118bd
M600 updated
2018-08-01 18:47:28 +02:00
b0077182e5
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 17:53:49 +02:00
54adb0beea
missing eol added
2018-08-01 16:54:26 +02:00
b35ef498f0
comments updated
2018-08-01 16:46:46 +02:00
665a885a21
Merge commit 'baddf38dbc2c72ab095deaf9b3e251ea2faeb699' into fix_compiler_warnings
2018-08-01 16:44:17 +02:00
135c4db5da
gcode for filemant type initial version: just re-sending information to mmu
2018-08-01 15:43:13 +02:00
0e059f8da6
single material fix: remove semicolon, unload_filament() function definition
2018-08-01 11:33:58 +02:00
e153a29bdb
messages corrected, 5 minutes timeout when communicating with mmu
2018-08-01 10:42:09 +02:00
45ac42caff
snmm v2: manage response: wait for nozzle temp only when heating
2018-08-01 09:58:07 +02:00
be1167fae3
M600 for multimaterial: don't check if filament unload was succesfull
2018-07-31 19:18:09 +02:00
40da6deef8
timeouts used when getting response from mmu, M600 improvements, no filament sensor in variants file
2018-07-31 19:00:42 +02:00
04d0178150
automatic M600 initial version
2018-07-31 12:24:22 +02:00
67f56d3de9
merge with upstream
2018-07-30 17:24:58 +02:00
970ba6fa2a
Sound
...
all cases
2018-07-29 22:59:14 +02:00
5bc40aff85
Merge pull request #975 from XPila/MK3-new_lang
...
EEPROM dump (code D3)
2018-07-26 19:59:09 +02:00
2f9003dbdd
fsensor - better state handling
2018-07-26 19:50:33 +02:00
9235ffb497
T code for SNMM_V2 fix
2018-07-26 17:03:43 +02:00
691e7a24ed
EEPROM dump (code D3)
2018-07-26 13:20:35 +02:00
cadb2e9cfe
Merge pull request #973 from MRprusa3d/MK3
...
PowerPanic IV
2018-07-26 09:40:57 +02:00
5be82962ee
PowerPanic IV
2018-07-25 19:24:41 +02:00
59c0127b77
automatic M600 for mmu v2: work in progress
2018-07-25 16:48:39 +02:00
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
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
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
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
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
2018-07-25 11:33:32 +02:00
0f577cace6
Fix compiler warning: sketch/Marlin_main.cpp:8759:8: warning: unused variable 'c' [-Wunused-variable]
2018-07-24 19:40:43 +02:00
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
c19bf72ba9
Fix compiler warning sketch/Marlin_main.cpp:8220:15: warning: unused variable 'k' [-Wunused-variable].
2018-07-24 18:33:44 +02:00
3f0684ea30
Fix compiler warning - remove unused variable.
2018-07-24 18:27:05 +02:00
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
68a3ae5456
Fix compiler warning sketch/Marlin_main.cpp:6331:11: warning: unused variable 'cnt' [-Wunused-variable]
2018-07-24 17:57:26 +02:00
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
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
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
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
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
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
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
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
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
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
c7d7389e27
PowerPanic & Sound
2018-07-23 20:04:47 +02:00
d347cdaf1a
Merge pull request #960 from XPila/MK3-new_lang
...
BOOTAPP support defined for EINSY
2018-07-23 17:32:08 +02:00
0659cf0287
Merge pull request #953 from PavelSindler/farm_mode_fix
...
G98 saves farm number
2018-07-23 17:31:42 +02:00
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
4eb4924d81
Optiboot enabled
2018-07-23 14:41:10 +02:00
b688bc9294
Merge branch 'MK3' into reapply_fix_compiler_warnings
2018-07-23 14:38:43 +02:00
dcf3b792be
Merge pull request #948 from XPila/MK3-new_lang
...
FSensor - optical quality meassurement
2018-07-23 14:37:16 +02:00
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
1a9643c892
G98 saves farm no
2018-07-23 11:49:06 +02:00
18419eefc4
no timeouts when communicating with mmu (temporarily ?)
2018-07-23 10:50:58 +02:00
60b4db15e0
FSensor - M600 fix + cond. translation + tunning filter and params
2018-07-22 16:14:13 +02:00
c6a3f073dd
FSensor - M600/autoload fix + optical quality meassurement
2018-07-21 17:04:29 +02:00
f07d08697a
max_feedrate and max_acceleration limitation fix (M201, M203)
2018-07-21 12:24:57 +02:00
2e260aeccc
FSensor - autoload fixed
2018-07-21 01:30:16 +02:00
1309c52bcf
FSensor - code cleaning + simplification
...
+ removed DEBUG_DISABLE_FSENSORCHECK
+ added FILAMENT_SENSOR
2018-07-20 23:48:00 +02:00
ca2d69271c
filament_autoload_enabled renamed to fsensor_watch_autoload
2018-07-20 20:37:50 +02:00
328cae1147
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
...
# Conflicts:
# Firmware/Marlin_main.cpp
2018-07-20 20:35:00 +02:00
0f91bf9527
FSensor - optical quality meassurement durring load filament
2018-07-20 20:30:08 +02:00
eac963e3a0
timeout prolonged
2018-07-20 18:03:52 +02:00
80ca5f3d33
merge with upstream fixes
2018-07-20 17:51:44 +02:00
814572fed5
merge with upstream
2018-07-20 17:22:06 +02:00
5fd1acaf81
Revert "PowerPanic"
2018-07-20 15:20:57 +02:00
fd9b9acf4e
FSensor, code cleaning + optical quality meassurement
2018-07-20 14:03:22 +02:00
b0ebea0c61
mmu: switching extruders simplified
2018-07-20 13:20:07 +02:00
bbec1ccfd4
Add files via upload
2018-07-20 04:34:12 +00:00
a09d44b869
PowerPanic
...
experimental
2018-07-20 04:47:33 +02:00
5483bee885
FSensor - meassuring filament optical quality
2018-07-19 20:55:38 +02:00
538f8a8858
Merge remote-tracking branch 'upstream/MK3' into snmm_v2
2018-07-19 20:27:51 +02:00
231a6dcf1b
M600 for single material fix
2018-07-19 20:27:39 +02:00
86882ae10a
M600 for snmm_v2 intial working version
2018-07-19 20:16:42 +02:00
2a66251170
_DISABLE_M42_M226 removed
2018-07-19 19:33:28 +02:00
fd0b7c25e5
TMC2130 speed and accel limitation (M201, M203) for stealth and normal mode
2018-07-19 19:12:46 +02:00
2ce210a8bb
TMC2130 feedrate and acceleration limitation - separate profiles for normal and stealth mode
2018-07-19 18:56:01 +02:00
5fecb7a2dc
M600
2018-07-19 16:17:46 +02:00
3cb3ec9975
Merge pull request #940 from XPila/MK3-new_lang
...
Filament sensor tunning
2018-07-19 15:22:47 +02:00
7600848533
load to nozzle function, M600 work in progress
2018-07-19 13:14:29 +02:00
afb9ca4687
FSensor - removed fsensor blocking while load, added filament quality meassurement
2018-07-18 17:45:54 +02:00
5676550452
missing get response readded
2018-07-18 16:52:10 +02:00
b9be718deb
timeout used everywhere where we are waiting for mmu reponse
2018-07-18 16:25:31 +02:00
0a43b9ce6b
timeout when waiting for mmu OK
2018-07-18 16:17:45 +02:00
6e760ef76d
merge with upstream cleanup
2018-07-18 15:34:33 +02:00
48d6ebffd8
Fix code_seen
...
char/string version was mixed
2018-07-17 18:57:28 +02:00
3f17364589
Fix various warnings
2018-07-17 18:57:28 +02:00
7bbf9953f2
Fix missing return warnings
2018-07-17 17:57:38 +02:00
baddf38dbc
Make card filename `const`
...
Fixes warning in filename_wldsd
2018-07-17 17:55:05 +02:00
3f92630fd1
Fix setTargetHotend array overflow
...
Special function may be used instead (setTargetHotends(temp))
2018-07-17 17:55:04 +02:00
33f9af65c8
merge with upstream/MK3
2018-07-17 16:36:53 +02:00
7bec5c6d5c
Merge branch 'MK3' into MK3-new_lang
2018-07-17 11:47:01 +02:00
77426b563a
Revert "Save 80B of flash and 8B of RAM and fix compiler warning:"
2018-07-17 11:28:44 +02:00
85c37d1225
Merge branch 'MK3' into fix_compiler_warnings
2018-07-17 10:56:25 +02:00
322978c920
Merge branch 'MK3_mk_prep' into MK3
2018-07-17 10:03:31 +02:00
eb3307e8fc
Merge pull request #889 from mkbel/fix_PRUSA_RESET
...
Do not skip bootloader when initiating reset by farm PRUSA RESET comm…
2018-07-17 09:52:41 +02:00
2451455974
LCD menu optimalization - initial lcd update fix
2018-07-16 23:54:46 +02:00
19a72ef9eb
LCD menu optimalization - LiquidCrystal_Prusa removed
2018-07-16 23:23:15 +02:00
e22d204e8e
LCD menu optimalization - print functions
...
+removed unused code
2018-07-16 19:29:27 +02:00
68e59399af
LCD menu optimalization - lcd_printPGM replaced with lcd_puts_P
2018-07-16 18:08:01 +02:00
0eaabed50c
LCD menu optimalization - renamed lcd_implementation clear
...
+code order
2018-07-16 17:54:16 +02:00
0924ad50d5
New localization vs octoprint fix - do not translate protocol messages
2018-07-16 04:50:43 +02:00
b6223d5623
LCD menu optimalization
2018-07-16 04:13:26 +02:00
268d2634f0
LCD menu optimalization - lcd and menu
...
removed unused code and conditional translation
2018-07-16 02:13:52 +02:00
0e15a4025b
whitespace
2018-07-15 20:24:24 +02:00
6824ab65dd
G28 fix
2018-07-15 20:00:29 +02:00
42893b7a94
Fix compiler warnings:
...
sketch/Marlin_main.cpp:806:6: warning: unused variable 'cursor_pos' [-Wunused-variable]
sketch/Marlin_main.cpp:1922:7: warning: unused variable 'stack_integrity' [-Wunused-variable]
sketch/Marlin_main.cpp:4254:8: warning: unused variable 'clamped' [-Wunused-variable]
2018-07-13 20:47:40 +02:00
c251777590
Fix compiler warning:
...
In file included from sketch/BlinkM.cpp:5:0:
sketch/Marlin.h:422:13: warning: 'void print_time_remaining_init()' declared 'static' but never defined [-Wunused-function]
static void print_time_remaining_init();
Make local functions static. Saves 6B of flash.
2018-07-13 18:44:54 +02:00
7c78559b0e
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
2018-07-12 18:27:06 +02:00
2c00f065fd
Fix error in recovering after power panic. (Function pointer was passed instead of function been called.)
...
It manifested istself as following compiler warnings:
sketch/Marlin_main.cpp: In function 'void print_physical_coordinates()':
sketch/Marlin_main.cpp:9065:86: warning: pointer to a function used in arithmetic [-Wpointer-arith]
printf_P(_N("physical coordinates: (%.3f, %.3f, %.3f)\n"), st_get_position_mm[X_AXIS], st_get_position_mm[Y_AXIS], st_get_position_mm[Z_AXIS]);
^
sketch/Marlin_main.cpp:9065:114: warning: pointer to a function used in arithmetic [-Wpointer-arith]
printf_P(_N("physical coordinates: (%.3f, %.3f, %.3f)\n"), st_get_position_mm[X_AXIS], st_get_position_mm[Y_AXIS], st_get_position_mm[Z_AXIS]);
^
sketch/Marlin_main.cpp:9065:142: warning: pointer to a function used in arithmetic [-Wpointer-arith]
printf_P(_N("physical coordinates: (%.3f, %.3f, %.3f)\n"), st_get_position_mm[X_AXIS], st_get_position_mm[Y_AXIS], st_get_position_mm[Z_AXIS]);
^
sketch/Marlin_main.cpp:9066:1: warning: pointer offset from symbol maybe incorrect [enabled by default]
}
^
_Z18st_get_position_mmh+2
sketch/Marlin_main.cpp:9066:1: warning: pointer offset from symbol maybe incorrect [enabled by default]
_Z18st_get_position_mmh+2
sketch/Marlin_main.cpp:9066:1: warning: pointer offset from symbol maybe incorrect [enabled by default]
_Z18st_get_position_mmh+1
sketch/Marlin_main.cpp:9066:1: warning: pointer offset from symbol maybe incorrect [enabled by default]
_Z18st_get_position_mmh+1
2018-07-12 18:06:07 +02:00
07f6ddfb69
filament loading corrected
2018-07-11 22:34:32 +02:00
9b7cc60b42
filament statistics hotfix, load filament move Z simplified
2018-07-11 21:59:43 +02:00
11aa775322
move in Z before filament loading: intial version
2018-07-11 21:59:23 +02:00
d18160cab5
splash screen
2018-07-11 21:58:06 +02:00
1357e27b55
FilamentAutoload setting by shipping preparation
2018-07-11 21:56:25 +02:00
d658bf56cf
ShippingPrep Reset
...
statistics reset by shipping preparation & filament sensor force
2018-07-11 21:55:21 +02:00
4b295c4091
FilamentAutoload setting by shipping preparation
2018-07-11 20:45:56 +02:00
066c044396
fixed tmc2130_wr_CHOPCONF
...
backlash - initial implementation (disabled by default)
removed menu "W25x20CL init"
splashscreen displayed before entering optiboot
2018-07-11 20:02:46 +02:00
d167b631fb
ShippingPrep Reset
...
statistics reset by shipping preparation & filament sensor force
2018-07-11 18:52:58 +02:00
1ad49dc5e9
first working version
2018-07-10 10:45:45 +02:00
c7745dfb83
Merge pull request #908 from XPila/MK3-new_lang
...
TMC2130 gcodes for live motor tunning:
2018-07-09 16:58:09 +02:00
771cead291
TMC2130 gcodes for live motor tunning:
...
TMC_SET_WAVE_X..E (linearity correction)
TMC_SET_CHOP_X..E (chopper configuration - 4 args - toff, hstr, hend, tbl)
2018-07-09 16:44:10 +02:00
bde81de984
load and unload filament functions for snmm_v2
2018-07-09 15:24:59 +02:00
928dcb1417
missing initialization fix
2018-07-09 14:45:59 +02:00
5979bf5e0c
T-codes for MMU_V2: initial version
2018-07-09 13:57:36 +02:00
3248edc1ca
Do not skip bootloader when initiating reset by farm PRUSA RESET command.
...
Set bootloader magic and run flag before watchdog reset in PRUSA RESET command.
2018-06-26 20:12:09 +02:00
6f617696ac
dummy "ok" reponse readded (fix for SD card print with Octoprint: fixes communication timeout issues)
2018-06-25 18:52:22 +02:00
20f98d487a
Merge pull request #872 from XPila/MK3
...
Farm mode - tmc2130 extruder current setting fixed
2018-06-25 17:45:58 +02:00
fe9b4e5f1f
Farm mode - tmc2130 extruder current setting fixed
2018-06-25 17:45:07 +02:00
0fccf5a737
Merge pull request #870 from XPila/MK3
...
Mk3
2018-06-25 17:36:22 +02:00
5d531b0f66
save extruder relative mode correctly
2018-06-25 17:30:20 +02:00
12de2f95e6
Farm mode: PFW360, PFW361, PFW362, PFW363
2018-06-25 17:29:34 +02:00
6d4c3b8b27
Farm mode - reset using watchdog for MK3
2018-06-25 16:04:47 +02:00
49ad60f0ff
Merge pull request #851 from PavelSindler/confused_display
...
set default printer message when recovering from crash detection
2018-06-22 08:48:33 +02:00
a83475bf7c
whitespace
2018-06-21 22:18:10 +02:00
7b81663883
crash detection/stop print erroneous movements hotfix
2018-06-21 22:16:45 +02:00
ee1e8dfccc
set default printer message when recovering from crash detection and at the end of mesh bed leveling
2018-06-20 17:58:31 +02:00
2be36f626f
Merge pull request #845 from PavelSindler/crash_movements
...
crash detection fix for absolute E coordinates
2018-06-19 18:46:39 +02:00
650d8cc643
Merge pull request #844 from mkbel/add_farm_PRUSA_RESET
...
Add PRUSA RESET command in farm mode.
2018-06-19 18:44:00 +02:00
1e60390545
dont process data from serial line if print is saved (crash detection and filament detection)
2018-06-19 16:51:22 +02:00
209209459d
Merge remote-tracking branch 'upstream/MK3' into crash_movements
2018-06-18 18:29:12 +02:00
7619e94040
New ML support - checksum and signature
2018-06-15 20:37:33 +02:00
ac1e089a7f
crash detection fix for absolute E coordinates
2018-06-15 20:03:48 +02:00
32165dedb0
Add PRUSA RESET command in farm mode.
2018-06-15 17:07:44 +02:00
9ba49affc6
Merge pull request #835 from PavelSindler/safety_timer_gcode
...
Safety timer gcode
2018-06-14 20:49:25 +02:00
ed2f87f4f5
documentation updated
2018-06-14 17:29:40 +02:00
eef6c68c9f
Added support for a secondary boot loader, based on the OptiBoot project,
...
modified to update the external flash memory on Einsy boards.
Due to a bug in the USB to serial converter firmware on the Prusa Einsy
boards, the STK500 protocol has been modified to never send semicolon
characters towards the main processor.
This firmware updater is compatible with a modified avrdude using
the "arduino" protocol, see the following commit.
https://github.com/prusa3d/Slic3r/tree/fwupdater_languages
2018-06-14 15:13:21 +02:00
2026e7fe4d
Revert changes in Timer class; disable safety timer in handleSafetyTimer function if safetytimer inactive time was set to zero
2018-06-14 13:14:14 +02:00
2a219143fe
Merge remote-tracking branch 'upstream/MK3' into safety_timer_gcode
2018-06-14 13:09:15 +02:00
c1425aece3
gcode: set safety timer period
2018-06-13 16:22:06 +02:00
3ca7c82e08
power panic: restore dir names
2018-06-12 19:45:59 +02:00
fb6f4c6c8f
break
2018-06-12 15:06:11 +02:00
0ab0519c01
power panic fix: short filenames
2018-06-12 14:35:25 +02:00
db9c82acef
M600 communication timeout fix
2018-06-11 20:28:18 +02:00
d6ccaa7c08
Merge pull request #830 from PavelSindler/crash_det_cool_hotend
...
Crash detection: set nozzle target temp to zero when waiting for user
2018-06-11 15:43:54 +02:00
5178675cdd
Merge pull request #829 from PavelSindler/temp_cal_fix2
...
Home XYZ: first move Z higher to protect steel sheet/heatbed
2018-06-11 15:42:59 +02:00
2f5bb80e98
crash detection: turn off nozzle when waiting for user
2018-06-11 15:34:16 +02:00
d4106c2fe3
If homing all axes, move Z little bit higher before X and Y movements to protect steel sheet/heatbed
2018-06-11 11:13:49 +02:00
0cf7d12ae3
New ML support - lcd optimalization
...
lcd_puts_P and lcd_printf_P functions
LineFeed implemented in LiquidCrystal_Prusa
2018-06-10 22:06:00 +02:00
0f75bcb442
New ML support - flash usage optimalization
...
used flash space 252826bytes (MK3 + ML support), free ~1kbyte
2018-06-10 20:44:36 +02:00
c25fec9f0a
New ML support
...
printf float library enabled - platform.txt must be modified!
+flash usage optimalization - printing to serial line
current flash usage: 253206bytes (MK3 + ML support)
platform.txt original line 20:
compiler.c.elf.flags=-w -Os -Wl,--gc-sections
platform.txt modified line 20 (enable printf float library)
compiler.c.elf.flags=-w -Os -Wl,-u,vfprintf -lprintf_flt -lm -Wl,--gc-sections
2018-06-10 20:04:25 +02:00
a1ea5019dc
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
2018-06-10 16:29:29 +02:00
076258ff99
New ML support - cond.trans. for LANG_MODE 0
2018-06-10 16:28:15 +02:00
4567d2feca
removed unused cond. trans. for NEW_SPI
2018-06-10 16:11:39 +02:00
fcfb4cdcae
New ML support - menu tunning, startup
...
+config headers (bool - true/false replaced with 0/1)
+fixed include hierarchy
+removed comments
2018-06-10 16:04:32 +02:00
f098707021
New ML support - W25X20CL - update process UI tunning
2018-06-10 00:22:28 +02:00
5de0a6437d
New ML support - W25X20CL - lang switching
...
+removed unused code
2018-06-09 23:49:26 +02:00
dcd58d002c
New ML support - W25X20CL
...
language selection from menu is working
2018-06-09 19:16:36 +02:00
a9446cc6b3
New ML support - W25x20CL
2018-06-09 18:26:53 +02:00
ebd8375313
New ML support - external flash W25X20CL - upgrade is working!!! (hardcoded to german)
...
+print test (LT_PRINT_TEST)
2018-06-09 17:49:41 +02:00
c0946d8f04
New ML support - w25x20cl spi external flash support
...
+fixed some messages
+sec lang update test
2018-06-09 01:23:04 +02:00
31357379ff
Merge branch 'MK3' into time_remaining
2018-06-08 18:31:32 +02:00
8963757c3c
Merge branch 'MK3' into crash_detection_stop
2018-06-08 18:28:43 +02:00
5e120e6e52
power panic flow factor hotfix
2018-06-08 18:13:50 +02:00
332a23bef5
Crash detection stops and waits for user if it fails multiple times in short time frame
2018-06-08 16:08:07 +02:00
739de5224e
Merge branch 'MK3' into MK3-new_lang
2018-06-08 14:38:00 +02:00
37f82118c8
New ML support - lang select menu fix
2018-06-08 02:03:25 +02:00
bd1e410228
New ML support - W25X20CL external spi flash support
2018-06-08 00:20:28 +02:00
877f8f2a61
Merge pull request #795 from 3d-gussner/MK3_fix5
...
Fix warning: This is kind of important
2018-06-07 22:22:54 +02:00
a15f0138de
show estimated time to end of the print if available in gcode: initial version
2018-06-07 20:50:30 +02:00
42cfcb2601
Merge pull request #794 from stahlfabrik/M860-enhanced
...
Improved M860 - now wait for cooling of PINDA, too
2018-06-06 12:01:06 +02:00
1290326210
Merge pull request #790 from PavelSindler/power_panic_flow_rate
...
power panic: extruder_multipliers added
2018-06-05 20:58:15 +02:00
6a8425f62d
Merge pull request #809 from mkbel/Use_Timer
...
Use timer
2018-06-05 20:54:41 +02:00
d49c4508a7
removing some debug code
2018-06-05 20:39:42 +02:00
264daaf715
typo fixed
2018-06-05 20:33:05 +02:00
aacaf67eaa
Crash detection/filament sensor: restore print from stored line number in case that we are printing over USB, retraction fix; debug: cmd queue on LCD
2018-06-05 20:28:41 +02:00
01af8a806b
Merge branch 'MK3' into Use_Timer
2018-06-05 19:03:11 +02:00
f819392d10
Do not create static object in function. Saves 8B RAM and 16B flash, because there is no need to guard constructor against concurrent calls.
2018-06-05 18:38:25 +02:00
7cc8b743c2
Add .gitignore. Setup doxyfile. Create project documentation main page. Document property of static object constructors on gcc-avr.
2018-06-05 18:30:02 +02:00
746ac17e4e
debugging
2018-06-04 16:40:56 +02:00
47c68c884c
New ML support - fixed duplicate strings
2018-06-01 14:35:03 +02:00
53d9d8bd8a
New ML support - lang codes
...
+script tunning
2018-06-01 10:47:47 +02:00
5004433b20
Fix warning: This is kind of important
...
Again another fix from https://github.com/prusa3d/Prusa-Firmware/pull/138 made by @Thess for the MK2 branch which i think is quite important.
Ardunio IDE 1.8.5 result with Compiler warnings set to "More" or "All"
```
sketch\Marlin_main.cpp:3265:44: warning: the address of 'retracted' will always evaluate as 'true' [-Waddress]
if((echange<-MIN_RETRACT && !retracted) || (echange>MIN_RETRACT && retracted)) { //move appears to be an attempt to retract or recover
^
sketch\Marlin_main.cpp:3265:82: warning: the address of 'retracted' will always evaluate as 'true' [-Waddress]
if((echange<-MIN_RETRACT && !retracted) || (echange>MIN_RETRACT && retracted)) { //move appears to be an attempt to retract or recover
^
sketch\Marlin_main.cpp:3268:28: warning: the address of 'retracted' will always evaluate as 'true' [-Waddress]
retract(!retracted);
^
sketch\Marlin_main.cpp:3870:15: warning: statement has no effect [-Wunused-value]
```
I don't know if that helps making small pull requests as they are easier to review or it would make sense to combine few more.
Prusa should really review this pull [request](https://github.com/prusa3d/Prusa-Firmware/pull/138 ) again for the MK3 branch, as it was one that made warnings disapear in the MK2 branch and made finding new flaws in the code much much easier.
2018-06-01 10:17:03 +02:00
5a2b056d47
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
2018-06-01 00:43:16 +02:00
7c4fce7876
whitespace correction
2018-05-31 18:55:14 +02:00
73708ec883
Improved M860 - now wait for cooling of PINDA, too
...
The M860 - wait for PINDA temperature - gcode has been improved. Until now it could only wait until the PINDA has been warmed up to a set temperature. Now it also can wait until the PINDA has cooled down to a set temperature. The calling syntax has not been changed at all. The logic now looks if the bed or hotend have a target temperature different from 0. If so, the code waits until PINDA has warmed up. Otherwise it waits until PINDA has cooled down.
Applications:
- Possibility to start a Print at exactly the right PINDA temperature. (Do not start the heater until PINDA is cooled down)
- Much easier manual temperature calibration (automating the wait for cool down in between calibration runs)
- Possibility for temp calibration verification on one heat bed by printing multiple objects with different PINDA temperatures one after the other
2018-05-31 16:41:59 +02:00
80c641ae5d
Merge pull request #789 from 3d-gussner/MK3_fix4
...
Fixed warning: invalid suffix on literal; C++11 requires a space betw…
2018-05-31 14:09:49 +02:00
37e575f4bc
New ML support - debug output, bootloader
...
bootapp - automaticaly erase flash when necessary
+test code
2018-05-30 19:29:52 +02:00
9104b0601a
power panic: extruder_multipliers added
2018-05-30 18:59:33 +02:00
eeca0f683b
Fixed warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix]
2018-05-30 16:06:22 +02:00
3bf47d7f83
"run xyz cal first" message
2018-05-30 15:29:59 +02:00
987f8969c0
Merge remote-tracking branch 'upstream/MK3' into temp_cal_coordinates_fix
2018-05-30 15:20:40 +02:00
2561ab9c7d
Merge pull request #786 from XPila/MK3-new_lang
...
Mk3 new lang
2018-05-30 14:54:47 +02:00
dce2d45499
Fixed forgotten comment
2018-05-30 13:35:48 +02:00
4746c77195
New ML support - bootloader support and update proces test
2018-05-29 21:03:47 +02:00
d307868a90
merge with upstream
2018-05-28 20:38:55 +02:00
26724c4a48
removed message
2018-05-28 20:31:57 +02:00
7e79ce8e53
MK3: crash detection for Z axis is active during auto home and mesh bed leveling (normal mode is forced for Z movents); temp cal coordintes corrections; temp cal: xy movents always in safe Z distance from heatbed, Z-axis homing improved
2018-05-28 20:26:15 +02:00
MRprusa3d
Laurentiu
PavelSindler
MRprusa3d
Marek Bel
PavelSindler
Robert Pelnar
mkbel
bubnikv
Petr Ledvina
3d-gussner
Christoph Stahl