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
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
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
Robert Pelnar
10af023eae
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
2018-08-02 16:32:59 +02:00
PavelSindler
1685f83020
Merge pull request #971 from mkbel/fix_menuData_compiler_warnings
...
Fix 98 compiler warnings of type: warning: dereferencing type-punned …
2018-08-02 09:42:54 +02:00
Marek Bel
ef8921d45e
Fix 10 compiler warnings of type: sketch/menu.cpp: In function 'void _menu_edit_int3()':
...
sketch/menu.cpp:272:51: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
#define _menu_data (*((menu_data_edit_t*)menu_data))
2018-08-01 22:43:36 +02:00
Marek Bel
93d2b37b5c
Fix 98 compiler warnings of type: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
2018-08-01 22:43:27 +02:00
MRprusa3d
bafd290141
Sound
...
& TuneMenu
2018-08-01 22:34:58 +02:00
PavelSindler
ac60b3ebe7
Merge pull request #996 from PavelSindler/snmm_v2
...
M600 updated
2018-08-01 19:39:08 +02:00
XPila
618aea25d6
Merge pull request #995 from PavelSindler/filament_type
...
snmm v2: send filament type to mmu
2018-08-01 19:33:44 +02:00
PavelSindler
24e7f0d0ec
mmures fix
2018-08-01 19:29:50 +02:00
PavelSindler
06063118bd
M600 updated
2018-08-01 18:47:28 +02:00
Marek Bel
ca97e2232f
Merge remote-tracking branch 'ledvinap/MK3' into fix_compiler_warnings
2018-08-01 18:44:05 +02:00
Marek Bel
b0077182e5
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 17:53:49 +02:00
Marek Bel
1a2d7657dc
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 17:39:54 +02:00
Marek Bel
6f824730af
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 17:37:09 +02:00
Marek Bel
a8f73b3915
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 17:19:34 +02:00
Marek Bel
97ec616dd1
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 17:14:36 +02:00
Marek Bel
ab5593e673
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 16:58:09 +02:00
PavelSindler
54adb0beea
missing eol added
2018-08-01 16:54:26 +02:00
Marek Bel
b7ba0c5f14
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 16:50:44 +02:00
PavelSindler
b35ef498f0
comments updated
2018-08-01 16:46:46 +02:00
Marek Bel
665a885a21
Merge commit 'baddf38dbc2c72ab095deaf9b3e251ea2faeb699' into fix_compiler_warnings
2018-08-01 16:44:17 +02:00
Marek Bel
98e921d456
Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings
2018-08-01 16:24:07 +02:00
PavelSindler
135c4db5da
gcode for filemant type initial version: just re-sending information to mmu
2018-08-01 15:43:13 +02:00
Robert Pelnar
43cc789602
feedrate symbol changed back to double-arrow
2018-08-01 15:15:54 +02:00
PavelSindler
0e059f8da6
single material fix: remove semicolon, unload_filament() function definition
2018-08-01 11:33:58 +02:00
PavelSindler
1f5026eed7
Merge pull request #991 from XPila/MK3-new_lang
...
FSensor improvement
2018-08-01 10:43:34 +02:00
PavelSindler
d363bd071d
Merge pull request #990 from PavelSindler/snmm_v2
...
Snmm v2: M600, communication timeouts with mmu
2018-08-01 10:43:22 +02:00
PavelSindler
e153a29bdb
messages corrected, 5 minutes timeout when communicating with mmu
2018-08-01 10:42:09 +02:00
PavelSindler
45ac42caff
snmm v2: manage response: wait for nozzle temp only when heating
2018-08-01 09:58:07 +02:00
Robert Pelnar
c2fe3b920c
FSensor - chunk defined in mm, runout detection distance tunning
2018-08-01 01:24:35 +02:00
Robert Pelnar
9509a60549
FSensor improovement
...
autoload sensitivity decreased (false triggering on MK25)
filtering algorithm more robust
additional check - fixed sync with autoload and better condition
2018-07-31 20:23:31 +02:00
PavelSindler
be1167fae3
M600 for multimaterial: don't check if filament unload was succesfull
2018-07-31 19:18:09 +02:00
PavelSindler
b99b73c924
missing declaration
2018-07-31 19:03:53 +02:00
PavelSindler
40da6deef8
timeouts used when getting response from mmu, M600 improvements, no filament sensor in variants file
2018-07-31 19:00:42 +02:00
Robert Pelnar
7731898b58
FSensor - optical quality meassurement - ignore reflexivity for materials with low data deviation
2018-07-31 16:28:11 +02:00
PavelSindler
04d0178150
automatic M600 initial version
2018-07-31 12:24:22 +02:00
Robert Pelnar
fa30353646
Live adjust Z format fix
2018-07-30 19:24:04 +02:00
PavelSindler
67f56d3de9
merge with upstream
2018-07-30 17:24:58 +02:00
PavelSindler
9195167541
Merge pull request #984 from MRprusa3d/MK3
...
Sound
2018-07-30 10:55:06 +02:00
MRprusa3d
f5ed37a88f
Sound
...
"stepper.cpp" revert (debug mode only)
2018-07-30 10:52:31 +02:00
MRprusa3d
970ba6fa2a
Sound
...
all cases
2018-07-29 22:59:14 +02:00
Robert Pelnar
dd23835480
fsensor - fix - do not report poor filament response when disabled
2018-07-27 20:53:25 +02:00
Robert Pelnar
26bc28cf89
menu_draw_float31 fixed (one digit after decimal point instead of thre)
2018-07-27 20:28:44 +02:00
Robert Pelnar
e73f84279e
EEPROM offset fixed - added dummy lcd_contrast
2018-07-26 21:05:16 +02:00
PavelSindler
4fb27866f4
Merge pull request #972 from PavelSindler/end_file_section
...
End file section for searching M84 in gcode file enlarged
2018-07-26 19:59:37 +02:00
PavelSindler
5bc40aff85
Merge pull request #975 from XPila/MK3-new_lang
...
EEPROM dump (code D3)
2018-07-26 19:59:09 +02:00
Robert Pelnar
2f9003dbdd
fsensor - better state handling
2018-07-26 19:50:33 +02:00
Robert Pelnar
f819b6b304
debug output from EEPROM_WRITE_VAR and EEPROM_READ_VAR
2018-07-26 19:43:33 +02:00
PavelSindler
d51b2666ac
no levels used in store settings function
2018-07-26 19:09:52 +02:00
PavelSindler
1232d2dae6
M503: print autoretract value fixed
2018-07-26 17:26:05 +02:00
PavelSindler
9235ffb497
T code for SNMM_V2 fix
2018-07-26 17:03:43 +02:00
PavelSindler
285f2ccbd9
Merge pull request #976 from PavelSindler/MK3_for_merging
...
config for mmu updated
2018-07-26 15:00:33 +02:00
PavelSindler
5bda19b9f7
config for mmu updated
2018-07-26 14:59:49 +02:00
Robert Pelnar
691e7a24ed
EEPROM dump (code D3)
2018-07-26 13:20:35 +02:00
PavelSindler
9c1ef5e414
Merge pull request #974 from mkbel/fix_compiler_warnings
...
Save 88B FLASH and fix compiler warnings:
2018-07-26 09:41:31 +02:00
PavelSindler
cadb2e9cfe
Merge pull request #973 from MRprusa3d/MK3
...
PowerPanic IV
2018-07-26 09:40:57 +02:00
Marek Bel
716e6c209c
Save 88B FLASH and fix compiler warnings:
...
sketch/cmdqueue.cpp: In function 'bool cmdqueue_pop_front()':
sketch/cmdqueue.cpp:67:56: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
for (++ bufindr; bufindr < sizeof(cmdbuffer) && cmdbuffer[bufindr] == 0; ++ bufindr) ;
^
sketch/cmdqueue.cpp: In function 'bool cmdqueue_could_enqueue_back(int, bool)':
sketch/cmdqueue.cpp:170:63: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
endw + CMDBUFFER_RESERVE_FRONT <= sizeof(cmdbuffer) ||
^
sketch/cmdqueue.cpp:172:38: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
(endw <= sizeof(cmdbuffer) && CMDBUFFER_RESERVE_FRONT <= bufindr))
^
sketch/cmdqueue.cpp:196:63: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
endw + CMDBUFFER_RESERVE_FRONT <= sizeof(cmdbuffer) ||
^
sketch/cmdqueue.cpp:198:38: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
(endw <= sizeof(cmdbuffer) && CMDBUFFER_RESERVE_FRONT <= bufindr))
^
sketch/cmdqueue.cpp: In function 'void get_command()':
sketch/cmdqueue.cpp:380:10: warning: variable 'rx_buffer_full' set but not used [-Wunused-but-set-variable]
bool rx_buffer_full = false; //flag that serial rx buffer is full
^
sketch/cmdqueue.cpp: In function 'uint16_t cmdqueue_calc_sd_length()':
sketch/cmdqueue.cpp:697:54: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
for (++ _bufindr; _bufindr < sizeof(cmdbuffer) && cmdbuffer[_bufindr] == 0; ++ _bufindr) ;
^
2018-07-25 21:18:29 +02:00
MRprusa3d
5be82962ee
PowerPanic IV
2018-07-25 19:24:41 +02:00
PavelSindler
da82062d41
End file section for searching M84 in gcode file were enlarged (compatibility with mmu Slic3r)
2018-07-25 18:26:22 +02:00
PavelSindler
9b4f786325
Merge pull request #970 from mkbel/fix_compiler_warnings
...
Fix compiler warnings
2018-07-25 17:08:07 +02:00
PavelSindler
59c0127b77
automatic M600 for mmu v2: work in progress
2018-07-25 16:48:39 +02:00
Marek Bel
620c015b65
Fix compiler warning: sketch/ultralcd.cpp:855:31: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
...
for (int dots = 0; dots < heating_status_counter; dots++)
2018-07-25 16:30:50 +02:00
Marek Bel
58155cacbc
Fix compiler warning sketch/ultralcd.cpp:6711:24: warning: suggest parentheses around comparison in operand of '^' [-Wparentheses].
...
Add parentheses to match expressions on following lines. This changed expression, as == has precedence over ^, but truth table of expression is anyway the same regardless of parentheses.
2018-07-25 16:24:08 +02:00
Marek Bel
08b56fe1a4
Fix compiler warning sketch/cardreader.cpp:706:25: warning: comparison between signed and unsigned integer expressions [-Wsign-compare].
...
Remove redundant and masked int d variable.
Fix indentation of presort() to make it clear, that it is not part of for loop.
2018-07-25 15:51:00 +02:00
Marek Bel
5f8e87e649
Fix compiler warning: sketch/SdFatUtil.cpp:49:7: warning: unused variable 'i' [-Wunused-variable]
2018-07-25 15:19:10 +02:00
Marek Bel
702fa307bb
Fix compiler warning sketch/Marlin_main.cpp:478:14: warning: 'delta' defined but not used [-Wunused-variable].
...
Variable was never used since "Initial commit".
2018-07-25 15:08:17 +02:00
Marek Bel
904db96cd1
Fix compiler warning sketch/tmc2130.h:123:3: warning: 'tmc2130_axis_config' defined but not used [-Wunused-variable]
2018-07-25 15:03:38 +02:00
Marek Bel
98ba79e518
Fix out of array bounds access.
...
Manifested as compiler warnings:
In file included from sketch/Marlin_main.cpp:67:0:
sketch/temperature.h: In function 'bool gcode_M45(bool, int8_t)':
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
target_temperature[extruder] = celsius;
^
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
target_temperature[extruder] = celsius;
^
sketch/temperature.h: In function 'void long_pause()':
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
target_temperature[extruder] = celsius;
^
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
target_temperature[extruder] = celsius;
^
sketch/temperature.h: In function 'void process_commands()':
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
target_temperature[extruder] = celsius;
^
sketch/temperature.h:142:30: warning: array subscript is above array bounds [-Warray-bounds]
target_temperature[extruder] = celsius;
^
2018-07-25 12:52:02 +02:00
Marek Bel
e6dcbedf82
Fix compiler warning: sketch/Marlin_main.cpp:8833:16: warning: variable 'nplanner_blocks' set but not used [-Wunused-but-set-variable]
2018-07-25 11:58:48 +02:00
Marek Bel
b357399c6b
Fix compiler warning sketch/Marlin_main.cpp:1846:1: warning: control reaches end of non-void function [-Wreturn-type].
2018-07-25 11:54:55 +02:00
PavelSindler
d6021d047d
Merge pull request #969 from mkbel/fix_compiler_warnings
...
Fix compiler warning: sketch/ultralcd.cpp:7258:61: warning: integer o…
2018-07-25 11:36:34 +02:00
Marek Bel
c7de8a91bb
Fix compiler warning sketch/Marlin_main.cpp:8811:10: warning: unused variable 'extruder_abs_pos' [-Wunused-variable]
...
Variable started to be unused in commit
fde0efc75c
power panic for absolute E coordinates: initial version
and its author told me that the change was intentional.
2018-07-25 11:33:32 +02:00
Marek Bel
0f577cace6
Fix compiler warning: sketch/Marlin_main.cpp:8759:8: warning: unused variable 'c' [-Wunused-variable]
2018-07-24 19:40:43 +02:00
Marek Bel
bd868132cc
Fix compiler warnings:
...
sketch/Marlin_main.cpp:8756:8: warning: unused variable 'x_rec' [-Wunused-variable]
sketch/Marlin_main.cpp:8756:15: warning: unused variable 'y_rec' [-Wunused-variable]
sketch/Marlin_main.cpp:8756:22: warning: unused variable 'z_pos' [-Wunused-variable]
2018-07-24 19:31:18 +02:00
Marek Bel
c19bf72ba9
Fix compiler warning sketch/Marlin_main.cpp:8220:15: warning: unused variable 'k' [-Wunused-variable].
2018-07-24 18:33:44 +02:00
Marek Bel
3f0684ea30
Fix compiler warning - remove unused variable.
2018-07-24 18:27:05 +02:00
Marek Bel
f7754faaf1
Fix compiler warning sketch/Marlin_main.cpp:7092:14: warning: variable 'make_move' set but not used [-Wunused-but-set-variable]
2018-07-24 18:06:38 +02:00
Marek Bel
68a3ae5456
Fix compiler warning sketch/Marlin_main.cpp:6331:11: warning: unused variable 'cnt' [-Wunused-variable]
2018-07-24 17:57:26 +02:00
Marek Bel
b44f71fd33
Fix compiler warning sketch/Marlin_main.cpp:6267:16: warning: variable 'TooLowZ' set but not used [-Wunused-but-set-variable]
...
int8_t TooLowZ = 0;
This variable was unused even in "Initial commit".
2018-07-24 17:30:37 +02:00
Marek Bel
d5ab657cdf
Fix compiler warnings:
...
file included from sketch/Configuration_prusa.h:2:0,
from sketch/Configuration.h:43,
from sketch/Marlin.h:22,
from sketch/Marlin_main.cpp:46:
sketch/Marlin_main.cpp: In function 'void process_commands()':
sketch/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h:106:33: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
#define NORMAL_MAX_ACCEL_XY 2500ul // max acceleration in normal mode in mm/s^2
^
sketch/Marlin_main.cpp:5772:16: note: in expansion of macro 'NORMAL_MAX_ACCEL_XY'
if (val > NORMAL_MAX_ACCEL_XY)
^
sketch/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h:102:34: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
#define SILENT_MAX_ACCEL_XY 960ul // max acceleration in silent mode in mm/s^2
^
sketch/Marlin_main.cpp:5774:23: note: in expansion of macro 'SILENT_MAX_ACCEL_XY'
if (val_silent > SILENT_MAX_ACCEL_XY)
2018-07-24 17:22:29 +02:00
Marek Bel
3a532a46bb
Fix compiler warning sketch/Marlin_main.cpp:5737:15: warning: unused variable 'area' [-Wunused-variable]
...
This variable was unused even in "Initial commit".
2018-07-24 17:17:44 +02:00
Marek Bel
97ec55b951
Fix compiler warning sketch/Marlin_main.cpp:4307:7: warning: unused variable 'Z_PROBE_FEEDRATE' [-Wunused-variable].
...
This variable was unused even in "Initial commit".
2018-07-24 17:07:21 +02:00
Marek Bel
8575645eec
Fix compiler warning: sketch/Marlin_main.cpp:4193:15: warning: statement has no effect [-Wunused-value]
...
fan_speed[1];
2018-07-24 16:56:56 +02:00
Marek Bel
9edb07afa5
Fix compiler warning sketch/Marlin_main.cpp:4218:10: warning: variable 'verbosity_level' set but not used [-Wunused-but-set-variable]
2018-07-24 16:54:12 +02:00
Marek Bel
219b98b7e1
Fix compiler warnings: sketch/Marlin_main.cpp: In function 'void setup()':
...
sketch/Marlin_main.cpp:1478:57: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
if ((farm_mode == 0xFF && farm_no == 0) || (farm_no == 0xFFFF)) farm_mode = false; //if farm_mode has not been stored to eeprom yet and farm number is set to zero or EEPROM is fresh, deactivate farm mode
^
sketch/Marlin_main.cpp:1479:17: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
if (farm_no == 0xFFFF) farm_no = 0;
^
2018-07-24 16:25:10 +02:00
Marek Bel
5ceece08f8
Fix compiler warning sketch/Marlin_main.cpp:1072:46: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
...
if ((state * LANGBOOT_BLOCKSIZE) < header.size)
2018-07-24 16:07:28 +02:00
Marek Bel
3811e30df9
Fix compiler warning: sketch/Marlin_main.cpp:1042:40: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
2018-07-24 16:04:19 +02:00
Marek Bel
0bde84983b
Fix compiler warning sketch/Marlin_main.cpp:798:6: warning: unused variable 'cursor_pos' [-Wunused-variable]
2018-07-24 15:47:39 +02:00
Marek Bel
fd3e0115b6
Fix compiler warning: sketch/ultralcd.cpp:7258:61: warning: integer overflow in expression [-Woverflow]
...
lcd_next_update_millis = millis() + (LCD_UPDATE_INTERVAL * 10000);
Use public interface instead of manipulating lcd_next_update_millis timer.
2018-07-24 15:20:03 +02:00
Marek Bel
6cf17fa760
Delete TMP file added accidentally by commit "timeout when waiting for mmu OK ".
2018-07-24 14:20:13 +02:00
PavelSindler
77cc55ed76
Merge pull request #951 from PavelSindler/use_timer
...
Use timer
2018-07-24 09:31:45 +02:00
PavelSindler
90b763775c
Merge pull request #966 from PavelSindler/MK3_for_merging
...
config for MK2.5 change
2018-07-23 21:13:22 +02:00
PavelSindler
e47656df97
config for MK2.5 change
2018-07-23 21:12:50 +02:00
PavelSindler
3fd705d763
Merge pull request #965 from PavelSindler/MK3_for_merging
...
config for MK25 Rambo1.0 changed
2018-07-23 21:09:46 +02:00
PavelSindler
e4641d3db4
config for MK25 Rambo1.0 changed
2018-07-23 21:09:07 +02:00
PavelSindler
064b8a4f24
Merge pull request #964 from MRprusa3d/MK3
...
PowerPanic & Sound III
2018-07-23 20:31:32 +02:00
PavelSindler
2d078f17b0
Merge pull request #963 from PavelSindler/MK3_for_merging
...
SUPPORT_VERBOSITY temporary solution
2018-07-23 20:12:05 +02:00
PavelSindler
f72f385c82
SUPPORT_VERBOSITY temporary solution
2018-07-23 20:11:16 +02:00
PavelSindler
d35124f637
Merge pull request #962 from PavelSindler/MK3_for_merging
...
config file updated
2018-07-23 20:06:35 +02:00
PavelSindler
c65efd0114
config file updated
2018-07-23 20:05:42 +02:00
Martin Remiš
c7d7389e27
PowerPanic & Sound
2018-07-23 20:04:47 +02:00
PavelSindler
2911b92b8f
Merge pull request #961 from mkbel/fix_compiler_warnings
...
Fix compiler warning arduino-1.6.9/hardware/tools/avr/avr/include/avr…
2018-07-23 20:00:28 +02:00
Marek Bel
e77a54034c
Fix compiler warning arduino-1.6.9/hardware/tools/avr/avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to <util/delay.h>." [-Wcpp]
2018-07-23 18:12:08 +02:00
PavelSindler
d347cdaf1a
Merge pull request #960 from XPila/MK3-new_lang
...
BOOTAPP support defined for EINSY
2018-07-23 17:32:08 +02:00
XPila
0659cf0287
Merge pull request #953 from PavelSindler/farm_mode_fix
...
G98 saves farm number
2018-07-23 17:31:42 +02:00
Robert Pelnar
6444573c92
BOOTAPP support defined for EINSY
...
W25x20CL test before entering optiboot (in some error cases it hangs in optiboot and then message not shown)
2018-07-23 17:14:18 +02:00
PavelSindler
87a9a721ee
Merge pull request #955 from mkbel/fix_compiler_warnings
...
Fix compiler warning arduino-1.6.9/hardware/tools/avr/avr/include/avr…
2018-07-23 15:15:24 +02:00
Robert Pelnar
4eb4924d81
Optiboot enabled
2018-07-23 14:41:10 +02:00
PavelSindler
b688bc9294
Merge branch 'MK3' into reapply_fix_compiler_warnings
2018-07-23 14:38:43 +02:00
PavelSindler
dcf3b792be
Merge pull request #948 from XPila/MK3-new_lang
...
FSensor - optical quality meassurement
2018-07-23 14:37:16 +02:00
Robert Pelnar
896734c06b
Display '!' instead of 'FR' on status screen when feedrate or acceleration limit reached.
2018-07-23 14:30:41 +02:00
Marek Bel
7cfa3156c7
Fix compiler warning arduino-1.6.9/hardware/tools/avr/avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to <util/delay.h>." [-Wcpp]
2018-07-23 13:47:15 +02:00
Marek Bel
88cce94cf9
Revert "Revert "Save 80B of flash and 8B of RAM and fix compiler warning:""
...
This reverts commit 77426b563a
.
2018-07-23 13:35:38 +02:00
Robert Pelnar
f0d939140b
Menu extruder info fixed
2018-07-23 12:54:48 +02:00
PavelSindler
1a9643c892
G98 saves farm no
2018-07-23 11:49:06 +02:00
PavelSindler
18419eefc4
no timeouts when communicating with mmu (temporarily ?)
2018-07-23 10:50:58 +02:00
PavelSindler
efd03b426f
final edits to fit changes on upstream
2018-07-23 09:14:22 +02:00
PavelSindler
565a6db3e4
use timer class
2018-07-22 16:26:12 +02:00
Robert Pelnar
60b4db15e0
FSensor - M600 fix + cond. translation + tunning filter and params
2018-07-22 16:14:13 +02:00
PavelSindler
5b6fb9e49b
Use Timer class for button blanking. Save 74B FLASH and 1B RAM.
2018-07-22 15:05:24 +02:00
Robert Pelnar
c6a3f073dd
FSensor - M600/autoload fix + optical quality meassurement
2018-07-21 17:04:29 +02:00
Robert Pelnar
612e83b473
max_feedrate and max_acceleration limitation (ConfigurationStore)
2018-07-21 12:33:29 +02:00
Robert Pelnar
f07d08697a
max_feedrate and max_acceleration limitation fix (M201, M203)
2018-07-21 12:24:57 +02:00
Robert Pelnar
980c044dac
FSensor - code cleaning
2018-07-21 01:57:41 +02:00
Robert Pelnar
2e260aeccc
FSensor - autoload fixed
2018-07-21 01:30:16 +02:00
Robert Pelnar
1309c52bcf
FSensor - code cleaning + simplification
...
+ removed DEBUG_DISABLE_FSENSORCHECK
+ added FILAMENT_SENSOR
2018-07-20 23:48:00 +02:00
Robert Pelnar
ca2d69271c
filament_autoload_enabled renamed to fsensor_watch_autoload
2018-07-20 20:37:50 +02:00
Robert Pelnar
328cae1147
Merge remote-tracking branch 'upstream/MK3' into MK3-new_lang
...
# Conflicts:
# Firmware/Marlin_main.cpp
2018-07-20 20:35:00 +02:00
Robert Pelnar
0f91bf9527
FSensor - optical quality meassurement durring load filament
2018-07-20 20:30:08 +02:00
PavelSindler
eac963e3a0
timeout prolonged
2018-07-20 18:03:52 +02:00
PavelSindler
80ca5f3d33
merge with upstream fixes
2018-07-20 17:51:44 +02:00
PavelSindler
a7e139ad8d
limist added to configuration files
2018-07-20 17:38:24 +02:00
PavelSindler
814572fed5
merge with upstream
2018-07-20 17:22:06 +02:00
PavelSindler
5fd1acaf81
Revert "PowerPanic"
2018-07-20 15:20:57 +02:00
PavelSindler
3c1f13377c
mmu first layer cal. status line message order changed
2018-07-20 14:58:36 +02:00
PavelSindler
cfe49a243a
first layer calibration: intitial version
2018-07-20 14:37:01 +02:00
Robert Pelnar
fd9b9acf4e
FSensor, code cleaning + optical quality meassurement
2018-07-20 14:03:22 +02:00
PavelSindler
b0ebea0c61
mmu: switching extruders simplified
2018-07-20 13:20:07 +02:00
MRprusa3d
bbec1ccfd4
Add files via upload
2018-07-20 04:34:12 +00:00
MRprusa3d
a09d44b869
PowerPanic
...
experimental
2018-07-20 04:47:33 +02:00
Robert Pelnar
5483bee885
FSensor - meassuring filament optical quality
2018-07-19 20:55:38 +02:00
PavelSindler
045cb5bb41
stop print for mmu initial version
2018-07-19 20:46:46 +02:00
PavelSindler
538f8a8858
Merge remote-tracking branch 'upstream/MK3' into snmm_v2
2018-07-19 20:27:51 +02:00
PavelSindler
231a6dcf1b
M600 for single material fix
2018-07-19 20:27:39 +02:00
PavelSindler
86882ae10a
M600 for snmm_v2 intial working version
2018-07-19 20:16:42 +02:00
Robert Pelnar
2a66251170
_DISABLE_M42_M226 removed
2018-07-19 19:33:28 +02:00
Robert Pelnar
fd0b7c25e5
TMC2130 speed and accel limitation (M201, M203) for stealth and normal mode
2018-07-19 19:12:46 +02:00
Robert Pelnar
2ce210a8bb
TMC2130 feedrate and acceleration limitation - separate profiles for normal and stealth mode
2018-07-19 18:56:01 +02:00
Robert Pelnar
c3e28b490c
TMC2130 old style limits removed
...
+menu draw_edit fix
2018-07-19 17:42:59 +02:00
Robert Pelnar
b46953c790
LCD menu optimalization - lcd_draw_edit removed
2018-07-19 16:57:31 +02:00
PavelSindler
5fecb7a2dc
M600
2018-07-19 16:17:46 +02:00
PavelSindler
3cb3ec9975
Merge pull request #940 from XPila/MK3-new_lang
...
Filament sensor tunning
2018-07-19 15:22:47 +02:00
Robert Pelnar
fa9d4550f0
PFW-448 menu items displaying fix
2018-07-19 15:21:46 +02:00
Robert Pelnar
42d2f31248
PFW-446 Stop print fix (recursion in lcd_update)
2018-07-19 14:23:45 +02:00
Robert Pelnar
6db1c6dc3b
Long press Move Z fixed
2018-07-19 13:54:56 +02:00
PavelSindler
7600848533
load to nozzle function, M600 work in progress
2018-07-19 13:14:29 +02:00
Robert Pelnar
afb9ca4687
FSensor - removed fsensor blocking while load, added filament quality meassurement
2018-07-18 17:45:54 +02:00
PavelSindler
2006ae58f1
typo fix
2018-07-18 16:54:40 +02:00
PavelSindler
5676550452
missing get response readded
2018-07-18 16:52:10 +02:00
PavelSindler
b9be718deb
timeout used everywhere where we are waiting for mmu reponse
2018-07-18 16:25:31 +02:00
PavelSindler
0a43b9ce6b
timeout when waiting for mmu OK
2018-07-18 16:17:45 +02:00
PavelSindler
6e760ef76d
merge with upstream cleanup
2018-07-18 15:34:33 +02:00
Robert Pelnar
2c06cb68d1
FSensor tunning - filtering changed, chunk length = 0.64mm and MAX_ERR = 10
2018-07-17 20:04:12 +02:00
Petr Ledvina
d3e9543fee
Fix undefined behaviour
...
Argument evaluation order is undefined
2018-07-17 19:12:48 +02:00
Petr Ledvina
48d6ebffd8
Fix code_seen
...
char/string version was mixed
2018-07-17 18:57:28 +02:00
Petr Ledvina
2af973bfba
Remove uninitialized variables
2018-07-17 18:57:28 +02:00
Petr Ledvina
3f17364589
Fix various warnings
2018-07-17 18:57:28 +02:00
Petr Ledvina
33bf363798
Fix st_get_position_mm
...
call it, do not index function pointer
2018-07-17 18:57:28 +02:00
Petr Ledvina
ef93de95d8
Fix int overflow
2018-07-17 18:57:28 +02:00
Petr Ledvina
ba8bcf76be
Use signed value where appropriate
2018-07-17 17:57:38 +02:00
Petr Ledvina
7bbf9953f2
Fix missing return warnings
2018-07-17 17:57:38 +02:00
Petr Ledvina
6cebf09b88
Fix operator priority
...
== has higher precedence to &, test was always false
2018-07-17 17:57:38 +02:00
Petr Ledvina
ceeb97f38c
Parentheses around macro argument
...
Not triggering error in this case
2018-07-17 17:57:38 +02:00
Petr Ledvina
baddf38dbc
Make card filename const
...
Fixes warning in filename_wldsd
2018-07-17 17:55:05 +02:00
Petr Ledvina
f2981bf322
Fix type coversion warnings in language.c
2018-07-17 17:55:05 +02:00
Petr Ledvina
d64754468a
Fix undefined function warnings
2018-07-17 17:55:05 +02:00
Petr Ledvina
fd332c1ff1
Fix ADC index overflow
...
Use bitmap bitcount to map pin number to adc_values array index. Old
code fails for TEMP_AMBIENT_PIN and VOLT_BED_PIN
2018-07-17 17:55:04 +02:00
Petr Ledvina
3f92630fd1
Fix setTargetHotend array overflow
...
Special function may be used instead (setTargetHotends(temp))
2018-07-17 17:55:04 +02:00
PavelSindler
33f9af65c8
merge with upstream/MK3
2018-07-17 16:36:53 +02:00
Robert Pelnar
64929a78f5
Linearity correction menu disabled
2018-07-17 13:35:04 +02:00
XPila
7bec5c6d5c
Merge branch 'MK3' into MK3-new_lang
2018-07-17 11:47:01 +02:00
PavelSindler
9e2985dfba
Revert "Use timer"
2018-07-17 11:38:38 +02:00
PavelSindler
77426b563a
Revert "Save 80B of flash and 8B of RAM and fix compiler warning:"
2018-07-17 11:28:44 +02:00
PavelSindler
85c37d1225
Merge branch 'MK3' into fix_compiler_warnings
2018-07-17 10:56:25 +02:00
PavelSindler
322978c920
Merge branch 'MK3_mk_prep' into MK3
2018-07-17 10:03:31 +02:00
PavelSindler
e1a71118f9
Merge pull request #917 from mkbel/use_Timer
...
Use timer
2018-07-17 09:57:56 +02:00
PavelSindler
eb3307e8fc
Merge pull request #889 from mkbel/fix_PRUSA_RESET
...
Do not skip bootloader when initiating reset by farm PRUSA RESET comm…
2018-07-17 09:52:41 +02:00
Robert Pelnar
2451455974
LCD menu optimalization - initial lcd update fix
2018-07-16 23:54:46 +02:00
Robert Pelnar
19a72ef9eb
LCD menu optimalization - LiquidCrystal_Prusa removed
2018-07-16 23:23:15 +02:00
PavelSindler
fddc02adfa
version changed
2018-07-16 21:01:40 +02:00
Robert Pelnar
d1de75eb19
LCD menu optimalization - createChar
...
+code order
2018-07-16 19:53:34 +02:00