Cleanups following recent commits

This commit is contained in:
Scott Lahteine 2017-05-08 14:09:37 -05:00
parent dca48f0e63
commit 71396f77d3
6 changed files with 40 additions and 57 deletions

View file

@ -649,7 +649,7 @@
/**
* Heater & Fan Pausing
*/
#if ENABLED(PROBING_FANS_OFF) && FAN_COUNT == 0
#if FAN_COUNT == 0
#undef PROBING_FANS_OFF
#endif
#define QUIET_PROBING (ENABLED(PROBING_HEATERS_OFF) || ENABLED(PROBING_FANS_OFF))

View file

@ -2057,26 +2057,21 @@ static void clean_up_after_endstop_or_probe_move() {
#endif
#if ENABLED(PROBING_FANS_OFF)
void fans_pause(bool p) {
if (p == fans_paused) { // If called out of order something is wrong
SERIAL_ERROR_START;
SERIAL_ERRORPGM("Fans already ");
if (!fans_paused) SERIAL_ERRORPGM("un");
SERIAL_ERRORLNPGM("paused!");
return;
void fans_pause(const bool p) {
if (p != fans_paused) {
fans_paused = p;
if (p)
for (uint8_t x = 0; x < FAN_COUNT; x++) {
paused_fanSpeeds[x] = fanSpeeds[x];
fanSpeeds[x] = 0;
}
else
for (uint8_t x = 0; x < FAN_COUNT; x++)
fanSpeeds[x] = paused_fanSpeeds[x];
}
if (p)
for (uint8_t x = 0;x < FAN_COUNT;x++) {
paused_fanSpeeds[x] = fanSpeeds[x];
fanSpeeds[x] = 0;
}
else
for (uint8_t x = 0;x < FAN_COUNT;x++)
fanSpeeds[x] = paused_fanSpeeds[x];
fans_paused = p;
}
#endif // PROBING_FANS_OFF
#if HAS_BED_PROBE
@ -2091,18 +2086,16 @@ static void clean_up_after_endstop_or_probe_move() {
#endif
#if QUIET_PROBING
void probing_pause(bool pause) {
void probing_pause(const bool p) {
#if ENABLED(PROBING_HEATERS_OFF)
thermalManager.pause(pause);
thermalManager.pause(p);
#endif
#if ENABLED(PROBING_FANS_OFF)
fans_pause(pause);
fans_pause(p);
#endif
if(pause) safe_delay(25);
if (p) safe_delay(25);
}
#endif
#endif // QUIET_PROBING
#if ENABLED(BLTOUCH)

View file

@ -1353,38 +1353,29 @@ void Temperature::disable_all_heaters() {
}
#if ENABLED(PROBING_HEATERS_OFF)
void Temperature::pause(bool p) {
if (p == paused) { // If called out of order something is wrong
SERIAL_ERROR_START;
SERIAL_ERRORPGM("Heaters already ");
if (!paused) SERIAL_ERRORPGM("un");
SERIAL_ERRORLNPGM("paused!");
return;
}
if (p) {
HOTEND_LOOP() {
paused_hotend_temp[e] = degTargetHotend(e);
setTargetHotend(0, e);
void Temperature::pause(const bool p) {
if (p != paused) {
paused = p;
if (p) {
HOTEND_LOOP() {
paused_hotend_temp[e] = degTargetHotend(e);
setTargetHotend(0, e);
}
#if HAS_TEMP_BED
paused_bed_temp = degTargetBed();
setTargetBed(0);
#endif
}
else {
HOTEND_LOOP() setTargetHotend(paused_hotend_temp[e], e);
#if HAS_TEMP_BED
setTargetBed(paused_bed_temp);
#endif
}
#if HAS_TEMP_BED
paused_bed_temp = degTargetBed();
setTargetBed(0);
#endif
}
else {
HOTEND_LOOP() setTargetHotend(paused_hotend_temp[e], e);
#if HAS_TEMP_BED
setTargetBed(paused_bed_temp);
#endif
}
paused = p;
}
bool Temperature::ispaused() {
return paused;
}
#endif // PROBING_HEATERS_OFF
#if ENABLED(HEATER_0_USES_MAX6675)

View file

@ -458,8 +458,7 @@ class Temperature {
#endif // BABYSTEPPING
#if ENABLED(PROBING_HEATERS_OFF)
static void pause(bool p);
static bool ispaused();
static void pause(const bool p);
#endif
private:

View file

@ -1006,7 +1006,7 @@
if (!ubl.state.active) SERIAL_PROTOCOLPGM("de");
SERIAL_PROTOCOLLNPGM("activated.\n");
}
bool g29_parameter_parsing() {
bool err_flag = false;

View file

@ -225,7 +225,7 @@
const float e_normalized_dist = e_position / on_axis_distance,
z_normalized_dist = z_position / on_axis_distance;
int current_xi = cell_start_xi,
int current_xi = cell_start_xi,
current_yi = cell_start_yi;
const float m = dy / dx,