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

Encapsulate Temperature items

Browse Source
This commit is contained in:
Scott Lahteine
2020-04-27 04:35:20 -05:00
parent 011ecc341a
commit 3d45a4bd23
5 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Marlin/src/module/temperature.cpp
View File

@ -28,9 +28,10 @@
#include "endstops.h"
#include "../MarlinCore.h"
#include "../lcd/ultralcd.h"
#include "planner.h"
#include "../HAL/shared/Delay.h"
#include "../lcd/ultralcd.h"
#if ENABLED(EXTENSIBLE_UI)
#include "../lcd/extui/ui_api.h"
#endif
@ -2241,22 +2242,14 @@ void Temperature::readings_ready() {
#if HAS_HOTEND
static constexpr int8_t temp_dir[] = {
#if ENABLED(HEATER_0_USES_MAX6675)
0
#else
TEMPDIR(0)
#endif
TERN(HEATER_0_USES_MAX6675, 0, TEMPDIR(0))
#if HAS_MULTI_HOTEND
#define _TEMPDIR(N) , TEMPDIR(N)
#if ENABLED(HEATER_1_USES_MAX6675)
, 0
#else
_TEMPDIR(1)
#endif
, TERN(HEATER_1_USES_MAX6675, 0, TEMPDIR(1))
#if HOTENDS > 2
#define _TEMPDIR(N) , TEMPDIR(N)
REPEAT_S(2, HOTENDS, _TEMPDIR)
#endif // HOTENDS > 2
#endif // HAS_MULTI_HOTEND
#endif
#endif
};
LOOP_L_N(e, COUNT(temp_dir)) {

5
Marlin/src/module/temperature.h
View File

@ -322,6 +322,7 @@ class Temperature {
#if HAS_HOTEND
#define HOTEND_TEMPS (HOTENDS + ENABLED(TEMP_SENSOR_1_AS_REDUNDANT))
static hotend_info_t temp_hotend[HOTEND_TEMPS];
static constexpr int16_t heater_maxtemp[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_MAXTEMP, HEATER_1_MAXTEMP, HEATER_2_MAXTEMP, HEATER_3_MAXTEMP, HEATER_4_MAXTEMP, HEATER_5_MAXTEMP, HEATER_6_MAXTEMP, HEATER_7_MAXTEMP);
#endif
TERN_(HAS_HEATED_BED, static bed_info_t temp_bed);
TERN_(HAS_TEMP_PROBE, static probe_info_t temp_probe);
@ -779,6 +780,10 @@ class Temperature {
TERN_(HAS_DISPLAY, static void set_heating_message(const uint8_t e));
#if HAS_LCD_MENU
static void lcd_preheat(const int16_t e, const int8_t indh, const int8_t indb);
#endif
private:
static void update_raw_temperatures();
static void updateTemperaturesFromRawValues();