josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4159 from gudnimg/cleanup-gudni-comments 

Remove random `//-//` comments
This commit is contained in:
Guðni Már Gilbert 2023-04-22 13:53:13 +00:00 committed by GitHub
parent e516d8a0c4 ccabf1fa31
commit 51da6065c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 5 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Firmware/Configuration.h
View File

@ -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;

1
Firmware/Marlin_main.cpp
View File

@ -43,7 +43,6 @@
*
*/
//-//
#include "Configuration.h"
#include "Marlin.h"
#include "config.h"

14
Firmware/lcd.cpp
View File

@ -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)

21
Firmware/temperature.cpp
View File

@ -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;

7
Firmware/ultralcd.cpp
View File

@ -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)

2
Firmware/util.h
View File

@ -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