Commit Graph

6213 Commits

Author SHA1 Message Date
8861374caf Changes in filament
Add fiber wood
  Change order
2023-04-03 21:02:50 +02:00
c606951891 Add more nozzles
0.15, 0.2, 0.5 mm
2023-04-03 21:02:37 +02:00
4c7494605c Add 1mm nozzle 2023-04-03 21:02:27 +02:00
3d-gussner
a6eeb55690
Merge pull request #4055 from 3d-gussner/MK3_3122
Bump up FW 3.12.2 to 5713
2023-02-28 08:54:56 +01:00
3d-gussner
662f5e0248 Bump up FW 3.12.2 to 5713 2023-02-28 08:08:59 +01:00
3d-gussner
db7b472929
Merge pull request #4041 from 3d-gussner/MK3_312_Fix_fil_loaded_timeout
MK3_3.12: Set `Is filament loaded? Yes|No` default to `No` without a timeout.
2023-02-21 07:18:20 +01:00
3d-gussner
0eeaa5bed6 Set Is filament loaded? Yes|No default to No without a timeout. 2023-02-20 14:17:04 +01:00
3d-gussner
c3ea4f02d4
Merge pull request #4006 from wavexx/tm_ptc312
PFW-1499 TM: PTC model support (3.12)
2023-02-20 08:55:54 +01:00
Yuri D'Elia
571d25c04b TM: Move headers to support the legacy build system 2023-02-15 14:15:30 +01:00
Yuri D'Elia
fd96b79ea9 TM: Split default model parameters into a separate header
Preparation to support multiple default model parameter sets
2023-02-15 13:49:51 +01:00
Yuri D'Elia
4b499583b5 TM: future-proofing for incompatible model upgrades
Introduce a model version. This is initialized at "1" and doesn't
require any upgrade/downgrade checks since it's currently
retro-compatible.
2023-02-15 13:48:25 +01:00
Yuri D'Elia
4a4be21374 TM: Fix UV identity 2023-02-15 11:24:49 +01:00
3d-gussner
b76908300d
Merge pull request #4017 from 3d-gussner/MK3_3.12.2
Bump up build number and FW version
2023-02-15 09:07:38 +01:00
3d-gussner
5ca84736e4 Bump up build number and FW version 2023-02-15 08:52:27 +01:00
Yuri D'Elia
6d51752ac8 TM: Optimize temp_model_set_lag
Save about 20 bytes by rewriting the sample count check
2023-02-10 15:44:28 +01:00
Yuri D'Elia
b7961ae0e9 TM: Handle L/TEMP_MODEL_LAG 2023-02-10 15:44:28 +01:00
Yuri D'Elia
e147fc2cb0 TM: Handle UV (PTC loss)
Model UV as power-invariant, so that scaling P doesn't change the
intercept location (that is, the zero point remains at the same
temperature even for more powerful heaters).

NOTE: It's not clear to me whether this is generally true (couldn't
find a datasheet from the same heater in diffent power variants
showing the efficiency loss)
2023-02-10 15:44:28 +01:00
Yuri D'Elia
02775fb79e TM: Handle D/TEMP_MODEL_fS 2023-02-10 15:44:28 +01:00
Yuri D'Elia
70fd9a336b TM: Handle UVDL set/load/report/upgrade
- Expose TEMP_MODEL_fS and TEMP_MODEL_LAG as D and L respectively,
  initializing the default values based on the previous hard-coded
  values.
- Always round L to the effective sample lag to future-proof model
  upgrades or changes (the stored value _is_ the effective value).
- Introduce UV as a new linear term for PTC heaters, defaulting
  to an identity for model backward-compatibility.
2023-02-10 15:44:28 +01:00
Yuri D'Elia
5a1ed1519c TM: Allocate new eeprom parameters for PTC handling 2023-02-10 15:44:28 +01:00
Yuri D'Elia
1445c2eecc Backport eeprom functions from 3.13 2023-02-10 15:44:28 +01:00
Yuri D'Elia
b23476aaf3 TM: Do not emit an "error:" on the serial for recoverable errors
Use "echo:" for thermal model error reporting to avoid octoprint
automatically sending a M112 kill.

Keep using "error:" instead for other thermal errors (MAXTEMP/etc).

This should allow resuming a thermal mode pause with the default
octoprint settings.
2023-02-10 14:25:05 +01:00
3d-gussner
c740bf923c
Merge pull request #3999 from 3d-gussner/MK3_312_Thermal_model
PFW-1479: MK3_3.12 Change Temp model to Thermal model
2023-02-09 07:10:47 +01:00
3d-gussner
8aaf77a6da Change to Thermal model
Add prusa.io/tm-cal link
and update all TM related translations
2023-02-08 18:34:11 +01:00
3d-gussner
c9722c2b63
Merge pull request #3956 from wavexx/tm_cal_check_312
TM: Check for PC parameters more carefully (3.12)
2023-01-27 14:57:41 +01:00
Yuri D'Elia
8ee084944a wizard: Return to status after calibration 2023-01-27 14:55:51 +01:00
Yuri D'Elia
68372c0c0e wizard: Do no set "Self test OK" as an alert message
Alert messages are intended to persist above "info" messages, thus
preventing further calibration status updates to be shown (such as
thermal model calibration).

Just set the message as a regular status message.

Fixes #3892
2023-01-27 14:55:51 +01:00
Yuri D'Elia
4e3152dc1d wizard: Disable TM warnings during calibration
During calibration model warnings are possible/normal. This is
apparently leading some into thinking the hotend might be faulty
and abort the calibration with a hard reset.

Disable warnings/beeps during calibration.

Rely on the error threshold only.
2023-01-27 14:55:37 +01:00
Yuri D'Elia
6058de4ae0 TM: Do not restrict autotune temperature
Fix a wrong type that prevents running TM autotune at temps >127
2023-01-27 14:55:27 +01:00
Yuri D'Elia
36c3814dc2 TM: Check for PC parameters more carefully 2023-01-26 23:47:17 +01:00
3d-gussner
87118c1042
Merge pull request #3934 from 3d-gussner/MK3_312_Fix_Wiz_BumpUpBuildNr
Revert inverted "Running wizard ..." message
2023-01-20 09:22:20 +01:00
3d-gussner
d8ae7cbe11 Revert inverted "Running wizard ..." message
Update build number +1 for PR + one for merge
2023-01-20 09:13:19 +01:00
3d-gussner
f7167595c3
Merge pull request #3932 from 3d-gussner/MK3_312_final_Version_change
Version changed (3.12.1 build 5684) for FW3.12.1
2023-01-20 06:59:25 +01:00
3d-gussner
149ecb857c Version changed (3.12.1 build 5684) for FW3.12.1 2023-01-19 16:36:26 +01:00
3d-gussner
54a3c836a7
Merge pull request #3926 from 3d-gussner/MK3_312_RC1_Version_change
Version changed (3.12.1-RC1 build 5682) for FW3.12.1-RC1
2023-01-17 10:12:14 +01:00
3d-gussner
cf08422672 Version changed (3.12.1-RC1 build 5682) for FW3.12.1-RC1 2023-01-17 09:49:56 +01:00
Yuri D'Elia
4a3644052d TM: Fan measuring state reset unification
Add resetFanCheck() to reset the fan measuring state as it's needed in
several places and save some flash space.
2023-01-16 08:43:23 +01:00
Yuri D'Elia
16922c2643 TM: Restore extruder autofan state when stopping/resuming
During thermal errors all fans are set to full speed.

When the print is resumed or stopped *and* the thermal error is gone,
also restore the autofan state.

Fixes #3893
2023-01-16 08:43:23 +01:00
Yuri D'Elia
128a23544d TM: Set the cal status bit when running M310 A directly
Running `M310 A` should set the TM calibration bit status if the
autotune procedure was successful.

Partially addresses #3891 and #3890, since running `M310 A F0` should
*still* count as valid calibration data and is not something that can be
replicated by using the LCD (which enforces self-test).
2023-01-16 07:33:23 +01:00
Yuri D'Elia
7adfd0c670 wizard: Do not complain about missing calibration if model is disabled
This fixes #3891 without having to set the calibration bit, meaning
that if the model is later re-enabled without a real calibration, a
prompt is shown as expected.
2023-01-16 07:31:57 +01:00
3d-gussner
5b8321d602 Move Z to top during Nozzle change 2023-01-16 07:27:59 +01:00
Alex Voinea
fffb15cc81 Fix MK2.5 softReset()
Disable the watchdog early in the program

More documentation for pins file

retrigger build

fix watchdog not getting disabled on user app boot

Fix interrupts not enabled during setup()
2023-01-13 15:41:54 +01:00
3d-gussner
3ea86136cd
Merge pull request #3897 from 3d-gussner/MK3_12_MMU106-fix
Fix Load filament issues with MMU FW1.0.6
2023-01-13 14:03:58 +01:00
3d-gussner
6db58f09d0 Revert LongTimers to uint32_t in mmu.cpp to fix issues with MMU2 fw 1.0.6 2023-01-13 11:20:49 +01:00
DRracer
fdadc9314e
Merge pull request #3887 from 3d-gussner/MK312_Version_change
Version changed (3.12.0 build 5672) for FW3.12.0 final
2023-01-10 10:51:50 +01:00
3d-gussner
fd678bc8ec Version changed (3.12.0 build 5672)
5670 +1 for the commit +1 for the merge
2023-01-10 09:55:46 +01:00
Yuri D'Elia
54356f8d97
Merge pull request #3880 from wavexx/m300_s0_m312
Make M300 S0 pause like Marlin (3.12)
2023-01-02 19:24:02 +01:00
3d-gussner
39a078306a
Merge pull request #3881 from 3d-gussner/MK3_312_Update_Cal_documention
Fix few values
2023-01-02 15:43:07 +01:00
3d-gussner
cfed4bcd19 Fix few values 2023-01-02 15:18:43 +01:00
Yuri D'Elia
3c4373c0c3 Remove extra delay after critical sound
This delay doesn't exist for the tone generator, so remove it from the
pure version as well.
2023-01-02 14:27:46 +01:00