SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Apply some fixes from Andreas

Browse source 
Derived from
https://github.com/AnHardt/Marlin/commit/6e8ede8c694fa4d9e3c769840b09d56
7f8d8e0dd
This commit is contained in:
Scott Lahteine 2016-06-22 17:35:59 -07:00
parent bd01592816
commit 7b2fadd598
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Marlin/Marlin_main.cpp
View file

@ -4286,7 +4286,7 @@ inline void gcode_M42() {
randomSeed(millis()); randomSeed(millis());
double mean, sigma, sample_set[n_samples]; double mean = 0, sigma = 0, sample_set[n_samples];
for (uint8_t n = 0; n < n_samples; n++) { for (uint8_t n = 0; n < n_samples; n++) {
if (n_legs) { if (n_legs) {
int dir = (random(0, 10) > 5.0) ? -1 : 1; // clockwise or counter clockwise int dir = (random(0, 10) > 5.0) ? -1 : 1; // clockwise or counter clockwise
@ -4410,8 +4410,10 @@ inline void gcode_M42() {
// Raise before the next loop for the legs, // Raise before the next loop for the legs,
// or do the final raise after the last probe // or do the final raise after the last probe
if (n_legs || last_probe) { if (last_probe)
do_probe_raise(last_probe ? Z_RAISE_AFTER_PROBING : z_between); do_probe_raise(Z_RAISE_AFTER_PROBING);
else if (n_legs) {
do_probe_raise(z_between);
if (!last_probe) delay(500); if (!last_probe) delay(500);
} }

2
Marlin/temperature.cpp
View file

@ -462,7 +462,7 @@ int Temperature::getHeaterPower(int heater) {
EXTRUDER_3_AUTO_FAN_PIN == EXTRUDER_2_AUTO_FAN_PIN ? 2 : 3 EXTRUDER_3_AUTO_FAN_PIN == EXTRUDER_2_AUTO_FAN_PIN ? 2 : 3
}; };
uint8_t fanState = 0; uint8_t fanState = 0;
for (int f = 0; f <= HOTENDS; f++) { for (int f = 0; f < HOTENDS; f++) {
if (current_temperature[f] > EXTRUDER_AUTO_FAN_TEMPERATURE) if (current_temperature[f] > EXTRUDER_AUTO_FAN_TEMPERATURE)
SBI(fanState, fanBit[f]); SBI(fanState, fanBit[f]);
} }