bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Power monitor and display (#17437)

Browse Source
This commit is contained in:
Scott Lahteine
2020-06-18 15:23:03 -05:00
committed by GitHub
parent c8e99d572c
commit 424569b4c4
32 changed files with 652 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Marlin/src/lcd/menu/menu_main.cpp
View File

@ -59,6 +59,14 @@ void menu_configuration();
void menu_user();
#endif
#if HAS_POWER_MONITOR
void menu_power_monitor();
#endif
#if ENABLED(MIXING_EXTRUDER)
void menu_mixer();
#endif
#if ENABLED(ADVANCED_PAUSE_FEATURE)
void _menu_temp_filament_op(const PauseMode, const int8_t);
void menu_change_filament();
@ -76,10 +84,6 @@ void menu_configuration();
void menu_spindle_laser();
#endif
#if ENABLED(MIXING_EXTRUDER)
void menu_mixer();
#endif
extern const char M21_STR[];
void menu_main() {
@ -155,6 +159,10 @@ void menu_main() {
SUBMENU(MSG_TEMPERATURE, menu_temperature);
#if HAS_POWER_MONITOR
MENU_ITEM(submenu, MSG_POWER_MONITOR, menu_power_monitor);
#endif
#if ENABLED(MIXING_EXTRUDER)
SUBMENU(MSG_MIXER, menu_mixer);
#endif

62
Marlin/src/lcd/menu/menu_power_monitor.cpp Normal file
View File

@ -0,0 +1,62 @@
/**
* Marlin 3D Printer Firmware
* Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
//
// Power Monitor Menu
//
#include "../../inc/MarlinConfigPre.h"
#if HAS_LCD_MENU && HAS_POWER_MONITOR
#include "menu.h"
#include "../../feature/power_monitor.h"
void menu_power_monitor() {
START_MENU();
MENU_BACK(MSG_MAIN);
#if ENABLED(POWER_MONITOR_CURRENT)
{
bool ena = power_monitor.current_display_enabled();
MENU_ITEM_EDIT_CALLBACK(bool, MSG_CURRENT, &ena, power_monitor.toggle_current_display);
}
#endif
#if HAS_POWER_MONITOR_VREF
{
bool ena = power_monitor.voltage_display_enabled();
MENU_ITEM_EDIT_CALLBACK(bool, MSG_VOLTAGE, &ena, power_monitor.toggle_voltage_display);
}
#endif
#if HAS_POWER_MONITOR_WATTS
{
bool ena = power_monitor.power_display_enabled();
MENU_ITEM_EDIT_CALLBACK(bool, MSG_POWER, &ena, power_monitor.toggle_power_display);
}
#endif
END_MENU();
}
#endif // HAS_LCD_MENU && HAS_POWER_MONITOR