PavelSindler
fc5d7e35ef
fail stats mmu function definitions
2018-12-18 17:35:41 +01:00
PavelSindler
11ab5dfd36
fail stats menu for mmu defined for MK2.5 version
2018-12-18 17:33:27 +01:00
PavelSindler
4543949cac
build without MMU_IDLER_SENSOR_PIN defined
2018-12-18 17:29:44 +01:00
PavelSindler
fc33affbda
temporary change
2018-12-18 17:24:29 +01:00
PavelSindler
2100376eb1
Merge remote-tracking branch 'upstream/MK3' into idler_sensor
2018-12-18 16:16:48 +01:00
PavelSindler
c782373f2d
comment
2018-12-18 16:09:10 +01:00
PavelSindler
7703125b2e
retry unload movements (T-codes, M702 C) if filament detected by idler sensor, then turn off stepper and wait, MMU_LOAD_TIME prolonged
2018-12-18 16:08:29 +01:00
PavelSindler
27c8612360
use just short movement for unloading filament
2018-12-17 21:25:07 +01:00
PavelSindler
cb1f6d2a0e
show sensor states in calibration menu
2018-12-14 19:43:26 +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
e0bed71801
comments update
2018-12-13 17:01:45 +01:00
PavelSindler
bbba27c15f
idler state menu
2018-12-13 16:53:59 +01:00
PavelSindler
24ef6deeed
typo fixed
2018-12-13 16:43:40 +01:00
PavelSindler
9c4f086add
fixed statistics for MMU_FAIL
2018-12-13 01:09:21 +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
665f1d7ffe
pause print after N continue loading attempts and wait for user, then start print and repeat last T-code
2018-12-12 23:36:50 +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
PavelSindler
041ed172a0
Merge remote-tracking branch 'robert/MK3' into idler_sensor
2018-12-11 19:16:04 +01:00
PavelSindler
8af127870d
consume click
2018-12-11 15:59:44 +01:00
Joshua Hoblitt
3f96dea4f9
make all shell scripts executable
2018-12-10 07:09:03 -07:00
PavelSindler
6d6de67c3f
consume click
2018-12-07 18:31:30 +01:00
Robert Pelnar
35378769fd
MMU - idler sensor
2018-12-06 19:19:50 +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
Robert Pelnar
cb334238cc
Slow PWM fan @ 62.5Hz
2018-12-06 15:18:07 +01:00
XPila
1948cb6310
Merge pull request #1369 from PavelSindler/M220_MK3
...
M220: possibility to backup/restore speed
2018-11-30 19:02:45 +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
MRprusa3d
83a9f75abe
minTemp
...
correct minTemp detection @ MK2.5 & MK3
2018-11-28 23:43:16 +01:00
Marek Bel
38dacaf07a
Automate secondary language support build.
2018-11-26 20:24:24 +01:00
PavelSindler
90876453a7
Merge pull request #1357 from PavelSindler/MK3_for_merging
...
version change
2018-11-22 23:32:37 +01:00
PavelSindler
47d3535012
version change
2018-11-22 23:30:01 +01:00
PavelSindler
c1773c1aa4
Merge pull request #1356 from PavelSindler/MK3_for_merging
...
process serial line during pause
2018-11-22 23:07:07 +01:00
PavelSindler
85b23d1db6
process serial line during pause
2018-11-22 21:41:22 +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
e229f3343e
Lang - text "volume.init failed" removed from dictionary
2018-11-22 18:48:22 +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
ddf898cb41
Lang - text "SD init fail" removed from dictionary
2018-11-22 18:41:00 +01:00
Robert Pelnar
3384dd8487
Lang - text "SD card ok" removed from dictionary
2018-11-22 18:39:35 +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
f0e3021d33
Lang - text "openRoot failed" removed from dictionary
2018-11-22 18:20:24 +01:00
Robert Pelnar
1cbb261707
Lang - text "open" removed from dictionary
2018-11-22 18:18:25 +01:00
Robert Pelnar
f4bbce4142
Lang - text "open failed, File: " removed from dictionary
2018-11-22 18:15:22 +01:00
Robert Pelnar
72d47eaeba
Lang - text "ok" removed from dictionary
2018-11-22 18:12:19 +01:00
Robert Pelnar
1568b94e87
Lang - text "No Checksum with line number, Last Line: " removed from dictionary
2018-11-22 18:09:07 +01:00
Robert Pelnar
fd3cd9b551
Lang - texts "Mxxx Invalid extruder " removed from dictionary
2018-11-22 18:06:10 +01:00
Robert Pelnar
fdf9734161
Lang - text "checksum mismatch, Last Line: " removed from dictionary
2018-11-22 17:59:43 +01:00
Robert Pelnar
9c964277ac
Lang - text "error writing to file" removed from dictionary
2018-11-22 17:57:52 +01:00
Robert Pelnar
9f86a334c6
Lang - text "endstops hit: " removed from dictionary
2018-11-22 17:53:51 +01:00
Robert Pelnar
0baa6412fc
Lang - text "Cannot enter subdir: " removed from dictionary
2018-11-22 17:49:28 +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
283e33dd69
Lang - text " cold extrusion prevented" removed from dictionary
2018-11-22 17:44:53 +01:00
Robert Pelnar
104353c0c5
Lang - text " PlannerBufferBytes: " removed from dictionary
2018-11-22 17:43:11 +01:00
Robert Pelnar
46fba48173
Lang - text "enqueing \"" removed from dictionary
2018-11-22 17:38:52 +01:00
Robert Pelnar
0ceeba38cb
Lang - text "Copy selected language from XFLASH?" shorted to "Copy selected language?"
2018-11-22 17:32:53 +01:00
Robert Pelnar
099fe216b6
Lang - text "KILLED. " removed from dictionaries
2018-11-22 17:26:01 +01:00
Robert Pelnar
37273d9fca
Lang - 'Auto Deplete' changed to 'SpoolJoin'
2018-11-22 17:19:38 +01:00
PavelSindler
49367c0b09
Merge pull request #1353 from XPila/V3_5
...
Lang - french translation
2018-11-22 17:18:42 +01:00
Robert Pelnar
f0624a9e97
Lang - some not localized texts marked as localized, formating fixed
2018-11-22 14:37:29 +01:00
XPila
3d76081c79
Merge pull request #1351 from PavelSindler/MK3_for_merging
...
mmu: FINDA disabled by damaged/disconnected PAT9125 hotfix
2018-11-21 20:03:07 +01:00
PavelSindler
0e65790218
removed redundant code
2018-11-21 19:49:19 +01:00
PavelSindler
74a7341005
mmu: FINDA disabled by damaged/disconnected PAT9125 hotfix
2018-11-21 19:27:55 +01:00
PavelSindler
9fa587b206
Merge pull request #1350 from XPila/V3_5
...
V 3.5 - new translation
2018-11-21 15:23:41 +01:00
Robert Pelnar
2dc5439069
Lang - reserved space increased to 0x2f00 (12032 bytes)
2018-11-21 14:57:20 +01:00
Robert Pelnar
1bff138b50
Lang - sec.lang. reserved space increased to 0x2e00 (11776 bytes)
2018-11-21 14:52:14 +01:00
PavelSindler
18eb9ad69e
Merge pull request #1344 from PavelSindler/progress_bar_fix
...
progress bar fix
2018-11-20 14:50:04 +01:00
Marek Bel
ab5b57df11
Style.
2018-11-19 20:41:14 +01:00
PavelSindler
cb7c701791
whitespace
2018-11-19 20:09:03 +01:00
PavelSindler
7d538cde6c
Retrieve settings (M501): initialize each item in feedrate and acceleration arrays separately
2018-11-19 20:05:58 +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
0398c3c26b
Merge pull request #1335 from PavelSindler/T_codes
...
version change
2018-11-13 17:49:26 +01:00
PavelSindler
51c80352e8
version change
2018-11-13 17:48:42 +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
XPila
c41b045ea7
Merge pull request #1333 from PavelSindler/T_codes
...
T-code fix
2018-11-13 16:09:52 +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
PavelSindler
f297e72864
Merge pull request #1332 from XPila/V3_5
...
Fix PFW657 - filament runout detection is not working after autoload …
2018-11-13 14:10:11 +01:00
Robert Pelnar
d886ba1100
Fix PFW657 - filament runout detection is not working after autoload disabled from menu.
2018-11-13 14:05:15 +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
PavelSindler
27db32cbd0
Merge pull request #1331 from XPila/V3_5
...
M907 fix - value in mA (PFW655)
2018-11-12 20:49:09 +01:00
Robert Pelnar
41b885c537
M907 fix - value in mA (PFW)
2018-11-12 20:39:25 +01:00
MRprusa3d
5e8e96b5d7
MMU module adjustment
...
MMU module conditional compilation adjustment for MMU v1
2018-11-12 20:09:54 +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
10a81ea768
version change
2018-11-09 19:16:53 +01:00
PavelSindler
5931d15566
whitespace
2018-11-09 18:31:28 +01:00
PavelSindler
c991c8b314
resume print fix: wait for heater() never disable steppers
2018-11-09 18:29:35 +01:00
XPila
10b79e918b
Merge pull request #1321 from PavelSindler/M600_load_fix
...
M600 load messages synchronization fixed
2018-11-09 15:40:00 +01:00
PavelSindler
22cf2c6b6b
M600 load messages synchronization fixed
2018-11-09 15:31:44 +01:00
PavelSindler
7022373885
Merge pull request #1320 from XPila/V3_5
...
localization - lang-export.sh + po files + tmc2130_print_currents fixed (M913)
2018-11-09 15:27:43 +01:00
Robert Pelnar
3afebcc9cc
tmc2130_print_currents fixed (for obsolete M913)
2018-11-09 15:20:25 +01:00
PavelSindler
5f166374ab
Merge pull request #1319 from XPila/V3_5
...
Fix PFW651 - cannot upload MK3 languages with slic3r (firmware compil…
2018-11-09 13:10:51 +01:00
Robert Pelnar
6c13225f49
Fix PFW651 - cannot upload MK3 languages with slic3r (firmware compiled on linux arduino 1.8.5 + lto)
2018-11-09 10:45:16 +01:00
PavelSindler
0e7fb26dc5
Merge pull request #1316 from MRprusa3d/PFW-635
...
MeshBed Levelling Fail IV
2018-11-08 10:18:08 +01:00
PavelSindler
6d59f88a8e
Merge pull request #1315 from MRprusa3d/PFW-639
...
Bed PowerMonitor III
2018-11-08 10:08:31 +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
MRprusa3d
fd45dd64dc
Bed PowerMonitor III
2018-11-08 03:32:00 +01:00
PavelSindler
3cccb125f7
Merge pull request #1313 from MRprusa3d/PFW-639
...
Bed PowerMonitor II
2018-11-07 13:50:50 +01:00
MRprusa3d
4ae857136d
Bed PowerMonitor II
2018-11-07 13:38:39 +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
PavelSindler
a5bbc75035
Merge pull request #1309 from mkbel/fix_1st_lay_cal
...
PFW-634 Move T<nr> code just before extrude code to properly load fil…
2018-11-07 10:28:13 +01:00
Marek Bel
b4d4bfa667
Do not declare extern class in .cpp file, include appropriate header.
2018-11-06 20:54:53 +01:00
Marek Bel
95b0506284
Make lcd_long_press_active private.
2018-11-06 20:48:28 +01:00
Marek Bel
676434111e
Disable long press handler in modal dialogs (LCD update disabled).
2018-11-06 20:43:19 +01:00
Marek Bel
02e31433f4
PFW-634 Move T<nr> code just before extrude code to properly load filament in first layer calibration with MMUv2.
2018-11-06 15:46:37 +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
PavelSindler
908fffc19a
Merge pull request #1306 from PavelSindler/fsensor_q
...
filament quality measurements disabled
2018-11-05 19:14:34 +01:00
PavelSindler
0a6ca7ffd0
Merge pull request #1305 from XPila/V3_5
...
PFW643 - removed M910-M918, implemented M907
2018-11-05 19:14:19 +01:00
PavelSindler
89ad02ac8c
filament quality measurements disabled
2018-11-05 18:37:36 +01:00
Marek Bel
50f9bf06be
Save 74B of flash memory.
2018-11-05 18:02:46 +01:00
Marek Bel
e95c2ad592
Display auto deplete as not available if filament sensor is disabled.
2018-11-05 17:43:07 +01:00
Robert Pelnar
d6b5f5a1c7
PFW643 - removed M910-M918, implemented M907
2018-11-05 16:15:27 +01:00
Marek Bel
ef5be690fb
Add autodeplete setting into tune menu.
2018-11-05 13:54:22 +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
688c10247e
Merge pull request #1291 from XPila/MK3-new_bs
...
lang update
2018-11-05 10:38:29 +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
3d24f5437c
leave Z move menu (hotfix)
2018-11-04 23:44:29 +01:00
PavelSindler
daef0eeb67
Merge pull request #1297 from MRprusa3d/PFW-635
...
MeshBed Leveling Fail
2018-11-04 23:33:29 +01:00
mkbel
e177c2b669
Merge pull request #1295 from PavelSindler/feedrate_change
...
choosing filament from T? menu changes feedrate fixed
2018-11-04 23:13:03 +01:00
PavelSindler
515f2723d7
Merge pull request #1301 from XPila/V3_5
...
PFW644 + PFW638
2018-11-04 23:10:10 +01:00
PavelSindler
8afb83406e
Wizard for assembled printers (contains more steps now)
2018-11-04 23:08:23 +01:00
Robert Pelnar
33a29cd416
Fix PFW638 - remaining/elapsed time >100h displayed in hours
2018-11-04 20:27:09 +01:00
PavelSindler
e2d2fb58aa
Z calibraion: always ask user to clean nozzle
2018-11-04 18:47:08 +01:00
XPila
35fae8be1c
Merge pull request #1294 from PavelSindler/manage_response_heating
...
mmu manage response: possibility to resume saved nozzle temperature
2018-11-04 18:31:47 +01:00
Robert Pelnar
1e05e1189d
Fix PFW644 - MK25 reports stopped, arduino 1.8.5.
2018-11-03 22:44:42 +01:00
MRprusa3d
73794b56cf
MeshBed Leveling Fail
...
Z-leveling after MeshBed leveling failing
2018-11-02 23:03:14 +01:00
PavelSindler
e304319e15
choosing filament from T? menu changes feedrate fixed
2018-11-02 20:25:24 +01:00
PavelSindler
d18013e5a2
manage response now contains showing nozzle temperature and possibility to resume saved nozzle temperature
2018-11-02 19:31:10 +01:00
MRprusa3d
18a8ae5b8f
Bed PowerMonitor
...
bed power monitoring correction
2018-11-01 20:55:42 +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
Robert Pelnar
a0e4acead3
lang - removed unused code and some service messages changed to "not translated"
2018-11-01 14:07:16 +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
PavelSindler
6a82af487e
Merge pull request #1278 from XPila/MK3-new_bs
...
New lang - fixed french langcode and comparsion in lang-clean script
2018-10-26 13:18:48 +02:00
mkbel
16c2f6fe8e
Merge pull request #1279 from PavelSindler/turn_on_FINDA
...
mmu2: filament senor (FINDA) menu fix
2018-10-25 21:53:11 +02:00
PavelSindler
a9317b4d36
upstream/MK3 merge
2018-10-25 21:46:32 +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
0e0dbad871
#ifdef __cplusplus added to allow including to .c file
2018-10-25 21:06:37 +02:00
PavelSindler
01529f18d2
upstream/MK3 merge
2018-10-25 20:57:27 +02:00
PavelSindler
a6a81c6ea6
mmu2: filament senor (FINDA) can be switched ON/OFF from menu without dependency on pat9125 state
2018-10-25 18:26:26 +02:00
Robert Pelnar
d301aa0e8c
New lang - fixed french langcode and comparsion in lang-clean script
2018-10-25 18:16:36 +02:00
Robert Pelnar
7e9eaf0f4b
New lang, arduino 1.8.5 - disable multilanguage support by default
2018-10-23 17:32:52 +02:00
PavelSindler
bd8ca8d652
removed redefinition of functions in fsensor.cpp
2018-10-22 20:51:44 +02:00
PavelSindler
d1de9fff60
mmu_loop: missing return added
2018-10-22 20:38:32 +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
Robert Pelnar
563052d015
New lang, arduino 1.8.5 - language.c - DEBUG_SEC_LANG fix
2018-10-18 15:39:08 +02:00
Robert Pelnar
868c79e835
New lang, arduino 1.8.5 - language.h - section names, messages.h - extern "C" added
2018-10-18 14:41:32 +02:00
PavelSindler
b8f92fdfa9
MK2.5 printers set mmu to stealth mode (using Mx code), required mmu2 buildnr can be different for MK2.5 and MK3 printers
2018-10-18 02:44:16 +02:00
mkbel
0d9b502937
Merge pull request #1246 from PavelSindler/variants_max
...
MK3: default max feedrate for x and y changed to 100mm/s
2018-10-10 16:46:34 +02:00
PavelSindler
bbd4f70f41
Merge pull request #1221 from XPila/MK3
...
Update fsensor in Manage_inactivity instead of main loop.
2018-10-10 13:12:12 +02:00
PavelSindler
866d6758c3
Merge pull request #1243 from mkbel/simplify_EEPROM_M500
...
Simplify eeprom m500
2018-10-10 13:11:17 +02:00
Marek Bel
9dff6431e6
Format fsensor documentation.
2018-10-09 22:33:54 +02:00
PavelSindler
809ae5a5f0
default max feedrate for x and y changed to 100mm/s
2018-10-09 20:03:28 +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
PavelSindler
c91c878408
Merge pull request #1202 from MRprusa3d/PFW-573
...
preHeatError
2018-10-08 16:12:33 +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
Marek Bel
c77672bf0f
PFW-608 Decrease wear of mass erase EEPROM and do it faster.
2018-10-05 18:11:26 +02:00
PavelSindler
436f5b5728
changed version
2018-10-04 17:40:38 +02:00
PavelSindler
d2aa13d333
Merge pull request #1199 from mkbel/document_gcodes1
...
Documentation: Put scattered and unscattered Gcode documentation toge…
2018-10-04 16:29:39 +02:00
Robert Pelnar
9960c80bf7
Additional check always with enabled oq_meassure
...
+ variant files
2018-10-04 16:12:41 +02:00
Robert Pelnar
f9d8c46802
Enable/disable optical quality meassurement in settings menu
2018-10-04 15:48:28 +02:00
Robert Pelnar
ced74b7ec2
Merge remote-tracking branch 'upstream/MK3' into MK3
2018-10-04 13:53:00 +02:00
Robert Pelnar
7882b3c975
Update fsensor in Manage_inactivity instead of main loop.
2018-10-03 17:29:24 +02:00
PavelSindler
3a58489c6a
Merge pull request #1169 from mkbel/remove_duplicate_debouncing_4
...
Remove duplicate debouncing 4
2018-10-02 11:21:17 +02:00
PavelSindler
bba1ffdb65
version change
2018-09-27 21:13:06 +02:00
PavelSindler
aefb4e5c09
Merge pull request #1200 from XPila/MK3
...
Filament sensor - fix invalid calculation of fsensor_counter in LA st…
2018-09-27 21:05:33 +02:00
Robert Pelnar
e50025cc7d
static_assert - portable solution compatible with C++98
2018-09-27 19:59:29 +02:00
PavelSindler
7e9220ada2
Merge pull request #1198 from PavelSindler/communication_timeouts
...
communication timeouts fix
2018-09-27 11:23:58 +02:00
MRprusa3d
0184f06dcf
preHeatError
...
correction of preHeatError detection
2018-09-27 04:23:00 +02:00
Robert Pelnar
c2f535b619
Filament sensor - fix invalid calculation of fsensor_counter in LA stepper.
...
+decreased additional check sensitivity/sctrictness
2018-09-26 18:59:07 +02:00
Marek Bel
0e33db0064
Documentation: Put scattered and unscattered Gcode documentation together in process_commands documentation. Mention at least existence of all implemented commands. Document T<n> and T? commands.
2018-09-26 18:55:31 +02:00
PavelSindler
e6a00b8f53
send busy messages when checking for filament presence
2018-09-25 19:14:57 +02:00
Marek Bel
4151e19781
Remove attribute packed. It is not needed on 8-bit platform. Change of platform would be detected by static_assert (sizeof(M500_conf) == 188).
2018-09-25 16:27:20 +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
ccfcc6f989
Document.
2018-09-24 18:32:01 +02:00
Marek Bel
3662f60f8f
if max_feedrate_silent and max_acceleration_units_per_sq_second_silent were never stored to eeprom, use default values;
2018-09-24 18:13:20 +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
PavelSindler
cd438c5c00
whitespace
2018-09-24 16:01:31 +02:00
PavelSindler
740e922b87
EEPROM M500 block size check for reading stored data added
2018-09-24 16:00:23 +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
Marek Bel
d611cad087
Temporary hide M500_conf cs to allow automated renaming.
2018-09-24 14:42:01 +02:00
Marek Bel
e94dc1341a
Use M500_conf cs in Config_ StoreSettings, RetrieveSettings and ResetDefault.
2018-09-24 14:34:43 +02:00
Marek Bel
991db0e71d
Finish default_conf.
2018-09-23 23:36:01 +02:00
Marek Bel
d9e2dcc736
Incomplete.
2018-09-23 22:21:28 +02:00
Marek Bel
58af1ae4c4
Add configuration store struct.
2018-09-21 20:52:44 +02:00
PavelSindler
d8dc2eef7a
if max_feedrate_silent and max_acceleration_units_per_sq_second_silent were never stored to eeprom, use default values; eeprom_version changed back to V2
2018-09-21 15:42:28 +02:00
PavelSindler
1c33b673c0
comment update
2018-09-19 18:43:27 +02:00
PavelSindler
3d57d504ba
Merge pull request #1174 from mkbel/fix_runout_resume
...
Fix runout resume
2018-09-19 18:29:32 +02:00
Marek Bel
2607a0c4ed
Update documentation.
2018-09-19 17:22:06 +02:00
Marek Bel
b92b307ee8
Make variables constant.
2018-09-19 17:21:45 +02:00
Marek Bel
cce8131070
Add missing s for seconds of print time.
2018-09-19 17:20:41 +02:00
Marek Bel
b5bb40474d
Fix print time overflow.
2018-09-19 17:17:32 +02:00
PavelSindler
0a5394a20e
defines moved to eeprom.h
2018-09-19 15:10:10 +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
Marek Bel
9868dd766e
Fix print not recovered when filament sensor is disabled during filament change initiated by filament run out.
2018-09-19 14:22:08 +02:00
Marek Bel
a5a7b1f1d6
Move functions definitions behind variable definitions. (No change in functionality.)
2018-09-19 14:08:31 +02:00
Marek Bel
05d3b7032d
Update documentation.
2018-09-18 17:48:11 +02:00
Marek Bel
a7fdfdd258
Put repetitive code into separate function. No change in functionality.
2018-09-18 17:15:13 +02:00
Marek Bel
6ee97468ee
Remove lcd_buttons_update() call from all other places than interrupt. There is no known reason, why lcd_buttons_update() should be called from multiple places and multiple contexts. Remove mutex, which is not needed anymore, and wasn't implemented properly anyway (Operation was not atomic.).
2018-09-18 16:05:49 +02:00
Marek Bel
f532da4b17
Remove duplicate button debouncing code. Save 254B flash.
2018-09-18 14:39:01 +02:00
Marek Bel
90a10a692a
Enable button debouncing also in modal mode (!lcd_update_enabled). In lcd_clicked() consume click event immediately.
2018-09-18 14:38:50 +02:00
Marek Bel
ab2d350ed1
Don't enable lcd update in lcd_show_fullscreen_message_and_wait_P(). Don't show menu in wizard when ejecting filament.
2018-09-17 21:23:13 +02:00
Marek Bel
a687b8e64a
Don't enable lcd update inside mmu_eject_filament().
2018-09-17 17:12:36 +02:00
Marek Bel
f496076508
Remove redundant code. No change in functionality.
2018-09-14 18:33:03 +02:00
Marek Bel
635a1b4cd8
Add possibility to to select preheat temperature when unloading filament in first layer calibration wizard.
...
Known limitations:
During filament eject, menu is shown for some moment.
2018-09-14 18:29:14 +02:00
Marek Bel
fe30e58fb5
Add possibility to unload filament from wizard before first layer calibration, if it is not PLA.
...
Known limitations:
Preheat temperature other than PLA can not be selected.
During filament eject, menu is shown for some moment.
2018-09-14 16:06:25 +02:00
Marek Bel
d14822b22f
Give wizard states human readable names. Use uint8_t as underlying type - saves 20B of FLASH memory.
2018-09-13 16:37:41 +02:00
Marek Bel
8235f0f869
Merge branch 'MK3_dev' into add_cancel
2018-09-12 19:38:26 +02:00
Marek Bel
7bc46323e2
Update pause print documentation.
2018-09-12 18:35:26 +02:00
Marek Bel
de2100ac7b
Merge branch 'MK3' into MK3_dev
2018-09-12 15:22:12 +02:00
PavelSindler
0d4f4fe933
Merge pull request #1143 from PavelSindler/lang2
...
lang fix
2018-09-12 09:38:18 +02:00
PavelSindler
45066ebddc
lang fix
2018-09-12 09:37:16 +02:00
PavelSindler
30d54be9de
Merge pull request #1142 from PavelSindler/lang2
...
changed version
2018-09-12 09:20:32 +02:00
PavelSindler
298950e601
changed version
2018-09-12 09:19:23 +02:00
Robert Pelnar
3e84bf6341
Lang update (translation + increased reserved space)
2018-09-12 02:45:13 +02:00
Marek Bel
13b67f0e0a
Add Cancel item into PLA filament selection menu initiated by first layer calibration with MMU.
2018-09-11 22:33:13 +02:00
Marek Bel
ada7cffd32
Open menu to select filament before first layer calibration if MMU unit is present.
2018-09-11 19:53:29 +02:00
PavelSindler
96aada9061
load filament messages, czech language missing translation readded
2018-09-11 18:25:38 +02:00
Marek Bel
5649d6c3c0
Precede active filament on status screen with letter F.
2018-09-11 17:27:10 +02:00
Marek Bel
98264808dc
Change gcode "T?" question from "Choose extruder:" to "Choose filament" and answers from "Extruder 1" .. "Extruder 5" to "Filament 1" .. "Filament 5".
2018-09-11 17:16:13 +02:00
Marek Bel
46df46f482
Add possibility to use other filaments in LCD_COMMAND_V2_CAL.
2018-09-11 17:03:20 +02:00
Marek Bel
19a1ccdc76
Rename choose_extruder_menu() to choose_menu_P(), add parameters to make it reusable.
2018-09-11 16:51:00 +02:00
Marek Bel
6c6354b2cb
Do not preheat nozzle before loading filament to MMU in first layer calibration wizard.
...
Show insert PLA filament to the first tube of MMU instead of "to the extruder".
First layer calibration wizard with MMU is now functional. But there is no option to unload filament from wizard.
2018-09-11 16:03:46 +02:00
Marek Bel
0fcd2cf2a1
Merge branch 'MK3_dev' into fix_mmu_1st_lay_cal
2018-09-11 15:26:35 +02:00
PavelSindler
d9a2fe70ec
missing declaration fix
2018-09-11 11:06:37 +02:00
PavelSindler
c023fb12d5
add choose filament messages
2018-09-11 09:50:50 +02:00
PavelSindler
90e3ae5464
Merge pull request #1127 from XPila/MK3
...
Lang update, french translation
2018-09-11 09:44:02 +02:00
Robert Pelnar
4ca300bc39
Lang update, french translation
...
+resized reserved space
2018-09-11 03:43:05 +02:00
Marek Bel
b3bc71b45b
Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev
2018-09-10 23:52:51 +02:00
PavelSindler
25a46557d1
merge with upstream
2018-09-10 22:11:32 +02:00
PavelSindler
8a9f066c1b
choose_extruder_menu: extruder -> filament
2018-09-10 22:09:37 +02:00
Marek Bel
cc08d660f7
Always use filament 1 for first layer calibration when MMU is present.
...
Lift Z when moving from intro line to meander.
For MMU, print longer intro line to allow load to nozzle.
2018-09-10 20:55:50 +02:00
PavelSindler
1bb9e9ed92
MMU_DEBUG
2018-09-10 20:39:28 +02:00
PavelSindler
6fa798aa83
init
2018-09-10 20:08:13 +02:00
PavelSindler
1253fb338a
wizard hotfix
2018-09-10 18:02:54 +02:00
Marek Bel
764e5c9769
Merge branch 'MK3' into MK3_dev
2018-09-09 22:52:01 +02:00
Marek Bel
5a6ef00cfc
Do not unload filament from nozzle when touching bed in the end of first layer calibration. Unload it after reaching home position.
2018-09-07 10:50:23 +02:00
Marek Bel
ebfbf4ac3f
Merge branch 'MK3' into MK3_dev
2018-09-07 09:24:45 +02:00
mkbel
cbc506c379
Merge pull request #1110 from PavelSindler/lcd_clicked_error_fix
...
lcd_clicked() fix (PFW-534 and PFW-546)
2018-09-07 09:07:03 +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
48bf5d3a75
Merge pull request #1104 from mkbel/MK3_dev
...
Merge MK3 into Mk3_dev
2018-09-06 21:01:29 +02:00
PavelSindler
dbc0654b1c
Merge pull request #1108 from mkbel/pause_print
...
Pause print
2018-09-06 21:01:16 +02:00
PavelSindler
48f5da9cb8
lcd_clicked fix
2018-09-06 20:54:51 +02:00
Marek Bel
0e50c388af
Save 1K flash memory.
2018-09-06 15:06:46 +02:00
Marek Bel
0d99dc0a3f
PFW-543 Add filament ramming when unloading filament with MMU.
2018-09-06 15:06:33 +02:00
Marek Bel
5d1e59cec3
Fix problem that nozzle temperature stays 0 if resume print is invoked from menu earlier than pause movements are finished.
2018-09-06 13:20:24 +02:00
Marek Bel
0fe48de4af
Remove feedmultiplyBckp global variable. Remove redundant isPrintPaused = true assignment, as it is already done in lcd_pause_print(). Remove unused saved_feedmultiply and fanSpeedBckp prototypes. Move isPrintPaused = true assignment to safer location, as LCD_COMMAND_LONG_PAUSE is not reached if lcd_commands_type is not LCD_COMMAND_IDLE.
2018-09-06 12:23:21 +02:00
Marek Bel
05a0b9c939
Remove fanSpeedBckp global variable.
2018-09-06 11:41:44 +02:00
Marek Bel
40990c4deb
Remove saved_feedmultiply global variable.
2018-09-06 11:30:06 +02:00
Marek Bel
b43c8dad74
Remove HotendTempBckp global variable.
2018-09-06 10:05:59 +02:00
Marek Bel
d71311f13f
Remove redundant HotendTempBckp from crash detection recover.
2018-09-06 09:41:37 +02:00
Marek Bel
920d828833
Rename lcd_sdcard_pause() to lcd_pause_print() to reflect, that also USB printing could be possible to pause. Unite it with pause_print() and use new (immediate) pause mechanism in all places where old mechanism was used. Rename resume_print() to lcd_resume_print() and make it global, unite it with lcd_sdcard_resume() and use it also in place, where lcd_commands_type = LCD_COMMAND_LONG_PAUSE_RESUME was used. Remove LCD_COMMAND_LONG_PAUSE_RESUME lcd_command_type. Remove unused pause_lastpos[].
2018-09-06 08:43:54 +02:00
Marek Bel
67b2456ad9
Merge branch 'MK3' into MK3_dev
2018-09-05 21:48:29 +02:00
Marek Bel
74be7677cf
Fix problem, that current_position is rewritten after long_pause() call.
2018-09-05 21:10:05 +02:00
Marek Bel
4b47a74d1d
Remove unused declarations from tmc2130.cpp. Move used declaration to Marlin.h.
2018-09-05 18:14:32 +02:00
PavelSindler
ed43913c5c
Merge pull request #1099 from mkbel/fix_compiler_warnings
...
Fix compiler warnings
2018-09-05 16:53:51 +02:00
PavelSindler
40679dcb3a
Merge branch 'MK3' into MK3
2018-09-05 00:06:48 +02:00
Marek Bel
a5db084b70
Move resuming nozzle temperature to restore_print_from_ram_and_continue().
...
Known limitations: Unused code not removed. Unload filament moves extruder to print position.
2018-09-04 14:56:20 +02:00
MRprusa3d
35cf3f3a61
Time info
...
suffix for doubt time estimation (i.e. if feed rate changed)
2018-09-04 14:39:46 +02:00
Marek Bel
2abd2a6cab
Resume print fan.
...
Known limitations: Unused code not removed. Unload filament moves extruder to print position.
2018-09-04 11:13:51 +02:00
Marek Bel
acef0578a5
Don't move before reaching nozzle temperature when resuming the print.
...
Known limitations: Doesn't resume print fan. Unused code not removed. Unload filament moves extruder to print position.
2018-09-04 10:07:52 +02:00
Marek Bel
d54e629950
Retract, lift Z, move away in XY, disable fan and nozzle heating. Resume nozzle heating.
...
Known limitations: Doesn't wait for nozzle temperature reaching set temperature before moving to print area. Doesn't resume print fan. Unused code not removed.
2018-09-04 08:53:27 +02:00
Marek Bel
af08e16426
Use stop_and_save_print_to_ram() and restore_print_from_ram_and_continue() pair to pause print from menu. Move declaration of those functions to marlin.h. Move declaration of FSensorStateMenu to ultralcd.h.
...
Known limitations: Filament is not retracted, extruder is not lifted in Z and moved to rear left corner in XY. Nozzle heating is not turned off nor restored. Unused code is not removed.
2018-09-04 08:13:56 +02:00
Marek Bel
63a215b0c3
Remove unused variable chars.
2018-09-03 20:48:03 +02:00
Marek Bel
cbf633cfd4
Remove unused variable chars.
2018-09-03 20:47:12 +02:00
Marek Bel
c95b463e0b
Remove unused variable yes. Remove redundant tmp_extruder assignment.
2018-09-03 20:44:40 +02:00
Marek Bel
517fbb66bf
Save 1K flash memory.
2018-09-03 20:00:46 +02:00
Marek Bel
d796df3f14
PFW-543 Add filament ramming when unloading filament with MMU.
2018-09-03 17:32:42 +02:00
Marek Bel
e5c0e26601
Merge branch 'MK3' into MK3_dev
2018-08-30 19:05:24 +02:00
Marek Bel
12b1769531
Fix printer reset when changing filament during print over USB.
2018-08-30 16:02:13 +02:00
PavelSindler
ed49e5187b
version changed
2018-08-30 11:35:06 +02:00
PavelSindler
d96b0d5f32
linearity correction define added (menu readded)
2018-08-30 11:28:12 +02:00
MRprusa3d
25a22120fb
1-st Layer Calibration correction
...
filament loading improvement
2018-08-30 03:32:33 +02:00
PavelSindler
b2c94f36cc
removed unused "out of range" function
2018-08-29 14:41:39 +02:00
PavelSindler
8a453e65f8
eject filament allowed only when nozzle is hot (there can be filament loaded in printer nozzle)
2018-08-29 13:16:17 +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
b9808354c4
Merge remote-tracking branch 'upstream/MK3' into M600_change_extruder
2018-08-28 23:53:35 +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
PavelSindler
705f098b1c
eject filament: initial version
2018-08-28 23:50:31 +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
mkbel
5ad2fdaaaa
Merge pull request #1080 from PavelSindler/M600_change_extruder
...
removed redundant code
2018-08-28 17:36:50 +02:00
Marek Bel
adde0d3944
Merge branch 'prusa3d_MK3' into MK3_dev
2018-08-28 17:31:12 +02:00
MRprusa3d
d3869bd857
Z-endstop @ MK3
...
add show P.I.N.D.A. state menu item @ CalibrationMenu
2018-08-28 16:12:59 +02:00
Marek Bel
9a14daab06
Revert "Split settings menu into separate functions."
...
Original commit wont work, as intended as MENU_ITEM_* macros contain return statement.
2018-08-28 16:03:07 +02:00
PavelSindler
27bd31e255
removed redundant code
2018-08-28 11:26:35 +02:00
PavelSindler
3e2cb72695
Merge branch 'MK3' into auto_deplete_2
2018-08-28 11:01:30 +02:00
PavelSindler
755baddb54
Merge branch 'MK3' into fix_unable_to_compile
2018-08-28 10:57:19 +02:00
Marek Bel
72cd0d26f9
Increase scope of code disabled by macro TMC2130 to whole lcd_settings_linearity_correction_menu.
2018-08-27 21:08:40 +02:00
Marek Bel
dd39976176
Merge remote-tracking branch 'pavel/fix_unable_to_compile' into fix_unable_to_compile
2018-08-27 21:06:35 +02:00
Marek Bel
7aadb2f660
Fix compile time error: default argument given for parameter 2 of int8_t lcd_show_fullscreen_message_yes_no_and_wait_P
2018-08-27 20:57:57 +02:00
Marek Bel
9611401b69
Fix mmu_M600_load_filament increments tmp_extruder, which is not set in case of automatic == true.
2018-08-27 20:23:43 +02:00
Marek Bel
2a00e5d348
Fix loading filament screen hangs if changed automatically.
2018-08-27 20:09:22 +02:00
Marek Bel
b08ae95568
Rename autoDeplete to lcd_autoDeplete and make it global. When filament runs out, call M600 AUTO if lcd_autoDeplete is enabled. Shorten finda polling period to 300 ms.
2018-08-27 19:36:54 +02:00
Marek Bel
1cdb7a48cb
Show auto deplete only when mmu unit present.
2018-08-27 16:24:21 +02:00
Marek Bel
8279aba4d7
Add auto deplete setting.
2018-08-27 16:15:46 +02:00
PavelSindler
191e5dfddd
mmu M600: dont use change extruder posibility; unload starts always imidiately
2018-08-27 16:12:10 +02:00
Marek Bel
f02b0d80e3
Split settings menu into separate macros.
2018-08-27 15:48:09 +02:00
PavelSindler
2b32b41969
MK2.5 build error hotfix
2018-08-27 05:53:39 +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
5d3eff6aea
Merge pull request #1072 from PavelSindler/manage_response
...
mmu timeout update: no need to press knob on printer
2018-08-27 05:25:50 +02:00
PavelSindler
c1ce07c463
Merge pull request #1071 from PavelSindler/feedrate_limit
...
max feedrate for stealth mode reduced to 100mm/s (because of loudness)
2018-08-27 05:25:41 +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
ac3b92bade
commentary fix
2018-08-26 23:55:29 +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
b13ff8e424
Wait for ok after U0 (unload current filament) command.
2018-08-26 22:08:52 +02:00
PavelSindler
4b1f1bc6a6
mmu timeout update: no need to press knob on printer to recover paused print
2018-08-26 21:39:37 +02:00
PavelSindler
5769b758ee
max feedrate for stealth mode reduced to 100mm/s (because of loudness)
2018-08-26 16:50:28 +02:00
PavelSindler
2610547a48
Fixed displayed filament after load
2018-08-26 16:39:21 +02:00
PavelSindler
c57fdb11b7
show active extruder: numbers corrected
2018-08-26 14:22:52 +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
cf83852d22
Merge pull request #1068 from PavelSindler/M600_fix
...
M600 fix: remove unretract
2018-08-25 20:02:30 +02:00
PavelSindler
ddcdfce356
Merge pull request #1069 from PavelSindler/mmu_timeout
...
5 minutes mmu timeout
2018-08-25 20:02:12 +02:00
PavelSindler
0929a35a4f
5 minutes mmu timeout
2018-08-25 17:21:17 +02:00
PavelSindler
815167c4b6
Merge pull request #1066 from mkbel/fix_linearity_correction_2
...
Fix linearity correction 2
2018-08-25 16:56:40 +02:00
PavelSindler
255cd2f34e
Merge pull request #1056 from mkbel/prdel
...
Reserve space for MENU_ITEM_EDIT_int3_P in shared memory
2018-08-25 16:55:56 +02:00
PavelSindler
f3edd37d11
removing unretract
2018-08-25 16:52:19 +02:00
PavelSindler
1f5bece0db
check for required mmu2 firmware buildnr
2018-08-25 16:15:35 +02:00
Marek Bel
6b7e47d730
Merge branch 'MK3' into MK3_dev
2018-08-24 22:21:08 +02:00
Marek Bel
5fe6a3ed1c
Place similar functions together.
2018-08-24 22:04:48 +02:00
Marek Bel
ea88dea432
Fix memory overwrite.
2018-08-24 21:24:14 +02:00
Marek Bel
085c77effb
Fix when value edited, other values appeard as +1.000 instead of [off].
2018-08-24 20:38:07 +02:00
Marek Bel
df61172984
Fix linearity correction not saved and applied when menu was left by timeout.
2018-08-24 20:31:49 +02:00
PavelSindler
32723d8d6f
whitespace
2018-08-24 20:30:44 +02:00
Marek Bel
46a3baac57
Add menu_item_edit_P<uint8_t*> specialization to be used for linearity correction. Works well, but costs about 600..700B of FLASH, needs to be optimized.
2018-08-24 20:06:09 +02:00
PavelSindler
0c80eca648
merge with upstream
2018-08-24 18:30:03 +02:00
PavelSindler
68f2e22dad
continue loading command
2018-08-24 18:28:05 +02:00
Marek Bel
5a7c9e3ffd
Make local functions static. Saves 30B of flash with Arduino 1.6.9. No difference with Arduino 1.8.5.
2018-08-24 18:00:05 +02:00
Marek Bel
5daae818e1
Convert menu_item_edit to template function.
2018-08-24 17:40:40 +02:00
PavelSindler
e6ac75f6a1
Merge pull request #1061 from mkbel/MK3_dev
...
Merge branch 'MK3' into MK3_dev
2018-08-24 16:27:07 +02:00
Marek Bel
ac5cb0989e
Uncomment linearity correction menu. Fix return from linearity correction menu.
2018-08-24 16:00:51 +02:00
Marek Bel
050a7c41d0
Fix "Check MMU. Fix the issue and then press button on MMU unit." shown instead of "Loading filament 1".
2018-08-24 03:49:51 +02:00
Marek Bel
0de7668bac
Remove usage of global variable tmp_extruder in M200.
2018-08-23 23:34:50 +02:00
Marek Bel
3c9047c9cd
Remove usage of global variable tmp_extruder in mmu_M600_load_filament. For automatic load filament, use mmu_extruder value as filament previously selected.
2018-08-23 23:34:45 +02:00
Marek Bel
54138407dd
Encapsulate MMU internal state.
2018-08-23 23:34:38 +02:00
Marek Bel
f1c51502fd
Merge branch 'MK3' into MK3_dev
2018-08-23 23:28:20 +02:00
Marek Bel
142bf28dc2
Clear communication buffer when sending load filament command to MMU.
...
This fixes PFW-517 in the moment, when the problem with not displaying "Loading filament 1" to "Loading filament 5" has appeared for the first time.
2018-08-23 22:05:56 +02:00
MRprusa3d
5dc2af961b
ShippingPrepare & M600
...
message after ShippingPrepare
M600 :: better filament (un)retraction
2018-08-23 00:08:14 +02:00
Marek Bel
3780516f74
PFW-512 Reserve space for MENU_ITEM_EDIT_int3_P in shared memory in lcd_tune_menu().
2018-08-22 19:47:29 +02:00
Marek Bel
07d07831f1
Add portability note.
2018-08-22 19:40:12 +02:00
Marek Bel
bb5ac93921
Add missing compile time check for ShortTimer fitting into menu_data. Convert preprocessor checks to shorter and more accurate static_assert. Remove redundant macro MENU_DATA_EDIT_SIZE. Decrease scope of menu_stack and asociated macro. No functional change.
2018-08-22 18:55:42 +02:00
PavelSindler
3477f84143
Merge pull request #1055 from XPila/MK3
...
MMU - communication fix + active extruder status
2018-08-22 16:48:09 +02:00
Robert Pelnar
dfb4bfac5b
MMU - display status while switching active extruder [PFW-465]
2018-08-22 16:38:34 +02:00
MRprusa3d
a1190e9a22
Merge pull request #1052 from PavelSindler/mmu_v2
...
fixes and improvements for multimaterial
2018-08-22 14:28:33 +00:00
Robert Pelnar
7836742621
MMU communication fix - WD reset inside manage_response
2018-08-22 16:19:57 +02:00
PavelSindler
9210ab12a9
Merge pull request #1053 from mkbel/MK3
...
Hot fix PFW-505 Speed change after tuning (on USB).
2018-08-22 16:19:08 +02:00
Marek Bel
fe43791673
Merge branch 'MK3' into MK3_dev
2018-08-22 16:17:10 +02:00
PavelSindler
a81b8dbd61
remove manage_heater
2018-08-22 16:09:38 +02:00
Marek Bel
ef6188cd59
Hot fix PFW-505 Speed change after tuning (on USB).
...
When encoder is rotated left and pushed immediately on status screen, after returning to status screen print speed jumps to 345%.
This is caused by downcasting signed lcd_encoder to unsigned position and back to signed lcd_encoder.
2018-08-22 16:09:19 +02:00
PavelSindler
d2aeb40bee
manage response function update
2018-08-22 15:46:36 +02:00
PavelSindler
f99196a7a0
fix reseting during filament change
2018-08-22 11:09:12 +02:00
Marek Bel
3b3d6ab472
Merge branch 'MK3' into MK3_dev
2018-08-21 17:56:34 +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
1cd0c6cfea
Status screen - print active MMU exrtuder (1/2 PFW465)
2018-08-20 00:59:36 +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
Marek Bel
cc0249126a
Document fsensor_update, remove disabled code.
2018-08-15 21:36:23 +02:00
MRprusa3d
01e71286f7
Merge pull request #1028 from mkbel/refactor_settings
...
Split settings menu into separate functions.
2018-08-15 15:42:02 +00:00
Marek Bel
6c387384c7
Fix compiler warnings: sketch/Marlin.h:366:35: warning: large integer implicitly truncated to unsigned type [-Woverflow]
...
#define PRINT_TIME_REMAINING_INIT 0xffffffff
sketch/Marlin_main.cpp:8814:21: note: in expansion of macro 'PRINT_TIME_REMAINING_INIT'
uint16_t print_t = PRINT_TIME_REMAINING_INIT;
sketch/Marlin_main.cpp:8817:15: warning: comparison is always true due to limited range of data type [-Wtype-limits]
if ((print_t != PRINT_TIME_REMAINING_INIT) && (feedmultiply != 0)) print_t = 100 * print_t / feedmultiply;
2018-08-13 19:43:37 +02:00
Marek Bel
ac62117d6b
Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev
2018-08-13 19:38:55 +02:00
Robert Pelnar
a11ae18f7e
XYZ calibration fix (progmem constants declaration) + version changed
2018-08-13 14:55:31 +02:00
Robert Pelnar
b7f17292ca
Version changed
2018-08-10 20:08:10 +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
b16fec956c
Enabled pullup for RX2 pin (it prevents uart2 from rx buffer overflow in case of disconnected MMU)
2018-08-10 16:20:53 +02:00
Marek Bel
95e7536955
Split settings menu into separate functions.
2018-08-10 15:19:35 +02:00
Robert Pelnar
923a06c164
menu data shared memory re-design
...
+code cleaning
2018-08-10 02:59:49 +02:00
Marek Bel
d94a1c5952
Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev
2018-08-09 21:26:33 +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
10cc077ee4
mmu_enabled = true removed
2018-08-08 21:05:25 +02:00
Robert Pelnar
4e32fb7181
removed '!' signalization when accel/feedrate limits reached
2018-08-08 20:23:13 +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
2f17997622
reset safety timer everytime lcd clicked
2018-08-08 19:33:44 +02:00
Robert Pelnar
ca25ec90bd
Disabled timeouts in support and failstats menus
2018-08-08 19:28:34 +02:00
Robert Pelnar
23e5cea5d0
MMU - code cleaning (modularity)
...
M403 set filament type
hardware reset
2018-08-08 18:58:03 +02:00
XPila
290328445a
Merge pull request #1019 from mkbel/MK3_fix6
...
Mk3 fix6
2018-08-08 18:38:20 +02:00
XPila
c2f098e263
Merge pull request #1015 from mkbel/fix_compiler_warnings
...
Fix compiler warnings
2018-08-08 18:37:57 +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
Marek Bel
5493ac57f9
Fix declaration and definition type mismatch of lcd_change_fil_state. Move declaration to Marlin.h.
2018-08-07 20:15:04 +02:00
Marek Bel
10ba3e7ffd
Move global variable count_position declaration to stepper.h header file.
2018-08-07 20:12:37 +02:00
mkbel
cda93906bc
Merge pull request #1018 from prusa3d/MK3
...
Merge MK3 into MK3_dev
2018-08-07 20:09:09 +02:00
mkbel
4cc127feac
Merge pull request #817 from 3d-gussner/MK3_fix6
...
Fix MK3 compilation issue with Arduino 1.8.x
2018-08-07 20:02:52 +02:00
Marek Bel
7e19b4adc1
Supress compiler warning sketch/Marlin_main.cpp:3079:6: warning: unused parameter 'e_shift_late' [-Wunused-parameter]. Make function static. Fix indentation.
2018-08-07 19:17:29 +02:00
Marek Bel
814d31d70d
Remove factory_reset() unused quiet parameter and make it static. It was tested, that both calls of factory reset (from menu and via PRUSA FR command) works somehow. Fix compiler warning: sketch/Marlin_main.cpp:808:6: warning: unused parameter 'quiet' [-Wunused-parameter]
2018-08-07 18:50:11 +02:00
Marek Bel
791b568339
Fix compiler warnings: sketch/uart2.c:19:33: warning: unused parameter 'stream' [-Wunused-parameter]
...
sketch/uart2.c:28:25: warning: unused parameter 'stream' [-Wunused-parameter]
sketch/Marlin_main.cpp:925:5: warning: unused parameter 'stream' [-Wunused-parameter]
sketch/lcd.cpp:224:5: warning: unused parameter 'stream' [-Wunused-parameter]
2018-08-07 17:51:30 +02:00
Marek Bel
4395ec207e
Fix compiler warnings: sketch/xyzcal.cpp:111:10: warning: unused parameter 'nd' [-Wunused-parameter]
...
sketch/xyzcal.cpp:111:10: warning: unused parameter 'dd' [-Wunused-parameter]
2018-08-07 17:32:27 +02:00
Marek Bel
78f1a7914f
Fix compiler warning: sketch/xyzcal.cpp:90:6: warning: unused parameter 'de' [-Wunused-parameter].
2018-08-07 16:45:19 +02:00
Marek Bel
9271d12bf7
Save 32B of FLASH, fix compiler warning: sketch/tmc2130.cpp:238:6: warning: unused parameter 'last_step_mask' [-Wunused-parameter].
2018-08-07 16:32:32 +02:00
Marek Bel
5af4897360
Fix compiler warning sketch/stepper.cpp:1553:6: warning: unused parameter 'driver' [-Wunused-parameter]
2018-08-07 16:05:06 +02:00
Marek Bel
880ed67785
Fix compiler warning: sketch/stepper.cpp:1499:6: warning: unused parameter 'address' [-Wunused-parameter].
2018-08-07 16:00:35 +02:00
Marek Bel
e06e19edf5
Fix showing calibration results.
...
Messages:
_i("XYZ calibration failed. Bed calibration point was not found.")
_T(MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED);
_i("XYZ calibration failed. Front calibration points not reachable.")
_i("XYZ calibration failed. Right front calibration point not reachable.")
_i("XYZ calibration failed. Left front calibration point not reachable.");
were never shown.
Fix compiler warnings:
sketch/ultralcd.cpp:3476:19: warning: comparison is always false due to limited range of data type [-Wtype-limits]
sketch/ultralcd.cpp:3478:26: warning: comparison is always false due to limited range of data type [-Wtype-limits]
2018-08-07 15:46:23 +02:00
Marek Bel
c0f37efbad
Save 278B of flash. Remove unused function parameters. Make functions static. Fix compiler warnings:
...
sketch/ultralcd.cpp:292:6: warning: unused parameter 'pstr' [-Wunused-parameter]
sketch/ultralcd.cpp:292:6: warning: unused parameter 'filename' [-Wunused-parameter]
sketch/ultralcd.cpp:344:6: warning: unused parameter 'pstr' [-Wunused-parameter]
sketch/ultralcd.cpp:364:6: warning: unused parameter 'pstr' [-Wunused-parameter]
sketch/ultralcd.cpp:385:6: warning: unused parameter 'pstr' [-Wunused-parameter]
sketch/ultralcd.cpp:6920:6: warning: unused parameter 'longFilename' [-Wunused-parameter]
sketch/ultralcd.cpp:6965:6: warning: unused parameter 'longFilename' [-Wunused-parameter]
2018-08-07 15:29:58 +02:00
Marek Bel
cf069f3fc2
Fix compiler warning sketch/ultralcd.cpp:53:31: warning: missing initializer for member 'MenuData::BabyStep::babystepMem' [-Wmissing-field-initializers]
2018-08-07 15:07:51 +02:00
Marek Bel
453b199057
Save 8B flash, fix compiler warning sketch/sound.cpp:62:6: warning: unused parameter 'eSoundClass' [-Wunused-parameter]
2018-08-07 15:05:18 +02:00
Marek Bel
548f4cb1fa
Fix compiler warning sketch/mmu.cpp:32:6: warning: unused parameter 'extr' [-Wunused-parameter]
2018-08-07 15:01:49 +02:00
Marek Bel
4c146a5b2c
Fix compiler warning: sketch/mesh_bed_leveling.cpp:24:6: warning: unused parameter 'use_default' [-Wunused-parameter].
2018-08-07 14:44:53 +02:00
Marek Bel
aa0f1fd80b
Fix compiler warnings sketch/mesh_bed_calibration.cpp:150:21: warning: unused parameter 'npts' [-Wunused-parameter]
...
sketch/mesh_bed_calibration.cpp:172:21: warning: unused parameter 'npts' [-Wunused-parameter]
2018-08-07 14:20:51 +02:00
Marek Bel
e9d8ed8599
Fix compiler warning: sketch/mesh_bed_calibration.cpp:1057:13: warning: unused parameter 'verbosity_level' [-Wunused-parameter]
2018-08-07 13:58:06 +02:00
Marek Bel
0d35451544
Fix compiler warning: sketch/mesh_bed_calibration.cpp:966:13: warning: unused parameter 'verbosity_level' [-Wunused-parameter]
2018-08-07 13:00:22 +02:00
Marek Bel
523c9cd737
Fix compiler warning: sketch/mesh_bed_calibration.cpp:205:34: warning: unused parameter 'verbosity_level' [-Wunused-parameter]
2018-08-07 12:58:15 +02:00
Marek Bel
95d13cbb59
Fix compiler warning: sketch/mesh_bed_calibration.cpp:135:20: warning: unused parameter 'i' [-Wunused-parameter]
2018-08-07 12:52:51 +02:00
Marek Bel
7364b6cf80
Do not compare signed value with unsigned, add parentheses.
2018-08-07 12:52:51 +02:00
Marek Bel
2e719c7885
Fix stack corruption for folder name longer than 12 characters. Save 260B of flash memory. Move duplicate code to separate method. Fix compiler warnings: sketch/cardreader.cpp:448:25: warning: ordered comparison of pointer with integer zero [-Wextra]
...
sketch/cardreader.cpp:453:22: warning: ordered comparison of pointer with integer zero [-Wextra]
2018-08-07 12:52:51 +02:00
Marek Bel
7a6cbf75b9
Fix compiler warnings: sketch/cardreader.cpp: In member function 'void CardReader::openFile(const char*, bool, bool)':
...
sketch/cardreader.cpp:350:25: warning: ordered comparison of pointer with integer zero [-Wextra]
sketch/cardreader.cpp:355:22: warning: ordered comparison of pointer with integer zero [-Wextra]
2018-08-07 12:52:51 +02:00
Marek Bel
5f4380cafb
Remove unused function, fix compiler warning: sketch/Marlin_main.cpp:8994:6: warning: unused parameter 'extruder' [-Wunused-parameter]
2018-08-07 12:52:51 +02:00
Marek Bel
30438833c6
Fix compiler warning sketch/Marlin_main.cpp:6584:19: warning: comparison is always true due to limited range of data type [-Wtype-limits]
2018-08-07 12:52:51 +02:00
Marek Bel
72cfa1b124
Fix 4 compiler warnings of type: sketch/planner.cpp:872:59: warning: suggest braces around empty body in an 'if' statement [-Wempty-body]
2018-08-07 12:52:51 +02:00
Marek Bel
55a47d57da
Fix compiler warning: sketch/Marlin.h:151:25: warning: suggest braces around empty body in an 'if' statement [-Wempty-body]
2018-08-07 12:52:51 +02:00
Marek Bel
ceac1e07bd
Merge branch 'MK3' into MK3_dev
2018-08-06 16:26:38 +02:00
PavelSindler
702a2e1883
Merge pull request #1004 from mkbel/fix_XYhoming_direction
...
Obey defined X and Y homing direction.
2018-08-05 20:18:30 +02:00
PavelSindler
d21e527c73
PRUSA Fir reports also buildnumber
2018-08-05 20:17:04 +02:00
PavelSindler
0c2d0bebce
merge with upstream fix
2018-08-03 19:14:17 +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
Marek Bel
5846707c5a
Remove local variable verbosity_level, which was masking function parameter of the same name. Remove duplicate code to derive verbosity level.
...
Problem manifested itself as compiler warning: sketch/Marlin_main.cpp:2881:6: warning: unused parameter 'verbosity_level' [-Wunused-parameter]
bool gcode_M45(bool onlyZ, int8_t verbosity_level)
2018-08-03 15:49:20 +02:00
PavelSindler
5824da8310
add more extrusion to M600 load filament
2018-08-03 15:42:06 +02:00
Marek Bel
f6094a58f7
Fix compiler warning sketch/lcd.cpp:160:6: warning: unused parameter 'cols' [-Wunused-parameter].
2018-08-03 15:37:40 +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
Marek Bel
a85d5948c3
Make function static, save 38B flash.
2018-08-03 15:32:28 +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
Marek Bel
373b4a1ea9
Fix compiler warnings sketch/lcd.cpp:59:18: warning: missing initializer for member '__file::unget' [-Wmissing-field-initializers]
...
FILE _lcdout = {0};
sketch/lcd.cpp:59:18: warning: missing initializer for member '__file::flags' [-Wmissing-field-initializers]
sketch/lcd.cpp:59:18: warning: missing initializer for member '__file::size' [-Wmissing-field-initializers]
sketch/lcd.cpp:59:18: warning: missing initializer for member '__file::len' [-Wmissing-field-initializers]
sketch/lcd.cpp:59:18: warning: missing initializer for member '__file::put' [-Wmissing-field-initializers]
sketch/lcd.cpp:59:18: warning: missing initializer for member '__file::get' [-Wmissing-field-initializers]
sketch/lcd.cpp:59:18: warning: missing initializer for member '__file::udata' [-Wmissing-field-initializers]
2018-08-03 15:25:52 +02:00
Marek Bel
0638e490c1
Fix compiler warnings: sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::unget' [-Wmissing-field-initializers]
...
FILE _uartout = {0};
sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::flags' [-Wmissing-field-initializers]
sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::size' [-Wmissing-field-initializers]
sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::len' [-Wmissing-field-initializers]
sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::put' [-Wmissing-field-initializers]
sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::get' [-Wmissing-field-initializers]
sketch/Marlin_main.cpp:923:19: warning: missing initializer for member '__file::udata' [-Wmissing-field-initializers]
2018-08-03 15:23:24 +02:00
Marek Bel
0632f3b6d8
Fix compiler warnings: sketch/ConfigurationStore.cpp:17:13: warning: unused parameter 'name' [-Wunused-parameter]
...
static void _EEPROM_writeData(int &pos, uint8_t* value, uint8_t size, char* name)
sketch/ConfigurationStore.cpp:45:13: warning: unused parameter 'name' [-Wunused-parameter]
static void _EEPROM_readData(int &pos, uint8_t* value, uint8_t size, char* name)
2018-08-03 14:50:51 +02:00
Marek Bel
f7f4ba2512
Make functions static, save 270B of flash.
2018-08-03 14:44:56 +02:00
Marek Bel
bd907aec86
Fix 4 compiler warnings of type sketch/sm4.c:88:2: warning: 'register' is not at beginning of declaration [-Wold-style-declaration].
2018-08-03 14:35:18 +02:00
Marek Bel
d3360c6868
Fix compiler warning sketch/Marlin_main.cpp:9099:7: warning: unused variable 'response' [-Wunused-variable].
2018-08-02 21:46:50 +02:00
Marek Bel
e13e3a9dc4
Merge remote-tracking branch 'prusa3d/MK3' into fix_compiler_warnings
2018-08-02 21:42:55 +02:00
Marek Bel
2e61c0e289
Obey defined X and Y homing direction.
...
Problem manifested itself as sketch/Marlin_main.cpp:2288:13: warning: unused variable 'axis_home_dir' [-Wunused-variable]
2018-08-02 20:47:03 +02:00
Robert Pelnar
468873ec68
MMU2 - removed conditional translation for SNMM_V2, new module mmu
2018-08-02 18:54:00 +02:00
Marek Bel
63724c5f0e
Comment out variable used only for commented out debug.
2018-08-02 18:26:49 +02:00
Marek Bel
fd70078606
Remove or disable by preprocessor unused functions in ultralcd.cpp.
2018-08-02 18:18:31 +02:00
Marek Bel
268c52207b
Fix compiler warning: sketch/ultralcd.cpp:7457:7: warning: unused variable 'pressed' [-Wunused-variable].
2018-08-02 17:29:14 +02:00
Marek Bel
87a650f2cb
Fix compiler warning: sketch/ultralcd.cpp:6573:23: warning: array subscript has type 'char' [-Wchar-subscripts]
2018-08-02 17:25:32 +02:00
Marek Bel
02f5a60065
Fix compiler warning: sketch/ultralcd.cpp:6540:23: warning: array subscript has type 'char' [-Wchar-subscripts]
2018-08-02 17:23:11 +02:00
Marek Bel
05d455fc30
Fix compiler warning sketch/ultralcd.cpp:6301:7: warning: unused variable 'tempScrool' [-Wunused-variable].
2018-08-02 17:11:23 +02:00
Robert Pelnar
282ff6c577
removed unused union
2018-08-02 17:09:02 +02:00
Marek Bel
d85c36cc77
Fix compiler warning sketch/ultralcd.cpp:3588:9: warning: unused variable 'enc_dif' [-Wunused-variable]
2018-08-02 17:08:46 +02:00
Robert Pelnar
d378575a68
SNMM_V2 - default retraction declared as variable
2018-08-02 17:07:09 +02:00
Marek Bel
1898ef9896
Fix compiler warning sketch/ultralcd.cpp:2533:7: warning: unused variable '_cm' [-Wunused-variable]
2018-08-02 17:02:12 +02:00
Marek Bel
bf8808ce22
Fix compiler warning sketch/tmc2130.cpp: In function 'void tmc2130_set_wave(uint8_t, uint8_t, uint8_t)':
...
sketch/tmc2130.cpp:921:32: warning: 'reg' may be used uninitialized in this function [-Wmaybe-uninitialized]
This was completely innocent, as reg was zeroed inside for loop.
2018-08-02 16:50:04 +02:00
Robert Pelnar
10af023eae
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
2018-08-02 16:32:59 +02:00
Marek Bel
3248d219f2
Restore motor power, after it is disabled in tmc2130_get_wave(). This bug manifested itself as compiler warning:
...
sketch/tmc2130.cpp:827:10: warning: unused variable 'pwr' [-Wunused-variable]
2018-08-02 16:23:30 +02:00
Marek Bel
9f68681a1b
Fix compiler warnings: sketch/tmc2130.cpp: In function 'void tmc2130_goto_step(uint8_t, uint8_t, uint8_t, uint16_t, uint16_t)':
...
sketch/tmc2130.cpp:795:94: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
sketch/tmc2130.cpp:807:23: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
sketch/tmc2130.cpp: In function 'void tmc2130_get_wave(uint8_t, uint8_t*, __file*)':
sketch/tmc2130.cpp:839:17: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
2018-08-02 16:21:38 +02:00
Marek Bel
ea3d407aa7
Fix compiler warning: remove unused function float analog2tempPINDA(int raw).
2018-08-02 15:52:28 +02:00
Marek Bel
aee31bdb8d
Fix compiler warnings sketch/stepper.cpp: In function 'void babystep(uint8_t, bool)':
...
sketch/stepper.cpp:1429:20: warning: unused variable 'x' [-Wunused-variable]
volatile float x=1./float(axis+1)/float(axis+2); //wait a tiny bit
sketch/stepper.cpp:1455:20: warning: unused variable 'x' [-Wunused-variable]
volatile float x=1./float(axis+1)/float(axis+2); //wait a tiny bit
sketch/stepper.cpp:1485:20: warning: unused variable 'x' [-Wunused-variable]
volatile float x=1./float(axis+1); //absolutely useless
sketch/stepper.cpp: In function 'void microstep_init()':
sketch/stepper.cpp:1571:17: warning: unused variable 'microstep_modes' [-Wunused-variable]
const uint8_t microstep_modes[] = MICROSTEP_MODES;
2018-08-02 15:45:33 +02:00
Marek Bel
5ac98afeec
Fix compiler warning sketch/optiboot_w25x20cl.cpp: In function 'void optiboot_w25x20cl_enter()':
...
sketch/optiboot_w25x20cl.cpp:275:15: warning: variable 'desttype' set but not used [-Wunused-but-set-variable]
2018-08-02 14:55:38 +02:00
Marek Bel
660a4c0d75
Fix compiler warnings: sketch/Marlin_main.cpp: In function 'void process_commands()':
...
sketch/Marlin_main.cpp:6311:3: warning: 'filament' may be used uninitialized in this function [-Wmaybe-uninitialized]
switch (filament) {
sketch/Marlin_main.cpp:6310:44: warning: 'extruder' may be used uninitialized in this function [-Wmaybe-uninitialized]
printf_P(PSTR("Extruder: %d; "), extruder);
2018-08-02 14:28:39 +02:00
Marek Bel
79057f070b
Fix compiler warning sketch/lcd.cpp:509:1: warning: label 'end' defined but not used [-Wunused-label].
2018-08-02 14:13:29 +02:00
Marek Bel
1b299618c1
Fix compiler warnings: sketch/fsensor.cpp: In function 'void __vector_11()':
...
sketch/fsensor.cpp:370:50: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
if (pat9125_y > 0) if (fsensor_oq_yd_min > pat9125_y) fsensor_oq_yd_min = (fsensor_oq_yd_min + pat9125_y) / 2;
^
sketch/fsensor.cpp:371:51: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
if (pat9125_y >= 0) if (fsensor_oq_yd_max < pat9125_y) fsensor_oq_yd_max = (fsensor_oq_yd_max + pat9125_y) / 2;
2018-08-02 14:13:29 +02:00
Marek Bel
25c00393ff
Fix compiler warning sketch/fsensor.cpp:221:10: warning: unused variable 'fsensor_autoload_c_old' [-Wunused-variable]
2018-08-02 14:13:29 +02:00
Marek Bel
904fe7e886
Fix compiler warning: In file included from sketch/Marlin_main.cpp:67:0:
...
sketch/temperature.h: In function 'void M600_wait_for_user()':
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
target_temperature[extruder] = celsius;
2018-08-02 14:13:29 +02:00
Marek Bel
d66da30843
Fix compiler warning: sketch/Dcodes.cpp: In function 'void dcode_3()':
...
sketch/Dcodes.cpp:117:24: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
for (int i = 0; i < count; i++)
2018-08-02 14:13:29 +02:00
Marek Bel
15c598fd6a
Fix compiler warning: sketch/Dcodes.cpp: In function 'void print_eeprom(uint16_t, uint16_t, uint8_t)':
...
sketch/Dcodes.cpp:37:12: warning: unused variable 'data' [-Wunused-variable]
2018-08-02 14:13:29 +02:00
PavelSindler
1685f83020
Merge pull request #971 from mkbel/fix_menuData_compiler_warnings
...
Fix 98 compiler warnings of type: warning: dereferencing type-punned …
2018-08-02 09:42:54 +02:00
Marek Bel
ef8921d45e
Fix 10 compiler warnings of type: sketch/menu.cpp: In function 'void _menu_edit_int3()':
...
sketch/menu.cpp:272:51: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
#define _menu_data (*((menu_data_edit_t*)menu_data))
2018-08-01 22:43:36 +02:00
Marek Bel
93d2b37b5c
Fix 98 compiler warnings of type: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
2018-08-01 22:43:27 +02:00
MRprusa3d
bafd290141
Sound
...
& TuneMenu
2018-08-01 22:34:58 +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
ca97e2232f
Merge remote-tracking branch 'ledvinap/MK3' into fix_compiler_warnings
2018-08-01 18:44:05 +02:00
Marek Bel
b0077182e5
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 17:53:49 +02:00
Marek Bel
1a2d7657dc
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 17:39:54 +02:00
Marek Bel
6f824730af
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 17:37:09 +02:00
Marek Bel
a8f73b3915
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 17:19:34 +02:00
Marek Bel
97ec616dd1
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 17:14:36 +02:00
Marek Bel
ab5593e673
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 16:58:09 +02:00
PavelSindler
54adb0beea
missing eol added
2018-08-01 16:54:26 +02:00
Marek Bel
b7ba0c5f14
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 16:50:44 +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
Marek Bel
98e921d456
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 16:24:07 +02:00
PavelSindler
135c4db5da
gcode for filemant type initial version: just re-sending information to mmu
2018-08-01 15:43:13 +02:00
Robert Pelnar
43cc789602
feedrate symbol changed back to double-arrow
2018-08-01 15:15:54 +02:00
PavelSindler
0e059f8da6
single material fix: remove semicolon, unload_filament() function definition
2018-08-01 11:33:58 +02:00
PavelSindler
1f5026eed7
Merge pull request #991 from XPila/MK3-new_lang
...
FSensor improvement
2018-08-01 10:43:34 +02:00
PavelSindler
d363bd071d
Merge pull request #990 from PavelSindler/snmm_v2
...
Snmm v2: M600, communication timeouts with mmu
2018-08-01 10:43:22 +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
Robert Pelnar
c2fe3b920c
FSensor - chunk defined in mm, runout detection distance tunning
2018-08-01 01:24:35 +02:00
Robert Pelnar
9509a60549
FSensor improovement
...
autoload sensitivity decreased (false triggering on MK25)
filtering algorithm more robust
additional check - fixed sync with autoload and better condition
2018-07-31 20:23:31 +02:00
PavelSindler
be1167fae3
M600 for multimaterial: don't check if filament unload was succesfull
2018-07-31 19:18:09 +02:00
PavelSindler
b99b73c924
missing declaration
2018-07-31 19:03:53 +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
Robert Pelnar
7731898b58
FSensor - optical quality meassurement - ignore reflexivity for materials with low data deviation
2018-07-31 16:28:11 +02:00
PavelSindler
04d0178150
automatic M600 initial version
2018-07-31 12:24:22 +02:00
Robert Pelnar
fa30353646
Live adjust Z format fix
2018-07-30 19:24:04 +02:00
PavelSindler
67f56d3de9
merge with upstream
2018-07-30 17:24:58 +02:00
PavelSindler
9195167541
Merge pull request #984 from MRprusa3d/MK3
...
Sound
2018-07-30 10:55:06 +02:00
MRprusa3d
f5ed37a88f
Sound
...
"stepper.cpp" revert (debug mode only)
2018-07-30 10:52:31 +02:00
MRprusa3d
970ba6fa2a
Sound
...
all cases
2018-07-29 22:59:14 +02:00
Robert Pelnar
dd23835480
fsensor - fix - do not report poor filament response when disabled
2018-07-27 20:53:25 +02:00
Robert Pelnar
26bc28cf89
menu_draw_float31 fixed (one digit after decimal point instead of thre)
2018-07-27 20:28:44 +02:00
Robert Pelnar
e73f84279e
EEPROM offset fixed - added dummy lcd_contrast
2018-07-26 21:05:16 +02:00
PavelSindler
4fb27866f4
Merge pull request #972 from PavelSindler/end_file_section
...
End file section for searching M84 in gcode file enlarged
2018-07-26 19:59:37 +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
Robert Pelnar
f819b6b304
debug output from EEPROM_WRITE_VAR and EEPROM_READ_VAR
2018-07-26 19:43:33 +02:00
PavelSindler
d51b2666ac
no levels used in store settings function
2018-07-26 19:09:52 +02:00
PavelSindler
1232d2dae6
M503: print autoretract value fixed
2018-07-26 17:26:05 +02:00
PavelSindler
9235ffb497
T code for SNMM_V2 fix
2018-07-26 17:03:43 +02:00
PavelSindler
285f2ccbd9
Merge pull request #976 from PavelSindler/MK3_for_merging
...
config for mmu updated
2018-07-26 15:00:33 +02:00
PavelSindler
5bda19b9f7
config for mmu updated
2018-07-26 14:59:49 +02:00
Robert Pelnar
691e7a24ed
EEPROM dump (code D3)
2018-07-26 13:20:35 +02:00
PavelSindler
9c1ef5e414
Merge pull request #974 from mkbel/fix_compiler_warnings
...
Save 88B FLASH and fix compiler warnings:
2018-07-26 09:41:31 +02:00
PavelSindler
cadb2e9cfe
Merge pull request #973 from MRprusa3d/MK3
...
PowerPanic IV
2018-07-26 09:40:57 +02:00
Marek Bel
716e6c209c
Save 88B FLASH and fix compiler warnings:
...
sketch/cmdqueue.cpp: In function 'bool cmdqueue_pop_front()':
sketch/cmdqueue.cpp:67:56: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
for (++ bufindr; bufindr < sizeof(cmdbuffer) && cmdbuffer[bufindr] == 0; ++ bufindr) ;
^
sketch/cmdqueue.cpp: In function 'bool cmdqueue_could_enqueue_back(int, bool)':
sketch/cmdqueue.cpp:170:63: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
endw + CMDBUFFER_RESERVE_FRONT <= sizeof(cmdbuffer) ||
^
sketch/cmdqueue.cpp:172:38: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
(endw <= sizeof(cmdbuffer) && CMDBUFFER_RESERVE_FRONT <= bufindr))
^
sketch/cmdqueue.cpp:196:63: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
endw + CMDBUFFER_RESERVE_FRONT <= sizeof(cmdbuffer) ||
^
sketch/cmdqueue.cpp:198:38: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
(endw <= sizeof(cmdbuffer) && CMDBUFFER_RESERVE_FRONT <= bufindr))
^
sketch/cmdqueue.cpp: In function 'void get_command()':
sketch/cmdqueue.cpp:380:10: warning: variable 'rx_buffer_full' set but not used [-Wunused-but-set-variable]
bool rx_buffer_full = false; //flag that serial rx buffer is full
^
sketch/cmdqueue.cpp: In function 'uint16_t cmdqueue_calc_sd_length()':
sketch/cmdqueue.cpp:697:54: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
for (++ _bufindr; _bufindr < sizeof(cmdbuffer) && cmdbuffer[_bufindr] == 0; ++ _bufindr) ;
^
2018-07-25 21:18:29 +02:00
MRprusa3d
5be82962ee
PowerPanic IV
2018-07-25 19:24:41 +02:00
PavelSindler
da82062d41
End file section for searching M84 in gcode file were enlarged (compatibility with mmu Slic3r)
2018-07-25 18:26:22 +02:00
PavelSindler
9b4f786325
Merge pull request #970 from mkbel/fix_compiler_warnings
...
Fix compiler warnings
2018-07-25 17:08:07 +02:00
PavelSindler
59c0127b77
automatic M600 for mmu v2: work in progress
2018-07-25 16:48:39 +02:00
Marek Bel
620c015b65
Fix compiler warning: sketch/ultralcd.cpp:855:31: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
...
for (int dots = 0; dots < heating_status_counter; dots++)
2018-07-25 16:30:50 +02:00
Marek Bel
58155cacbc
Fix compiler warning sketch/ultralcd.cpp:6711:24: warning: suggest parentheses around comparison in operand of '^' [-Wparentheses].
...
Add parentheses to match expressions on following lines. This changed expression, as == has precedence over ^, but truth table of expression is anyway the same regardless of parentheses.
2018-07-25 16:24:08 +02:00
Marek Bel
08b56fe1a4
Fix compiler warning sketch/cardreader.cpp:706:25: warning: comparison between signed and unsigned integer expressions [-Wsign-compare].
...
Remove redundant and masked int d variable.
Fix indentation of presort() to make it clear, that it is not part of for loop.
2018-07-25 15:51:00 +02:00
Marek Bel
5f8e87e649
Fix compiler warning: sketch/SdFatUtil.cpp:49:7: warning: unused variable 'i' [-Wunused-variable]
2018-07-25 15:19:10 +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
904db96cd1
Fix compiler warning sketch/tmc2130.h:123:3: warning: 'tmc2130_axis_config' defined but not used [-Wunused-variable]
2018-07-25 15:03:38 +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
PavelSindler
d6021d047d
Merge pull request #969 from mkbel/fix_compiler_warnings
...
Fix compiler warning: sketch/ultralcd.cpp:7258:61: warning: integer o…
2018-07-25 11:36:34 +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
Marek Bel
fd3e0115b6
Fix compiler warning: sketch/ultralcd.cpp:7258:61: warning: integer overflow in expression [-Woverflow]
...
lcd_next_update_millis = millis() + (LCD_UPDATE_INTERVAL * 10000);
Use public interface instead of manipulating lcd_next_update_millis timer.
2018-07-24 15:20:03 +02:00
Marek Bel
6cf17fa760
Delete TMP file added accidentally by commit "timeout when waiting for mmu OK ".
2018-07-24 14:20:13 +02:00
PavelSindler
77cc55ed76
Merge pull request #951 from PavelSindler/use_timer
...
Use timer
2018-07-24 09:31:45 +02:00
PavelSindler
90b763775c
Merge pull request #966 from PavelSindler/MK3_for_merging
...
config for MK2.5 change
2018-07-23 21:13:22 +02:00
PavelSindler
e47656df97
config for MK2.5 change
2018-07-23 21:12:50 +02:00
PavelSindler
3fd705d763
Merge pull request #965 from PavelSindler/MK3_for_merging
...
config for MK25 Rambo1.0 changed
2018-07-23 21:09:46 +02:00
PavelSindler
e4641d3db4
config for MK25 Rambo1.0 changed
2018-07-23 21:09:07 +02:00
PavelSindler
064b8a4f24
Merge pull request #964 from MRprusa3d/MK3
...
PowerPanic & Sound III
2018-07-23 20:31:32 +02:00
PavelSindler
2d078f17b0
Merge pull request #963 from PavelSindler/MK3_for_merging
...
SUPPORT_VERBOSITY temporary solution
2018-07-23 20:12:05 +02:00
PavelSindler
f72f385c82
SUPPORT_VERBOSITY temporary solution
2018-07-23 20:11:16 +02:00
PavelSindler
d35124f637
Merge pull request #962 from PavelSindler/MK3_for_merging
...
config file updated
2018-07-23 20:06:35 +02:00
PavelSindler
c65efd0114
config file updated
2018-07-23 20:05:42 +02:00
Martin Remiš
c7d7389e27
PowerPanic & Sound
2018-07-23 20:04:47 +02:00
PavelSindler
2911b92b8f
Merge pull request #961 from mkbel/fix_compiler_warnings
...
Fix compiler warning arduino-1.6.9/hardware/tools/avr/avr/include/avr…
2018-07-23 20:00:28 +02:00
Marek Bel
e77a54034c
Fix compiler warning arduino-1.6.9/hardware/tools/avr/avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to <util/delay.h>." [-Wcpp]
2018-07-23 18:12:08 +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
PavelSindler
87a9a721ee
Merge pull request #955 from mkbel/fix_compiler_warnings
...
Fix compiler warning arduino-1.6.9/hardware/tools/avr/avr/include/avr…
2018-07-23 15:15:24 +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
Robert Pelnar
896734c06b
Display '!' instead of 'FR' on status screen when feedrate or acceleration limit reached.
2018-07-23 14:30:41 +02:00
Marek Bel
7cfa3156c7
Fix compiler warning arduino-1.6.9/hardware/tools/avr/avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to <util/delay.h>." [-Wcpp]
2018-07-23 13:47:15 +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
Robert Pelnar
f0d939140b
Menu extruder info fixed
2018-07-23 12:54:48 +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
PavelSindler
efd03b426f
final edits to fit changes on upstream
2018-07-23 09:14:22 +02:00
PavelSindler
565a6db3e4
use timer class
2018-07-22 16:26:12 +02:00
Robert Pelnar
60b4db15e0
FSensor - M600 fix + cond. translation + tunning filter and params
2018-07-22 16:14:13 +02:00
PavelSindler
5b6fb9e49b
Use Timer class for button blanking. Save 74B FLASH and 1B RAM.
2018-07-22 15:05:24 +02:00
Robert Pelnar
c6a3f073dd
FSensor - M600/autoload fix + optical quality meassurement
2018-07-21 17:04:29 +02:00
Robert Pelnar
612e83b473
max_feedrate and max_acceleration limitation (ConfigurationStore)
2018-07-21 12:33: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
980c044dac
FSensor - code cleaning
2018-07-21 01:57:41 +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
a7e139ad8d
limist added to configuration files
2018-07-20 17:38:24 +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
PavelSindler
3c1f13377c
mmu first layer cal. status line message order changed
2018-07-20 14:58:36 +02:00
PavelSindler
cfe49a243a
first layer calibration: intitial version
2018-07-20 14:37:01 +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
045cb5bb41
stop print for mmu initial version
2018-07-19 20:46:46 +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
Robert Pelnar
c3e28b490c
TMC2130 old style limits removed
...
+menu draw_edit fix
2018-07-19 17:42:59 +02:00
Robert Pelnar
b46953c790
LCD menu optimalization - lcd_draw_edit removed
2018-07-19 16:57:31 +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
Robert Pelnar
fa9d4550f0
PFW-448 menu items displaying fix
2018-07-19 15:21:46 +02:00
Robert Pelnar
42d2f31248
PFW-446 Stop print fix (recursion in lcd_update)
2018-07-19 14:23:45 +02:00
Robert Pelnar
6db1c6dc3b
Long press Move Z fixed
2018-07-19 13:54:56 +02:00
PavelSindler
7600848533
load to nozzle function, M600 work in progress
2018-07-19 13:14:29 +02:00
Robert Pelnar
afb9ca4687
FSensor - removed fsensor blocking while load, added filament quality meassurement
2018-07-18 17:45:54 +02:00
PavelSindler
2006ae58f1
typo fix
2018-07-18 16:54:40 +02:00
PavelSindler
5676550452
missing get response readded
2018-07-18 16:52:10 +02:00
PavelSindler
b9be718deb
timeout used everywhere where we are waiting for mmu reponse
2018-07-18 16:25:31 +02:00
PavelSindler
0a43b9ce6b
timeout when waiting for mmu OK
2018-07-18 16:17:45 +02:00
PavelSindler
6e760ef76d
merge with upstream cleanup
2018-07-18 15:34:33 +02:00
Robert Pelnar
2c06cb68d1
FSensor tunning - filtering changed, chunk length = 0.64mm and MAX_ERR = 10
2018-07-17 20:04:12 +02:00
Petr Ledvina
d3e9543fee
Fix undefined behaviour
...
Argument evaluation order is undefined
2018-07-17 19:12:48 +02:00
Petr Ledvina
48d6ebffd8
Fix code_seen
...
char/string version was mixed
2018-07-17 18:57:28 +02:00
Petr Ledvina
2af973bfba
Remove uninitialized variables
2018-07-17 18:57:28 +02:00
Petr Ledvina
3f17364589
Fix various warnings
2018-07-17 18:57:28 +02:00
Petr Ledvina
33bf363798
Fix st_get_position_mm
...
call it, do not index function pointer
2018-07-17 18:57:28 +02:00
Petr Ledvina
ef93de95d8
Fix int overflow
2018-07-17 18:57:28 +02:00
Petr Ledvina
ba8bcf76be
Use signed value where appropriate
2018-07-17 17:57:38 +02:00
Petr Ledvina
7bbf9953f2
Fix missing return warnings
2018-07-17 17:57:38 +02:00
Petr Ledvina
6cebf09b88
Fix operator priority
...
== has higher precedence to &, test was always false
2018-07-17 17:57:38 +02:00
Petr Ledvina
ceeb97f38c
Parentheses around macro argument
...
Not triggering error in this case
2018-07-17 17:57:38 +02:00
Petr Ledvina
baddf38dbc
Make card filename `const`
...
Fixes warning in filename_wldsd
2018-07-17 17:55:05 +02:00
Petr Ledvina
f2981bf322
Fix type coversion warnings in language.c
2018-07-17 17:55:05 +02:00
Petr Ledvina
d64754468a
Fix undefined function warnings
2018-07-17 17:55:05 +02:00
Petr Ledvina
fd332c1ff1
Fix ADC index overflow
...
Use bitmap bitcount to map pin number to adc_values array index. Old
code fails for TEMP_AMBIENT_PIN and VOLT_BED_PIN
2018-07-17 17:55:04 +02:00
Petr Ledvina
3f92630fd1
Fix setTargetHotend array overflow
...
Special function may be used instead (setTargetHotends(temp))
2018-07-17 17:55:04 +02:00
PavelSindler
33f9af65c8
merge with upstream/MK3
2018-07-17 16:36:53 +02:00
Robert Pelnar
64929a78f5
Linearity correction menu disabled
2018-07-17 13:35:04 +02:00
XPila
7bec5c6d5c
Merge branch 'MK3' into MK3-new_lang
2018-07-17 11:47:01 +02:00
PavelSindler
9e2985dfba
Revert "Use timer"
2018-07-17 11:38:38 +02:00
PavelSindler
77426b563a
Revert "Save 80B of flash and 8B of RAM and fix compiler warning:"
2018-07-17 11:28:44 +02:00
PavelSindler
85c37d1225
Merge branch 'MK3' into fix_compiler_warnings
2018-07-17 10:56:25 +02:00
PavelSindler
322978c920
Merge branch 'MK3_mk_prep' into MK3
2018-07-17 10:03:31 +02:00
PavelSindler
e1a71118f9
Merge pull request #917 from mkbel/use_Timer
...
Use timer
2018-07-17 09:57:56 +02:00
PavelSindler
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
Robert Pelnar
2451455974
LCD menu optimalization - initial lcd update fix
2018-07-16 23:54:46 +02:00
Robert Pelnar
19a72ef9eb
LCD menu optimalization - LiquidCrystal_Prusa removed
2018-07-16 23:23:15 +02:00
PavelSindler
fddc02adfa
version changed
2018-07-16 21:01:40 +02:00
Robert Pelnar
d1de75eb19
LCD menu optimalization - createChar
...
+code order
2018-07-16 19:53:34 +02:00
Robert Pelnar
e22d204e8e
LCD menu optimalization - print functions
...
+removed unused code
2018-07-16 19:29:27 +02:00
PavelSindler
a575c028bf
resend request sends OK
2018-07-16 19:20:39 +02:00
Robert Pelnar
68e59399af
LCD menu optimalization - lcd_printPGM replaced with lcd_puts_P
2018-07-16 18:08:01 +02:00
Robert Pelnar
0eaabed50c
LCD menu optimalization - renamed lcd_implementation clear
...
+code order
2018-07-16 17:54:16 +02:00
Robert Pelnar
fd3fc31304
LCD menu optimalization - conversion functions - source separation
2018-07-16 17:23:35 +02:00
Robert Pelnar
0924ad50d5
New localization vs octoprint fix - do not translate protocol messages
2018-07-16 04:50:43 +02:00
Robert Pelnar
a7df5f368b
LCD menu optimalization - sdcard menu fixed
2018-07-16 04:24:27 +02:00
Robert Pelnar
b6223d5623
LCD menu optimalization
2018-07-16 04:13:26 +02:00
Robert Pelnar
268d2634f0
LCD menu optimalization - lcd and menu
...
removed unused code and conditional translation
2018-07-16 02:13:52 +02:00
PavelSindler
0e15a4025b
whitespace
2018-07-15 20:24:24 +02:00
PavelSindler
6824ab65dd
G28 fix
2018-07-15 20:00:29 +02:00
Robert Pelnar
39bb855333
LCD menu optimalization - menu_item_edit_int3
...
MenuStack removed
FILAMENT_LCD_DISPLAY and ENCODER_STEPS_PER_MENU_ITEM removed (unused)
EXPERIMENTAL_FEATURES menu removed
2018-07-15 18:37:59 +02:00
Marek Bel
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
Marek Bel
83081b0fba
Fix compiler warning: sketch/LiquidCrystal_Prusa.cpp:502:1: warning: label 'end' defined but not used [-Wunused-label].
2018-07-13 20:00:20 +02:00
Marek Bel
ea59d8a6e6
Fix compiler warnings:
...
In file included from sketch/ConfigurationStore.cpp:4:0:
sketch/ultralcd.h:40:15: warning: 'void lcd_selftest_v()' declared 'static' but never defined [-Wunused-function]
static void lcd_selftest_v();
^
sketch/ultralcd.h:42:15: warning: 'bool lcd_selfcheck_endstops()' declared 'static' but never defined [-Wunused-function]
static bool lcd_selfcheck_endstops();
^
sketch/ultralcd.h:45:15: warning: 'void reset_crash_det(char)' declared 'static' but never defined [-Wunused-function]
static void reset_crash_det(char axis);
^
sketch/ultralcd.h:46:15: warning: 'bool lcd_selfcheck_axis_sg(char)' declared 'static' but never defined [-Wunused-function]
static bool lcd_selfcheck_axis_sg(char axis);
^
sketch/ultralcd.h:47:15: warning: 'bool lcd_selfcheck_axis(int, int)' declared 'static' but never defined [-Wunused-function]
static bool lcd_selfcheck_axis(int _axis, int _travel);
^
sketch/ultralcd.h:54:15: warning: 'bool lcd_selfcheck_check_heater(bool)' declared 'static' but never defined [-Wunused-function]
static bool lcd_selfcheck_check_heater(bool _isbed);
^
sketch/ultralcd.h:55:15: warning: 'int lcd_selftest_screen(int, int, int, bool, int)' declared 'static' but never defined [-Wunused-function]
static int lcd_selftest_screen(int _step, int _progress, int _progress_scale, bool _clear, int _delay);
^
sketch/ultralcd.h:56:15: warning: 'void lcd_selftest_screen_step(int, int, int, const char*, const char*)' declared 'static' but never defined [-Wunused-function]
static void lcd_selftest_screen_step(int _row, int _col, int _state, const char *_name, const char *_indicator);
^
sketch/ultralcd.h:57:15: warning: 'bool lcd_selftest_manual_fan_check(int, bool)' declared 'static' but never defined [-Wunused-function]
static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite);
^
sketch/ultralcd.h:58:15: warning: 'bool lcd_selftest_fan_dialog(int)' declared 'static' but never defined [-Wunused-function]
static bool lcd_selftest_fan_dialog(int _fan);
^
sketch/ultralcd.h:59:15: warning: 'bool lcd_selftest_fsensor()' declared 'static' but never defined [-Wunused-function]
static bool lcd_selftest_fsensor();
^
sketch/ultralcd.h:60:15: warning: 'void lcd_selftest_error(int, const char*, const char*)' declared 'static' but never defined [-Wunused-function]
static void lcd_selftest_error(int _error_no, const char *_error_1, const char *_error_2);
sketch/ultralcd.h:68:24: warning: 'blink' defined but not used [-Wunused-variable]
static unsigned char blink = 0; // Variable for visualization of fan rotation in GLCD
sketch/ultralcd.h:222:13: warning: 'void lcd_colorprint_change()' declared 'static' but never defined [-Wunused-function]
static void lcd_colorprint_change();
^
sketch/ultralcd.h:223:12: warning: 'int get_ext_nr()' declared 'static' but never defined [-Wunused-function]
static int get_ext_nr();
^
sketch/ultralcd.h:225:13: warning: 'void extr_adj_0()' declared 'static' but never defined [-Wunused-function]
static void extr_adj_0();
^
sketch/ultralcd.h:226:13: warning: 'void extr_adj_1()' declared 'static' but never defined [-Wunused-function]
static void extr_adj_1();
^
sketch/ultralcd.h:227:13: warning: 'void extr_adj_2()' declared 'static' but never defined [-Wunused-function]
static void extr_adj_2();
^
sketch/ultralcd.h:228:13: warning: 'void extr_adj_3()' declared 'static' but never defined [-Wunused-function]
static void extr_adj_3();
^
sketch/ultralcd.h:229:13: warning: 'void fil_load_menu()' declared 'static' but never defined [-Wunused-function]
static void fil_load_menu();
^
sketch/ultralcd.h:230:13: warning: 'void fil_unload_menu()' declared 'static' but never defined [-Wunused-function]
static void fil_unload_menu();
^
sketch/ultralcd.h:231:13: warning: 'void extr_unload_0()' declared 'static' but never defined [-Wunused-function]
static void extr_unload_0();
^
sketch/ultralcd.h:232:13: warning: 'void extr_unload_1()' declared 'static' but never defined [-Wunused-function]
static void extr_unload_1();
^
sketch/ultralcd.h:233:13: warning: 'void extr_unload_2()' declared 'static' but never defined [-Wunused-function]
static void extr_unload_2();
^
sketch/ultralcd.h:234:13: warning: 'void extr_unload_3()' declared 'static' but never defined [-Wunused-function]
static void extr_unload_3();
^
sketch/ultralcd.h:235:13: warning: 'void lcd_disable_farm_mode()' declared 'static' but never defined [-Wunused-function]
static void lcd_disable_farm_mode();
^
sketch/ultralcd.h:236:13: warning: 'void lcd_set_fan_check()' declared 'static' but never defined [-Wunused-function]
static void lcd_set_fan_check();
^
sketch/ultralcd.h:240:13: warning: 'char snmm_stop_print_menu()' declared 'static' but never defined [-Wunused-function]
static char snmm_stop_print_menu();
^
sketch/ultralcd.h:242:14: warning: 'void lcd_sort_type_set()' declared 'static' but never defined [-Wunused-function]
static void lcd_sort_type_set();
^
sketch/ultralcd.h:244:14: warning: 'float count_e(float, float, float)' declared 'static' but never defined [-Wunused-function]
static float count_e(float layer_heigth, float extrusion_width, float extrusion_length);
^
sketch/ultralcd.h:245:13: warning: 'void lcd_babystep_z()' declared 'static' but never defined [-Wunused-function]
static void lcd_babystep_z();
^
sketch/ultralcd.h:290:13: warning: 'void lcd_send_status()' declared 'static' but never defined [-Wunused-function]
static void lcd_send_status();
^
sketch/ultralcd.h:291:13: warning: 'void lcd_connect_printer()' declared 'static' but never defined [-Wunused-function]
static void lcd_connect_printer();
sketch/ultralcd.h:227:13: warning: 'char snmm_stop_print_menu()' declared 'static' but never defined [-Wunused-function]
static char snmm_stop_print_menu();
^
sketch/ultralcd.h:229:14: warning: 'void lcd_sort_type_set()' declared 'static' but never defined [-Wunused-function]
static void lcd_sort_type_set();
^
sketch/ultralcd.h:231:14: warning: 'float count_e(float, float, float)' declared 'static' but never defined [-Wunused-function]
static float count_e(float layer_heigth, float extrusion_width, float extrusion_length);
^
sketch/ultralcd.h:232:13: warning: 'void lcd_babystep_z()' declared 'static' but never defined [-Wunused-function]
static void lcd_babystep_z();
2018-07-13 19:50:51 +02:00
Marek Bel
6bd8e60176
Fix compiler warning:
...
In file included from sketch/ConfigurationStore.cpp:4:0:
sketch/ultralcd.h:12:14: warning: 'void lcd_language_menu()' declared 'static' but never defined [-Wunused-function]
static void lcd_language_menu();
2018-07-13 19:27:25 +02:00
Marek Bel
ee366ce3b5
Fix compiler warnings:
...
In file included from sketch/ConfigurationStore.cpp:3:0:
sketch/temperature.h:193:14: warning: 'temp_runaway_status' defined but not used [-Wunused-variable]
static float temp_runaway_status[4];
^
sketch/temperature.h:194:14: warning: 'temp_runaway_target' defined but not used [-Wunused-variable]
static float temp_runaway_target[4];
^
sketch/temperature.h:195:14: warning: 'temp_runaway_timer' defined but not used [-Wunused-variable]
static float temp_runaway_timer[4];
^
sketch/temperature.h:196:12: warning: 'temp_runaway_error_counter' defined but not used [-Wunused-variable]
static int temp_runaway_error_counter[4];
2018-07-13 19:18:54 +02:00
Marek Bel
ff56e491e8
Save 2B flash, fix compiler warning:
...
In file included from sketch/ConfigurationStore.cpp:5:0:
sketch/ConfigurationStore.h: In function 'uint8_t calibration_status_store(uint8_t)':
sketch/ConfigurationStore.h:24:124: warning: no return statement in function returning non-void [-Wreturn-type]
inline uint8_t calibration_status_store(uint8_t status) { eeprom_update_byte((uint8_t*)EEPROM_CALIBRATION_STATUS, status); }
2018-07-13 18:49:14 +02:00
Marek Bel
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
Marek Bel
bc99db8233
Fix compiler warning: sketch/uart2.c:48:1: warning: control reaches end of non-void function [-Wreturn-type]
2018-07-13 18:35:42 +02:00
Marek Bel
f620a66211
Use public interface instead of manipulating lcd_next_update_millis timer.
2018-07-13 18:26:52 +02:00
Marek Bel
49dd8d83fb
Fix indentation in lcd_update() and split some of the preprocessor disabled functionality into separate functions. No change in resulting binary.
2018-07-13 18:06:33 +02:00
Marek Bel
9d72062cd7
Save 82B flash and 1B RAM, fix compiler warning:
...
sketch/ultralcd.cpp:7212:61: warning: integer overflow in expression [-Woverflow]
lcd_next_update_millis = millis() + (LCD_UPDATE_INTERVAL * 10000);
2018-07-13 17:42:47 +02:00
Robert Pelnar
68a5a4b74e
FEEDRATE_LIMIT fix
2018-07-12 23:51:15 +02:00
Robert Pelnar
f9f718e787
Config_PrintSettings fix
2018-07-12 23:50:41 +02:00
Robert Pelnar
37f34a1ba3
Config_PrintSettings (M503) - printf optimized (~800 bytes flash saved)
2018-07-12 23:40:04 +02:00
Robert Pelnar
007717bfd2
Disabled TMC2130 feedrate and acceleration limits (should be properly limited with M201-M203)
2018-07-12 19:04:44 +02:00
Marek Bel
070e6f49e8
Fix error in sine wave compression algorithm in tmc2130. This problem could manifest itself only for negative function slope, which is not used.
2018-07-12 18:56:11 +02:00
Marek Bel
2116262845
Fix *_MAX_ACCEL integer overflow.
2018-07-12 18:46:12 +02:00
Robert Pelnar
7c78559b0e
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
2018-07-12 18:27:06 +02:00
Marek Bel
bc1f416602
Fix compiler warning symbol __AVR redefined.
2018-07-12 18:26:29 +02:00
Robert Pelnar
b35a212d15
PAT9125 optimalization (rewrited to C, 8bit sampling)
2018-07-12 18:11:07 +02:00
Marek Bel
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
Robert Pelnar
410e911364
SWI2C for PAT9125 simplified/optimized
2018-07-12 17:55:38 +02:00
Marek Bel
fb6aa72de9
Fix compiler warnings in sm4.c
2018-07-12 17:38:13 +02:00
Marek Bel
2b5e63eb7f
Fix compiler warnings in language.c and document _SEC_LANG_TABLE macro.
2018-07-12 17:23:50 +02:00
Robert Pelnar
f24c71d5a9
removed unused variable SDscrool
2018-07-12 17:01:03 +02:00
Robert Pelnar
8d5e6a65cd
LCD sdcard menu fix
...
+removed debug code
2018-07-12 16:27:02 +02:00
Marek Bel
bf0bbb215e
Merge branch 'MK3' into fix_compiler_warnings
2018-07-12 14:10:02 +02:00
PavelSindler
07f6ddfb69
filament loading corrected
2018-07-11 22:34:32 +02:00
PavelSindler
9b7cc60b42
filament statistics hotfix, load filament move Z simplified
2018-07-11 21:59:43 +02:00
PavelSindler
11aa775322
move in Z before filament loading: intial version
2018-07-11 21:59:23 +02:00
Marek Bel
29d1052f0e
Save 80B of flash and 8B of RAM and fix compiler warning:
...
sketch/adc.c: In function 'adc_init':
sketch/adc.c:20:2: warning: implicit declaration of function 'printf' [-Wimplicit-function-declaration]
printf(("adc_init\n"));
^
sketch/adc.c:20:2: warning: incompatible implicit declaration of built-in function 'printf' [enabled by default]
2018-07-11 21:58:49 +02:00
PavelSindler
d18160cab5
splash screen
2018-07-11 21:58:06 +02:00
MRprusa3d
1357e27b55
FilamentAutoload setting by shipping preparation
2018-07-11 21:56:25 +02:00
MRprusa3d
d658bf56cf
ShippingPrep Reset
...
statistics reset by shipping preparation & filament sensor force
2018-07-11 21:55:21 +02:00
PavelSindler
29d73029ae
Merge pull request #916 from MRprusa3d/MK3
...
FilamentAutoload setting by shipping preparation
2018-07-11 21:42:42 +02:00
Marek Bel
fc657bc31e
Merge branch 'MK3' into use_Timer
2018-07-11 21:24:18 +02:00
mkbel
02bd319a6c
Merge pull request #818 from 3d-gussner/MK3_fix7
...
Fix warning #7
2018-07-11 21:04:13 +02:00
MRprusa3d
4b295c4091
FilamentAutoload setting by shipping preparation
2018-07-11 20:45:56 +02:00
Robert Pelnar
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
MRprusa3d
d167b631fb
ShippingPrep Reset
...
statistics reset by shipping preparation & filament sensor force
2018-07-11 18:52:58 +02:00
PavelSindler
1ad49dc5e9
first working version
2018-07-10 10:45:45 +02:00
PavelSindler
c7745dfb83
Merge pull request #908 from XPila/MK3-new_lang
...
TMC2130 gcodes for live motor tunning:
2018-07-09 16:58:09 +02:00
Robert Pelnar
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
PavelSindler
bde81de984
load and unload filament functions for snmm_v2
2018-07-09 15:24:59 +02:00
PavelSindler
18f007d7b2
Merge remote-tracking branch 'upstream/MK3' into snmm_v2
2018-07-09 14:47:10 +02:00
PavelSindler
928dcb1417
missing initialization fix
2018-07-09 14:45:59 +02:00
PavelSindler
9d0a15da90
init
2018-07-09 14:20:56 +02:00
PavelSindler
5979bf5e0c
T-codes for MMU_V2: initial version
2018-07-09 13:57:36 +02:00
Robert Pelnar
8d2acd02a5
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
2018-07-09 12:44:58 +02:00
Robert Pelnar
e2ff00b05f
Menu optimalization - SDcard menu - initial implementation for async variant
2018-07-09 12:44:19 +02:00
Robert Pelnar
c8d5648ea8
Version changed
2018-07-02 16:53:10 +02:00
Marek Bel
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
PavelSindler
6abde828fa
version changed
2018-06-26 18:53:11 +02:00
PavelSindler
65880fac67
Merge pull request #875 from PavelSindler/fix_crash_restore
...
dummy "ok" reponse readded (fix for SD card print with Octoprint: fix…
2018-06-25 19:08:43 +02:00
PavelSindler
6f617696ac
dummy "ok" reponse readded (fix for SD card print with Octoprint: fixes communication timeout issues)
2018-06-25 18:52:22 +02:00
XPila
01f04cc406
Merge pull request #874 from XPila/MK3
...
XYZ cal. details screen fixed
2018-06-25 18:29:58 +02:00
Robert Pelnar
3ff4105024
XYZ cal. details screen fixed
2018-06-25 18:28:43 +02:00
PavelSindler
3674673faa
Merge pull request #873 from PavelSindler/MK3_for_merging
...
status screen update
2018-06-25 17:56:53 +02:00
PavelSindler
81c0c01825
status screen update
2018-06-25 17:50:37 +02:00
XPila
20f98d487a
Merge pull request #872 from XPila/MK3
...
Farm mode - tmc2130 extruder current setting fixed
2018-06-25 17:45:58 +02:00
Robert Pelnar
fe9b4e5f1f
Farm mode - tmc2130 extruder current setting fixed
2018-06-25 17:45:07 +02:00
PavelSindler
0fccf5a737
Merge pull request #870 from XPila/MK3
...
Mk3
2018-06-25 17:36:22 +02:00
PavelSindler
5d531b0f66
save extruder relative mode correctly
2018-06-25 17:30:20 +02:00
Robert Pelnar
12de2f95e6
Farm mode: PFW360, PFW361, PFW362, PFW363
2018-06-25 17:29:34 +02:00
Robert Pelnar
6d4c3b8b27
Farm mode - reset using watchdog for MK3
2018-06-25 16:04:47 +02:00
Robert Pelnar
bd5b51c7e4
LCD menu optimalization
2018-06-24 12:41:36 +02:00
Robert Pelnar
3a1c004848
LCD menu optimalization
2018-06-23 14:42:58 +02:00
Robert Pelnar
f7262637f8
LCD menu optimalization
2018-06-23 14:33:54 +02:00
Robert Pelnar
4d42617b21
LCD menu optimalization, saved ~12k of flash space
2018-06-23 03:22:39 +02:00
Robert Pelnar
febca066f2
New ML support - multiple languages in internal flash (MK25/MK2)
2018-06-23 01:31:38 +02:00
Robert Pelnar
7f9c9c153a
Rambo 1.0 pinout changed - SCL/21 (used for ENC button) rewired to PH2/84
2018-06-22 18:37:18 +02:00
PavelSindler
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
PavelSindler
f365150e3a
Merge pull request #860 from PavelSindler/crash_det_issue
...
Crash detection/stop print erroneous movements hotfix
2018-06-22 08:48:24 +02:00
PavelSindler
a83475bf7c
whitespace
2018-06-21 22:18:10 +02:00
PavelSindler
7b81663883
crash detection/stop print erroneous movements hotfix
2018-06-21 22:16:45 +02:00
Robert Pelnar
603ed49001
New ML support - MK25 (without W25x20CL)
2018-06-21 20:57:22 +02:00
Robert Pelnar
79afb76839
New ML support - includes fixed
2018-06-21 19:58:13 +02:00
Robert Pelnar
5674208eda
New ML support - removed menu + hardcoded W25x20CL
2018-06-21 19:17:41 +02:00
PavelSindler
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
XPila
2be36f626f
Merge pull request #845 from PavelSindler/crash_movements
...
crash detection fix for absolute E coordinates
2018-06-19 18:46:39 +02:00
PavelSindler
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
PavelSindler
88a19432b7
whitespace
2018-06-19 17:48:31 +02:00
PavelSindler
1e60390545
dont process data from serial line if print is saved (crash detection and filament detection)
2018-06-19 16:51:22 +02:00