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

Merge pull request #7722 from tcm0116/2.0.x-warnings

Browse Source 
Cleanup 2.0.x compiler warnings
This commit is contained in:
Scott Lahteine
2017-10-01 21:56:54 -05:00
committed by GitHub
parent c0b365fdb4 0cb00f52d9
commit ac41eb5871
22 changed files with 238 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/feature/mixing.cpp
View File

@ -24,6 +24,10 @@
#if ENABLED(MIXING_EXTRUDER)
#if ENABLED(DIRECT_MIXING_IN_G1)
#include "../gcode/parser.h"
#endif
float mixing_factor[MIXING_STEPPERS]; // Reciprocal of mix proportion. 0.0 = off, otherwise >= 1.0.
#if MIXING_VIRTUAL_TOOLS > 1

24
Marlin/src/feature/pause.cpp
View File

@ -52,21 +52,23 @@ static float resume_position[XYZE];
static bool sd_print_paused = false;
#endif
static void filament_change_beep(const int8_t max_beep_count, const bool init=false) {
static millis_t next_buzz = 0;
static int8_t runout_beep = 0;
#if HAS_BUZZER
static void filament_change_beep(const int8_t max_beep_count, const bool init=false) {
static millis_t next_buzz = 0;
static int8_t runout_beep = 0;
if (init) next_buzz = runout_beep = 0;
if (init) next_buzz = runout_beep = 0;
const millis_t ms = millis();
if (ELAPSED(ms, next_buzz)) {
if (max_beep_count < 0 || runout_beep < max_beep_count + 5) { // Only beep as long as we're supposed to
next_buzz = ms + ((max_beep_count < 0 || runout_beep < max_beep_count) ? 2500 : 400);
BUZZ(300, 2000);
runout_beep++;
const millis_t ms = millis();
if (ELAPSED(ms, next_buzz)) {
if (max_beep_count < 0 || runout_beep < max_beep_count + 5) { // Only beep as long as we're supposed to
next_buzz = ms + ((max_beep_count < 0 || runout_beep < max_beep_count) ? 2500 : 400);
BUZZ(300, 2000);
runout_beep++;
}
}
}
}
#endif
static void ensure_safe_temperature() {
bool heaters_heating = true;