Skip to content

Commit eaee9b1

Browse files
thinkyheadthinkyhead
committed
TWEAK runout sensor bool menu items
1 parent b2db6d3 commit eaee9b1

10 files changed

Lines changed: 40 additions & 37 deletions

File tree

‎A10D_marlin1.1.8/Marlin/ultralcd.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3686,6 +3686,9 @@ void kill_screen(const char* lcd_msg) {
36863686
START_MENU();
36873687
MENU_BACK(MSG_CONTROL);
36883688

3689+
// Filament Runout Sensors
3690+
MENU_ITEM_EDIT(bool, MSG_RUNOUT_SENSORS, &filament_runout_enabled);
3691+
36893692
#if ENABLED(LIN_ADVANCE)
36903693
MENU_ITEM_EDIT(float3, MSG_ADVANCE_K, &planner.extruder_advance_k, 0, 999);
36913694
#endif
@@ -3711,9 +3714,6 @@ void kill_screen(const char* lcd_msg) {
37113714
#endif // EXTRUDERS > 1
37123715
}
37133716

3714-
// Filament Runout Sensors
3715-
MENU_ITEM_EDIT(bool, MSG_RUNOUT_SENSORS, &filament_runout_enabled);
3716-
37173717
END_MENU();
37183718
}
37193719

@@ -4528,7 +4528,7 @@ void kill_screen(const char* lcd_msg) {
45284528

45294529
#endif // SDSUPPORT
45304530

4531-
void menu_action_setting_edit_bool(const char* pstr, bool* ptr) { UNUSED(pstr); *ptr ^= true; lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; }
4531+
void menu_action_setting_edit_bool(const char* pstr, bool* ptr) { UNUSED(pstr); *ptr = !*ptr; lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; }
45324532
void menu_action_setting_edit_callback_bool(const char* pstr, bool* ptr, screenFunc_t callback) {
45334533
menu_action_setting_edit_bool(pstr, ptr);
45344534
(*callback)();

‎A10M_marlin1.1.8/Marlin/ultralcd.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3914,6 +3914,9 @@ void kill_screen(const char* lcd_msg) {
39143914
START_MENU();
39153915
MENU_BACK(MSG_CONTROL);
39163916

3917+
// Filament Runout Sensors
3918+
MENU_ITEM_EDIT(bool, MSG_RUNOUT_SENSORS, &filament_runout_enabled);
3919+
39173920
#if ENABLED(LIN_ADVANCE)
39183921
MENU_ITEM_EDIT(float3, MSG_ADVANCE_K, &planner.extruder_advance_k, 0, 999);
39193922
#endif
@@ -3939,9 +3942,6 @@ void kill_screen(const char* lcd_msg) {
39393942
#endif // EXTRUDERS > 1
39403943
}
39413944

3942-
// Filament Runout Sensors
3943-
MENU_ITEM_EDIT(bool, MSG_RUNOUT_SENSORS, &filament_runout_enabled);
3944-
39453945
END_MENU();
39463946
}
39473947

@@ -4761,7 +4761,7 @@ void kill_screen(const char* lcd_msg) {
47614761

47624762
#endif // SDSUPPORT
47634763

4764-
void menu_action_setting_edit_bool(const char* pstr, bool* ptr) { UNUSED(pstr); *ptr ^= true; lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; }
4764+
void menu_action_setting_edit_bool(const char* pstr, bool* ptr) { UNUSED(pstr); *ptr = !*ptr; lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; }
47654765
void menu_action_setting_edit_callback_bool(const char* pstr, bool* ptr, screenFunc_t callback) {
47664766
menu_action_setting_edit_bool(pstr, ptr);
47674767
(*callback)();

‎A10M_marlin1.1.8_3Dtouch/Marlin/ultralcd.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3914,6 +3914,9 @@ void kill_screen(const char* lcd_msg) {
39143914
START_MENU();
39153915
MENU_BACK(MSG_CONTROL);
39163916

3917+
// Filament Runout Sensors
3918+
MENU_ITEM_EDIT(bool, MSG_RUNOUT_SENSORS, &filament_runout_enabled);
3919+
39173920
#if ENABLED(LIN_ADVANCE)
39183921
MENU_ITEM_EDIT(float3, MSG_ADVANCE_K, &planner.extruder_advance_k, 0, 999);
39193922
#endif
@@ -3939,9 +3942,6 @@ void kill_screen(const char* lcd_msg) {
39393942
#endif // EXTRUDERS > 1
39403943
}
39413944

3942-
// Filament Runout Sensors
3943-
MENU_ITEM_EDIT(bool, MSG_RUNOUT_SENSORS, &filament_runout_enabled);
3944-
39453945
END_MENU();
39463946
}
39473947

@@ -4761,7 +4761,7 @@ void kill_screen(const char* lcd_msg) {
47614761

47624762
#endif // SDSUPPORT
47634763

4764-
void menu_action_setting_edit_bool(const char* pstr, bool* ptr) { UNUSED(pstr); *ptr ^= true; lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; }
4764+
void menu_action_setting_edit_bool(const char* pstr, bool* ptr) { UNUSED(pstr); *ptr = !*ptr; lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; }
47654765
void menu_action_setting_edit_callback_bool(const char* pstr, bool* ptr, screenFunc_t callback) {
47664766
menu_action_setting_edit_bool(pstr, ptr);
47674767
(*callback)();

‎A10_marlin1.1.8/Marlin/ultralcd.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3688,6 +3688,9 @@ void kill_screen(const char* lcd_msg) {
36883688
START_MENU();
36893689
MENU_BACK(MSG_CONTROL);
36903690

3691+
// Filament Runout Sensors
3692+
MENU_ITEM_EDIT(bool, MSG_RUNOUT_SENSORS, &filament_runout_enabled);
3693+
36913694
#if ENABLED(LIN_ADVANCE)
36923695
MENU_ITEM_EDIT(float3, MSG_ADVANCE_K, &planner.extruder_advance_k, 0, 999);
36933696
#endif
@@ -3713,9 +3716,6 @@ void kill_screen(const char* lcd_msg) {
37133716
#endif // EXTRUDERS > 1
37143717
}
37153718

3716-
// Filament Runout Sensors
3717-
MENU_ITEM_EDIT(bool, MSG_RUNOUT_SENSORS, &filament_runout_enabled);
3718-
37193719
END_MENU();
37203720
}
37213721

@@ -4535,7 +4535,7 @@ void kill_screen(const char* lcd_msg) {
45354535

45364536
#endif // SDSUPPORT
45374537

4538-
void menu_action_setting_edit_bool(const char* pstr, bool* ptr) { UNUSED(pstr); *ptr ^= true; lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; }
4538+
void menu_action_setting_edit_bool(const char* pstr, bool* ptr) { UNUSED(pstr); *ptr = !*ptr; lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; }
45394539
void menu_action_setting_edit_callback_bool(const char* pstr, bool* ptr, screenFunc_t callback) {
45404540
menu_action_setting_edit_bool(pstr, ptr);
45414541
(*callback)();

‎A10_marlin1.1.8_3DTtouch/Marlin/ultralcd.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3688,6 +3688,9 @@ void kill_screen(const char* lcd_msg) {
36883688
START_MENU();
36893689
MENU_BACK(MSG_CONTROL);
36903690

3691+
// Filament Runout Sensors
3692+
MENU_ITEM_EDIT(bool, MSG_RUNOUT_SENSORS, &filament_runout_enabled);
3693+
36913694
#if ENABLED(LIN_ADVANCE)
36923695
MENU_ITEM_EDIT(float3, MSG_ADVANCE_K, &planner.extruder_advance_k, 0, 999);
36933696
#endif
@@ -3713,9 +3716,6 @@ void kill_screen(const char* lcd_msg) {
37133716
#endif // EXTRUDERS > 1
37143717
}
37153718

3716-
// Filament Runout Sensors
3717-
MENU_ITEM_EDIT(bool, MSG_RUNOUT_SENSORS, &filament_runout_enabled);
3718-
37193719
END_MENU();
37203720
}
37213721

@@ -4535,7 +4535,7 @@ void kill_screen(const char* lcd_msg) {
45354535

45364536
#endif // SDSUPPORT
45374537

4538-
void menu_action_setting_edit_bool(const char* pstr, bool* ptr) { UNUSED(pstr); *ptr ^= true; lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; }
4538+
void menu_action_setting_edit_bool(const char* pstr, bool* ptr) { UNUSED(pstr); *ptr = !*ptr; lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; }
45394539
void menu_action_setting_edit_callback_bool(const char* pstr, bool* ptr, screenFunc_t callback) {
45404540
menu_action_setting_edit_bool(pstr, ptr);
45414541
(*callback)();

‎A20M_Marlin-1.1.x12864/Marlin/ultralcd.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3914,6 +3914,9 @@ void kill_screen(const char* lcd_msg) {
39143914
START_MENU();
39153915
MENU_BACK(MSG_CONTROL);
39163916

3917+
// Filament Runout Sensors
3918+
MENU_ITEM_EDIT(bool, MSG_RUNOUT_SENSORS, &filament_runout_enabled);
3919+
39173920
#if ENABLED(LIN_ADVANCE)
39183921
MENU_ITEM_EDIT(float3, MSG_ADVANCE_K, &planner.extruder_advance_k, 0, 999);
39193922
#endif
@@ -3939,9 +3942,6 @@ void kill_screen(const char* lcd_msg) {
39393942
#endif // EXTRUDERS > 1
39403943
}
39413944

3942-
// Filament Runout Sensors
3943-
MENU_ITEM_EDIT(bool, MSG_RUNOUT_SENSORS, &filament_runout_enabled);
3944-
39453945
END_MENU();
39463946
}
39473947

@@ -4760,7 +4760,7 @@ void kill_screen(const char* lcd_msg) {
47604760

47614761
#endif // SDSUPPORT
47624762

4763-
void menu_action_setting_edit_bool(const char* pstr, bool* ptr) { UNUSED(pstr); *ptr ^= true; lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; }
4763+
void menu_action_setting_edit_bool(const char* pstr, bool* ptr) { UNUSED(pstr); *ptr = !*ptr; lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; }
47644764
void menu_action_setting_edit_callback_bool(const char* pstr, bool* ptr, screenFunc_t callback) {
47654765
menu_action_setting_edit_bool(pstr, ptr);
47664766
(*callback)();

‎A20M_Marlin-1.1.x12864_3DTouch/Marlin/ultralcd.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3914,6 +3914,9 @@ void kill_screen(const char* lcd_msg) {
39143914
START_MENU();
39153915
MENU_BACK(MSG_CONTROL);
39163916

3917+
// Filament Runout Sensors
3918+
MENU_ITEM_EDIT(bool, MSG_RUNOUT_SENSORS, &filament_runout_enabled);
3919+
39173920
#if ENABLED(LIN_ADVANCE)
39183921
MENU_ITEM_EDIT(float3, MSG_ADVANCE_K, &planner.extruder_advance_k, 0, 999);
39193922
#endif
@@ -3939,9 +3942,6 @@ void kill_screen(const char* lcd_msg) {
39393942
#endif // EXTRUDERS > 1
39403943
}
39413944

3942-
// Filament Runout Sensors
3943-
MENU_ITEM_EDIT(bool, MSG_RUNOUT_SENSORS, &filament_runout_enabled);
3944-
39453945
END_MENU();
39463946
}
39473947

@@ -4760,7 +4760,7 @@ void kill_screen(const char* lcd_msg) {
47604760

47614761
#endif // SDSUPPORT
47624762

4763-
void menu_action_setting_edit_bool(const char* pstr, bool* ptr) { UNUSED(pstr); *ptr ^= true; lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; }
4763+
void menu_action_setting_edit_bool(const char* pstr, bool* ptr) { UNUSED(pstr); *ptr = !*ptr; lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; }
47644764
void menu_action_setting_edit_callback_bool(const char* pstr, bool* ptr, screenFunc_t callback) {
47654765
menu_action_setting_edit_bool(pstr, ptr);
47664766
(*callback)();

‎A20_Marlin-1.1.x12864/Marlin/ultralcd.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3688,6 +3688,9 @@ void kill_screen(const char* lcd_msg) {
36883688
START_MENU();
36893689
MENU_BACK(MSG_CONTROL);
36903690

3691+
// Filament Runout Sensors
3692+
MENU_ITEM_EDIT(bool, MSG_RUNOUT_SENSORS, &filament_runout_enabled);
3693+
36913694
#if ENABLED(LIN_ADVANCE)
36923695
MENU_ITEM_EDIT(float3, MSG_ADVANCE_K, &planner.extruder_advance_k, 0, 999);
36933696
#endif
@@ -3713,9 +3716,6 @@ void kill_screen(const char* lcd_msg) {
37133716
#endif // EXTRUDERS > 1
37143717
}
37153718

3716-
// Filament Runout Sensors
3717-
MENU_ITEM_EDIT(bool, MSG_RUNOUT_SENSORS, &filament_runout_enabled);
3718-
37193719
END_MENU();
37203720
}
37213721

@@ -4534,7 +4534,7 @@ void kill_screen(const char* lcd_msg) {
45344534

45354535
#endif // SDSUPPORT
45364536

4537-
void menu_action_setting_edit_bool(const char* pstr, bool* ptr) { UNUSED(pstr); *ptr ^= true; lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; }
4537+
void menu_action_setting_edit_bool(const char* pstr, bool* ptr) { UNUSED(pstr); *ptr = !*ptr; lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; }
45384538
void menu_action_setting_edit_callback_bool(const char* pstr, bool* ptr, screenFunc_t callback) {
45394539
menu_action_setting_edit_bool(pstr, ptr);
45404540
(*callback)();

‎A20_Marlin-1.1.x12864_3DTouch/Marlin/ultralcd.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3688,6 +3688,9 @@ void kill_screen(const char* lcd_msg) {
36883688
START_MENU();
36893689
MENU_BACK(MSG_CONTROL);
36903690

3691+
// Filament Runout Sensors
3692+
MENU_ITEM_EDIT(bool, MSG_RUNOUT_SENSORS, &filament_runout_enabled);
3693+
36913694
#if ENABLED(LIN_ADVANCE)
36923695
MENU_ITEM_EDIT(float3, MSG_ADVANCE_K, &planner.extruder_advance_k, 0, 999);
36933696
#endif
@@ -3713,9 +3716,6 @@ void kill_screen(const char* lcd_msg) {
37133716
#endif // EXTRUDERS > 1
37143717
}
37153718

3716-
// Filament Runout Sensors
3717-
MENU_ITEM_EDIT(bool, MSG_RUNOUT_SENSORS, &filament_runout_enabled);
3718-
37193719
END_MENU();
37203720
}
37213721

@@ -4534,7 +4534,7 @@ void kill_screen(const char* lcd_msg) {
45344534

45354535
#endif // SDSUPPORT
45364536

4537-
void menu_action_setting_edit_bool(const char* pstr, bool* ptr) { UNUSED(pstr); *ptr ^= true; lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; }
4537+
void menu_action_setting_edit_bool(const char* pstr, bool* ptr) { UNUSED(pstr); *ptr = !*ptr; lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; }
45384538
void menu_action_setting_edit_callback_bool(const char* pstr, bool* ptr, screenFunc_t callback) {
45394539
menu_action_setting_edit_bool(pstr, ptr);
45404540
(*callback)();

‎MeCreator2_marlin1.1.8/Marlin/ultralcd.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3683,6 +3683,9 @@ void kill_screen(const char* lcd_msg) {
36833683
START_MENU();
36843684
MENU_BACK(MSG_CONTROL);
36853685

3686+
// Filament Runout Sensors
3687+
MENU_ITEM_EDIT(bool, MSG_RUNOUT_SENSORS, &filament_runout_enabled);
3688+
36863689
#if ENABLED(LIN_ADVANCE)
36873690
MENU_ITEM_EDIT(float3, MSG_ADVANCE_K, &planner.extruder_advance_k, 0, 999);
36883691
#endif
@@ -4521,7 +4524,7 @@ void kill_screen(const char* lcd_msg) {
45214524

45224525
#endif // SDSUPPORT
45234526

4524-
void menu_action_setting_edit_bool(const char* pstr, bool* ptr) { UNUSED(pstr); *ptr ^= true; lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; }
4527+
void menu_action_setting_edit_bool(const char* pstr, bool* ptr) { UNUSED(pstr); *ptr = !*ptr; lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; }
45254528
void menu_action_setting_edit_callback_bool(const char* pstr, bool* ptr, screenFunc_t callback) {
45264529
menu_action_setting_edit_bool(pstr, ptr);
45274530
(*callback)();

0 commit comments

Comments
 (0)