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

Add typedef celsius_t (#21374)

Browse Source
This commit is contained in:
Scott Lahteine
2021-03-24 04:11:43 -05:00
committed by GitHub
parent 07c24e72ac
commit e5ff55a1be
35 changed files with 252 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1578,20 +1578,22 @@ void _draw_xyz_position(const bool force) {
void update_variable() {
#if HAS_HOTEND
static float _hotendtemp = 0;
const bool _new_hotend_temp = _hotendtemp != thermalManager.temp_hotend[0].celsius;
if (_new_hotend_temp) _hotendtemp = thermalManager.temp_hotend[0].celsius;
static int16_t _hotendtarget = 0;
const bool _new_hotend_target = _hotendtarget != thermalManager.temp_hotend[0].target;
if (_new_hotend_target) _hotendtarget = thermalManager.temp_hotend[0].target;
static celsius_t _hotendtemp = 0, _hotendtarget = 0;
const celsius_t hc = thermalManager.degHotend(0),
ht = thermalManager.degTargetHotend(0);
const bool _new_hotend_temp = _hotendtemp != hc,
_new_hotend_target = _hotendtarget != ht;
if (_new_hotend_temp) _hotendtemp = hc;
if (_new_hotend_target) _hotendtarget = ht;
#endif
#if HAS_HEATED_BED
static float _bedtemp = 0;
const bool _new_bed_temp = _bedtemp != thermalManager.temp_bed.celsius;
if (_new_bed_temp) _bedtemp = thermalManager.temp_bed.celsius;
static int16_t _bedtarget = 0;
const bool _new_bed_target = _bedtarget != thermalManager.temp_bed.target;
if (_new_bed_target) _bedtarget = thermalManager.temp_bed.target;
static celsius_t _bedtemp = 0, _bedtarget = 0;
const celsius_t bc = thermalManager.degBed(),
bt = thermalManager.degTargetBed();
const bool _new_bed_temp = _bedtemp != bc,
_new_bed_target = _bedtarget != bt;
if (_new_bed_temp) _bedtemp = bc;
if (_new_bed_target) _bedtarget = bt;
#endif
#if HAS_FAN
static uint8_t _fanspeed = 0;

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

@ -234,8 +234,8 @@ extern char print_filename[16];
extern millis_t dwin_heat_time;
typedef struct {
TERN_(HAS_HOTEND, int16_t E_Temp = 0);
TERN_(HAS_HEATED_BED, int16_t Bed_Temp = 0);
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);
int16_t print_speed = 100;
float Max_Feedspeed = 0;