Skip to content

Commit

Permalink
Tweak Ender # labels
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed Apr 6, 2023
1 parent e1759f2 commit 91ab3c1
Show file tree
Hide file tree
Showing 22 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ body:
- type: input
attributes:
label: Printer model
description: Creality Ender 3, Prusa mini, or Kossel Delta?
description: Creality Ender-3, Prusa mini, or Kossel Delta?

- type: input
attributes:
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/inc/SanityCheck.h
Original file line number Diff line number Diff line change
Expand Up @@ -3274,7 +3274,7 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE, "Movement bounds (X_MIN_POS, X_MAX_POS
#endif

/**
* Ender 3 V2 controller has some limitations
* Ender-3 V2 controller has some limitations
*/
#if ENABLED(DWIN_CREALITY_LCD)
#if DISABLED(SDSUPPORT)
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/lcd/e3v2/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/e3v2/creality/dwin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2243,7 +2243,7 @@ void HMI_SelectFile() {
card.openAndPrintFile(card.filename);

#if HAS_FAN
// All fans on for Ender 3 v2 ?
// All fans on for Ender-3 v2 ?
// The slicer should manage this for us.
//for (uint8_t i = 0; i < FAN_COUNT; i++)
// thermalManager.fan_speed[i] = 255;
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/lcd/e3v2/jyersui/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
const bool blink = get_blink();
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/e3v2/proui/base64.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Author: Densaugeo
* Maintainer: Densaugeo
* 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/
*/

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/libs/BL24CXX.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/********************************************************************************
* @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 ********************/
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@
#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
* -- | 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
Expand Down
6 changes: 3 additions & 3 deletions Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,10 @@
* 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.
* Tested:
* - Ender 3 Old display (Character LCD)
* - Ender 3 New Serial DWING Display
* - Ender-3 Old display (Character LCD)
* - Ender-3 New Serial DWING Display
* - Reprap Display
* - Ender 5 New Serial Display
* - Ender-5 New Serial Display
* - Any Reprap character display like
*/

Expand Down
6 changes: 3 additions & 3 deletions Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
Original file line number Diff line number Diff line change
Expand Up @@ -255,10 +255,10 @@
* 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.
* Tested:
* - Ender 3 Old display (Character LCD)
* - Ender 3 New Serial DWING Display
* - Ender-3 Old display (Character LCD)
* - Ender-3 New Serial DWING Display
* - Reprap Display
* - Ender 5 New Serial Display
* - Ender-5 New Serial Display
* - Any Reprap character display like
*/

Expand Down
6 changes: 3 additions & 3 deletions Marlin/src/pins/samd/pins_MINITRONICS20.h
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,10 @@
* 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.
* Tested:
* - Ender 3 Old display (Character LCD)
* - Ender 3 New Serial DWING Display
* - Ender-3 Old display (Character LCD)
* - Ender-3 New Serial DWING Display
* - Reprap Display
* - Ender 5 New Serial Display
* - Ender-5 New Serial Display
* - Any Reprap character display like
*/

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/pins/stm32f1/pins_CREALITY_V24S1.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#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"
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#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.
*/

Expand All @@ -40,7 +40,7 @@
#define BOARD_INFO_NAME "Creality V24S1-301"
#endif
#ifndef DEFAULT_MACHINE_NAME
#define DEFAULT_MACHINE_NAME "Ender 3 S1"
#define DEFAULT_MACHINE_NAME "Ender-3 S1"
#endif

//
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#define BOARD_INFO_NAME "Creality V4"
#endif
#ifndef DEFAULT_MACHINE_NAME
#define DEFAULT_MACHINE_NAME "Ender 3 V2"
#define DEFAULT_MACHINE_NAME "Ender-3 V2"
#endif

#define BOARD_NO_NATIVE_USB
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/pins/stm32f4/pins_CREALITY_CR4NTxxC10.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#define BOARD_INFO_NAME "CR4NT220622C10"
#endif
#ifndef DEFAULT_MACHINE_NAME
#define DEFAULT_MACHINE_NAME "Ender 3 Series"
#define DEFAULT_MACHINE_NAME "Ender-3 Series"
#endif
#define BOARD_WEBSITE_URL "www.creality.com"

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/pins/stm32f4/pins_CREALITY_V24S1_301F4.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@
USB_OTG_FS_ID = PA_10,
USB_OTG_FS_DM = PA_11,
USB_OTG_FS_DP = PA_12,
#endif
#endif
2 changes: 1 addition & 1 deletion buildroot/share/dwin/bin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Tools for processing `.ICO` files used by DWIN displays.

## 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.

Expand Down
4 changes: 2 additions & 2 deletions buildroot/tests/STM32F103RE_creality
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ set -e
#
use_example_configs "Creality/Ender-3 V2/CrealityV422/CrealityUI"
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"
opt_disable DWIN_CREALITY_LCD
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"
opt_disable DWIN_CREALITY_LCD Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN AUTO_BED_LEVELING_BILINEAR CONFIGURATION_EMBEDDING CANCEL_OBJECTS FWRETRACT
Expand Down
2 changes: 1 addition & 1 deletion buildroot/tests/STM32F401RC_creality
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set -e
use_example_configs "Creality/Ender-3 V2/CrealityV422/MarlinUI"
opt_add SDCARD_EEPROM_EMULATION AUTO_BED_LEVELING_BILINEAR Z_SAFE_HOMING
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
restore_configs
4 changes: 2 additions & 2 deletions buildroot/tests/melzi_optiboot
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
set -e

#
# Ender 2
# Ender-2
#
use_example_configs Creality/Ender-2
exec_test $1 $2 "Ender 2" "$3"
exec_test $1 $2 "Ender-2" "$3"

# clean up
restore_configs

0 comments on commit 91ab3c1

Please sign in to comment.