sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

📝 Update Ender # labels

Browse Source
This commit is contained in:
Scott Lahteine
2023-04-06 17:24:32 -05:00
parent 42a5ae8716
commit 5b1f087c5b
20 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/bug_report.yml vendored
View File

@@ -100,7 +100,7 @@ body:
- type: input - type: input
attributes: attributes:
label: Printer model label: Printer model
description: Creality Ender 3, Prusa mini, or Kossel Delta? description: Creality Ender-3, Prusa mini, or Kossel Delta?
- type: input - type: input
attributes: attributes:

2
Marlin/src/inc/SanityCheck.h
View File

@@ -3274,7 +3274,7 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE, "Movement bounds (X_MIN_POS, X_MAX_POS
#endif #endif
/** /**
* Ender 3 V2 controller has some limitations * Ender-3 V2 controller has some limitations
*/ */
#if ENABLED(DWIN_CREALITY_LCD) #if ENABLED(DWIN_CREALITY_LCD)
#if DISABLED(SDSUPPORT) #if DISABLED(SDSUPPORT)

4
Marlin/src/lcd/e3v2/README.md
View File

@@ -1,6 +1,6 @@
# DWIN for Creality Ender 3 v2 # DWIN for Creality Ender-3 v2
Marlin's Ender 3 v2 support requires the `DWIN_SET` included with the Ender 3 V2 [example configuration](https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.1.x/config/examples/Creality/Ender-3%20V2). Marlin's Ender-3 v2 support requires the `DWIN_SET` included with the Ender-3 V2 [example configuration](https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.1.x/config/examples/Creality/Ender-3%20V2).
## Easy Install ## Easy Install

2
Marlin/src/lcd/e3v2/creality/dwin.cpp
View File

@@ -2243,7 +2243,7 @@ void HMI_SelectFile() {
card.openAndPrintFile(card.filename); card.openAndPrintFile(card.filename);
#if HAS_FAN #if HAS_FAN
// All fans on for Ender 3 v2 ? // All fans on for Ender-3 v2 ?
// The slicer should manage this for us. // The slicer should manage this for us.
//for (uint8_t i = 0; i < FAN_COUNT; i++) //for (uint8_t i = 0; i < FAN_COUNT; i++)
// thermalManager.fan_speed[i] = 255; // thermalManager.fan_speed[i] = 255;

4
Marlin/src/lcd/e3v2/jyersui/README.md
View File

@@ -1,6 +1,6 @@
# DWIN for Creality Ender 3 v2 # DWIN for Creality Ender-3 v2
Marlin's Ender 3 v2 support requires the `DWIN_SET` included with the Ender 3 V2 [example configuration](https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.1.x/config/examples/Creality/Ender-3%20V2). Marlin's Ender-3 v2 support requires the `DWIN_SET` included with the Ender-3 V2 [example configuration](https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.1.x/config/examples/Creality/Ender-3%20V2).
## Easy Install ## Easy Install

2
Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
View File

@@ -262,7 +262,7 @@ FORCE_INLINE void _draw_feedrate_status(const char *value, uint16_t x, uint16_t
} }
/** /**
* Draw the MarlinUI Status Screen for Ender 3 V2 * Draw the MarlinUI Status Screen for Ender-3 V2
*/ */
void MarlinUI::draw_status_screen() { void MarlinUI::draw_status_screen() {
const bool blink = get_blink(); const bool blink = get_blink();

2
Marlin/src/lcd/e3v2/proui/base64.hpp
View File

@@ -5,7 +5,7 @@
* Author: Densaugeo * Author: Densaugeo
* Maintainer: Densaugeo * Maintainer: Densaugeo
* Version: 1.2.1.1 * Version: 1.2.1.1
* Changed unsigned int to uint16_t for use in the professional Ender 3V2/S1 firmware * Changed unsigned int to uint16_t for use in the professional Ender-3V2/S1 firmware
* Url: https://www.arduino.cc/reference/en/libraries/base64/ * Url: https://www.arduino.cc/reference/en/libraries/base64/
*/ */

2
Marlin/src/libs/BL24CXX.h
View File

@@ -23,7 +23,7 @@
/******************************************************************************** /********************************************************************************
* @file BL24CXX.h * @file BL24CXX.h
* @brief i2c EEPROM for Ender 3 v2 board (4.2.2) * @brief i2c EEPROM for Ender-3 v2 board (4.2.2)
********************************************************************************/ ********************************************************************************/
/******************** IIC ********************/ /******************** IIC ********************/

2
Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
View File

@@ -211,7 +211,7 @@
#endif #endif
/** /**
* Ender 3 V2 display SKR E3 Turbo (EXP1) Ender 3 V2 display --> SKR E3 Turbo * Ender-3 V2 display SKR E3 Turbo (EXP1) Ender-3 V2 display --> SKR E3 Turbo
* ------ ------ RX 3 --> 5 P0_15 * ------ ------ RX 3 --> 5 P0_15
* -- | 1 2 | -- (BEEPER) P2_08 |10 9 | P0_16 (BTN_ENC) TX 4 --> 9 P0_16 * -- | 1 2 | -- (BEEPER) P2_08 |10 9 | P0_16 (BTN_ENC) TX 4 --> 9 P0_16
* (SKR_TX1) RX | 3 4 | TX (SKR_RX1) (BTN_EN1) P0_19 | 8 7 | RESET BEEPER 6 --> 10 P2_08 * (SKR_TX1) RX | 3 4 | TX (SKR_RX1) (BTN_EN1) P0_19 | 8 7 | RESET BEEPER 6 --> 10 P2_08

6
Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
View File

@@ -203,10 +203,10 @@
* This section starts with the pins_RAMPS_144.h as example, after if you need any new * This section starts with the pins_RAMPS_144.h as example, after if you need any new
* display, you could use normal duponts and connect it with with the scheme showed before. * display, you could use normal duponts and connect it with with the scheme showed before.
* Tested: * Tested:
* - Ender 3 Old display (Character LCD) * - Ender-3 Old display (Character LCD)
* - Ender 3 New Serial DWING Display * - Ender-3 New Serial DWING Display
* - Reprap Display * - Reprap Display
* - Ender 5 New Serial Display * - Ender-5 New Serial Display
* - Any Reprap character display like * - Any Reprap character display like
*/ */

6
Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
View File

@@ -255,10 +255,10 @@
* This sections starts with the pins_RAMPS_144.h as example, after if you need any new * This sections starts with the pins_RAMPS_144.h as example, after if you need any new
* display, you could use normal duponts and connect it with with the scheme showed before. * display, you could use normal duponts and connect it with with the scheme showed before.
* Tested: * Tested:
* - Ender 3 Old display (Character LCD) * - Ender-3 Old display (Character LCD)
* - Ender 3 New Serial DWING Display * - Ender-3 New Serial DWING Display
* - Reprap Display * - Reprap Display
* - Ender 5 New Serial Display * - Ender-5 New Serial Display
* - Any Reprap character display like * - Any Reprap character display like
*/ */

6
Marlin/src/pins/samd/pins_MINITRONICS20.h
View File

@@ -174,10 +174,10 @@
* This sections starts with the pins_RAMPS_144.h as example, after if you need any new * This sections starts with the pins_RAMPS_144.h as example, after if you need any new
* display, you could use normal duponts and connect it with with the scheme showed before. * display, you could use normal duponts and connect it with with the scheme showed before.
* Tested: * Tested:
* - Ender 3 Old display (Character LCD) * - Ender-3 Old display (Character LCD)
* - Ender 3 New Serial DWING Display * - Ender-3 New Serial DWING Display
* - Reprap Display * - Reprap Display
* - Ender 5 New Serial Display * - Ender-5 New Serial Display
* - Any Reprap character display like * - Any Reprap character display like
*/ */

2
Marlin/src/pins/stm32f1/pins_CREALITY_V24S1.h
View File

@@ -22,7 +22,7 @@
#pragma once #pragma once
/** /**
* Creality v2.4.S1 (STM32F103RE / STM32F103RC) v101 as found in the Ender 7 * Creality v2.4.S1 (STM32F103RE / STM32F103RC) v101 as found in the Ender-7
*/ */
#define BOARD_INFO_NAME "Creality v2.4.S1 V101" #define BOARD_INFO_NAME "Creality v2.4.S1 V101"

4
Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h
View File

@@ -22,7 +22,7 @@
#pragma once #pragma once
/** /**
* Creality V24S1_301 (STM32F103RE / STM32F103RC) board pin assignments as found on Ender 3 S1. * Creality V24S1_301 (STM32F103RE / STM32F103RC) board pin assignments as found on Ender-3 S1.
* Also supports the STM32F4 version of the board with identical pin mapping. * Also supports the STM32F4 version of the board with identical pin mapping.
*/ */
@@ -40,7 +40,7 @@
#define BOARD_INFO_NAME "Creality V24S1-301" #define BOARD_INFO_NAME "Creality V24S1-301"
#endif #endif
#ifndef DEFAULT_MACHINE_NAME #ifndef DEFAULT_MACHINE_NAME
#define DEFAULT_MACHINE_NAME "Ender 3 S1" #define DEFAULT_MACHINE_NAME "Ender-3 S1"
#endif #endif
// //

2
Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
View File

@@ -35,7 +35,7 @@
#define BOARD_INFO_NAME "Creality V4" #define BOARD_INFO_NAME "Creality V4"
#endif #endif
#ifndef DEFAULT_MACHINE_NAME #ifndef DEFAULT_MACHINE_NAME
#define DEFAULT_MACHINE_NAME "Ender 3 V2" #define DEFAULT_MACHINE_NAME "Ender-3 V2"
#endif #endif
#define BOARD_NO_NATIVE_USB #define BOARD_NO_NATIVE_USB

2
Marlin/src/pins/stm32f4/pins_CREALITY_V24S1_301F4.h
View File

@@ -22,7 +22,7 @@
#pragma once #pragma once
/** /**
* Creality V24S1_301F4 (STM32F401RC) board pin assignments as found on Ender 3 S1. * Creality V24S1_301F4 (STM32F401RC) board pin assignments as found on Ender-3 S1.
*/ */
#ifndef BOARD_INFO_NAME #ifndef BOARD_INFO_NAME

2
buildroot/share/dwin/bin/README.md
View File

@@ -4,7 +4,7 @@ Tools for processing `.ICO` files used by DWIN displays.
## Introduction ## Introduction
The DWIN LCDs that come with the Creality Ender 3 v2 and other 3D printers contain image and container files stored on them which are used to draw various the UI elements. The DWIN LCDs that come with the Creality Ender-3 v2 and other 3D printers contain image and container files stored on them which are used to draw various the UI elements.
Standard `.JPG` files can be installed for things like the boot screen, and `.ICO` files can contain several images within a structured file format. Standard `.JPG` files can be installed for things like the boot screen, and `.ICO` files can contain several images within a structured file format.

4
buildroot/tests/STM32F103RE_creality
View File

@@ -11,12 +11,12 @@ set -e
# #
use_example_configs "Creality/Ender-3 V2/CrealityV422/CrealityUI" use_example_configs "Creality/Ender-3 V2/CrealityV422/CrealityUI"
opt_enable MARLIN_DEV_MODE BUFFER_MONITORING BLTOUCH AUTO_BED_LEVELING_BILINEAR Z_SAFE_HOMING opt_enable MARLIN_DEV_MODE BUFFER_MONITORING BLTOUCH AUTO_BED_LEVELING_BILINEAR Z_SAFE_HOMING
exec_test $1 $2 "Ender 3 v2 with CrealityUI" "$3" exec_test $1 $2 "Ender-3 v2 with CrealityUI" "$3"
use_example_configs "Creality/Ender-3 V2/CrealityV422/CrealityUI" use_example_configs "Creality/Ender-3 V2/CrealityV422/CrealityUI"
opt_disable DWIN_CREALITY_LCD opt_disable DWIN_CREALITY_LCD
opt_enable DWIN_CREALITY_LCD_JYERSUI AUTO_BED_LEVELING_BILINEAR PROBE_MANUALLY opt_enable DWIN_CREALITY_LCD_JYERSUI AUTO_BED_LEVELING_BILINEAR PROBE_MANUALLY
exec_test $1 $2 "Ender 3 v2 with JyersUI" "$3" exec_test $1 $2 "Ender-3 v2 with JyersUI" "$3"
use_example_configs "Creality/Ender-3 S1/STM32F1" use_example_configs "Creality/Ender-3 S1/STM32F1"
opt_disable DWIN_CREALITY_LCD Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN AUTO_BED_LEVELING_BILINEAR CONFIGURATION_EMBEDDING CANCEL_OBJECTS FWRETRACT opt_disable DWIN_CREALITY_LCD Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN AUTO_BED_LEVELING_BILINEAR CONFIGURATION_EMBEDDING CANCEL_OBJECTS FWRETRACT

2
buildroot/tests/STM32F401RC_creality
View File

@@ -9,7 +9,7 @@ set -e
use_example_configs "Creality/Ender-3 V2/CrealityV422/MarlinUI" use_example_configs "Creality/Ender-3 V2/CrealityV422/MarlinUI"
opt_add SDCARD_EEPROM_EMULATION AUTO_BED_LEVELING_BILINEAR Z_SAFE_HOMING opt_add SDCARD_EEPROM_EMULATION AUTO_BED_LEVELING_BILINEAR Z_SAFE_HOMING
opt_set MOTHERBOARD BOARD_CREALITY_V24S1_301F4 opt_set MOTHERBOARD BOARD_CREALITY_V24S1_301F4
exec_test $1 $2 "Ender 3 v2 with MarlinUI" "$3" exec_test $1 $2 "Ender-3 v2 with MarlinUI" "$3"
# clean up # clean up
restore_configs restore_configs

4
buildroot/tests/melzi_optiboot
View File

@@ -7,10 +7,10 @@
set -e set -e
# #
# Ender 2 # Ender-2
# #
use_example_configs Creality/Ender-2 use_example_configs Creality/Ender-2
exec_test $1 $2 "Ender 2" "$3" exec_test $1 $2 "Ender-2" "$3"
# clean up # clean up
restore_configs restore_configs