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

Extrudser info, merge upstream (powerpanic fix)

Browse Source 
build number = 114
This commit is contained in:
Robert Pelnar 2017-11-27 07:44:12 +01:00
parent 60930beb52
commit 25c16cc835
4 changed files with 30606 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Configuration.h
View File

@ -9,7 +9,7 @@
// Firmware version
#define FW_version "3.0.12-RC2"
#define FW_build 113
#define FW_build 114
//#define FW_build --BUILD-NUMBER--
#define FW_version_build FW_version " b" STR(FW_build)

15732
Firmware/builds/1_75mm_MK3-EINY04-E3Dv6full/Firmware.ino.rambo_b113.hex Normal file
View File

File diff suppressed because it is too large Load Diff

14855
Firmware/builds/1_75mm_MK3-EINY04-E3Dv6full/Firmware.ino.rambo_b114.hex Normal file
View File

File diff suppressed because it is too large Load Diff

20
Firmware/ultralcd.cpp
View File

@ -1437,6 +1437,8 @@ static void lcd_menu_extruder_info()
{
int fan_speed_RPM[2];
pat9125_update();
fan_speed_RPM[0] = 60*fan_speed[0];
fan_speed_RPM[1] = 60*fan_speed[1];
@ -1474,11 +1476,25 @@ static void lcd_menu_extruder_info()
lcd.print(itostr3(pat9125_y));
// Display Light intensity from Filament sensor
/* Frame_Avg register represents the average brightness of all pixels within a frame (324 pixels). This
value ranges from 0(darkest) to 255(brightest). */
lcd.setCursor(0, 3);
lcd.print("Intensity: ");
lcd.setCursor(12, 3);
lcd.print("Int: ");
lcd.setCursor(5, 3);
lcd.print(itostr3(pat9125_b));
// Display LASER shutter time from Filament sensor
/* 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.
When the chip is tracking on a poor reflection surface, the Shutter is large. Value ranges from 0 to
46. */
lcd.setCursor(10, 3);
lcd.print("Shut: ");
lcd.setCursor(15, 3);
lcd.print(itostr3(pat9125_s));
if (lcd_clicked())