e3c006dbe9
Serial communication uses port0 or port1, not both, removed some suspected code.
...
build 141
2017-12-29 00:06:47 +01:00
f71f133e80
power panic polished
...
Retraction set correctly to have minimum missing line
Z motor current not lowered that drascialy
Extruder motor turning off instantly
Beeping added to the end
2017-12-28 23:26:06 +01:00
f1c741d027
Filament autoloading improved and minor tweaks
...
Filament autoloading now acts like normal loading (Error message pops out if nozzle too cold, Printer asks if should extrude more when done loading)
Autoloading now unable to turn on when filament sensor is turned off or not responding
Color not right changed to color not correct to avoid slight confusion
2017-12-28 18:59:57 +01:00
26255766f6
Translation fix
...
on -> zap
off -> vyp
2017-12-28 15:55:16 +01:00
5e5588c72c
Text grooming
...
Added language mutations of error messages, menu items.
Synced wording of crash detection in messages.
rPi port -> RPi port.
Minor menu items alignment.
2017-12-28 15:45:52 +01:00
bd58718d9d
dummy "ok" response
...
build 139 (RC4)
2017-12-28 02:45:05 +01:00
e064133a04
Merge remote-tracking branch 'upstream/MK3' into MK3
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2017-12-28 01:37:13 +01:00
69d496e157
autoload filament menu (PFW-95, PFW-96)
2017-12-27 21:57:51 +01:00
cbd7f033e8
crashdetection and mode menu (PFW-85, PFW-97)
2017-12-27 21:43:04 +01:00
546314fda7
Removed debug messages from serial comunication (octoprint...).
...
build 137b
2017-12-27 20:29:24 +01:00
f9d5619682
MINTEMP safety for ambient temperature < 18C
...
Silent mode acceleration limit lowered to 1000mm/s^2
2017-12-27 18:20:04 +01:00
a09dee7aea
build 138 (RC3)
2017-12-23 03:44:47 +01:00
23ed33fc21
disable crashdetection while usb printing
2017-12-23 03:42:19 +01:00
8739b4a610
MINTEMP fix
2017-12-23 03:36:08 +01:00
1a69c979bf
Increase Z current (PFW-90).
2017-12-23 01:01:57 +01:00
8f7a50cfcd
Merge pull request #343 from PavelSindler/m110_fix
...
M110 fix
2017-12-23 00:04:11 +01:00
e8477b525c
initial version of M110 fix (port from MK2)
2017-12-22 22:34:57 +01:00
257b8e9f59
Merge pull request #342 from XPila/MK3
...
Mk3 - RC3
2017-12-22 20:35:15 +01:00
c4b045083c
Extrude mintemp increased to 190C
2017-12-22 20:34:24 +01:00
7f05b9fd44
changed menu order (PFW 91)
2017-12-22 20:31:45 +01:00
6abba7bfe9
filament autoload - better detection algorithm, autoload in M600 from menu
...
unload menu always visible
2017-12-22 20:14:26 +01:00
7114772784
whitespace
2017-12-22 19:23:11 +01:00
3aca1271ed
serial resend request always contains OK
2017-12-22 18:54:55 +01:00
6f7a2ba263
Merge pull request #340 from PavelSindler/MK3_for_merging
...
removed some serial line error messages
2017-12-22 13:35:33 +01:00
1917b6a1d7
removed some serial line error messages which caused that octoprint changed status
2017-12-22 13:27:04 +01:00
33d715616f
Merge pull request #339 from PavelSindler/MK3_for_merging
...
setup function
2017-12-21 13:42:22 +01:00
71bb4022dc
setup function
2017-12-21 13:40:16 +01:00
3ddbac6056
LCD_PWM removed (will be solved other way)
2017-12-21 01:00:49 +01:00
f227952c0b
Merge branch 'MK3' into MK3
2017-12-21 00:07:01 +01:00
b8fd058749
selftest fix
2017-12-21 00:03:41 +01:00
17d9bb205a
selftest tests filament sensor, selftest messages have language variants
2017-12-20 23:40:18 +01:00
eba2924fdd
Remove load/unload menu when autoload enabled
2017-12-20 22:55:11 +01:00
a3a0e70eeb
Fsensor autoload enabled menu and eeprom variable
2017-12-20 22:29:41 +01:00
c88938e813
Fixed blocked lcd buttons
...
build = 137y
2017-12-20 21:33:07 +01:00
25dd6dd673
new module adc (analog2digital)
...
temperature.cpp - adc sampling state machine removed
new dcode D9 (adc read/write + simulator)
temporarily DEBUG_DISABLE_STARTMSGS because UI blocked
SILENT_MAX_FEEDRATE reduced to 172mm/s
hexfile removed
build number 137x
2017-12-20 13:42:20 +01:00
a9d5af4a07
Wizard: dont ask if color is clear and dont use automatic filament load; multiscreen messages update
2017-12-20 13:33:45 +01:00
525d022841
whitespace
2017-12-18 19:17:39 +01:00
31add2e69f
removed 4 bytes from maiden eeprom check as these could be set earlier to 0 by lcd_status_screen function
2017-12-18 19:15:36 +01:00
9639b58f4d
Merge pull request #329 from XPila/MK3
...
Meassuring voltages (pwr, bed), voltages menu
2017-12-15 18:42:59 +01:00
01654e7145
Meassuring voltages (pwr, bed), voltages menu
2017-12-15 18:33:35 +01:00
ecbb5cf54b
selftest fix
2017-12-15 17:54:52 +01:00
dd1eddb1cb
Merge pull request #327 from XPila/MK3
...
Removed SG software homming
2017-12-15 14:13:00 +01:00
c6e10fb903
Removed SG software homming
...
After Calibration Z enabled minstop (SG and PINDA)
TMC2130 code simplification
2017-12-15 14:10:20 +01:00
3c95bea693
threshold changed
2017-12-15 14:07:12 +01:00
5daf53f35b
version changed
2017-12-15 11:55:37 +01:00
893f34fd85
watchdog reset
2017-12-14 20:28:07 +01:00
011ebb3675
selftest is checking if fans are swapped, host keepalive messages added
2017-12-14 19:36:32 +01:00
7304579ca5
build 135
2017-12-13 23:19:51 +01:00
ca55cf74e2
Merge remote-tracking branch 'upstream/MK3' into MK3
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2017-12-13 22:58:34 +01:00
66e279b41c
Autoload filament - fsensor error couter reset when switched.
2017-12-13 18:12:05 +01:00
356bc403b1
Automatic filament load when printer idle and preheated
2017-12-13 17:39:32 +01:00
cdeb835b5d
Failstat couters initialization
...
build number = 131
2017-12-12 23:37:31 +01:00
bbd8dc3191
Merge pull request #315 from XPila/MK3
...
new ambient thermistor table
2017-12-12 22:51:02 +01:00
7e00248060
new ambient thermistor table
...
MINTEMP_MINAMBIENT
2017-12-12 22:49:47 +01:00
00a029ac7f
bed maxtemp = 125
2017-12-12 21:28:14 +01:00
fde0efc75c
power panic for absolute E coordinates: initial version
2017-12-12 21:20:59 +01:00
c1416cbb33
Merge pull request #312 from PavelSindler/wizard
...
Wizard: force high power mode during xyz cal. and selftest; wizard for assembled printer
2017-12-12 20:24:15 +01:00
82dffb688a
force high power mode during xyz cal. and selftest
2017-12-12 20:21:09 +01:00
997c8de161
shipping prep. reset sets wizard flag, shipping prep wizard improvements
2017-12-12 19:17:37 +01:00
5b314d0829
second serial active address in eeprom redefined
2017-12-12 17:18:06 +01:00
f8e3c76315
merging new changes from upstream/MK3
2017-12-12 17:14:48 +01:00
86418eed2d
Merge pull request #311 from XPila/MK3
...
Ambient thermistor - new table (PFW-71)
2017-12-12 15:46:16 +01:00
0271da3c67
Ambient thermistor - new table (PFW-71)
...
Crashdetection disable durring print (PI3M3-42)
Stealth mode - better limit values (PI3M3-5)
2017-12-12 15:44:42 +01:00
1ef5543a2a
dont sort files when print is finished
2017-12-12 15:26:48 +01:00
a724c2664c
menus updated, set lcd_commands_step = 0;
2017-12-12 14:25:13 +01:00
9ef5570fa3
menus accessable during first layer calibration updated
2017-12-12 13:41:31 +01:00
d29a95bd65
if first layer calibration is active set SD_PRINTING to true
2017-12-12 11:41:54 +01:00
7204e91ec6
Filament sensor not responding - (PFW-41)
...
build number = 130
2017-12-11 18:17:25 +01:00
124a3e6da8
Stealth mode limits + END_FILE_SECTION=10000
2017-12-11 16:17:36 +01:00
20de899d25
Merge branch 'MK3' into sort_files
2017-12-11 11:50:47 +01:00
c9f95628d0
changed version
2017-12-11 11:49:40 +01:00
13a17f9fd4
dont sort files when changing sort type in settings menu
2017-12-11 11:45:20 +01:00
1c61f2f29c
First working version
2017-12-11 11:30:49 +01:00
c708f63803
build 128
2017-12-11 00:01:47 +01:00
b76758b7b6
Ram status - heap and stack monitor.
2017-12-10 23:45:46 +01:00
e8b2043d03
Stack monitor in stepper ISR
2017-12-10 20:38:09 +01:00
26135ea227
all sd sort files: initial version; sorting type switch not added to SD card menu itself
2017-12-10 11:08:50 +01:00
9dba7dcd1f
DISABLE_M42_M226 = +56 bytes RAM (because of stack overflow)
...
build 127
2017-12-09 19:31:27 +01:00
995801c967
Silent mode limits
...
+ cannot compile "END_FILE_SECTION"
2017-12-09 14:41:50 +01:00
82f5a79527
bug fix (cannot compile) - ultralcd.cpp - conversion from (const char*)
2017-12-08 19:22:02 +01:00
00945cf7c3
version changed
2017-12-08 16:59:45 +01:00
868aacc7d5
turn on second serial line from settings menu
2017-12-08 16:56:06 +01:00
07aa7a3803
support two serial lines at the same time
2017-12-07 19:14:17 +01:00
d0b6b19373
save filename to eeprom first, then check if file is complete
2017-12-07 17:16:23 +01:00
b5ad41b8af
build number
2017-12-06 18:28:08 +01:00
2cbd1f7894
fix: added saving filename to eeprom which was removed by accident
2017-12-06 18:13:54 +01:00
071873b38a
init; last merged file: Marlin_main.cpp
2017-12-06 17:48:16 +01:00
40b7a5c82f
build number changed
2017-12-06 14:59:26 +01:00
44218a1b53
incomplete file check ported from MK2: initial version
2017-12-06 14:55:53 +01:00
443dc53145
Merge pull request #292 from XPila/MK3
...
Automatic filament load in M600
2017-12-05 18:38:23 +01:00
58f8fdb51b
Automatic filament load in M600
2017-12-05 18:37:03 +01:00
bc0278c6e1
build number changed
2017-12-05 17:13:07 +01:00
d7db407f32
xyz cal.: add delay_keep_alive messages to reset watchdog (LS optimization method takes more than 4s in some cases)
2017-12-05 13:16:59 +01:00
22065e4877
merging from dev/MK3
2017-12-02 21:56:39 +01:00
0de584c213
bugfix UVLO - extruder position from stepper
2017-11-29 02:08:15 +01:00
a56b0ccaf8
bugfix - Filament sensor enable from menu
2017-11-29 00:15:45 +01:00
9413eca52c
UVLO recover E absolute mode
...
build number 119
2017-11-28 23:41:58 +01:00
13f1684a4c
build 118
2017-11-28 22:53:51 +01:00
1da1eaea01
Merge pull request #117 from PavelSindler/m600
...
M600: wait for user before unloading filament
2017-11-28 22:45:57 +01:00
1863819e39
pat9125 reinit when fsensor enabled from menu.
2017-11-28 22:44:58 +01:00
020a7ec257
unload filament can be repeated
2017-11-28 19:04:43 +01:00
059c255a35
changed build version to b117
2017-11-28 18:31:38 +01:00
c0112f05e1
M600: wait for user before unloading filament
2017-11-28 18:28:53 +01:00
2cf7f54e5f
changed build
2017-11-27 20:29:47 +01:00
3f7be78997
translation to Czech language added
2017-11-27 18:54:44 +01:00
bd748bc986
EINY -> EINSY
2017-11-27 18:47:48 +01:00
211725c946
dont show temp cal message, dont save uvlo flag to eeprom if printing from USB
2017-11-27 18:30:16 +01:00
ddc8587bbd
Merge pull request #112 from PavelSindler/menu_corrections
...
Menu corrections, translation to Czech language
2017-11-27 18:00:31 +01:00
ce3f14e1c0
tune menu updated
2017-11-27 17:55:32 +01:00
67a2e0a706
settings menu updated
2017-11-27 17:01:01 +01:00
f075711e64
corrected menus
2017-11-27 16:37:46 +01:00
7c6d63ffb5
pla preheat temp. changed, temp calibration on/off moved to settings menu
2017-11-27 16:21:54 +01:00
044ed951cb
translations to czech language and menu corrections: initial version
2017-11-27 16:06:34 +01:00
7c8de94778
filament unload - initial
...
lower currents for power panic
2017-11-27 15:54:36 +01:00
533418d63e
opravene nezadouci resetovani watchdogem
...
powerpanic Z shift = 0.64mm (misto 1.92mm)
teplotni kompenzace default = ON
2017-11-27 14:43:56 +01:00
25c16cc835
Extrudser info, merge upstream (powerpanic fix)
...
build number = 114
2017-11-27 07:44:12 +01:00
60930beb52
Merge pull request #108 from PavelSindler/power_panic
...
Power panic works with folders
2017-11-27 07:27:17 +01:00
1113124bde
PINDA calibration and precalibrated characteristics.
2017-11-27 07:09:53 +01:00
d9f44eb16b
unused code commented
2017-11-27 06:36:41 +01:00
bd59e11660
removed serial print
2017-11-27 06:22:32 +01:00
42b533b5d8
first working version
2017-11-27 06:20:51 +01:00
3b892e16d8
Merge branch 'MK3' into MK3
2017-11-27 04:49:23 +01:00
4dae6f871e
Sg load meassurement durring self test - 'Belt status'
2017-11-27 04:46:58 +01:00
a40c759ee7
First run: show calibration status messages in case that user refused to use wizard
2017-11-27 02:03:42 +01:00
5a77113fb5
init
2017-11-27 01:59:47 +01:00
24195557ea
removed redundant line
2017-11-27 01:24:58 +01:00
a7b40d43e3
timeouting to status in the end of first layer cal.
2017-11-27 01:23:11 +01:00
7de187d813
if user dont confirm live adjust Z by pressing the knob, save last live adjust value to eeprom
2017-11-27 00:17:45 +01:00
4c7cc5520e
"confirm nozzle clean" message re-added
2017-11-26 21:26:36 +01:00
856d8c1be9
Merge pull request #103 from PavelSindler/print_menu_fix
...
Print menu fix
2017-11-26 20:58:32 +01:00
a61964666e
whitespace and minor corrections
2017-11-26 20:57:28 +01:00
626818f87d
removed debug messages
2017-11-26 20:53:09 +01:00
d8bf148996
manage heater added
2017-11-26 20:51:56 +01:00
4297a98fdd
debuging messages
2017-11-26 19:10:38 +01:00
efba30b77e
Merge pull request #102 from XPila/MK3
...
Fixed bug - unload filament restarts the printer.
2017-11-26 17:20:40 +01:00
e5fee387db
Fixed bug - unload filament restarts the printer.
2017-11-26 17:14:39 +01:00
e605305db4
build number changed
2017-11-24 23:01:53 +01:00
38c1ea7867
Merge pull request #101 from PavelSindler/wizard
...
Wizard and mesh bed leveling messages
2017-11-24 22:58:16 +01:00
05348a33db
wizard: dont update lcd when loading filament
2017-11-24 22:55:47 +01:00
25b0b0b381
Merge pull request #100 from XPila/MK3
...
Fsensor synchronization and triggering improved
2017-11-24 22:03:55 +01:00
f2e9bdef24
Fsensor synchronization and triggering improved
...
Watchdog implemented (4s interval, triggered from manage_heater)
Stallguard sensitivity for XY decreased by 1
Extruder current adjusted to 5.5kg force
Build number = 111
2017-11-24 21:53:35 +01:00
171dc707fa
improve mesh bed leveling messages
2017-11-24 20:18:11 +01:00
4b644a58ae
block of gcodes changed to avoid full buffer during v2 cal.
2017-11-23 18:22:00 +01:00
79c221d6c0
Merge pull request #97 from PavelSindler/wizard
...
show live adjust Z option in main menu during First layer cal.
2017-11-23 15:59:03 +01:00
2170c1bbe7
timeout to status prolonged, no timeout allowed when MSG_WIZARD_RERUN
2017-11-23 15:46:10 +01:00
ba1bb4aea3
whitespace
2017-11-22 19:18:32 +01:00
6d0574dd0f
changed Y_MIN and probe points coordinates
2017-11-22 19:13:34 +01:00
6bd221ad3b
Y distance between nozzle and PINDA corrected
2017-11-22 16:07:03 +01:00
7d825de214
show live adjust Z option in main menu when running First layer calibration
2017-11-22 11:18:39 +01:00
213ee43cc9
Merge usptream
...
Crashdetection fixed
pl language removed (because of low flash capacity)
build number = 110
2017-11-22 08:41:52 +01:00
Robert Pelnar
Michal Průša
PavelSindler
PavelSindler