Merge branch 'CrealityDwin2.0_Bleeding' into CrealityDwin_2.0

Merge branch 'CrealityDwin2.0_Bleeding' of https://github.com/InsanityAutomation/Marlin into CrealityDwin2.0_Bleeding
Update Creality_DWIN.h
2021-04-03 11:11:01 -04:00 · 2021-02-24 09:09:47 -05:00 · 2021-02-24 09:09:13 -05:00 · 2021-02-23 18:41:46 -05:00 · 2021-02-23 14:28:20 -05:00 · 2021-02-19 23:11:46 -05:00
1769 changed files with 33579 additions and 57066 deletions
@@ -4,10 +4,10 @@ root = true
 [{*.patch,syntax_test_*}]
 trim_trailing_whitespace = false

-[{*.c,*.cpp,*.h,*.ino}]
+[{*.c,*.cpp,*.h}]
 charset = utf-8

-[{*.c,*.cpp,*.h,*.ino,Makefile}]
+[{*.c,*.cpp,*.h,Makefile}]
 trim_trailing_whitespace = true
 insert_final_newline = true
 end_of_line = lf
@@ -56,31 +56,28 @@ jobs:

        # STM32F1 (Maple) Environments

-        #- STM32F103RC_btt_maple
-        - STM32F103RC_btt_USB_maple
+        - STM32F103RC_btt
+        - STM32F103RC_btt_USB
+        - STM32F103RE_btt
+        - STM32F103RE_btt_USB
        - STM32F103RC_fysetc
        - STM32F103RC_meeb
        - jgaurora_a5s_a1
        - STM32F103VE_longer
-        #- mks_robin_maple
+        - mks_robin
        - mks_robin_lite
        - mks_robin_pro
-        #- mks_robin_nano35_maple
-        #- STM32F103RET6_creality_maple
+        - STM32F103RET6_creality
+        - mks_robin_nano35

        # STM32 (ST) Environments

-        - STM32F103RC_btt
-        #- STM32F103RC_btt_USB
-        - STM32F103RE_btt
-        - STM32F103RE_btt_USB
-        - STM32F103RET6_creality
        - STM32F407VE_black
        - STM32F401VE_STEVAL
        - BIGTREE_BTT002
        - BIGTREE_SKR_PRO
        - BIGTREE_GTR_V1_0
-        - mks_robin
+        - mks_robin_stm32
        - ARMED
        - FYSETC_S6
        - STM32F070CB_malyan
@@ -89,12 +86,9 @@ jobs:
        - FLYF407ZG
        - rumba32
        - LERDGEX
-        - LERDGEK
-        - mks_robin_nano35
+        - mks_robin_nano35_stm32
        - NUCLEO_F767ZI
        - REMRAM_V1
-        - BTT_SKR_SE_BX
-        - chitu_f103

        # Put lengthy tests last

@@ -104,7 +98,6 @@ jobs:
        # Non-working environment tests
        #- at90usb1286_cdc
        #- STM32F103CB_malyan
-        #- STM32F103RE
        #- mks_robin_mini

    steps:
@@ -122,6 +122,29 @@ tags
 .gcc-flags.json
 /lib/

+# Workaround for Deviot+platformio quirks
+Marlin/lib
+Marlin/platformio.ini
+Marlin/*/platformio.ini
+Marlin/*/*/platformio.ini
+Marlin/*/*/*/platformio.ini
+Marlin/*/*/*/*/platformio.ini
+Marlin/.travis.yml
+Marlin/*/.travis.yml
+Marlin/*/*/.travis.yml
+Marlin/*/*/*/.travis.yml
+Marlin/*/*/*/*/.travis.yml
+Marlin/.gitignore
+Marlin/*/.gitignore
+Marlin/*/*/.gitignore
+Marlin/*/*/*/.gitignore
+Marlin/*/*/*/*/.gitignore
+Marlin/readme.txt
+Marlin/*/readme.txt
+Marlin/*/*/readme.txt
+Marlin/*/*/*/readme.txt
+Marlin/*/*/*/*/readme.txt
+
 # Secure Credentials
 Configuration_Secure.h

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
InsanityAutomation	9c5ee355e8	Merge branch 'CrealityDwin2.0_Bleeding' into CrealityDwin_2.0	2021-04-03 11:11:01 -04:00
InsanityAutomation	656946a0ff	Merge branch 'CrealityDwin2.0_Bleeding' of https://github.com/InsanityAutomation/Marlin into CrealityDwin2.0_Bleeding	2021-02-24 09:09:47 -05:00
InsanityAutomation	48e02a3210	Update Creality_DWIN.h	2021-02-24 09:09:13 -05:00
InsanityAutomation	6891ef5d00	Update Configuration.h	2021-02-23 18:41:46 -05:00
InsanityAutomation	c392e6bf07	Minor tweaks	2021-02-23 14:28:20 -05:00
InsanityAutomation	de564f9b0a	add 7.2 hex files	2021-02-19 23:11:46 -05:00
InsanityAutomation	c9aab13192	Merge branch 'bugfix-2.0.x' into CrealityDwin2.0_Bleeding	2021-02-19 10:17:09 -05:00
InsanityAutomation	a13ebba41a	Merge pull request #168 from DrDMoney/patch-1 Update Configuration.h	2021-02-11 15:51:21 -05:00
InsanityAutomation	b1153cff1e	Merge pull request #176 from x13-me/CrealityDwin_2.0 Added Ender 3 to Readme.md	2021-02-11 15:48:59 -05:00
InsanityAutomation	9aa0004de6	Disable broken feature until I can trace it down	2021-02-10 07:39:53 -05:00
InsanityAutomation	3a9f043c58	Update temperature.cpp	2021-02-10 07:26:20 -05:00
InsanityAutomation	80123bfdf2	fix platform	2021-02-10 07:24:51 -05:00
InsanityAutomation	923ce8e1d8	Merge branch 'bugfix-2.0.x' into CrealityDwin2.0_Bleeding	2021-02-10 07:09:49 -05:00
InsanityAutomation	c72fc3eaec	Update platformio.ini	2021-02-06 11:04:09 -05:00
InsanityAutomation	3aa0763f26	Update Creality_DWIN.cpp	2021-02-02 11:17:12 -05:00
InsanityAutomation	96bee60be9	Update dwin.cpp	2021-02-02 09:33:22 -05:00
InsanityAutomation	b5df47bdf7	Add missing extui functions	2021-01-31 17:18:06 -05:00
InsanityAutomation	c27474f396	Update Version.h	2021-01-31 15:37:45 -05:00
InsanityAutomation	6af2c36c50	Add E3V2 427 Env	2021-01-31 15:31:38 -05:00
InsanityAutomation	577ebc6ba4	Reimplement live move	2021-01-31 15:27:46 -05:00
InsanityAutomation	4b0135c022	Merge branch 'bugfix-2.0.x' into CrealityDwin2.0_Bleeding	2021-01-31 13:27:55 -05:00
x13.me	27e95f2aab	Added Ender 3 to Readme.md	2021-01-25 02:18:13 +00:00
InsanityAutomation	247385e94e	Update platformio.ini	2021-01-06 19:05:44 -05:00
Daniel Mooney	aafa3af088	Update Configuration.h PSU_ACTIVE_HIGH should be PSU_ACTIVE_STATE PSU_ACTIVE_STATE set from false to low.	2020-12-12 14:23:00 -06:00
InsanityAutomation	12e230ca30	Update Configuration.h	2020-12-08 21:29:09 -05:00
InsanityAutomation	225a89004b	Poweroff kit	2020-12-05 19:36:09 -05:00
InsanityAutomation	0b6aa3cb2d	Update Creality_DWIN.cpp	2020-11-10 09:04:21 -05:00
InsanityAutomation	e7d3e67dc4	Merge branch 'CrealityDwin2.0_Bleeding' of https://github.com/InsanityAutomation/Marlin into CrealityDwin2.0_Bleeding	2020-11-08 14:14:53 -05:00
InsanityAutomation	8fd37402a3	Bump rev, invert flag	2020-11-08 14:14:07 -05:00
InsanityAutomation	7cf72d5867	Rebase and catchup add 2130 option for SKR Update platformio.ini Add SKRMini and DDX Rebase and catchup add 2130 option for SKR Update platformio.ini Minor adjustments following github issues Update Creality_DWIN.cpp Update Configuration_adv.h Update platformio.ini Rebase and catchup add 2130 option for SKR Update platformio.ini Add SKRMini and DDX Rebase and catchup add 2130 option for SKR Update platformio.ini Minor adjustments following github issues Update Creality_DWIN.cpp Update Configuration_adv.h Clean up rebase Update platformio.ini Update platformio.ini Add Ender3V2 Update Configuration.h tweaks for e3v2 Fixes Add 32 bit Ender3's eparser and display fixes MachineEnder3Pro420 -> MachineEnder3Pro422 force silent board for all v4 pcb's Update Configuration.h Implement fix from https://github.com/cosmoderp/Marlin/commit/5c8e1e7d4af37e25fb9040dcbf690bbb089948e6 Live axis move and z offset Update dwin.cpp Fix info menu screens borders etc e3v2 Ender 5 SKRMini Tweaks Update Version.h Add layer shift rapid correction logic and creality stm32f01 environments for E3V2 changes for melzi to fit Update Configuration.h Add DW7 Hex Files Support 10SPro display on Ender3 422 and 427 boards Update dwin.cpp Update Configuration_adv.h Update Configuration.h	2020-11-08 13:47:02 -05:00
InsanityAutomation	a348c3caa9	Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.0.x	2020-11-06 09:30:48 -05:00
InsanityAutomation	6f5430f00a	Update Configuration.h	2020-10-26 10:44:44 -04:00
InsanityAutomation	63821d87f9	Update Configuration_adv.h	2020-10-23 14:57:19 -04:00
InsanityAutomation	b5f447f144	Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.0.x	2020-10-23 14:32:10 -04:00
InsanityAutomation	4a56689801	Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.0.x	2020-10-22 09:13:59 -04:00
Scott Lahteine	0216e032be	Host prompt followup	2020-10-19 04:34:14 -05:00
Scott Lahteine	2d8aa0cea1	Tweak a host prompt call	2020-10-19 04:25:48 -05:00
InsanityAutomation	50f10fc57f	Update dwin.cpp	2020-10-08 15:56:54 -04:00
InsanityAutomation	12180f20e5	Support 10SPro display on Ender3 422 and 427 boards	2020-10-01 21:20:50 -04:00
InsanityAutomation	f5dc8d73ee	Add DW7 Hex Files	2020-09-26 10:51:50 -04:00
InsanityAutomation	00e3806613	Update Configuration.h	2020-09-24 12:54:05 -04:00
InsanityAutomation	7296538849	changes for melzi to fit	2020-09-24 09:53:13 -04:00
InsanityAutomation	6c4e3e9215	Add layer shift rapid correction logic and creality stm32f01 environments for E3V2	2020-09-21 10:13:07 -04:00
InsanityAutomation	4f050e8dc9	Update Version.h	2020-09-15 16:53:04 -04:00
InsanityAutomation	e50e446676	Ender 5 SKRMini Tweaks	2020-09-14 21:38:07 -04:00
InsanityAutomation	b795860c5a	borders etc e3v2	2020-09-13 22:35:56 -04:00
InsanityAutomation	b97b2b9df8	Fix info menu screens	2020-09-13 11:20:52 -04:00
InsanityAutomation	c6bdb2cd95	Update dwin.cpp	2020-09-08 07:48:53 -04:00
InsanityAutomation	f409cf8c87	Live axis move and z offset	2020-09-07 19:20:22 -04:00
InsanityAutomation	fbb75f41c2	Implement fix from https://github.com/cosmoderp/Marlin/commit/5c8e1e7d4af37e25fb9040dcbf690bbb089948e6	2020-09-05 15:13:10 -04:00
InsanityAutomation	d560a493b2	Update Configuration.h	2020-09-03 13:31:32 -04:00
InsanityAutomation	0395b7563e	force silent board for all v4 pcb's	2020-09-03 13:19:53 -04:00
InsanityAutomation	ebd414b3d5	MachineEnder3Pro420 -> MachineEnder3Pro422	2020-09-03 12:37:58 -04:00
InsanityAutomation	0c8bafba38	eparser and display fixes	2020-09-03 12:33:39 -04:00
InsanityAutomation	65d5c57957	Add 32 bit Ender3's	2020-09-03 12:30:06 -04:00
InsanityAutomation	b1d667c04a	Fixes	2020-09-03 12:03:20 -04:00
InsanityAutomation	ee8ea7a0b5	tweaks for e3v2	2020-09-03 12:03:20 -04:00
InsanityAutomation	89ac692bcc	Update Configuration.h	2020-09-03 12:03:20 -04:00
InsanityAutomation	88410b3cfe	Add Ender3V2	2020-09-03 12:03:20 -04:00
InsanityAutomation	60eb467bfe	Update platformio.ini	2020-09-03 12:03:03 -04:00
InsanityAutomation	1c3407ed62	Update platformio.ini	2020-09-03 12:03:03 -04:00
InsanityAutomation	82064d2341	Clean up rebase	2020-09-03 12:03:03 -04:00
InsanityAutomation	16b7cffe0f	Update Configuration_adv.h	2020-09-03 12:03:03 -04:00
InsanityAutomation	638bac84cf	Update Creality_DWIN.cpp	2020-09-03 12:03:03 -04:00
InsanityAutomation	9d3ad76d50	Minor adjustments following github issues	2020-09-03 12:03:03 -04:00
InsanityAutomation	6edb31f58c	Update platformio.ini	2020-09-03 12:02:49 -04:00
InsanityAutomation	01297cab24	add 2130 option for SKR	2020-09-03 12:02:49 -04:00
InsanityAutomation	80fa195db3	Rebase and catchup	2020-09-03 12:02:49 -04:00
InsanityAutomation	052b4387d3	Add SKRMini and DDX	2020-09-03 12:02:34 -04:00
InsanityAutomation	dd5481b001	Update platformio.ini	2020-09-03 12:02:14 -04:00
InsanityAutomation	59e1371f89	add 2130 option for SKR	2020-09-03 12:02:13 -04:00
InsanityAutomation	4fdcae6677	Rebase and catchup	2020-09-03 12:02:13 -04:00
InsanityAutomation	1c3dcae659	Update platformio.ini	2020-09-03 12:01:58 -04:00
InsanityAutomation	ec425de694	Update Configuration_adv.h	2020-09-03 12:01:58 -04:00
InsanityAutomation	29899e6fe8	Update Creality_DWIN.cpp	2020-09-03 12:01:58 -04:00
InsanityAutomation	f7eaa32bc9	Minor adjustments following github issues	2020-09-03 12:01:58 -04:00
InsanityAutomation	508dc26394	Update platformio.ini	2020-09-03 12:01:33 -04:00
InsanityAutomation	600d5922da	add 2130 option for SKR	2020-09-03 12:01:33 -04:00
InsanityAutomation	a2efee8b7b	Rebase and catchup	2020-09-03 12:01:32 -04:00
InsanityAutomation	239e4737a8	Add SKRMini and DDX	2020-09-03 12:01:00 -04:00
InsanityAutomation	c8577bc673	Update platformio.ini	2020-09-03 12:00:22 -04:00
InsanityAutomation	3bd2ed7310	add 2130 option for SKR	2020-09-03 12:00:22 -04:00
InsanityAutomation	79414a1398	Rebase and catchup	2020-09-03 12:00:22 -04:00