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

More IntelliSense-friendly declarations

Browse Source
This commit is contained in:
Scott Lahteine
2021-03-24 05:40:28 -05:00
committed by Scott Lahteine
parent da4b6896f7
commit 2d2291d00e
32 changed files with 562 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/src/lcd/dwin/e3v2/dwin.cpp
View File

@ -180,8 +180,12 @@ static uint8_t _card_percent = 0;
static uint16_t _remain_time = 0;
#if ENABLED(PAUSE_HEAT)
TERN_(HAS_HOTEND, uint16_t resume_hotend_temp = 0);
TERN_(HAS_HEATED_BED, uint16_t resume_bed_temp = 0);
#if ENABLED(HAS_HOTEND)
uint16_t resume_hotend_temp = 0;
#endif
#if ENABLED(HAS_HEATED_BED)
uint16_t resume_bed_temp = 0;
#endif
#endif
#if HAS_ZOFFSET_ITEM

24
Marlin/src/lcd/dwin/e3v2/dwin.h
View File

@ -234,9 +234,15 @@ extern char print_filename[16];
extern millis_t dwin_heat_time;
typedef struct {
TERN_(HAS_HOTEND, celsius_t E_Temp = 0);
TERN_(HAS_HEATED_BED, celsius_t Bed_Temp = 0);
TERN_(HAS_FAN, int16_t Fan_speed = 0);
#if ENABLED(HAS_HOTEND)
celsius_t E_Temp = 0;
#endif
#if ENABLED(HAS_HEATED_BED)
celsius_t Bed_Temp = 0;
#endif
#if ENABLED(HAS_FAN)
int16_t Fan_speed = 0;
#endif
int16_t print_speed = 100;
float Max_Feedspeed = 0;
float Max_Acceleration = 0;
@ -312,9 +318,15 @@ void HMI_Move_E();
void HMI_Zoffset();
TERN_(HAS_HOTEND, void HMI_ETemp());
TERN_(HAS_HEATED_BED, void HMI_BedTemp());
TERN_(HAS_FAN, void HMI_FanSpeed());
#if ENABLED(HAS_HOTEND)
void HMI_ETemp();
#endif
#if ENABLED(HAS_HEATED_BED)
void HMI_BedTemp();
#endif
#if ENABLED(HAS_FAN)
void HMI_FanSpeed();
#endif
void HMI_PrintSpeed();