✨Add DGUS_LCD_UI_RELOADED (#21931)
This commit is contained in:
mrv96
Scott Lahteine
@@ -0,0 +1,240 @@
|
||||
/**
|
||||
* Marlin 3D Printer Firmware
|
||||
* Copyright (c) 2021 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/>.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "../../../../inc/MarlinConfigPre.h"
|
||||
|
||||
#if ENABLED(DGUS_LCD_UI_RELOADED)
|
||||
|
||||
#include "DGUS_ScreenAddrList.h"
|
||||
|
||||
#include "../../ui_api.h"
|
||||
|
||||
constexpr DGUS_Addr LIST_HOME[] PROGMEM = {
|
||||
DGUS_Addr::TEMP_Current_H0,
|
||||
DGUS_Addr::TEMP_Target_H0,
|
||||
DGUS_Addr::TEMP_Current_Bed,
|
||||
DGUS_Addr::TEMP_Target_Bed,
|
||||
(DGUS_Addr)0
|
||||
};
|
||||
|
||||
#if ENABLED(SDSUPPORT)
|
||||
constexpr DGUS_Addr LIST_PRINT[] PROGMEM = {
|
||||
DGUS_Addr::SD_Type,
|
||||
DGUS_Addr::SD_FileName0,
|
||||
DGUS_Addr::SD_FileName1,
|
||||
DGUS_Addr::SD_FileName2,
|
||||
DGUS_Addr::SD_FileName3,
|
||||
DGUS_Addr::SD_FileName4,
|
||||
DGUS_Addr::SD_ScrollIcons,
|
||||
DGUS_Addr::SD_SelectedFileName,
|
||||
(DGUS_Addr)0
|
||||
};
|
||||
#endif
|
||||
|
||||
constexpr DGUS_Addr LIST_PRINT_STATUS[] PROGMEM = {
|
||||
DGUS_Addr::TEMP_Current_H0,
|
||||
DGUS_Addr::TEMP_Target_H0,
|
||||
DGUS_Addr::TEMP_Current_Bed,
|
||||
DGUS_Addr::TEMP_Target_Bed,
|
||||
DGUS_Addr::STATUS_PositionZ,
|
||||
DGUS_Addr::STATUS_Ellapsed,
|
||||
DGUS_Addr::STATUS_Percent,
|
||||
DGUS_Addr::STATUS_Icons,
|
||||
(DGUS_Addr)0
|
||||
};
|
||||
|
||||
constexpr DGUS_Addr LIST_PRINT_ADJUST[] PROGMEM = {
|
||||
DGUS_Addr::TEMP_Target_H0,
|
||||
DGUS_Addr::TEMP_Target_Bed,
|
||||
DGUS_Addr::FAN0_Speed,
|
||||
DGUS_Addr::ADJUST_Feedrate,
|
||||
DGUS_Addr::ADJUST_Flowrate_CUR,
|
||||
DGUS_Addr::LEVEL_OFFSET_Current,
|
||||
(DGUS_Addr)0
|
||||
};
|
||||
|
||||
constexpr DGUS_Addr LIST_PRINT_FINISHED[] PROGMEM = {
|
||||
DGUS_Addr::TEMP_Current_H0,
|
||||
DGUS_Addr::TEMP_Target_H0,
|
||||
DGUS_Addr::TEMP_Current_Bed,
|
||||
DGUS_Addr::TEMP_Target_Bed,
|
||||
DGUS_Addr::STATUS_PositionZ,
|
||||
DGUS_Addr::STATUS_Ellapsed,
|
||||
DGUS_Addr::STATUS_Percent_Complete,
|
||||
(DGUS_Addr)0
|
||||
};
|
||||
|
||||
constexpr DGUS_Addr LIST_TEMP_MENU[] PROGMEM = {
|
||||
DGUS_Addr::TEMP_Current_H0,
|
||||
DGUS_Addr::TEMP_Target_H0,
|
||||
DGUS_Addr::TEMP_Current_Bed,
|
||||
DGUS_Addr::TEMP_Target_Bed,
|
||||
(DGUS_Addr)0
|
||||
};
|
||||
|
||||
constexpr DGUS_Addr LIST_TEMP_MANUAL[] PROGMEM = {
|
||||
DGUS_Addr::TEMP_Current_H0,
|
||||
DGUS_Addr::TEMP_Target_H0,
|
||||
DGUS_Addr::TEMP_Max_H0,
|
||||
DGUS_Addr::TEMP_Current_Bed,
|
||||
DGUS_Addr::TEMP_Target_Bed,
|
||||
DGUS_Addr::TEMP_Max_Bed,
|
||||
(DGUS_Addr)0
|
||||
};
|
||||
|
||||
constexpr DGUS_Addr LIST_FAN[] PROGMEM = {
|
||||
DGUS_Addr::FAN0_Speed,
|
||||
(DGUS_Addr)0
|
||||
};
|
||||
|
||||
constexpr DGUS_Addr LIST_SETTINGS_MENU[] PROGMEM = {
|
||||
DGUS_Addr::STEPPER_Status,
|
||||
(DGUS_Addr)0
|
||||
};
|
||||
|
||||
constexpr DGUS_Addr LIST_LEVELING_OFFSET[] PROGMEM = {
|
||||
DGUS_Addr::LEVEL_OFFSET_Current,
|
||||
DGUS_Addr::LEVEL_OFFSET_StepIcons,
|
||||
(DGUS_Addr)0
|
||||
};
|
||||
|
||||
constexpr DGUS_Addr LIST_LEVELING_MANUAL[] PROGMEM = {
|
||||
DGUS_Addr::TEMP_Current_H0,
|
||||
DGUS_Addr::TEMP_Target_H0,
|
||||
DGUS_Addr::TEMP_Current_Bed,
|
||||
DGUS_Addr::TEMP_Target_Bed,
|
||||
(DGUS_Addr)0
|
||||
};
|
||||
|
||||
constexpr DGUS_Addr LIST_LEVELING_AUTOMATIC[] PROGMEM = {
|
||||
DGUS_Addr::TEMP_Current_H0,
|
||||
DGUS_Addr::TEMP_Target_H0,
|
||||
DGUS_Addr::TEMP_Current_Bed,
|
||||
DGUS_Addr::TEMP_Target_Bed,
|
||||
DGUS_Addr::LEVEL_AUTO_DisableIcon,
|
||||
DGUS_Addr::LEVEL_AUTO_Grid,
|
||||
(DGUS_Addr)0
|
||||
};
|
||||
|
||||
constexpr DGUS_Addr LIST_LEVELING_PROBING[] PROGMEM = {
|
||||
DGUS_Addr::LEVEL_PROBING_Icons1,
|
||||
DGUS_Addr::LEVEL_PROBING_Icons2,
|
||||
(DGUS_Addr)0
|
||||
};
|
||||
|
||||
constexpr DGUS_Addr LIST_FILAMENT[] PROGMEM = {
|
||||
DGUS_Addr::TEMP_Current_H0,
|
||||
DGUS_Addr::TEMP_Target_H0,
|
||||
DGUS_Addr::FILAMENT_ExtruderIcons,
|
||||
DGUS_Addr::FILAMENT_Length,
|
||||
(DGUS_Addr)0
|
||||
};
|
||||
|
||||
constexpr DGUS_Addr LIST_MOVE[] PROGMEM = {
|
||||
DGUS_Addr::MOVE_CurrentX,
|
||||
DGUS_Addr::MOVE_CurrentY,
|
||||
DGUS_Addr::MOVE_CurrentZ,
|
||||
DGUS_Addr::MOVE_StepIcons,
|
||||
(DGUS_Addr)0
|
||||
};
|
||||
|
||||
constexpr DGUS_Addr LIST_GCODE[] PROGMEM = {
|
||||
DGUS_Addr::GCODE_Data,
|
||||
(DGUS_Addr)0
|
||||
};
|
||||
|
||||
constexpr DGUS_Addr LIST_SETTINGS_MENU2[] PROGMEM = {
|
||||
DGUS_Addr::SETTINGS2_BLTouch,
|
||||
(DGUS_Addr)0
|
||||
};
|
||||
|
||||
constexpr DGUS_Addr LIST_PID[] PROGMEM = {
|
||||
DGUS_Addr::PID_HeaterIcons,
|
||||
DGUS_Addr::PID_Temp,
|
||||
DGUS_Addr::PID_Cycles,
|
||||
DGUS_Addr::PID_Kp,
|
||||
DGUS_Addr::PID_Ki,
|
||||
DGUS_Addr::PID_Kd,
|
||||
(DGUS_Addr)0
|
||||
};
|
||||
|
||||
constexpr DGUS_Addr LIST_VOLUME[] PROGMEM = {
|
||||
DGUS_Addr::VOLUME_Level,
|
||||
(DGUS_Addr)0
|
||||
};
|
||||
|
||||
constexpr DGUS_Addr LIST_BRIGHTNESS[] PROGMEM = {
|
||||
DGUS_Addr::BRIGHTNESS_Level,
|
||||
(DGUS_Addr)0
|
||||
};
|
||||
|
||||
constexpr DGUS_Addr LIST_INFOS[] PROGMEM = {
|
||||
DGUS_Addr::INFOS_Machine,
|
||||
DGUS_Addr::INFOS_BuildVolume,
|
||||
DGUS_Addr::INFOS_Version,
|
||||
DGUS_Addr::INFOS_TotalPrints,
|
||||
DGUS_Addr::INFOS_FinishedPrints,
|
||||
DGUS_Addr::INFOS_PrintTime,
|
||||
DGUS_Addr::INFOS_LongestPrint,
|
||||
DGUS_Addr::INFOS_FilamentUsed,
|
||||
(DGUS_Addr)0
|
||||
};
|
||||
|
||||
constexpr DGUS_Addr LIST_WAIT[] PROGMEM = {
|
||||
DGUS_Addr::WAIT_Icons,
|
||||
(DGUS_Addr)0
|
||||
};
|
||||
|
||||
#define MAP_HELPER(SCREEN, LIST) \
|
||||
{ .screen = SCREEN, \
|
||||
.addr_list = LIST }
|
||||
|
||||
const struct DGUS_ScreenAddrList screen_addr_list_map[] PROGMEM = {
|
||||
MAP_HELPER(DGUS_Screen::HOME, LIST_HOME),
|
||||
#if ENABLED(SDSUPPORT)
|
||||
MAP_HELPER(DGUS_Screen::PRINT, LIST_PRINT),
|
||||
#endif
|
||||
MAP_HELPER(DGUS_Screen::PRINT_STATUS, LIST_PRINT_STATUS),
|
||||
MAP_HELPER(DGUS_Screen::PRINT_ADJUST, LIST_PRINT_ADJUST),
|
||||
MAP_HELPER(DGUS_Screen::PRINT_FINISHED, LIST_PRINT_FINISHED),
|
||||
MAP_HELPER(DGUS_Screen::TEMP_MENU, LIST_TEMP_MENU),
|
||||
MAP_HELPER(DGUS_Screen::TEMP_MANUAL, LIST_TEMP_MANUAL),
|
||||
MAP_HELPER(DGUS_Screen::FAN, LIST_FAN),
|
||||
MAP_HELPER(DGUS_Screen::SETTINGS_MENU, LIST_SETTINGS_MENU),
|
||||
MAP_HELPER(DGUS_Screen::LEVELING_OFFSET, LIST_LEVELING_OFFSET),
|
||||
MAP_HELPER(DGUS_Screen::LEVELING_MANUAL, LIST_LEVELING_MANUAL),
|
||||
MAP_HELPER(DGUS_Screen::LEVELING_AUTOMATIC, LIST_LEVELING_AUTOMATIC),
|
||||
MAP_HELPER(DGUS_Screen::LEVELING_PROBING, LIST_LEVELING_PROBING),
|
||||
MAP_HELPER(DGUS_Screen::FILAMENT, LIST_FILAMENT),
|
||||
MAP_HELPER(DGUS_Screen::MOVE, LIST_MOVE),
|
||||
MAP_HELPER(DGUS_Screen::GCODE, LIST_GCODE),
|
||||
MAP_HELPER(DGUS_Screen::SETTINGS_MENU2, LIST_SETTINGS_MENU2),
|
||||
MAP_HELPER(DGUS_Screen::PID, LIST_PID),
|
||||
MAP_HELPER(DGUS_Screen::VOLUME, LIST_VOLUME),
|
||||
MAP_HELPER(DGUS_Screen::BRIGHTNESS, LIST_BRIGHTNESS),
|
||||
MAP_HELPER(DGUS_Screen::INFOS, LIST_INFOS),
|
||||
MAP_HELPER(DGUS_Screen::WAIT, LIST_WAIT),
|
||||
|
||||
MAP_HELPER((DGUS_Screen)0, nullptr)
|
||||
};
|
||||
|
||||
#endif // DGUS_LCD_UI_RELOADED
|
||||
@@ -0,0 +1,32 @@
|
||||
/**
|
||||
* Marlin 3D Printer Firmware
|
||||
* Copyright (c) 2021 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/>.
|
||||
*
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include "../config/DGUS_Screen.h"
|
||||
#include "../config/DGUS_Addr.h"
|
||||
|
||||
struct DGUS_ScreenAddrList {
|
||||
DGUS_Screen screen;
|
||||
const DGUS_Addr *addr_list;
|
||||
};
|
||||
|
||||
extern const struct DGUS_ScreenAddrList screen_addr_list_map[];
|
||||
@@ -0,0 +1,57 @@
|
||||
/**
|
||||
* Marlin 3D Printer Firmware
|
||||
* Copyright (c) 2021 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/>.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "../../../../inc/MarlinConfigPre.h"
|
||||
|
||||
#if ENABLED(DGUS_LCD_UI_RELOADED)
|
||||
|
||||
#include "DGUS_ScreenSetup.h"
|
||||
|
||||
#include "../DGUSSetupHandler.h"
|
||||
|
||||
#include "../../ui_api.h"
|
||||
|
||||
#define SETUP_HELPER(SCREEN, SETUP) \
|
||||
{ .screen = SCREEN, \
|
||||
.setup_fn = SETUP }
|
||||
|
||||
const struct DGUS_ScreenSetup screen_setup_list[] PROGMEM = {
|
||||
#if ENABLED(SDSUPPORT)
|
||||
SETUP_HELPER(DGUS_Screen::PRINT, &DGUSSetupHandler::Print),
|
||||
#endif
|
||||
SETUP_HELPER(DGUS_Screen::PRINT_STATUS, &DGUSSetupHandler::PrintStatus),
|
||||
SETUP_HELPER(DGUS_Screen::PRINT_ADJUST, &DGUSSetupHandler::PrintAdjust),
|
||||
SETUP_HELPER(DGUS_Screen::LEVELING_MENU, &DGUSSetupHandler::LevelingMenu),
|
||||
SETUP_HELPER(DGUS_Screen::LEVELING_OFFSET, &DGUSSetupHandler::LevelingOffset),
|
||||
SETUP_HELPER(DGUS_Screen::LEVELING_MANUAL, &DGUSSetupHandler::LevelingManual),
|
||||
SETUP_HELPER(DGUS_Screen::LEVELING_AUTOMATIC, &DGUSSetupHandler::LevelingAutomatic),
|
||||
SETUP_HELPER(DGUS_Screen::LEVELING_PROBING, &DGUSSetupHandler::LevelingProbing),
|
||||
SETUP_HELPER(DGUS_Screen::FILAMENT, &DGUSSetupHandler::Filament),
|
||||
SETUP_HELPER(DGUS_Screen::MOVE, &DGUSSetupHandler::Move),
|
||||
SETUP_HELPER(DGUS_Screen::GCODE, &DGUSSetupHandler::Gcode),
|
||||
SETUP_HELPER(DGUS_Screen::PID, &DGUSSetupHandler::PID),
|
||||
SETUP_HELPER(DGUS_Screen::INFOS, &DGUSSetupHandler::Infos),
|
||||
|
||||
SETUP_HELPER((DGUS_Screen)0, nullptr)
|
||||
};
|
||||
|
||||
#endif // DGUS_LCD_UI_RELOADED
|
||||
@@ -0,0 +1,31 @@
|
||||
/**
|
||||
* Marlin 3D Printer Firmware
|
||||
* Copyright (c) 2021 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/>.
|
||||
*
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include "../config/DGUS_Screen.h"
|
||||
|
||||
struct DGUS_ScreenSetup {
|
||||
DGUS_Screen screen;
|
||||
bool (*setup_fn)(void);
|
||||
};
|
||||
|
||||
extern const struct DGUS_ScreenSetup screen_setup_list[];
|
||||
40
Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VP.h
Normal file
40
Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VP.h
Normal file
@@ -0,0 +1,40 @@
|
||||
/**
|
||||
* Marlin 3D Printer Firmware
|
||||
* Copyright (c) 2021 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/>.
|
||||
*
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include "../config/DGUS_Addr.h"
|
||||
|
||||
#define VPFLAG_NONE 0
|
||||
#define VPFLAG_AUTOUPLOAD (1U << 0) // Upload on every DGUS update
|
||||
#define VPFLAG_RXSTRING (1U << 1) // Treat the received data as a string (terminated with 0xFFFF)
|
||||
|
||||
struct DGUS_VP {
|
||||
DGUS_Addr addr;
|
||||
uint8_t size;
|
||||
uint8_t flags;
|
||||
void *extra;
|
||||
|
||||
// Callback that will be called if the display modified the value.
|
||||
// nullptr makes it readonly for the display.
|
||||
void (*rx_handler)(DGUS_VP &, void *);
|
||||
void (*tx_handler)(DGUS_VP &);
|
||||
};
|
||||
368
Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.cpp
Normal file
368
Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.cpp
Normal file
@@ -0,0 +1,368 @@
|
||||
/**
|
||||
* Marlin 3D Printer Firmware
|
||||
* Copyright (c) 2021 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/>.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "../../../../inc/MarlinConfigPre.h"
|
||||
|
||||
#if ENABLED(DGUS_LCD_UI_RELOADED)
|
||||
|
||||
#include "DGUS_VPList.h"
|
||||
|
||||
#include "../config/DGUS_Addr.h"
|
||||
#include "../DGUSScreenHandler.h"
|
||||
#include "../DGUSRxHandler.h"
|
||||
#include "../DGUSTxHandler.h"
|
||||
|
||||
#include "../../ui_api.h"
|
||||
#include "../../../../module/probe.h"
|
||||
#include "../../../../module/motion.h"
|
||||
#include "../../../../module/temperature.h"
|
||||
|
||||
const char DGUS_MACHINENAME[] PROGMEM = MACHINE_NAME;
|
||||
const char DGUS_MARLINVERSION[] PROGMEM = SHORT_BUILD_VERSION;
|
||||
|
||||
#define VP_HELPER(ADDR, SIZE, FLAGS, EXTRA, RXHANDLER, TXHANDLER) \
|
||||
{ .addr = ADDR, \
|
||||
.size = SIZE, \
|
||||
.flags = FLAGS, \
|
||||
.extra = EXTRA, \
|
||||
.rx_handler = RXHANDLER, \
|
||||
.tx_handler = TXHANDLER }
|
||||
|
||||
#define VP_HELPER_WORD(ADDR, FLAGS, EXTRA, RXHANDLER, TXHANDLER) \
|
||||
VP_HELPER(ADDR, 2, FLAGS, EXTRA, RXHANDLER, TXHANDLER)
|
||||
|
||||
#define VP_HELPER_DWORD(ADDR, FLAGS, EXTRA, RXHANDLER, TXHANDLER) \
|
||||
VP_HELPER(ADDR, 4, FLAGS, EXTRA, RXHANDLER, TXHANDLER)
|
||||
|
||||
#define VP_HELPER_RX(ADDR, RXHANDLER) \
|
||||
VP_HELPER_WORD(ADDR, VPFLAG_NONE, nullptr, RXHANDLER, nullptr)
|
||||
|
||||
#define VP_HELPER_RX_NODATA(ADDR, RXHANDLER) \
|
||||
VP_HELPER(ADDR, 0, VPFLAG_NONE, nullptr, RXHANDLER, nullptr)
|
||||
|
||||
#define VP_HELPER_TX(ADDR, TXHANDLER) \
|
||||
VP_HELPER_WORD(ADDR, VPFLAG_NONE, nullptr, nullptr, TXHANDLER)
|
||||
|
||||
#define VP_HELPER_TX_SIZE(ADDR, SIZE, TXHANDLER) \
|
||||
VP_HELPER(ADDR, SIZE, VPFLAG_NONE, nullptr, nullptr, TXHANDLER)
|
||||
|
||||
#define VP_HELPER_TX_EXTRA(ADDR, EXTRA, TXHANDLER) \
|
||||
VP_HELPER_WORD(ADDR, VPFLAG_NONE, EXTRA, nullptr, TXHANDLER)
|
||||
|
||||
#define VP_HELPER_TX_AUTO(ADDR, EXTRA, TXHANDLER) \
|
||||
VP_HELPER_WORD(ADDR, VPFLAG_AUTOUPLOAD, EXTRA, nullptr, TXHANDLER)
|
||||
|
||||
const struct DGUS_VP vp_list[] PROGMEM = {
|
||||
|
||||
// READ-ONLY VARIABLES
|
||||
|
||||
VP_HELPER_RX(DGUS_Addr::SCREENCHANGE, &DGUSRxHandler::ScreenChange),
|
||||
VP_HELPER_RX(DGUS_Addr::SCREENCHANGE_SD, &DGUSRxHandler::ScreenChange),
|
||||
VP_HELPER_RX(DGUS_Addr::SCREENCHANGE_Idle, &DGUSRxHandler::ScreenChange),
|
||||
VP_HELPER_RX(DGUS_Addr::SCREENCHANGE_Printing, &DGUSRxHandler::ScreenChange),
|
||||
|
||||
#if ENABLED(SDSUPPORT)
|
||||
VP_HELPER_RX(DGUS_Addr::SD_SelectFile, &DGUSRxHandler::SelectFile),
|
||||
VP_HELPER_RX(DGUS_Addr::SD_Scroll, &DGUSRxHandler::Scroll),
|
||||
VP_HELPER_RX_NODATA(DGUS_Addr::SD_Print, &DGUSRxHandler::PrintFile),
|
||||
#endif
|
||||
|
||||
VP_HELPER_RX(DGUS_Addr::STATUS_Abort, &DGUSRxHandler::PrintAbort),
|
||||
VP_HELPER_RX(DGUS_Addr::STATUS_Pause, &DGUSRxHandler::PrintPause),
|
||||
VP_HELPER_RX(DGUS_Addr::STATUS_Resume, &DGUSRxHandler::PrintResume),
|
||||
|
||||
VP_HELPER_RX(DGUS_Addr::ADJUST_SetFeedrate, &DGUSRxHandler::Feedrate),
|
||||
VP_HELPER_RX(DGUS_Addr::ADJUST_SetFlowrate_CUR, &DGUSRxHandler::Flowrate),
|
||||
#if EXTRUDERS > 1
|
||||
VP_HELPER_RX(DGUS_Addr::ADJUST_SetFlowrate_E0, &DGUSRxHandler::Flowrate),
|
||||
VP_HELPER_RX(DGUS_Addr::ADJUST_SetFlowrate_E1, &DGUSRxHandler::Flowrate),
|
||||
#endif
|
||||
VP_HELPER_RX(DGUS_Addr::ADJUST_SetBabystep, &DGUSRxHandler::BabystepSet),
|
||||
VP_HELPER_RX(DGUS_Addr::ADJUST_Babystep, &DGUSRxHandler::Babystep),
|
||||
|
||||
VP_HELPER_RX(DGUS_Addr::TEMP_Preset, &DGUSRxHandler::TempPreset),
|
||||
VP_HELPER_RX(DGUS_Addr::TEMP_SetTarget_Bed, &DGUSRxHandler::TempTarget),
|
||||
VP_HELPER_RX(DGUS_Addr::TEMP_SetTarget_H0, &DGUSRxHandler::TempTarget),
|
||||
#if HOTENDS > 1
|
||||
VP_HELPER_RX(DGUS_Addr::TEMP_SetTarget_H1, &DGUSRxHandler::TempTarget),
|
||||
#endif
|
||||
VP_HELPER_RX(DGUS_Addr::TEMP_Cool, &DGUSRxHandler::TempCool),
|
||||
|
||||
VP_HELPER_RX(DGUS_Addr::STEPPER_Control, &DGUSRxHandler::Steppers),
|
||||
|
||||
VP_HELPER_RX(DGUS_Addr::LEVEL_OFFSET_Set, &DGUSRxHandler::ZOffset),
|
||||
VP_HELPER_RX(DGUS_Addr::LEVEL_OFFSET_Step, &DGUSRxHandler::ZOffsetStep),
|
||||
VP_HELPER_RX(DGUS_Addr::LEVEL_OFFSET_SetStep, &DGUSRxHandler::ZOffsetSetStep),
|
||||
|
||||
VP_HELPER_RX(DGUS_Addr::LEVEL_MANUAL_Point, &DGUSRxHandler::MoveToPoint),
|
||||
|
||||
VP_HELPER_RX_NODATA(DGUS_Addr::LEVEL_AUTO_Probe, &DGUSRxHandler::Probe),
|
||||
VP_HELPER_RX_NODATA(DGUS_Addr::LEVEL_AUTO_Disable,
|
||||
&DGUSRxHandler::DisableABL),
|
||||
|
||||
VP_HELPER_RX(DGUS_Addr::FILAMENT_Select, &DGUSRxHandler::FilamentSelect),
|
||||
VP_HELPER_RX(DGUS_Addr::FILAMENT_SetLength, &DGUSRxHandler::FilamentLength),
|
||||
VP_HELPER_RX(DGUS_Addr::FILAMENT_Move, &DGUSRxHandler::FilamentMove),
|
||||
|
||||
VP_HELPER_RX(DGUS_Addr::MOVE_Home, &DGUSRxHandler::Home),
|
||||
VP_HELPER_RX(DGUS_Addr::MOVE_SetX, &DGUSRxHandler::Move),
|
||||
VP_HELPER_RX(DGUS_Addr::MOVE_SetY, &DGUSRxHandler::Move),
|
||||
VP_HELPER_RX(DGUS_Addr::MOVE_SetZ, &DGUSRxHandler::Move),
|
||||
VP_HELPER_RX(DGUS_Addr::MOVE_Step, &DGUSRxHandler::MoveStep),
|
||||
VP_HELPER_RX(DGUS_Addr::MOVE_SetStep, &DGUSRxHandler::MoveSetStep),
|
||||
|
||||
VP_HELPER_RX_NODATA(DGUS_Addr::GCODE_Clear, &DGUSRxHandler::GcodeClear),
|
||||
VP_HELPER_RX_NODATA(DGUS_Addr::GCODE_Execute, &DGUSRxHandler::GcodeExecute),
|
||||
|
||||
VP_HELPER_RX(DGUS_Addr::EEPROM_Reset, &DGUSRxHandler::ResetEEPROM),
|
||||
|
||||
VP_HELPER_RX(DGUS_Addr::SETTINGS2_Extra, &DGUSRxHandler::SettingsExtra),
|
||||
|
||||
VP_HELPER_RX(DGUS_Addr::PID_Select, &DGUSRxHandler::PIDSelect),
|
||||
VP_HELPER_RX(DGUS_Addr::PID_SetTemp, &DGUSRxHandler::PIDSetTemp),
|
||||
VP_HELPER_RX_NODATA(DGUS_Addr::PID_Run, &DGUSRxHandler::PIDRun),
|
||||
|
||||
#if ENABLED(POWER_LOSS_RECOVERY)
|
||||
VP_HELPER_RX(DGUS_Addr::POWERLOSS_Abort, &DGUSRxHandler::PowerLossAbort),
|
||||
VP_HELPER_RX(DGUS_Addr::POWERLOSS_Resume, &DGUSRxHandler::PowerLossResume),
|
||||
#endif
|
||||
|
||||
VP_HELPER_RX(DGUS_Addr::WAIT_Abort, &DGUSRxHandler::WaitAbort),
|
||||
VP_HELPER_RX_NODATA(DGUS_Addr::WAIT_Continue, &DGUSRxHandler::WaitContinue),
|
||||
|
||||
// WRITE-ONLY VARIABLES
|
||||
|
||||
#if ENABLED(SDSUPPORT)
|
||||
VP_HELPER_TX(DGUS_Addr::SD_Type, &DGUSTxHandler::FileType),
|
||||
VP_HELPER_TX_SIZE(DGUS_Addr::SD_FileName0,
|
||||
DGUS_FILENAME_LEN,
|
||||
&DGUSTxHandler::FileName),
|
||||
VP_HELPER_TX_SIZE(DGUS_Addr::SD_FileName1,
|
||||
DGUS_FILENAME_LEN,
|
||||
&DGUSTxHandler::FileName),
|
||||
VP_HELPER_TX_SIZE(DGUS_Addr::SD_FileName2,
|
||||
DGUS_FILENAME_LEN,
|
||||
&DGUSTxHandler::FileName),
|
||||
VP_HELPER_TX_SIZE(DGUS_Addr::SD_FileName3,
|
||||
DGUS_FILENAME_LEN,
|
||||
&DGUSTxHandler::FileName),
|
||||
VP_HELPER_TX_SIZE(DGUS_Addr::SD_FileName4,
|
||||
DGUS_FILENAME_LEN,
|
||||
&DGUSTxHandler::FileName),
|
||||
VP_HELPER_TX(DGUS_Addr::SD_ScrollIcons, &DGUSTxHandler::ScrollIcons),
|
||||
VP_HELPER_TX_SIZE(DGUS_Addr::SD_SelectedFileName,
|
||||
DGUS_FILENAME_LEN,
|
||||
&DGUSTxHandler::SelectedFileName),
|
||||
#endif
|
||||
|
||||
VP_HELPER_TX_AUTO(DGUS_Addr::STATUS_PositionZ,
|
||||
nullptr,
|
||||
&DGUSTxHandler::PositionZ),
|
||||
VP_HELPER(DGUS_Addr::STATUS_Ellapsed,
|
||||
DGUS_ELLAPSED_LEN,
|
||||
VPFLAG_AUTOUPLOAD,
|
||||
nullptr,
|
||||
nullptr,
|
||||
&DGUSTxHandler::Ellapsed),
|
||||
VP_HELPER_TX_AUTO(DGUS_Addr::STATUS_Percent,
|
||||
nullptr,
|
||||
&DGUSTxHandler::Percent),
|
||||
VP_HELPER_TX(DGUS_Addr::STATUS_Icons, &DGUSTxHandler::StatusIcons),
|
||||
|
||||
VP_HELPER_TX_AUTO(DGUS_Addr::ADJUST_Feedrate,
|
||||
&feedrate_percentage,
|
||||
&DGUSTxHandler::ExtraToInteger<int16_t>),
|
||||
VP_HELPER_TX_AUTO(DGUS_Addr::ADJUST_Flowrate_CUR,
|
||||
nullptr,
|
||||
&DGUSTxHandler::Flowrate),
|
||||
#if EXTRUDERS > 1
|
||||
VP_HELPER_TX_AUTO(DGUS_Addr::ADJUST_Flowrate_E0,
|
||||
nullptr,
|
||||
&DGUSTxHandler::Flowrate),
|
||||
VP_HELPER_TX_AUTO(DGUS_Addr::ADJUST_Flowrate_E1,
|
||||
nullptr,
|
||||
&DGUSTxHandler::Flowrate),
|
||||
#endif
|
||||
|
||||
VP_HELPER_TX_AUTO(DGUS_Addr::TEMP_Current_Bed,
|
||||
&thermalManager.temp_bed.celsius,
|
||||
&DGUSTxHandler::ExtraToInteger<float>),
|
||||
VP_HELPER_TX_AUTO(DGUS_Addr::TEMP_Target_Bed,
|
||||
&thermalManager.temp_bed.target,
|
||||
&DGUSTxHandler::ExtraToInteger<int16_t>),
|
||||
VP_HELPER_TX(DGUS_Addr::TEMP_Max_Bed, &DGUSTxHandler::TempMax),
|
||||
VP_HELPER_TX_AUTO(DGUS_Addr::TEMP_Current_H0,
|
||||
&thermalManager.temp_hotend[ExtUI::heater_t::H0].celsius,
|
||||
&DGUSTxHandler::ExtraToInteger<float>),
|
||||
VP_HELPER_TX_AUTO(DGUS_Addr::TEMP_Target_H0,
|
||||
&thermalManager.temp_hotend[ExtUI::heater_t::H0].target,
|
||||
&DGUSTxHandler::ExtraToInteger<int16_t>),
|
||||
VP_HELPER_TX(DGUS_Addr::TEMP_Max_H0, &DGUSTxHandler::TempMax),
|
||||
#if HOTENDS > 1
|
||||
VP_HELPER_TX_AUTO(DGUS_Addr::TEMP_Current_H1,
|
||||
&thermalManager.temp_hotend[ExtUI::heater_t::H1].celsius,
|
||||
&DGUSTxHandler::ExtraToInteger<float>),
|
||||
VP_HELPER_TX_AUTO(DGUS_Addr::TEMP_Target_H1,
|
||||
&thermalManager.temp_hotend[ExtUI::heater_t::H1].target,
|
||||
&DGUSTxHandler::ExtraToInteger<int16_t>),
|
||||
VP_HELPER_TX(DGUS_Addr::TEMP_Max_H1, &DGUSTxHandler::TempMax),
|
||||
#endif
|
||||
|
||||
VP_HELPER_TX_AUTO(DGUS_Addr::STEPPER_Status,
|
||||
nullptr,
|
||||
&DGUSTxHandler::StepperStatus),
|
||||
|
||||
VP_HELPER_TX_AUTO(DGUS_Addr::LEVEL_OFFSET_Current,
|
||||
&probe.offset.z,
|
||||
(&DGUSTxHandler::ExtraToFixedPoint<float, 2>)),
|
||||
VP_HELPER_TX_EXTRA(DGUS_Addr::LEVEL_OFFSET_StepIcons,
|
||||
&DGUSScreenHandler::offset_steps,
|
||||
&DGUSTxHandler::StepIcons),
|
||||
|
||||
VP_HELPER_TX_AUTO(DGUS_Addr::LEVEL_AUTO_DisableIcon,
|
||||
nullptr,
|
||||
&DGUSTxHandler::ABLDisableIcon),
|
||||
VP_HELPER_TX(DGUS_Addr::LEVEL_AUTO_Grid, &DGUSTxHandler::ABLGrid),
|
||||
|
||||
VP_HELPER_TX_EXTRA(DGUS_Addr::LEVEL_PROBING_Icons1,
|
||||
&DGUSScreenHandler::probing_icons[0],
|
||||
&DGUSTxHandler::ExtraToInteger<uint16_t>),
|
||||
VP_HELPER_TX_EXTRA(DGUS_Addr::LEVEL_PROBING_Icons2,
|
||||
&DGUSScreenHandler::probing_icons[1],
|
||||
&DGUSTxHandler::ExtraToInteger<uint16_t>),
|
||||
|
||||
VP_HELPER_TX(DGUS_Addr::FILAMENT_ExtruderIcons, &DGUSTxHandler::FilamentIcons),
|
||||
VP_HELPER_TX_EXTRA(DGUS_Addr::FILAMENT_Length,
|
||||
&DGUSScreenHandler::filament_length,
|
||||
&DGUSTxHandler::ExtraToInteger<uint16_t>),
|
||||
|
||||
VP_HELPER_TX_AUTO(DGUS_Addr::MOVE_CurrentX,
|
||||
¤t_position.x,
|
||||
(&DGUSTxHandler::ExtraToFixedPoint<float, 1>)),
|
||||
VP_HELPER_TX_AUTO(DGUS_Addr::MOVE_CurrentY,
|
||||
¤t_position.y,
|
||||
(&DGUSTxHandler::ExtraToFixedPoint<float, 1>)),
|
||||
VP_HELPER_TX_AUTO(DGUS_Addr::MOVE_CurrentZ,
|
||||
¤t_position.z,
|
||||
(&DGUSTxHandler::ExtraToFixedPoint<float, 1>)),
|
||||
VP_HELPER_TX_EXTRA(DGUS_Addr::MOVE_StepIcons,
|
||||
&DGUSScreenHandler::move_steps,
|
||||
&DGUSTxHandler::StepIcons),
|
||||
|
||||
VP_HELPER_TX(DGUS_Addr::SETTINGS2_BLTouch, &DGUSTxHandler::BLTouch),
|
||||
|
||||
VP_HELPER_TX(DGUS_Addr::PID_HeaterIcons, &DGUSTxHandler::PIDIcons),
|
||||
VP_HELPER_TX_EXTRA(DGUS_Addr::PID_Temp,
|
||||
&DGUSScreenHandler::pid_temp,
|
||||
&DGUSTxHandler::ExtraToInteger<uint16_t>),
|
||||
VP_HELPER_DWORD(DGUS_Addr::PID_Kp,
|
||||
VPFLAG_AUTOUPLOAD,
|
||||
nullptr,
|
||||
nullptr,
|
||||
&DGUSTxHandler::PIDKp),
|
||||
VP_HELPER_DWORD(DGUS_Addr::PID_Ki,
|
||||
VPFLAG_AUTOUPLOAD,
|
||||
nullptr,
|
||||
nullptr,
|
||||
&DGUSTxHandler::PIDKi),
|
||||
VP_HELPER_DWORD(DGUS_Addr::PID_Kd,
|
||||
VPFLAG_AUTOUPLOAD,
|
||||
nullptr,
|
||||
nullptr,
|
||||
&DGUSTxHandler::PIDKd),
|
||||
|
||||
VP_HELPER(DGUS_Addr::INFOS_Machine,
|
||||
DGUS_MACHINE_LEN,
|
||||
VPFLAG_NONE,
|
||||
(void*)DGUS_MACHINENAME,
|
||||
nullptr,
|
||||
&DGUSTxHandler::ExtraPGMToString),
|
||||
VP_HELPER_TX_SIZE(DGUS_Addr::INFOS_BuildVolume,
|
||||
DGUS_BUILDVOLUME_LEN,
|
||||
&DGUSTxHandler::BuildVolume),
|
||||
VP_HELPER(DGUS_Addr::INFOS_Version,
|
||||
DGUS_VERSION_LEN,
|
||||
VPFLAG_NONE,
|
||||
(void*)DGUS_MARLINVERSION,
|
||||
nullptr,
|
||||
&DGUSTxHandler::ExtraPGMToString),
|
||||
VP_HELPER_TX(DGUS_Addr::INFOS_TotalPrints, &DGUSTxHandler::TotalPrints),
|
||||
VP_HELPER_TX(DGUS_Addr::INFOS_FinishedPrints, &DGUSTxHandler::FinishedPrints),
|
||||
VP_HELPER_TX_SIZE(DGUS_Addr::INFOS_PrintTime,
|
||||
DGUS_PRINTTIME_LEN,
|
||||
&DGUSTxHandler::PrintTime),
|
||||
VP_HELPER_TX_SIZE(DGUS_Addr::INFOS_LongestPrint,
|
||||
DGUS_LONGESTPRINT_LEN,
|
||||
&DGUSTxHandler::LongestPrint),
|
||||
VP_HELPER_TX_SIZE(DGUS_Addr::INFOS_FilamentUsed,
|
||||
DGUS_FILAMENTUSED_LEN,
|
||||
&DGUSTxHandler::FilamentUsed),
|
||||
|
||||
VP_HELPER_TX(DGUS_Addr::WAIT_Icons, &DGUSTxHandler::WaitIcons),
|
||||
|
||||
// READ-WRITE VARIABLES
|
||||
|
||||
VP_HELPER(DGUS_Addr::FAN0_Speed,
|
||||
2,
|
||||
VPFLAG_AUTOUPLOAD,
|
||||
nullptr,
|
||||
&DGUSRxHandler::FanSpeed,
|
||||
&DGUSTxHandler::FanSpeed),
|
||||
|
||||
VP_HELPER(DGUS_Addr::GCODE_Data,
|
||||
DGUS_GCODE_LEN,
|
||||
VPFLAG_RXSTRING,
|
||||
(void*)DGUSScreenHandler::gcode,
|
||||
&DGUSRxHandler::StringToExtra,
|
||||
&DGUSTxHandler::ExtraToString),
|
||||
|
||||
VP_HELPER(DGUS_Addr::PID_Cycles,
|
||||
2,
|
||||
VPFLAG_NONE,
|
||||
&DGUSScreenHandler::pid_cycles,
|
||||
&DGUSRxHandler::IntegerToExtra<uint8_t>,
|
||||
&DGUSTxHandler::ExtraToInteger<uint8_t>),
|
||||
|
||||
VP_HELPER(DGUS_Addr::VOLUME_Level,
|
||||
2,
|
||||
VPFLAG_NONE,
|
||||
nullptr,
|
||||
&DGUSRxHandler::Volume,
|
||||
&DGUSTxHandler::Volume),
|
||||
|
||||
VP_HELPER(DGUS_Addr::BRIGHTNESS_Level,
|
||||
2,
|
||||
VPFLAG_NONE,
|
||||
nullptr,
|
||||
&DGUSRxHandler::Brightness,
|
||||
&DGUSTxHandler::Brightness),
|
||||
|
||||
// SPECIAL CASES
|
||||
|
||||
VP_HELPER_TX(DGUS_Addr::STATUS_Percent_Complete, &DGUSTxHandler::Percent),
|
||||
VP_HELPER_RX_NODATA(DGUS_Addr::INFOS_Debug, &DGUSRxHandler::Debug),
|
||||
|
||||
VP_HELPER((DGUS_Addr)0, 0, VPFLAG_NONE, nullptr, nullptr, nullptr)
|
||||
|
||||
};
|
||||
|
||||
#endif // DGUS_LCD_UI_RELOADED
|
||||
26
Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.h
Normal file
26
Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.h
Normal file
@@ -0,0 +1,26 @@
|
||||
/**
|
||||
* Marlin 3D Printer Firmware
|
||||
* Copyright (c) 2021 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/>.
|
||||
*
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include "DGUS_VP.h"
|
||||
|
||||
extern const struct DGUS_VP vp_list[];
|
||||
Reference in New Issue
Block a user