Update Configuration.h

Marlin/Configuration.h

@@ -4,7 +4,7 @@
    Select Machine
 */
 
-
+#define DWIN_PORTRAIT
 
 // Touchscreen
 //#define MachineCR10SPro // Graphics LCD Requires soldering R64 and R66
@@ -3030,10 +3030,10 @@
     #define Z_MAX_POS 405
     #define ClipClearance 5
   #elif ANY(MachineEnder3, MachineEnder3V2)
-    #define X_BED_SIZE 230
-    #define Y_BED_SIZE 230
+    #define X_BED_SIZE 220
+    #define Y_BED_SIZE 220
     #define Z_MAX_POS 250
-    #define X_MAX_POS 245
+    #define X_MAX_POS 220
     #define Y_MAX_POS 240
     #define ClipClearance 15
   #elif ANY(MachineEnder3S1)

Marlin/Version.h

@@ -28,7 +28,7 @@
 /**
  * Marlin release version identifier
  */
-#define SHORT_BUILD_VERSION "DW7.4.8"
+#define SHORT_BUILD_VERSION "DW7.4.9"
 
 /**
  * Verbose version identifier which should contain a reference to the location
@@ -124,7 +124,7 @@
 #define VerChar6 "N"
 #endif
 
-#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION " TM3D " VerChar1 VerChar2 VerChar3 VerChar4 VerChar5 VerChar6
+#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION " FL " VerChar1 VerChar2 VerChar3 VerChar4 VerChar5 VerChar6
 
 /**
  * The STRING_DISTRIBUTION_DATE represents when the binary file was built,
@@ -136,58 +136,64 @@
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
  */
+#if ENABLED(MACHINE_PRO)
+  #define MACHINEPRO " Pro"
+#else
+  #define MACHINEPRO ""
+#endif
+
 #if(ENABLED(MachineMini))
   #define CUSTOM_MACHINE_NAME "Mini SuPeR"
 #elif(ENABLED(MachineCR10Smart))
-  #define CUSTOM_MACHINE_NAME "TM3D CR10Smart"
+  #define CUSTOM_MACHINE_NAME "CR10Smart"
 #elif(ENABLED(MachineCR10SmartPro))
-  #define CUSTOM_MACHINE_NAME "TM3D CR10SmartPro"
+  #define CUSTOM_MACHINE_NAME "CR10SmartPro"
 #elif(ENABLED(MachineEnder2))
-  #define CUSTOM_MACHINE_NAME "TM3D Ender2"
+  #define CUSTOM_MACHINE_NAME "Ender2"
 #elif(ENABLED(MachineEnder2Pro))
-  #define CUSTOM_MACHINE_NAME "TM3D Ender2 Pro"
+  #define CUSTOM_MACHINE_NAME "Ender2 Pro"
 #elif(ENABLED(MachineEnder3))
-  #define CUSTOM_MACHINE_NAME "TM3D Ender3"
+  #define CUSTOM_MACHINE_NAME "Ender3" MACHINEPRO
 #elif(ENABLED(MachineEnder3Max))
-  #define CUSTOM_MACHINE_NAME "TM3D E3Max"
+  #define CUSTOM_MACHINE_NAME "E3Max"
 #elif(ENABLED(MachineEnder6))
-  #define CUSTOM_MACHINE_NAME "TM3D Ender6"
+  #define CUSTOM_MACHINE_NAME "Ender6"
 #elif(ENABLED(MachineEnder7))
-  #define CUSTOM_MACHINE_NAME "TM3D Ender7"
+  #define CUSTOM_MACHINE_NAME "Ender7"
 #elif(ENABLED(MachineEnder3V2))
-  #define CUSTOM_MACHINE_NAME "TM3D Ender3V2"
+  #define CUSTOM_MACHINE_NAME "Ender3V2"
 #elif(ENABLED(MachineEnder3S1))
-  #define CUSTOM_MACHINE_NAME "TM3D Ender3S1"
+  #define CUSTOM_MACHINE_NAME "Ender3S1"
 #elif(ENABLED(MachineEnder4))
-  #define CUSTOM_MACHINE_NAME "TM3D Ender4"
+  #define CUSTOM_MACHINE_NAME "Ender4"
 #elif(ENABLED(MachineEnder5))
-  #define CUSTOM_MACHINE_NAME "TM3D Ender5"
+  #define CUSTOM_MACHINE_NAME "Ender5" MACHINEPRO
 #elif(ENABLED(MachineEnder5Plus))
-  #define CUSTOM_MACHINE_NAME "TM3D E5 Plus"
+  #define CUSTOM_MACHINE_NAME "E5 Plus"
 #elif(ENABLED(MachineCR20))
-  #define CUSTOM_MACHINE_NAME "SuPeR CR-20"
+  #define CUSTOM_MACHINE_NAME "CR-20"
 #elif(ENABLED(MachineCR10Orig))
-  #define CUSTOM_MACHINE_NAME "SuPeR CR-10"
+  #define CUSTOM_MACHINE_NAME "CR-10"
 #elif(ENABLED(MachineCRX))
-  #define CUSTOM_MACHINE_NAME "TM3D CR-X"
+  #define CUSTOM_MACHINE_NAME "CR-X"
 #elif ENABLED(MachineCR10SProV2)
-  #define CUSTOM_MACHINE_NAME "TM3D 10SProV2"
+  #define CUSTOM_MACHINE_NAME "10SProV2"
 #elif(ENABLED(MachineCR10SPro))
-  #define CUSTOM_MACHINE_NAME "TM3D 10S Pro"
+  #define CUSTOM_MACHINE_NAME "10S Pro"
 #elif(ENABLED(MachineCR10Max))
-  #define CUSTOM_MACHINE_NAME "TM3D Max"
+  #define CUSTOM_MACHINE_NAME "CR10Max"
 #elif(ENABLED(MachineCR10SV3))
-  #define CUSTOM_MACHINE_NAME "TM3D CR10V3"
+  #define CUSTOM_MACHINE_NAME "CR10V3"
 #elif(ENABLED(MachineCR10SV2))
-  #define CUSTOM_MACHINE_NAME "TM3D CR10V2"
+  #define CUSTOM_MACHINE_NAME "CR10V2"
 #elif(ENABLED(MachineCR10Std))
-  #define CUSTOM_MACHINE_NAME "300 SuPeR"
+  #define CUSTOM_MACHINE_NAME "CR10300"
 #elif(ENABLED(MachineS4))
-  #define CUSTOM_MACHINE_NAME "400 SuPeR"
+  #define CUSTOM_MACHINE_NAME "CR10400"
 #elif(ENABLED(MachineS5))
-  #define CUSTOM_MACHINE_NAME "500 SuPeR"
+  #define CUSTOM_MACHINE_NAME "CR10500"
 #elif ENABLED(MachineCR2020)
-  #define CUSTOM_MACHINE_NAME "TM3D 2020"
+  #define CUSTOM_MACHINE_NAME "CR2020"
 #elif ENABLED(MachineSermoonD1)
   #define CUSTOM_MACHINE_NAME "SermoonD1"
 #elif ENABLED(MachineCR5)
@@ -213,7 +219,7 @@
  * The WEBSITE_URL is the location where users can get more information such as
  * documentation about a specific Marlin release.
  */
-#define WEBSITE_URL "tinymachines3d.com"
+#define WEBSITE_URL "https://www.amazon.com/s?k=F1RST+LAYER"
 
 /**
  * Set the vendor info the serial USB interface, if changable

Marlin/src/lcd/e3v2/marlinui/ui_common.cpp

@@ -109,7 +109,7 @@ void MarlinUI::clear_lcd() {
       #define VERSION_Y   84
     #endif
     dwinJPGShowAndCache(0); // Ensure DACAI stays on boot screen
-    dwinDrawString(false, font10x20, Color_Yellow, Color_Bg_Black, INFO_CENTER - (dwin_string.length * 10) / 2, 230, S(dwin_string.string()));
+    dwinDrawString(false, font10x20, COLOR_YELLOW, COLOR_BG_BLACK, INFO_CENTER - (dwin_string.length * 10) / 2, 230, S(dwin_string.string()));
     TERN_(SHOW_CUSTOM_BOOTSCREEN, safe_delay(CUSTOM_BOOTSCREEN_TIMEOUT));
     clear_lcd();
 

Marlin/src/lcd/extui/dgus_creality/DGUSScreenHandler.h

@@ -26,6 +26,8 @@
 
 #include "../../../inc/MarlinConfig.h"
 
+#include "../../../module/motion.h"
+
 #if HAS_COLOR_LEDS
   #include "../../../feature/leds/leds.h"
 

Marlin/src/lcd/extui/dgus_creality_lcd.cpp

@@ -203,15 +203,20 @@ bool hasPrintTimer = false;
     }
 
     void onMeshUpdate(const int8_t xpos, const int8_t ypos, const float zval) {
-      ScreenHandler.OnMeshLevelingUpdate(xpos, ypos, zval);
+      #if HAS_BED_PROBE
+        ScreenHandler.OnMeshLevelingUpdate(xpos, ypos, zval);
+      #endif
     }
 
     void onMeshUpdate(const int8_t xpos, const int8_t ypos, const ExtUI::probe_state_t state) {
-      ScreenHandler.OnMeshLevelingUpdate(xpos, ypos, 0);
+      #if HAS_BED_PROBE
+        ScreenHandler.OnMeshLevelingUpdate(xpos, ypos, 0);
+      #endif
     }
     void onLevelingDone() {
 
     }
+
   #endif
 
   #if ENABLED(POWER_LOSS_RECOVERY)

Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.cpp

@@ -310,6 +310,10 @@ if(idleThrottling == 400) {
       rtscheck.RTS_SndData(28, RunoutMode);
     if(getRunoutMode(getActiveTool()) == 7)
       rtscheck.RTS_SndData(25, RunoutMode);
+    if(getFilamentRunoutEnabled(getActiveTool()))
+      rtscheck.RTS_SndData(3, RunoutToggle); /*On*/
+    else
+      rtscheck.RTS_SndData(2, RunoutToggle); /*Off*/
   #endif
 
   switch(babystepIncrementIndex)
@@ -358,11 +362,13 @@ if(idleThrottling == 400) {
 }
   if(idleThrottling == 500) {
 
-  #if ENABLED(CASE_LIGHT_ENABLE)
+  #if CASE_LIGHT_ENABLE
     if(getCaseLightState())
       rtscheck.RTS_SndData(3, LedToggle); /*On*/
     else
       rtscheck.RTS_SndData(2, LedToggle); /*Off*/
+  #else
+    rtscheck.RTS_SndData(2, LedToggle); /*Off*/
   #endif
 
   #if ENABLED(POWER_LOSS_RECOVERY)
@@ -370,7 +376,10 @@ if(idleThrottling == 400) {
       rtscheck.RTS_SndData(3, PowerLossToggle); /*On*/
     else
       rtscheck.RTS_SndData(2, PowerLossToggle); /*Off*/
+  #else
+    rtscheck.RTS_SndData(2, PowerLossToggle); /*Off*/
   #endif
+
 }
 
   if (startprogress == 0)
@@ -2432,7 +2441,7 @@ void SetTouchScreenConfiguration() {
   if (Settings.display_sound) cfg_bits |= 1UL << 3; // 3: audio
   if (Settings.display_standby) cfg_bits |= 1UL << 2; // 2: backlight on standby
   if(Settings.screen_rotation==10) cfg_bits |= 1UL << 1; // 1 & 0: Inversion
-  #if DISABLED(LOWRES_DWIN)
+  #if (DISABLED(LOWRES_DWIN) && DISABLED(DWIN_PORTRAIT)) || (ENABLED(LOWRES_DWIN) && ENABLED(DWIN_PORTRAIT))
     cfg_bits |= 1UL << 0; // Portrait Mode or 800x480 display has 0 point rotated 90deg from 480x272 display
   #endif
 

Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.h

@@ -74,7 +74,6 @@ namespace ExtUI {
 #define	PrintscheduleIcon		0x100E
 #define	Timehour			0x1010
 #define	Timemin				0x1012
-#define	IconPrintstatus		0x1014
 #define	Percentage			0x1016
 #define	FanKeyIcon			0x101E
 #define Flowrate        0x1300

README.md

@@ -1,6 +1,13 @@
-## Creality Touch/TFT Screen supported firmware
+## Creality 427 Board TFT and Touchscreen Firmware For F1rst Layer Kits
 
-This branch adds support for the Creality touchscreen machines and was split off from the standard Creality branches due to specific custom changes not found upstream. This includes extensions to the EXTui framework among other smaller tweaks that we have been working towards getting submitted upstream. Machines supported here are :
+This branch is specifically intended to support the kits sold by F1rst Layer including Creality 427 boards, touchscreens, and other upgrades.
+
+
+- [Dual Gear Extruders](https://amzn.to/3lZfg08)
+- [Creality 427 Board with Runout Sensor](https://amzn.to/2Y1jrke)
+- [Creality 427 Board and BLTouch](https://amzn.to/3CT57Jk)
+- [E3V2 Upgrade Kit (Screen, 427 board, bltouch, runout)](https://amzn.to/3EZnhec)
+- [Ender 3 100mm Z Extension Kit](https://amzn.to/2XWH78F)
 
 - [CR10S Pro / V2](https://www.tinymachines3d.com/products/cr-10s-pro-v2-3d-printer?rfsn=3419592.cc302fe)
 - [CR10 Max](https://www.tinymachines3d.com/products/creality-cr-10-max-3d-printer?rfsn=3419592.cc302fe)
@@ -61,9 +68,7 @@ There is a limitation with Windows systems and path depth so the file names need
 
 ## Support
 
-This firmware is provided to the public as-is with no warranty or guarantee. It's based on a large open source project and there is no entitlement to support. That said, Tiny Machines 3D customers may obtain
-support through their normal support queue. I will provide support to Patreons as I am able. If you require more immediate support and are not a Tiny Machines 3D customer, you may contact them at
-support@tinymachines3d.com about purchasing support hours. Aside from this, we are active on many Facebook groups as well as several discord channels and typically help anyone we can when we come across them.
+This firmware is provided to the public as-is with no warranty or guarantee. It's based on a large open source project and there is no entitlement to support. If you are a F1rst Layer customer, you can contact them for support. I will provide support to Patreons as I am able. If you require more immediate support and are not a Tiny Machines 3D or F1rst Layer customer, you may contact Tiny Machines at support@tinymachines3d.com about purchasing support hours. Aside from this, we are active on many Facebook groups as well as several discord channels and typically help anyone we can when we come across them.
 
 We have now created a dedicated Discord server to handle support and archive relevant guides and instructions. Patreon supporters will get priority assistance.
 
@@ -138,47 +143,13 @@ Insanity Automation Discord - https://discord.gg/TKmJ85PyG4
  - CR30 Support Added
 
 ## Primary Notes for DW7.4
-- Added Screen Calibration Options
--- Standby Brightness
--- Volume
--- Both now saved in EEPROM
--- Screen configuration code based loosely on the work from the CR6 community modified for this screen model
--- Automatic Screen rotation for the Ender 6 (Default is upside-down)
-- Manual Mesh Controls for no Probe machines
--- CRX and Ender 6 with no Probe can now use all mesh controls
--- All machines now use the same screen files except for Ender 3 V2 Rotary Dial machines and CR6
-- Home button added to 5 point adjustment screen
-- Tap mesh values to manually type in a new value - allows for manual adjustment of mesh values
-- Additional functions, messaging on pause / filament runout
--- No will no longer cancel print
--- Depending on state, if only option is continue (eg Reheat, Load filament) Any response continues
--- On final Confirm Continue, No will purge more filament and Yes will resume
-- Most places temperatures are shown, can now tap them to type in a value to set the temerature
-- Updated to Marlin 2.0.9 Base
-- CR6 Branches merged in
--- Support for this machine is primarily based on the fork by the [CR6 Community](https://github.com/CR6Community)
-
-## Primary notes for DW7.3
-- File browser rewritten to support paging as well as subdirectories
--- New file browser has a limit of a 66 character directory depth. This can be expanded at the cost of more RAM if users find this more limiting.
--- Due to the above, the current recommendation is to try and limit folder depth to 3 subdirectories and keep names short if possible.
-- Base bumped to Marlin Bugfix as of 20210418
-
-# Changes for DW7.3.1
-- Added SD file refresh button for users with damaged SD Detect Pins
-- Modified print finish button action to raise z by 5mm and disable steppers rather than rehome XY
-- Solve rounding issue with babystepping below step precision by forcing always round up caused by recent upstream change
-- Modified babystepping resolution for fine adjustment to .02mm from .01mm
-- Force file pages to reset paging value on entry to screen to prevent incorrect scrolling
-- Additional string length buffer safeties
-
-The default build button is now a batch Build All! If you want to build a custom stock 2560 environment, use the env:megaatmega2560 environment.
-For SKR 1.3/1.4 boards use the LPC1768/9 environments as usual. For SKR Mini or Creality STM32F1 boards use the standard STM32 environments per vendor.
+- Touch screen primarily based on the fork by the [CR6 Community](https://github.com/CR6Community)
+- E3V2 is currently using the modified Jyers UI as merged into Marlin upstream
 
 ## About Our Branches
 
-The firmware branches maintained here are made possible by the support of [Tiny Machines 3D](https://www.tinymachines3d.com/?rfsn=3419592.cc302fe) as well as our customer base through our 3D printing Services.
-Maintaining and developing these branches takes a significant investment, made up of time and machines. To support continued development, please consider your next 3D Printer related purchase from Tiny Machines 3D
+The firmware branches maintained here are made possible by the support of [F1rst Layer](https://amzn.to/2XWHVdH) and [Tiny Machines 3D](https://www.tinymachines3d.com/?rfsn=3419592.cc302fe) as well as our customer base through our 3D printing Services.
+Maintaining and developing these branches takes a significant investment, made up of time and machines. To support continued development, please consider your next 3D Printer purchases from Tiny Machines 3D, F1rst Layer, Bondtech, or Slice Engineering and thank them for supporting open source!
 and thank them for supporting open source development. Or, consider us for printing services outside of your machine’s capabilities. Print service requests can be sent to d.menzel@insanityautomation.com and we will
 respond typically within 1 working day. If you do not need anything printed or a 3D Printer but still want to contribute, you can support us through [Patreon](https://www.patreon.com/InsanityAutomation).