Pārlūkot izejas kodu

Patch #else / #endif comments

Scott Lahteine 8 gadus atpakaļ
vecāks
revīzija
081bf1f879

+ 2
- 2
Marlin/Conditionals_LCD.h Parādīt failu

205
     #ifndef LCD_HEIGHT
205
     #ifndef LCD_HEIGHT
206
       #define LCD_HEIGHT 4
206
       #define LCD_HEIGHT 4
207
     #endif
207
     #endif
208
-  #else //no panel but just LCD
208
+  #else // no panel but just LCD
209
     #if ENABLED(ULTRA_LCD)
209
     #if ENABLED(ULTRA_LCD)
210
       #ifndef LCD_WIDTH
210
       #ifndef LCD_WIDTH
211
         #define LCD_WIDTH 16
211
         #define LCD_WIDTH 16
392
   #define HAS_RESUME_CONTINUE (ENABLED(NEWPANEL) || ENABLED(EMERGENCY_PARSER))
392
   #define HAS_RESUME_CONTINUE (ENABLED(NEWPANEL) || ENABLED(EMERGENCY_PARSER))
393
   #define HAS_COLOR_LEDS (ENABLED(BLINKM) || ENABLED(RGB_LED) || ENABLED(RGBW_LED))
393
   #define HAS_COLOR_LEDS (ENABLED(BLINKM) || ENABLED(RGB_LED) || ENABLED(RGBW_LED))
394
 
394
 
395
-#endif //CONDITIONALS_LCD_H
395
+#endif // CONDITIONALS_LCD_H

+ 1
- 1
Marlin/Marlin.h Parādīt failu

429
   bool axis_unhomed_error(const bool x, const bool y, const bool z);
429
   bool axis_unhomed_error(const bool x, const bool y, const bool z);
430
 #endif
430
 #endif
431
 
431
 
432
-#endif //MARLIN_H
432
+#endif // MARLIN_H

+ 8
- 8
Marlin/Marlin_main.cpp Parādīt failu

788
     return free_memory;
788
     return free_memory;
789
   }
789
   }
790
 }
790
 }
791
-#endif //!SDSUPPORT
791
+#endif // !SDSUPPORT
792
 
792
 
793
 #if ENABLED(DIGIPOT_I2C)
793
 #if ENABLED(DIGIPOT_I2C)
794
   extern void digipot_i2c_set_current(int channel, float current);
794
   extern void digipot_i2c_set_current(int channel, float current);
1841
       do_blocking_move_to_z(z_dest);
1841
       do_blocking_move_to_z(z_dest);
1842
   }
1842
   }
1843
 
1843
 
1844
-#endif //HAS_BED_PROBE
1844
+#endif // HAS_BED_PROBE
1845
 
1845
 
1846
 #if HAS_PROBING_PROCEDURE || HOTENDS > 1 || ENABLED(Z_PROBE_ALLEN_KEY) || ENABLED(Z_PROBE_SLED) || ENABLED(NOZZLE_CLEAN_FEATURE) || ENABLED(NOZZLE_PARK_FEATURE) || ENABLED(DELTA_AUTO_CALIBRATION)
1846
 #if HAS_PROBING_PROCEDURE || HOTENDS > 1 || ENABLED(Z_PROBE_ALLEN_KEY) || ENABLED(Z_PROBE_SLED) || ENABLED(NOZZLE_CLEAN_FEATURE) || ENABLED(NOZZLE_PARK_FEATURE) || ENABLED(DELTA_AUTO_CALIBRATION)
1847
 
1847
 
3208
     next_busy_signal_ms = ms + host_keepalive_interval * 1000UL;
3208
     next_busy_signal_ms = ms + host_keepalive_interval * 1000UL;
3209
   }
3209
   }
3210
 
3210
 
3211
-#endif //HOST_KEEPALIVE_FEATURE
3211
+#endif // HOST_KEEPALIVE_FEATURE
3212
 
3212
 
3213
 bool position_is_reachable(const float target[XYZ]
3213
 bool position_is_reachable(const float target[XYZ]
3214
   #if HAS_BED_PROBE
3214
   #if HAS_BED_PROBE
3421
     );
3421
     );
3422
   }
3422
   }
3423
 
3423
 
3424
-#endif //FWRETRACT
3424
+#endif // FWRETRACT
3425
 
3425
 
3426
 #if ENABLED(NOZZLE_CLEAN_FEATURE)
3426
 #if ENABLED(NOZZLE_CLEAN_FEATURE)
3427
   /**
3427
   /**
7032
     inline void gcode_M129() { baricuda_e_to_p_pressure = 0; }
7032
     inline void gcode_M129() { baricuda_e_to_p_pressure = 0; }
7033
   #endif
7033
   #endif
7034
 
7034
 
7035
-#endif //BARICUDA
7035
+#endif // BARICUDA
7036
 
7036
 
7037
 /**
7037
 /**
7038
  * M140: Set bed temperature
7038
  * M140: Set bed temperature
9385
     for (uint8_t j = 0; j < MIXING_STEPPERS; j++)
9385
     for (uint8_t j = 0; j < MIXING_STEPPERS; j++)
9386
       mixing_factor[j] = mixing_virtual_tool_mix[tmp_extruder][j];
9386
       mixing_factor[j] = mixing_virtual_tool_mix[tmp_extruder][j];
9387
 
9387
 
9388
-  #else //!MIXING_EXTRUDER || MIXING_VIRTUAL_TOOLS <= 1
9388
+  #else // !MIXING_EXTRUDER || MIXING_VIRTUAL_TOOLS <= 1
9389
 
9389
 
9390
     #if HOTENDS > 1
9390
     #if HOTENDS > 1
9391
 
9391
 
9677
     SERIAL_ECHO_START;
9677
     SERIAL_ECHO_START;
9678
     SERIAL_ECHOLNPAIR(MSG_ACTIVE_EXTRUDER, (int)active_extruder);
9678
     SERIAL_ECHOLNPAIR(MSG_ACTIVE_EXTRUDER, (int)active_extruder);
9679
 
9679
 
9680
-  #endif //!MIXING_EXTRUDER || MIXING_VIRTUAL_TOOLS <= 1
9680
+  #endif // !MIXING_EXTRUDER || MIXING_VIRTUAL_TOOLS <= 1
9681
 }
9681
 }
9682
 
9682
 
9683
 /**
9683
 /**
9968
 
9968
 
9969
         case 928: // M928: Start SD write
9969
         case 928: // M928: Start SD write
9970
           gcode_M928(); break;
9970
           gcode_M928(); break;
9971
-      #endif //SDSUPPORT
9971
+      #endif // SDSUPPORT
9972
 
9972
 
9973
       case 31: // M31: Report time since the start of SD print or last M109
9973
       case 31: // M31: Report time since the start of SD print or last M109
9974
         gcode_M31(); break;
9974
         gcode_M31(); break;

+ 1
- 1
Marlin/blinkm.cpp Parādīt failu

42
   Wire.endTransmission();
42
   Wire.endTransmission();
43
 }
43
 }
44
 
44
 
45
-#endif //BLINKM
45
+#endif // BLINKM
46
 
46
 

+ 1
- 1
Marlin/boards.h Parādīt failu

98
 
98
 
99
 #define MB(board) (MOTHERBOARD==BOARD_##board)
99
 #define MB(board) (MOTHERBOARD==BOARD_##board)
100
 
100
 
101
-#endif //__BOARDS_H
101
+#endif // __BOARDS_H

+ 2
- 2
Marlin/cardreader.cpp Parādīt failu

54
   //power to SD reader
54
   //power to SD reader
55
   #if SDPOWER > -1
55
   #if SDPOWER > -1
56
     OUT_WRITE(SDPOWER, HIGH);
56
     OUT_WRITE(SDPOWER, HIGH);
57
-  #endif //SDPOWER
57
+  #endif // SDPOWER
58
 
58
 
59
   next_autostart_ms = millis() + 5000;
59
   next_autostart_ms = millis() + 5000;
60
 }
60
 }
882
   }
882
   }
883
 }
883
 }
884
 
884
 
885
-#endif //SDSUPPORT
885
+#endif // SDSUPPORT

+ 2
- 2
Marlin/cardreader.h Parādīt failu

183
 
183
 
184
 #define IS_SD_PRINTING (false)
184
 #define IS_SD_PRINTING (false)
185
 
185
 
186
-#endif //SDSUPPORT
186
+#endif // SDSUPPORT
187
 
187
 
188
-#endif //__CARDREADER_H
188
+#endif // __CARDREADER_H

+ 2
- 2
Marlin/configuration_store.cpp Parādīt failu

418
       EEPROM_WRITE(ubl_active);
418
       EEPROM_WRITE(ubl_active);
419
       EEPROM_WRITE(dummy);
419
       EEPROM_WRITE(dummy);
420
       EEPROM_WRITE(eeprom_slot);
420
       EEPROM_WRITE(eeprom_slot);
421
-    #endif //AUTO_BED_LEVELING_UBL
421
+    #endif // AUTO_BED_LEVELING_UBL
422
 
422
 
423
     // 9 floats for DELTA / Z_DUAL_ENDSTOPS
423
     // 9 floats for DELTA / Z_DUAL_ENDSTOPS
424
     #if ENABLED(DELTA)
424
     #if ENABLED(DELTA)
795
         EEPROM_READ(dummyb);
795
         EEPROM_READ(dummyb);
796
         EEPROM_READ(dummy);
796
         EEPROM_READ(dummy);
797
         EEPROM_READ(dummyui8);
797
         EEPROM_READ(dummyui8);
798
-      #endif //AUTO_BED_LEVELING_UBL
798
+      #endif // AUTO_BED_LEVELING_UBL
799
 
799
 
800
       #if ENABLED(DELTA)
800
       #if ENABLED(DELTA)
801
         EEPROM_READ(endstop_adj);               // 3 floats
801
         EEPROM_READ(endstop_adj);               // 3 floats

+ 1
- 1
Marlin/digipot_mcp4451.cpp Parādīt failu

76
     digipot_i2c_set_current(i, digipot_motor_current[i]);
76
     digipot_i2c_set_current(i, digipot_motor_current[i]);
77
 }
77
 }
78
 
78
 
79
-#endif //DIGIPOT_I2C
79
+#endif // DIGIPOT_I2C

+ 1
- 1
Marlin/endstop_interrupts.h Parādīt failu

203
   // If we arrive here without raising an assertion, each pin has either an EXT-interrupt or a PCI.
203
   // If we arrive here without raising an assertion, each pin has either an EXT-interrupt or a PCI.
204
 }
204
 }
205
 
205
 
206
-#endif //_ENDSTOP_INTERRUPTS_H_
206
+#endif // _ENDSTOP_INTERRUPTS_H_

+ 1
- 1
Marlin/language.h Parādīt failu

305
 
305
 
306
 #include "language_en.h"
306
 #include "language_en.h"
307
 
307
 
308
-#endif //__LANGUAGE_H
308
+#endif // __LANGUAGE_H

+ 1
- 1
Marlin/macros.h Parādīt failu

183
 #define RECIPROCAL(x) (NEAR_ZERO(x) ? 0.0 : 1.0 / (x))
183
 #define RECIPROCAL(x) (NEAR_ZERO(x) ? 0.0 : 1.0 / (x))
184
 #define FIXFLOAT(f) (f + 0.00001)
184
 #define FIXFLOAT(f) (f + 0.00001)
185
 
185
 
186
-#endif //__MACROS_H
186
+#endif // __MACROS_H

+ 1
- 1
Marlin/mesh_bed_leveling.cpp Parādīt failu

47
     ZERO(z_values);
47
     ZERO(z_values);
48
   }
48
   }
49
 
49
 
50
-#endif  // MESH_BED_LEVELING
50
+#endif // MESH_BED_LEVELING

+ 1
- 1
Marlin/mesh_bed_leveling.h Parādīt failu

119
 
119
 
120
   extern mesh_bed_leveling mbl;
120
   extern mesh_bed_leveling mbl;
121
 
121
 
122
-#endif  // MESH_BED_LEVELING
122
+#endif // MESH_BED_LEVELING

+ 1
- 1
Marlin/nozzle.h Parādīt failu

32
                   nozzle_clean_length = fabs(nozzle_clean_start_point[X_AXIS] - nozzle_clean_end_point[X_AXIS]), //abs x size of wipe pad
32
                   nozzle_clean_length = fabs(nozzle_clean_start_point[X_AXIS] - nozzle_clean_end_point[X_AXIS]), //abs x size of wipe pad
33
                   nozzle_clean_height = fabs(nozzle_clean_start_point[Y_AXIS] - nozzle_clean_end_point[Y_AXIS]); //abs y size of wipe pad
33
                   nozzle_clean_height = fabs(nozzle_clean_start_point[Y_AXIS] - nozzle_clean_end_point[Y_AXIS]); //abs y size of wipe pad
34
   constexpr bool nozzle_clean_horizontal = nozzle_clean_length >= nozzle_clean_height; //whether to zig-zag horizontally or vertically
34
   constexpr bool nozzle_clean_horizontal = nozzle_clean_length >= nozzle_clean_height; //whether to zig-zag horizontally or vertically
35
-#endif //NOZZLE_CLEAN_FEATURE
35
+#endif // NOZZLE_CLEAN_FEATURE
36
 
36
 
37
 /**
37
 /**
38
  * @brief Nozzle class
38
  * @brief Nozzle class

+ 1
- 1
Marlin/pins.h Parādīt failu

568
   #define SS_PIN   AVR_SS_PIN
568
   #define SS_PIN   AVR_SS_PIN
569
 #endif
569
 #endif
570
 
570
 
571
-#endif //__PINS_H
571
+#endif // __PINS_H

+ 1
- 1
Marlin/pins_SAV_MKI.h Parādīt failu

131
   // For LCD SHIFT register LCD
131
   // For LCD SHIFT register LCD
132
   #define SR_DATA_PIN         EXT_AUX_SDA_D1
132
   #define SR_DATA_PIN         EXT_AUX_SDA_D1
133
   #define SR_CLK_PIN          EXT_AUX_SCL_D0
133
   #define SR_CLK_PIN          EXT_AUX_SCL_D0
134
-#endif  // SAV_3DLCD
134
+#endif // SAV_3DLCD
135
 
135
 
136
 #if ENABLED(SAV_3DLCD) || ENABLED(SAV_3DGLCD)
136
 #if ENABLED(SAV_3DLCD) || ENABLED(SAV_3DGLCD)
137
   #define BTN_EN1            EXT_AUX_A1_IO
137
   #define BTN_EN1            EXT_AUX_A1_IO

+ 2
- 2
Marlin/planner.cpp Parādīt failu

392
     thermalManager.setTargetHotend(t, 0);
392
     thermalManager.setTargetHotend(t, 0);
393
   }
393
   }
394
 
394
 
395
-#endif //AUTOTEMP
395
+#endif // AUTOTEMP
396
 
396
 
397
 /**
397
 /**
398
  * Maintain fans, paste extruder pressure,
398
  * Maintain fans, paste extruder pressure,
487
         KICKSTART_FAN(2);
487
         KICKSTART_FAN(2);
488
       #endif
488
       #endif
489
 
489
 
490
-    #endif //FAN_KICKSTART_TIME
490
+    #endif // FAN_KICKSTART_TIME
491
 
491
 
492
     #if ENABLED(FAN_SOFT_PWM)
492
     #if ENABLED(FAN_SOFT_PWM)
493
       #if HAS_FAN0
493
       #if HAS_FAN0

+ 1
- 1
Marlin/servo.cpp Parādīt failu

221
           , OCIE3A);    // disable the timer3 output compare A interrupt
221
           , OCIE3A);    // disable the timer3 output compare A interrupt
222
       timerDetach(TIMER3OUTCOMPAREA_INT);
222
       timerDetach(TIMER3OUTCOMPAREA_INT);
223
     }
223
     }
224
-  #else //!WIRING
224
+  #else // !WIRING
225
     // For arduino - in future: call here to a currently undefined function to reset the timer
225
     // For arduino - in future: call here to a currently undefined function to reset the timer
226
     UNUSED(timer);
226
     UNUSED(timer);
227
   #endif
227
   #endif

+ 1
- 1
Marlin/stepper.cpp Parādīt failu

1398
     //delay(10);
1398
     //delay(10);
1399
   }
1399
   }
1400
 
1400
 
1401
-#endif //HAS_DIGIPOTSS
1401
+#endif // HAS_DIGIPOTSS
1402
 
1402
 
1403
 #if HAS_DIGIPOTSS || HAS_MOTOR_CURRENT_PWM
1403
 #if HAS_DIGIPOTSS || HAS_MOTOR_CURRENT_PWM
1404
 
1404
 

+ 1
- 1
Marlin/stopwatch.h Parādīt failu

114
     #endif
114
     #endif
115
 };
115
 };
116
 
116
 
117
-#endif //STOPWATCH_H
117
+#endif // STOPWATCH_H

+ 9
- 9
Marlin/temperature.cpp Parādīt failu

601
       }
601
       }
602
     #else
602
     #else
603
       pid_output = constrain(target_temperature[HOTEND_INDEX], 0, PID_MAX);
603
       pid_output = constrain(target_temperature[HOTEND_INDEX], 0, PID_MAX);
604
-    #endif //PID_OPENLOOP
604
+    #endif // PID_OPENLOOP
605
 
605
 
606
     #if ENABLED(PID_DEBUG)
606
     #if ENABLED(PID_DEBUG)
607
       SERIAL_ECHO_START;
607
       SERIAL_ECHO_START;
615
         SERIAL_ECHOPAIR(MSG_PID_DEBUG_CTERM, cTerm[HOTEND_INDEX]);
615
         SERIAL_ECHOPAIR(MSG_PID_DEBUG_CTERM, cTerm[HOTEND_INDEX]);
616
       #endif
616
       #endif
617
       SERIAL_EOL;
617
       SERIAL_EOL;
618
-    #endif //PID_DEBUG
618
+    #endif // PID_DEBUG
619
 
619
 
620
   #else /* PID off */
620
   #else /* PID off */
621
     pid_output = (current_temperature[HOTEND_INDEX] < target_temperature[HOTEND_INDEX]) ? PID_MAX : 0;
621
     pid_output = (current_temperature[HOTEND_INDEX] < target_temperature[HOTEND_INDEX]) ? PID_MAX : 0;
662
       SERIAL_ECHO(iTerm_bed);
662
       SERIAL_ECHO(iTerm_bed);
663
       SERIAL_ECHOPGM(" dTerm ");
663
       SERIAL_ECHOPGM(" dTerm ");
664
       SERIAL_ECHOLN(dTerm_bed);
664
       SERIAL_ECHOLN(dTerm_bed);
665
-    #endif //PID_BED_DEBUG
665
+    #endif // PID_BED_DEBUG
666
 
666
 
667
     return pid_output;
667
     return pid_output;
668
   }
668
   }
669
-#endif //PIDTEMPBED
669
+#endif // PIDTEMPBED
670
 
670
 
671
 /**
671
 /**
672
  * Manage heating activities for extruder hot-ends and a heated bed
672
  * Manage heating activities for extruder hot-ends and a heated bed
818
         WRITE_HEATER_BED(LOW);
818
         WRITE_HEATER_BED(LOW);
819
       }
819
       }
820
     #endif
820
     #endif
821
-  #endif //TEMP_SENSOR_BED != 0
821
+  #endif // TEMP_SENSOR_BED != 0
822
 }
822
 }
823
 
823
 
824
 #define PGM_RD_W(x)   (short)pgm_read_word(&x)
824
 #define PGM_RD_W(x)   (short)pgm_read_word(&x)
1188
         bed_minttemp_raw -= OVERSAMPLENR;
1188
         bed_minttemp_raw -= OVERSAMPLENR;
1189
       #endif
1189
       #endif
1190
     }
1190
     }
1191
-  #endif //BED_MINTEMP
1191
+  #endif // BED_MINTEMP
1192
   #ifdef BED_MAXTEMP
1192
   #ifdef BED_MAXTEMP
1193
     while (analog2tempBed(bed_maxttemp_raw) > BED_MAXTEMP) {
1193
     while (analog2tempBed(bed_maxttemp_raw) > BED_MAXTEMP) {
1194
       #if HEATER_BED_RAW_LO_TEMP < HEATER_BED_RAW_HI_TEMP
1194
       #if HEATER_BED_RAW_LO_TEMP < HEATER_BED_RAW_HI_TEMP
1197
         bed_maxttemp_raw += OVERSAMPLENR;
1197
         bed_maxttemp_raw += OVERSAMPLENR;
1198
       #endif
1198
       #endif
1199
     }
1199
     }
1200
-  #endif //BED_MAXTEMP
1200
+  #endif // BED_MAXTEMP
1201
 
1201
 
1202
   #if ENABLED(PROBING_HEATERS_OFF)
1202
   #if ENABLED(PROBING_HEATERS_OFF)
1203
     paused = false;
1203
     paused = false;
1454
     return (int)max6675_temp;
1454
     return (int)max6675_temp;
1455
   }
1455
   }
1456
 
1456
 
1457
-#endif //HEATER_0_USES_MAX6675
1457
+#endif // HEATER_0_USES_MAX6675
1458
 
1458
 
1459
 /**
1459
 /**
1460
  * Get raw temperatures
1460
  * Get raw temperatures
2056
         babystepsTodo[axis]++; //fewer to do next time
2056
         babystepsTodo[axis]++; //fewer to do next time
2057
       }
2057
       }
2058
     }
2058
     }
2059
-  #endif //BABYSTEPPING
2059
+  #endif // BABYSTEPPING
2060
 
2060
 
2061
   #if ENABLED(PINS_DEBUGGING)
2061
   #if ENABLED(PINS_DEBUGGING)
2062
     extern bool endstop_monitor_flag;
2062
     extern bool endstop_monitor_flag;

+ 1
- 1
Marlin/twibus.cpp Parādīt failu

201
 
201
 
202
 #endif
202
 #endif
203
 
203
 
204
-#endif //EXPERIMENTAL_I2CBUS
204
+#endif // EXPERIMENTAL_I2CBUS

+ 1
- 1
Marlin/twibus.h Parādīt failu

239
     #endif
239
     #endif
240
 };
240
 };
241
 
241
 
242
-#endif //TWIBUS_H
242
+#endif // TWIBUS_H

+ 16
- 16
Marlin/ultralcd.cpp Parādīt failu

291
         _MENU_ITEM_PART_2(type, ## __VA_ARGS__); \
291
         _MENU_ITEM_PART_2(type, ## __VA_ARGS__); \
292
       } while(0)
292
       } while(0)
293
 
293
 
294
-  #else  // !ENCODER_RATE_MULTIPLIER
294
+  #else // !ENCODER_RATE_MULTIPLIER
295
     #define ENCODER_RATE_MULTIPLY(F) NOOP
295
     #define ENCODER_RATE_MULTIPLY(F) NOOP
296
   #endif // !ENCODER_RATE_MULTIPLIER
296
   #endif // !ENCODER_RATE_MULTIPLIER
297
 
297
 
301
   #if ENABLED(ENCODER_RATE_MULTIPLIER)
301
   #if ENABLED(ENCODER_RATE_MULTIPLIER)
302
     #define MENU_MULTIPLIER_ITEM_EDIT(type, label, ...) MENU_MULTIPLIER_ITEM(setting_edit_ ## type, label, PSTR(label), ## __VA_ARGS__)
302
     #define MENU_MULTIPLIER_ITEM_EDIT(type, label, ...) MENU_MULTIPLIER_ITEM(setting_edit_ ## type, label, PSTR(label), ## __VA_ARGS__)
303
     #define MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(type, label, ...) MENU_MULTIPLIER_ITEM(setting_edit_callback_ ## type, label, PSTR(label), ## __VA_ARGS__)
303
     #define MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(type, label, ...) MENU_MULTIPLIER_ITEM(setting_edit_callback_ ## type, label, PSTR(label), ## __VA_ARGS__)
304
-  #else //!ENCODER_RATE_MULTIPLIER
304
+  #else // !ENCODER_RATE_MULTIPLIER
305
     #define MENU_MULTIPLIER_ITEM_EDIT(type, label, ...) MENU_ITEM(setting_edit_ ## type, label, PSTR(label), ## __VA_ARGS__)
305
     #define MENU_MULTIPLIER_ITEM_EDIT(type, label, ...) MENU_ITEM(setting_edit_ ## type, label, PSTR(label), ## __VA_ARGS__)
306
     #define MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(type, label, ...) MENU_ITEM(setting_edit_callback_ ## type, label, PSTR(label), ## __VA_ARGS__)
306
     #define MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(type, label, ...) MENU_ITEM(setting_edit_callback_ ## type, label, PSTR(label), ## __VA_ARGS__)
307
-  #endif //!ENCODER_RATE_MULTIPLIER
307
+  #endif // !ENCODER_RATE_MULTIPLIER
308
 
308
 
309
   /**
309
   /**
310
    * START_SCREEN_OR_MENU generates init code for a screen or menu
310
    * START_SCREEN_OR_MENU generates init code for a screen or menu
568
           }
568
           }
569
         #else
569
         #else
570
           expire_status_ms = 0;
570
           expire_status_ms = 0;
571
-        #endif //SDSUPPORT
571
+        #endif // SDSUPPORT
572
       }
572
       }
573
     #endif
573
     #endif
574
-  #endif //LCD_PROGRESS_BAR
574
+  #endif // LCD_PROGRESS_BAR
575
 
575
 
576
   lcd_implementation_status_screen();
576
   lcd_implementation_status_screen();
577
 
577
 
614
 
614
 
615
     feedrate_percentage = constrain(feedrate_percentage, 10, 999);
615
     feedrate_percentage = constrain(feedrate_percentage, 10, 999);
616
 
616
 
617
-  #endif //ULTIPANEL
617
+  #endif // ULTIPANEL
618
 }
618
 }
619
 
619
 
620
 /**
620
 /**
848
           MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21")); // Manually initialize the SD-card via user interface
848
           MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21")); // Manually initialize the SD-card via user interface
849
         #endif
849
         #endif
850
       }
850
       }
851
-    #endif //SDSUPPORT
851
+    #endif // SDSUPPORT
852
 
852
 
853
     #if ENABLED(LCD_INFO_MENU)
853
     #if ENABLED(LCD_INFO_MENU)
854
       MENU_ITEM(submenu, MSG_INFO_MENU, lcd_info_menu);
854
       MENU_ITEM(submenu, MSG_INFO_MENU, lcd_info_menu);
1061
     //
1061
     //
1062
     #if HOTENDS == 1
1062
     #if HOTENDS == 1
1063
       MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE, &thermalManager.target_temperature[0], 0, HEATER_0_MAXTEMP - 15, watch_temp_callback_E0);
1063
       MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE, &thermalManager.target_temperature[0], 0, HEATER_0_MAXTEMP - 15, watch_temp_callback_E0);
1064
-    #else //HOTENDS > 1
1064
+    #else // HOTENDS > 1
1065
       MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE MSG_N1, &thermalManager.target_temperature[0], 0, HEATER_0_MAXTEMP - 15, watch_temp_callback_E0);
1065
       MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE MSG_N1, &thermalManager.target_temperature[0], 0, HEATER_0_MAXTEMP - 15, watch_temp_callback_E0);
1066
       MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE MSG_N2, &thermalManager.target_temperature[1], 0, HEATER_1_MAXTEMP - 15, watch_temp_callback_E1);
1066
       MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE MSG_N2, &thermalManager.target_temperature[1], 0, HEATER_1_MAXTEMP - 15, watch_temp_callback_E1);
1067
       #if HOTENDS > 2
1067
       #if HOTENDS > 2
2191
       enqueue_and_echo_command(cmd);
2191
       enqueue_and_echo_command(cmd);
2192
     }
2192
     }
2193
 
2193
 
2194
-  #endif //PID_AUTOTUNE_MENU
2194
+  #endif // PID_AUTOTUNE_MENU
2195
 
2195
 
2196
   #if ENABLED(PIDTEMP)
2196
   #if ENABLED(PIDTEMP)
2197
 
2197
 
2360
         PID_MENU_ITEMS("", 0);
2360
         PID_MENU_ITEMS("", 0);
2361
       #endif // !PID_PARAMS_PER_HOTEND || HOTENDS == 1
2361
       #endif // !PID_PARAMS_PER_HOTEND || HOTENDS == 1
2362
 
2362
 
2363
-    #endif //PIDTEMP
2363
+    #endif // PIDTEMP
2364
 
2364
 
2365
     //
2365
     //
2366
     // Preheat Material 1 conf
2366
     // Preheat Material 1 conf
2724
       END_MENU();
2724
       END_MENU();
2725
     }
2725
     }
2726
 
2726
 
2727
-  #endif //SDSUPPORT
2727
+  #endif // SDSUPPORT
2728
 
2728
 
2729
   #if ENABLED(LCD_INFO_MENU)
2729
   #if ENABLED(LCD_INFO_MENU)
2730
 
2730
 
3285
       lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW;
3285
       lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW;
3286
     }
3286
     }
3287
 
3287
 
3288
-  #endif //SDSUPPORT
3288
+  #endif // SDSUPPORT
3289
 
3289
 
3290
   void menu_action_setting_edit_bool(const char* pstr, bool* ptr) {UNUSED(pstr); *ptr ^= true; lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; }
3290
   void menu_action_setting_edit_bool(const char* pstr, bool* ptr) {UNUSED(pstr); *ptr ^= true; lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; }
3291
   void menu_action_setting_edit_callback_bool(const char* pstr, bool* ptr, screenFunc_t callback) {
3291
   void menu_action_setting_edit_callback_bool(const char* pstr, bool* ptr, screenFunc_t callback) {
3483
       );
3483
       );
3484
     }
3484
     }
3485
 
3485
 
3486
-  #endif //SDSUPPORT && SD_DETECT_PIN
3486
+  #endif // SDSUPPORT && SD_DETECT_PIN
3487
 
3487
 
3488
   const millis_t ms = millis();
3488
   const millis_t ms = millis();
3489
   if (ELAPSED(ms, next_lcd_update_ms)
3489
   if (ELAPSED(ms, next_lcd_update_ms)
3533
                   SERIAL_ECHOPAIR("  ENCODER_10X_STEPS_PER_SEC: ", ENCODER_10X_STEPS_PER_SEC);
3533
                   SERIAL_ECHOPAIR("  ENCODER_10X_STEPS_PER_SEC: ", ENCODER_10X_STEPS_PER_SEC);
3534
                   SERIAL_ECHOPAIR("  ENCODER_100X_STEPS_PER_SEC: ", ENCODER_100X_STEPS_PER_SEC);
3534
                   SERIAL_ECHOPAIR("  ENCODER_100X_STEPS_PER_SEC: ", ENCODER_100X_STEPS_PER_SEC);
3535
                   SERIAL_EOL;
3535
                   SERIAL_EOL;
3536
-                #endif //ENCODER_RATE_MULTIPLIER_DEBUG
3536
+                #endif // ENCODER_RATE_MULTIPLIER_DEBUG
3537
               }
3537
               }
3538
 
3538
 
3539
               lastEncoderMovementMillis = ms;
3539
               lastEncoderMovementMillis = ms;
3540
             } // encoderRateMultiplierEnabled
3540
             } // encoderRateMultiplierEnabled
3541
-          #endif //ENCODER_RATE_MULTIPLIER
3541
+          #endif // ENCODER_RATE_MULTIPLIER
3542
 
3542
 
3543
           encoderPosition += (encoderDiff * encoderMultiplier) / ENCODER_PULSES_PER_STEP;
3543
           encoderPosition += (encoderDiff * encoderMultiplier) / ENCODER_PULSES_PER_STEP;
3544
           encoderDiff = 0;
3544
           encoderDiff = 0;
3829
         #endif
3829
         #endif
3830
       #else
3830
       #else
3831
         GET_BUTTON_STATES(buttons);
3831
         GET_BUTTON_STATES(buttons);
3832
-      #endif //!NEWPANEL
3832
+      #endif // !NEWPANEL
3833
 
3833
 
3834
     } // next_button_update_ms
3834
     } // next_button_update_ms
3835
 
3835
 

+ 1
- 1
Marlin/ultralcd.h Parādīt failu

148
     #define LCD_CLICKED false
148
     #define LCD_CLICKED false
149
   #endif
149
   #endif
150
 
150
 
151
-#else //no LCD
151
+#else // no LCD
152
   inline void lcd_update() {}
152
   inline void lcd_update() {}
153
   inline void lcd_init() {}
153
   inline void lcd_init() {}
154
   inline bool lcd_hasstatus() { return false; }
154
   inline bool lcd_hasstatus() { return false; }

+ 1
- 1
Marlin/ultralcd_impl_DOGM.h Parādīt failu

874
 
874
 
875
 #endif // ULTIPANEL
875
 #endif // ULTIPANEL
876
 
876
 
877
-#endif //__ULTRALCD_IMPL_DOGM_H
877
+#endif // __ULTRALCD_IMPL_DOGM_H

+ 2
- 2
Marlin/ultralcd_impl_HD44780.h Parādīt failu

101
     #define LCD_CLICKED ((buttons & B_MI) || (buttons & B_ST))
101
     #define LCD_CLICKED ((buttons & B_MI) || (buttons & B_ST))
102
   #endif
102
   #endif
103
 
103
 
104
-#endif //ULTIPANEL
104
+#endif // ULTIPANEL
105
 
105
 
106
 ////////////////////////////////////
106
 ////////////////////////////////////
107
 // Create LCD class instance and chipset-specific information
107
 // Create LCD class instance and chipset-specific information
675
         LCD_TEMP(thermalManager.degBed(), thermalManager.degTargetBed(), LCD_STR_BEDTEMP[0]);
675
         LCD_TEMP(thermalManager.degBed(), thermalManager.degTargetBed(), LCD_STR_BEDTEMP[0]);
676
       #endif
676
       #endif
677
 
677
 
678
-    #endif  // HOTENDS > 1 || TEMP_SENSOR_BED != 0
678
+    #endif // HOTENDS > 1 || TEMP_SENSOR_BED != 0
679
 
679
 
680
   #endif // LCD_WIDTH >= 20
680
   #endif // LCD_WIDTH >= 20
681
 
681
 

+ 2
- 2
Marlin/ultralcd_st7920_u8glib_rrd.h Parādīt failu

186
 
186
 
187
 #pragma GCC reset_options
187
 #pragma GCC reset_options
188
 
188
 
189
-#endif //U8GLIB_ST7920
190
-#endif //ULCDST7920_H
189
+#endif // U8GLIB_ST7920
190
+#endif // ULCDST7920_H

+ 2
- 2
Marlin/watchdog.cpp Parādīt failu

51
     kill(PSTR("ERR:Please Reset")); //kill blocks //16 characters so it fits on a 16x2 display
51
     kill(PSTR("ERR:Please Reset")); //kill blocks //16 characters so it fits on a 16x2 display
52
     while (1); //wait for user or serial reset
52
     while (1); //wait for user or serial reset
53
   }
53
   }
54
-#endif //WATCHDOG_RESET_MANUAL
54
+#endif // WATCHDOG_RESET_MANUAL
55
 
55
 
56
-#endif //USE_WATCHDOG
56
+#endif // USE_WATCHDOG

Notiek ielāde…
Atcelt
Saglabāt