melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace all remaining 'boolean' with 'bool'

Browse Source
This commit is contained in:
AnHardt 2017-01-13 13:03:52 +01:00
parent f6858d9974
commit fa26767efe
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/Marlin_main.cpp
View File

@ -629,7 +629,7 @@ static bool send_ok[BUFSIZE];
#ifdef CHDK #ifdef CHDK
millis_t chdkHigh = 0; millis_t chdkHigh = 0;
boolean chdkActive = false; bool chdkActive = false;
#endif #endif
#if ENABLED(PID_EXTRUSION_SCALING) #if ENABLED(PID_EXTRUSION_SCALING)
@ -966,7 +966,7 @@ void gcode_line_error(const char* err, bool doFlush = true) {
inline void get_serial_commands() { inline void get_serial_commands() {
static char serial_line_buffer[MAX_CMD_SIZE]; static char serial_line_buffer[MAX_CMD_SIZE];
static boolean serial_comment_mode = false; static bool serial_comment_mode = false;
// If the command buffer is empty for too long, // If the command buffer is empty for too long,
// send "wait" to indicate Marlin is still waiting. // send "wait" to indicate Marlin is still waiting.
@ -1006,7 +1006,7 @@ inline void get_serial_commands() {
if (npos) { if (npos) {
boolean M110 = strstr_P(command, PSTR("M110")) != NULL; bool M110 = strstr_P(command, PSTR("M110")) != NULL;
if (M110) { if (M110) {
char* n2pos = strchr(command + 4, 'N'); char* n2pos = strchr(command + 4, 'N');

2
Marlin/cardreader.cpp
View File

@ -81,7 +81,7 @@ void CardReader::lsDive(const char *prepend, SdFile parent, const char * const m
createFilename(lfilename, p); createFilename(lfilename, p);
// Allocate enough stack space for the full path to a folder, trailing slash, and nul // Allocate enough stack space for the full path to a folder, trailing slash, and nul
boolean prepend_is_empty = (prepend[0] == '\0'); bool prepend_is_empty = (prepend[0] == '\0');
int len = (prepend_is_empty ? 1 : strlen(prepend)) + strlen(lfilename) + 1 + 1; int len = (prepend_is_empty ? 1 : strlen(prepend)) + strlen(lfilename) + 1 + 1;
char path[len]; char path[len];

2
Marlin/servo.cpp
View File

@ -227,7 +227,7 @@ static void finISR(timer16_Sequence_t timer) {
#endif #endif
} }
static boolean isTimerActive(timer16_Sequence_t timer) { static bool isTimerActive(timer16_Sequence_t timer) {
// returns true if any servo is active on this timer // returns true if any servo is active on this timer
for (uint8_t channel = 0; channel < SERVOS_PER_TIMER; channel++) { for (uint8_t channel = 0; channel < SERVOS_PER_TIMER; channel++) {
if (SERVO(timer, channel).Pin.isActive) if (SERVO(timer, channel).Pin.isActive)