andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

📌 Distinct BOARD_CREALITY_V422 (#23674)

FB4S_WIFI
Bruno Henrique de Paula 3 years ago
committed by Scott Lahteine
parent
21935b41f0
commit
50ffacfb90
12 changed files with 49 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Marlin/src/pins/pins.h
  2. 2
      Marlin/src/pins/stm32f1/pins_CREALITY_V24S1.h
  3. 2
      Marlin/src/pins/stm32f1/pins_CREALITY_V24S1_301.h
  4. 2
      Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
  5. 2
      Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
  6. 31
      Marlin/src/pins/stm32f1/pins_CREALITY_V422.h
  7. 2
      Marlin/src/pins/stm32f1/pins_CREALITY_V423.h
  8. 2
      Marlin/src/pins/stm32f1/pins_CREALITY_V427.h
  9. 2
      Marlin/src/pins/stm32f1/pins_CREALITY_V431.h
  10. 2
      Marlin/src/pins/stm32f1/pins_CREALITY_V452.h
  11. 2
      Marlin/src/pins/stm32f1/pins_CREALITY_V453.h
  12. 10
      buildroot/share/scripts/upload.py

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

@ -559,10 +559,12 @@
#include "stm32f1/pins_CHITU3D_V6.h" // STM32F1 env:chitu_f103 env:chitu_f103_maple #include "stm32f1/pins_CHITU3D_V6.h" // STM32F1 env:chitu_f103 env:chitu_f103_maple
#elif MB(CHITU3D_V9) #elif MB(CHITU3D_V9)
#include "stm32f1/pins_CHITU3D_V9.h" // STM32F1 env:chitu_f103 env:chitu_f103_maple #include "stm32f1/pins_CHITU3D_V9.h" // STM32F1 env:chitu_f103 env:chitu_f103_maple
#elif MB(CREALITY_V4, CREALITY_V422) #elif MB(CREALITY_V4)
#include "stm32f1/pins_CREALITY_V4.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple #include "stm32f1/pins_CREALITY_V4.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
#elif MB(CREALITY_V4210) #elif MB(CREALITY_V4210)
#include "stm32f1/pins_CREALITY_V4210.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple #include "stm32f1/pins_CREALITY_V4210.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
#elif MB(CREALITY_V422)
#include "stm32f1/pins_CREALITY_V422.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
#elif MB(CREALITY_V423) #elif MB(CREALITY_V423)
#include "stm32f1/pins_CREALITY_V423.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer #include "stm32f1/pins_CREALITY_V423.h" // STM32F1 env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer
#elif MB(CREALITY_V427) #elif MB(CREALITY_V427)

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

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

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

@ -22,7 +22,7 @@
#pragma once #pragma once
/** /**
* Creality V24S1_301 (STM32F103RCT) board pin assignments as found on Ender 3 S1 * Creality V24S1_301 (STM32F103RE / STM32F103RC) board pin assignments as found on Ender 3 S1
*/ */
#include "env_validate.h" #include "env_validate.h"

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

@ -22,7 +22,7 @@
#pragma once #pragma once
/** /**
* Creality 4.2.x (STM32F103RET6) board pin assignments * Creality 4.2.x (STM32F103RE / STM32F103RC) board pin assignments
*/ */
#include "env_validate.h" #include "env_validate.h"

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

@ -22,7 +22,7 @@
#pragma once #pragma once
/** /**
* CREALITY 4.2.10 (STM32F103) board pin assignments * CREALITY 4.2.10 (STM32F103RE / STM32F103RC) board pin assignments
*/ */
#include "env_validate.h" #include "env_validate.h"

31
Marlin/src/pins/stm32f1/pins_CREALITY_V422.h
View File

@ -0,0 +1,31 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2022 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
#pragma once
/**
* CREALITY v4.2.2 (STM32F103RE / STM32F103RC) board pin assignments
*/
#define BOARD_INFO_NAME "Creality v4.2.2"
#define DEFAULT_MACHINE_NAME "Creality3D"
#include "pins_CREALITY_V4.h"

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

@ -22,7 +22,7 @@
#pragma once #pragma once
/** /**
* CREALITY v4.2.3 (STM32F103) board pin assignments * CREALITY v4.2.3 (STM32F103RE / STM32F103RC) board pin assignments
*/ */
#define BOARD_INFO_NAME "Creality v4.2.3" #define BOARD_INFO_NAME "Creality v4.2.3"

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

@ -22,7 +22,7 @@
#pragma once #pragma once
/** /**
* CREALITY v4.2.7 (STM32F103) board pin assignments * CREALITY v4.2.7 (STM32F103RE / STM32F103RC) board pin assignments
*/ */
#define BOARD_INFO_NAME "Creality v4.2.7" #define BOARD_INFO_NAME "Creality v4.2.7"

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

@ -22,7 +22,7 @@
#pragma once #pragma once
/** /**
* CREALITY v4.3.1 (STM32F103) board pin assignments * CREALITY v4.3.1 (STM32F103RE / STM32F103RC) board pin assignments
*/ */
#define BOARD_INFO_NAME "Creality v4.3.1" #define BOARD_INFO_NAME "Creality v4.3.1"

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

@ -22,7 +22,7 @@
#pragma once #pragma once
/** /**
* Creality v4.5.2 (STM32F103RET6) board pin assignments * Creality v4.5.2 (STM32F103RE / STM32F103RC) board pin assignments
*/ */
#if HAS_MULTI_HOTEND || E_STEPPERS > 1 #if HAS_MULTI_HOTEND || E_STEPPERS > 1

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

@ -22,7 +22,7 @@
#pragma once #pragma once
/** /**
* Creality v4.5.3 (STM32F103RET6) board pin assignments * Creality v4.5.3 (STM32F103RE / STM32F103RC) board pin assignments
*/ */
#if HAS_MULTI_HOTEND || E_STEPPERS > 1 #if HAS_MULTI_HOTEND || E_STEPPERS > 1

10
buildroot/share/scripts/upload.py
View File

@ -153,11 +153,13 @@ def Upload(source, target, env):
# Set local upload params based on board type to change script behavior # Set local upload params based on board type to change script behavior
# "upload_delete_old_bins": delete all *.bin files in the root of SD Card # "upload_delete_old_bins": delete all *.bin files in the root of SD Card
upload_delete_old_bins = marlin_motherboard in ['BOARD_CREALITY_V4', 'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V423', 'BOARD_CREALITY_V427', upload_delete_old_bins = marlin_motherboard in ['BOARD_CREALITY_V4', 'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V422', 'BOARD_CREALITY_V423',
'BOARD_CREALITY_V431', 'BOARD_CREALITY_V452', 'BOARD_CREALITY_V453', 'BOARD_CREALITY_V24S1'] 'BOARD_CREALITY_V427', 'BOARD_CREALITY_V431', 'BOARD_CREALITY_V452', 'BOARD_CREALITY_V453',
'BOARD_CREALITY_V24S1']
# "upload_random_name": generate a random 8.3 firmware filename to upload # "upload_random_name": generate a random 8.3 firmware filename to upload
upload_random_filename = marlin_motherboard in ['BOARD_CREALITY_V4', 'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V423', 'BOARD_CREALITY_V427', upload_random_filename = marlin_motherboard in ['BOARD_CREALITY_V4', 'BOARD_CREALITY_V4210', 'BOARD_CREALITY_V422', 'BOARD_CREALITY_V423',
'BOARD_CREALITY_V431', 'BOARD_CREALITY_V452', 'BOARD_CREALITY_V453', 'BOARD_CREALITY_V24S1'] and not marlin_long_filename_host_support 'BOARD_CREALITY_V427', 'BOARD_CREALITY_V431', 'BOARD_CREALITY_V452', 'BOARD_CREALITY_V453',
'BOARD_CREALITY_V24S1'] and not marlin_long_filename_host_support
try: try:

Write Preview
Loading…
Cancel
Save