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

Menu extruder info fixed

This commit is contained in:
Robert Pelnar 2018-07-23 12:54:48 +02:00
parent 60b4db15e0
commit f0d939140b
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Firmware/ultralcd.cpp
View File

@ -24,6 +24,7 @@
#include "SdFatUtil.h" #include "SdFatUtil.h"
#ifdef FILAMENT_SENSOR #ifdef FILAMENT_SENSOR
#include "pat9125.h"
#include "fsensor.h" #include "fsensor.h"
#endif //FILAMENT_SENSOR #endif //FILAMENT_SENSOR
@ -1999,11 +2000,19 @@ static void lcd_menu_extruder_info()
//|Fil. Xd: Yd: | //|Fil. Xd: Yd: |
//|Int: Shut: | //|Int: Shut: |
//---------------------- //----------------------
int fan_speed_RPM[2]; int fan_speed_RPM[2];
// Display Nozzle fan RPM // Display Nozzle fan RPM
fan_speed_RPM[0] = 60*fan_speed[0]; fan_speed_RPM[0] = 60*fan_speed[0];
fan_speed_RPM[1] = 60*fan_speed[1]; fan_speed_RPM[1] = 60*fan_speed[1];
lcd_printf_P(_N(
ESC_H(0,0)
"Nozzle FAN: %4d RPM\n"
"Print FAN: %4d RPM\n"
),
fan_speed_RPM[0],
fan_speed_RPM[1]
);
#ifdef FILAMENT_SENSOR #ifdef FILAMENT_SENSOR
// Display X and Y difference from Filament sensor // Display X and Y difference from Filament sensor
// Display Light intensity from Filament sensor // Display Light intensity from Filament sensor
@ -2013,28 +2022,21 @@ static void lcd_menu_extruder_info()
// Shutter register is an index of LASER shutter time. It is automatically controlled by the chip's internal // Shutter register is an index of LASER shutter time. It is automatically controlled by the chip's internal
// auto-exposure algorithm. When the chip is tracking on a good reflection surface, the Shutter is small. // auto-exposure algorithm. When the chip is tracking on a good reflection surface, the Shutter is small.
// When the chip is tracking on a poor reflection surface, the Shutter is large. Value ranges from 0 to 46. // When the chip is tracking on a poor reflection surface, the Shutter is large. Value ranges from 0 to 46.
/* pat9125_update();
lcd_printf_P(_N( if (!fsensor_enabled)
ESC_H(0,0) lcd_puts_P(_N("Filament sensor\n" "is disabled."));
"Nozzle FAN: %4d RPM\n" else
"Print FAN: %4d RPM\n" {
"Fil. Xd:%3d Yd:%3d\n" if (!moves_planned() && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LCD_COMMAND_V2_CAL))
"Int: %3d Shut: %3d\n" pat9125_update();
), lcd_printf_P(_N(
fan_speed_RPM[0], "Fil. Xd:%3d Yd:%3d\n"
fan_speed_RPM[1], "Int: %3d Shut: %3d"
pat9125_x, pat9125_y, ),
pat9125_b, pat9125_s pat9125_x, pat9125_y,
);*/ pat9125_b, pat9125_s
#else //FILAMENT_SENSOR );
printf_P(_N( }
ESC_H(0,0)
"Nozzle FAN: %4d RPM\n"
"Print FAN: %4d RPM\n"
),
fan_speed_RPM[0],
fan_speed_RPM[1]
);
#endif //FILAMENT_SENSOR #endif //FILAMENT_SENSOR
menu_back_if_clicked(); menu_back_if_clicked();
@ -2172,6 +2174,7 @@ static void lcd_menu_belt_status()
} }
#endif //TMC2130 #endif //TMC2130
#ifdef RESUME_DEBUG
extern void stop_and_save_print_to_ram(float z_move, float e_move); extern void stop_and_save_print_to_ram(float z_move, float e_move);
extern void restore_print_from_ram_and_continue(float e_move); extern void restore_print_from_ram_and_continue(float e_move);
@ -2184,6 +2187,7 @@ static void lcd_menu_test_restore()
{ {
restore_print_from_ram_and_continue(0.8); restore_print_from_ram_and_continue(0.8);
} }
#endif //RESUME_DEBUG
static void lcd_preheat_menu() static void lcd_preheat_menu()
{ {