Skip to content

Commit

Permalink
🎨 Misc. code format
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed Sep 3, 2024
1 parent d34b62e commit 5f0b9d4
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 20 deletions.
2 changes: 1 addition & 1 deletion Marlin/src/MarlinCore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ bool wait_for_heatup = false;

// For M0/M1, this flag may be cleared (by M108) to exit the wait-for-user loop
#if HAS_RESUME_CONTINUE
bool wait_for_user; // = false;
bool wait_for_user; // = false

void wait_for_user_response(millis_t ms/*=0*/, const bool no_sleep/*=false*/) {
UNUSED(no_sleep);
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/feature/filwidth.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

FilamentWidthSensor filwidth;

bool FilamentWidthSensor::enabled; // = false; // (M405-M406) Filament Width Sensor ON/OFF.
bool FilamentWidthSensor::enabled; // = false // (M405-M406) Filament Width Sensor ON/OFF.
uint32_t FilamentWidthSensor::accum; // = 0 // ADC accumulator
uint16_t FilamentWidthSensor::raw; // = 0 // Measured filament diameter - one extruder only
float FilamentWidthSensor::nominal_mm = DEFAULT_NOMINAL_FILAMENT_DIA, // (M104) Nominal filament width
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/feature/joystick.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ Joystick joystick;

void Joystick::inject_jog_moves() {
// Recursion barrier
static bool injecting_now; // = false;
static bool injecting_now; // = false
if (injecting_now) return;

#if ENABLED(NO_MOTION_BEFORE_HOMING)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ constexpr uint8_t DGUS_CMD_WRITEVAR = 0x82;
constexpr uint8_t DGUS_CMD_READVAR = 0x83;

#if ENABLED(DEBUG_DGUSLCD)
bool dguslcd_local_debug; // = false;
bool dguslcd_local_debug; // = false
#endif

void DGUSDisplay::initDisplay() {
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/module/motion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
#endif

// Relative Mode. Enable with G91, disable with G90.
bool relative_mode; // = false;
bool relative_mode; // = false

/**
* Cartesian Current Position
Expand Down
13 changes: 9 additions & 4 deletions Marlin/src/module/probe.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -938,10 +938,15 @@ float Probe::run_z_probe(const bool sanity_check/*=true*/, const_float_t z_min_p
* with the previously active tool.
*
*/
float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRaise raise_after/*=PROBE_PT_NONE*/,
const uint8_t verbose_level/*=0*/, const bool probe_relative/*=true*/, const bool sanity_check/*=true*/,
const_float_t z_min_point/*=Z_PROBE_LOW_POINT*/, const_float_t z_clearance/*=Z_TWEEN_SAFE_CLEARANCE*/,
const bool raise_after_is_relative/*=false*/
float Probe::probe_at_point(
const_float_t rx, const_float_t ry,
const ProbePtRaise raise_after, // = PROBE_PT_NONE
const uint8_t verbose_level, // = 0
const bool probe_relative, // = true
const bool sanity_check, // = true
const_float_t z_min_point, // = Z_PROBE_LOW_POINT
const_float_t z_clearance, // = Z_TWEEN_SAFE_CLEARANCE
const bool raise_after_is_relative // = false
) {
DEBUG_SECTION(log_probe, "Probe::probe_at_point", DEBUGGING(LEVELING));

Expand Down
30 changes: 21 additions & 9 deletions Marlin/src/module/probe.h
Original file line number Diff line number Diff line change
Expand Up @@ -171,15 +171,27 @@ class Probe {

#endif // !IS_KINEMATIC

static float probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRaise raise_after=PROBE_PT_NONE,
const uint8_t verbose_level=0, const bool probe_relative=true, const bool sanity_check=true,
const_float_t z_min_point=Z_PROBE_LOW_POINT, const_float_t z_clearance=Z_TWEEN_SAFE_CLEARANCE,
const bool raise_after_is_relative=false);

static float probe_at_point(const xy_pos_t &pos, const ProbePtRaise raise_after=PROBE_PT_NONE,
const uint8_t verbose_level=0, const bool probe_relative=true, const bool sanity_check=true,
const_float_t z_min_point=Z_PROBE_LOW_POINT, float z_clearance=Z_TWEEN_SAFE_CLEARANCE,
const bool raise_after_is_relative=false
static float probe_at_point(
const_float_t rx,
const_float_t ry,
const ProbePtRaise raise_after = PROBE_PT_NONE,
const uint8_t verbose_level = 0,
const bool probe_relative = true,
const bool sanity_check = true,
const_float_t z_min_point = Z_PROBE_LOW_POINT,
const_float_t z_clearance = Z_TWEEN_SAFE_CLEARANCE,
const bool raise_after_is_rel = false
);

static float probe_at_point(
const xy_pos_t &pos,
const ProbePtRaise raise_after = PROBE_PT_NONE,
const uint8_t verbose_level = 0,
const bool probe_relative = true,
const bool sanity_check = true,
const_float_t z_min_point = Z_PROBE_LOW_POINT,
const_float_t z_clearance = Z_TWEEN_SAFE_CLEARANCE,
const bool raise_after_is_rel = false
) {
return probe_at_point(pos.x, pos.y, raise_after, verbose_level, probe_relative, sanity_check, z_min_point, z_clearance, raise_after_is_relative);
}
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/module/temperature.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
#endif

#if ANY(PROBING_FANS_OFF, ADVANCED_PAUSE_FANS_PAUSE)
bool Temperature::fans_paused; // = false;
bool Temperature::fans_paused; // = false
uint8_t Temperature::saved_fan_speed[FAN_COUNT] = ARRAY_N_1(FAN_COUNT, FAN_OFF_PWM);
#endif

Expand Down Expand Up @@ -1954,7 +1954,7 @@ void Temperature::mintemp_error(const heater_id_t heater_id OPTARG(ERR_INCLUDE_T
#endif

#if ANY(CHAMBER_FAN, CHAMBER_VENT) || DISABLED(PIDTEMPCHAMBER)
static bool flag_chamber_excess_heat; // = false;
static bool flag_chamber_excess_heat; // = false
#endif

#if ANY(CHAMBER_FAN, CHAMBER_VENT)
Expand Down

0 comments on commit 5f0b9d4

Please sign in to comment.