Browse Source

Replace all remaining 'boolean' with 'bool'

AnHardt 7 years ago
parent
commit
fa26767efe
3 changed files with 5 additions and 5 deletions
  1. 3
    3
      Marlin/Marlin_main.cpp
  2. 1
    1
      Marlin/cardreader.cpp
  3. 1
    1
      Marlin/servo.cpp

+ 3
- 3
Marlin/Marlin_main.cpp View File

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

+ 1
- 1
Marlin/cardreader.cpp View File

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

+ 1
- 1
Marlin/servo.cpp View File

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

Loading…
Cancel
Save