bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🎨 Tweak pins, comment formatting

Browse Source
This commit is contained in:
Scott Lahteine 2021-08-29 20:54:51 -05:00 committed by Scott Lahteine
parent 99028376e6
commit 8916b05cb4
2 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Marlin/src/module/settings.cpp
View File

@ -2397,13 +2397,15 @@ void MarlinSettings::postprocess() {
UNUSED(s);
}
const uint16_t MarlinSettings::meshes_end = persistentStore.capacity() - 129; // 128 (+1 because of the change to capacity rather than last valid address)
// is a placeholder for the size of the MAT; the MAT will always
// live at the very end of the eeprom
// 128 (+1 because of the change to capacity rather than last valid address)
// is a placeholder for the size of the MAT; the MAT will always
// live at the very end of the eeprom
const uint16_t MarlinSettings::meshes_end = persistentStore.capacity() - 129;
uint16_t MarlinSettings::meshes_start_index() {
return (datasize() + EEPROM_OFFSET + 32) & 0xFFF8; // Pad the end of configuration data so it can float up
// or down a little bit without disrupting the mesh data
// Pad the end of configuration data so it can float up
// or down a little bit without disrupting the mesh data
return (datasize() + EEPROM_OFFSET + 32) & 0xFFF8;
}
#define MESH_STORE_SIZE sizeof(TERN(OPTIMIZED_MESH_STORAGE, mesh_store_t, ubl.z_values))

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

@ -154,36 +154,38 @@
#define SDIO_SUPPORT
#define NO_SD_HOST_DRIVE // This board's SD is only seen by the printer
#if ENABLED(CR10_STOCKDISPLAY) && NONE(RET6_12864_LCD, VET6_12864_LCD)
#error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
#endif
#if ENABLED(CR10_STOCKDISPLAY)
#if ENABLED(RET6_12864_LCD)
#if ENABLED(RET6_12864_LCD)
// RET6 12864 LCD
#define LCD_PINS_RS PB12
#define LCD_PINS_ENABLE PB15
#define LCD_PINS_D4 PB13
// RET6 12864 LCD
#define LCD_PINS_RS PB12
#define LCD_PINS_ENABLE PB15
#define LCD_PINS_D4 PB13
#define BTN_ENC PB2
#define BTN_EN1 PB10
#define BTN_EN2 PB14
#define BTN_ENC PB2
#define BTN_EN1 PB10
#define BTN_EN2 PB14
#ifndef HAS_PIN_27_BOARD
#define BEEPER_PIN PC6
#ifndef HAS_PIN_27_BOARD
#define BEEPER_PIN PC6
#endif
#elif ENABLED(VET6_12864_LCD)
// VET6 12864 LCD
#define LCD_PINS_RS PA4
#define LCD_PINS_ENABLE 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 V4 controller."
#endif
#elif ENABLED(VET6_12864_LCD)
// VET6 12864 LCD
#define LCD_PINS_RS PA4
#define LCD_PINS_ENABLE PA7
#define LCD_PINS_D4 PA5
#define BTN_ENC PC5
#define BTN_EN1 PB10
#define BTN_EN2 PA6
#elif EITHER(DWIN_CREALITY_LCD, IS_DWIN_MARLINUI)
// RET6 DWIN ENCODER LCD