3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove commented code

Browse source
This commit is contained in:
D.R.racer 2021-01-25 08:38:44 +01:00
parent a9d8ddc89c
commit 9bfada94f0
2 changed files with 7 additions and 180 deletions

28
Firmware/Marlin_main.cpp
View file

@ -714,10 +714,8 @@ static void factory_reset(char level)
// Force the "Follow calibration flow" message at the next boot up.
calibration_status_store(CALIBRATION_STATUS_Z_CALIBRATION);
eeprom_write_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1); //run wizard
// farm_no = 0;
farm_mode = false;
eeprom_update_byte((uint8_t*)EEPROM_FARM_MODE, farm_mode);
// EEPROM_save_B(EEPROM_FARM_NUMBER, &farm_no);
eeprom_update_dword((uint32_t *)EEPROM_TOTALTIME, 0);
eeprom_update_dword((uint32_t *)EEPROM_FILAMENTUSED, 0);
@ -1051,10 +1049,8 @@ void setup()
setup_powerhold();
farm_mode = eeprom_read_byte((uint8_t*)EEPROM_FARM_MODE);
// EEPROM_read_B(EEPROM_FARM_NUMBER, &farm_no);
if ((farm_mode == 0xFF /*&& farm_no == 0*/) /*|| ((uint16_t)farm_no == 0xFFFF)*/)
if (farm_mode == 0xFF)
farm_mode = false; //if farm_mode has not been stored to eeprom yet and farm number is set to zero or EEPROM is fresh, deactivate farm mode
// if ((uint16_t)farm_no == 0xFFFF) farm_no = 0;
if (farm_mode)
{
no_response = true; //we need confirmation by recieving PRUSA thx
@ -1370,9 +1366,7 @@ void setup()
#endif
farm_mode = eeprom_read_byte((uint8_t*)EEPROM_FARM_MODE);
// EEPROM_read_B(EEPROM_FARM_NUMBER, &farm_no);
if ((farm_mode == 0xFF /*&& farm_no == 0*/) /*|| (farm_no == static_cast<int>(0xFFFF))*/) farm_mode = false; //if farm_mode has not been stored to eeprom yet and farm number is set to zero or EEPROM is fresh, deactivate farm mode
// if (farm_no == static_cast<int>(0xFFFF)) farm_no = 0;
if (farm_mode == 0xFF) farm_mode = false; //if farm_mode has not been stored to eeprom yet and farm number is set to zero or EEPROM is fresh, deactivate farm mode
if (farm_mode)
{
prusa_statistics(8);
@ -3883,7 +3877,6 @@ void process_commands()
if (code_seen("Ping")) { // PRUSA Ping
if (farm_mode) {
PingTime = _millis();
//MYSERIAL.print(farm_no); MYSERIAL.println(": OK");
}
}
else if (code_seen("PRN")) { // PRUSA PRN
@ -3893,15 +3886,7 @@ void process_commands()
gcode_PRUSA_BadRAMBoFanTest();
}else if (code_seen("FAN")) { // PRUSA FAN
printf_P(_N("E0:%d RPM\nPRN0:%d RPM\n"), 60*fan_speed[0], 60*fan_speed[1]);
}/*else if (code_seen("fn")) { // PRUSA fn
if (farm_mode) {
printf_P(_N("%d"), farm_no);
}
else {
puts_P(_N("Not in farm mode."));
}
}*/
}
else if (code_seen("thx")) // PRUSA thx
{
no_response = false;
@ -5556,10 +5541,9 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
farm_mode = 1;
PingTime = _millis();
eeprom_update_byte((unsigned char *)EEPROM_FARM_MODE, farm_mode);
// EEPROM_save_B(EEPROM_FARM_NUMBER, &farm_no);
SilentModeMenu = SILENT_MODE_OFF;
eeprom_update_byte((unsigned char *)EEPROM_SILENT, SilentModeMenu);
fCheckModeInit(); // alternatively invoke printer reset
SilentModeMenu = SILENT_MODE_OFF;
eeprom_update_byte((unsigned char *)EEPROM_SILENT, SilentModeMenu);
fCheckModeInit(); // alternatively invoke printer reset
break;
/*! ### G99 - Deactivate farm mode <a href="https://reprap.org/wiki/G-code#G99:_Deactivate_farm_mode">G99: Deactivate farm mode</a>

159
Firmware/ultralcd.cpp
View file

@ -136,7 +136,6 @@ static void prusa_stat_farm_number();
static void prusa_stat_diameter();
static void prusa_stat_temperatures();
static void prusa_stat_printinfo();
//static void lcd_farm_no();
static void lcd_menu_xyz_y_min();
static void lcd_menu_xyz_skew();
static void lcd_menu_xyz_offset();
@ -1453,7 +1452,6 @@ void lcd_commands()
if (lcd_commands_step == 1 && !blocks_queued())
{
// lcd_confirm_print();
lcd_commands_step = 0;
lcd_commands_type = LcdCommands::Idle;
}
@ -5800,7 +5798,6 @@ static void lcd_settings_menu()
if (farm_mode)
{
// MENU_ITEM_SUBMENU_P(PSTR("Farm number"), lcd_farm_no);
MENU_ITEM_FUNCTION_P(PSTR("Disable farm mode"), lcd_disable_farm_mode);
}
@ -6432,74 +6429,6 @@ void unload_filament()
}
/*static void lcd_farm_no()
{
char step = 0;
int enc_dif = 0;
int _farmno = farm_no;
int _ret = 0;
lcd_clear();
lcd_set_cursor(0, 0);
lcd_print("Farm no");
do
{
if (abs((enc_dif - lcd_encoder_diff)) > 2) {
if (enc_dif > lcd_encoder_diff) {
switch (step) {
case(0): if (_farmno >= 100) _farmno -= 100; break;
case(1): if (_farmno % 100 >= 10) _farmno -= 10; break;
case(2): if (_farmno % 10 >= 1) _farmno--; break;
default: break;
}
}
if (enc_dif < lcd_encoder_diff) {
switch (step) {
case(0): if (_farmno < 900) _farmno += 100; break;
case(1): if (_farmno % 100 < 90) _farmno += 10; break;
case(2): if (_farmno % 10 <= 8)_farmno++; break;
default: break;
}
}
enc_dif = 0;
lcd_encoder_diff = 0;
}
lcd_set_cursor(0, 2);
if (_farmno < 100) lcd_print("0");
if (_farmno < 10) lcd_print("0");
lcd_print(_farmno);
lcd_print(" ");
lcd_set_cursor(0, 3);
lcd_print(" ");
lcd_set_cursor(step, 3);
lcd_print("^");
_delay(100);
if (lcd_clicked())
{
_delay(200);
step++;
if(step == 3) {
_ret = 1;
// farm_no = _farmno;
// EEPROM_save_B(EEPROM_FARM_NUMBER, &farm_no);
prusa_statistics(20);
lcd_return_to_status();
}
}
manage_heater();
} while (_ret == 0);
}*/
unsigned char lcd_choose_color() {
//function returns index of currently chosen item
//following part can be modified from 2 to 255 items:
@ -6584,85 +6513,6 @@ unsigned char lcd_choose_color() {
}
/*void lcd_confirm_print()
{
uint8_t filament_type;
int enc_dif = 0;
int cursor_pos = 1;
int _ret = 0;
int _t = 0;
enc_dif = lcd_encoder_diff;
lcd_clear();
lcd_set_cursor(0, 0);
lcd_print("Print ok ?");
do
{
if (abs(enc_dif - lcd_encoder_diff) > 12) {
if (enc_dif > lcd_encoder_diff) {
cursor_pos--;
}
if (enc_dif < lcd_encoder_diff) {
cursor_pos++;
}
enc_dif = lcd_encoder_diff;
}
if (cursor_pos > 2) { cursor_pos = 2; }
if (cursor_pos < 1) { cursor_pos = 1; }
lcd_set_cursor(0, 2); lcd_print(" ");
lcd_set_cursor(0, 3); lcd_print(" ");
lcd_set_cursor(2, 2);
lcd_puts_P(_T(MSG_YES));
lcd_set_cursor(2, 3);
lcd_puts_P(_T(MSG_NO));
lcd_set_cursor(0, 1 + cursor_pos);
lcd_print(">");
_delay(100);
_t = _t + 1;
if (_t>100)
{
prusa_statistics(99);
_t = 0;
}
if (lcd_clicked())
{
filament_type = FARM_FILAMENT_COLOR_NONE;
if (cursor_pos == 1)
{
_ret = 1;
// filament_type = lcd_choose_color();
prusa_statistics(4, filament_type);
no_response = true; //we need confirmation by recieving PRUSA thx
important_status = 4;
saved_filament_type = filament_type;
NcTime = _millis();
}
if (cursor_pos == 2)
{
_ret = 2;
// filament_type = lcd_choose_color();
prusa_statistics(5, filament_type);
no_response = true; //we need confirmation by recieving PRUSA thx
important_status = 5;
saved_filament_type = filament_type;
NcTime = _millis();
}
}
manage_heater();
manage_inactivity();
proc_commands();
} while (_ret == 0);
}*/
#include "w25x20cl.h"
#ifdef LCD_TEST
@ -6943,14 +6793,7 @@ static void lcd_main_menu()
}
if (IS_SD_PRINTING || is_usb_printing || (lcd_commands_type == LcdCommands::Layer1Cal))
{
// if (farm_mode)
// {
// MENU_ITEM_SUBMENU_P(PSTR("Farm number"), lcd_farm_no);
// }
}
else
if ( ! ( IS_SD_PRINTING || is_usb_printing || (lcd_commands_type == LcdCommands::Layer1Cal) ) )
{
if (mmu_enabled)
{