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

Remove farm_no completely + reuse prusa_stat_farm_number() where

Browse Source 
applicable
This commit is contained in:
D.R.racer 2021-01-25 11:09:28 +01:00
parent c1ff6242b0
commit 514321f2ce
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Firmware/ultralcd.cpp
View File

@ -4110,10 +4110,9 @@ void prusa_statistics(int _message, uint8_t _fil_nr) {
farm_timer = 2; farm_timer = 2;
break; break;
case 8: // printer started case 8: // printer started
SERIAL_ECHOPGM("{[PRN:0][PFN:"); SERIAL_ECHOPGM("{[PRN:0]");
prusa_stat_farm_number();
status_number = 0; status_number = 0;
SERIAL_ECHO(farm_no);
SERIAL_ECHO(']');
farm_timer = 2; farm_timer = 2;
break; break;
case 20: // echo farm no case 20: // echo farm no
@ -4150,10 +4149,7 @@ void prusa_statistics(int _message, uint8_t _fil_nr) {
case 99: // heartbeat case 99: // heartbeat
SERIAL_ECHOPGM("{[PRN:99]"); SERIAL_ECHOPGM("{[PRN:99]");
prusa_stat_temperatures(); prusa_stat_temperatures();
SERIAL_ECHOPGM("[PFN:"); prusa_stat_farm_number();
SERIAL_ECHO(farm_no);
SERIAL_ECHO(']');
break; break;
} }
SERIAL_ECHOLN('}'); SERIAL_ECHOLN('}');
@ -4168,9 +4164,7 @@ static void prusa_stat_printerstatus(int _status)
} }
static void prusa_stat_farm_number() { static void prusa_stat_farm_number() {
SERIAL_ECHOPGM("[PFN:"); SERIAL_ECHOPGM("[PFN:0]");
SERIAL_ECHO(farm_no);
SERIAL_ECHO(']');
} }
static void prusa_stat_diameter() { static void prusa_stat_diameter() {

3
Firmware/ultralcd.h
View File

@ -47,7 +47,6 @@ void lcd_pause_print();
void lcd_resume_print(); void lcd_resume_print();
void lcd_print_stop(); void lcd_print_stop();
void prusa_statistics(int _message, uint8_t _col_nr = 0); void prusa_statistics(int _message, uint8_t _col_nr = 0);
//void lcd_confirm_print();
unsigned char lcd_choose_color(); unsigned char lcd_choose_color();
void lcd_load_filament_color_check(); void lcd_load_filament_color_check();
//void lcd_mylang(); //void lcd_mylang();
@ -127,8 +126,6 @@ extern CustomMsg custom_message_type;
extern unsigned int custom_message_state; extern unsigned int custom_message_state;
extern uint8_t farm_mode; extern uint8_t farm_mode;
// Farmers request removal of farm_no from the FW
constexpr const int farm_no = 0;
extern int farm_timer; extern int farm_timer;
extern uint8_t farm_status; extern uint8_t farm_status;