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

1351 Commits

Author SHA1 Message Date
Marek Bel
fe43791673 Merge branch 'MK3' into MK3_dev 2018-08-22 16:17:10 +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
Marek Bel
3b3d6ab472 Merge branch 'MK3' into MK3_dev 2018-08-21 17:56:34 +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