PavelSindler
|
d005005e22
|
Merge remote-tracking branch 'upstream/3_4_2' into 3_4_2_branch_merging
|
2018-10-22 20:33:38 +02:00 |
|
PavelSindler
|
940f436a5f
|
merge MK3_dev into MK3
|
2018-10-22 20:25:29 +02:00 |
|
PavelSindler
|
bc247ca02c
|
MK2.5 sw reset at setup function
|
2018-10-19 17:54:48 +02:00 |
|
Robert Pelnar
|
ac18eb67c0
|
New lang, arduino 1.8.5 - boot_app debug output
+ variable _uartout linkage fix
+ DEBUG_DCODE5
|
2018-10-18 16:20:14 +02:00 |
|
Robert Pelnar
|
563052d015
|
New lang, arduino 1.8.5 - language.c - DEBUG_SEC_LANG fix
|
2018-10-18 15:39:08 +02:00 |
|
Robert Pelnar
|
868c79e835
|
New lang, arduino 1.8.5 - language.h - section names, messages.h - extern "C" added
|
2018-10-18 14:41:32 +02:00 |
|
PavelSindler
|
b8f92fdfa9
|
MK2.5 printers set mmu to stealth mode (using Mx code), required mmu2 buildnr can be different for MK2.5 and MK3 printers
|
2018-10-18 02:44:16 +02:00 |
|
mkbel
|
0d9b502937
|
Merge pull request #1246 from PavelSindler/variants_max
MK3: default max feedrate for x and y changed to 100mm/s
|
2018-10-10 16:46:34 +02:00 |
|
PavelSindler
|
bbd4f70f41
|
Merge pull request #1221 from XPila/MK3
Update fsensor in Manage_inactivity instead of main loop.
|
2018-10-10 13:12:12 +02:00 |
|
PavelSindler
|
866d6758c3
|
Merge pull request #1243 from mkbel/simplify_EEPROM_M500
Simplify eeprom m500
|
2018-10-10 13:11:17 +02:00 |
|
Marek Bel
|
9dff6431e6
|
Format fsensor documentation.
|
2018-10-09 22:33:54 +02:00 |
|
PavelSindler
|
809ae5a5f0
|
default max feedrate for x and y changed to 100mm/s
|
2018-10-09 20:03:28 +02:00 |
|
Marek Bel
|
9cae0c378a
|
Rename _EEPROM_writeData to EEPROM_writeData. Rename _EEPROM_readData to EEPROM_readData. Add return value to EEPROM_writeData to detect failure to write. Do not mark data as valid, if write has failed. Remove EEPROM_WRITE_VAR and EEPROM_READ_VAR macros. Make pos input only parameter. Convert EEPROM_OFFSET macro to typed constatant EEPROM_M500_base, it was defined in two places, leave it in one place. Use Config_StoreSettings() instead of erase_eeprom_section(). Compare float with 0xff byte by byte to avoid compiler warning "Dereferencing type punned pointer will break strict aliasing rules."
|
2018-10-08 20:24:56 +02:00 |
|
PavelSindler
|
c91c878408
|
Merge pull request #1202 from MRprusa3d/PFW-573
preHeatError
|
2018-10-08 16:12:33 +02:00 |
|
Marek Bel
|
1585dc66b0
|
Merge remote-tracking branch 'prusa3d/MK3_dev' into simplify_EEPROM_M500
Known limitation: Unable to compile.
|
2018-10-08 15:58:49 +02:00 |
|
Marek Bel
|
c77672bf0f
|
PFW-608 Decrease wear of mass erase EEPROM and do it faster.
|
2018-10-05 18:11:26 +02:00 |
|
PavelSindler
|
436f5b5728
|
changed version
|
2018-10-04 17:40:38 +02:00 |
|
PavelSindler
|
d2aa13d333
|
Merge pull request #1199 from mkbel/document_gcodes1
Documentation: Put scattered and unscattered Gcode documentation toge…
|
2018-10-04 16:29:39 +02:00 |
|
Robert Pelnar
|
9960c80bf7
|
Additional check always with enabled oq_meassure
+ variant files
|
2018-10-04 16:12:41 +02:00 |
|
Robert Pelnar
|
f9d8c46802
|
Enable/disable optical quality meassurement in settings menu
|
2018-10-04 15:48:28 +02:00 |
|
Robert Pelnar
|
ced74b7ec2
|
Merge remote-tracking branch 'upstream/MK3' into MK3
|
2018-10-04 13:53:00 +02:00 |
|
Robert Pelnar
|
7882b3c975
|
Update fsensor in Manage_inactivity instead of main loop.
|
2018-10-03 17:29:24 +02:00 |
|
PavelSindler
|
3a58489c6a
|
Merge pull request #1169 from mkbel/remove_duplicate_debouncing_4
Remove duplicate debouncing 4
|
2018-10-02 11:21:17 +02:00 |
|
PavelSindler
|
bba1ffdb65
|
version change
|
2018-09-27 21:13:06 +02:00 |
|
PavelSindler
|
aefb4e5c09
|
Merge pull request #1200 from XPila/MK3
Filament sensor - fix invalid calculation of fsensor_counter in LA st…
|
2018-09-27 21:05:33 +02:00 |
|
Robert Pelnar
|
e50025cc7d
|
static_assert - portable solution compatible with C++98
|
2018-09-27 19:59:29 +02:00 |
|
PavelSindler
|
7e9220ada2
|
Merge pull request #1198 from PavelSindler/communication_timeouts
communication timeouts fix
|
2018-09-27 11:23:58 +02:00 |
|
MRprusa3d
|
0184f06dcf
|
preHeatError
correction of preHeatError detection
|
2018-09-27 04:23:00 +02:00 |
|
Robert Pelnar
|
c2f535b619
|
Filament sensor - fix invalid calculation of fsensor_counter in LA stepper.
+decreased additional check sensitivity/sctrictness
|
2018-09-26 18:59:07 +02:00 |
|
Marek Bel
|
0e33db0064
|
Documentation: Put scattered and unscattered Gcode documentation together in process_commands documentation. Mention at least existence of all implemented commands. Document T<n> and T? commands.
|
2018-09-26 18:55:31 +02:00 |
|
PavelSindler
|
e6a00b8f53
|
send busy messages when checking for filament presence
|
2018-09-25 19:14:57 +02:00 |
|
Marek Bel
|
4151e19781
|
Remove attribute packed. It is not needed on 8-bit platform. Change of platform would be detected by static_assert (sizeof(M500_conf) == 188).
|
2018-09-25 16:27:20 +02:00 |
|
Marek Bel
|
d80fcab66c
|
Disable filament sensor response quality check.
|
2018-09-25 15:50:50 +02:00 |
|
Marek Bel
|
19c1ba6274
|
Remove duplicate condition. This condition was already in if(mmu_enabled) {} else branch.
|
2018-09-25 14:25:03 +02:00 |
|
Marek Bel
|
ccfcc6f989
|
Document.
|
2018-09-24 18:32:01 +02:00 |
|
Marek Bel
|
3662f60f8f
|
if max_feedrate_silent and max_acceleration_units_per_sq_second_silent were never stored to eeprom, use default values;
|
2018-09-24 18:13:20 +02:00 |
|
Marek Bel
|
c38fef281d
|
Use cs.max_feedrate_silent, cs.max_acceleration_units_per_sq_second_silent from ConfigurationStore.
|
2018-09-24 17:33:58 +02:00 |
|
Marek Bel
|
ca179a2d18
|
Use cs.filament_size from ConfigurationStore.
|
2018-09-24 17:29:02 +02:00 |
|
Marek Bel
|
e225e9cab0
|
Use cs.volumetric_enabled from ConfigurationStore.
|
2018-09-24 17:12:16 +02:00 |
|
Marek Bel
|
a201128b20
|
Use cs.retract_length, cs.retract_feedrate, cs.retract_zlift, cs.retract_recover_length and cs.retract_recover_feedrate from ConfigurationStore.
|
2018-09-24 17:10:25 +02:00 |
|
Marek Bel
|
7e593e6922
|
Use cs.autoretract_enabled from ConfigurationStore.
|
2018-09-24 17:03:10 +02:00 |
|
Marek Bel
|
20ba2b1c79
|
Use cs.bedKp, cs.bedKi and cs.bedKd from ConfigurationStore.
|
2018-09-24 16:57:48 +02:00 |
|
Marek Bel
|
54bcc8aa52
|
Use cs.Kp, cs.Ki and cs.Kd from ConfigurationStore.
|
2018-09-24 16:54:50 +02:00 |
|
Marek Bel
|
f2ae3fb1f7
|
Use cs.zprobe_zoffset from ConfigurationStore.
|
2018-09-24 16:47:57 +02:00 |
|
Marek Bel
|
959d0069fa
|
Use cs.add_homing from ConfigurationStore.
|
2018-09-24 16:42:28 +02:00 |
|
Marek Bel
|
ac7c062161
|
Use cs.max_jerk from ConfigurationStore.
|
2018-09-24 16:35:33 +02:00 |
|
Marek Bel
|
bb66bfe6a7
|
Use cs.minsegmenttime from ConfigurationStore.
|
2018-09-24 16:22:50 +02:00 |
|
mkbel
|
0e7afc67ca
|
Merge pull request #1175 from PavelSindler/eeprom_version
M500 EEPROM version update and M500 EEPROM block size check
|
2018-09-24 16:19:55 +02:00 |
|
Marek Bel
|
10428b30d9
|
Use cs.mintravelfeedrate from ConfigurationStore.
|
2018-09-24 16:01:58 +02:00 |
|
PavelSindler
|
cd438c5c00
|
whitespace
|
2018-09-24 16:01:31 +02:00 |
|
PavelSindler
|
740e922b87
|
EEPROM M500 block size check for reading stored data added
|
2018-09-24 16:00:23 +02:00 |
|
Marek Bel
|
26e2fd1c76
|
Use cs.minimumfeedrate from ConfigurationStore.
|
2018-09-24 15:57:24 +02:00 |
|
Marek Bel
|
b8fefceb4d
|
Use cs.retract_acceleration from ConfigurationStore.
|
2018-09-24 15:53:35 +02:00 |
|
Marek Bel
|
7dbe0afdc4
|
Use cs.acceleration from ConfigurationStore.
|
2018-09-24 15:47:36 +02:00 |
|
Marek Bel
|
cee51cf9c3
|
Use cs.max_acceleration_units_per_sq_second_normal from ConfigurationStore.
|
2018-09-24 15:40:35 +02:00 |
|
Marek Bel
|
02becb5e6a
|
Use cs.max_feedrate_normal from ConfigurationStore.
|
2018-09-24 15:09:19 +02:00 |
|
PavelSindler
|
053b94b711
|
remove "start" duplicity in setup
|
2018-09-24 14:57:46 +02:00 |
|
Marek Bel
|
3f28632443
|
Use cs.axis_steps_per_unit from ConfigurationStore.
|
2018-09-24 14:54:41 +02:00 |
|
Marek Bel
|
d611cad087
|
Temporary hide M500_conf cs to allow automated renaming.
|
2018-09-24 14:42:01 +02:00 |
|
Marek Bel
|
e94dc1341a
|
Use M500_conf cs in Config_ StoreSettings, RetrieveSettings and ResetDefault.
|
2018-09-24 14:34:43 +02:00 |
|
Marek Bel
|
991db0e71d
|
Finish default_conf.
|
2018-09-23 23:36:01 +02:00 |
|
Marek Bel
|
d9e2dcc736
|
Incomplete.
|
2018-09-23 22:21:28 +02:00 |
|
Marek Bel
|
58af1ae4c4
|
Add configuration store struct.
|
2018-09-21 20:52:44 +02:00 |
|
PavelSindler
|
d8dc2eef7a
|
if max_feedrate_silent and max_acceleration_units_per_sq_second_silent were never stored to eeprom, use default values; eeprom_version changed back to V2
|
2018-09-21 15:42:28 +02:00 |
|
PavelSindler
|
1c33b673c0
|
comment update
|
2018-09-19 18:43:27 +02:00 |
|
PavelSindler
|
3d57d504ba
|
Merge pull request #1174 from mkbel/fix_runout_resume
Fix runout resume
|
2018-09-19 18:29:32 +02:00 |
|
Marek Bel
|
2607a0c4ed
|
Update documentation.
|
2018-09-19 17:22:06 +02:00 |
|
Marek Bel
|
b92b307ee8
|
Make variables constant.
|
2018-09-19 17:21:45 +02:00 |
|
Marek Bel
|
cce8131070
|
Add missing s for seconds of print time.
|
2018-09-19 17:20:41 +02:00 |
|
Marek Bel
|
b5bb40474d
|
Fix print time overflow.
|
2018-09-19 17:17:32 +02:00 |
|
PavelSindler
|
0a5394a20e
|
defines moved to eeprom.h
|
2018-09-19 15:10:10 +02:00 |
|
PavelSindler
|
752aec37fb
|
M500 EEPROM version changed; if EEPROM_M500_SIZE is not updated, data are not stored
|
2018-09-19 14:36:26 +02:00 |
|
Marek Bel
|
9868dd766e
|
Fix print not recovered when filament sensor is disabled during filament change initiated by filament run out.
|
2018-09-19 14:22:08 +02:00 |
|
Marek Bel
|
a5a7b1f1d6
|
Move functions definitions behind variable definitions. (No change in functionality.)
|
2018-09-19 14:08:31 +02:00 |
|
Marek Bel
|
05d3b7032d
|
Update documentation.
|
2018-09-18 17:48:11 +02:00 |
|
Marek Bel
|
a7fdfdd258
|
Put repetitive code into separate function. No change in functionality.
|
2018-09-18 17:15:13 +02:00 |
|
Marek Bel
|
6ee97468ee
|
Remove lcd_buttons_update() call from all other places than interrupt. There is no known reason, why lcd_buttons_update() should be called from multiple places and multiple contexts. Remove mutex, which is not needed anymore, and wasn't implemented properly anyway (Operation was not atomic.).
|
2018-09-18 16:05:49 +02:00 |
|
Marek Bel
|
f532da4b17
|
Remove duplicate button debouncing code. Save 254B flash.
|
2018-09-18 14:39:01 +02:00 |
|
Marek Bel
|
90a10a692a
|
Enable button debouncing also in modal mode (!lcd_update_enabled). In lcd_clicked() consume click event immediately.
|
2018-09-18 14:38:50 +02:00 |
|
Marek Bel
|
ab2d350ed1
|
Don't enable lcd update in lcd_show_fullscreen_message_and_wait_P(). Don't show menu in wizard when ejecting filament.
|
2018-09-17 21:23:13 +02:00 |
|
Marek Bel
|
a687b8e64a
|
Don't enable lcd update inside mmu_eject_filament().
|
2018-09-17 17:12:36 +02:00 |
|
Marek Bel
|
f496076508
|
Remove redundant code. No change in functionality.
|
2018-09-14 18:33:03 +02:00 |
|
Marek Bel
|
635a1b4cd8
|
Add possibility to to select preheat temperature when unloading filament in first layer calibration wizard.
Known limitations:
During filament eject, menu is shown for some moment.
|
2018-09-14 18:29:14 +02:00 |
|
Marek Bel
|
fe30e58fb5
|
Add possibility to unload filament from wizard before first layer calibration, if it is not PLA.
Known limitations:
Preheat temperature other than PLA can not be selected.
During filament eject, menu is shown for some moment.
|
2018-09-14 16:06:25 +02:00 |
|
Marek Bel
|
d14822b22f
|
Give wizard states human readable names. Use uint8_t as underlying type - saves 20B of FLASH memory.
|
2018-09-13 16:37:41 +02:00 |
|
Marek Bel
|
8235f0f869
|
Merge branch 'MK3_dev' into add_cancel
|
2018-09-12 19:38:26 +02:00 |
|
Marek Bel
|
7bc46323e2
|
Update pause print documentation.
|
2018-09-12 18:35:26 +02:00 |
|
Marek Bel
|
de2100ac7b
|
Merge branch 'MK3' into MK3_dev
|
2018-09-12 15:22:12 +02:00 |
|
PavelSindler
|
0d4f4fe933
|
Merge pull request #1143 from PavelSindler/lang2
lang fix
|
2018-09-12 09:38:18 +02:00 |
|
PavelSindler
|
45066ebddc
|
lang fix
|
2018-09-12 09:37:16 +02:00 |
|
PavelSindler
|
30d54be9de
|
Merge pull request #1142 from PavelSindler/lang2
changed version
|
2018-09-12 09:20:32 +02:00 |
|
PavelSindler
|
298950e601
|
changed version
|
2018-09-12 09:19:23 +02:00 |
|
Robert Pelnar
|
3e84bf6341
|
Lang update (translation + increased reserved space)
|
2018-09-12 02:45:13 +02:00 |
|
Marek Bel
|
13b67f0e0a
|
Add Cancel item into PLA filament selection menu initiated by first layer calibration with MMU.
|
2018-09-11 22:33:13 +02:00 |
|
Marek Bel
|
ada7cffd32
|
Open menu to select filament before first layer calibration if MMU unit is present.
|
2018-09-11 19:53:29 +02:00 |
|
PavelSindler
|
96aada9061
|
load filament messages, czech language missing translation readded
|
2018-09-11 18:25:38 +02:00 |
|
Marek Bel
|
5649d6c3c0
|
Precede active filament on status screen with letter F.
|
2018-09-11 17:27:10 +02:00 |
|
Marek Bel
|
98264808dc
|
Change gcode "T?" question from "Choose extruder:" to "Choose filament" and answers from "Extruder 1" .. "Extruder 5" to "Filament 1" .. "Filament 5".
|
2018-09-11 17:16:13 +02:00 |
|
Marek Bel
|
46df46f482
|
Add possibility to use other filaments in LCD_COMMAND_V2_CAL.
|
2018-09-11 17:03:20 +02:00 |
|
Marek Bel
|
19a1ccdc76
|
Rename choose_extruder_menu() to choose_menu_P(), add parameters to make it reusable.
|
2018-09-11 16:51:00 +02:00 |
|