From a9641c64001dabfaec302caca5aaf2d1e177793d Mon Sep 17 00:00:00 2001 From: Sergey Date: Wed, 22 Dec 2021 12:07:38 +0300 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 1ce69f55df8be53faa479c0f76089a66af231d6f Author: Sergey Date: Wed Dec 22 12:00:30 2021 +0300 Squashed commit of the following: commit ecb08b15bed770972a263abb600207a0db8791d1 Merge: 798d12c2af 854ce63358 Author: Sergey Date: Wed Dec 22 11:58:28 2021 +0300 Merge branch '2.0.x' into vanilla_fb_2.0.x commit 854ce63358f409340863024edd38fb7d1499fd91 Author: Robby Candra Date: Sun Dec 19 05:33:21 2021 +0700 🐛 Fix loud_kill heater disable (#23314) commit 170f77fada009bcd77b02edf7b5d55d5173b00e9 Author: lukrow80 <64228214+lukrow80@users.noreply.github.com> Date: Tue Nov 23 22:30:13 2021 +0100 🐛 Fix homing current for extra axes (#23152) Followup to #19112 commit 72b99bf1ba24cb9124668b958039b32a164c68cd Author: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com> Date: Sat Oct 9 19:13:19 2021 -0400 🐛 Fix IDEX Duplication Mode Positioning (#22914) Fixing #22538 commit 1a8583f4fce492240db5d890825b8edd8217025f Author: Robby Candra Date: Wed Nov 24 04:19:32 2021 +0700 🐛 Fix serial_data_available (#23160) commit f8c2940f89347668e10092dd4d1790f721469e0b Author: Sergey Date: Fri Dec 10 10:56:00 2021 +0300 Merge 2.0.x commit 21ee093bf4a32b118599b768945413baba3b2ea0 Author: Sergey Date: Fri Dec 3 14:56:50 2021 +0300 fix commit 1c7be914901a7511eac941a22421430341eae491 Author: Sergey Date: Thu Dec 2 19:32:07 2021 +0300 Nano-s external driver direction commit b0e175415822ca48935799c834cae86e8d62c2d5 Author: Sergey Date: Thu Dec 2 18:06:23 2021 +0300 m992 report only when printing commit 739d1fede4861d2842681382fa97abd014b605ac Author: Sergey Date: Thu Dec 2 17:36:25 2021 +0300 m992 and m944 support commit 6f9daef615f139f09c6f349fb51488c0de0a750a Author: Sergey Date: Mon Nov 22 20:05:34 2021 +0300 remove debug tools commit 34184747d39123a8527668ded8552672ad325b6a Merge: cea1e40acb b454496d03 Author: Sergey Date: Mon Nov 22 19:59:59 2021 +0300 Merge branch 'DEV' into FB4S_WIFI commit cea1e40acba0ede90828d503eaa834e20be40527 Author: Sergey Date: Mon Nov 22 19:53:53 2021 +0300 remove debug tools commit b454496d0300c2c19ab46f6e68655e6059a00c7b Author: Sergey Date: Mon Nov 22 19:48:18 2021 +0300 2.0x update commit 70e489094e776d677bff04b5c649bd45dfe448e9 Merge: bf52f48673 798d12c2af Author: Sergey Date: Mon Nov 22 19:38:32 2021 +0300 Merge branch 'vanilla_fb_2.0.x' into MY_DEV commit 798d12c2af57b8f7afcb7738332a99725c86008f Author: Sergey Date: Mon Nov 22 19:06:10 2021 +0300 readme commit 2594bb57c9e95ebeab92ff56f9528aec2df82f7f Author: Sergey Date: Mon Nov 22 18:53:44 2021 +0300 Driver config commit bf2be7d4b05a5c45aceccb5a6ad7cebd0a96269b Author: Sergey Date: Mon Nov 22 18:52:41 2021 +0300 readme commit bf52f486735d7905f10dbf3860e20f0632298cd7 Author: Sergey Date: Mon Nov 22 15:13:56 2021 +0300 Ozone commit 0e1f6771715b1a9cf7349496cfd8e13d0f2d9987 Author: Sergey Date: Mon Nov 22 15:12:26 2021 +0300 DEV options commit 8ab7f02ff6154bc78a8f1f21db013fea9e21e35f Author: Sergey Date: Sun Nov 7 20:52:04 2021 +0300 Nano 1.3 TMC preset E1 extruder for v1.1 commit de582ac8e978ff77a01a90a5790736867e9461b2 Author: Sergey Date: Wed Oct 27 16:39:46 2021 +0300 Build configuration commit 500855c28d3cb18d417c5c3aa1babcd31529b561 Merge: 79f3f68c6e 09a17ae58d Author: Sergey Date: Wed Oct 27 14:16:32 2021 +0300 Merge branch 'FB4S_WIFI' of github.com:Sergey1560/Marlin_FB4S into FB4S_WIFI commit 79f3f68c6efc817f6684aa768345defbe1610e61 Author: Sergey Date: Wed Oct 27 14:12:45 2021 +0300 update 2.0.x commit 6db2fc55b4472fcb6a8669e09478b0890eacfbcd Author: Sergey Date: Wed Oct 27 14:08:03 2021 +0300 UART PIN for nano-s 1.3 commit 09a17ae58d39554802938716a41ca9e3366a98e4 Merge: 09a00e7edb 0affd99b4b Author: Sergey1560 <53866542+Sergey1560@users.noreply.github.com> Date: Wed Oct 20 22:36:05 2021 +0300 Merge pull request #51 from pznamenskii/patch-1 Update Configuration.h commit 0affd99b4b832a09159c0a26e512fa724c839a35 Author: pznamenskii Date: Wed Oct 20 22:32:41 2021 +0300 Update Configuration.h corrected motherboard name in FB_5_STOCK check for nano-s to match new code commit 09a00e7edbb56e729cb71b8f658645402d693098 Author: Sergey Date: Wed Oct 20 11:00:45 2021 +0300 Update 2.0.x commit 393e9d2cf84ce80c4d02141587b659dbd3e2dc9e Author: Sergey Date: Wed Oct 13 16:50:10 2021 +0300 SPI cleanup commit a0fd04f2ae57522a9ac90eae52c944bfbb59b033 Author: Sergey Date: Wed Oct 13 16:26:43 2021 +0300 update 2.0.x commit 6c5211e0bb8301f85df313824569ac43a0ad276f Author: Sergey Date: Tue Oct 12 13:47:48 2021 +0300 update 2.0.x commit 2f2c7b0846017755d137a55e32ecaeeaa3d191eb Author: Sergey Date: Mon Oct 4 15:31:06 2021 +0300 2.0.9.2 update commit 6c136d64640a27010d56429fe6bd9dcd802cefc5 Merge: cd3dcc5a8b 58e03be23c Author: Sergey1560 <53866542+Sergey1560@users.noreply.github.com> Date: Sat Oct 2 22:59:25 2021 +0300 Merge pull request #48 from danijcom/FB4S_WIFI Update README.md commit 58e03be23cf7b9c5ac69d0f0e48e7df944964b77 Author: Danij <46953160+danijcom@users.noreply.github.com> Date: Fri Oct 1 23:15:38 2021 +0300 Update README.md commit cd3dcc5a8bf8f5d1dbfd2bff6bf2bc5eb72c4e62 Author: Sergey Date: Mon Sep 27 12:50:46 2021 +0300 fix default envs commit 9fb7f75bfbace5790e866c065f768181e896685d Author: Sergey Date: Fri Sep 17 17:40:48 2021 +0300 Robin Nano v1.3 fix commit 058aa2fef3b28e99606ce73a8ca6e1113f2b3512 Author: Sergey Date: Wed Sep 15 13:20:36 2021 +0300 Printer name define commit e9d211f6627a6f0e01c8e90606668bd5f711b857 Author: Sergey Date: Wed Sep 15 09:09:23 2021 +0300 disable wifi module if file transfer start during print. commit 473c340ff2107d3bfddae15e9830d24207d4e415 Author: Sergey Date: Tue Sep 14 22:13:17 2021 +0300 WD commit 9e0cccbbf7ea1de719f6fdaa2188d65338a22f81 Author: Sergey Date: Tue Sep 14 17:45:18 2021 +0300 F4 sdio fix commit f59916679df7814367fb784999850613dbbb048a Author: Sergey Date: Tue Sep 14 10:27:14 2021 +0300 fix dealy commit f1c49e24498cc212171ef0063f570ceffefc5366 Author: Sergey Date: Tue Sep 14 10:22:09 2021 +0300 disable heaters during wifi transfer commit 05a607b928b0789e8fc2b44736b29a0d6e869294 Merge: d2ebf4ff88 e5a8b556c7 Author: Sergey Date: Tue Aug 31 21:48:07 2021 +0300 Merge branch 'FB4S_WIFI' of github.com:Sergey1560/Marlin_FB4S into FB4S_WIFI commit d2ebf4ff884a18f82fc6d439665e4bef1cbed4d0 Author: Sergey Date: Tue Aug 31 21:47:58 2021 +0300 readme update commit e5a8b556c7f2e62af1f5e55fc0e1eb2aba4b2a1e Merge: 88192b8163 52737dcb70 Author: Sergey1560 <53866542+Sergey1560@users.noreply.github.com> Date: Sun Aug 29 11:09:58 2021 +0300 Merge pull request #46 from SergeyTurnaev/FB5_NanoS13 Fb5 nano s13 commit 52737dcb704e98c954015f8a8399b51c0507db66 Author: Sergey Turnaev Date: Thu Aug 26 21:18:39 2021 +0300 External extruder driver default disabled commit 5f209feed1ee3dddb0c848a3d53a5435385303d7 Author: Sergey Turnaev Date: Thu Aug 26 21:17:23 2021 +0300 Added support of external extruder driver commit 88192b8163e74ec2fd54058638250625e0998740 Merge: e30d47d19b 8f82ce3ae3 Author: Sergey1560 <53866542+Sergey1560@users.noreply.github.com> Date: Sat Aug 21 13:08:04 2021 +0300 Merge pull request #45 from SergeyTurnaev/FB5_NanoS13 Fixed axis directions for MKS Robin Nano S 1.3 commit 8f82ce3ae3a40c5b1bec00f692a46ed9361e88d5 Author: Sergey Turnaev Date: Sat Aug 21 11:29:57 2021 +0300 Fixed axis directions for MKS Robin Nano S 1.3 Fixed bug with fan pins commit e30d47d19b4ffad91c8e4b6375293a4d2aee40ed Author: Sergey Date: Fri Aug 20 12:09:09 2021 +0300 update 2.0.x MKS Robin Nano-s v1.3 support commit fe39eefab5be7f1fb7fdd8fde9541aad275041a8 Author: Sergey Date: Wed Aug 18 16:26:57 2021 +0300 Slow down SDIO CLK commit af930ee994e7e761e88086e63a3b3c2c24476c90 Author: Sergey Date: Mon Aug 16 14:17:06 2021 +0300 uodate 2.0.x commit f2c69b6950e0aa6387a2d8c5ab74431a3e16cdb9 Author: Sergey Date: Wed Aug 11 16:41:06 2021 +0300 Обработка gcode во время печати commit 67c6fbf4a7b93a994a419c333e26b9381ba14ed6 Author: Sergey Date: Wed Aug 11 15:22:14 2021 +0300 Update fatfs wifi transfer commit c4d79ab54c5d8121671945d5ff485bba229baa71 Author: Sergey Date: Mon Aug 9 13:19:09 2021 +0300 update 2.0.x commit 80552d3f70658f519656116c9d8b0218c9f6ed97 Author: Sergey Date: Mon Aug 2 12:10:36 2021 +0300 update from 2.0.x branch commit 75290bdded1063f66f0526b26eeaa0e647f109aa Author: Sergey Date: Wed Jul 21 15:16:49 2021 +0300 Возможность отключить прогресс загрузки файла commit 7261a0a2181d5454059049a1c3a2820f08be9cc2 Author: Sergey Date: Wed Jul 21 14:10:25 2021 +0300 2.0.x update commit 5da110b80a78ff4ec591594317af471f676d9530 Author: Sergey Date: Tue Jul 13 16:35:01 2021 +0300 esp timeout commit cdbc333cf231b599a6f428ec5c42d7ae265c4176 Author: Sergey Date: Tue Jul 13 16:14:37 2021 +0300 SD remount commit 3d73738bff8ee74684ac576ae2affafee64441bb Author: Sergey Date: Tue Jul 13 13:35:13 2021 +0300 fix debug uart num commit 58ba6b64304df702ce4d789b9c0954d25550f850 Author: Sergey Date: Tue Jul 13 10:43:24 2021 +0300 Update marlin commit dc6785f14caf8e1d8b0dbfb453db326aee7500e2 Author: Sergey Date: Wed Jul 7 14:34:26 2021 +0300 update commit 3c34dad09a35d84f74bc8245174948a0d3225029 Author: Sergey Date: Wed Jul 7 14:17:07 2021 +0300 fix debug output commit d41e6e5773e0edea1ea406548a0aa529cdefa34e Author: Sergey Date: Mon Jul 5 14:09:12 2021 +0300 2.0.9.1 update commit 398bb884ecc6e674136eb5f6fe6a117aaeff4d15 Author: Sergey Date: Tue Jun 15 13:12:14 2021 +0300 2.0.9 commit 3358523c707da299430b6e3357b28bc248583882 Author: Sergey Date: Tue Jun 8 13:59:22 2021 +0300 Custom menu commit bcf31b86ab2ddefece0964073a0fccf6edf08549 Author: Sergey Date: Tue Jun 8 12:50:25 2021 +0300 MKS PWC preset commit ffee9fd1bec172d82fcbea8e485f0d8009122d83 Author: Sergey Date: Tue Jun 8 12:46:49 2021 +0300 Touch settings commit de0681a2039a79658abd5173ea4412cf9b5a09f2 Author: Sergey Date: Tue Jun 8 12:19:27 2021 +0300 2.0.8.2 update commit 081833edd93d2d108b762e7f9c129f11f679f589 Author: Sergey Date: Tue May 25 12:07:25 2021 +0300 Marlin update commit 3d75a6e48de62e0a48b7355f0e6717a023c76129 Author: Sergey Date: Tue May 25 11:44:32 2021 +0300 Fix configuration issue commit 03d1b99331f8d3e570b70b3e709aae3485a5462e Merge: a399523691 2b875a6fb9 Author: Sergey1560 <53866542+Sergey1560@users.noreply.github.com> Date: Mon May 17 12:22:06 2021 +0300 Merge pull request #38 from X-Dron/PR1 Update pins_MKS_ROBIN_NANO_V2.h commit a3995236916feb182668da11f9a72becd99b14bb Author: Sergey Date: Sun May 16 11:43:29 2021 +0300 2.0.8.1 update commit 2b875a6fb9186618337c76298ee73fda75989a28 Merge: 9000949ee3 34b324931d Author: X-Dron Date: Mon May 10 14:39:23 2021 +0300 Merge branch 'PR1' of https://github.com/X-Dron/Marlin_FB4S into PR1 commit 9000949ee3188b067f7608619cab828b42ad51d3 Merge: c7995c9a57 23a88910ce Author: X-Dron Date: Mon May 10 14:38:57 2021 +0300 Merge branch 'FB4S_WIFI' into PR1 commit 34b324931d7c452e359ff6950b0d3cee5541ab64 Merge: c7995c9a57 80a7af65d2 Author: X-Dron Date: Mon May 10 14:37:31 2021 +0300 Merge pull request #20 from Sergey1560/FB4S_WIFI Fix build without MKS_WIFI commit 80a7af65d22386bf1b38bdfc86f20c3ad0704a03 Author: Sergey Date: Mon May 10 10:48:33 2021 +0300 Fix build without MKS_WIFI commit c7995c9a57592f057850a3362643fcbfd0ac71dc Author: X-Dron Date: Sun May 9 22:48:45 2021 +0300 Update pins_MKS_ROBIN_NANO_V2.h commit 23a88910ce4494afadfb36934f789f034618be8e Author: X-Dron Date: Sun May 9 21:03:34 2021 +0300 Last 2.0.7.2 commit e46e5fa2740bcfcb1a86269c726d5c112d15e5b4 Author: Sergey Date: Fri May 7 17:49:32 2021 +0300 russian lang commit 80aaf45953d53c960f8b6722dba5f4726a35419f Author: Sergey Date: Fri May 7 12:20:29 2021 +0300 Disable debug commit 3b88927356e0ccf508478c62d5a38d42f05f0ae4 Author: Sergey Date: Fri Apr 30 20:45:28 2021 +0300 2.0.8 update commit bd6eab3735f509004fe554a34bcbdbbba48c468b Author: Sergey Date: Wed Apr 28 15:13:05 2021 +0300 Readme update commit 9aca7d6d6f47430570731412376208e632c5e597 Author: Sergey Date: Sun Mar 21 10:02:27 2021 +0300 'buildroot' folder update commit d339681e3ff14e7ea00f3ff8b12988ce2c8d1d92 Author: Sergey Date: Thu Jan 28 14:10:29 2021 +0300 Fix Ёё commit 1d87fac9899e8f879e2b21853d656e193072a331 Author: Sergey Date: Sat Jan 16 11:47:10 2021 +0300 cyrillic glyphs commit b5d7f8ab36b07c71eb9e46ca87d21af49eccb72c Merge: c9348d19d3 e8b3d7bec0 Author: X-Dron Date: Sun Jan 17 14:11:24 2021 +0300 Merge pull request #16 from Sergey1560/FB4S_WIFI small file transfer fix commit e8b3d7bec07ce73cf5ee9317486955ecb5b0ef4c Author: Sergey Date: Sat Jan 2 12:52:20 2021 +0300 small file transfer fix commit c9348d19d333b411ad7b37bf8c816b2e88964793 Merge: 87b632dc0f a550740f06 Author: X-Dron Date: Tue Dec 29 18:07:55 2020 +0300 Merge pull request #14 from X-Dron/PR Sergey1560 Sync commit a550740f06b8cf2f2e55751b11c7b682f54576a5 Merge: 774e779d7e 87b632dc0f Author: X-Dron Date: Tue Dec 29 18:07:41 2020 +0300 Merge branch 'FB4S_WIFI' into PR commit 774e779d7e2888014c8adc76299588c18b825f18 Merge: a622308db6 2da0e91155 Author: X-Dron Date: Tue Dec 29 18:00:06 2020 +0300 Merge pull request #13 from Sergey1560/FB4S_WIFI Sergey1560 Sync commit 87b632dc0fd4e174d675c1d6b09ad03a9f6aa21c Author: X-Dron Date: Tue Dec 29 17:55:24 2020 +0300 Update Configuration.h commit 2da0e9115519743354636d37908690f89d8eec02 Author: Sergey Date: Mon Dec 28 12:01:38 2020 +0300 Update config commit a3f2eaafbd7a754fecea7e00c8d907400cedb330 Author: Sergey Date: Mon Nov 30 13:23:45 2020 +0300 fix commit af8800d8ed748a0a74f3cd532e7f0d246ceb9ef9 Author: Sergey Date: Mon Nov 30 13:23:09 2020 +0300 telegram link commit 92a2c1d62d21c245084f607ba13ca4ac7a94b197 Author: X-Dron Date: Wed Nov 25 20:08:55 2020 +0300 PSU + Update config commit d7ddde3f039fcbdd9d83a0873d9ef03cebeaadfc Author: Sergey Date: Thu Nov 12 00:41:55 2020 +0300 Временное исправление восстановления печати POWER_LOSS_RECOVERY commit e85ed10bebfa3b0345ac321ad606cd01d5f7a046 Author: Sergey Date: Tue Nov 10 12:42:13 2020 +0300 Исправление постановки на паузу из меню Исправление POWER_LOSS_RECOVERY commit 0196149b591143be6efd2de21db5b06e2594ac99 Author: X-Dron Date: Fri Nov 6 21:14:42 2020 +0300 Update MarlinCore.cpp commit f1e9249a8b5b7caf7ba5dd25681aca7d108143b0 Author: X-Dron Date: Fri Nov 6 21:06:22 2020 +0300 Update Configuration.h commit b0bd83903f5a2f29eba2ab606adaeed3678f3180 Merge: 12ac9daecf a410e6c8db Author: X-Dron Date: Fri Nov 6 21:03:44 2020 +0300 Merge branch 'Sergey1560-FB4S_WIFI' into FB4S_WIFI commit a410e6c8dbd7f1f7e0b99386e121ca8482cfcdc3 Merge: 12ac9daecf 7bad09ebe1 Author: X-Dron Date: Fri Nov 6 21:02:49 2020 +0300 Merge branch 'FB4S_WIFI' of https://github.com/Sergey1560/Marlin_FB4S into Sergey1560-FB4S_WIFI commit 12ac9daecfe00f843d8035831b231022545fd0e3 Author: X-Dron Date: Fri Nov 6 20:32:48 2020 +0300 Revert "Sync with Sergey1560" This reverts commit 72431de8e560bd2ddf2301c8394c2906e6f4c84e. commit 72431de8e560bd2ddf2301c8394c2906e6f4c84e Author: X-Dron Date: Fri Nov 6 19:59:59 2020 +0300 Sync with Sergey1560 commit a622308db6681be71b534effc9e9ab3c98f0b245 Author: X-Dron Date: Fri Nov 6 19:37:42 2020 +0300 SYNC commit de94b4588d245d7377ad39bdc5db22c5cde69a6f Author: X-Dron Date: Fri Nov 6 19:09:10 2020 +0300 ENABLED(BABYSTEP_ZPROBE_OFFSET) commit 48ba69684b5b19c22eac8dbf846448cad68544da Merge: 3d886c4fbd 4877bfcc52 Author: X-Dron Date: Fri Nov 6 13:26:28 2020 +0300 Merge branch 'Sergey1560-FB4S_WIFI' into PR commit 4877bfcc52e0377007a437bbb82412ca7c04b677 Merge: 3d886c4fbd 7bad09ebe1 Author: X-Dron Date: Fri Nov 6 13:25:19 2020 +0300 Merge https://github.com/Sergey1560/Marlin_FB4S into Sergey1560-FB4S_WIFI commit 7bad09ebe14d90afadfc0b154422c899e9e8fe45 Author: Sergey Date: Fri Nov 6 12:22:32 2020 +0300 Fix float print commit 0b8c529c03ad7f58f2115e0ce3341fc30586270f Author: Sergey Date: Fri Nov 6 12:10:42 2020 +0300 Merge PR16 commit 3d886c4fbdc57642784e65cce4dc1c0ea4365d46 Author: X-Dron Date: Fri Nov 6 11:11:19 2020 +0300 Revert "BABYSTEP_MILLIMETER_UNITS" This reverts commit 83aaac475e51656dc1be3d5d7556620dcad35fc8. commit 83aaac475e51656dc1be3d5d7556620dcad35fc8 Author: X-Dron Date: Fri Nov 6 11:04:39 2020 +0300 BABYSTEP_MILLIMETER_UNITS Так будет лучше. Шаги на мм у разных версий принтера могут быть разными. В исходном варианте дергаем на 10 микрошагов драйвера. В обновленнном на 0.01мм на babystep commit a6fea31697b0799220ca2a8171485d3350a25ebc Author: X-Dron Date: Fri Nov 6 07:49:12 2020 +0300 LED Switch and minor config update commit ef6354982a828ad24f92dcd1a724dc0264847a73 Author: X-Dron Date: Sun Nov 1 21:21:27 2020 +0300 PID RANGE, USB SPEED, HOME OFFSETS MENU, UART drive commit 036ade4ae826332be28bc383037dae93806ae93d Author: X-Dron Date: Sun Nov 1 21:02:09 2020 +0300 REVERT commit 5d33eed461ca0e9507b46e417947776b36191d0c Author: X-Dron Date: Sun Nov 1 20:51:10 2020 +0300 PID range/Home Offset Menu commit bbd55e183d1ade0b49b5e5406522c73d2d78fa30 Merge: 5eb1931028 10ea9561ea Author: X-Dron Date: Wed Oct 21 16:35:13 2020 +0300 Merge pull request #8 from Sergey1560/FB4S_WIFI Положение головы при парковке по M600 commit 10ea9561eaf6b47c5e26c40505c01911a99c21d9 Author: Sergey Date: Tue Oct 20 11:24:24 2020 +0300 Положение головы при парковке по M600 Update from Marlin Fix print float values commit 5eb1931028b2f45745fdc73ec4df6a788b9f74e6 Merge: b02fab8491 0e1344c344 Author: X-Dron Date: Sun Oct 18 14:55:07 2020 +0300 Merge pull request #7 from X-Dron/Sergey1560-FB4S_WIFI Update to 2.0.7.2 commit 0e1344c344b4adaa89da206bc89cb18aa0a63736 Merge: b02fab8491 c81bb9f8a0 Author: X-Dron Date: Sun Oct 18 12:56:51 2020 +0300 Merge branch 'FB4S_WIFI' of git://github.com/Sergey1560/Marlin_FB4S into Sergey1560-FB4S_WIFI commit b02fab84919950ced5105d03e5f39afb36eb3c5f Author: X-Dron Date: Sun Oct 18 11:57:54 2020 +0300 Update MarlinCore.cpp commit c81bb9f8a062be477eac7c56adaca72820fc25be Author: Sergey Date: Fri Oct 16 14:29:40 2020 +0300 Readme commit cf08ad6ca801a40e982dded711ff12672f490786 Author: Sergey Date: Fri Oct 16 14:26:31 2020 +0300 Readme commit 6a666cf13d0b1c767baa35c97c1a37fe87e188b1 Author: Sergey Date: Fri Oct 16 14:24:22 2020 +0300 Перенос собранных прошивок в раздел releases commit dbde3371af716e39b7e6d54f4e53c1293216c346 Author: Sergey Date: Fri Oct 16 14:21:20 2020 +0300 readme commit a83c1bf5daa969ee9775709b8a6a9bfe9f130454 Author: Sergey Date: Fri Oct 16 14:20:13 2020 +0300 Readme commit 59c93c79cfa2bd9c19221f78cdb2ae2bbf546260 Author: Sergey Date: Fri Oct 16 14:03:59 2020 +0300 Readme update commit 9c80f9b7e6601216722c024801fc59e3a9e6fab4 Author: Sergey Date: Wed Oct 14 12:15:15 2020 +0300 Включение вентилятора хотенда commit 102a6fb2619a085057e3f2138e9d44fc422408a8 Author: Sergey Date: Mon Oct 12 16:45:06 2020 +0300 Update to 2.0.7.2 commit d47085f7aac3261fa57371e0b9268bd34f149765 Author: X-Dron Date: Sat Oct 10 18:24:25 2020 +0300 USB_BAUDRATE 250000 commit f1c265a0c2a374bb9c852c490577b881ab9969b3 Author: X-Dron Date: Fri Oct 9 20:17:23 2020 +0300 32 micro commit 02d2aeea57e467b2fdb3037e79fce922f6be498e Merge: b3bc33a1ce 88825d3b6a Author: X-Dron Date: Thu Oct 8 09:15:43 2020 +0300 Merge branch 'FB4S_WIFI' of https://github.com/X-Dron/Marlin_FB4S into FB4S_WIFI commit b3bc33a1ce2df4d185d4ce21684ecd6bb9044340 Author: X-Dron Date: Thu Oct 8 09:15:38 2020 +0300 TMC2208 UART commit 88825d3b6a28258ec8342ebd624a438495ce44fd Merge: bd0b3d0e00 1ccafc9d5d Author: X-Dron Date: Mon Oct 5 15:02:31 2020 +0300 Merge pull request #5 from Sergey1560/FB4S_WIFI Fix warning commit 1ccafc9d5de3a8d894dd3a3e8c6e6f1549966a72 Author: Sergey Date: Mon Oct 5 13:36:04 2020 +0300 Fix warning Fix firmware upload commit bd0b3d0e00d323d2cd9a8955fcdc9d6f63e4523b Merge: 23e3e6e64e 0d8bbec997 Author: X-Dron Date: Mon Oct 5 09:53:02 2020 +0300 Merge pull request #4 from Sergey1560/FB4S_WIFI eeprom fix commit 0d8bbec997d319358b047534c8142e32deda23a7 Author: Sergey Date: Sun Oct 4 18:03:16 2020 +0300 Fix store eeprom commit 72214cfff016722a96f69a430091990a8bb6e63d Author: Sergey Date: Sun Oct 4 12:00:16 2020 +0300 Включение отладки commit 23e3e6e64e51cc65683de3f6959e5a3db1bcde67 Merge: 4a1c69960f 8d9545af34 Author: X-Dron Date: Wed Sep 30 19:25:40 2020 +0300 Merge pull request #2 from Sergey1560/FB4S_WIFI Fix автозапуска commit 8d9545af3403fd2259cf9bc5d000d85126b9c8b1 Author: Sergey Date: Wed Sep 30 17:38:49 2020 +0300 v2.0 pins commit 1d984106530239d7be5d8dc0cc93f1dc36dba924 Author: Sergey Date: Tue Sep 29 18:51:05 2020 +0300 Fix автозапуска commit 4a1c69960f78bc889cc9d1e7ebc5df1102c65a98 Author: X-Dron Date: Tue Sep 29 22:55:20 2020 +0300 Update Config commit 9613c005b98f2cf01a52e4480c4e8ec3bb986c00 Merge: 58afb98ef1 46d376a31d Author: X-Dron Date: Tue Sep 29 14:20:49 2020 +0300 Merge remote-tracking branch 'upstream/FB4S_WIFI' into FB4S_WIFI commit 46d376a31d9dda306f8746be6c3da8f78b8e3f5d Author: Sergey Date: Tue Sep 29 11:44:43 2020 +0300 Обновление на 2.0.7 commit 49d28922d046a78c8289597e5a182a0536a27c73 Merge: 040e600496 2d0ecef273 Author: Sergey Date: Tue Sep 29 11:11:04 2020 +0300 Merge branch 'FB4S_WIFI' of github.com:Sergey1560/Marlin_FB4S into FB4S_WIFI commit 040e6004960c3d143fc564f2290f4aa5960c15b7 Author: Sergey Date: Tue Sep 29 11:10:21 2020 +0300 Обновление кода commit 2d0ecef2733c0d2597aff0553b6b4e5cf4cedbbe Merge: 7584f9d900 c0704a1c97 Author: Sergey1560 <53866542+Sergey1560@users.noreply.github.com> Date: Tue Sep 29 11:05:55 2020 +0300 Merge pull request #7 from X-Dron/FB4S_WIFI pins_MKS_ROBIN_NANO_V2.h после установки в принтер commit 58afb98ef16c9a88af686bd3bdacb87e32e525a9 Author: X-Dron Date: Sun Sep 27 07:38:05 2020 +0300 Update Configuration.h commit c4f9f67605aae02f6f08c9961c19d5918ff3ba3f Author: X-Dron Date: Sat Sep 26 07:44:21 2020 +0300 Revert "Revert "USB_BAUDRATE 230400"" This reverts commit 676c8733c4b773766d283cca9a19332fedf236c3. commit c6189c155b537c880b36a6093f1233793406bb28 Author: X-Dron Date: Sat Sep 26 07:43:53 2020 +0300 Revert "Revert "Nano2_Config"" This reverts commit bd2cea18a2a15d5988aee7c837dfb7bd79c03ee8. commit 3ff214c4bfa7bbf09c7918616ff2ad1a8bddaab4 Author: X-Dron Date: Sat Sep 26 07:43:30 2020 +0300 Revert "Revert "Update Configuration_adv.h"" This reverts commit c0704a1c9754cdc4e9f4e0cba2520732a7a465a3. commit c0704a1c9754cdc4e9f4e0cba2520732a7a465a3 Author: X-Dron Date: Sat Sep 26 07:33:33 2020 +0300 Revert "Update Configuration_adv.h" This reverts commit 91ccf7ba7c7cbddec968a2b480db21782e3e89af. commit bd2cea18a2a15d5988aee7c837dfb7bd79c03ee8 Author: X-Dron Date: Sat Sep 26 07:33:11 2020 +0300 Revert "Nano2_Config" This reverts commit 709b26d6f9532610024135f76d2b61ea3e59a3e5. commit 2bd939d8f57b2373704ca628cb0d7385b8d19b02 Author: X-Dron Date: Sat Sep 26 07:32:55 2020 +0300 Revert "Update Configuration.h" This reverts commit 09c13d5b08087e43165fab3ee775b222d541d407. commit 676c8733c4b773766d283cca9a19332fedf236c3 Author: X-Dron Date: Sat Sep 26 07:32:45 2020 +0300 Revert "USB_BAUDRATE 230400" This reverts commit d87fdcd63da52df47973b4876ea7c06dc392a9af. commit 09c13d5b08087e43165fab3ee775b222d541d407 Author: X-Dron Date: Sat Sep 26 07:32:34 2020 +0300 Update Configuration.h commit 1e27eaa3323cfd378eea7fe71a89a45804d1d696 Author: X-Dron Date: Fri Sep 25 09:27:59 2020 +0300 AutoFan Фикс AutoFan, датчик температуры в корпусе, фикс русских коментариев commit d87fdcd63da52df47973b4876ea7c06dc392a9af Author: X-Dron Date: Fri Sep 25 09:25:01 2020 +0300 USB_BAUDRATE 230400 commit 91ccf7ba7c7cbddec968a2b480db21782e3e89af Author: X-Dron Date: Tue Sep 22 23:15:52 2020 +0300 Update Configuration_adv.h LIGHT_NO_BRIGHTNESS commit 709b26d6f9532610024135f76d2b61ea3e59a3e5 Author: X-Dron Date: Tue Sep 22 22:53:41 2020 +0300 Nano2_Config commit 7584f9d900309a1281d8f84bfcae5811b68b5ccd Merge: d5c4b1e96f a8518d552e Author: Sergey1560 <53866542+Sergey1560@users.noreply.github.com> Date: Tue Sep 22 13:45:32 2020 +0300 Merge pull request #6 from X-Dron/FB4S_WIFI Update pins_MKS_ROBIN_NANO_V2.h commit a8518d552ecd481d72e4eff1348e69089278803e Author: X-Dron Date: Mon Sep 21 21:27:41 2020 +0300 Update pins_MKS_ROBIN_NANO_V2.h commit d5c4b1e96feee20435896413f448c836369887fb Author: Sergey Date: Mon Sep 21 16:16:29 2020 +0300 Исправление скорости передачи commit 20be76c49b1361d626c18ba918826e684f14acae Author: Sergey Date: Mon Sep 21 15:04:15 2020 +0300 Прошивки commit 27eafd72f20436b95ffff0c4d18b884265f46ea0 Author: Sergey Date: Mon Sep 21 14:50:32 2020 +0300 Исправление передачи файлов commit 0080f212d6538627ea76771bda7656c9a6303786 Author: Sergey Date: Wed Sep 16 12:05:50 2020 +0300 Настройки FILAMENT_RUNOUT_SENSOR commit e84d17a3b979403879d07e75e7895e0d4df3198e Author: Sergey Date: Wed Sep 16 10:47:32 2020 +0300 Новый интерфейс commit 940798f6939e910b0f53ce73ebcca06f7deac7ef Author: Sergey Date: Mon Sep 7 11:32:45 2020 +0300 readme commit d7af9fc4a069deaffe5876ff2827489408e110c6 Author: Sergey Date: Mon Sep 7 11:27:26 2020 +0300 readme commit 7336820b0141b3105a3ca4daedcea7720cca2924 Author: Sergey Date: Mon Sep 7 11:16:28 2020 +0300 Прошивки commit 6c5177230b7f1d7d496d324d34734e98dfa7f10d Author: Sergey Date: Mon Sep 7 11:08:28 2020 +0300 Удаление старых прошивок commit 294d0e31b935d207b0bb2c0f887bea37b423227f Author: Sergey Date: Mon Sep 7 11:07:32 2020 +0300 Отключение WIFI commit 89e1ee15a4701d760e9a785d91b1a8e021e8b5a3 Author: Sergey Date: Sun Sep 6 14:07:05 2020 +0300 buildroot fix commit f5cd440cbfb0722c6458b3c3b22fbf48c9b864c8 Author: Sergey Date: Thu Sep 3 09:56:13 2020 +0300 FAN pin commit adee4a7475f427184643be301667c36aef2f8283 Author: Sergey Date: Mon Aug 31 17:02:51 2020 +0300 Обновление 2.0.6.1 commit 241305cd8bbe6552cfe6ba2a408ec2a3a097fa1a Merge: b261e886ef 28dbc30db5 Author: Sergey1560 <53866542+Sergey1560@users.noreply.github.com> Date: Mon Aug 31 16:29:00 2020 +0300 Merge pull request #5 from maxd/fix-firmware-upload-settings Восстановил загрузку прошивок по WiFi в mks_robin_nano35.py commit 28dbc30db5a0f606b1047df216d8040d6c6eb19b Author: maxd Date: Sat Aug 29 12:50:39 2020 +0300 Скопировал настройки для загрузки прошивки по WiFi из mks_robin_nano.py в mks_robin_nano35.py commit b261e886efd50f24f2447359e4c04b92c0dc8998 Author: Sergey Date: Wed Aug 26 12:52:20 2020 +0300 Дополнительные проверки при работе с пакетом от ESP Откат в обработчике serial commit 8c3ee152e086fbb34a78ea6c4c5addd58165881a Author: Sergey Date: Tue Aug 25 12:52:36 2020 +0300 Обновление readme commit dd5cbfde4bc93c2f043376bf8ae8c4f499db0b97 Author: Sergey Date: Tue Aug 25 12:29:09 2020 +0300 Описание настройки драйверов commit 4d953cd290ff33d0d9d9d40c07b05f1063140fac Author: Sergey Date: Tue Aug 25 12:27:49 2020 +0300 Обновление готовых сборок Обновление наборов направления осей commit 1beeb805cc08307d42282ced4360ad0b82d4efa8 Merge: af9f3377d5 5232e572c2 Author: Sergey1560 <53866542+Sergey1560@users.noreply.github.com> Date: Tue Aug 25 12:11:33 2020 +0300 Merge pull request #4 from fyfywka/FB4S_WIFI Логотип commit 5232e572c277a18d01bd297433554a51142aff52 Author: Vladislav Vasiliev Date: Tue Aug 25 10:04:59 2020 +0300 Логотип FlyingBear Ghost при старте принтера commit 4240033926659f875bd7925dd742e4372672f7d0 Author: Vladislav Vasiliev Date: Tue Aug 25 10:02:56 2020 +0300 Исправление направления кнопок навигации, ↑- ↓+ на ↓- ↑+ commit af9f3377d5e92a90c234dc9d1dcb40202ff74e04 Author: Sergey Date: Mon Aug 24 14:54:38 2020 +0300 Исправление с размером EEPROM для SD Обновление Readme Настройки драйверов под FB5 commit 5d9e1e7f8744e54c5e24aaf22e6ab8c648db539d Author: Sergey Date: Wed Aug 19 14:33:31 2020 +0300 Актуализация конфига commit 145d165ebb53f7749af943132cb43edfb9cb9ec5 Author: Sergey Date: Mon Aug 3 13:04:48 2020 +0300 Включен Advanced_ok по-умолчанию Слияние исправлений с офф. репа Конфиг под BLTouch, BLTouch установлен Z Probe по-умолчанию Отключение кратковременного старта обдува при загрузке платы Инициализация ноги управления светом без шим. commit d4ba67ff2ca5397adfa6abb765986a325e60d22f Author: Sergey Date: Fri Jul 31 17:40:05 2020 +0300 Обновление с офф. гита commit 8dd26c1a3e64370be3a6fc0fc0883f05d500e1c1 Author: Sergey Date: Tue Jul 28 16:19:21 2020 +0300 Update to 2.0.6 commit 46ff2246fad999241dfc73a266f3d4bd5916c8df Merge: 77dc0a9792 905d218016 Author: Sergey Date: Thu Jul 16 14:52:27 2020 +0300 Merge branch 'FB4S_WIFI' of github.com:Sergey1560/Marlin_FB4S into FB4S_WIFI commit 77dc0a9792d852f3067ee73e16cf40e2ef07fe50 Author: Sergey Date: Thu Jul 16 14:52:21 2020 +0300 Обновление на 2.0.5.4 commit 905d2180167709ed5ee3b7b8090be7da63d0c602 Merge: f034cb3bf9 3b195f7c29 Author: Sergey1560 <53866542+Sergey1560@users.noreply.github.com> Date: Sun Jul 5 11:34:43 2020 +0300 Merge pull request #3 from vostrenkov/patch-1 Fixed build core dependency for mks_robin_nano commit 3b195f7c29340f34805ebab80e953b0ea2457847 Author: Yury Vostrenkov Date: Sun Jul 5 10:54:34 2020 +0300 Fixed build core dependency for mks_robin_nano Исправления в зависимостях (только для MKS Robin Nano, по хорошему наверное надо для всех STM32-плат) для новых версий PlatformIO. Описание проблемы и решение тут: https://community.platformio.org/t/include-path-issues-include-libmaple-gpio-h/14596/4 commit f034cb3bf93b74ce7f9c35c1295d852d30705530 Author: Sergey Date: Tue Jun 23 22:33:19 2020 +0300 Readme commit d55e2792a56839501ae21a766113c798586c30aa Author: Sergey Date: Mon Jun 22 12:49:36 2020 +0300 Параметры для Classic Jerk commit fe5b078afdcc677e297e51a2aaced5ea8386d732 Author: Sergey Date: Mon Jun 22 12:45:10 2020 +0300 Слиты изменения из офф. marlin commit 538a970c082c76f27afc014a33faeee5cac44a67 Author: Sergey Date: Thu Jun 11 14:52:29 2020 +0300 Update binary commit 140b33330d984953421b786ca7fa62bfe44c295f Author: Sergey Date: Thu Jun 11 14:47:44 2020 +0300 Ошибки слияния с тестовой веткой commit 005271943a1aa095e213d9121ed0a3536cd24f76 Author: Sergey Date: Thu Jun 11 14:42:16 2020 +0300 readme commit 5ee88981a68fb7af717df903e1778b7004a68169 Author: Sergey Date: Thu Jun 11 14:36:41 2020 +0300 Перенос кода для работы с W25Q отдельный модуль Исправления в SDIO commit 427f6e6b60398a15dd4022a5c399b3ae4b52d899 Author: Sergey Date: Mon Jun 8 13:36:06 2020 +0300 SDIO fix commit 060a078140d77a9b424c5f6f49dd9245e9264030 Author: Sergey Date: Mon Jun 8 11:38:12 2020 +0300 Вывод отладки по умолчанию в RTT commit 0cd0192a57e12953ac6cec41f3dc88cb8f97d48c Author: Sergey Date: Mon Jun 8 11:37:21 2020 +0300 Исправлены warnings commit 83a726679bd4d4abf37604c9a3e14d1096ef1369 Author: Sergey Date: Mon Jun 8 11:18:58 2020 +0300 Исправлена инициализация ног SPI, включен вывод отладки в SDIO. commit bf880555d4a7f41727cef22fca8e67c375edd299 Merge: 61a67aff31 4f3ff11929 Author: Sergey1560 <53866542+Sergey1560@users.noreply.github.com> Date: Mon Jun 8 11:11:40 2020 +0300 Merge pull request #1 from efim-a-efim/FB4S_WIFI Bug fixes commit 4f3ff119295480d388c37da5ccd54add78669f3b Author: Alexander Efimov Date: Sat Jun 6 23:59:14 2020 +0300 24v settings for SpreadCycle commit d01b5e1dc053cb507c96794955a90fdfa5b130e3 Author: Alexander Efimov Date: Sat Jun 6 21:37:37 2020 +0300 Fixing extrusion commit 2544b24e43d4f0e24a7e6d9745eea3656875bbec Author: Alexander Efimov Date: Fri Jun 5 20:57:44 2020 +0300 One more fix to SDIO commit 172fcfac17f203c3a3ac1c6ef64f35a3db965b77 Author: Alexander Efimov Date: Fri Jun 5 20:37:44 2020 +0300 Bugfixes from Marlin commit 61a67aff316ca5b25f8169f5dce27ced23c09773 Author: Sergey Date: Wed May 27 22:01:51 2020 +0300 Ошибка слияния веток commit 458ee3607089bbc5f0e33415f2b95c5781eb4f8b Author: Sergey Date: Wed May 27 15:34:53 2020 +0300 Readme fix commit db29115cf3a3692dad7b71b474ae1edbff3e9d04 Author: Sergey Date: Wed May 27 15:29:27 2020 +0300 Возможность использовать SPI флеш для EEPROM Поддержка sd карт SDv2 Загрузка прошивки по WIFI commit 2809a868222ff422f42cd2295500bf9549bfa841 Author: Sergey Date: Sat May 16 23:00:43 2020 +0300 I2C EEPROM timeout fix commit 14cf164f165de2a2b1fa79aea0f2a8f7f6d05785 Author: Sergey Date: Sat May 16 00:58:13 2020 +0300 Отключение нагрева при передаче файлов commit de6746d09dee1409a608170de73dfd47352ec1f1 Author: Sergey Date: Fri May 15 17:05:41 2020 +0300 Опечатки readme commit 1a5422eef18e28a6340619a3438a0730a4debb42 Author: Sergey Date: Fri May 15 17:04:28 2020 +0300 readme commit 6b210ff5ec6299ff24f0e9f202a587e313bb60c0 Author: Sergey Date: Fri May 15 16:34:34 2020 +0300 Отключение нагрева commit ece599d925b6b67e3013d2940b3d743bee2a0830 Author: Sergey Date: Fri May 15 15:56:16 2020 +0300 readme commit 35de438c2374c90b1ab9f801d6446b9e0a191a00 Author: Sergey Date: Fri May 15 15:49:06 2020 +0300 Readme Параметры в конфигурации commit 73fcda41c1ef80e38b5196264fce84694961a7ce Author: Sergey Date: Fri May 15 14:52:02 2020 +0300 Отключение нагрева, во время передачи файлов Драйвер для работы с I2C EEPROM commit dd65922e9ca934147cb62702c86f9c15bbcd1f42 Author: Sergey Date: Sun May 3 17:14:41 2020 +0300 Применение обновления из Marlin Исправлен вывод в uart на команды из файла на карте. commit b86720169cd7a07bfa473a5f4f79521a3b1c4f62 Author: Sergey Date: Fri Apr 24 00:08:41 2020 +0300 Собранные прошивки commit 81db25647aebe6bcba01b659bab81d3ab0a747b1 Author: Sergey Date: Thu Apr 23 23:57:25 2020 +0300 Исправлена конфигурация Сохранение файлов с русскими именами commit 0e1b83838f6cbca0e36452a8057ea40f6d8c778d Author: Sergey Date: Thu Apr 16 12:08:29 2020 +0300 Readme commit 71cf8a7a2df1c9166384f7fd76b88200d9e93184 Author: Sergey Date: Thu Apr 16 12:06:28 2020 +0300 Исправлена ошибка с сохранение файла размером кратным буферу (8К). Настройки в конфигурации для работы UART с октопринт и т.д. commit 5e8d0a8c1cd16db664c90d41c34a7e2549adc7e5 Author: Sergey Date: Tue Apr 14 16:12:01 2020 +0300 Исправлены бинарники commit a240f0ecc0a714c2edbbe8b1beb54d83813065a4 Author: Sergey Date: Tue Apr 14 15:53:37 2020 +0300 В готовых сборках не была отключена конфигурация ESP commit 2fe1a935c295111ec605c6e03ebea334111342bf Author: Sergey Date: Tue Apr 14 15:37:02 2020 +0300 Снова readme commit 4c75b039e4ad61335a99cadf59c07ceaef2abb9c Author: Sergey Date: Tue Apr 14 15:33:13 2020 +0300 readme commit 4ede26a7e59a8ee343313e02ea0ed97dc76b28c2 Author: Sergey Date: Tue Apr 14 15:29:57 2020 +0300 Готовые прошивки, readme commit 44d3475ed7ccc99bdf1d6a13a24ff0f6dd8eb243 Author: Sergey Date: Tue Apr 14 14:48:47 2020 +0300 Авто-старт после загрузки файлов Отключаемая отправка настроек ESP commit 712601a29f15fb32af51ac5ab2490c9493988b42 Author: Sergey Date: Thu Apr 9 09:59:40 2020 +0300 Remove github actions commit beb38a4bed8bb2e810a339b7572368e24355fdda Author: Sergey Date: Wed Apr 8 13:05:50 2020 +0300 Опечатки commit 68f4c029b3d72cb1a8d79f2c2b9799a6d970a77d Author: Sergey Date: Wed Apr 8 12:49:23 2020 +0300 README commit 080ddffe47fd75ce38d9a01c31c99bbcc93410c6 Merge: 693a0e381e 8a711e1ee8 Author: Sergey Date: Wed Apr 8 12:16:43 2020 +0300 Merge branch 'FB4S_Wifi_testing' into FB4S_WIFI commit 693a0e381ee533ac13d589d28635452513066818 Author: Sergey Date: Wed Apr 8 12:11:53 2020 +0300 ignore commit 8a711e1ee8b5aae548181fb5229ccbdb586147fe Author: Sergey Date: Wed Apr 8 12:09:39 2020 +0300 Игнор мусора commit 800d4f091dcdc11cbb5858a8da33ada88fde7ce4 Author: Sergey Date: Wed Apr 8 12:08:27 2020 +0300 Удаление мусора commit 254eb365ed59c6b5c6d2f33c8563db42eb0eac66 Author: Sergey Date: Wed Apr 8 11:59:55 2020 +0300 Robin_nano.bin => robin_nano35.bin commit cb74b463bcc84e790e0d8cae7e971c9a966baf55 Merge: f7fb563f65 0518dec60d Author: Sergey Date: Wed Apr 8 11:57:29 2020 +0300 Merge branch '2.0.x' into FB4S_Config commit 6668af3c8b7be70f507b71e15c2307ad5a5e6ce3 Author: Sergey Date: Wed Apr 8 11:49:20 2020 +0300 Шаблон wifi настроек commit d76c608f29ca6dd7d9f9667d7219d07a08a5591b Author: Sergey Date: Wed Apr 8 11:38:40 2020 +0300 Драйвер SDIO commit 094c65f14e6ff933146b0f6be0d885850d9da277 Author: Sergey Date: Tue Apr 7 15:25:33 2020 +0300 Прерывание не вызывается commit 24fe46548b25458524b69df9b5eaeef9cdc56938 Merge: aa8ca1c38b 8e10ed168d Author: Sergey Date: Tue Apr 7 15:24:59 2020 +0300 Merge branch 'Opt_speed' into FB4S_Wifi_testing commit 8e10ed168d456b85184a5dccdcd01418143e225f Author: Sergey Date: Tue Apr 7 00:02:29 2020 +0300 Оптимизация скорости commit aa8ca1c38b94591a7ad670b0f52552fec1952637 Author: Sergey Date: Mon Apr 6 13:31:59 2020 +0300 С буфером, не работает commit 38400a2e06ecd969119e7c7f8ef91075e0a8eb0f Author: Sergey Date: Sun Apr 5 09:12:23 2020 +0300 Чистка, вывод прогресса на экран, имя файла в скрипте сборки commit 881e89a4f75dcb4a3b80d9f1c11fc17fc285d1a8 Author: Sergey Date: Sat Apr 4 20:22:55 2020 +0300 Предварительно работает commit e127fb778d6ad1bddd2b96a11b141fac46df07a8 Author: Sergey Date: Sat Apr 4 19:20:28 2020 +0300 Работает с модулем MKS commit a9f15e388e5718aaa166d5aac4994b34483f50df Author: Sergey Date: Fri Apr 3 19:05:16 2020 +0300 Пакет начала передачи файлов commit 8ff3c7efc42a4049093a8409c6c386cb2bc05d30 Author: Sergey Date: Fri Apr 3 11:01:43 2020 +0300 Драйвер 2208 на E0 commit 8b5c01099017f1fa67b2811b5c8a3de5c7e5178b Author: Sergey Date: Thu Apr 2 22:54:08 2020 +0300 Работает команда M30 (удаление файлов) из Cura commit 3f8d7b105449958b0dedb03ac82252a3b7f715d4 Author: Sergey Date: Thu Apr 2 21:38:45 2020 +0300 FATfs, без вызовов функций commit fe1d76fa915a80e71141790d3104bc864e0dd150 Author: Sergey Date: Thu Apr 2 20:04:39 2020 +0300 Форматирование M20 исправлено commit 26027cf48fcd3bcae92d2a68c1d04442f5ffd076 Author: Sergey Date: Thu Apr 2 20:03:52 2020 +0300 Вывод IP при загрузке в SERIAL0 commit 70eb31d2db59fc33eb94ccea9d47fbab65749bf2 Author: Sergey Date: Thu Apr 2 20:02:35 2020 +0300 Шаги экструдера commit cca84156ced6b37311948b9777c1f331088da5a8 Author: Sergey Date: Thu Apr 2 11:59:38 2020 +0300 Минимальная температура экструдера commit 0271d32aca4a642cda8ad8fa750a9c370985d139 Author: Sergey Date: Wed Apr 1 21:34:19 2020 +0300 Настройки PID в прошивке. При подключении к WIFI показывает адрес на экране commit 85384ccc69d9866bb6bb7556c833c976c24452f7 Merge: 97e8aa4517 015c4e6fbd Author: Sergey Date: Wed Apr 1 20:28:00 2020 +0300 Merge branch '2.0.x' into FB4S_Wifi_testing commit 97e8aa45177c953a7e8137e926c77a9a7813fde0 Author: Sergey Date: Wed Apr 1 20:16:19 2020 +0300 Вывод списка файлов в куре commit e5b1dbe2a94eb8817f87173ef245aae2e0ad7f74 Author: Sergey Date: Mon Mar 30 18:53:46 2020 +0300 Вывод линных имен только в WIFI commit 2371b358ed4635c749f42c4ef8da7572216c6481 Author: Sergey Date: Mon Mar 30 18:46:14 2020 +0300 Вывод длинных имен в ответе на М20 commit f7e88f9f1626a2f1ef910e3416caf4c21e9f2d96 Author: Sergey Date: Mon Mar 30 17:10:57 2020 +0300 Установка параметров WIFI работает commit f64362f7193c5460f6cd6c26040f58d2e45296be Author: Sergey Date: Mon Mar 30 10:55:19 2020 +0300 Функция настройки параметров ESP commit 4b6268f1240f52f693f281bb0346aa3cf64c2fcb Author: Sergey Date: Mon Mar 30 10:25:43 2020 +0300 Вывод измененных сообщений только в Serial1 для WIFI commit 63b525165ef3f1871cd10e0d5cbdfa25067015e9 Author: Sergey Date: Sun Mar 29 23:14:41 2020 +0300 Ответ на 991 и 997 commit 4334ca1bb03e4dca163c22eda7e489a2433239b0 Author: Sergey Date: Sun Mar 29 22:18:46 2020 +0300 В ответ на M105 не выводить "ok" перед температурой commit c3299b9a61d86c09f15a0fff9466c455e1eae24a Author: Sergey Date: Sun Mar 29 22:09:18 2020 +0300 Функции в одном стиле, чистка commit 5c1f2ce98b82f7110f8a4e8b6721cd3a615b011a Author: Sergey Date: Sun Mar 29 21:55:44 2020 +0300 Формирование бинарного пакета на выход commit 9319c80be333f5aa30b5e7d839967f7e19b380b3 Author: Sergey Date: Sun Mar 29 20:17:39 2020 +0300 Перехват вывода символов commit 99710e0280381441aabe7760956cd462dadde788 Author: Sergey Date: Fri Mar 27 20:13:44 2020 +0300 Перехват символов из serial, скелет разбора пакета commit f7fb563f65de45b9a11cb388fd842574d0e0feba Author: Sergey Date: Thu Mar 26 22:07:55 2020 +0300 Сборка по умолчанию commit f7a507cb49ce840385426cfd338e26e2e8d6e211 Author: Sergey Date: Thu Mar 26 16:12:27 2020 +0300 remove Ozone config commit 4bbb839cacbd9e564ecd9f67e32d26a153f3c8da Author: Sergey Date: Thu Mar 26 16:07:01 2020 +0300 Шаблон инита MKS, прерывание на IO0 commit 96a692ff84e5de8ddaaa2af170f29aa745c9fae4 Author: Sergey Date: Thu Mar 26 15:17:01 2020 +0300 MKS WIFI Pins commit f72676d7c5a5fab4ad57a37f0b9c6a1e8e7ad986 Author: Sergey Date: Thu Mar 26 15:16:35 2020 +0300 Segger RTT commit c77305d5d6736b64676b6a49f1a4507926622838 Author: Sergey Date: Thu Mar 26 12:16:06 2020 +0300 Доп. меню, скролл имен файлов commit 9b38017e8a96b38741f14258e64585d8f0138ec6 Author: Sergey Date: Thu Mar 26 11:26:41 2020 +0300 Рабочий конфиг под 4S commit ebf99b197c85ca5e09b97250c950a83fd239a372 Merge: 5535971cdc 7124b2164d Author: Sergey Date: Thu Mar 26 11:25:34 2020 +0300 Merge branch '2.0.x' into FB4S_Config commit 5535971cdcd4bfe4ef043e044198bcafea789f0b Author: Sergey Date: Thu Mar 26 11:21:06 2020 +0300 Тестовый конфиг по 2.0.4 --- Marlin/src/module/temperature.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp index 0f6395b127..3a19d60d92 100644 --- a/Marlin/src/module/temperature.cpp +++ b/Marlin/src/module/temperature.cpp @@ -953,8 +953,8 @@ int16_t Temperature::getHeaterPower(const heater_id_t heater_id) { inline void loud_kill(PGM_P const lcd_msg, const heater_id_t heater_id) { marlin_state = MF_KILLED; + thermalManager.disable_all_heaters(); #if USE_BEEPER - thermalManager.disable_all_heaters(); for (uint8_t i = 20; i--;) { WRITE(BEEPER_PIN, HIGH); delay(25);