Skip to content

Commit a6b209d

Browse files
committed
Rename Temperature Model to Thermal Model
`Temperature model` to `Thermal model` `temperature model` to `thermal model`
1 parent 78ed427 commit a6b209d

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

Firmware/Marlin_main.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -3932,7 +3932,7 @@ extern uint8_t st_backlash_y;
39323932
//!@n M302 - Allow cold extrudes, or set the minimum extrude S<temperature>.
39333933
//!@n M303 - PID relay autotune S<temperature> sets the target temperature. (default target temperature = 150C)
39343934
//!@n M304 - Set bed PID parameters P I and D
3935-
//!@n M310 - Temperature model settings
3935+
//!@n M310 - Thermal model settings
39363936
//!@n M400 - Finish all moves
39373937
//!@n M401 - Lower z-probe if present
39383938
//!@n M402 - Raise z-probe if present
@@ -7332,7 +7332,7 @@ SERIAL_PROTOCOLPGM("\n\n");
73327332

73337333
#ifdef THERMAL_MODEL
73347334
/*!
7335-
### M310 - Temperature model settings <a href="https://reprap.org/wiki/G-code#M310:_Temperature_model_settings">M310: Temperature model settings</a>
7335+
### M310 - Thermal model settings <a href="https://reprap.org/wiki/G-code#M310:_Temperature_model_settings">M310: Thermal model settings</a>
73367336
#### Usage
73377337
73387338
M310 ; report values
@@ -8880,7 +8880,7 @@ SERIAL_PROTOCOLPGM("\n\n");
88808880

88818881
#ifdef THERMAL_MODEL_DEBUG
88828882
/*!
8883-
## D70 - Enable low-level temperature model logging for offline simulation
8883+
## D70 - Enable low-level thermal model logging for offline simulation
88848884
#### Usage
88858885
88868886
D70 [ S ]

Firmware/temperature.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
#define DISABLE_TEMP_MGR_INTERRUPT() TIMSKx &= ~(1<<OCIExA)
9494

9595
#ifdef THERMAL_MODEL
96-
// temperature model interface
96+
// thermal model interface
9797
#include "thermal_model.h"
9898
#endif
9999

@@ -2365,7 +2365,7 @@ void thermal_model_set_resistance(uint8_t index, float R)
23652365
void thermal_model_report_settings()
23662366
{
23672367
SERIAL_ECHO_START;
2368-
SERIAL_ECHOLNPGM("Temperature Model settings:");
2368+
SERIAL_ECHOLNPGM("Thermal Model settings:");
23692369
for(uint8_t i = 0; i != THERMAL_MODEL_R_SIZE; ++i)
23702370
printf_P(PSTR("%S M310 I%u R%.2f\n"), echomagic, (unsigned)i, (double)thermal_model::data.R[i]);
23712371
printf_P(PSTR("%S M310 P%.2f U%.4f V%.2f C%.2f D%.4f L%u S%u B%u E%.2f W%.2f T%.2f\n"),

Firmware/temperature.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ FORCE_INLINE void autotempShutdown(){
175175
void PID_autotune(float temp, int extruder, int ncycles);
176176

177177
#ifdef THERMAL_MODEL
178-
bool thermal_model_enabled(); // return temperature model state
178+
bool thermal_model_enabled(); // return thermal model state
179179
void thermal_model_set_enabled(bool enabled);
180180
void thermal_model_set_warn_beep(bool enabled);
181181
void thermal_model_set_params(float P=NAN, float U=NAN, float V=NAN, float C=NAN, float D=NAN,

Firmware/util.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ const CalibrationStatus CALIBRATION_STATUS_SELFTEST = 0b00000001; // Selftest
107107
const CalibrationStatus CALIBRATION_STATUS_XYZ = 0b00000010; // XYZ calibration
108108
const CalibrationStatus CALIBRATION_STATUS_Z = 0b00000100; // Z calibration
109109
#ifdef THERMAL_MODEL
110-
const CalibrationStatus CALIBRATION_STATUS_THERMAL_MODEL = 0b00001000; // Temperature model calibration
110+
const CalibrationStatus CALIBRATION_STATUS_THERMAL_MODEL = 0b00001000; // Thermal model calibration
111111
#endif
112112
const CalibrationStatus CALIBRATION_STATUS_LIVE_ADJUST = 0b00010000; // 1st layer calibration
113113
const CalibrationStatus CALIBRATION_STATUS_UNKNOWN = 0b10000000; // Freshly assembled or unknown status

tools/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ Set the required TTY flags on the specified port to avoid reset-on-connect for *
6767

6868
### ``tml_decode``
6969

70-
Decode (or plot) the temperature model trace from a serial log file.
70+
Decode (or plot) the thermal model trace from a serial log file.
7171

72-
The TML trace needs to be enabled by issuing "M155 S1 C3" and "D70 S1" to the printer, generally followed by a temperature model calibration request "M310 A F0".
72+
The TML trace needs to be enabled by issuing "M155 S1 C3" and "D70 S1" to the printer, generally followed by a thermal model calibration request "M310 A F0".
7373

7474
The parser is not strict, and will consume most serial logs with/without timestamps.
7575

0 commit comments

Comments
 (0)