Browse Source

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

Marek Bel 5 years ago
parent
commit
89fc9e7f92
3 changed files with 2 additions and 3 deletions
  1. 1 1
      Firmware/mmu.cpp
  2. 1 1
      Firmware/mmu.h
  3. 0 1
      Firmware/ultralcd.h

+ 1 - 1
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;

+ 1 - 1
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_();

+ 0 - 1
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();