Commit Graph

727 Commits

Author SHA1 Message Date
PavelSindler
6f7a2ba263
Merge pull request #340 from PavelSindler/MK3_for_merging
removed some serial line error messages
2017-12-22 13:35:33 +01:00
PavelSindler
1917b6a1d7 removed some serial line error messages which caused that octoprint changed status 2017-12-22 13:27:04 +01:00
PavelSindler
33d715616f
Merge pull request #339 from PavelSindler/MK3_for_merging
setup function
2017-12-21 13:42:22 +01:00
PavelSindler
71bb4022dc setup function 2017-12-21 13:40:16 +01:00
XPila
18e662bd7c
Merge pull request #338 from XPila/MK3
LCD_PWM removed (will be solved other way)
2017-12-21 01:04:08 +01:00
Robert Pelnar
3ddbac6056 LCD_PWM removed (will be solved other way) 2017-12-21 01:00:49 +01:00
PavelSindler
bb6c8703e8
Merge pull request #335 from XPila/MK3
Mk3
2017-12-21 00:08:59 +01:00
PavelSindler
0e447c34de
Merge branch 'MK3' into MK3 2017-12-21 00:08:46 +01:00
PavelSindler
f227952c0b
Merge branch 'MK3' into MK3 2017-12-21 00:07:01 +01:00
PavelSindler
7d163887e7
Merge pull request #337 from PavelSindler/wizard
selftest fix
2017-12-21 00:04:31 +01:00
PavelSindler
b8fd058749 selftest fix 2017-12-21 00:03:41 +01:00
PavelSindler
6671b33d99
Merge pull request #336 from PavelSindler/wizard
Wizard and selftest improvements
2017-12-20 23:42:50 +01:00
PavelSindler
17d9bb205a selftest tests filament sensor, selftest messages have language variants 2017-12-20 23:40:18 +01:00
Robert Pelnar
eba2924fdd Remove load/unload menu when autoload enabled 2017-12-20 22:55:11 +01:00
Robert Pelnar
a3a0e70eeb Fsensor autoload enabled menu and eeprom variable 2017-12-20 22:29:41 +01:00
Robert Pelnar
c88938e813 Fixed blocked lcd buttons
build = 137y
2017-12-20 21:33:07 +01:00
Robert Pelnar
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
PavelSindler
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
PavelSindler
38d1877016
Merge pull request #332 from PavelSindler/initialization
Initialization
2017-12-18 19:18:11 +01:00
PavelSindler
525d022841 whitespace 2017-12-18 19:17:39 +01:00
PavelSindler
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
XPila
9639b58f4d
Merge pull request #329 from XPila/MK3
Meassuring voltages (pwr, bed), voltages menu
2017-12-15 18:42:59 +01:00
Robert Pelnar
01654e7145 Meassuring voltages (pwr, bed), voltages menu 2017-12-15 18:33:35 +01:00
PavelSindler
889d7a0374
Merge pull request #328 from PavelSindler/MK3_for_merging
mk3 selftest fix
2017-12-15 17:56:09 +01:00
PavelSindler
ecbb5cf54b selftest fix 2017-12-15 17:54:52 +01:00
XPila
dd1eddb1cb
Merge pull request #327 from XPila/MK3
Removed SG software homming
2017-12-15 14:13:00 +01:00
Robert Pelnar
c6e10fb903 Removed SG software homming
After Calibration Z enabled minstop (SG and PINDA)
TMC2130 code simplification
2017-12-15 14:10:20 +01:00
PavelSindler
22fb8162b0
Merge pull request #326 from PavelSindler/selftest_fans_swapped
selftest swappped fans threshold changed
2017-12-15 14:09:29 +01:00
PavelSindler
3c95bea693 threshold changed 2017-12-15 14:07:12 +01:00
PavelSindler
67f7d3d7ca
Merge pull request #325 from PavelSindler/MK3_for_merging
build version 136
2017-12-15 11:56:56 +01:00
PavelSindler
5daf53f35b version changed 2017-12-15 11:55:37 +01:00
PavelSindler
a646b4c406
Merge pull request #324 from PavelSindler/pid_cal_fix
PID calibration fix
2017-12-14 20:30:52 +01:00
PavelSindler
893f34fd85 watchdog reset 2017-12-14 20:28:07 +01:00
PavelSindler
72a4161fea
Merge pull request #323 from PavelSindler/selftest_fans_swapped
selftest updates
2017-12-14 19:38:56 +01:00
PavelSindler
011ebb3675 selftest is checking if fans are swapped, host keepalive messages added 2017-12-14 19:36:32 +01:00
XPila
1c7bbad66d
Merge pull request #321 from XPila/MK3
build 135
2017-12-13 23:21:28 +01:00
Robert Pelnar
7304579ca5 build 135 2017-12-13 23:19:51 +01:00
XPila
8fedd6b428
Merge pull request #320 from XPila/MK3
Mk3
2017-12-13 23:03:19 +01:00
Robert Pelnar
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
PavelSindler
844aa98636
Merge pull request #319 from PavelSindler/maiden_eeprom_fix
Maiden eeprom fix
2017-12-13 19:14:26 +01:00
Robert Pelnar
66e279b41c Autoload filament - fsensor error couter reset when switched. 2017-12-13 18:12:05 +01:00
Robert Pelnar
356bc403b1 Automatic filament load when printer idle and preheated 2017-12-13 17:39:32 +01:00
PavelSindler
240922d789 build 134 2017-12-13 16:27:35 +01:00
PavelSindler
d1224834c1 init sd card after wizard 2017-12-13 16:27:15 +01:00
PavelSindler
e3b693c71d
Merge pull request #317 from PavelSindler/MK3_for_merging
build 133: selftest not reseted by watchdog, eeprom defines changes
2017-12-13 15:02:45 +01:00
PavelSindler
8c320d0089 selftest delay -> delay_keep_alive 2017-12-13 14:55:53 +01:00
PavelSindler
ae8e84a698 build 133 2017-12-13 14:44:53 +01:00
PavelSindler
889f4e49fb eeprom defines 2017-12-13 14:17:32 +01:00
PavelSindler
af5241623d version change 2017-12-13 13:14:25 +01:00
XPila
42d1ec823f
Merge pull request #316 from XPila/MK3
Failstat couters initialization
2017-12-12 23:41:03 +01:00