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

Remove stubs and live K by default

This commit is contained in:
Yuri D'Elia 2019-06-10 19:34:00 +02:00
parent 0239f4bce1
commit c40e3b550d
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Configuration_adv.h
View File

@ -295,7 +295,7 @@
#ifdef LIN_ADVANCE #ifdef LIN_ADVANCE
#define LIN_ADVANCE_K 0 // Unit: mm compression per 1mm/s extruder speed #define LIN_ADVANCE_K 0 // Unit: mm compression per 1mm/s extruder speed
#define LA_LIVE_K // Allow adjusting K in the Tune menu //#define LA_LIVE_K // Allow adjusting K in the Tune menu
//#define LA_DEBUG // If enabled, this will generate debug information output over USB. //#define LA_DEBUG // If enabled, this will generate debug information output over USB.
//#define LA_DEBUG_LOGIC // @wavexx: setup logic channels for isr debugging //#define LA_DEBUG_LOGIC // @wavexx: setup logic channels for isr debugging
#endif #endif

13
Firmware/ultralcd.cpp
View File

@ -6612,18 +6612,6 @@ static void lcd_colorprint_change() {
// redefine our custom handling functions to mimick other tunables // redefine our custom handling functions to mimick other tunables
#define MSG_ADVANCE_K PSTR("Advance K:") #define MSG_ADVANCE_K PSTR("Advance K:")
#if 1
// TODO: this is a stub to be removed for FW >3.7.1
const static char menu_fmt_float13_k[] PROGMEM = "%c%-13.13S%+5.3f";
const static char menu_fmt_float13off_k[] PROGMEM = "%c%-13.13S%6.6s";
static void lcd_advance_draw_K(char chr, float val)
{
if (val <= 0)
lcd_printf_P(menu_fmt_float13off_k, chr, MSG_ADVANCE_K, " [off]");
else
lcd_printf_P(menu_fmt_float13_k, chr, MSG_ADVANCE_K, val);
}
#else
static void lcd_advance_draw_K(char chr, float val) static void lcd_advance_draw_K(char chr, float val)
{ {
if (val <= 0) if (val <= 0)
@ -6631,7 +6619,6 @@ static void lcd_advance_draw_K(char chr, float val)
else else
lcd_printf_P(menu_fmt_float13, chr, MSG_ADVANCE_K, val); lcd_printf_P(menu_fmt_float13, chr, MSG_ADVANCE_K, val);
} }
#endif
static void lcd_advance_edit_K(void) static void lcd_advance_edit_K(void)
{ {