From 89fc9e7f924d8c2a899d4ad876a3bbc48ce3686a Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 14 May 2019 18:25:43 +0200 Subject: [PATCH] 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();