From d796614c6339ebe760f62149be1ef8a9390e681b Mon Sep 17 00:00:00 2001 From: espr14 Date: Tue, 24 Nov 2020 11:47:30 +0100 Subject: [PATCH 1/2] Fix warnings --- Firmware/fsensor.cpp | 4 ++++ Firmware/ultralcd.cpp | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Firmware/fsensor.cpp b/Firmware/fsensor.cpp index c81a5ac6f1..ed2b05ed7f 100755 --- a/Firmware/fsensor.cpp +++ b/Firmware/fsensor.cpp @@ -230,7 +230,11 @@ void fsensor_init(void) } } +#ifdef PAT9125 +bool fsensor_enable(bool) +#else // PAT9125 bool fsensor_enable(bool bUpdateEEPROM) +#endif // PAT9125 { #ifdef PAT9125 if (mmu_enabled == false) { //filament sensor is pat9125, enable only if it is working diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0a6e47916f..7a54d9ce7b 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -334,7 +334,7 @@ bool bSettings; // flag (i.e. 'fake parameter' const char STR_SEPARATOR[] PROGMEM = "------------"; -static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, const char* filename, char* longFilename) +static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, char* filename, char* longFilename) { char c; int enc_dif = lcd_encoder_diff / ENCODER_PULSES_PER_STEP; @@ -520,7 +520,7 @@ static uint8_t menu_item_sdfile(const char* #ifdef NEW_SD_MENU str #endif //NEW_SD_MENU - ,const char* str_fn, char* str_fnl) + , char* str_fn, char* str_fnl) { #ifdef NEW_SD_MENU // printf_P(PSTR("menu sdfile\n")); @@ -671,7 +671,7 @@ void lcdui_print_extruder(void) // Print farm number (5 chars total) void lcdui_print_farm(void) { - int chars = lcd_printf_P(_N(" F0 ")); + // int chars = lcd_printf_P(_N(" F0 ")); // lcd_space(5 - chars); /* // Farm number display From fd7b42e555b1349600a6409f7e833e4ee0a19ac9 Mon Sep 17 00:00:00 2001 From: espr14 Date: Tue, 24 Nov 2020 15:40:58 +0100 Subject: [PATCH 2/2] Fix scripts --- lang/lang-add.sh | 2 +- lang/progmem.sh | 2 +- lang/textaddr.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/lang-add.sh b/lang/lang-add.sh index f1bf56802f..7629548f5e 100755 --- a/lang/lang-add.sh +++ b/lang/lang-add.sh @@ -70,4 +70,4 @@ cat lang_add.txt | sed 's/^/"/;s/$/"/' | while read new_s; do done read -t 5 -exit 0 \ No newline at end of file +exit 0 diff --git a/lang/progmem.sh b/lang/progmem.sh index 53993b2801..567889c3b1 100755 --- a/lang/progmem.sh +++ b/lang/progmem.sh @@ -113,4 +113,4 @@ cat $PROGMEM.var | sed 's/\r/\n/g' | sed -E 's/^[0-9a-f]{8} [^ ]* //' >$PROGMEM. echo "progmem.sh finished" >&2 -exit 0 \ No newline at end of file +exit 0 diff --git a/lang/textaddr.sh b/lang/textaddr.sh index 3645a7f039..da2e6ce2d4 100755 --- a/lang/textaddr.sh +++ b/lang/textaddr.sh @@ -65,4 +65,4 @@ done > textaddr.txt echo "textaddr.sh finished" >&2 -exit 0 \ No newline at end of file +exit 0