From 081bf1f8799db79e3d16597cf1832c2b7adb3818 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 9 May 2017 12:35:43 -0500 Subject: [PATCH] Patch #else / #endif comments --- Marlin/Conditionals_LCD.h | 4 ++-- Marlin/Marlin.h | 2 +- Marlin/Marlin_main.cpp | 16 +++++++-------- Marlin/blinkm.cpp | 2 +- Marlin/boards.h | 2 +- Marlin/cardreader.cpp | 4 ++-- Marlin/cardreader.h | 4 ++-- Marlin/configuration_store.cpp | 4 ++-- Marlin/digipot_mcp4451.cpp | 2 +- Marlin/endstop_interrupts.h | 2 +- Marlin/language.h | 2 +- Marlin/macros.h | 2 +- Marlin/mesh_bed_leveling.cpp | 2 +- Marlin/mesh_bed_leveling.h | 2 +- Marlin/nozzle.h | 2 +- Marlin/pins.h | 2 +- Marlin/pins_SAV_MKI.h | 2 +- Marlin/planner.cpp | 4 ++-- Marlin/servo.cpp | 2 +- Marlin/stepper.cpp | 2 +- Marlin/stopwatch.h | 2 +- Marlin/temperature.cpp | 18 ++++++++-------- Marlin/twibus.cpp | 2 +- Marlin/twibus.h | 2 +- Marlin/ultralcd.cpp | 32 ++++++++++++++--------------- Marlin/ultralcd.h | 2 +- Marlin/ultralcd_impl_DOGM.h | 2 +- Marlin/ultralcd_impl_HD44780.h | 4 ++-- Marlin/ultralcd_st7920_u8glib_rrd.h | 4 ++-- Marlin/watchdog.cpp | 4 ++-- 30 files changed, 68 insertions(+), 68 deletions(-) diff --git a/Marlin/Conditionals_LCD.h b/Marlin/Conditionals_LCD.h index b1a5b5a05..19c7f8109 100644 --- a/Marlin/Conditionals_LCD.h +++ b/Marlin/Conditionals_LCD.h @@ -205,7 +205,7 @@ #ifndef LCD_HEIGHT #define LCD_HEIGHT 4 #endif - #else //no panel but just LCD + #else // no panel but just LCD #if ENABLED(ULTRA_LCD) #ifndef LCD_WIDTH #define LCD_WIDTH 16 @@ -392,4 +392,4 @@ #define HAS_RESUME_CONTINUE (ENABLED(NEWPANEL) || ENABLED(EMERGENCY_PARSER)) #define HAS_COLOR_LEDS (ENABLED(BLINKM) || ENABLED(RGB_LED) || ENABLED(RGBW_LED)) -#endif //CONDITIONALS_LCD_H +#endif // CONDITIONALS_LCD_H diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h index a5c2b81c2..b10541b06 100644 --- a/Marlin/Marlin.h +++ b/Marlin/Marlin.h @@ -429,4 +429,4 @@ void do_blocking_move_to_xy(const float &x, const float &y, const float &fr_mm_s bool axis_unhomed_error(const bool x, const bool y, const bool z); #endif -#endif //MARLIN_H +#endif // MARLIN_H diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 0cb90c968..4047adb52 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -788,7 +788,7 @@ extern "C" { return free_memory; } } -#endif //!SDSUPPORT +#endif // !SDSUPPORT #if ENABLED(DIGIPOT_I2C) extern void digipot_i2c_set_current(int channel, float current); @@ -1841,7 +1841,7 @@ static void clean_up_after_endstop_or_probe_move() { do_blocking_move_to_z(z_dest); } -#endif //HAS_BED_PROBE +#endif // HAS_BED_PROBE #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) @@ -3208,7 +3208,7 @@ void unknown_command_error() { next_busy_signal_ms = ms + host_keepalive_interval * 1000UL; } -#endif //HOST_KEEPALIVE_FEATURE +#endif // HOST_KEEPALIVE_FEATURE bool position_is_reachable(const float target[XYZ] #if HAS_BED_PROBE @@ -3421,7 +3421,7 @@ inline void gcode_G4() { ); } -#endif //FWRETRACT +#endif // FWRETRACT #if ENABLED(NOZZLE_CLEAN_FEATURE) /** @@ -7032,7 +7032,7 @@ inline void gcode_M111() { inline void gcode_M129() { baricuda_e_to_p_pressure = 0; } #endif -#endif //BARICUDA +#endif // BARICUDA /** * M140: Set bed temperature @@ -9385,7 +9385,7 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n for (uint8_t j = 0; j < MIXING_STEPPERS; j++) mixing_factor[j] = mixing_virtual_tool_mix[tmp_extruder][j]; - #else //!MIXING_EXTRUDER || MIXING_VIRTUAL_TOOLS <= 1 + #else // !MIXING_EXTRUDER || MIXING_VIRTUAL_TOOLS <= 1 #if HOTENDS > 1 @@ -9677,7 +9677,7 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n SERIAL_ECHO_START; SERIAL_ECHOLNPAIR(MSG_ACTIVE_EXTRUDER, (int)active_extruder); - #endif //!MIXING_EXTRUDER || MIXING_VIRTUAL_TOOLS <= 1 + #endif // !MIXING_EXTRUDER || MIXING_VIRTUAL_TOOLS <= 1 } /** @@ -9968,7 +9968,7 @@ void process_next_command() { case 928: // M928: Start SD write gcode_M928(); break; - #endif //SDSUPPORT + #endif // SDSUPPORT case 31: // M31: Report time since the start of SD print or last M109 gcode_M31(); break; diff --git a/Marlin/blinkm.cpp b/Marlin/blinkm.cpp index c495a5deb..1caf0a071 100644 --- a/Marlin/blinkm.cpp +++ b/Marlin/blinkm.cpp @@ -42,5 +42,5 @@ void SendColors(byte red, byte grn, byte blu) { Wire.endTransmission(); } -#endif //BLINKM +#endif // BLINKM diff --git a/Marlin/boards.h b/Marlin/boards.h index 14f1d27a1..32165f53c 100644 --- a/Marlin/boards.h +++ b/Marlin/boards.h @@ -98,4 +98,4 @@ #define MB(board) (MOTHERBOARD==BOARD_##board) -#endif //__BOARDS_H +#endif // __BOARDS_H diff --git a/Marlin/cardreader.cpp b/Marlin/cardreader.cpp index a37389e45..5681660d2 100644 --- a/Marlin/cardreader.cpp +++ b/Marlin/cardreader.cpp @@ -54,7 +54,7 @@ CardReader::CardReader() { //power to SD reader #if SDPOWER > -1 OUT_WRITE(SDPOWER, HIGH); - #endif //SDPOWER + #endif // SDPOWER next_autostart_ms = millis() + 5000; } @@ -882,4 +882,4 @@ void CardReader::printingHasFinished() { } } -#endif //SDSUPPORT +#endif // SDSUPPORT diff --git a/Marlin/cardreader.h b/Marlin/cardreader.h index 05e8ecf07..ca2968273 100644 --- a/Marlin/cardreader.h +++ b/Marlin/cardreader.h @@ -183,6 +183,6 @@ extern CardReader card; #define IS_SD_PRINTING (false) -#endif //SDSUPPORT +#endif // SDSUPPORT -#endif //__CARDREADER_H +#endif // __CARDREADER_H diff --git a/Marlin/configuration_store.cpp b/Marlin/configuration_store.cpp index 99495997b..997922550 100644 --- a/Marlin/configuration_store.cpp +++ b/Marlin/configuration_store.cpp @@ -418,7 +418,7 @@ void MarlinSettings::postprocess() { EEPROM_WRITE(ubl_active); EEPROM_WRITE(dummy); EEPROM_WRITE(eeprom_slot); - #endif //AUTO_BED_LEVELING_UBL + #endif // AUTO_BED_LEVELING_UBL // 9 floats for DELTA / Z_DUAL_ENDSTOPS #if ENABLED(DELTA) @@ -795,7 +795,7 @@ void MarlinSettings::postprocess() { EEPROM_READ(dummyb); EEPROM_READ(dummy); EEPROM_READ(dummyui8); - #endif //AUTO_BED_LEVELING_UBL + #endif // AUTO_BED_LEVELING_UBL #if ENABLED(DELTA) EEPROM_READ(endstop_adj); // 3 floats diff --git a/Marlin/digipot_mcp4451.cpp b/Marlin/digipot_mcp4451.cpp index 9c5e8d025..419d3a423 100644 --- a/Marlin/digipot_mcp4451.cpp +++ b/Marlin/digipot_mcp4451.cpp @@ -76,4 +76,4 @@ void digipot_i2c_init() { digipot_i2c_set_current(i, digipot_motor_current[i]); } -#endif //DIGIPOT_I2C +#endif // DIGIPOT_I2C diff --git a/Marlin/endstop_interrupts.h b/Marlin/endstop_interrupts.h index 642f78a58..7d37c77c6 100644 --- a/Marlin/endstop_interrupts.h +++ b/Marlin/endstop_interrupts.h @@ -203,4 +203,4 @@ void setup_endstop_interrupts( void ) { // If we arrive here without raising an assertion, each pin has either an EXT-interrupt or a PCI. } -#endif //_ENDSTOP_INTERRUPTS_H_ +#endif // _ENDSTOP_INTERRUPTS_H_ diff --git a/Marlin/language.h b/Marlin/language.h index f377ce248..1294eb6b6 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -305,4 +305,4 @@ #include "language_en.h" -#endif //__LANGUAGE_H +#endif // __LANGUAGE_H diff --git a/Marlin/macros.h b/Marlin/macros.h index a943e9cb5..8badc5c85 100644 --- a/Marlin/macros.h +++ b/Marlin/macros.h @@ -183,4 +183,4 @@ #define RECIPROCAL(x) (NEAR_ZERO(x) ? 0.0 : 1.0 / (x)) #define FIXFLOAT(f) (f + 0.00001) -#endif //__MACROS_H +#endif // __MACROS_H diff --git a/Marlin/mesh_bed_leveling.cpp b/Marlin/mesh_bed_leveling.cpp index 08fdd3f86..3da19d97e 100644 --- a/Marlin/mesh_bed_leveling.cpp +++ b/Marlin/mesh_bed_leveling.cpp @@ -47,4 +47,4 @@ ZERO(z_values); } -#endif // MESH_BED_LEVELING +#endif // MESH_BED_LEVELING diff --git a/Marlin/mesh_bed_leveling.h b/Marlin/mesh_bed_leveling.h index b2d503b4b..41ba2677c 100644 --- a/Marlin/mesh_bed_leveling.h +++ b/Marlin/mesh_bed_leveling.h @@ -119,4 +119,4 @@ extern mesh_bed_leveling mbl; -#endif // MESH_BED_LEVELING +#endif // MESH_BED_LEVELING diff --git a/Marlin/nozzle.h b/Marlin/nozzle.h index 6b3b4a1a2..944dd5d21 100644 --- a/Marlin/nozzle.h +++ b/Marlin/nozzle.h @@ -32,7 +32,7 @@ nozzle_clean_length = fabs(nozzle_clean_start_point[X_AXIS] - nozzle_clean_end_point[X_AXIS]), //abs x size of wipe pad nozzle_clean_height = fabs(nozzle_clean_start_point[Y_AXIS] - nozzle_clean_end_point[Y_AXIS]); //abs y size of wipe pad constexpr bool nozzle_clean_horizontal = nozzle_clean_length >= nozzle_clean_height; //whether to zig-zag horizontally or vertically -#endif //NOZZLE_CLEAN_FEATURE +#endif // NOZZLE_CLEAN_FEATURE /** * @brief Nozzle class diff --git a/Marlin/pins.h b/Marlin/pins.h index 7458d8cef..aef1083b9 100644 --- a/Marlin/pins.h +++ b/Marlin/pins.h @@ -568,4 +568,4 @@ #define SS_PIN AVR_SS_PIN #endif -#endif //__PINS_H +#endif // __PINS_H diff --git a/Marlin/pins_SAV_MKI.h b/Marlin/pins_SAV_MKI.h index c2ad00631..019139d1e 100644 --- a/Marlin/pins_SAV_MKI.h +++ b/Marlin/pins_SAV_MKI.h @@ -131,7 +131,7 @@ // For LCD SHIFT register LCD #define SR_DATA_PIN EXT_AUX_SDA_D1 #define SR_CLK_PIN EXT_AUX_SCL_D0 -#endif // SAV_3DLCD +#endif // SAV_3DLCD #if ENABLED(SAV_3DLCD) || ENABLED(SAV_3DGLCD) #define BTN_EN1 EXT_AUX_A1_IO diff --git a/Marlin/planner.cpp b/Marlin/planner.cpp index f95d8ab6e..af6808fa2 100644 --- a/Marlin/planner.cpp +++ b/Marlin/planner.cpp @@ -392,7 +392,7 @@ void Planner::recalculate() { thermalManager.setTargetHotend(t, 0); } -#endif //AUTOTEMP +#endif // AUTOTEMP /** * Maintain fans, paste extruder pressure, @@ -487,7 +487,7 @@ void Planner::check_axes_activity() { KICKSTART_FAN(2); #endif - #endif //FAN_KICKSTART_TIME + #endif // FAN_KICKSTART_TIME #if ENABLED(FAN_SOFT_PWM) #if HAS_FAN0 diff --git a/Marlin/servo.cpp b/Marlin/servo.cpp index bfe24c8b6..3536571c1 100644 --- a/Marlin/servo.cpp +++ b/Marlin/servo.cpp @@ -221,7 +221,7 @@ static void finISR(timer16_Sequence_t timer) { , OCIE3A); // disable the timer3 output compare A interrupt timerDetach(TIMER3OUTCOMPAREA_INT); } - #else //!WIRING + #else // !WIRING // For arduino - in future: call here to a currently undefined function to reset the timer UNUSED(timer); #endif diff --git a/Marlin/stepper.cpp b/Marlin/stepper.cpp index ff6d85f84..08612b490 100644 --- a/Marlin/stepper.cpp +++ b/Marlin/stepper.cpp @@ -1398,7 +1398,7 @@ void Stepper::report_positions() { //delay(10); } -#endif //HAS_DIGIPOTSS +#endif // HAS_DIGIPOTSS #if HAS_DIGIPOTSS || HAS_MOTOR_CURRENT_PWM diff --git a/Marlin/stopwatch.h b/Marlin/stopwatch.h index 735983891..ae3c998fb 100644 --- a/Marlin/stopwatch.h +++ b/Marlin/stopwatch.h @@ -114,4 +114,4 @@ class Stopwatch { #endif }; -#endif //STOPWATCH_H +#endif // STOPWATCH_H diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp index 6021d899a..8193d3c96 100644 --- a/Marlin/temperature.cpp +++ b/Marlin/temperature.cpp @@ -601,7 +601,7 @@ float Temperature::get_pid_output(int e) { } #else pid_output = constrain(target_temperature[HOTEND_INDEX], 0, PID_MAX); - #endif //PID_OPENLOOP + #endif // PID_OPENLOOP #if ENABLED(PID_DEBUG) SERIAL_ECHO_START; @@ -615,7 +615,7 @@ float Temperature::get_pid_output(int e) { SERIAL_ECHOPAIR(MSG_PID_DEBUG_CTERM, cTerm[HOTEND_INDEX]); #endif SERIAL_EOL; - #endif //PID_DEBUG + #endif // PID_DEBUG #else /* PID off */ pid_output = (current_temperature[HOTEND_INDEX] < target_temperature[HOTEND_INDEX]) ? PID_MAX : 0; @@ -662,11 +662,11 @@ float Temperature::get_pid_output(int e) { SERIAL_ECHO(iTerm_bed); SERIAL_ECHOPGM(" dTerm "); SERIAL_ECHOLN(dTerm_bed); - #endif //PID_BED_DEBUG + #endif // PID_BED_DEBUG return pid_output; } -#endif //PIDTEMPBED +#endif // PIDTEMPBED /** * Manage heating activities for extruder hot-ends and a heated bed @@ -818,7 +818,7 @@ void Temperature::manage_heater() { WRITE_HEATER_BED(LOW); } #endif - #endif //TEMP_SENSOR_BED != 0 + #endif // TEMP_SENSOR_BED != 0 } #define PGM_RD_W(x) (short)pgm_read_word(&x) @@ -1188,7 +1188,7 @@ void Temperature::init() { bed_minttemp_raw -= OVERSAMPLENR; #endif } - #endif //BED_MINTEMP + #endif // BED_MINTEMP #ifdef BED_MAXTEMP while (analog2tempBed(bed_maxttemp_raw) > BED_MAXTEMP) { #if HEATER_BED_RAW_LO_TEMP < HEATER_BED_RAW_HI_TEMP @@ -1197,7 +1197,7 @@ void Temperature::init() { bed_maxttemp_raw += OVERSAMPLENR; #endif } - #endif //BED_MAXTEMP + #endif // BED_MAXTEMP #if ENABLED(PROBING_HEATERS_OFF) paused = false; @@ -1454,7 +1454,7 @@ void Temperature::disable_all_heaters() { return (int)max6675_temp; } -#endif //HEATER_0_USES_MAX6675 +#endif // HEATER_0_USES_MAX6675 /** * Get raw temperatures @@ -2056,7 +2056,7 @@ void Temperature::isr() { babystepsTodo[axis]++; //fewer to do next time } } - #endif //BABYSTEPPING + #endif // BABYSTEPPING #if ENABLED(PINS_DEBUGGING) extern bool endstop_monitor_flag; diff --git a/Marlin/twibus.cpp b/Marlin/twibus.cpp index c59e79dc9..d4822f1d2 100644 --- a/Marlin/twibus.cpp +++ b/Marlin/twibus.cpp @@ -201,4 +201,4 @@ void TWIBus::flush() { #endif -#endif //EXPERIMENTAL_I2CBUS +#endif // EXPERIMENTAL_I2CBUS diff --git a/Marlin/twibus.h b/Marlin/twibus.h index 3b606571c..b93cd1c4c 100644 --- a/Marlin/twibus.h +++ b/Marlin/twibus.h @@ -239,4 +239,4 @@ class TWIBus { #endif }; -#endif //TWIBUS_H +#endif // TWIBUS_H diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 83cd04527..60771a5f5 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -291,7 +291,7 @@ uint16_t max_display_update_time = 0; _MENU_ITEM_PART_2(type, ## __VA_ARGS__); \ } while(0) - #else // !ENCODER_RATE_MULTIPLIER + #else // !ENCODER_RATE_MULTIPLIER #define ENCODER_RATE_MULTIPLY(F) NOOP #endif // !ENCODER_RATE_MULTIPLIER @@ -301,10 +301,10 @@ uint16_t max_display_update_time = 0; #if ENABLED(ENCODER_RATE_MULTIPLIER) #define MENU_MULTIPLIER_ITEM_EDIT(type, label, ...) MENU_MULTIPLIER_ITEM(setting_edit_ ## type, label, PSTR(label), ## __VA_ARGS__) #define MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(type, label, ...) MENU_MULTIPLIER_ITEM(setting_edit_callback_ ## type, label, PSTR(label), ## __VA_ARGS__) - #else //!ENCODER_RATE_MULTIPLIER + #else // !ENCODER_RATE_MULTIPLIER #define MENU_MULTIPLIER_ITEM_EDIT(type, label, ...) MENU_ITEM(setting_edit_ ## type, label, PSTR(label), ## __VA_ARGS__) #define MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(type, label, ...) MENU_ITEM(setting_edit_callback_ ## type, label, PSTR(label), ## __VA_ARGS__) - #endif //!ENCODER_RATE_MULTIPLIER + #endif // !ENCODER_RATE_MULTIPLIER /** * START_SCREEN_OR_MENU generates init code for a screen or menu @@ -568,10 +568,10 @@ void lcd_status_screen() { } #else expire_status_ms = 0; - #endif //SDSUPPORT + #endif // SDSUPPORT } #endif - #endif //LCD_PROGRESS_BAR + #endif // LCD_PROGRESS_BAR lcd_implementation_status_screen(); @@ -614,7 +614,7 @@ void lcd_status_screen() { feedrate_percentage = constrain(feedrate_percentage, 10, 999); - #endif //ULTIPANEL + #endif // ULTIPANEL } /** @@ -848,7 +848,7 @@ void kill_screen(const char* lcd_msg) { MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21")); // Manually initialize the SD-card via user interface #endif } - #endif //SDSUPPORT + #endif // SDSUPPORT #if ENABLED(LCD_INFO_MENU) MENU_ITEM(submenu, MSG_INFO_MENU, lcd_info_menu); @@ -1061,7 +1061,7 @@ void kill_screen(const char* lcd_msg) { // #if HOTENDS == 1 MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE, &thermalManager.target_temperature[0], 0, HEATER_0_MAXTEMP - 15, watch_temp_callback_E0); - #else //HOTENDS > 1 + #else // HOTENDS > 1 MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE MSG_N1, &thermalManager.target_temperature[0], 0, HEATER_0_MAXTEMP - 15, watch_temp_callback_E0); MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE MSG_N2, &thermalManager.target_temperature[1], 0, HEATER_1_MAXTEMP - 15, watch_temp_callback_E1); #if HOTENDS > 2 @@ -2191,7 +2191,7 @@ void kill_screen(const char* lcd_msg) { enqueue_and_echo_command(cmd); } - #endif //PID_AUTOTUNE_MENU + #endif // PID_AUTOTUNE_MENU #if ENABLED(PIDTEMP) @@ -2360,7 +2360,7 @@ void kill_screen(const char* lcd_msg) { PID_MENU_ITEMS("", 0); #endif // !PID_PARAMS_PER_HOTEND || HOTENDS == 1 - #endif //PIDTEMP + #endif // PIDTEMP // // Preheat Material 1 conf @@ -2724,7 +2724,7 @@ void kill_screen(const char* lcd_msg) { END_MENU(); } - #endif //SDSUPPORT + #endif // SDSUPPORT #if ENABLED(LCD_INFO_MENU) @@ -3285,7 +3285,7 @@ void kill_screen(const char* lcd_msg) { lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; } - #endif //SDSUPPORT + #endif // SDSUPPORT void menu_action_setting_edit_bool(const char* pstr, bool* ptr) {UNUSED(pstr); *ptr ^= true; lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; } void menu_action_setting_edit_callback_bool(const char* pstr, bool* ptr, screenFunc_t callback) { @@ -3483,7 +3483,7 @@ void lcd_update() { ); } - #endif //SDSUPPORT && SD_DETECT_PIN + #endif // SDSUPPORT && SD_DETECT_PIN const millis_t ms = millis(); if (ELAPSED(ms, next_lcd_update_ms) @@ -3533,12 +3533,12 @@ void lcd_update() { SERIAL_ECHOPAIR(" ENCODER_10X_STEPS_PER_SEC: ", ENCODER_10X_STEPS_PER_SEC); SERIAL_ECHOPAIR(" ENCODER_100X_STEPS_PER_SEC: ", ENCODER_100X_STEPS_PER_SEC); SERIAL_EOL; - #endif //ENCODER_RATE_MULTIPLIER_DEBUG + #endif // ENCODER_RATE_MULTIPLIER_DEBUG } lastEncoderMovementMillis = ms; } // encoderRateMultiplierEnabled - #endif //ENCODER_RATE_MULTIPLIER + #endif // ENCODER_RATE_MULTIPLIER encoderPosition += (encoderDiff * encoderMultiplier) / ENCODER_PULSES_PER_STEP; encoderDiff = 0; @@ -3829,7 +3829,7 @@ void lcd_reset_alert_level() { lcd_status_message_level = 0; } #endif #else GET_BUTTON_STATES(buttons); - #endif //!NEWPANEL + #endif // !NEWPANEL } // next_button_update_ms diff --git a/Marlin/ultralcd.h b/Marlin/ultralcd.h index 0b32c09b6..fbc5e1c4a 100644 --- a/Marlin/ultralcd.h +++ b/Marlin/ultralcd.h @@ -148,7 +148,7 @@ #define LCD_CLICKED false #endif -#else //no LCD +#else // no LCD inline void lcd_update() {} inline void lcd_init() {} inline bool lcd_hasstatus() { return false; } diff --git a/Marlin/ultralcd_impl_DOGM.h b/Marlin/ultralcd_impl_DOGM.h index 0db02992b..9c36573c5 100644 --- a/Marlin/ultralcd_impl_DOGM.h +++ b/Marlin/ultralcd_impl_DOGM.h @@ -874,4 +874,4 @@ static void lcd_implementation_status_screen() { #endif // ULTIPANEL -#endif //__ULTRALCD_IMPL_DOGM_H +#endif // __ULTRALCD_IMPL_DOGM_H diff --git a/Marlin/ultralcd_impl_HD44780.h b/Marlin/ultralcd_impl_HD44780.h index 0e92079d6..0cb0d524f 100644 --- a/Marlin/ultralcd_impl_HD44780.h +++ b/Marlin/ultralcd_impl_HD44780.h @@ -101,7 +101,7 @@ extern volatile uint8_t buttons; //an extended version of the last checked butt #define LCD_CLICKED ((buttons & B_MI) || (buttons & B_ST)) #endif -#endif //ULTIPANEL +#endif // ULTIPANEL //////////////////////////////////// // Create LCD class instance and chipset-specific information @@ -675,7 +675,7 @@ static void lcd_implementation_status_screen() { LCD_TEMP(thermalManager.degBed(), thermalManager.degTargetBed(), LCD_STR_BEDTEMP[0]); #endif - #endif // HOTENDS > 1 || TEMP_SENSOR_BED != 0 + #endif // HOTENDS > 1 || TEMP_SENSOR_BED != 0 #endif // LCD_WIDTH >= 20 diff --git a/Marlin/ultralcd_st7920_u8glib_rrd.h b/Marlin/ultralcd_st7920_u8glib_rrd.h index 5cc36907f..edefbc93d 100644 --- a/Marlin/ultralcd_st7920_u8glib_rrd.h +++ b/Marlin/ultralcd_st7920_u8glib_rrd.h @@ -186,5 +186,5 @@ class U8GLIB_ST7920_128X64_RRD : public U8GLIB { #pragma GCC reset_options -#endif //U8GLIB_ST7920 -#endif //ULCDST7920_H +#endif // U8GLIB_ST7920 +#endif // ULCDST7920_H diff --git a/Marlin/watchdog.cpp b/Marlin/watchdog.cpp index ce8e832b6..fe20b89e9 100644 --- a/Marlin/watchdog.cpp +++ b/Marlin/watchdog.cpp @@ -51,6 +51,6 @@ void watchdog_init() { kill(PSTR("ERR:Please Reset")); //kill blocks //16 characters so it fits on a 16x2 display while (1); //wait for user or serial reset } -#endif //WATCHDOG_RESET_MANUAL +#endif // WATCHDOG_RESET_MANUAL -#endif //USE_WATCHDOG +#endif // USE_WATCHDOG