From 89fc9e7f924d8c2a899d4ad876a3bbc48ce3686a Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 14 May 2019 18:25:43 +0200 Subject: [PATCH 1/4] sketch/menu.h:90:115: warning: invalid conversion from 'void (*)(int)' to 'void (*)(uint8_t) {aka void (*)(unsigned char)}' [-fpermissive] #define MENU_ITEM_FUNCTION_NR_P(str, number, func, fn_par) do { if (menu_item_function_P(str, number, func, fn_par)) return; } while (0) ^ sketch/ultralcd.cpp:5926:5: note: in expansion of macro 'MENU_ITEM_FUNCTION_NR_P' MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '1', extr_adj, 0); ////MSG_LOAD_FILAMENT_1 c=16 --- Firmware/mmu.cpp | 2 +- Firmware/mmu.h | 2 +- Firmware/ultralcd.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index 783564329..0c1279964 100644 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -965,7 +965,7 @@ void display_loading() } } -void extr_adj(int extruder) //loading filament for SNMM +void extr_adj(uint8_t extruder) //loading filament for SNMM { #ifndef SNMM MmuCmd cmd = MmuCmd::L0 + extruder; diff --git a/Firmware/mmu.h b/Firmware/mmu.h index a7da0c2d9..0f8784ba7 100644 --- a/Firmware/mmu.h +++ b/Firmware/mmu.h @@ -103,7 +103,7 @@ extern void extr_mov(float shift, float feed_rate); extern void change_extr(int extr); extern int get_ext_nr(); extern void display_loading(); -extern void extr_adj(int extruder); +extern void extr_adj(uint8_t extruder); extern void extr_unload(); //-// extern void extr_unload_(); diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 84988c588..365f17977 100644 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -129,7 +129,6 @@ void lcd_commands(); void change_extr(int extr); -void extr_adj(int extruder); #ifdef SNMM void extr_unload_all(); From acfcd59369cd5a64b06008cadf539e5a40a8cc4c Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 14 May 2019 18:32:40 +0200 Subject: [PATCH 2/4] Fix compiler warning: sketch/menu.cpp: In function 'int menu_draw_item_puts_P(char, const char*, char)': sketch/menu.cpp:184:1: warning: no return statement in function returning non-void [-Wreturn-type] --- Firmware/menu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index e84043540..2534b43a2 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -174,7 +174,7 @@ static void menu_draw_item_puts_P(char type_char, const char* str) lcd_printf_P(PSTR("%c%-18.18S%c"), (lcd_encoder == menu_item)?'>':' ', str, type_char); } -static int menu_draw_item_puts_P(char type_char, const char* str, char num) +static void menu_draw_item_puts_P(char type_char, const char* str, char num) { lcd_set_cursor(0, menu_row); lcd_printf_P(PSTR("%c%-.16S "), (lcd_encoder == menu_item)?'>':' ', str); From 91e72a79f0d1112a897741224560488e8278e8bc Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 14 May 2019 19:07:50 +0200 Subject: [PATCH 3/4] Fix compiler warning sketch/Marlin_main.cpp:871:13: warning: unused variable 'ir_detected' [-Wunused-variable] --- Firmware/Marlin_main.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index f2b190670..c6d323a0b 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -865,23 +865,23 @@ void show_fw_version_warnings() { lcd_update_enable(true); } -//try to check if firmware is on right type of printer -void check_if_fw_is_on_right_printer(){ - #ifdef FILAMENT_SENSOR - swi2c_init(); - uint8_t pat9125_detected = swi2c_readByte_A8(PAT9125_I2C_ADDR,0x00,NULL); - uint8_t ir_detected = !(PIN_GET(IR_SENSOR_PIN)); //will return 1 only if IR can detect filament in bondtech extruder so this may fail even when we have IR sensor - +//! @brief try to check if firmware is on right type of printer +static void check_if_fw_is_on_right_printer(){ +#ifdef FILAMENT_SENSOR #ifdef IR_SENSOR + swi2c_init(); + const uint8_t pat9125_detected = swi2c_readByte_A8(PAT9125_I2C_ADDR,0x00,NULL); if (pat9125_detected){ lcd_show_fullscreen_message_and_wait_P(_i("MK3S firmware detected on MK3 printer"));} - #endif + #endif //IR_SENSOR #ifdef PAT9125 + //will return 1 only if IR can detect filament in bondtech extruder so this may fail even when we have IR sensor + const uint8_t ir_detected = !(PIN_GET(IR_SENSOR_PIN)); if (ir_detected){ lcd_show_fullscreen_message_and_wait_P(_i("MK3 firmware detected on MK3S printer"));} - #endif - #endif + #endif //PAT9125 +#endif //FILAMENT_SENSOR } uint8_t check_printer_version() From 1a78bd53baf3ab77e63369c3e7f01eaed78102d9 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 14 May 2019 19:11:46 +0200 Subject: [PATCH 4/4] Fix compiler warning sketch/Marlin_main.cpp: In function 'void marlin_wait_for_click()': sketch/Marlin_main.cpp:9646:12: warning: unused variable 'busy_state_backup' [-Wunused-variable] --- Firmware/Marlin_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index c6d323a0b..4f5a931b6 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -9652,7 +9652,7 @@ void marlin_wait_for_click() manage_inactivity(true); lcd_update(0); } - KEEPALIVE_STATE(busy_state); + KEEPALIVE_STATE(busy_state_backup); } #define FIL_LOAD_LENGTH 60