josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename `Temperature Model` to `Thermal Model` 

`Temperature model` to `Thermal model`
`temperature model` to `thermal model`
This commit is contained in:
3d-gussner 2023-05-24 08:49:23 +02:00
parent 78ed427166
commit a6b209d36d
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Firmware/Marlin_main.cpp
View File

@ -3932,7 +3932,7 @@ extern uint8_t st_backlash_y;
//!@n M302 - Allow cold extrudes, or set the minimum extrude S<temperature>. //!@n M302 - Allow cold extrudes, or set the minimum extrude S<temperature>.
//!@n M303 - PID relay autotune S<temperature> sets the target temperature. (default target temperature = 150C) //!@n M303 - PID relay autotune S<temperature> sets the target temperature. (default target temperature = 150C)
//!@n M304 - Set bed PID parameters P I and D //!@n M304 - Set bed PID parameters P I and D
//!@n M310 - Temperature model settings //!@n M310 - Thermal model settings
//!@n M400 - Finish all moves //!@n M400 - Finish all moves
//!@n M401 - Lower z-probe if present //!@n M401 - Lower z-probe if present
//!@n M402 - Raise z-probe if present //!@n M402 - Raise z-probe if present
@ -7332,7 +7332,7 @@ Sigma_Exit:
#ifdef THERMAL_MODEL #ifdef THERMAL_MODEL
/*! /*!
### M310 - Temperature model settings <a href="https://reprap.org/wiki/G-code#M310:_Temperature_model_settings">M310: Temperature model settings</a> ### M310 - Thermal model settings <a href="https://reprap.org/wiki/G-code#M310:_Temperature_model_settings">M310: Thermal model settings</a>
#### Usage #### Usage
M310 ; report values M310 ; report values
@ -8880,7 +8880,7 @@ Sigma_Exit:
#ifdef THERMAL_MODEL_DEBUG #ifdef THERMAL_MODEL_DEBUG
/*! /*!
## D70 - Enable low-level temperature model logging for offline simulation ## D70 - Enable low-level thermal model logging for offline simulation
#### Usage #### Usage
D70 [ S ] D70 [ S ]

4
Firmware/temperature.cpp
View File

@ -93,7 +93,7 @@
#define DISABLE_TEMP_MGR_INTERRUPT() TIMSKx &= ~(1<<OCIExA) #define DISABLE_TEMP_MGR_INTERRUPT() TIMSKx &= ~(1<<OCIExA)
#ifdef THERMAL_MODEL #ifdef THERMAL_MODEL
// temperature model interface // thermal model interface
#include "thermal_model.h" #include "thermal_model.h"
#endif #endif
@ -2365,7 +2365,7 @@ void thermal_model_set_resistance(uint8_t index, float R)
void thermal_model_report_settings() void thermal_model_report_settings()
{ {
SERIAL_ECHO_START; SERIAL_ECHO_START;
SERIAL_ECHOLNPGM("Temperature Model settings:"); SERIAL_ECHOLNPGM("Thermal Model settings:");
for(uint8_t i = 0; i != THERMAL_MODEL_R_SIZE; ++i) for(uint8_t i = 0; i != THERMAL_MODEL_R_SIZE; ++i)
printf_P(PSTR("%S M310 I%u R%.2f\n"), echomagic, (unsigned)i, (double)thermal_model::data.R[i]); printf_P(PSTR("%S M310 I%u R%.2f\n"), echomagic, (unsigned)i, (double)thermal_model::data.R[i]);
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"), 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"),

2
Firmware/temperature.h
View File

@ -175,7 +175,7 @@ FORCE_INLINE void autotempShutdown(){
void PID_autotune(float temp, int extruder, int ncycles); void PID_autotune(float temp, int extruder, int ncycles);
#ifdef THERMAL_MODEL #ifdef THERMAL_MODEL
bool thermal_model_enabled(); // return temperature model state bool thermal_model_enabled(); // return thermal model state
void thermal_model_set_enabled(bool enabled); void thermal_model_set_enabled(bool enabled);
void thermal_model_set_warn_beep(bool enabled); void thermal_model_set_warn_beep(bool enabled);
void thermal_model_set_params(float P=NAN, float U=NAN, float V=NAN, float C=NAN, float D=NAN, void thermal_model_set_params(float P=NAN, float U=NAN, float V=NAN, float C=NAN, float D=NAN,

2
Firmware/util.h
View File

@ -107,7 +107,7 @@ const CalibrationStatus CALIBRATION_STATUS_SELFTEST = 0b00000001; // Selftest
const CalibrationStatus CALIBRATION_STATUS_XYZ = 0b00000010; // XYZ calibration const CalibrationStatus CALIBRATION_STATUS_XYZ = 0b00000010; // XYZ calibration
const CalibrationStatus CALIBRATION_STATUS_Z = 0b00000100; // Z calibration const CalibrationStatus CALIBRATION_STATUS_Z = 0b00000100; // Z calibration
#ifdef THERMAL_MODEL #ifdef THERMAL_MODEL
const CalibrationStatus CALIBRATION_STATUS_THERMAL_MODEL = 0b00001000; // Temperature model calibration const CalibrationStatus CALIBRATION_STATUS_THERMAL_MODEL = 0b00001000; // Thermal model calibration
#endif #endif
const CalibrationStatus CALIBRATION_STATUS_LIVE_ADJUST = 0b00010000; // 1st layer calibration const CalibrationStatus CALIBRATION_STATUS_LIVE_ADJUST = 0b00010000; // 1st layer calibration
const CalibrationStatus CALIBRATION_STATUS_UNKNOWN = 0b10000000; // Freshly assembled or unknown status const CalibrationStatus CALIBRATION_STATUS_UNKNOWN = 0b10000000; // Freshly assembled or unknown status

4
tools/README.md
View File

@ -67,9 +67,9 @@ Set the required TTY flags on the specified port to avoid reset-on-connect for *
### ``tml_decode`` ### ``tml_decode``
Decode (or plot) the temperature model trace from a serial log file. Decode (or plot) the thermal model trace from a serial log file.
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". 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".
The parser is not strict, and will consume most serial logs with/without timestamps. The parser is not strict, and will consume most serial logs with/without timestamps.