zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

General cleanup

Browse source
This commit is contained in:
Scott Lahteine 2020-09-09 17:56:01 -05:00
parent 42619a3a81
commit d6bbcd020b
6 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/gcode/motion/G2_G3.cpp
View file

@ -115,9 +115,7 @@ void plan_arc(
); );
// Divide total travel by nominal segment length // Divide total travel by nominal segment length
uint16_t segments = FLOOR(mm_of_travel / seg_length); uint16_t segments = FLOOR(mm_of_travel / seg_length);
if (segments < min_segments) { // Too few segments? NOLESS(segments, min_segments); // At least some segments
segments = min_segments; // More segments
}
seg_length = mm_of_travel / segments; seg_length = mm_of_travel / segments;
/** /**

4
Marlin/src/lcd/dwin/e3v2/rotary_encoder.cpp
View file

@ -127,8 +127,8 @@ ENCODER_DiffState Encoder_ReceiveAnalyze(void) {
// if must encoder rati multiplier // if must encoder rati multiplier
if (EncoderRate.encoderRateEnabled) { if (EncoderRate.encoderRateEnabled) {
const float abs_diff = ABS(temp_diff); const float abs_diff = ABS(temp_diff),
const float encoderMovementSteps = abs_diff / (ENCODER_PULSES_PER_STEP); encoderMovementSteps = abs_diff / (ENCODER_PULSES_PER_STEP);
if (EncoderRate.lastEncoderTime) { if (EncoderRate.lastEncoderTime) {
// Note that the rate is always calculated between two passes through the // Note that the rate is always calculated between two passes through the
// loop and that the abs of the temp_diff value is tracked. // loop and that the abs of the temp_diff value is tracked.

8
Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
View file

@ -161,7 +161,7 @@
#if ENABLED(RET6_12864_LCD) #if ENABLED(RET6_12864_LCD)
/* RET6 12864 LCD */ // RET6 12864 LCD
#define LCD_PINS_RS PB12 #define LCD_PINS_RS PB12
#define LCD_PINS_ENABLE PB15 #define LCD_PINS_ENABLE PB15
#define LCD_PINS_D4 PB13 #define LCD_PINS_D4 PB13
@ -174,7 +174,7 @@
#elif ENABLED(VET6_12864_LCD) #elif ENABLED(VET6_12864_LCD)
/* VET6 12864 LCD */ // VET6 12864 LCD
#define LCD_PINS_RS PA4 #define LCD_PINS_RS PA4
#define LCD_PINS_ENABLE PA7 #define LCD_PINS_ENABLE PA7
#define LCD_PINS_D4 PA5 #define LCD_PINS_D4 PA5
@ -185,7 +185,7 @@
#elif ENABLED(DWIN_CREALITY_LCD) #elif ENABLED(DWIN_CREALITY_LCD)
/* RET6 DWIN ENCODER LCD */ // RET6 DWIN ENCODER LCD
#define BTN_ENC PB14 #define BTN_ENC PB14
#define BTN_EN1 PB15 #define BTN_EN1 PB15
#define BTN_EN2 PB12 #define BTN_EN2 PB12
@ -198,7 +198,7 @@
#elif ENABLED(DWIN_VET6_CREALITY_LCD) #elif ENABLED(DWIN_VET6_CREALITY_LCD)
/* VET6 DWIN ENCODER LCD */ // VET6 DWIN ENCODER LCD
#define BTN_ENC PA6 #define BTN_ENC PA6
#define BTN_EN1 PA7 #define BTN_EN1 PA7
#define BTN_EN2 PA4 #define BTN_EN2 PA4