Commit Graph

1718 Commits

Author SHA1 Message Date
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