浏览代码

Replace all remaining 'boolean' with 'bool'

AnHardt 8 年前
父节点
当前提交
fa26767efe
共有 3 个文件被更改,包括 5 次插入5 次删除
  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 查看文件

629
 
629
 
630
 #ifdef CHDK
630
 #ifdef CHDK
631
   millis_t chdkHigh = 0;
631
   millis_t chdkHigh = 0;
632
-  boolean chdkActive = false;
632
+  bool chdkActive = false;
633
 #endif
633
 #endif
634
 
634
 
635
 #if ENABLED(PID_EXTRUSION_SCALING)
635
 #if ENABLED(PID_EXTRUSION_SCALING)
966
 
966
 
967
 inline void get_serial_commands() {
967
 inline void get_serial_commands() {
968
   static char serial_line_buffer[MAX_CMD_SIZE];
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
   // If the command buffer is empty for too long,
971
   // If the command buffer is empty for too long,
972
   // send "wait" to indicate Marlin is still waiting.
972
   // send "wait" to indicate Marlin is still waiting.
1006
 
1006
 
1007
       if (npos) {
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
         if (M110) {
1011
         if (M110) {
1012
           char* n2pos = strchr(command + 4, 'N');
1012
           char* n2pos = strchr(command + 4, 'N');

+ 1
- 1
Marlin/cardreader.cpp 查看文件

81
       createFilename(lfilename, p);
81
       createFilename(lfilename, p);
82
 
82
 
83
       // Allocate enough stack space for the full path to a folder, trailing slash, and nul
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
       int len = (prepend_is_empty ? 1 : strlen(prepend)) + strlen(lfilename) + 1 + 1;
85
       int len = (prepend_is_empty ? 1 : strlen(prepend)) + strlen(lfilename) + 1 + 1;
86
       char path[len];
86
       char path[len];
87
 
87
 

+ 1
- 1
Marlin/servo.cpp 查看文件

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

正在加载...
取消
保存