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

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
This commit is contained in:
Marek Bel 2019-05-14 18:25:43 +02:00
parent ec1a979656
commit 89fc9e7f92
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/mmu.cpp
View File

@ -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 #ifndef SNMM
MmuCmd cmd = MmuCmd::L0 + extruder; MmuCmd cmd = MmuCmd::L0 + extruder;

2
Firmware/mmu.h
View File

@ -103,7 +103,7 @@ extern void extr_mov(float shift, float feed_rate);
extern void change_extr(int extr); extern void change_extr(int extr);
extern int get_ext_nr(); extern int get_ext_nr();
extern void display_loading(); 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();
//-// //-//
extern void extr_unload_(); extern void extr_unload_();

1
Firmware/ultralcd.h
View File

@ -129,7 +129,6 @@ void lcd_commands();
void change_extr(int extr); void change_extr(int extr);
void extr_adj(int extruder);
#ifdef SNMM #ifdef SNMM
void extr_unload_all(); void extr_unload_all();