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

🎨 Misc. cleanup, comments

Browse Source
This commit is contained in:
Scott Lahteine 2022-01-06 05:07:47 -06:00 committed by Scott Lahteine
parent 2690bb1bc2
commit d7b7b570c7
10 changed files with 45 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/gcode/bedlevel/abl/G29.cpp
View File

@ -290,6 +290,9 @@ G29_TYPE GcodeSuite::G29() {
ry = RAW_Y_POSITION(parser.linearval('Y', NAN));
int8_t i = parser.byteval('I', -1), j = parser.byteval('J', -1);
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
if (!isnan(rx) && !isnan(ry)) {
// Get nearest i / j from rx / ry
i = (rx - bilinear_start.x + 0.5 * abl.gridSpacing.x) / abl.gridSpacing.x;
@ -297,6 +300,9 @@ G29_TYPE GcodeSuite::G29() {
LIMIT(i, 0, (GRID_MAX_POINTS_X) - 1);
LIMIT(j, 0, (GRID_MAX_POINTS_Y) - 1);
}
#pragma GCC diagnostic pop
if (WITHIN(i, 0, (GRID_MAX_POINTS_X) - 1) && WITHIN(j, 0, (GRID_MAX_POINTS_Y) - 1)) {
set_bed_leveling_enabled(false);
z_values[i][j] = rz;

5
Marlin/src/lcd/e3v2/creality/dwin.cpp
View File

@ -2762,7 +2762,10 @@ void HMI_Prepare() {
#endif
#if HAS_HOTEND || HAS_HEATED_BED
case PREPARE_CASE_COOL: thermalManager.cooldown(); break;
case PREPARE_CASE_COOL:
thermalManager.cooldown();
ui.reset_status();
break;
#endif
case PREPARE_CASE_LANG:

2
Marlin/src/lcd/touch/touch_buttons.cpp
View File

@ -79,7 +79,7 @@ uint8_t TouchButtons::read_buttons() {
#if ENABLED(TOUCH_SCREEN_CALIBRATION)
const calibrationState state = touch_calibration.get_calibration_state();
if (state >= CALIBRATION_TOP_LEFT && state <= CALIBRATION_BOTTOM_RIGHT) {
if (WITHIN(state, CALIBRATION_TOP_LEFT, CALIBRATION_BOTTOM_RIGHT)) {
if (touch_calibration.handleTouch(x, y)) ui.refresh();
return 0;
}

15
Marlin/src/module/endstops.cpp
View File

@ -593,9 +593,6 @@ void _O2 Endstops::report_states() {
} // Endstops::report_states
// The following routines are called from an ISR context. It could be the temperature ISR, the
// endstop ISR or the Stepper ISR.
#if HAS_DELTA_SENSORLESS_PROBING
#define __ENDSTOP(AXIS, ...) AXIS ##_MAX
#define _ENDSTOP_PIN(AXIS, ...) AXIS ##_MAX_PIN
@ -607,13 +604,18 @@ void _O2 Endstops::report_states() {
#endif
#define _ENDSTOP(AXIS, MINMAX) __ENDSTOP(AXIS, MINMAX)
// Check endstops - Could be called from Temperature ISR!
/**
* Called from interrupt context by the Endstop ISR or Stepper ISR!
* Read endstops to get their current states, register hits for all
* axes moving in the direction of their endstops, and abort moves.
*/
void Endstops::update() {
#if !ENDSTOP_NOISE_THRESHOLD
if (!abort_enabled()) return;
#if !ENDSTOP_NOISE_THRESHOLD // If not debouncing...
if (!abort_enabled()) return; // ...and not enabled, exit.
#endif
// Macros to update / copy the live_state
#define UPDATE_ENDSTOP_BIT(AXIS, MINMAX) SET_BIT_TO(live_state, _ENDSTOP(AXIS, MINMAX), (READ(_ENDSTOP_PIN(AXIS, MINMAX)) != _ENDSTOP_INVERTING(AXIS, MINMAX)))
#define COPY_LIVE_STATE(SRC_BIT, DST_BIT) SET_BIT_TO(live_state, DST_BIT, TEST(live_state, SRC_BIT))
@ -1107,6 +1109,7 @@ void Endstops::update() {
#if ENABLED(SPI_ENDSTOPS)
// Called from idle() to read Trinamic stall states
bool Endstops::tmc_spi_homing_check() {
bool hit = false;
#if X_SPI_SENSORLESS

10
Marlin/src/module/stepper.cpp
View File

@ -2346,13 +2346,9 @@ uint32_t Stepper::block_phase_isr() {
#endif
#endif // LASER_POWER_INLINE
// At this point, we must ensure the movement about to execute isn't
// trying to force the head against a limit switch. If using interrupt-
// driven change detection, and already against a limit then no call to
// the endstop_triggered method will be done and the movement will be
// done against the endstop. So, check the limits here: If the movement
// is against the limits, the block will be marked as to be killed, and
// on the next call to this ISR, will be discarded.
// If the endstop is already pressed, endstop interrupts won't invoke
// endstop_triggered and the move will grind. So check here for a
// triggered endstop, which marks the block for discard on the next ISR.
endstops.update();
#if ENABLED(Z_LATE_ENABLE)

43
Marlin/src/sd/cardreader.cpp
View File

@ -271,9 +271,8 @@ void CardReader::selectByName(SdFile dir, const char * const match) {
* good addition.
*/
void CardReader::printListing(
SdFile parent
SdFile parent, const char * const prepend
OPTARG(LONG_FILENAME_HOST_SUPPORT, const bool includeLongNames/*=false*/)
, const char * const prepend/*=nullptr*/
OPTARG(LONG_FILENAME_HOST_SUPPORT, const char * const prependLong/*=nullptr*/)
) {
dir_t p;
@ -283,61 +282,47 @@ void CardReader::printListing(
size_t lenPrepend = prepend ? strlen(prepend) + 1 : 0;
// Allocate enough stack space for the full path including / separator
char path[lenPrepend + FILENAME_LENGTH];
if (prepend) {
strcpy(path, prepend);
path[lenPrepend - 1] = '/';
}
if (prepend) { strcpy(path, prepend); path[lenPrepend - 1] = '/'; }
char* dosFilename = path + lenPrepend;
createFilename(dosFilename, p);
// Get a new directory object using the full path
// and dive recursively into it.
SdFile child; // child.close() in destructor
if (child.open(&parent, dosFilename, O_READ))
if (child.open(&parent, dosFilename, O_READ)) {
#if ENABLED(LONG_FILENAME_HOST_SUPPORT)
if (includeLongNames) {
size_t lenPrependLong = prependLong ? strlen(prependLong) + 1 : 0;
// Allocate enough stack space for the full long path including / separator
char pathLong[lenPrependLong + strlen(longFilename) + 1];
if (prependLong) {
strcpy(pathLong, prependLong);
pathLong[lenPrependLong - 1] = '/';
}
if (prependLong) { strcpy(pathLong, prependLong); pathLong[lenPrependLong - 1] = '/'; }
strcpy(pathLong + lenPrependLong, longFilename);
printListing(child, true, path, pathLong);
printListing(child, path, true, pathLong);
}
else
printListing(child, false, path);
printListing(child, path);
#else
printListing(child, path);
#endif
}
else {
SERIAL_ECHO_MSG(STR_SD_CANT_OPEN_SUBDIR, dosFilename);
return;
}
}
else if (is_dir_or_gcode(p)) {
if (prepend) {
SERIAL_ECHO(prepend);
SERIAL_CHAR('/');
}
if (prepend) { SERIAL_ECHO(prepend); SERIAL_CHAR('/'); }
SERIAL_ECHO(createFilename(filename, p));
SERIAL_CHAR(' ');
#if ENABLED(LONG_FILENAME_HOST_SUPPORT)
if (!includeLongNames)
#endif
SERIAL_ECHOLN(p.fileSize);
#if ENABLED(LONG_FILENAME_HOST_SUPPORT)
else {
SERIAL_ECHO(p.fileSize);
#if ENABLED(LONG_FILENAME_HOST_SUPPORT)
if (includeLongNames) {
SERIAL_CHAR(' ');
if (prependLong) {
SERIAL_ECHO(prependLong);
SERIAL_CHAR('/');
}
SERIAL_ECHOLN(longFilename[0] ? longFilename : "???");
if (prependLong) { SERIAL_ECHO(prependLong); SERIAL_CHAR('/'); }
SERIAL_ECHO(longFilename[0] ? longFilename : "???");
}
#endif
SERIAL_EOL();
}
}
}
@ -348,7 +333,7 @@ void CardReader::printListing(
void CardReader::ls(TERN_(LONG_FILENAME_HOST_SUPPORT, bool includeLongNames/*=false*/)) {
if (flag.mounted) {
root.rewind();
printListing(root OPTARG(LONG_FILENAME_HOST_SUPPORT, includeLongNames));
printListing(root, nullptr OPTARG(LONG_FILENAME_HOST_SUPPORT, includeLongNames));
}
}

3
Marlin/src/sd/cardreader.h
View File

@ -336,9 +336,8 @@ private:
static void selectByIndex(SdFile dir, const uint8_t index);
static void selectByName(SdFile dir, const char * const match);
static void printListing(
SdFile parent
SdFile parent, const char * const prepend
OPTARG(LONG_FILENAME_HOST_SUPPORT, const bool includeLongNames=false)
, const char * const prepend=nullptr
OPTARG(LONG_FILENAME_HOST_SUPPORT, const char * const prependLong=nullptr)
);