mirror of
https://github.com/MarlinFirmware/Marlin.git
synced 2024-11-30 07:17:59 +00:00
🐛 Creality Free Runs fixups (#26562)
Followup to #25636, #26533 Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
ellensp
GitHub
parent
fa8d2bd108
commit
18b0dbb501
@ -669,6 +669,8 @@
|
|||||||
#error "Z_PROBE_OFFSET_RANGE_(MIN|MAX) is now PROBE_OFFSET_Z(MIN|MAX)."
|
#error "Z_PROBE_OFFSET_RANGE_(MIN|MAX) is now PROBE_OFFSET_Z(MIN|MAX)."
|
||||||
#elif defined(LARGE_MOVE_ITEMS)
|
#elif defined(LARGE_MOVE_ITEMS)
|
||||||
#error "LARGE_MOVE_ITEMS is obsolete. Instead define MANUAL_MOVE_DISTANCE_MM and MANUAL_MOVE_DISTANCE_IN."
|
#error "LARGE_MOVE_ITEMS is obsolete. Instead define MANUAL_MOVE_DISTANCE_MM and MANUAL_MOVE_DISTANCE_IN."
|
||||||
|
#elif defined(SDIO_SUPPORT)
|
||||||
|
#error "SDIO_SUPPORT is now ONBOARD_SDIO."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// L64xx stepper drivers have been removed
|
// L64xx stepper drivers have been removed
|
||||||
|
|||||||
@ -811,3 +811,10 @@
|
|||||||
#if HAL_ADC_VREF_MV < 5000 && ANY_THERMISTOR_IS(-1) && DISABLED(ALLOW_AD595_3V3_VREF)
|
#if HAL_ADC_VREF_MV < 5000 && ANY_THERMISTOR_IS(-1) && DISABLED(ALLOW_AD595_3V3_VREF)
|
||||||
#warning "The (-1) AD595 Thermocouple Amplifier requires 5V input supply! Use AD8495 for 3.3V ADC."
|
#warning "The (-1) AD595 Thermocouple Amplifier requires 5V input supply! Use AD8495 for 3.3V ADC."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* No PWM on the Piezo Beeper?
|
||||||
|
*/
|
||||||
|
#if PIN_EXISTS(BEEPER) && ALL(SPEAKER, NO_SPEAKER)
|
||||||
|
#warning "The BEEPER cannot produce tones so you can disable SPEAKER."
|
||||||
|
#endif
|
||||||
|
|||||||
@ -33,10 +33,6 @@
|
|||||||
#define LCD_PINS_D7 6
|
#define LCD_PINS_D7 6
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef SPEAKER
|
|
||||||
#define SPEAKER // The speaker can produce tones
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if IS_NEWPANEL
|
#if IS_NEWPANEL
|
||||||
#define BTN_EN1 16
|
#define BTN_EN1 16
|
||||||
#define BTN_EN2 17
|
#define BTN_EN2 17
|
||||||
|
|||||||
@ -35,10 +35,6 @@
|
|||||||
#define LCD_PINS_D7 6
|
#define LCD_PINS_D7 6
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef SPEAKER
|
|
||||||
#define SPEAKER // The speaker can produce tones
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if IS_NEWPANEL
|
#if IS_NEWPANEL
|
||||||
#define BTN_EN1 16
|
#define BTN_EN1 16
|
||||||
#define BTN_EN2 17
|
#define BTN_EN2 17
|
||||||
|
|||||||
@ -228,7 +228,7 @@
|
|||||||
|
|
||||||
#ifndef BEEPER_PIN
|
#ifndef BEEPER_PIN
|
||||||
#define BEEPER_PIN EXP1_01_PIN
|
#define BEEPER_PIN EXP1_01_PIN
|
||||||
#undef SPEAKER
|
#define NO_SPEAKER
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
|
#elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
|
||||||
|
|||||||
@ -281,7 +281,7 @@
|
|||||||
|
|
||||||
#ifndef BEEPER_PIN
|
#ifndef BEEPER_PIN
|
||||||
#define BEEPER_PIN EXP1_01_PIN
|
#define BEEPER_PIN EXP1_01_PIN
|
||||||
#undef SPEAKER
|
#define NO_SPEAKER
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
|
#elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
|
||||||
|
|||||||
@ -114,7 +114,7 @@
|
|||||||
|
|
||||||
#define SD_DETECT_PIN -1
|
#define SD_DETECT_PIN -1
|
||||||
#define SDCARD_CONNECTION ONBOARD
|
#define SDCARD_CONNECTION ONBOARD
|
||||||
//#define SDIO_SUPPORT
|
//#define ONBOARD_SDIO
|
||||||
#define NO_SD_HOST_DRIVE // This board's SD is only seen by the printer
|
#define NO_SD_HOST_DRIVE // This board's SD is only seen by the printer
|
||||||
|
|
||||||
#if SD_CONNECTION_IS(ONBOARD)
|
#if SD_CONNECTION_IS(ONBOARD)
|
||||||
|
|||||||
@ -188,74 +188,55 @@
|
|||||||
//
|
//
|
||||||
#define SD_DETECT_PIN PC1
|
#define SD_DETECT_PIN PC1
|
||||||
#define SDCARD_CONNECTION ONBOARD
|
#define SDCARD_CONNECTION ONBOARD
|
||||||
#define ONBOARD_SPI_DEVICE 1
|
#define ONBOARD_SDIO
|
||||||
//#define ONBOARD_SD_CS_PIN PA4 // SDSS
|
#define SDIO_CLOCK 4500000
|
||||||
#define SDIO_SUPPORT
|
#define SDIO_READ_RETRIES 16
|
||||||
#define NO_SD_HOST_DRIVE // This board's SD is only seen by the printer
|
#define NO_SD_HOST_DRIVE // This board's SD is only seen by the printer
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ------
|
||||||
|
* PC0 | 1 2 | PB2
|
||||||
|
* TX2 PA2 | 3 4 | PA3 RX2
|
||||||
|
* SPI2_MISO PB14 | 5 6 | PB13 SPI2_SCK
|
||||||
|
* SPI2_NSS PB12 | 7 8 | PB15 SPI2_MOSI
|
||||||
|
* GND | 9 10 | 5V
|
||||||
|
* ------
|
||||||
|
* EXP1
|
||||||
|
*/
|
||||||
|
#define EXP1_01_PIN PC0
|
||||||
|
#define EXP1_02_PIN PB2
|
||||||
|
#define EXP1_03_PIN PA2
|
||||||
|
#define EXP1_04_PIN PA3
|
||||||
|
#define EXP1_05_PIN PB14
|
||||||
|
#define EXP1_06_PIN PB13
|
||||||
|
#define EXP1_07_PIN PB12
|
||||||
|
#define EXP1_08_PIN PB15
|
||||||
|
|
||||||
#if ENABLED(CR10_STOCKDISPLAY)
|
#if ENABLED(CR10_STOCKDISPLAY)
|
||||||
|
|
||||||
#if ENABLED(RET6_12864_LCD)
|
#define LCD_PINS_RS EXP1_07_PIN
|
||||||
// RET6 12864 LCD
|
#define LCD_PINS_EN EXP1_08_PIN
|
||||||
#define LCD_PINS_RS PB12
|
#define LCD_PINS_D4 EXP1_06_PIN
|
||||||
#define LCD_PINS_EN PB15
|
|
||||||
#define LCD_PINS_D4 PB13
|
|
||||||
|
|
||||||
#define BTN_ENC PB2
|
#define BTN_ENC EXP1_02_PIN
|
||||||
#define BTN_EN1 PA2
|
#define BTN_EN1 EXP1_03_PIN
|
||||||
#define BTN_EN2 PB14
|
#define BTN_EN2 EXP1_05_PIN
|
||||||
|
|
||||||
#ifndef HAS_PIN_27_BOARD
|
#ifndef HAS_PIN_27_BOARD
|
||||||
#define BEEPER_PIN PC0
|
#define BEEPER_PIN EXP1_01_PIN
|
||||||
#endif
|
|
||||||
|
|
||||||
#elif ENABLED(VET6_12864_LCD)
|
|
||||||
// VET6 12864 LCD
|
|
||||||
#define LCD_PINS_RS PA4
|
|
||||||
//#define LCD_PINS_EN PA7
|
|
||||||
#define LCD_PINS_D4 PA5
|
|
||||||
|
|
||||||
#define BTN_ENC PC5
|
|
||||||
#define BTN_EN1 PB10
|
|
||||||
#define BTN_EN2 PA6
|
|
||||||
|
|
||||||
#else
|
|
||||||
#error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the CREALITY_CR4NTXXC10 controller."
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(DWIN_CREALITY_LCD)
|
#elif ENABLED(DWIN_CREALITY_LCD)
|
||||||
|
|
||||||
// RET6 DWIN ENCODER LCD
|
// DWIN ENCODER LCD
|
||||||
#define BTN_ENC PB14
|
#define BTN_ENC EXP1_05_PIN
|
||||||
#define BTN_EN1 PB15
|
#define BTN_EN1 EXP1_08_PIN
|
||||||
#define BTN_EN2 PB12
|
#define BTN_EN2 EXP1_07_PIN
|
||||||
|
|
||||||
//#define LCD_LED_PIN PB2
|
//#define LCD_LED_PIN EXP1_02_PIN
|
||||||
#ifndef BEEPER_PIN
|
#ifndef BEEPER_PIN
|
||||||
#define BEEPER_PIN PB13
|
#define BEEPER_PIN EXP1_06_PIN
|
||||||
#undef SPEAKER
|
#define NO_SPEAKER
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif ENABLED(DWIN_VET6_CREALITY_LCD)
|
|
||||||
|
|
||||||
// VET6 DWIN ENCODER LCD
|
|
||||||
#define BTN_ENC PA6
|
|
||||||
//#define BTN_EN1 PA7
|
|
||||||
#define BTN_EN2 PA4
|
|
||||||
|
|
||||||
#define BEEPER_PIN PA5
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
//
|
|
||||||
// M3/M4/M5 - Spindle/Laser Control
|
|
||||||
//
|
|
||||||
#if HAS_CUTTER
|
|
||||||
//#undef HEATER_0_PIN
|
|
||||||
//#undef HEATER_BED_PIN
|
|
||||||
//#undef FAN0_PIN
|
|
||||||
#define SPINDLE_LASER_ENA_PIN PC0 // FET 1
|
|
||||||
#define SPINDLE_LASER_PWM_PIN PC0 // Bed FET
|
|
||||||
#define SPINDLE_DIR_PIN PC0 // FET 4
|
|
||||||
//#define LASER_SOFT_PWM_PIN PC0
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -125,7 +125,7 @@
|
|||||||
#define SDCARD_CONNECTION ONBOARD
|
#define SDCARD_CONNECTION ONBOARD
|
||||||
#define ONBOARD_SPI_DEVICE 1
|
#define ONBOARD_SPI_DEVICE 1
|
||||||
#define ONBOARD_SD_CS_PIN PC12 // SDSS
|
#define ONBOARD_SD_CS_PIN PC12 // SDSS
|
||||||
#define SDIO_SUPPORT
|
#define ONBOARD_SDIO
|
||||||
#define NO_SD_HOST_DRIVE // This board's SD is only seen by the printer
|
#define NO_SD_HOST_DRIVE // This board's SD is only seen by the printer
|
||||||
|
|
||||||
// SPI 2
|
// SPI 2
|
||||||
|
|||||||
@ -742,17 +742,14 @@ upload_protocol = stlink
|
|||||||
#
|
#
|
||||||
[env:STM32F401RE_freeruns]
|
[env:STM32F401RE_freeruns]
|
||||||
extends = stm32_variant
|
extends = stm32_variant
|
||||||
board = genericSTM32F401RE
|
board = marlin_STM32F401RE_freeruns
|
||||||
board_build.variant = marlin_STM32F401RE_freeruns
|
|
||||||
board_build.offset = 0x10000
|
board_build.offset = 0x10000
|
||||||
board_upload.offset_address = 0x08010000
|
board_upload.offset_address = 0x08010000
|
||||||
board_build.rename = firmware-{date}-{time}.bin
|
board_build.rename = firmware-{date}-{time}.bin
|
||||||
build_flags = ${stm32_variant.build_flags} -DMCU_STM32F401RE -DSTM32F4
|
build_flags = ${stm32_variant.build_flags} -DSTM32F401xE
|
||||||
-DSS_TIMER=4 -DTIMER_SERVO=TIM5
|
-DSS_TIMER=4 -DTIMER_SERVO=TIM5
|
||||||
-DTRANSFER_CLOCK_DIV=8
|
-DTRANSFER_CLOCK_DIV=8
|
||||||
build_unflags = ${stm32_variant.build_unflags} -DUSBCON -DUSBD_USE_CDC
|
build_unflags = ${stm32_variant.build_unflags} -DUSBCON -DUSBD_USE_CDC
|
||||||
extra_scripts = ${stm32_variant.extra_scripts}
|
|
||||||
pre:buildroot/share/PlatformIO/scripts/random-bin.py
|
|
||||||
monitor_speed = 115200
|
monitor_speed = 115200
|
||||||
|
|
||||||
[env:STM32F401RE_freeruns_jlink]
|
[env:STM32F401RE_freeruns_jlink]
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user