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

Merge pull request #4225 from 3d-gussner/MK3_3130RC1_pre-release 

FW3.13.0-RC1 Pre-release PR
This commit is contained in:
3d-gussner 2023-05-30 08:57:11 +02:00 committed by GitHub
parent 9ac5436fad 3da1ae1344
commit 8652c77c33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 7079 additions and 7384 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Configuration.h
View File

@ -24,7 +24,7 @@ extern const char _sPrinterMmuName[] PROGMEM;
#define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) "-" STR(FW_FLAVOR) "" STR(FW_FLAVERSION) #define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) "-" STR(FW_FLAVOR) "" STR(FW_FLAVERSION)
#endif #endif
#define FW_COMMIT_NR 6565 #define FW_COMMIT_NR 6853
// FW_VERSION_UNKNOWN means this is an unofficial build. // FW_VERSION_UNKNOWN means this is an unofficial build.
// The firmware should only be checked into github with this symbol. // The firmware should only be checked into github with this symbol.

2
Firmware/ultralcd.cpp
View File

@ -2592,7 +2592,7 @@ static void lcd_babystep_z()
lcd_set_cursor(0, 0); lcd_set_cursor(0, 0);
lcd_print(buffer.c); lcd_print(buffer.c);
lcd_set_cursor(0, 1); lcd_set_cursor(0, 1);
menu_draw_float13(_i("Adjusting Z:"), _md->babystepMemMMZ); ////MSG_BABYSTEPPING_Z c=15 // Beware: must include the ':' as its last character menu_draw_float13(_i("Adjusting Z"), _md->babystepMemMMZ); ////MSG_BABYSTEPPING_Z c=13
} }
if (LCD_CLICKED || menu_leaving) if (LCD_CLICKED || menu_leaving)
{ {

28
Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h
View File

@ -15,12 +15,7 @@
#define PRINTER_MMU_TYPE PRINTER_MK3_MMU2 #define PRINTER_MMU_TYPE PRINTER_MK3_MMU2
#define PRINTER_MMU_NAME PRINTER_MK3_MMU2_NAME #define PRINTER_MMU_NAME PRINTER_MK3_MMU2_NAME
#define FILAMENT_SIZE "1_75mm_MK3" #define FILAMENT_SIZE "1_75mm_MK3"
#define HOTEND 2 //1= E3Dv6 2= E3D REVO
#if HOTEND == 1
#define NOZZLE_TYPE "E3Dv6full"
#elif HOTEND ==2
#define NOZZLE_TYPE "E3DREVO" #define NOZZLE_TYPE "E3DREVO"
#endif
// Printer name // Printer name
#define CUSTOM_MENDEL_NAME "Prusa i3 MK3-R" #define CUSTOM_MENDEL_NAME "Prusa i3 MK3-R"
@ -331,18 +326,11 @@
#define DEFAULT_Kp 21.70 #define DEFAULT_Kp 21.70
#define DEFAULT_Ki 1.60 #define DEFAULT_Ki 1.60
#define DEFAULT_Kd 73.76 #define DEFAULT_Kd 73.76
#elif HOTEND == 2 //E3D REVO PID values #else
#define DEFAULT_Kp 16.13 // Define PID constants for E3D REVO
#define DEFAULT_Ki 1.1625 #define DEFAULT_Kp 25.00
#define DEFAULT_Kd 56.23 #define DEFAULT_Ki 4.8
#else // E3D v6 PID values #define DEFAULT_Kd 32.6
// Define PID constants for extruder
//#define DEFAULT_Kp 40.925
//#define DEFAULT_Ki 4.875
//#define DEFAULT_Kd 86.085
#define DEFAULT_Kp 16.13
#define DEFAULT_Ki 1.1625
#define DEFAULT_Kd 56.23
#endif #endif
// Extrude mintemp // Extrude mintemp
@ -413,13 +401,9 @@
#define TEMP_MODEL_Ta_corr -7 // Default ambient temperature correction #define TEMP_MODEL_Ta_corr -7 // Default ambient temperature correction
#if HOTEND == 1
#include "temp_model/e3d_v6.h"
#define TEMP_MODEL_DEFAULT E3D_V6 // Default E3D v6 model parameters
#elif HOTEND == 2
#include "temp_model/e3d_REVO.h" #include "temp_model/e3d_REVO.h"
#define TEMP_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters #define TEMP_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters
#endif
/*------------------------------------ /*------------------------------------
MOTOR CURRENT SETTINGS MOTOR CURRENT SETTINGS

19
Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h
View File

@ -15,12 +15,7 @@
#define PRINTER_MMU_TYPE PRINTER_MK3_MMU2 #define PRINTER_MMU_TYPE PRINTER_MK3_MMU2
#define PRINTER_MMU_NAME PRINTER_MK3_MMU2_NAME #define PRINTER_MMU_NAME PRINTER_MK3_MMU2_NAME
#define FILAMENT_SIZE "1_75mm_MK3" #define FILAMENT_SIZE "1_75mm_MK3"
#define HOTEND 1 //1= E3Dv6 2= E3D REVO
#if HOTEND == 1
#define NOZZLE_TYPE "E3Dv6full" #define NOZZLE_TYPE "E3Dv6full"
#elif HOTEND ==2
#define NOZZLE_TYPE "E3DREVO"
#endif
// Printer name // Printer name
#define CUSTOM_MENDEL_NAME "Prusa i3 MK3" #define CUSTOM_MENDEL_NAME "Prusa i3 MK3"
@ -331,11 +326,7 @@
#define DEFAULT_Kp 21.70 #define DEFAULT_Kp 21.70
#define DEFAULT_Ki 1.60 #define DEFAULT_Ki 1.60
#define DEFAULT_Kd 73.76 #define DEFAULT_Kd 73.76
#elif HOTEND == 2 //E3D REVO PID values #else
#define DEFAULT_Kp 16.13
#define DEFAULT_Ki 1.1625
#define DEFAULT_Kd 56.23
#else // E3D v6 PID values
// Define PID constants for extruder // Define PID constants for extruder
//#define DEFAULT_Kp 40.925 //#define DEFAULT_Kp 40.925
//#define DEFAULT_Ki 4.875 //#define DEFAULT_Ki 4.875
@ -413,13 +404,9 @@
#define TEMP_MODEL_Ta_corr -7 // Default ambient temperature correction #define TEMP_MODEL_Ta_corr -7 // Default ambient temperature correction
#if HOTEND == 1
#include "temp_model/e3d_v6.h" #include "temp_model/e3d_v6.h"
#define TEMP_MODEL_DEFAULT E3D_V6 // Default E3D v6 model parameters #define TEMP_MODEL_DEFAULT E3D_V6 // Default model parameters
#elif HOTEND == 2
#include "temp_model/e3d_REVO.h"
#define TEMP_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters
#endif
/*------------------------------------ /*------------------------------------
MOTOR CURRENT SETTINGS MOTOR CURRENT SETTINGS

28
Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h
View File

@ -14,12 +14,7 @@
#define PRINTER_MMU_TYPE PRINTER_MK3S_MMU2 #define PRINTER_MMU_TYPE PRINTER_MK3S_MMU2
#define PRINTER_MMU_NAME PRINTER_MK3S_MMU2_NAME #define PRINTER_MMU_NAME PRINTER_MK3S_MMU2_NAME
#define FILAMENT_SIZE "1_75mm_MK3S" #define FILAMENT_SIZE "1_75mm_MK3S"
#define HOTEND 2 //1= E3Dv6 2= E3D REVO
#if HOTEND == 1
#define NOZZLE_TYPE "E3Dv6full"
#elif HOTEND ==2
#define NOZZLE_TYPE "E3DREVO" #define NOZZLE_TYPE "E3DREVO"
#endif
// Printer name // Printer name
#define CUSTOM_MENDEL_NAME "Prusa i3 MK3S-R" #define CUSTOM_MENDEL_NAME "Prusa i3 MK3S-R"
@ -333,18 +328,11 @@
#define DEFAULT_Kp 21.70 #define DEFAULT_Kp 21.70
#define DEFAULT_Ki 1.60 #define DEFAULT_Ki 1.60
#define DEFAULT_Kd 73.76 #define DEFAULT_Kd 73.76
#elif HOTEND == 2 //E3D REVO PID values #else
#define DEFAULT_Kp 16.13 // Define PID constants for E3D REVO
#define DEFAULT_Ki 1.1625 #define DEFAULT_Kp 25.00
#define DEFAULT_Kd 56.23 #define DEFAULT_Ki 4.8
#else // E3D v6 PID values #define DEFAULT_Kd 32.6
// Define PID constants for extruder
//#define DEFAULT_Kp 40.925
//#define DEFAULT_Ki 4.875
//#define DEFAULT_Kd 86.085
#define DEFAULT_Kp 16.13
#define DEFAULT_Ki 1.1625
#define DEFAULT_Kd 56.23
#endif #endif
// Extrude mintemp // Extrude mintemp
@ -417,13 +405,9 @@
#define TEMP_MODEL_Ta_corr -7 // Default ambient temperature correction #define TEMP_MODEL_Ta_corr -7 // Default ambient temperature correction
#if HOTEND == 1
#include "temp_model/e3d_v6.h"
#define TEMP_MODEL_DEFAULT E3D_V6 // Default E3D v6 model parameters
#elif HOTEND == 2
#include "temp_model/e3d_REVO.h" #include "temp_model/e3d_REVO.h"
#define TEMP_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters #define TEMP_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters
#endif
/*------------------------------------ /*------------------------------------
MOTOR CURRENT SETTINGS MOTOR CURRENT SETTINGS

19
Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h
View File

@ -14,12 +14,7 @@
#define PRINTER_MMU_TYPE PRINTER_MK3S_MMU2 #define PRINTER_MMU_TYPE PRINTER_MK3S_MMU2
#define PRINTER_MMU_NAME PRINTER_MK3S_MMU2_NAME #define PRINTER_MMU_NAME PRINTER_MK3S_MMU2_NAME
#define FILAMENT_SIZE "1_75mm_MK3S" #define FILAMENT_SIZE "1_75mm_MK3S"
#define HOTEND 1 //1= E3Dv6 2= E3D REVO
#if HOTEND == 1
#define NOZZLE_TYPE "E3Dv6full" #define NOZZLE_TYPE "E3Dv6full"
#elif HOTEND ==2
#define NOZZLE_TYPE "E3DREVO"
#endif
// Printer name // Printer name
#define CUSTOM_MENDEL_NAME "Prusa i3 MK3S" #define CUSTOM_MENDEL_NAME "Prusa i3 MK3S"
@ -333,11 +328,7 @@
#define DEFAULT_Kp 21.70 #define DEFAULT_Kp 21.70
#define DEFAULT_Ki 1.60 #define DEFAULT_Ki 1.60
#define DEFAULT_Kd 73.76 #define DEFAULT_Kd 73.76
#elif HOTEND == 2 //E3D REVO PID values #else
#define DEFAULT_Kp 16.13
#define DEFAULT_Ki 1.1625
#define DEFAULT_Kd 56.23
#else // E3D v6 PID values
// Define PID constants for extruder // Define PID constants for extruder
//#define DEFAULT_Kp 40.925 //#define DEFAULT_Kp 40.925
//#define DEFAULT_Ki 4.875 //#define DEFAULT_Ki 4.875
@ -417,13 +408,9 @@
#define TEMP_MODEL_Ta_corr -7 // Default ambient temperature correction #define TEMP_MODEL_Ta_corr -7 // Default ambient temperature correction
#if HOTEND == 1
#include "temp_model/e3d_v6.h" #include "temp_model/e3d_v6.h"
#define TEMP_MODEL_DEFAULT E3D_V6 // Default E3D v6 model parameters #define TEMP_MODEL_DEFAULT E3D_V6 // Default model parameters
#elif HOTEND == 2
#include "temp_model/e3d_REVO.h"
#define TEMP_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters
#endif
/*------------------------------------ /*------------------------------------
MOTOR CURRENT SETTINGS MOTOR CURRENT SETTINGS

90
Firmware/variants/README.md
View File

@ -10,88 +10,90 @@ There are other 3rd party hotends which the community uses.
Steps to add a new 3rd party hotend: Steps to add a new 3rd party hotend:
1. Make a copy of the `/Firmware/variant/1_75mm_MK3S-EINSy10a-E3Dv6full.h` with a new name `1_75mm_MK3S-EINSy10a-<3rd party hotend:16>.h` 1. Make a copy of the `/Firmware/variant/1_75mm_MK3S-EINSy10a-E3Dv6full.h` with a new name `1_75mm_MK3S-EINSy10a-<3rd party hotend:16>.h`
a. Example for the E3D REVO HF 60W: `/Firmware/variant/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h` - Example for the E3D REVO HF 60W: `/Firmware/variant/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h`
2. Open the new variant file. 2. Open the new variant file.
3. Add the 3rd party hotend with new number and the description in the comment part `#define HOTEND 1 //1= E3Dv6 2= E3D REVO` 3. Search for `#define NOZZLE_TYPE`
a. Example: `#define HOTEND 3 //1= E3Dv6 2= E3D REVO 3= E3DREVO_HF_60W` 4. Change `"E3Dv6full"` to `"<3rd party hotend:16>"`
4. Add a new `#elif HOTEND == <new number>` and `#define NOZZLE_TYPE "<3rd party hotend:16>"` ```
a.Example ...
#define NOZZLE_TYPE "E3Dv6full"
...
```
- Example
``` ```
... ...
#elif HOTEND ==2
#define NOZZLE_TYPE "E3DREVO"
#elif HOTEND ==3
#define NOZZLE_TYPE "E3DREVO_HF_60W" #define NOZZLE_TYPE "E3DREVO_HF_60W"
#endif
... ...
``` ```
5. Change the `#define CUSTOM_MENDEL_NAME "Prusa i3 MK3S-<Short description:2>` 5. Search `#define CUSTOM_MENDEL_NAME`
a. `CUSTOM_MENDEL_NAME` string cannot exceed 17 chars in total! 6. Change `"Prusa i3 MK3S"` to `"Prusa i3 MK3S-<Short description:2>"`
6. Add new PID values for the new Hotend type. - `CUSTOM_MENDEL_NAME` string cannot exceed 16 chars in total!
a. Search for `#else // E3D v6 PID values`
b. Copy, paste (above `#else // E3D v6 PID values`) and update the new hotend PID default values
``` ```
#elif HOTEND == 2 //E3D REVO PID values ...
#define CUSTOM_MENDEL_NAME "Prusa i3 MK3S"
...
```
- Example
```
...
#define CUSTOM_MENDEL_NAME "Prusa i3 MK3S-RH"
...
```
```
...
#define CUSTOM_MENDEL_NAME "Prusa MK3S-RHF60"
...
```
7. Add new PID values for the new Hotend type.
- Search for `// Define PID constants for extruder`
- Change `extruder` to new hotend name ` <3rd party hotend:16>` and update the new hotend PID default values
```
// Define PID constants for extruder
#define DEFAULT_Kp 16.13 #define DEFAULT_Kp 16.13
#define DEFAULT_Ki 1.1625 #define DEFAULT_Ki 1.1625
#define DEFAULT_Kd 56.23 #define DEFAULT_Kd 56.23
#endif
``` ```
Example: Example:
``` ```
... ...
#elif HOTEND == 2 //E3D REVO PID values // Define PID constants for E3D REVO HF 60W
#define DEFAULT_Kp 16.13
#define DEFAULT_Ki 1.1625
#define DEFAULT_Kd 56.23
#elif HOTEND == 3 //E3D REVO HF 60W PID values
#define DEFAULT_Kp 23.23 #define DEFAULT_Kp 23.23
#define DEFAULT_Ki 1.1 #define DEFAULT_Ki 1.1
#define DEFAULT_Kd 55.25 #define DEFAULT_Kd 55.25
#else // E3D v6 PID values #endif
... ...
``` ```
7. Prepare for new 3rd party hotend TM value file 8. Prepare for new 3rd party hotend TM value file
a. Search for `#define TEMP_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters` or the last entry - Search for `#include "temp_model/e3d_v6.h"`
b. Copy the lines starting with `#elif HOTEND == 2` till the search, paste (above next `#endif`) and update this - Change the `e3d_v6.h` to `<3rd party hotend:16>.h`
- Change below the `E3D_V6` to `<3rd party hotend:16>`
``` ```
... ...
#if HOTEND == 1
#include "temp_model/e3d_v6.h" #include "temp_model/e3d_v6.h"
#define TEMP_MODEL_DEFAULT E3D_V6 // Default E3D v6 model parameters #define TEMP_MODEL_DEFAULT E3D_V6 // Default E3D v6 model parameters
#elif HOTEND == 2
#include "temp_model/e3d_REVO.h"
#define TEMP_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters
#endif
... ...
``` ```
Example: Example:
``` ```
... ...
#if HOTEND == 1
#include "temp_model/e3d_v6.h"
#define TEMP_MODEL_DEFAULT E3D_V6 // Default E3D v6 model parameters
#elif HOTEND == 2
#include "temp_model/e3d_REVO.h"
#define TEMP_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters
#elif HOTEND == 3
#include "temp_model/e3d_REVO_HF_60W.h" #include "temp_model/e3d_REVO_HF_60W.h"
#define TEMP_MODEL_DEFAULT E3D_REVO_HF_60W // Default E3D REVO HF 60W model parameters #define TEMP_MODEL_DEFAULT E3D_REVO_HF_60W // Default E3D REVO HF 60W model parameters
#endif
... ...
``` ```
8. Save and close the new variant file 9. Save and close the new variant file
9. Copy/paste `Firmware/temp_model/e3d_v6.h` as `Firmware/temp_model/<3rd party hotend:16>.h` 10. Copy/paste `Firmware/temp_model/e3d_v6.h` as `Firmware/temp_model/<3rd party hotend:16>.h`
a. Example: `Firmware/temp_model/e3d_REVO_HF_60W.h` - Example: `Firmware/temp_model/e3d_REVO_HF_60W.h`
10. Open the new file `Firmware/temp_model/<3rd party hotend:16>.h` 11. Open the new file `Firmware/temp_model/<3rd party hotend:16>.h`
11. Search `E3D_V6` and replace it with what you have used in `#defined TEMP_MODEL_DEFAULT` 12. Search `E3D_V6` and replace it with what you have used in `#defined TEMP_MODEL_DEFAULT`
a. Example - Example
``` ```
#pragma once #pragma once
#define TEMP_MODEL_E3D_REVO_HF_60W_VER 1 // model parameters version #define TEMP_MODEL_E3D_REVO_HF_60W_VER 1 // model parameters version
#define TEMP_MODEL_E3D_REVO_HF_60W_P 40. // heater power (W) #define TEMP_MODEL_E3D_REVO_HF_60W_P 60. // heater power (W)
#define TEMP_MODEL_E3D_REVO_HF_60W_U -0.0014 // linear temperature coefficient (W/K/power) #define TEMP_MODEL_E3D_REVO_HF_60W_U -0.0014 // linear temperature coefficient (W/K/power)
#define TEMP_MODEL_E3D_REVO_HF_60W_V 1.05 // linear temperature intercept (W/power) #define TEMP_MODEL_E3D_REVO_HF_60W_V 1.05 // linear temperature intercept (W/power)

1009
lang/po/Firmware.pot
View File

File diff suppressed because it is too large Load Diff

1020
lang/po/Firmware_cs.po
View File

File diff suppressed because it is too large Load Diff

1020
lang/po/Firmware_de.po
View File

File diff suppressed because it is too large Load Diff

1020
lang/po/Firmware_es.po
View File

File diff suppressed because it is too large Load Diff

1020
lang/po/Firmware_fr.po
View File

File diff suppressed because it is too large Load Diff

1020
lang/po/Firmware_hr.po
View File

File diff suppressed because it is too large Load Diff

1024
lang/po/Firmware_hu.po
View File

File diff suppressed because it is too large Load Diff

1020
lang/po/Firmware_it.po
View File

File diff suppressed because it is too large Load Diff

1020
lang/po/Firmware_nl.po
View File

File diff suppressed because it is too large Load Diff

1020
lang/po/Firmware_no.po
View File

File diff suppressed because it is too large Load Diff

1020
lang/po/Firmware_pl.po
View File

File diff suppressed because it is too large Load Diff

1020
lang/po/Firmware_ro.po
View File

File diff suppressed because it is too large Load Diff

1020
lang/po/Firmware_sk.po
View File

File diff suppressed because it is too large Load Diff

1020
lang/po/Firmware_sv.po
View File

File diff suppressed because it is too large Load Diff