Commit Graph

1918 Commits

Author SHA1 Message Date
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
XPila
3147e6b3d8
Merge pull request #1020 from XPila/MK3-new_lang
Mk3 new lang
2018-08-07 20:56:10 +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
XPila
f873ae9486
Merge pull request #1014 from mkbel/MK3_dev
Mk3 dev
2018-08-06 17:09:06 +02:00
Marek Bel
ceac1e07bd Merge branch 'MK3' into MK3_dev 2018-08-06 16:26:38 +02:00
XPila
cc37ef4390
Merge pull request #1010 from PavelSindler/snmm_v2
PRUSA Fir reports also buildnumber
2018-08-06 15:18:20 +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
bb64dc5a58
Merge pull request #1001 from mkbel/fix_compiler_warnings
Fix compiler warnings
2018-08-05 20:18:17 +02:00
PavelSindler
d21e527c73 PRUSA Fir reports also buildnumber 2018-08-05 20:17:04 +02:00
PavelSindler
2097ef8485
Merge pull request #1006 from PavelSindler/snmm_v2
merge with upstream fix
2018-08-03 19:15:00 +02:00
PavelSindler
0c2d0bebce merge with upstream fix 2018-08-03 19:14:17 +02:00
XPila
8de1bd6a6c
Merge pull request #1005 from PavelSindler/snmm_v2
M600 fix; manage_response fix
2018-08-03 18:57:51 +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