瀏覽代碼

🐛 Fix MPC compile (#24049)

Followup to #23984, #23751

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
John Lagonikas 3 年之前
父節點
當前提交
c58c5b09ab
No account linked to committer's email address
共有 3 個文件被更改,包括 5 次插入3 次删除
  1. 3
    1
      Marlin/src/gcode/temp/M306.cpp
  2. 1
    1
      Marlin/src/lcd/menu/menu_advanced.cpp
  3. 1
    1
      buildroot/tests/BIGTREE_GTR_V1_0

+ 3
- 1
Marlin/src/gcode/temp/M306.cpp 查看文件

69
     SERIAL_ECHOPAIR_F(" C", constants.block_heat_capacity, 2);
69
     SERIAL_ECHOPAIR_F(" C", constants.block_heat_capacity, 2);
70
     SERIAL_ECHOPAIR_F(" R", constants.sensor_responsiveness, 4);
70
     SERIAL_ECHOPAIR_F(" R", constants.sensor_responsiveness, 4);
71
     SERIAL_ECHOPAIR_F(" A", constants.ambient_xfer_coeff_fan0, 4);
71
     SERIAL_ECHOPAIR_F(" A", constants.ambient_xfer_coeff_fan0, 4);
72
-    SERIAL_ECHOLNPAIR_F(" F", constants.ambient_xfer_coeff_fan0 + constants.fan255_adjustment, 4);
72
+    #if ENABLED(MPC_INCLUDE_FAN)
73
+      SERIAL_ECHOLNPAIR_F(" F", constants.ambient_xfer_coeff_fan0 + constants.fan255_adjustment, 4);
74
+    #endif
73
   }
75
   }
74
 }
76
 }
75
 
77
 

+ 1
- 1
Marlin/src/lcd/menu/menu_advanced.cpp 查看文件

366
           MPC_EDIT_ITEMS(e);
366
           MPC_EDIT_ITEMS(e);
367
           END_MENU();
367
           END_MENU();
368
         };
368
         };
369
-        #define MPC_ENTRY(N) SUBMENU_N(N, MSG_MPC_EDIT, []{ mpc_edit_hotend(MenuItemBase::itemIndex); });
369
+        #define MPC_ENTRY(N) SUBMENU_N(N, MSG_MPC_EDIT, [&]{ mpc_edit_hotend(MenuItemBase::itemIndex); });
370
       #else
370
       #else
371
         #define MPC_ENTRY MPC_EDIT_ITEMS
371
         #define MPC_ENTRY MPC_EDIT_ITEMS
372
       #endif
372
       #endif

+ 1
- 1
buildroot/tests/BIGTREE_GTR_V1_0 查看文件

38
         MPC_SENSOR_RESPONSIVENESS '{ 0.22f, 0.22f, 0.22f }' \
38
         MPC_SENSOR_RESPONSIVENESS '{ 0.22f, 0.22f, 0.22f }' \
39
         MPC_AMBIENT_XFER_COEFF '{ 0.068f, 0.068f, 0.068f }' \
39
         MPC_AMBIENT_XFER_COEFF '{ 0.068f, 0.068f, 0.068f }' \
40
         MPC_AMBIENT_XFER_COEFF_FAN255 '{ 0.097f, 0.097f, 0.097f }'
40
         MPC_AMBIENT_XFER_COEFF_FAN255 '{ 0.097f, 0.097f, 0.097f }'
41
-opt_enable SWITCHING_TOOLHEAD TOOL_SENSOR MPCTEMP
41
+opt_enable SWITCHING_TOOLHEAD TOOL_SENSOR MPCTEMP MPC_EDIT_MENU MPC_AUTOTUNE_MENU
42
 opt_disable PIDTEMP
42
 opt_disable PIDTEMP
43
 exec_test $1 $2 "BigTreeTech GTR | MPC | Switching Toolhead | Tool Sensors" "$3"
43
 exec_test $1 $2 "BigTreeTech GTR | MPC | Switching Toolhead | Tool Sensors" "$3"
44
 
44
 

Loading…
取消
儲存