Merge pull request MarlinFirmware#4159 from gudnimg/cleanup-gudni-com…

…ments Remove random `//-//` comments
drewmoseley · Apr 22, 2023 · 51da606 · 51da606
2 parents e516d8a + ccabf1f
commit 51da606
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 41 deletions.
diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h
@@ -6,7 +6,6 @@
 #define STR_HELPER(x) #x
 #define STR(x) STR_HELPER(x)
 
-//-//
 #include <avr/pgmspace.h>
 extern const uint16_t _nPrinterType;
 extern const char _sPrinterName[] PROGMEM;

diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
@@ -43,7 +43,6 @@
  *
  */
 
-//-//
 #include "Configuration.h"
 #include "Marlin.h"
 #include "config.h"

diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp
@@ -13,7 +13,6 @@
 #include <Arduino.h>
 #include "Marlin.h"
 #include "fastio.h"
-//-//
 #include "sound.h"
 #include "backlight.h"
 
@@ -671,17 +670,8 @@ uint8_t lcd_clicked(void)
     return clicked;
 }
 
-void lcd_beeper_quick_feedback(void)
-{
-//-//
-Sound_MakeSound(e_SOUND_TYPE_ButtonEcho);
-/*
-	for(int8_t i = 0; i < 10; i++)
-	{
-		Sound_MakeCustom(100,0,false);
-		_delay_us(100);
-	}
-*/
+void lcd_beeper_quick_feedback(void) {
+	Sound_MakeSound(e_SOUND_TYPE_ButtonEcho);
 }
 
 void lcd_quick_feedback(void)

diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp
@@ -944,17 +944,6 @@ static void temp_runaway_check(uint8_t _heater_id, float _target_temperature, fl
 			__preheat_counter[_heater_id]++;
 			if (__preheat_counter[_heater_id] > ((_isbed) ? 16 : 8)) // periodicaly check if current temperature changes
 			{
-				/*SERIAL_ECHOPGM("Heater:");
-				MYSERIAL.print(_heater_id);
-				SERIAL_ECHOPGM(" T:");
-				MYSERIAL.print(_current_temperature);
-				SERIAL_ECHOPGM(" Tstart:");
-				MYSERIAL.print(__preheat_start[_heater_id]);
-				SERIAL_ECHOPGM(" delta:");
-				MYSERIAL.print(_current_temperature-__preheat_start[_heater_id]);*/
-
-//-//				if (_current_temperature - __preheat_start[_heater_id] < 2) {
-//-//				if (_current_temperature - __preheat_start[_heater_id] < ((_isbed && (_current_temperature>105.0))?0.6:2.0)) {
                     __delta=2.0;
                     if(_isbed)
                          {
@@ -964,11 +953,7 @@ static void temp_runaway_check(uint8_t _heater_id, float _target_temperature, fl
                          }
 				if (_current_temperature - __preheat_start[_heater_id] < __delta) {
 					__preheat_errors[_heater_id]++;
-					/*SERIAL_ECHOPGM(" Preheat errors:");
-					MYSERIAL.println(__preheat_errors[_heater_id]);*/
-				}
-				else {
-					//SERIAL_ECHOLNPGM("");
+				} else {
 					__preheat_errors[_heater_id] = 0;
 				}
 
@@ -980,12 +965,8 @@ static void temp_runaway_check(uint8_t _heater_id, float _target_temperature, fl
 			}
 		}
 
-//-//		if (_current_temperature >= _target_temperature  && temp_runaway_status[_heater_id] == TempRunaway_PREHEAT)
 		if ((_current_temperature > (_target_temperature - __hysteresis))  && temp_runaway_status[_heater_id] == TempRunaway_PREHEAT)
 		{
-			/*SERIAL_ECHOPGM("Heater:");
-			MYSERIAL.print(_heater_id);
-			MYSERIAL.println(" ->tempRunaway");*/
 			temp_runaway_status[_heater_id] = TempRunaway_ACTIVE;
 			temp_runaway_check_active = false;
 			temp_runaway_error_counter[_heater_id] = 0;

diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
@@ -3366,10 +3366,8 @@ static void lcd_crash_mode_info2()
 }
 #endif //TMC2130
 
-//-//
-static void lcd_sound_state_set(void)
-{
-Sound_CycleState();
+static void lcd_sound_state_set(void) {
+    Sound_CycleState();
 }
 
 #ifndef MMU_FORCE_STEALTH_MODE
@@ -4237,7 +4235,6 @@ do\
 }\
 while (0)
 
-//-//
 static void lcd_check_mode_set(void)
 {
 switch(oCheckMode)

diff --git a/Firmware/util.h b/Firmware/util.h
@@ -21,8 +21,6 @@ bool show_upgrade_dialog_if_version_newer(const char *version_string);
 bool eeprom_fw_version_older_than_p(const uint16_t (&req_ver)[4]);
 void update_current_firmware_version_to_eeprom();
 
-
-//-//
 #define EEPROM_NOZZLE_DIAMETER_uM_DEFAULT 400
 
 enum class ClPrintChecking:uint_least8_t
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,7 +43,6 @@ @@
      *
      */
-    //-//
     #include "Configuration.h"
     #include "Marlin.h"
     #include "config.h"
@@ Expand Down @@