jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btt stm32 CR6 Fixes

Browse Source
This commit is contained in:
InsanityAutomation
2024-06-26 10:26:47 -04:00
parent e94a1b16c4
commit d46cf60548
7 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/Configuration.h
+9 -13
View File
@@ -333,7 +333,7 @@
// @section info
// Author info of this build printed to the host during boot and M115
#define STRING_CONFIG_H_AUTHOR "TinyMachines3D" // Who made the changes.
#define STRING_CONFIG_H_AUTHOR "Insanity Automation" // Who made the changes.
#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes)
/**
@@ -365,7 +365,7 @@
#define ABL_BLTOUCH
#endif
#if ANY(SKRMiniE3V2, SKRMiniE3V3, SKRE3Turbo)
#if ANY(SKRMiniE3V2, SKRMiniE3V3, SKRE3Turbo, SKR_CR6)
#define SKR_2209
#define SKR_UART
#if NONE(INSANITYAUTOMATION_DWIN, MachineEnder3Touchscreen, FORCEV2DISPLAY)
@@ -511,17 +511,17 @@
#endif
#endif
#if ANY(MachineCRX, MachineCRXPro, MachineEnder5Plus, MachineCR10SPro, MachineCR5, MachineCR10Max, MachineEnder6, MachineSermoonD1, MachineEnder7, MachineCR10Smart, MachineCR10SmartPro)
#if ANY(MachineCRX, MachineCRXPro, MachineEnder5Plus, MachineCR10SPro, MachineCR5, MachineCR6, MachineCR10Max, MachineEnder6, MachineSermoonD1, MachineEnder7, MachineCR10Smart, MachineCR10SmartPro)
#if NONE(GraphicLCD, OrigLCD, INSANITYAUTOMATION_DWIN)
#define INSANITYAUTOMATION_DWIN
#endif
#endif
#if ANY(MachineEnder7, MachineSermoonD1, MachineCR10Smart, MachineCR5, MachineCR10SmartPro)
#if ANY(MachineEnder7, MachineSermoonD1, MachineCR10Smart, MachineCR5, MachineCR10SmartPro, MachineCR6)
#define DWINOS_4
#endif
#if NONE(MachineCR10Smart, MachineCR10SmartPro)
#if NONE(MachineCR10Smart, MachineCR10SmartPro, MachineCR6)
#define LOWRES_DWIN
#endif
@@ -698,7 +698,7 @@
#define LCD_SERIAL_PORT 1
#define LCD_BAUDRATE 115200
//#define SERIAL_CATCHALL -1
#elif ANY(MachineCR10SPro, MachineCRX, MachineEnder5Plus, MachineCR10Max, MachineCR5) && NONE(GraphicLCD, OrigLCD, MachineEnder3V2, MachineEnder3S1, Creality422, Creality427, MachineEnder6, FORCEV2DISPLAY)
#elif ANY(MachineCR10SPro, MachineCRX, MachineEnder5Plus, MachineCR10Max, MachineCR5, SKR_CR6) && NONE(GraphicLCD, OrigLCD, MachineEnder3V2, MachineEnder3S1, Creality422, Creality427, MachineEnder6, FORCEV2DISPLAY)
#define LCD_SERIAL_PORT 2
#define LCD_BAUDRATE 115200
#define SERIAL_CATCHALL 0
@@ -836,7 +836,7 @@
* :['A4988', 'A5984', 'DRV8825', 'LV8729', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE']
*/
#if (ANY(SKR13, SKR14, SKR14Turbo, SKR2, SKR3, SKRPRO11) || ANY(MachineCR10SV2, MachineEnder3S1, MachineCR10SPro, MachineCR10SProV2, MachineCR10Max, MachineCR5, SKRMiniE3V2, SKRMiniE3V3, MachineCR6, MachineCR6Max, MachineEnder6, MachineEnder7, MachineSermoonD1, MachineCR30, MachineCR10Smart, MachineCR10SmartPro)) && DISABLED(SKR_UART)
#if (ANY(SKR13, SKR14, SKR14Turbo, SKR2, SKR3, SKRPRO11, SKR_CR6) || ANY(MachineCR10SV2, MachineEnder3S1, MachineCR10SPro, MachineCR10SProV2, MachineCR10Max, MachineCR5, SKRMiniE3V2, SKRMiniE3V3, MachineCR6, MachineCR6Max, MachineEnder6, MachineEnder7, MachineSermoonD1, MachineCR30, MachineCR10Smart, MachineCR10SmartPro)) && DISABLED(SKR_UART)
#if ENABLED(SKR_2209)
#define X_DRIVER_TYPE TMC2209_STANDALONE
#define Y_DRIVER_TYPE TMC2209_STANDALONE
@@ -868,7 +868,7 @@
#define E1_DRIVER_TYPE TMC2208_STANDALONE
#endif
#endif
#elif ANY(SKR13, SKR14, SKR14Turbo, SKR2, SKR3, SKRPRO11, SKRMiniE3V2, SKRMiniE3V3, SKRE3Turbo) && ENABLED(SKR_UART)
#elif ANY(SKR13, SKR14, SKR14Turbo, SKR2, SKR3, SKRPRO11, SKRMiniE3V2, SKRMiniE3V3, SKRE3Turbo, SKR_CR6) && ENABLED(SKR_UART)
#if ENABLED(SKR_2209)
#define X_DRIVER_TYPE TMC2209
#define Y_DRIVER_TYPE TMC2209
@@ -3543,11 +3543,7 @@
#if ENABLED(MeshFast)
#define GRID_MAX_POINTS_X 3
#elif ENABLED(MeshStd)
#if ANY(MachineCR6, MachineEnder3Touchscreen)
#define GRID_MAX_POINTS_X 4
#elif ENABLED(MachineCR6Max)
#define GRID_MAX_POINTS_X 7
#elif ENABLED(ABL_UBL)
#if ENABLED(ABL_UBL)
#define GRID_MAX_POINTS_X 6
#else
#define GRID_MAX_POINTS_X 5
Marlin/Version.h
+4
View File
@@ -192,6 +192,10 @@
#define CUSTOM_MACHINE_NAME "SermoonD1"
#elif ENABLED(MachineCR5)
#define CUSTOM_MACHINE_NAME "CR5 Pro"
#elif ENABLED(MachineCR6)
#define CUSTOM_MACHINE_NAME "CR6"
#elif ENABLED(MachineCR6Max)
#define CUSTOM_MACHINE_NAME "CR6 Max"
#elif ENABLED(MachineCR30)
#define CUSTOM_MACHINE_NAME "CR30 Printmill"
#endif
Marlin/src/HAL/STM32/HAL.h
+1 -1
View File
@@ -112,7 +112,7 @@
#else
#error "LCD_SERIAL_PORT must be from 1 to 9, or -1 for Native USB."
#endif
#if HAS_DGUS_LCD || ENABLED(DGUS_LCD_UI_CREALITY_TOUCH) || ENABLED(DWINOS_4)
#if HAS_DGUS_LCD || ENABLED(DGUS_LCD_UI_CREALITY_TOUCH) || ENABLED(EXTENSIBLE_UI)
#define LCD_SERIAL_TX_BUFFER_FREE() LCD_SERIAL.availableForWrite()
#endif
#endif
Marlin/src/gcode/control/M111.cpp
+1 -1
View File
@@ -66,7 +66,7 @@ void GcodeSuite::M111() {
SERIAL_ECHOPGM(STR_DEBUG_OFF);
#if !(defined(__AVR__) && defined(USBCON))
#if ENABLED(SERIAL_STATS_RX_BUFFER_OVERRUNS)
SERIAL_ECHOPGM("\nBuffer Overruns: ", MYSERIAL1.buffer_overruns());
//SERIAL_ECHOPGM("\nBuffer Overruns: ", MYSERIAL1.buffer_overruns());
#endif
#if ENABLED(SERIAL_STATS_RX_FRAMING_ERRORS)
SERIAL_ECHOPGM("\nFraming Errors: ", MYSERIAL1.framing_errors());
Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.cpp
+6 -7
View File
@@ -543,7 +543,7 @@ if(idleThrottling == 1800) {
}
if(idleThrottling == 1900) {
if(isMediaMounted())
if(isMediaInserted())
{
uint16_t currPage, maxPageAdd;
if(fileIndex == 0)
@@ -1052,7 +1052,7 @@ void RTSSHOW::RTS_HandleData()
#endif
//SERIAL_ECHOLNPGM_P(PSTR("BeginSwitch"));
float tmp_zprobe_offset = 0.0f;
switch (Checkkey)
{
case Printfile:
@@ -1205,7 +1205,6 @@ void RTSSHOW::RTS_HandleData()
break;
case Zoffset:
float tmp_zprobe_offset;
if (recdat.data[0] >= 32768)
{
tmp_zprobe_offset = ((float)recdat.data[0] - 65536) / 100;
@@ -2002,7 +2001,7 @@ void RTSSHOW::RTS_HandleData()
case Filement:
if (recdat.addr == Exchfilement)
{
extruder_t tmpTool;
extruder_t tmpTool = E0;
if (recdat.data[0]<=2)
tmpTool = E0;
else if (recdat.data[0]<=4)
@@ -2218,7 +2217,7 @@ void RTSSHOW::RTS_HandleData()
case Filename:
//SERIAL_ECHOLNPGM_P(PSTR("Filename Selected"));
if (isMediaMounted() && recdat.addr == FilenameChs)
if (isMediaInserted() && recdat.addr == FilenameChs)
{
//SERIAL_ECHOLNPGM_P(PSTR("Has Media"));
@@ -2258,7 +2257,7 @@ void RTSSHOW::RTS_HandleData()
}
else if (recdat.addr == FilenamePlay)
{
if (recdat.data[0] == 1 && isMediaMounted()) //for sure
if (recdat.data[0] == 1 && isMediaInserted()) //for sure
{
printFile(filenavigator.getIndexName(fileIndex + recordcount));
@@ -2493,7 +2492,7 @@ void onPrinterKilled(FSTR_P const error, FSTR_P const component) {
delay_ms(10);
}
void onMediaMounted()
void onMediaInserted()
{
//SERIAL_ECHOLNPGM_P(PSTR("***Initing card is OK***"));
filenavigator.reset();
Marlin/src/lcd/extui/ui_api.cpp
+1 -1
View File
@@ -1198,7 +1198,7 @@ namespace ExtUI {
return isPrinting() && (isPrintingFromMediaPaused() || print_job_timer.isPaused());
}
bool isMediaMounted() { return TERN0(HAS_MEDIA, IS_SD_INSERTED() || card.isMounted()); }
bool isMediaInserted() { return TERN0(HAS_MEDIA, IS_SD_INSERTED() || card.isMounted()); }
// Pause/Resume/Stop are implemented in MarlinUI
void pausePrint() { ui.pause_print(); }
Marlin/src/sd/cardreader.cpp
+1 -1
View File
@@ -495,7 +495,7 @@ void CardReader::mount() {
else {
flag.mounted = true;
SERIAL_ECHO_MSG(STR_SD_CARD_OK);
TERN_(EXTENSIBLE_UI, ExtUI::onMediaMounted()); // ExtUI response
TERN_(EXTENSIBLE_UI, ExtUI::isMediaInserted()); // ExtUI response
}
if (flag.mounted)