josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,909 Commits 31 Branches 140 Tags 71 MiB
Commit Graph

652 Commits

Author SHA1 Message Date
Robert Pelnar f1ad1d22ba Menu lcd_adjust_bed fixed (Bed level correction, PFW-499) 2018-08-19 13:59:33 +02:00
Marek Bel ac62117d6b Merge remote-tracking branch 'prusa3d/MK3' into MK3_dev 2018-08-13 19:38:55 +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
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 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 23e5cea5d0 MMU - code cleaning (modularity) 
M403 set filament type
hardware reset
 2018-08-08 18:58:03 +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 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 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 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 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
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
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 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 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
Robert Pelnar 282ff6c577 removed unused union 2018-08-02 17:09:02 +02:00
Robert Pelnar d378575a68 SNMM_V2 - default retraction declared as variable 2018-08-02 17:07:09 +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 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
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 b0077182e5 Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings 2018-08-01 17:53:49 +02:00
PavelSindler 54adb0beea missing eol added 2018-08-01 16:54:26 +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
PavelSindler 135c4db5da gcode for filemant type initial version: just re-sending information to mmu 2018-08-01 15:43:13 +02:00
PavelSindler 0e059f8da6 single material fix: remove semicolon, unload_filament() function definition 2018-08-01 11:33:58 +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
PavelSindler be1167fae3 M600 for multimaterial: don't check if filament unload was succesfull 2018-07-31 19:18:09 +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
PavelSindler 04d0178150 automatic M600 initial version 2018-07-31 12:24:22 +02:00
PavelSindler 67f56d3de9 merge with upstream 2018-07-30 17:24:58 +02:00
MRprusa3d 970ba6fa2a Sound 
all cases
 2018-07-29 22:59:14 +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
PavelSindler 9235ffb497 T code for SNMM_V2 fix 2018-07-26 17:03:43 +02:00
Robert Pelnar 691e7a24ed EEPROM dump (code D3) 2018-07-26 13:20:35 +02:00
PavelSindler cadb2e9cfe
Merge pull request #973 from MRprusa3d/MK3 
PowerPanic IV
 2018-07-26 09:40:57 +02:00
MRprusa3d 5be82962ee PowerPanic IV 2018-07-25 19:24:41 +02:00
PavelSindler 59c0127b77 automatic M600 for mmu v2: work in progress 2018-07-25 16:48:39 +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 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
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
Martin Remiš c7d7389e27 PowerPanic & Sound 2018-07-23 20:04:47 +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
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
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
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
Robert Pelnar 60b4db15e0 FSensor - M600 fix + cond. translation + tunning filter and params 2018-07-22 16:14:13 +02:00
Robert Pelnar c6a3f073dd FSensor - M600/autoload fix + optical quality meassurement 2018-07-21 17:04: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 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 814572fed5 merge with upstream 2018-07-20 17:22:06 +02:00