Merge remote-tracking branch 'upstream/MK3' into MK3_Dutch
Merge upstream/MK3 Fix conflicts update Dutch translation
This commit is contained in:
commit
4d3aa1b59a
85 changed files with 24210 additions and 19835 deletions
.editorconfig.gitattributes
.github/ISSUE_TEMPLATE
.gitignoreFirmware
Configuration.hConfigurationStore.cppConfiguration_adv.hDcodes.cppDcodes.hMarlin.hMarlin_main.cppbootapp.ccardreader.cppcardreader.hconfig.heeprom.hfastio.hfsensor.cppfsensor.hheatbed_pwm.cppla10compat.cppla10compat.hlanguage.hmenu.cppmenu.hmesh_bed_calibration.cppmessages.cmessages.hmmu.cppoptiboot_w25x20cl.cppoptiboot_w25x20cl.hpat9125.cpat9125.hplanner.cppplanner.hspeed_lookuptable.cppspeed_lookuptable.hstepper.cppstepper.hsystem_timer.htemperature.cpptemperature.hthermistortables.htimer02.ctimer02.htone04.ctone04.hultralcd.cppultralcd.h
PF-build.shREADME.mdbuild.shvariants
lang
|
@ -12,3 +12,7 @@ indent_style = space
|
|||
indent_size = 4
|
||||
tab_width = 4
|
||||
max_line_length = 100
|
||||
|
||||
[lang/po/*.po]
|
||||
end_of_line = crlf
|
||||
trim_trailing_whitespace = false
|
||||
|
|
1
.gitattributes
vendored
Normal file
1
.gitattributes
vendored
Normal file
|
@ -0,0 +1 @@
|
|||
lang/po/*.po text eol=crlf
|
3
.github/ISSUE_TEMPLATE/bug_report.md
vendored
3
.github/ISSUE_TEMPLATE/bug_report.md
vendored
|
@ -15,6 +15,9 @@ Please, before you create a new bug report, please make sure you searched in ope
|
|||
**MMU Upgrade** - [e.g. MMU2S, MMU2, MMU1]
|
||||
**MMU upgrade firmware version [e.g. 1.0.6, 1.0.6-RC2, ...]
|
||||
|
||||
**SD card or USB/Octoprint**
|
||||
Please let us know if you print via SD card or USB/Octoprint
|
||||
|
||||
**Describe the bug**
|
||||
A clear and concise description of what the bug is.
|
||||
|
||||
|
|
4
.gitignore
vendored
4
.gitignore
vendored
|
@ -40,8 +40,8 @@ Firmware/Doc
|
|||
/lang/*.dat
|
||||
/lang/*.tmp
|
||||
/lang/*.out
|
||||
/lang/not_tran.txt
|
||||
/lang/not_used.txt
|
||||
/lang/not_tran*.txt
|
||||
/lang/not_used*.txt
|
||||
/lang/progmem1.chr
|
||||
/lang/progmem1.lss
|
||||
/lang/progmem1.txt
|
||||
|
|
|
@ -16,8 +16,8 @@ extern uint16_t nPrinterType;
|
|||
extern PGM_P sPrinterName;
|
||||
|
||||
// Firmware version
|
||||
#define FW_VERSION "3.8.1"
|
||||
#define FW_COMMIT_NR 2869
|
||||
#define FW_VERSION "3.9.0"
|
||||
#define FW_COMMIT_NR 3421
|
||||
// FW_VERSION_UNKNOWN means this is an unofficial build.
|
||||
// The firmware should only be checked into github with this symbol.
|
||||
#define FW_DEV_VERSION FW_VERSION_UNKNOWN
|
||||
|
@ -424,7 +424,7 @@ your extruder heater takes 2 minutes to hit the target on heating.
|
|||
#define DEFAULT_XJERK 10 // (mm/sec)
|
||||
#define DEFAULT_YJERK 10 // (mm/sec)
|
||||
#define DEFAULT_ZJERK 0.4 // (mm/sec)
|
||||
#define DEFAULT_EJERK 2.5 // (mm/sec)
|
||||
#define DEFAULT_EJERK 4.5 // (mm/sec)
|
||||
|
||||
//===========================================================================
|
||||
//=============================Additional Features===========================
|
||||
|
|
|
@ -165,8 +165,8 @@ void Config_PrintSettings(uint8_t level)
|
|||
#endif
|
||||
if (level >= 10) {
|
||||
#ifdef LIN_ADVANCE
|
||||
printf_P(PSTR("%SLinear advance settings:\n M900 K%.2f E/D = %.2f\n"),
|
||||
echomagic, extruder_advance_k, advance_ed_ratio);
|
||||
printf_P(PSTR("%SLinear advance settings:%S M900 K%.2f\n"),
|
||||
echomagic, echomagic, extruder_advance_K);
|
||||
#endif //LIN_ADVANCE
|
||||
}
|
||||
}
|
||||
|
|
|
@ -152,7 +152,6 @@
|
|||
#define Z_HOME_RETRACT_MM 2
|
||||
//#define QUICK_HOME //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
|
||||
|
||||
#define AXIS_RELATIVE_MODES {0, 0, 0, 0}
|
||||
#define MAX_STEP_FREQUENCY 40000 // Max step frequency for Ultimaker (5000 pps / half step). Toshiba steppers are 4x slower, but Prusa3D does not use those.
|
||||
//By default pololu step drivers require an active high signal. However, some high power drivers require an active low signal as step.
|
||||
#define INVERT_X_STEP_PIN 0
|
||||
|
@ -268,43 +267,32 @@
|
|||
#endif
|
||||
|
||||
/**
|
||||
* Implementation of linear pressure control
|
||||
*
|
||||
* Assumption: advance = k * (delta velocity)
|
||||
* K=0 means advance disabled.
|
||||
* See Marlin documentation for calibration instructions.
|
||||
*/
|
||||
* Linear Pressure Control v1.5
|
||||
*
|
||||
* Assumption: advance [steps] = k * (delta velocity [steps/s])
|
||||
* K=0 means advance disabled.
|
||||
*
|
||||
* NOTE: K values for LIN_ADVANCE 1.5 differs from earlier versions!
|
||||
*
|
||||
* Set K around 0.22 for 3mm PLA Direct Drive with ~6.5cm between the drive gear and heatbreak.
|
||||
* Larger K values will be needed for flexible filament and greater distances.
|
||||
* If this algorithm produces a higher speed offset than the extruder can handle (compared to E jerk)
|
||||
* print acceleration will be reduced during the affected moves to keep within the limit.
|
||||
*
|
||||
* See http://marlinfw.org/docs/features/lin_advance.html for full instructions.
|
||||
* Mention @Sebastianv650 on GitHub to alert the author of any issues.
|
||||
*/
|
||||
#define LIN_ADVANCE
|
||||
|
||||
#ifdef LIN_ADVANCE
|
||||
#define LIN_ADVANCE_K 0 //Try around 45 for PLA, around 25 for ABS.
|
||||
|
||||
/**
|
||||
* Some Slicers produce Gcode with randomly jumping extrusion widths occasionally.
|
||||
* For example within a 0.4mm perimeter it may produce a single segment of 0.05mm width.
|
||||
* While this is harmless for normal printing (the fluid nature of the filament will
|
||||
* close this very, very tiny gap), it throws off the LIN_ADVANCE pressure adaption.
|
||||
*
|
||||
* For this case LIN_ADVANCE_E_D_RATIO can be used to set the extrusion:distance ratio
|
||||
* to a fixed value. Note that using a fixed ratio will lead to wrong nozzle pressures
|
||||
* if the slicer is using variable widths or layer heights within one print!
|
||||
*
|
||||
* This option sets the default E:D ratio at startup. Use `M900` to override this value.
|
||||
*
|
||||
* Example: `M900 W0.4 H0.2 D1.75`, where:
|
||||
* - W is the extrusion width in mm
|
||||
* - H is the layer height in mm
|
||||
* - D is the filament diameter in mm
|
||||
*
|
||||
* Example: `M900 R0.0458` to set the ratio directly.
|
||||
*
|
||||
* Set to 0 to auto-detect the ratio based on given Gcode G1 print moves.
|
||||
*
|
||||
* Slic3r (including Prusa Slic3r) produces Gcode compatible with the automatic mode.
|
||||
* Cura (as of this writing) may produce Gcode incompatible with the automatic mode.
|
||||
*/
|
||||
#define LIN_ADVANCE_E_D_RATIO 0 // The calculated ratio (or 0) according to the formula W * H / ((D / 2) ^ 2 * PI)
|
||||
// Example: 0.4 * 0.2 / ((1.75 / 2) ^ 2 * PI) = 0.033260135
|
||||
#define LA_K_DEF 0 // Default K factor (Unit: mm compression per 1mm/s extruder speed)
|
||||
#define LA_K_MAX 10 // Maximum acceptable K factor (exclusive, see notes in planner.cpp:plan_buffer_line)
|
||||
#define LA_LA10_MIN LA_K_MAX // Lin. Advance 1.0 threshold value (inclusive)
|
||||
//#define LA_FLOWADJ // Adjust LA along with flow/M221 for uniform width
|
||||
//#define LA_NOCOMPAT // Disable Linear Advance 1.0 compatibility
|
||||
//#define LA_LIVE_K // Allow adjusting K in the Tune menu
|
||||
//#define LA_DEBUG // If enabled, this will generate debug information output over USB.
|
||||
//#define LA_DEBUG_LOGIC // @wavexx: setup logic channels for isr debugging
|
||||
#endif
|
||||
|
||||
// Arc interpretation settings:
|
||||
|
@ -449,6 +437,10 @@ const unsigned int dropsegments=5; //everything with less than this number of st
|
|||
#undef BED_MINTEMP
|
||||
#undef BED_MAXTEMP
|
||||
#endif
|
||||
#if TEMP_SENSOR_AMBIENT == 0
|
||||
#undef AMBIENT_MINTEMP
|
||||
#undef AMBIENT_MAXTEMP
|
||||
#endif
|
||||
|
||||
|
||||
#endif //__CONFIGURATION_ADV_H
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
#include "Dcodes.h"
|
||||
//#include "Marlin.h"
|
||||
#include "Marlin.h"
|
||||
#include "Configuration.h"
|
||||
#include "language.h"
|
||||
#include "cmdqueue.h"
|
||||
#include <stdio.h>
|
||||
|
@ -97,8 +98,26 @@ void print_mem(uint32_t address, uint16_t count, uint8_t type, uint8_t countperl
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef DEBUG_DCODE3
|
||||
#if defined DEBUG_DCODE3 || defined DEBUG_DCODES
|
||||
#define EEPROM_SIZE 0x1000
|
||||
/*!
|
||||
### D3 - Read/Write EEPROM <a href="https://reprap.org/wiki/G-code#D3:_Read.2FWrite_EEPROM">D3: Read/Write EEPROM</a>
|
||||
This command can be used without any additional parameters. It will read the entire eeprom.
|
||||
#### Usage
|
||||
|
||||
D3 [ A | C | X ]
|
||||
|
||||
#### Parameters
|
||||
- `A` - Address (x0000-x0fff)
|
||||
- `C` - Count (1-4096)
|
||||
- `X` - Data (hex)
|
||||
|
||||
#### Notes
|
||||
- The hex address needs to be lowercase without the 0 before the x
|
||||
- Count is decimal
|
||||
- The hex data needs to be lowercase
|
||||
|
||||
*/
|
||||
void dcode_3()
|
||||
{
|
||||
DBG(_N("D3 - Read/Write EEPROM\n"));
|
||||
|
@ -167,7 +186,6 @@ void dcode_3()
|
|||
#define BOOT_APP_FLG_COPY 0x02
|
||||
#define BOOT_APP_FLG_FLASH 0x04
|
||||
|
||||
extern uint8_t fsensor_log;
|
||||
extern float current_temperature_pinda;
|
||||
extern float axis_steps_per_unit[NUM_AXIS];
|
||||
|
||||
|
@ -176,6 +194,14 @@ extern float axis_steps_per_unit[NUM_AXIS];
|
|||
#endif //0
|
||||
#define LOG(args...)
|
||||
|
||||
/*!
|
||||
*
|
||||
### D-1 - Endless Loop <a href="https://reprap.org/wiki/G-code#G28:_Move_to_Origin_.28Home.29">D-1: Endless Loop</a>
|
||||
|
||||
D-1
|
||||
|
||||
*
|
||||
*/
|
||||
void dcode__1()
|
||||
{
|
||||
printf_P(PSTR("D-1 - Endless loop\n"));
|
||||
|
@ -185,15 +211,22 @@ void dcode__1()
|
|||
|
||||
#ifdef DEBUG_DCODES
|
||||
|
||||
/*!
|
||||
### D0 - Reset <a href="https://reprap.org/wiki/G-code#D0:_Reset">D0: Reset</a>
|
||||
#### Usage
|
||||
|
||||
D0 [ B ]
|
||||
|
||||
#### Parameters
|
||||
- `B` - Bootloader
|
||||
*/
|
||||
void dcode_0()
|
||||
{
|
||||
if (*(strchr_pointer + 1) == 0) return;
|
||||
LOG("D0 - Reset\n");
|
||||
if (code_seen('B')) //bootloader
|
||||
{
|
||||
cli();
|
||||
wdt_enable(WDTO_15MS);
|
||||
while(1);
|
||||
softReset();
|
||||
}
|
||||
else //reset
|
||||
{
|
||||
|
@ -203,16 +236,41 @@ void dcode_0()
|
|||
}
|
||||
}
|
||||
|
||||
/*!
|
||||
*
|
||||
### D1 - Clear EEPROM and RESET <a href="https://reprap.org/wiki/G-code#D1:_Clear_EEPROM_and_RESET">D1: Clear EEPROM and RESET</a>
|
||||
|
||||
D1
|
||||
|
||||
*
|
||||
*/
|
||||
void dcode_1()
|
||||
{
|
||||
LOG("D1 - Clear EEPROM and RESET\n");
|
||||
cli();
|
||||
for (int i = 0; i < 8192; i++)
|
||||
eeprom_write_byte((unsigned char*)i, (unsigned char)0xff);
|
||||
wdt_enable(WDTO_15MS);
|
||||
while(1);
|
||||
softReset();
|
||||
}
|
||||
|
||||
/*!
|
||||
### D2 - Read/Write RAM <a href="https://reprap.org/wiki/G-code#D2:_Read.2FWrite_RAM">D3: Read/Write RAM</a>
|
||||
This command can be used without any additional parameters. It will read the entire RAM.
|
||||
#### Usage
|
||||
|
||||
D2 [ A | C | X ]
|
||||
|
||||
#### Parameters
|
||||
- `A` - Address (x0000-x1fff)
|
||||
- `C` - Count (1-8192)
|
||||
- `X` - Data
|
||||
|
||||
#### Notes
|
||||
- The hex address needs to be lowercase without the 0 before the x
|
||||
- Count is decimal
|
||||
- The hex data needs to be lowercase
|
||||
|
||||
*/
|
||||
void dcode_2()
|
||||
{
|
||||
LOG("D2 - Read/Write RAM\n");
|
||||
|
@ -256,6 +314,19 @@ void dcode_2()
|
|||
}*/
|
||||
}
|
||||
|
||||
/*!
|
||||
|
||||
### D4 - Read/Write PIN <a href="https://reprap.org/wiki/G-code#D4:_Read.2FWrite_PIN">D4: Read/Write PIN</a>
|
||||
To read the digital value of a pin you need only to define the pin number.
|
||||
#### Usage
|
||||
|
||||
D4 [ P | F | V ]
|
||||
|
||||
#### Parameters
|
||||
- `P` - Pin (0-255)
|
||||
- `F` - Function in/out (0/1)
|
||||
- `V` - Value (0/1)
|
||||
*/
|
||||
void dcode_4()
|
||||
{
|
||||
LOG("D4 - Read/Write PIN\n");
|
||||
|
@ -286,8 +357,27 @@ void dcode_4()
|
|||
}
|
||||
#endif //DEBUG_DCODES
|
||||
|
||||
#ifdef DEBUG_DCODE5
|
||||
#if defined DEBUG_DCODE5 || defined DEBUG_DCODES
|
||||
|
||||
/*!
|
||||
### D5 - Read/Write FLASH <a href="https://reprap.org/wiki/G-code#D5:_Read.2FWrite_FLASH">D5: Read/Write Flash</a>
|
||||
This command can be used without any additional parameters. It will read the 1kb FLASH.
|
||||
#### Usage
|
||||
|
||||
D5 [ A | C | X | E ]
|
||||
|
||||
#### Parameters
|
||||
- `A` - Address (x00000-x3ffff)
|
||||
- `C` - Count (1-8192)
|
||||
- `X` - Data (hex)
|
||||
- `E` - Erase
|
||||
|
||||
#### Notes
|
||||
- The hex address needs to be lowercase without the 0 before the x
|
||||
- Count is decimal
|
||||
- The hex data needs to be lowercase
|
||||
|
||||
*/
|
||||
void dcode_5()
|
||||
{
|
||||
printf_P(PSTR("D5 - Read/Write FLASH\n"));
|
||||
|
@ -327,8 +417,7 @@ void dcode_5()
|
|||
boot_dst_addr = (uint32_t)address;
|
||||
boot_src_addr = (uint32_t)(&data);
|
||||
bootapp_print_vars();
|
||||
wdt_enable(WDTO_15MS);
|
||||
while(1);
|
||||
softReset();
|
||||
}
|
||||
while (count)
|
||||
{
|
||||
|
@ -351,11 +440,19 @@ void dcode_5()
|
|||
|
||||
#ifdef DEBUG_DCODES
|
||||
|
||||
/*!
|
||||
### D6 - Read/Write external FLASH <a href="https://reprap.org/wiki/G-code#D6:_Read.2FWrite_external_FLASH">D6: Read/Write external Flash</a>
|
||||
Reserved
|
||||
*/
|
||||
void dcode_6()
|
||||
{
|
||||
LOG("D6 - Read/Write external FLASH\n");
|
||||
}
|
||||
|
||||
/*!
|
||||
### D7 - Read/Write Bootloader <a href="https://reprap.org/wiki/G-code#D7:_Read.2FWrite_Bootloader">D7: Read/Write Bootloader</a>
|
||||
Reserved
|
||||
*/
|
||||
void dcode_7()
|
||||
{
|
||||
LOG("D7 - Read/Write Bootloader\n");
|
||||
|
@ -366,11 +463,22 @@ void dcode_7()
|
|||
boot_copy_size = (uint16_t)0xc00;
|
||||
boot_src_addr = (uint32_t)0x0003e400;
|
||||
boot_dst_addr = (uint32_t)0x0003f400;
|
||||
wdt_enable(WDTO_15MS);
|
||||
while(1);
|
||||
softReset();
|
||||
*/
|
||||
}
|
||||
|
||||
/*!
|
||||
### D8 - Read/Write PINDA <a href="https://reprap.org/wiki/G-code#D8:_Read.2FWrite_PINDA">D8: Read/Write PINDA</a>
|
||||
#### Usage
|
||||
|
||||
D8 [ ? | ! | P | Z ]
|
||||
|
||||
#### Parameters
|
||||
- `?` - Read PINDA temperature shift values
|
||||
- `!` - Reset PINDA temperature shift values to default
|
||||
- `P` - Pinda temperature [C]
|
||||
- `Z` - Z Offset [mm]
|
||||
*/
|
||||
void dcode_8()
|
||||
{
|
||||
printf_P(PSTR("D8 - Read/Write PINDA\n"));
|
||||
|
@ -412,6 +520,23 @@ void dcode_8()
|
|||
printf_P(PSTR("temp_pinda=%d offset_z=%d.%03d\n"), (int)temp_pinda, (int)offset_z, ((int)(1000 * offset_z) % 1000));
|
||||
}
|
||||
|
||||
/*!
|
||||
### D9 - Read ADC <a href="https://reprap.org/wiki/G-code#D9:_Read.2FWrite_ADC">D9: Read ADC</a>
|
||||
#### Usage
|
||||
|
||||
D9 [ I | V ]
|
||||
|
||||
#### Parameters
|
||||
- `I` - ADC channel index
|
||||
- `0` - Heater 0 temperature
|
||||
- `1` - Heater 1 temperature
|
||||
- `2` - Bed temperature
|
||||
- `3` - PINDA temperature
|
||||
- `4` - PWR voltage
|
||||
- `5` - Ambient temperature
|
||||
- `6` - BED voltage
|
||||
- `V` Value to be written as simulated
|
||||
*/
|
||||
const char* dcode_9_ADC_name(uint8_t i)
|
||||
{
|
||||
switch (i)
|
||||
|
@ -485,55 +610,178 @@ void dcode_9()
|
|||
}
|
||||
}
|
||||
|
||||
/*!
|
||||
### D10 - Set XYZ calibration = OK <a href="https://reprap.org/wiki/G-code#D10:_Set_XYZ_calibration_.3D_OK">D10: Set XYZ calibration = OK</a>
|
||||
*/
|
||||
void dcode_10()
|
||||
{//Tell the printer that XYZ calibration went OK
|
||||
LOG("D10 - XYZ calibration = OK\n");
|
||||
calibration_status_store(CALIBRATION_STATUS_LIVE_ADJUST);
|
||||
}
|
||||
|
||||
/*!
|
||||
### D12 - Time <a href="https://reprap.org/wiki/G-code#D12:_Time">D12: Time</a>
|
||||
Writes the current time in the log file.
|
||||
*/
|
||||
|
||||
void dcode_12()
|
||||
{//Time
|
||||
LOG("D12 - Time\n");
|
||||
|
||||
}
|
||||
|
||||
#ifdef HEATBED_ANALYSIS
|
||||
/*!
|
||||
### D80 - Bed check <a href="https://reprap.org/wiki/G-code#D80:_Bed_check">D80: Bed check</a>
|
||||
This command will log data to SD card file "mesh.txt".
|
||||
#### Usage
|
||||
|
||||
D80 [ E | F | G | H | I | J ]
|
||||
|
||||
#### Parameters
|
||||
- `E` - Dimension X (default 40)
|
||||
- `F` - Dimention Y (default 40)
|
||||
- `G` - Points X (default 40)
|
||||
- `H` - Points Y (default 40)
|
||||
- `I` - Offset X (default 74)
|
||||
- `J` - Offset Y (default 34)
|
||||
*/
|
||||
void dcode_80()
|
||||
{
|
||||
float dimension_x = 40;
|
||||
float dimension_y = 40;
|
||||
int points_x = 40;
|
||||
int points_y = 40;
|
||||
float offset_x = 74;
|
||||
float offset_y = 33;
|
||||
|
||||
if (code_seen('E')) dimension_x = code_value();
|
||||
if (code_seen('F')) dimension_y = code_value();
|
||||
if (code_seen('G')) {points_x = code_value(); }
|
||||
if (code_seen('H')) {points_y = code_value(); }
|
||||
if (code_seen('I')) {offset_x = code_value(); }
|
||||
if (code_seen('J')) {offset_y = code_value(); }
|
||||
printf_P(PSTR("DIM X: %f\n"), dimension_x);
|
||||
printf_P(PSTR("DIM Y: %f\n"), dimension_y);
|
||||
printf_P(PSTR("POINTS X: %d\n"), points_x);
|
||||
printf_P(PSTR("POINTS Y: %d\n"), points_y);
|
||||
printf_P(PSTR("OFFSET X: %f\n"), offset_x);
|
||||
printf_P(PSTR("OFFSET Y: %f\n"), offset_y);
|
||||
bed_check(dimension_x,dimension_y,points_x,points_y,offset_x,offset_y);
|
||||
}
|
||||
|
||||
|
||||
/*!
|
||||
### D81 - Bed analysis <a href="https://reprap.org/wiki/G-code#D81:_Bed_analysis">D80: Bed analysis</a>
|
||||
This command will log data to SD card file "wldsd.txt".
|
||||
#### Usage
|
||||
|
||||
D81 [ E | F | G | H | I | J ]
|
||||
|
||||
#### Parameters
|
||||
- `E` - Dimension X (default 40)
|
||||
- `F` - Dimention Y (default 40)
|
||||
- `G` - Points X (default 40)
|
||||
- `H` - Points Y (default 40)
|
||||
- `I` - Offset X (default 74)
|
||||
- `J` - Offset Y (default 34)
|
||||
*/
|
||||
void dcode_81()
|
||||
{
|
||||
float dimension_x = 40;
|
||||
float dimension_y = 40;
|
||||
int points_x = 40;
|
||||
int points_y = 40;
|
||||
float offset_x = 74;
|
||||
float offset_y = 33;
|
||||
|
||||
if (code_seen('E')) dimension_x = code_value();
|
||||
if (code_seen('F')) dimension_y = code_value();
|
||||
if (code_seen("G")) { strchr_pointer+=1; points_x = code_value(); }
|
||||
if (code_seen("H")) { strchr_pointer+=1; points_y = code_value(); }
|
||||
if (code_seen("I")) { strchr_pointer+=1; offset_x = code_value(); }
|
||||
if (code_seen("J")) { strchr_pointer+=1; offset_y = code_value(); }
|
||||
|
||||
bed_analysis(dimension_x,dimension_y,points_x,points_y,offset_x,offset_y);
|
||||
|
||||
}
|
||||
|
||||
#endif //HEATBED_ANALYSIS
|
||||
|
||||
/*!
|
||||
### D106 - Print measured fan speed for different pwm values <a href="https://reprap.org/wiki/G-code#D106:_Print_measured_fan_speed_for_different_pwm_values">D106: Print measured fan speed for different pwm values</a>
|
||||
*/
|
||||
void dcode_106()
|
||||
{
|
||||
for (int i = 255; i > 0; i = i - 5) {
|
||||
fanSpeed = i;
|
||||
//delay_keep_alive(2000);
|
||||
for (int j = 0; j < 100; j++) {
|
||||
delay_keep_alive(100);
|
||||
}
|
||||
printf_P(_N("%d: %d\n"), i, fan_speed[1]);
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef TMC2130
|
||||
#include "planner.h"
|
||||
#include "tmc2130.h"
|
||||
extern void st_synchronize();
|
||||
/**
|
||||
* @brief D2130 Trinamic stepper controller
|
||||
* D2130<axis><command>[subcommand][value]
|
||||
* * Axis
|
||||
* * * 'X'
|
||||
* * * 'Y'
|
||||
* * * 'Z'
|
||||
* * * 'E'
|
||||
* * command
|
||||
* * * '0' current off
|
||||
* * * '1' current on
|
||||
* * * '+' single step
|
||||
* * * * value sereval steps
|
||||
* * * '-' dtto oposite direction
|
||||
* * * '?' read register
|
||||
* * * * "mres"
|
||||
* * * * "step"
|
||||
* * * * "mscnt"
|
||||
* * * * "mscuract"
|
||||
* * * * "wave"
|
||||
* * * '!' set register
|
||||
* * * * "mres"
|
||||
* * * * "step"
|
||||
* * * * "wave"
|
||||
* * * * *0, 180..250 meaning: off, 0.9..1.25, recommended value is 1.1
|
||||
* * * '@' home calibrate axis
|
||||
*
|
||||
* Example:
|
||||
* D2130E?wave //print extruder microstep linearity compensation curve
|
||||
* D2130E!wave0 //disable extruder linearity compensation curve, (sine curve is used)
|
||||
* D2130E!wave220 // (sin(x))^1.1 extruder microstep compensation curve used
|
||||
*/
|
||||
/*!
|
||||
### D2130 - Trinamic stepper controller <a href="https://reprap.org/wiki/G-code#D2130:_Trinamic_stepper_controller">D2130: Trinamic stepper controller</a>
|
||||
@todo Please review by owner of the code. RepRap Wiki Gcode needs to be updated after review of owner as well.
|
||||
|
||||
#### Usage
|
||||
|
||||
D2130 [ Axis | Command | Subcommand | Value ]
|
||||
|
||||
#### Parameters
|
||||
- Axis
|
||||
- `X` - X stepper driver
|
||||
- `Y` - Y stepper driver
|
||||
- `Z` - Z stepper driver
|
||||
- `E` - Extruder stepper driver
|
||||
- Commands
|
||||
- `0` - Current off
|
||||
- `1` - Current on
|
||||
- `+` - Single step
|
||||
- `-` - Single step oposite direction
|
||||
- `NNN` - Value sereval steps
|
||||
- `?` - Read register
|
||||
- Subcommands for read register
|
||||
- `mres` - Micro step resolution. More information in datasheet '5.5.2 CHOPCONF – Chopper Configuration'
|
||||
- `step` - Step
|
||||
- `mscnt` - Microstep counter. More information in datasheet '5.5 Motor Driver Registers'
|
||||
- `mscuract` - Actual microstep current for motor. More information in datasheet '5.5 Motor Driver Registers'
|
||||
- `wave` - Microstep linearity compensation curve
|
||||
- `!` - Set register
|
||||
- Subcommands for set register
|
||||
- `mres` - Micro step resolution
|
||||
- `step` - Step
|
||||
- `wave` - Microstep linearity compensation curve
|
||||
- Values for set register
|
||||
- `0, 180 --> 250` - Off
|
||||
- `0.9 --> 1.25` - Valid values (recommended is 1.1)
|
||||
- `@` - Home calibrate axis
|
||||
|
||||
Examples:
|
||||
|
||||
D2130E?wave
|
||||
|
||||
Print extruder microstep linearity compensation curve
|
||||
|
||||
D2130E!wave0
|
||||
|
||||
Disable extruder linearity compensation curve, (sine curve is used)
|
||||
|
||||
D2130E!wave220
|
||||
|
||||
(sin(x))^1.1 extruder microstep compensation curve used
|
||||
|
||||
Notes:
|
||||
For more information see https://www.trinamic.com/fileadmin/assets/Products/ICs_Documents/TMC2130_datasheet.pdf
|
||||
*
|
||||
*/
|
||||
void dcode_2130()
|
||||
{
|
||||
printf_P(PSTR("D2130 - TMC2130\n"));
|
||||
|
@ -636,6 +884,20 @@ void dcode_2130()
|
|||
#endif //TMC2130
|
||||
|
||||
#ifdef PAT9125
|
||||
/*!
|
||||
### D9125 - PAT9125 filament sensor <a href="https://reprap.org/wiki/G-code#D9:_Read.2FWrite_ADC">D9125: PAT9125 filament sensor</a>
|
||||
#### Usage
|
||||
|
||||
D9125 [ ? | ! | R | X | Y | L ]
|
||||
|
||||
#### Parameters
|
||||
- `?` - Print values
|
||||
- `!` - Print values
|
||||
- `R` - Resolution. Not active in code
|
||||
- `X` - X values
|
||||
- `Y` - Y values
|
||||
- `L` - Activate filament sensor log
|
||||
*/
|
||||
void dcode_9125()
|
||||
{
|
||||
LOG("D9125 - PAT9125\n");
|
||||
|
@ -668,11 +930,13 @@ void dcode_9125()
|
|||
pat9125_y = (int)code_value();
|
||||
LOG("pat9125_y=%d\n", pat9125_y);
|
||||
}
|
||||
#ifdef DEBUG_FSENSOR_LOG
|
||||
if (code_seen('L'))
|
||||
{
|
||||
fsensor_log = (int)code_value();
|
||||
LOG("fsensor_log=%d\n", fsensor_log);
|
||||
}
|
||||
#endif //DEBUG_FSENSOR_LOG
|
||||
}
|
||||
#endif //PAT9125
|
||||
|
||||
|
|
|
@ -2,26 +2,40 @@
|
|||
#define DCODES_H
|
||||
|
||||
extern void dcode__1(); //D-1 - Endless loop (to simulate deadlock)
|
||||
|
||||
extern void dcode_0(); //D0 - Reset
|
||||
extern void dcode_1(); //D1 - Clear EEPROM
|
||||
extern void dcode_2(); //D2 - Read/Write RAM
|
||||
|
||||
#if defined DEBUG_DCODE3 || defined DEBUG_DCODES
|
||||
extern void dcode_3(); //D3 - Read/Write EEPROM
|
||||
#endif //DEBUG_DCODE3
|
||||
|
||||
extern void dcode_4(); //D4 - Read/Write PIN
|
||||
|
||||
#if defined DEBUG_DCODE5 || defined DEBUG_DCODES
|
||||
extern void dcode_5(); //D5 - Read/Write FLASH
|
||||
#endif //DEBUG_DCODE5
|
||||
|
||||
extern void dcode_6(); //D6 - Read/Write external FLASH
|
||||
extern void dcode_7(); //D7 - Read/Write Bootloader
|
||||
extern void dcode_8(); //D8 - Read/Write PINDA
|
||||
extern void dcode_9(); //D9 - Read/Write ADC (Write=enable simulated, Read=disable simulated)
|
||||
|
||||
extern void dcode_10(); //D10 - XYZ calibration = OK
|
||||
extern void dcode_12(); //D12 - Log time. Writes the current time in the log file.
|
||||
|
||||
#ifdef HEATBED_ANALYSIS
|
||||
extern void dcode_80(); //D80 - Bed check. This command will log data to SD card file "mesh.txt".
|
||||
extern void dcode_81(); //D81 - Bed analysis. This command will log data to SD card file "wldsd.txt".
|
||||
#endif //HEATBED_ANALYSIS
|
||||
|
||||
extern void dcode_106(); //D106 - Print measured fan speed for different pwm values
|
||||
|
||||
#ifdef TMC2130
|
||||
extern void dcode_2130(); //D2130 - TMC2130
|
||||
extern void dcode_2130(); //D2130 - TMC2130
|
||||
#endif //TMC2130
|
||||
|
||||
#ifdef PAT9125
|
||||
extern void dcode_9125(); //D9125 - PAT9125
|
||||
extern void dcode_9125(); //D9125 - PAT9125
|
||||
#endif //PAT9125
|
||||
|
||||
|
||||
|
|
|
@ -146,40 +146,39 @@ void manage_inactivity(bool ignore_stepper_queue=false);
|
|||
#if defined(Z_ENABLE_PIN) && Z_ENABLE_PIN > -1
|
||||
#if defined(Z_AXIS_ALWAYS_ON)
|
||||
#ifdef Z_DUAL_STEPPER_DRIVERS
|
||||
#define enable_z() { WRITE(Z_ENABLE_PIN, Z_ENABLE_ON); WRITE(Z2_ENABLE_PIN, Z_ENABLE_ON); }
|
||||
#define disable_z() { WRITE(Z_ENABLE_PIN,!Z_ENABLE_ON); WRITE(Z2_ENABLE_PIN,!Z_ENABLE_ON); axis_known_position[Z_AXIS] = false; }
|
||||
#define poweron_z() { WRITE(Z_ENABLE_PIN, Z_ENABLE_ON); WRITE(Z2_ENABLE_PIN, Z_ENABLE_ON); }
|
||||
#define poweroff_z() { WRITE(Z_ENABLE_PIN,!Z_ENABLE_ON); WRITE(Z2_ENABLE_PIN,!Z_ENABLE_ON); axis_known_position[Z_AXIS] = false; }
|
||||
#else
|
||||
#define enable_z() WRITE(Z_ENABLE_PIN, Z_ENABLE_ON)
|
||||
#define disable_z() {}
|
||||
#define poweron_z() WRITE(Z_ENABLE_PIN, Z_ENABLE_ON)
|
||||
#define poweroff_z() {}
|
||||
#endif
|
||||
#else
|
||||
#ifdef Z_DUAL_STEPPER_DRIVERS
|
||||
#define enable_z() { WRITE(Z_ENABLE_PIN, Z_ENABLE_ON); WRITE(Z2_ENABLE_PIN, Z_ENABLE_ON); }
|
||||
#define disable_z() { WRITE(Z_ENABLE_PIN,!Z_ENABLE_ON); WRITE(Z2_ENABLE_PIN,!Z_ENABLE_ON); axis_known_position[Z_AXIS] = false; }
|
||||
#define poweron_z() { WRITE(Z_ENABLE_PIN, Z_ENABLE_ON); WRITE(Z2_ENABLE_PIN, Z_ENABLE_ON); }
|
||||
#define poweroff_z() { WRITE(Z_ENABLE_PIN,!Z_ENABLE_ON); WRITE(Z2_ENABLE_PIN,!Z_ENABLE_ON); axis_known_position[Z_AXIS] = false; }
|
||||
#else
|
||||
#define enable_z() WRITE(Z_ENABLE_PIN, Z_ENABLE_ON)
|
||||
#define disable_z() { WRITE(Z_ENABLE_PIN,!Z_ENABLE_ON); axis_known_position[Z_AXIS] = false; }
|
||||
#define poweron_z() WRITE(Z_ENABLE_PIN, Z_ENABLE_ON)
|
||||
#define poweroff_z() { WRITE(Z_ENABLE_PIN,!Z_ENABLE_ON); axis_known_position[Z_AXIS] = false; }
|
||||
#endif
|
||||
#endif
|
||||
#else
|
||||
#define enable_z() {}
|
||||
#define disable_z() {}
|
||||
#define poweron_z() {}
|
||||
#define poweroff_z() {}
|
||||
#endif
|
||||
|
||||
#ifdef PSU_Delta
|
||||
#ifndef PSU_Delta
|
||||
#define enable_z() poweron_z()
|
||||
#define disable_z() poweroff_z()
|
||||
#else
|
||||
void init_force_z();
|
||||
void check_force_z();
|
||||
#undef disable_z
|
||||
#define disable_z() disable_force_z()
|
||||
void disable_force_z();
|
||||
#undef enable_z
|
||||
#define enable_z() enable_force_z()
|
||||
void enable_force_z();
|
||||
void disable_force_z();
|
||||
#define enable_z() enable_force_z()
|
||||
#define disable_z() disable_force_z()
|
||||
#endif // PSU_Delta
|
||||
|
||||
|
||||
|
||||
|
||||
//#if defined(Z_ENABLE_PIN) && Z_ENABLE_PIN > -1
|
||||
//#ifdef Z_DUAL_STEPPER_DRIVERS
|
||||
//#define enable_z() { WRITE(Z_ENABLE_PIN, Z_ENABLE_ON); WRITE(Z2_ENABLE_PIN, Z_ENABLE_ON); }
|
||||
|
@ -239,8 +238,8 @@ void get_coordinates();
|
|||
void prepare_move();
|
||||
void kill(const char *full_screen_message = NULL, unsigned char id = 0);
|
||||
void Stop();
|
||||
|
||||
bool IsStopped();
|
||||
void finishAndDisableSteppers();
|
||||
|
||||
//put an ASCII command at the end of the current buffer.
|
||||
void enquecommand(const char *cmd, bool from_progmem = false);
|
||||
|
@ -295,12 +294,12 @@ void setPwmFrequency(uint8_t pin, int val);
|
|||
|
||||
extern bool fans_check_enabled;
|
||||
extern float homing_feedrate[];
|
||||
extern bool axis_relative_modes[];
|
||||
extern uint8_t axis_relative_modes;
|
||||
extern float feedrate;
|
||||
extern int feedmultiply;
|
||||
extern int extrudemultiply; // Sets extrude multiply factor (in percent) for all extruders
|
||||
extern int extruder_multiply[EXTRUDERS]; // sets extrude multiply factor (in percent) for each extruder individually
|
||||
extern float volumetric_multiplier[EXTRUDERS]; // reciprocal of cross-sectional area of filament (in square millimeters), stored this way to reduce computational burden in planner
|
||||
extern float extruder_multiplier[EXTRUDERS]; // reciprocal of cross-sectional area of filament (in square millimeters), stored this way to reduce computational burden in planner
|
||||
extern float current_position[NUM_AXIS] ;
|
||||
extern float destination[NUM_AXIS] ;
|
||||
extern float min_pos[3];
|
||||
|
@ -308,6 +307,7 @@ extern float max_pos[3];
|
|||
extern bool axis_known_position[3];
|
||||
extern int fanSpeed;
|
||||
extern int8_t lcd_change_fil_state;
|
||||
extern float default_retraction;
|
||||
|
||||
#ifdef TMC2130
|
||||
void homeaxis(int axis, uint8_t cnt = 1, uint8_t* pstep = 0);
|
||||
|
@ -334,7 +334,6 @@ extern unsigned long stoptime;
|
|||
extern int bowden_length[4];
|
||||
extern bool is_usb_printing;
|
||||
extern bool homing_flag;
|
||||
extern bool temp_cal_active;
|
||||
extern bool loading_flag;
|
||||
extern unsigned int usb_printing_counter;
|
||||
|
||||
|
@ -444,9 +443,8 @@ void setup_uvlo_interrupt();
|
|||
void setup_fan_interrupt();
|
||||
#endif
|
||||
|
||||
//extern void recover_machine_state_after_power_panic();
|
||||
extern void recover_machine_state_after_power_panic(bool bTiny);
|
||||
extern void restore_print_from_eeprom();
|
||||
extern bool recover_machine_state_after_power_panic();
|
||||
extern void restore_print_from_eeprom(bool mbl_was_active);
|
||||
extern void position_menu();
|
||||
|
||||
extern void print_world_coordinates();
|
||||
|
@ -514,4 +512,6 @@ void load_filament_final_feed();
|
|||
void marlin_wait_for_click();
|
||||
void raise_z_above(float target, bool plan=true);
|
||||
|
||||
extern "C" void softReset();
|
||||
|
||||
#endif
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -9,6 +9,8 @@
|
|||
extern FILE _uartout;
|
||||
#define uartout (&_uartout)
|
||||
|
||||
extern void softReset();
|
||||
|
||||
void bootapp_print_vars(void)
|
||||
{
|
||||
fprintf_P(uartout, PSTR("boot_src_addr =0x%08lx\n"), boot_src_addr);
|
||||
|
@ -39,8 +41,7 @@ void bootapp_ram2flash(uint16_t rptr, uint16_t fptr, uint16_t size)
|
|||
boot_src_addr = (uint32_t)rptr;
|
||||
boot_dst_addr = (uint32_t)fptr;
|
||||
bootapp_print_vars();
|
||||
wdt_enable(WDTO_15MS);
|
||||
while(1);
|
||||
softReset();
|
||||
}
|
||||
|
||||
void bootapp_reboot_user0(uint8_t reserved)
|
||||
|
@ -50,6 +51,5 @@ void bootapp_reboot_user0(uint8_t reserved)
|
|||
boot_app_flags = BOOT_APP_FLG_USER0;
|
||||
boot_reserved = reserved;
|
||||
bootapp_print_vars();
|
||||
wdt_enable(WDTO_15MS);
|
||||
while(1);
|
||||
softReset();
|
||||
}
|
||||
|
|
|
@ -136,8 +136,17 @@ void CardReader::lsDive(const char *prepend, SdFile parent, const char * const m
|
|||
SERIAL_ECHOPGM("Access date: ");
|
||||
MYSERIAL.println(p.lastAccessDate);
|
||||
SERIAL_ECHOLNPGM("");*/
|
||||
modificationDate = p.lastWriteDate;
|
||||
modificationTime = p.lastWriteTime;
|
||||
crmodDate = p.lastWriteDate;
|
||||
crmodTime = p.lastWriteTime;
|
||||
// There are scenarios when simple modification time is not enough (on MS Windows)
|
||||
// For example - extract an old g-code from an archive onto the SD card.
|
||||
// In such case the creation time is current time (which is correct), but the modification time
|
||||
// stays the same - i.e. old.
|
||||
// Therefore let's pick the most recent timestamp from both creation and modification timestamps
|
||||
if( crmodDate < p.creationDate || ( crmodDate == p.creationDate && crmodTime < p.creationTime ) ){
|
||||
crmodDate = p.creationDate;
|
||||
crmodTime = p.creationTime;
|
||||
}
|
||||
//writeDate = p.lastAccessDate;
|
||||
if (match != NULL) {
|
||||
if (strcasecmp(match, filename) == 0) return;
|
||||
|
@ -322,7 +331,7 @@ void CardReader::diveSubfolder (const char *fileName, SdFile& dir)
|
|||
{
|
||||
SERIAL_PROTOCOLRPGM(MSG_SD_OPEN_FILE_FAIL);
|
||||
SERIAL_PROTOCOL(subdirname);
|
||||
SERIAL_PROTOCOLLNPGM(".");
|
||||
SERIAL_PROTOCOLLN('.');
|
||||
return;
|
||||
}
|
||||
else
|
||||
|
@ -421,7 +430,7 @@ void CardReader::openFile(const char* name,bool read, bool replace_current/*=tru
|
|||
{
|
||||
SERIAL_PROTOCOLRPGM(MSG_SD_OPEN_FILE_FAIL);
|
||||
SERIAL_PROTOCOL(fname);
|
||||
SERIAL_PROTOCOLLNPGM(".");
|
||||
SERIAL_PROTOCOLLN('.');
|
||||
}
|
||||
}
|
||||
else
|
||||
|
@ -430,7 +439,7 @@ void CardReader::openFile(const char* name,bool read, bool replace_current/*=tru
|
|||
{
|
||||
SERIAL_PROTOCOLRPGM(MSG_SD_OPEN_FILE_FAIL);
|
||||
SERIAL_PROTOCOL(fname);
|
||||
SERIAL_PROTOCOLLNPGM(".");
|
||||
SERIAL_PROTOCOLLN('.');
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -487,17 +496,15 @@ void CardReader::getStatus()
|
|||
SERIAL_PROTOCOLLNPGM("Print saved");
|
||||
}
|
||||
else {
|
||||
SERIAL_PROTOCOL(longFilename);
|
||||
SERIAL_PROTOCOLPGM("\n");
|
||||
SERIAL_PROTOCOLLN(longFilename);
|
||||
SERIAL_PROTOCOLRPGM(_N("SD printing byte "));////MSG_SD_PRINTING_BYTE
|
||||
SERIAL_PROTOCOL(sdpos);
|
||||
SERIAL_PROTOCOLPGM("/");
|
||||
SERIAL_PROTOCOL('/');
|
||||
SERIAL_PROTOCOLLN(filesize);
|
||||
uint16_t time = _millis()/60000 - starttime/60000;
|
||||
uint16_t time = ( _millis() - starttime ) / 60000U;
|
||||
SERIAL_PROTOCOL(itostr2(time/60));
|
||||
SERIAL_PROTOCOL(':');
|
||||
SERIAL_PROTOCOL(itostr2(time%60));
|
||||
SERIAL_PROTOCOLPGM("\n");
|
||||
SERIAL_PROTOCOLLN(itostr2(time%60));
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
@ -726,7 +733,7 @@ void CardReader::presort() {
|
|||
// Never sort more than the max allowed
|
||||
// If you use folders to organize, 20 may be enough
|
||||
if (fileCnt > SDSORT_LIMIT) {
|
||||
lcd_show_fullscreen_message_and_wait_P(_i("Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."));////MSG_FILE_CNT c=20 r=4
|
||||
lcd_show_fullscreen_message_and_wait_P(_i("Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."));////MSG_FILE_CNT c=20 r=6
|
||||
fileCnt = SDSORT_LIMIT;
|
||||
}
|
||||
lcd_clear();
|
||||
|
@ -773,8 +780,8 @@ void CardReader::presort() {
|
|||
// retaining only two filenames at a time. This is very
|
||||
// slow but is safest and uses minimal RAM.
|
||||
char name1[LONG_FILENAME_LENGTH + 1];
|
||||
uint16_t modification_time_bckp;
|
||||
uint16_t modification_date_bckp;
|
||||
uint16_t crmod_time_bckp;
|
||||
uint16_t crmod_date_bckp;
|
||||
|
||||
#endif
|
||||
position = 0;
|
||||
|
@ -800,8 +807,8 @@ void CardReader::presort() {
|
|||
#else
|
||||
// Copy filenames into the static array
|
||||
strcpy(sortnames[i], LONGEST_FILENAME);
|
||||
modification_time[i] = modificationTime;
|
||||
modification_date[i] = modificationDate;
|
||||
modification_time[i] = crmodTime;
|
||||
modification_date[i] = crmodDate;
|
||||
#if SDSORT_CACHE_NAMES
|
||||
strcpy(sortshort[i], filename);
|
||||
#endif
|
||||
|
@ -830,8 +837,8 @@ void CardReader::presort() {
|
|||
(modification_date[o1] < modification_date [o2]))
|
||||
#else
|
||||
#define _SORT_CMP_NODIR() (strcasecmp(name1, name2) > 0) //true if lowercase(name1) > lowercase(name2)
|
||||
#define _SORT_CMP_TIME_NODIR() (((modification_date_bckp == modificationDate) && (modification_time_bckp > modificationTime)) || \
|
||||
(modification_date_bckp > modificationDate))
|
||||
#define _SORT_CMP_TIME_NODIR() (((crmod_date_bckp == crmodDate) && (crmod_time_bckp > crmodTime)) || \
|
||||
(crmod_date_bckp > crmodDate))
|
||||
|
||||
#endif
|
||||
|
||||
|
@ -882,8 +889,8 @@ void CardReader::presort() {
|
|||
counter++;
|
||||
getfilename_simple(positions[o1]);
|
||||
strcpy(name1, LONGEST_FILENAME); // save (or getfilename below will trounce it)
|
||||
modification_date_bckp = modificationDate;
|
||||
modification_time_bckp = modificationTime;
|
||||
crmod_date_bckp = crmodDate;
|
||||
crmod_time_bckp = crmodTime;
|
||||
#if HAS_FOLDER_SORTING
|
||||
bool dir1 = filenameIsDir;
|
||||
#endif
|
||||
|
|
|
@ -75,7 +75,9 @@ public:
|
|||
bool sdprinting ;
|
||||
bool cardOK ;
|
||||
char filename[13];
|
||||
uint16_t modificationTime, modificationDate;
|
||||
// There are scenarios when simple modification time is not enough (on MS Windows)
|
||||
// Therefore these timestamps hold the most recent one of creation/modification date/times
|
||||
uint16_t crmodTime, crmodDate;
|
||||
uint32_t cluster, position;
|
||||
char longFilename[LONG_FILENAME_LENGTH];
|
||||
bool filenameIsDir;
|
||||
|
|
|
@ -5,10 +5,12 @@
|
|||
#include "Configuration_prusa.h"
|
||||
#include "pins.h"
|
||||
|
||||
#define IR_SENSOR_ANALOG (defined(VOLT_IR_PIN) && defined(IR_SENSOR))
|
||||
#if (defined(VOLT_IR_PIN) && defined(IR_SENSOR))
|
||||
# define IR_SENSOR_ANALOG
|
||||
#endif
|
||||
|
||||
//ADC configuration
|
||||
#if !IR_SENSOR_ANALOG
|
||||
#ifndef IR_SENSOR_ANALOG
|
||||
#define ADC_CHAN_MSK 0b0000001001011111 //used AD channels bit mask (0,1,2,3,4,6,9)
|
||||
#define ADC_DIDR_MSK 0b0000001001011111 //AD channels DIDR mask (1 ~ disabled digital input)
|
||||
#define ADC_CHAN_CNT 7 //number of used channels)
|
||||
|
@ -34,7 +36,8 @@
|
|||
//#define PAT9125_I2C_ADDR 0x79 //ID=HI
|
||||
//#define PAT9125_I2C_ADDR 0x73 //ID=NC
|
||||
#define PAT9125_XRES 0
|
||||
#define PAT9125_YRES 240
|
||||
#define PAT9125_YRES 240 // maximum resolution (5*X cpi)
|
||||
#define PAT9124_YRES_MM (5*PAT9125_YRES/25.4) // counts per mm
|
||||
|
||||
//SM4 configuration
|
||||
#define SM4_DEFDELAY 500 //default step delay [us]
|
||||
|
@ -55,7 +58,7 @@
|
|||
#define W25X20CL_SPSR SPI_SPSR(W25X20CL_SPI_RATE)
|
||||
|
||||
//LANG - Multi-language support
|
||||
//define LANG_MODE 0 // primary language only
|
||||
//#define LANG_MODE 0 // primary language only
|
||||
#define LANG_MODE 1 // sec. language support
|
||||
|
||||
#define LANG_SIZE_RESERVED 0x3000 // reserved space for secondary language (12288 bytes)
|
||||
|
|
|
@ -1,3 +1,13 @@
|
|||
|
||||
/**
|
||||
* @file
|
||||
* @author 3d-gussner
|
||||
*/
|
||||
/** \ingroup eeprom_table */
|
||||
|
||||
//! _This is a EEPROM table of currently implemented in Prusa firmware (dynamically generated from doxygen)._
|
||||
|
||||
|
||||
#ifndef EEPROM_H
|
||||
#define EEPROM_H
|
||||
|
||||
|
@ -26,6 +36,346 @@ typedef struct
|
|||
#ifdef __cplusplus
|
||||
static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEPROM_SHEETS_SIZEOF.");
|
||||
#endif
|
||||
/** @defgroup eeprom_table EEPROM Table
|
||||
*
|
||||
|
||||
---------------------------------------------------------------------------------
|
||||
EEPROM 8-bit Empty value = 0xFFh 255
|
||||
|
||||
EEPROM 16-bit Empty value = 0xFFFFh 65535
|
||||
|
||||
_Italic = unused or default_
|
||||
|
||||
__Bold = Status__
|
||||
|
||||
In Default/FactoryReset column the
|
||||
|
||||
- __L__ Language
|
||||
- __S__ Statistics
|
||||
- __P__ Shipping prep
|
||||
- __S/P__ Statistics and Shipping prep
|
||||
|
||||
will overwrite existing values to 0 or default.
|
||||
A FactoryReset All Data will overwrite the whole EEPROM with ffh and some values will be initialized automatically,
|
||||
others need a reset / reboot.
|
||||
|
||||
---------------------------------------------------------------------------------
|
||||
How can you use the debug codes?
|
||||
- Serial terminal like Putty.
|
||||
- Octoprint does support D-codes
|
||||
- _Pronterface_ does __not__ support D-codes
|
||||
|
||||
### !!! D-codes are case sensitive so please don't use upper case A,C or X in the address you want to read !!!
|
||||
|
||||
#### Useful tools/links:
|
||||
To convert hex to ascii https://www.rapidtables.com/convert/number/hex-to-ascii.html
|
||||
|
||||
To convert hex to dec https://www.rapidtables.com/convert/number/hex-to-decimal.html
|
||||
|
||||
Version: 1.0.1
|
||||
|
||||
---------------------------------------------------------------------------------
|
||||
|
||||
|
||||
| Address begin | Bit/Type | Name | Valid values | Default/FactoryReset | Description | Gcode/Function| Debug code
|
||||
| :-- | :-- | :-- | :--: | :--: | :-- | :--: | :--:
|
||||
| 0x0FFFh 4095 | uchar | EEPROM_SILENT | 00h 0 | ffh 255 | TMC Stealth mode: __off__ / miniRambo Power mode | LCD menu | D3 Ax0fff C1
|
||||
| ^ | ^ | ^ | 01h 1 | ^ | TMC Stealth mode: __on__ / miniRambo Silent mode | ^ | ^
|
||||
| ^ | ^ | ^ | 02h 2 | ^ | miniRambo Auto mode | ^ | ^
|
||||
| 0x0FFEh 4094 | uchar | EEPROM_LANG | 00h 0 | ffh 255 __L__ | English / LANG_ID_PRI | LCD menu | D3 Ax0ffe C1
|
||||
| ^ | ^ | ^ | 01h 1 | ^ | Other language LANG_ID_SEC | ^ | ^
|
||||
| 0x0FFCh 4092 | uint16 | EEPROM_BABYSTEP_X | ??? | ff ffh 65535 | Babystep for X axis _unsued_ | ??? | D3 Ax0ffc C2
|
||||
| 0x0FFAh 4090 | uint16 | EEPROM_BABYSTEP_Y | ??? | ff ffh 65535 | Babystep for Y axis _unsued_ | ^ | D3 Ax0ffa C2
|
||||
| 0x0FF8h 4088 | uint16 | EEPROM_BABYSTEP_Z | ??? | ff ffh 65535 | Babystep for Z axis _lagacy_ | ^ | D3 Ax0ff8 C2
|
||||
| ^ | ^ | ^ | ^ | ^ | multiple values stored now in EEPROM_Sheets_base | ^ | ^
|
||||
| 0x0FF7h 4087 | uint8 | EEPROM_CALIBRATION_STATUS | ffh 255 | ffh 255 | Assembled _default_ | ??? | D3 Ax0ff7 C1
|
||||
| ^ | ^ | ^ | 01h 1 | ^ | Calibrated | ^ | ^
|
||||
| ^ | ^ | ^ | e6h 230 | ^ | needs Live Z adjustment | ^ | ^
|
||||
| ^ | ^ | ^ | f0h 240 | ^ __P__ | needs Z calibration | ^ | ^
|
||||
| ^ | ^ | ^ | fah 250 | ^ | needs XYZ calibration | ^ | ^
|
||||
| ^ | ^ | ^ | 00h 0 | ^ | Unknown | ^ | ^
|
||||
| 0x0FF5h 4085 | uint16 | EEPROM_BABYSTEP_Z0 | ??? | ff ffh 65535 | Babystep for Z ??? | ??? | D3 Ax0ff5 C2
|
||||
| 0x0FF1h 4081 | uint32 | EEPROM_FILAMENTUSED | ??? | 00 00 00 00h 0 __S/P__| Filament used in meters | ??? | D3 Ax0ff1 C4
|
||||
| 0x0FEDh 4077 | uint32 | EEPROM_TOTALTIME | ??? | 00 00 00 00h 0 __S/P__| Total print time | ??? | D3 Ax0fed C4
|
||||
| 0x0FE5h 4069 | float | EEPROM_BED_CALIBRATION_CENTER | ??? | ff ff ff ffh | ??? | ??? | D3 Ax0fe5 C8
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| 0x0FDDh 4061 | float | EEPROM_BED_CALIBRATION_VEC_X | ??? | ff ff ff ffh | ??? | ??? | D3 Ax0fdd C8
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| 0x0FD5h 4053 | float | EEPROM_BED_CALIBRATION_VEC_Y | ??? | ff ff ff ffh | ??? | ??? | D3 Ax0fd5 C8
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| 0x0FC5h 4037 | int16 | EEPROM_BED_CALIBRATION_Z_JITTER | ??? | ff ffh 65535 | ??? | ??? | D3 Ax0fc5 C16
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| 0x0FC4h 4036 | bool | EEPROM_FARM_MODE | 00h 0 | ffh 255 __P__ | Prusa farm mode: __off__ | G99 | D3 Ax0fc4 C1
|
||||
| ^ | ^ | ^ | 01h 1 | ^ | Prusa farm mode: __on__ | G98 | ^
|
||||
| 0x0FC3h 4035 | free | _EEPROM_FREE_NR1_ | ??? | ffh 255 | _Free EEPROM space_ | _free space_ | D3 Ax0fc3 C1
|
||||
| 0x0FC1h 4033 | ??? | EEPROM_FARM_NUMBER | 000-999 | ff ffh / 000 __P__ | Prusa farm number _only 0-9 are allowed: 000-999_ | LCD menu | D3 Ax0fc1 C2
|
||||
| 0x0FC0h 4032 | bool | EEPROM_BED_CORRECTION_VALID | 00h 0 | 00h 0 | Bed correction invalid | ??? | D3 Ax0fc0 C1
|
||||
| ^ | ^ | ^ | ffh 255 | | Bed correction valid | ??? | ^
|
||||
| 0x0FBFh 4031 | char | EEPROM_BED_CORRECTION_LEFT | 00h ffh | 00h 0 | Bed manual correction left | LCD menu | D3 Ax0fbf C1
|
||||
| ^ | ^ | ^ | ^ | ^ | At this moment limited to +-100um | G80 Lxxx | ^
|
||||
| 0x0FBEh 4030 | char | EEPROM_BED_CORRECTION_RIGHT | 00h ffh | 00h 0 | Bed manual correction right | LCD menu | D3 Ax0fbe C1
|
||||
| ^ | ^ | ^ | ^ | ^ | At this moment limited to +-100um | G80 Rxxx | ^
|
||||
| 0x0FBDh 4029 | char | EEPROM_BED_CORRECTION_FRONT | 00h ffh | 00h 0 | Bed manual correction front | LCD menu | D3 Ax0fbd C1
|
||||
| ^ | ^ | ^ | ^ | ^ | At this moment limited to +-100um | G80 Fxxx | ^
|
||||
| 0x0FBCh 4028 | char | EEPROM_BED_CORRECTION_BACK | 00h ffh | 00h 0 | Bed manual correction back | LCD menu | D3 Ax0fbc C1
|
||||
| ^ | ^ | ^ | ^ | ^ | At this moment limited to +-100um | G80 Bxxx | ^
|
||||
| 0x0FBBh 4027 | bool | EEPROM_TOSHIBA_FLASH_AIR_COMPATIBLITY | 00h 0 | ffh 255 | Toshiba Air: __off__ | LCD menu | D3 Ax0fbb C1
|
||||
| ^ | ^ | ^ | 01h 1 | ^ | Toshiba Air: __on__ | ^ | ^
|
||||
| 0x0FBAh 4026 | uchar | EEPROM_PRINT_FLAG | ??? | ??? | _unsued_ | ??? | D3 Ax0fba C1
|
||||
| 0x0FB0h 4016 | int16 | EEPROM_PROBE_TEMP_SHIFT | ??? | ??? | ??? | ??? | D3 Ax0fb0 C10
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| 0x0FAFh 4015 | bool | EEPROM_TEMP_CAL_ACTIVE | 00h 0 | 00h 0 | PINDA Temp cal.: __inactive__ | LCD menu | D3 Ax0faf C1
|
||||
| ^ | ^ | ^ | ffh 255 | ^ | PINDA Temp cal.: __active__ | ^ | ^
|
||||
| 0x0FA7h 4007 | uint32 | EEPROM_BOWDEN_LENGTH | ??? | ff 00 00 00h | Bowden length | ??? | D3 Ax0fae C8
|
||||
| ^ | ^ | ^ | ^ | 00 00 00 00h | ^ | ^ | ^
|
||||
| 0x0FA6h 4006 | uint8 | EEPROM_CALIBRATION_STATUS_PINDA | 00h 0 | ffh 255 | PINDA Temp: __not calibrated__ | ??? | D3 Ax0fa6 C1
|
||||
| ^ | ^ | ^ | 01h 1 | ^ | PINDA Temp: __calibrated__ | ^ | ^
|
||||
| 0x0FA5h 4005 | uint8 | EEPROM_UVLO | 00h 0 | ffh 255 | Power Panic flag: __inactive__ | ??? | D3 Ax0fa5 C1
|
||||
| ^ | ^ | ^ | 01h 1 | ^ | Power Panic flag: __active__ | ^ | ^
|
||||
| ^ | ^ | ^ | 02h 2 | ^ | Power Panic flag: __???__ | ^ | ^
|
||||
| 0x0F9Dh 3997 | float | EEPROM_UVLO_CURRENT_POSITION | ??? | ffh 255 | Power Panic position | ??? | D3 Ax0f9d C8
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| 0x0F95h 3989 | char | EEPROM_FILENAME | ??? | ffh 255 | Power Panic Filename | ??? | D3 Ax0f95 C8
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| 0x0F91h 39851 | uint32 | EEPROM_FILE_POSITION | ??? | ff ff ff ffh | Power Panic File Position | ??? | D3 Ax0f91 C4
|
||||
| 0x0F8Dh 3981 | float | EEPROM_UVLO_CURRENT_POSITION_Z | ??? | ff ff ff ffh | Power Panic Z Position | ^ | D3 Ax0f8d C4
|
||||
| 0x0F8Ch 3980 | ??? | EEPROM_UVLO_UNUSED_001 | ??? | ffh 255 | Power Panic _unused_ | ^ | D3 Ax0f8c C1
|
||||
| 0x0F8Bh 3979 | uint8 | EEPROM_UVLO_TARGET_BED | ??? | ffh 255 | Power Panic Bed temperature | ^ | D3 Ax0f8b C1
|
||||
| 0x0F89h 3977 | uint16 | EEPROM_UVLO_FEEDRATE | ??? | ff ffh 65535 | Power Panic Feedrate | ^ | D3 Ax0f89 C2
|
||||
| 0x0F88h 3976 | uint8 | EEPROM_UVLO_FAN_SPEED | ??? | ffh 255 | Power Panic Fan speed | ^ | D3 Ax0f88 C1
|
||||
| 0x0F87h 3975 | uint8 | EEPROM_FAN_CHECK_ENABLED | 00h 0 | ??? | Fan Check __disabled__ | LCD menu | D3 Ax0f87 C1
|
||||
| ^ | ^ | ^ | 01h 1 | ffh 255 | Fan Check __enabled__ | ^ | ^
|
||||
| 0x0F75h 3957 | uint16 | EEPROM_UVLO_MESH_BED_LEVELING | ??? | ff ffh 65535 | Power Panic Mesh Bed Leveling | ??? | D3 Ax0f75 C18
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^
|
||||
| 0x0F73h 3955 | uint16 | EEPROM_UVLO_Z_MICROSTEPS | ??? | ff ffh 65535 | Power Panic Z microsteps | ??? | D3 Ax0f73 C2
|
||||
| 0x0F72h 3954 | uint8 | EEPROM_UVLO_E_ABS | ??? | ffh 255 | Power Panic ??? position | ??? | D3 Ax0f72 C1
|
||||
| 0x0F6Eh 3950 | foat | EEPROM_UVLO_CURRENT_POSITION_E | ??? | ff ff ff ffh | Power Panic E position | ??? | D3 Ax0f6e C4
|
||||
| 0x0F6Dh 3949 | ??? | _EEPROM_FREE_NR2_ | ??? | ffh 255 | _Free EEPROM space_ | _free space_ | D3 Ax0f6d C1
|
||||
| 0x0F6Ch 3948 | ??? | _EEPROM_FREE_NR3_ | ??? | ffh 255 | _Free EEPROM space_ | _free space_ | D3 Ax0f6c C1
|
||||
| 0x0F6Bh 3947 | ??? | _EEPROM_FREE_NR4_ | ??? | ffh 255 | _Free EEPROM space_ | _free space_ | D3 Ax0f6b C1
|
||||
| 0x0F6Ah 3946 | ??? | _EEPROM_FREE_NR5_ | ??? | ffh 255 | _Free EEPROM space_ | _free space_ | D3 Ax0f6a C1
|
||||
| 0x0F69h 3945 | uint8 | EEPROM_CRASH_DET | ffh 255 | ffh 255 | Crash detection: __enabled__ | LCD menu | D3 Ax0f69 C1
|
||||
| ^ | ^ | ^ | 00h 0 | ^ | Crash detection: __disabled__ | LCD menu | ^
|
||||
| 0x0F68h 3944 | uint8 | EEPROM_CRASH_COUNT_Y | 00h-ffh 0-255 | ffh 255 __S/P__ | Crashes detected on y axis | ??? | D3 Ax0f68 C1
|
||||
| 0x0F67h 3943 | uint8 | EEPROM_FSENSOR | 01h 1 | ffh 255 __P__ | Filament sensor: __enabled__ | LCD menu | D3 Ax0f67 C1
|
||||
| ^ | ^ | ^ | 00h 0 | ^ | Filament sensor: __disabled__ | LCD menu | ^
|
||||
| 0x0F65h 3942 | uint8 | EEPROM_CRASH_COUNT_X | 00h-ffh 0-255 | ffh 255 __S/P__ | Crashes detected on x axis | ??? | D3 Ax0f66 C1
|
||||
| 0x0F65h 3941 | uint8 | EEPROM_FERROR_COUNT | 00h-ffh 0-255 | ffh 255 __S/P__ | Filament sensor error counter | ??? | D3 Ax0f65 C1
|
||||
| 0x0F64h 3940 | uint8 | EEPROM_POWER_COUNT | 00h-ffh 0-255 | ffh 255 __S/P__ | Power failure counter | ??? | D3 Ax0f64 C1
|
||||
| 0x0F60h 3936 | float | EEPROM_XYZ_CAL_SKEW | ??? | ff ff ff ffh | XYZ skew value | ??? | D3 Ax0f60 C4
|
||||
| 0x0F5Fh 3935 | uint8 | EEPROM_WIZARD_ACTIVE | 01h 1 | 01h 1 __P__ | Wizard __active__ | ??? | D3 Ax0f5f C1
|
||||
| ^ | ^ | ^ | 00h 0 | ^ | Wizard __inactive__ | ^ | ^
|
||||
| 0x0F5Dh 3933 | uint16 | EEPROM_BELTSTATUS_X | ??? | ff ffh | X Beltstatus | ??? | D3 Ax0f5d C2
|
||||
| 0x0F5Bh 3931 | uint16 | EEPROM_BELTSTATUS_Y | ??? | ff ffh | Y Beltstatus | ??? | D3 Ax0f5b C2
|
||||
| 0x0F5Ah 3930 | uint8 | EEPROM_DIR_DEPTH | 00h-ffh 0-255 | ffh 255 | Directory depth | ??? | D3 Ax0f5a C1
|
||||
| 0x0F0Ah 3850 | uint8 | EEPROM_DIRS | ??? | ffh 255 | Directories ??? | ??? | D3 Ax0f0a C80
|
||||
| 0x0F09h 3849 | uint8 | EEPROM_SD_SORT | 00h 0 | ffh 255 | SD card sort by: __time__ | LCD menu | D3 Ax0f09 C1
|
||||
| ^ | ^ | ^ | 01h 1 | ^ | SD card sort by: __alphabet__ | LCD menu | ^
|
||||
| ^ | ^ | ^ | 02h 1 | ^ | SD card: __not sorted__ | LCD menu | ^
|
||||
| 0x0F08h 3848 | uint8 | EEPROM_SECOND_SERIAL_ACTIVE | 00h 0 | ffh 255 | RPi Port: __disabled__ | LCD menu | D3 Ax0f08 C1
|
||||
| ^ | ^ | ^ | 01h 1 | ^ | RPi Port: __enabled__ | LCD menu | ^
|
||||
| 0x0F07h 3847 | uint8 | EEPROM_FSENS_AUTOLOAD_ENABLED | 01h 1 | ffh 255 __P__ | Filament autoload: __enabled__ | LCD menu | D3 Ax0f07 C1
|
||||
| ^ | ^ | ^ | 00h 0 | ^ | Filament autoload: __disabled__ | LCD menu | ^
|
||||
| 0x0F05h 3845 | uint16 | EEPROM_CRASH_COUNT_X_TOT | 0000-fffe | ff ffh __S/P__ | Total crashes on x axis | ??? | D3 Ax0f05 C2
|
||||
| 0x0F03h 3843 | uint16 | EEPROM_CRASH_COUNT_Y_TOT | 0000-fffe | ff ffh __S/P__ | Total crashes on y axis | ??? | D3 Ax0f03 C2
|
||||
| 0x0F01h 3841 | uint16 | EEPROM_FERROR_COUNT_TOT | 0000-fffe | ff ffh __S/P__ | Total filament sensor errors | ??? | D3 Ax0f01 C2
|
||||
| 0x0EFFh 3839 | uint16 | EEPROM_POWER_COUNT_TOT | 0000-fffe | ff ffh __S/P__ | Total power failures | ??? | D3 Ax0eff C2
|
||||
| 0x0EFEh 3838 | uint8 | EEPROM_TMC2130_HOME_X_ORIGIN | ??? | ffh 255 | ??? | ??? | D3 Ax0efe C1
|
||||
| 0x0EFDh 3837 | uint8 | EEPROM MC2130_HOME_X_BSTEPS | ??? | ffh 255 | ??? | ??? | D3 Ax0efd C1
|
||||
| 0x0EFCh 3836 | uint8 | EEPROM_TMC2130_HOME_X_FSTEPS | ??? | ffh 255 | ??? | ??? | D3 Ax0efc C1
|
||||
| 0x0EFBh 3835 | uint8 | EEPROM_TMC2130_HOME_Y_ORIGIN | ??? | ffh 255 | ??? | ??? | D3 Ax0efb C1
|
||||
| 0x0EFAh 3834 | uint8 | EEPROM_TMC2130_HOME_Y_BSTEPS | ??? | ffh 255 | ??? | ??? | D3 Ax0efa C1
|
||||
| 0x0EF9h 3833 | uint8 | EEPROM_TMC2130_HOME_Y_FSTEPS | ??? | ffh 255 | ??? | ??? | D3 Ax0ef9 C1
|
||||
| 0x0EF8h 3832 | uint8 | EEPROM_TMC2130_HOME_ENABLED | ??? | ffh 255 | ??? | ??? | D3 Ax0ef8 C1
|
||||
| 0x0EF7h 3831 | uint8 | EEPROM_TMC2130_WAVE_X_FAC | ??? | ffh 255 | ??? | ??? | D3 Ax0ef7 C1
|
||||
| 0x0EF6h 3830 | uint8 | EEPROM_TMC2130_WAVE_Y_FAC | ??? | ffh 255 | ??? | ??? | D3 Ax0ef6 C1
|
||||
| 0x0EF5h 3829 | uint8 | EEPROM_TMC2130_WAVE_Z_FAC | ??? | ffh 255 | ??? | ??? | D3 Ax0ef5 C1
|
||||
| 0x0EF4h 3828 | uint8 | EEPROM_TMC2130_WAVE_E_FAC | ??? | ffh 255 | ??? | ??? | D3 Ax0ef4 C1
|
||||
| 0x0EF3h 3827 | uint8 | EEPROM_TMC2130_X_MRES | ??? | ffh 255 | ??? | ??? | D3 Ax0ef3 C1
|
||||
| 0x0EF2h 3826 | uint8 | EEPROM_TMC2130_Y_MRES | ??? | ffh 255 | ??? | ??? | D3 Ax0ef2 C1
|
||||
| 0x0EF1h 3825 | uint8 | EEPROM_TMC2130_Z_MRES | ??? | ffh 255 | ??? | ??? | D3 Ax0ef1 C1
|
||||
| 0x0EF0h 3824 | uint8 | EEPROM_TMC2130_E_MRES | ??? | ffh 255 | ??? | ??? | D3 Ax0ef0 C1
|
||||
| 0x0EEE 3822 | uint16 | EEPROM_PRINTER_TYPE | ??? | ff ffh 65535 | Printer Type | ??? | D3 Ax0eee C2
|
||||
| ^ | ^ | ^ | 64 00h 100 | ^ | PRINTER_MK1 | ??? | ^
|
||||
| ^ | ^ | ^ | c8 00h 200 | ^ | PRINTER_MK2 | ??? | ^
|
||||
| ^ | ^ | ^ | c9 00h 201 | ^ | PRINTER_MK2 with MMU1 | ??? | ^
|
||||
| ^ | ^ | ^ | ca 00h 202 | ^ | PRINTER_MK2S | ??? | ^
|
||||
| ^ | ^ | ^ | cb 00h 203 | ^ | PRINTER_MK2S with MMU1 | ??? | ^
|
||||
| ^ | ^ | ^ | fa 00h 250 | ^ | PRINTER_MK2.5 | ??? | ^
|
||||
| ^ | ^ | ^ | 1a 4fh 20250 | ^ | PRINTER_MK2.5 with MMU2 | ??? | ^
|
||||
| ^ | ^ | ^ | fc 00h 252 | ^ | PRINTER_MK2.5S | ??? | ^
|
||||
| ^ | ^ | ^ | 1c 4fh 20252 | ^ | PRINTER_MK2.5S with MMU2S | ??? | ^
|
||||
| ^ | ^ | ^ | 2c 01h 300 | ^ | PRINTER_MK3 | ??? | ^
|
||||
| ^ | ^ | ^ | 4c 4fh 20300 | ^ | PRINTER_MK3 with MMU2 | ??? | ^
|
||||
| ^ | ^ | ^ | 2e 01h 302 | ^ | PRINTER_MK3S | ??? | ^
|
||||
| ^ | ^ | ^ | 4e 4fh 20302 | ^ | PRINTER_MK3S with MMU2S | ??? | ^
|
||||
| 0x0EEC 3820 | uint16 | EEPROM_BOARD_TYPE | ??? | ff ffh 65535 | Board Type | ??? | D3 Ax0eec C2
|
||||
| ^ | ^ | ^ | c8 00h 200 | ^ | BOARD_RAMBO_MINI_1_0 | ??? | ^
|
||||
| ^ | ^ | ^ | cb 00h 203 | ^ | BOARD_RAMBO_MINI_1_3 | ??? | ^
|
||||
| ^ | ^ | ^ | 36 01h 310 | ^ | BOARD_EINSY_1_0a | ??? | ^
|
||||
| 0x0EE8 3816 | float | EEPROM_EXTRUDER_MULTIPLIER_0 | ??? | ff ff ff ffh | Power panic Extruder 0 multiplier | ??? | D3 Ax0ee8 C4
|
||||
| 0x0EE4 3812 | float | EEPROM_EXTRUDER_MULTIPLIER_1 | ??? | ff ff ff ffh | Power panic Extruder 1 multiplier | ??? | D3 Ax0ee4 C4
|
||||
| 0x0EE0 3808 | float | EEPROM_EXTRUDER_MULTIPLIER_2 | ??? | ff ff ff ffh | Power panic Extruder 2 multiplier | ??? | D3 Ax0ee0 C4
|
||||
| 0x0EDE 3806 | uint16 | EEPROM_EXTRUDEMULTIPLY | ??? | ff ffh 65535 | Power panic Extruder multiplier | ??? | D3 Ax0ede C2
|
||||
| 0x0EDA 3802 | float | EEPROM_UVLO_TINY_CURRENT_POSITION_Z | ??? | ff ff ff ffh | Power panic Z position | ??? | D3 Ax0eda C4
|
||||
| 0x0ED8 3800 | uint16 | EEPROM_UVLO_TARGET_HOTEND | ??? | ff ffh 65535 | Power panic target Hotend temperature | ??? | D3 Ax0ed8 C2
|
||||
| 0x0ED7 3799 | uint8 | EEPROM_SOUND_MODE | 00h 0 | ffh 255 | Sound mode: __loud__ | ??? | D3 Ax0ed7 C1
|
||||
| ^ | ^ | ^ | 01h 1 | ^ | Sound mode: __once__ | ^ | ^
|
||||
| ^ | ^ | ^ | 02h 1 | ^ | Sound mode: __silent__ | ^ | ^
|
||||
| ^ | ^ | ^ | 03h 1 | ^ | Sound mode: __assist__ | ^ | ^
|
||||
| 0x0ED6 3798 | bool | EEPROM_AUTO_DEPLETE | 01h 1 | ffh 255 | MMU2/s autodeplete: __on__ | ??? | D3 Ax0ed6 C1
|
||||
| ^ | ^ | ^ | 00h 0 | ^ | MMU2/s autodeplete: __off__ | ^ | ^
|
||||
| 0x0ED5 3797 | bool | EEPROM_FSENS_OQ_MEASS_ENABLED | ??? | ffh 255 | PAT1925 ??? | ??? | D3 Ax0ed5 C1
|
||||
| ^ | ^ | ^ | ??? | ^ | PAT1925 ??? | ^ | ^
|
||||
| 0x0ED3 3795 | uint16 | EEPROM_MMU_FAIL_TOT | ??? | ff ffh 65535 __S/P__ | MMU2/s total failures | ??? | D3 Ax0ed3 C2
|
||||
| 0x0ED2 3794 | uint8 | EEPROM_MMU_FAIL | ??? | ffh 255 __S/P__ | MMU2/s fails during print | ??? | D3 Ax0ed2 C1
|
||||
| 0x0ED0 3792 | uint16 | EEPROM_MMU_LOAD_FAIL_TOT | ??? | ff ffh 65535 __S/P__ | MMU2/s total load failures | ??? | D3 Ax0ed0 C2
|
||||
| 0x0ECF 3791 | uint8 | EEPROM_MMU_LOAD_FAIL | ??? | ffh 255 __S/P__ | MMU2/s load failures during print | ??? | D3 Ax0ecf C1
|
||||
| 0x0ECE 3790 | uint8 | EEPROM_MMU_CUTTER_ENABLED | 00h 0 | ffh 255 | MMU2/s cutter: __disabled__ | LCD menu | D3 Ax0ece C1
|
||||
| ^ | ^ | ^ | 01h 1 | ^ | MMU2/s cutter: __enabled__ | ^ | ^
|
||||
| ^ | ^ | ^ | 02h 2 | ^ | MMU2/s cutter: __always__ | ^ | ^
|
||||
| 0x0DAE 3502 | uint16 | EEPROM_UVLO_MESH_BED_LEVELING_FULL | ??? | ff ffh 65535 | Power panic Mesh bed leveling points | ??? | D3 Ax0dae C288
|
||||
| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^
|
||||
| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^
|
||||
| 0x0DAD 3501 | uint8 | EEPROM_MBL_TYPE | ??? | ffh 255 | Mesh bed leveling precision _unused atm_ | ??? | D3 Ax0dad C1
|
||||
| 0x0DAC 3500 | bool | EEPROM_MBL_MAGNET_ELIMINATION | 01h 1 | ffh 255 | Mesh bed leveling does: __ignores__ magnets | LCD menu | D3 Ax0dac C1
|
||||
| ^ | ^ | ^ | 00h 0 | ^ | Mesh bed leveling does: __NOT ignores__ magnets | ^ | ^
|
||||
| 0x0DAB 3499 | uint8 | EEPROM_MBL_POINTS_NR | 03h 3 | ffh 255 | Mesh bed leveling points: __3x3__ | LCD menu | D3 Ax0dab C1
|
||||
| ^ | ^ | ^ | 07h 7 | ^ | Mesh bed leveling points: __7x7__ | ^ | ^
|
||||
| 0x0DAA 3498 | uint8 | EEPROM_MBL_PROBE_NR | 03h 3 | ffh 255 | MBL times measurements for each point: __3__ | LCD menu | D3 Ax0daa C1
|
||||
| ^ | ^ | ^ | 05h 5 | ^ | MBL times measurements for each point: __5__ | ^ | ^
|
||||
| ^ | ^ | ^ | 01h 1 | ^ | MBL times measurements for each point: __1__ | ^ | ^
|
||||
| 0x0DA9 3497 | uint8 | EEPROM_MMU_STEALTH | 01h 1 | ffh 255 | MMU2/s Silent mode: __on__ | ??? | D3 Ax0da9 C1
|
||||
| ^ | ^ | ^ | 00h 0 | ^ | MMU2/s Silent mode: __off__ | ^ | ^
|
||||
| 0x0DA8 3496 | uint8 | EEPROM_CHECK_MODE | 01h 1 | ffh 255 | Check mode for nozzle is: __warn__ | LCD menu | D3 Ax0da8 C1
|
||||
| ^ | ^ | ^ | 02h 0 | ^ | Check mode for nozzle is: __strict__ | ^ | ^
|
||||
| ^ | ^ | ^ | 00h 0 | ^ | Check mode for nozzle is: __none__ | ^ | ^
|
||||
| 0x0DA7 3495 | uint8 | EEPROM_NOZZLE_DIAMETER | 28h 40 | ffh 255 | Nozzle diameter is: __40 or 0.40mm__ | LCD menu | D3 Ax0da7 C1
|
||||
| ^ | ^ | ^ | 3ch 60 | ^ | Nozzle diameter is: __60 or 0.60mm__ | ^ | ^
|
||||
| ^ | ^ | ^ | 19h 25 | ^ | Nozzle diameter is: __25 or 0.25mm__ | ^ | ^
|
||||
| 0x0DA5 3493 | uint16 | EEPROM_NOZZLE_DIAMETER_uM | 9001h | ff ffh 65535 | Nozzle diameter is: __400um__ | LCD menu | D3 Ax0da5 C2
|
||||
| ^ | ^ | ^ | 5802h | ^ | Nozzle diameter is: __600um__ | ^ | ^
|
||||
| ^ | ^ | ^ | fa00h | ^ | Nozzle diameter is: __250um__ | ^ | ^
|
||||
| 0x0DA4 3492 | uint8 | EEPROM_CHECK_MODEL | 01h 1 | ffh 255 | Check mode for printer model is: __warn__ | LCD menu | D3 Ax0da4 C1
|
||||
| ^ | ^ | ^ | 02h 0 | ^ | Check mode for printer model is: __strict__ | ^ | ^
|
||||
| ^ | ^ | ^ | 00h 0 | ^ | Check mode for printer model is: __none__ | ^ | ^
|
||||
| 0x0DA3 3491 | uint8 | EEPROM_CHECK_VERSION | 01h 1 | ffh 255 | Check mode for firmware is: __warn__ | LCD menu | D3 Ax0da3 C1
|
||||
| ^ | ^ | ^ | 02h 0 | ^ | Check mode for firmware is: __strict__ | ^ | ^
|
||||
| ^ | ^ | ^ | 00h 0 | ^ | Check mode for firmware is: __none__ | ^ | ^
|
||||
| 0x0DA2 3490 | uint8 | EEPROM_CHECK_GCODE | 01h 1 | ffh 255 | Check mode for gcode is: __warn__ _unused atm_ | LCD menu | D3 Ax0da2 C1
|
||||
| ^ | ^ | ^ | 02h 0 | ^ | Check mode for gcode is: __strict__ _unused atm_ | ^ | ^
|
||||
| ^ | ^ | ^ | 00h 0 | ^ | Check mode for gcode is: __none__ _unused atm_ | ^ | ^
|
||||
| 0x0D49 3401 | uint16 | EEPROM_SHEETS_BASE | ??? | ffh 255 | ??? | LCD menu | D3 Ax0d49 C89
|
||||
| 0x0D49 3401 | char | _1st Sheet block_ | 536d6f6f746831| ffffffffffffff | 1st sheet - Name: _Smooth1_ | ^ | D3 Ax0d49 C7
|
||||
| 0x0D50 3408 | uint16 | ^ | 00 00h 0 | ff ffh 65535 | 1st sheet - Z offset | ^ | D3 Ax0d50 C2
|
||||
| 0x0D52 3410 | uint8 | ^ | 00h 0 | ffh 255 | 1st sheet - bed temp | ^ | D3 Ax0d52 C1
|
||||
| 0x0D53 3411 | uint8 | ^ | 00h 0 | ffh 255 | 1st sheet - PINDA temp | ^ | D3 Ax0d53 C1
|
||||
| 0x0D54 3412 | char | _2nd Sheet block_ | 536d6f6f746832| ffffffffffffff | 2nd sheet - Name: _Smooth2_ | ^ | D3 Ax0d54 C7
|
||||
| 0x0D5B 3419 | uint16 | ^ | 00 00h 0 | ff ffh 65535 | 2nd sheet - Z offset | ^ | D3 Ax0d5b C2
|
||||
| 0x0D5D 3421 | uint8 | ^ | 00h 0 | ffh 255 | 2nd sheet - bed temp | ^ | D3 Ax0d5d C1
|
||||
| 0x0D5E 3422 | uint8 | ^ | 00h 0 | ffh 255 | 2nd sheet - PINDA temp | ^ | D3 Ax0d5e C1
|
||||
| 0x0D5F 3423 | char | _3rd Sheet block_ | 54657874757231| ffffffffffffff | 3rd sheet - Name: _Textur1_ | ^ | D3 Ax0d5f C7
|
||||
| 0x0D66 3430 | uint16 | ^ | 00 00h 0 | ff ffh 65535 | 3rd sheet - Z offset | ^ | D3 Ax0d66 C2
|
||||
| 0x0D68 3432 | uint8 | ^ | 00h 0 | ffh 255 | 3rd sheet - bed temp | ^ | D3 Ax0d68 C1
|
||||
| 0x0D69 3433 | uint8 | ^ | 00h 0 | ffh 255 | 3rd sheet - PINDA temp | ^ | D3 Ax0d69 C1
|
||||
| 0x0D6A 3434 | char | _4th Sheet block_ | 54657874757232| ffffffffffffff | 4th sheet - Name: _Textur2_ | ^ | D3 Ax0d6a C7
|
||||
| 0x0D71 3441 | uint16 | ^ | 00 00h 0 | ff ffh 65535 | 4th sheet - Z offset | ^ | D3 Ax0d71 C2
|
||||
| 0x0D73 3443 | uint8 | ^ | 00h 0 | ffh 255 | 4th sheet - bed temp | ^ | D3 Ax0d73 C1
|
||||
| 0x0D74 3444 | uint8 | ^ | 00h 0 | ffh 255 | 4th sheet - PINDA temp | ^ | D3 Ax0d74 C1
|
||||
| 0x0D75 3445 | char | _5th Sheet block_ | 437573746f6d31| ffffffffffffff | 5th sheet - Name: _Custom1_ | ^ | D3 Ax0d75 C7
|
||||
| 0x0D7C 3452 | uint16 | ^ | 00 00h 0 | ff ffh 65535 | 5th sheet - Z offset | ^ | D3 Ax0d7c C2
|
||||
| 0x0D7E 3454 | uint8 | ^ | 00h 0 | ffh 255 | 5th sheet - bed temp | ^ | D3 Ax0d7e C1
|
||||
| 0x0D7F 3455 | uint8 | ^ | 00h 0 | ffh 255 | 5th sheet - PINDA temp | ^ | D3 Ax0d7f C1
|
||||
| 0x0D80 3456 | char | _6th Sheet block_ | 437573746f6d32| ffffffffffffff | 6th sheet - Name: _Custom2_ | ^ | D3 Ax0d80 C7
|
||||
| 0x0D87 3463 | uint16 | ^ | 00 00h 0 | ff ffh 65535 | 6th sheet - Z offset | ^ | D3 Ax0d87 C2
|
||||
| 0x0D89 3465 | uint8 | ^ | 00h 0 | ffh 255 | 6th sheet - bed temp | ^ | D3 Ax0d89 C1
|
||||
| 0x0D8A 3466 | uint8 | ^ | 00h 0 | ffh 255 | 6th sheet - PINDA temp | ^ | D3 Ax0d8a C1
|
||||
| 0x0D8B 3467 | char | _7th Sheet block_ | 437573746f6d33| ffffffffffffff | 7th sheet - Name: _Custom3_ | ^ | D3 Ax0d8b C7
|
||||
| 0x0D92 3474 | uint16 | ^ | 00 00h 0 | ff ffh 65535 | 7th sheet - Z offset | ^ | D3 Ax0d92 C2
|
||||
| 0x0D94 3476 | uint8 | ^ | 00h 0 | ffh 255 | 7th sheet - bed temp | ^ | D3 Ax0d94 C1
|
||||
| 0x0D95 3477 | uint8 | ^ | 00h 0 | ffh 255 | 7th sheet - PINDA temp | ^ | D3 Ax0d95 C1
|
||||
| 0x0D96 3478 | char | _8th Sheet block_ | 437573746f6d34| ffffffffffffff | 8th sheet - Name: _Custom4_ | ^ | D3 Ax0d96 C7
|
||||
| 0x0D9D 3485 | uint16 | ^ | 00 00h 0 | ff ffh 65535 | 8th sheet - Z offset | ^ | D3 Ax0d9d C2
|
||||
| 0x0D9F 3487 | uint8 | ^ | 00h 0 | ffh 255 | 8th sheet - bed temp | ^ | D3 Ax0d9f C1
|
||||
| 0x0DA0 3488 | uint8 | ^ | 00h 0 | ffh 255 | 8th sheet - PINDA temp | ^ | D3 Ax0da0 C1
|
||||
| 0x0DA1 3489 | uint8 | ??? | 00h 0 | ffh 255 | ??? | ??? | D3 Ax0da1 C1
|
||||
| 0x0D48 3400 | uint8 | EEPROM_FSENSOR_PCB | ffh 255 | ffh 255 | Filament Sensor type IR unknown | LCD Support | D3 Ax0d48 C1
|
||||
| ^ | ^ | ^ | 00h 0 | ^ | Filament Sensor type IR 0.3 or older | ^ | ^
|
||||
| ^ | ^ | ^ | 01h 1 | ^ | Filament Sensor type IR 0.4 or newer | ^ | ^
|
||||
| 0x0D47 3399 | uint8 | EEPROM_FSENSOR_ACTION_NA | 00h 0 | ffh 255 | Filament Sensor action: __Continue__ | LCD menu | D3 Ax0d47 C1
|
||||
| ^ | ^ | ^ | 01h 1 | ^ | Filament Sensor action: __Pause__ | ^ | ^
|
||||
| 0x0D37 3383 | float | EEPROM_UVLO_SAVED_TARGET | ??? | ff ff ff ffh | Power panic saved target all-axis | ??? | D3 Ax0d37 C16
|
||||
| ^ | ^ | ^ | ??? | ^ | Power panic saved target e-axis | ^ | D3 Ax0d43 C4
|
||||
| ^ | ^ | ^ | ??? | ^ | Power panic saved target z-axis | ^ | D3 Ax0d3f C4
|
||||
| ^ | ^ | ^ | ??? | ^ | Power panic saved target y-axis | ^ | D3 Ax0d3b C4
|
||||
| ^ | ^ | ^ | ??? | ^ | Power panic saved target x-axis | ^ | D3 Ax0d37 C4
|
||||
| 0x0D35 3381 | uint16 | EEPROM_UVLO_FEEDMULTIPLY | ??? | ff ffh 65355 | Power panic saved feed multiplier | ??? | D3 Ax0d35 C2
|
||||
| 0x0D34 3380 | uint8 | EEPROM_BACKLIGHT_LEVEL_HIGH | 00h - ffh | 82h 130 | LCD backlight bright: __128__ Dim value to 255 | LCD menu | D3 Ax0d34 C1
|
||||
| 0x0D33 3379 | uint8 | EEPROM_BACKLIGHT_LEVEL_LOW | 00h - ffh | 32h 50 | LCD backlight dim: __50__ 0 to Bright value | LCD menu | D3 Ax0d33 C1
|
||||
| 0x0D32 3378 | uint8 | EEPROM_BACKLIGHT_MODE | 02h 2 | ffh 255 | LCD backlight mode: __Auto__ | LCD menu | D3 Ax0d32 C1
|
||||
| ^ | ^ | ^ | 01h 1 | ^ | LCD backlight mode: __Bright__ | ^ | ^
|
||||
| ^ | ^ | ^ | 00h 0 | ^ | LCD backlight mode: __Dim__ | ^ | ^
|
||||
| 0x0D30 3376 | uint16 | EEPROM_BACKLIGHT_TIMEOUT | 01 00 - ff ff | 0a 00h 65535 | LCD backlight timeout: __10__ seconds | LCD menu | D3 Ax0d30 C2
|
||||
| 0x0D2C 3372 | float | EEPROM_UVLO_LA_K | ??? | ff ff ff ffh | Power panic saved Linear Advanced K value | ??? | D3 Ax0d2c C4
|
||||
| 0x0D2B 3371 | uint8 | EEPROM_ALTFAN_OVERRIDE | ffh 255 | ffh 255 | ALTFAN override unknown state | LCD menu | D3 Ax0d2b C1
|
||||
| ^ | ^ | ^ | 00h 0 | ^ | ALTFAN override deactivated | ^ | ^
|
||||
| ^ | ^ | ^ | 01h 1 | ^ | ALTFAN override activated | ^ | ^
|
||||
| 0x0D2A 3370 | uint8 | EEPROM_EXPERIMENTAL_VISIBILITY | ffh 255 | ffh 255 | Experimental menu visibility unknown state | LCD menu | D3 Ax0d2a C1
|
||||
| ^ | ^ | ^ | 00h 0 | ^ | Experimental menu visibility hidden | ^ | ^
|
||||
| ^ | ^ | ^ | 01h 1 | ^ | Experimental menu visibility visible | ^ | ^
|
||||
|
||||
|
||||
| Address begin | Bit/Type | Name | Valid values | Default/FactoryReset | Description | Gcode/Function| Debug code
|
||||
| :--: | :--: | :--: | :--: | :--: | :--: | :--: | :--:
|
||||
| 0x0012 18 | uint16 | EEPROM_FIRMWARE_VERSION_END | ??? | ff ffh 65535 | ??? | ??? | D3 Ax0012 C2
|
||||
| 0x0010 16 | uint16 | EEPROM_FIRMWARE_VERSION_FLAVOR | ??? | ff ffh 65535 | ??? | ??? | D3 Ax0010 C2
|
||||
| 0x000E 14 | uint16 | EEPROM_FIRMWARE_VERSION_REVISION | ??? | ff ffh 65535 | Firmware version revision number DEV/ALPHA/BETA/RC| ??? | D3 Ax000e C2
|
||||
| 0x000C 12 | uint16 | EEPROM_FIRMWARE_VERSION_MINOR | ??? | ff ffh 65535 | Firmware version minor number | ??? | D3 Ax000c C2
|
||||
| 0x000A 10 | uint16 | EEPROM_FIRMWARE_VERSION_MAJOR | ??? | ff ffh 65535 | Firmware version major number | ??? | D3 Ax000a C2
|
||||
| 0x0000 0 | char | FW_PRUSA3D_MAGIC | ??? | ffffffffffffffffffff | __`PRUSA3DFW`__ | ??? | D3 Ax0000 C10
|
||||
*/
|
||||
|
||||
#define EEPROM_EMPTY_VALUE 0xFF
|
||||
#define EEPROM_EMPTY_VALUE16 0xFFFF
|
||||
|
@ -51,7 +401,8 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP
|
|||
// The offsets are saved as 16bit signed int, scaled to tenths of microns.
|
||||
#define EEPROM_BED_CALIBRATION_Z_JITTER (EEPROM_BED_CALIBRATION_VEC_Y-2*8)
|
||||
#define EEPROM_FARM_MODE (EEPROM_BED_CALIBRATION_Z_JITTER-1)
|
||||
#define EEPROM_FARM_NUMBER (EEPROM_FARM_MODE-3)
|
||||
#define EEPROM_FREE_NR1 (EEPROM_FARM_MODE-1)
|
||||
#define EEPROM_FARM_NUMBER (EEPROM_FREE_NR1-2)
|
||||
|
||||
// Correction of the bed leveling, in micrometers.
|
||||
// Maximum 50 micrometers allowed.
|
||||
|
@ -72,19 +423,23 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP
|
|||
#define EEPROM_FILENAME (EEPROM_UVLO_CURRENT_POSITION - 8) //8chars to store filename without extension
|
||||
#define EEPROM_FILE_POSITION (EEPROM_FILENAME - 4) //32 bit for uint32_t file position
|
||||
#define EEPROM_UVLO_CURRENT_POSITION_Z (EEPROM_FILE_POSITION - 4) //float for current position in Z
|
||||
#define EEPROM_UVLO_TARGET_HOTEND (EEPROM_UVLO_CURRENT_POSITION_Z - 1)
|
||||
#define EEPROM_UVLO_TARGET_BED (EEPROM_UVLO_TARGET_HOTEND - 1)
|
||||
#define EEPROM_UVLO_UNUSED_001 (EEPROM_UVLO_CURRENT_POSITION_Z - 1) // uint8_t (unused)
|
||||
#define EEPROM_UVLO_TARGET_BED (EEPROM_UVLO_UNUSED_001 - 1)
|
||||
#define EEPROM_UVLO_FEEDRATE (EEPROM_UVLO_TARGET_BED - 2) //uint16_t
|
||||
#define EEPROM_UVLO_FAN_SPEED (EEPROM_UVLO_FEEDRATE - 1)
|
||||
#define EEPROM_FAN_CHECK_ENABLED (EEPROM_UVLO_FAN_SPEED - 1)
|
||||
#define EEPROM_UVLO_MESH_BED_LEVELING (EEPROM_FAN_CHECK_ENABLED - 9*2)
|
||||
|
||||
#define EEPROM_UVLO_Z_MICROSTEPS (EEPROM_UVLO_MESH_BED_LEVELING - 2)
|
||||
#define EEPROM_UVLO_Z_MICROSTEPS (EEPROM_UVLO_MESH_BED_LEVELING - 2) // uint16_t (could be removed)
|
||||
#define EEPROM_UVLO_E_ABS (EEPROM_UVLO_Z_MICROSTEPS - 1)
|
||||
#define EEPROM_UVLO_CURRENT_POSITION_E (EEPROM_UVLO_E_ABS - 4) //float for current position in E
|
||||
|
||||
#define EEPROM_FREE_NR2 (EEPROM_UVLO_CURRENT_POSITION_E - 1) // FREE EEPROM SPACE
|
||||
#define EEPROM_FREE_NR3 (EEPROM_FREE_NR2 - 1) // FREE EEPROM SPACE
|
||||
#define EEPROM_FREE_NR4 (EEPROM_FREE_NR3 - 1) // FREE EEPROM SPACE
|
||||
#define EEPROM_FREE_NR5 (EEPROM_FREE_NR4 - 1) // FREE EEPROM SPACE
|
||||
// Crash detection mode EEPROM setting
|
||||
#define EEPROM_CRASH_DET (EEPROM_UVLO_CURRENT_POSITION_E - 5) // float (orig EEPROM_UVLO_MESH_BED_LEVELING-12)
|
||||
#define EEPROM_CRASH_DET (EEPROM_FREE_NR5 - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-12)
|
||||
// Crash detection counter Y (last print)
|
||||
#define EEPROM_CRASH_COUNT_Y (EEPROM_CRASH_DET - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-15)
|
||||
// Filament sensor on/off EEPROM setting
|
||||
|
@ -165,13 +520,11 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP
|
|||
#define EEPROM_EXTRUDER_MULTIPLIER_2 (EEPROM_EXTRUDER_MULTIPLIER_1 - 4) //float
|
||||
#define EEPROM_EXTRUDEMULTIPLY (EEPROM_EXTRUDER_MULTIPLIER_2 - 2) // uint16
|
||||
|
||||
//
|
||||
#define EEPROM_UVLO_TINY_CURRENT_POSITION_Z (EEPROM_EXTRUDEMULTIPLY-4) // float
|
||||
#define EEPROM_UVLO_TINY_Z_MICROSTEPS (EEPROM_UVLO_TINY_CURRENT_POSITION_Z-2) // uint16
|
||||
#define EEPROM_UVLO_TARGET_HOTEND (EEPROM_UVLO_TINY_CURRENT_POSITION_Z-2) // uint16
|
||||
|
||||
// Sound Mode
|
||||
//#define EEPROM_SOUND_MODE (EEPROM_EXTRUDEMULTIPLY-1) // uint8
|
||||
#define EEPROM_SOUND_MODE (EEPROM_UVLO_TINY_Z_MICROSTEPS-1) // uint8
|
||||
#define EEPROM_SOUND_MODE (EEPROM_UVLO_TARGET_HOTEND-1) // uint8
|
||||
#define EEPROM_AUTO_DEPLETE (EEPROM_SOUND_MODE-1) //bool
|
||||
|
||||
#define EEPROM_FSENS_OQ_MEASS_ENABLED (EEPROM_AUTO_DEPLETE - 1) //bool
|
||||
|
@ -212,9 +565,13 @@ static Sheets * const EEPROM_Sheets_base = (Sheets*)(EEPROM_SHEETS_BASE);
|
|||
#define EEPROM_BACKLIGHT_MODE (EEPROM_BACKLIGHT_LEVEL_LOW-1) // uint8
|
||||
#define EEPROM_BACKLIGHT_TIMEOUT (EEPROM_BACKLIGHT_MODE-2) // uint16
|
||||
|
||||
#define EEPROM_UVLO_LA_K (EEPROM_BACKLIGHT_TIMEOUT-4) // float
|
||||
|
||||
#define EEPROM_ALTFAN_OVERRIDE (EEPROM_UVLO_LA_K-1) //uint8
|
||||
#define EEPROM_EXPERIMENTAL_VISIBILITY (EEPROM_ALTFAN_OVERRIDE-1) //uint8
|
||||
|
||||
//This is supposed to point to last item to allow EEPROM overrun check. Please update when adding new items.
|
||||
#define EEPROM_LAST_ITEM EEPROM_BACKLIGHT_TIMEOUT
|
||||
#define EEPROM_LAST_ITEM EEPROM_EXPERIMENTAL_VISIBILITY
|
||||
// !!!!!
|
||||
// !!!!! this is end of EEPROM section ... all updates MUST BE inserted before this mark !!!!!
|
||||
// !!!!!
|
||||
|
|
|
@ -58,7 +58,7 @@
|
|||
#define _GET_OUTPUT(IO) ((DIO ## IO ## _DDR & MASK(DIO ## IO ## _PIN)) != 0)
|
||||
|
||||
/// check if pin is an timer
|
||||
#define _GET_TIMER(IO) ((DIO ## IO ## _PWM)
|
||||
#define _GET_TIMER(IO) (DIO ## IO ## _PWM)
|
||||
|
||||
// why double up on these macros? see http://gcc.gnu.org/onlinedocs/cpp/Stringification.html
|
||||
|
||||
|
|
|
@ -6,12 +6,9 @@
|
|||
#include <avr/pgmspace.h>
|
||||
#include "pat9125.h"
|
||||
#include "stepper.h"
|
||||
#include "planner.h"
|
||||
#include "fastio.h"
|
||||
#include "io_atmega2560.h"
|
||||
#include "cmdqueue.h"
|
||||
#include "ultralcd.h"
|
||||
#include "ConfigurationStore.h"
|
||||
#include "mmu.h"
|
||||
#include "cardreader.h"
|
||||
|
||||
|
@ -21,19 +18,19 @@
|
|||
|
||||
//! @name Basic parameters
|
||||
//! @{
|
||||
#define FSENSOR_CHUNK_LEN 0.64F //!< filament sensor chunk length 0.64mm
|
||||
#define FSENSOR_ERR_MAX 17 //!< filament sensor maximum error count for runout detection
|
||||
#define FSENSOR_CHUNK_LEN 1.25 //!< filament sensor chunk length (mm)
|
||||
#define FSENSOR_ERR_MAX 4 //!< filament sensor maximum error/chunk count for runout detection
|
||||
|
||||
#define FSENSOR_SOFTERR_CMAX 3 //!< number of contiguous soft failures before a triggering a runout
|
||||
#define FSENSOR_SOFTERR_DELTA 30000 //!< maximum interval (ms) to consider soft failures contiguous
|
||||
//! @}
|
||||
|
||||
//! @name Optical quality measurement parameters
|
||||
//! @{
|
||||
#define FSENSOR_OQ_MAX_ES 6 //!< maximum error sum while loading (length ~64mm = 100chunks)
|
||||
#define FSENSOR_OQ_MAX_EM 2 //!< maximum error counter value while loading
|
||||
#define FSENSOR_OQ_MIN_YD 2 //!< minimum yd per chunk (applied to avg value)
|
||||
#define FSENSOR_OQ_MAX_YD 200 //!< maximum yd per chunk (applied to avg value)
|
||||
#define FSENSOR_OQ_MAX_PD 4 //!< maximum positive deviation (= yd_max/yd_avg)
|
||||
#define FSENSOR_OQ_MAX_ND 5 //!< maximum negative deviation (= yd_avg/yd_min)
|
||||
#define FSENSOR_OQ_MAX_SH 13 //!< maximum shutter value
|
||||
#define FSENSOR_OQ_MAX_ES 2 //!< maximum sum of error blocks during filament recheck
|
||||
#define FSENSOR_OQ_MIN_YD 2 //!< minimum yd sum during filament check (counts per inch)
|
||||
#define FSENSOR_OQ_MIN_BR 80 //!< minimum brightness value
|
||||
#define FSENSOR_OQ_MAX_SH 10 //!< maximum shutter value
|
||||
//! @}
|
||||
|
||||
const char ERRMSG_PAT9125_NOT_RESP[] PROGMEM = "PAT9125 not responding (%d)!\n";
|
||||
|
@ -47,28 +44,35 @@ const char ERRMSG_PAT9125_NOT_RESP[] PROGMEM = "PAT9125 not responding (%d)!\n";
|
|||
#define FSENSOR_INT_PIN_PCMSK_BIT PCINT13 // PinChange Interrupt / PinChange Enable Mask @ PJ4
|
||||
#define FSENSOR_INT_PIN_PCICR_BIT PCIE1 // PinChange Interrupt Enable / Flag @ PJ4
|
||||
|
||||
//uint8_t fsensor_int_pin = FSENSOR_INT_PIN;
|
||||
uint8_t fsensor_int_pin_old = 0;
|
||||
int16_t fsensor_chunk_len = 0;
|
||||
|
||||
//! enabled = initialized and sampled every chunk event
|
||||
bool fsensor_enabled = true;
|
||||
//! runout watching is done in fsensor_update (called from main loop)
|
||||
bool fsensor_watch_runout = true;
|
||||
//! not responding - is set if any communication error occurred during initialization or readout
|
||||
bool fsensor_not_responding = false;
|
||||
|
||||
#ifdef PAT9125
|
||||
uint8_t fsensor_int_pin_old = 0;
|
||||
//! optical checking "chunk lenght" (already in steps)
|
||||
int16_t fsensor_chunk_len = 0;
|
||||
//! enable/disable quality meassurement
|
||||
bool fsensor_oq_meassure_enabled = false;
|
||||
|
||||
//! number of errors, updated in ISR
|
||||
uint8_t fsensor_err_cnt = 0;
|
||||
//! variable for accumulating step count (updated callbacks from stepper and ISR)
|
||||
int16_t fsensor_st_cnt = 0;
|
||||
//! last dy value from pat9125 sensor (used in ISR)
|
||||
int16_t fsensor_dy_old = 0;
|
||||
//! count of total sensor "soft" failures (filament status checks)
|
||||
uint8_t fsensor_softfail = 0;
|
||||
//! timestamp of last soft failure
|
||||
unsigned long fsensor_softfail_last = 0;
|
||||
//! count of soft failures within the configured time
|
||||
uint8_t fsensor_softfail_ccnt = 0;
|
||||
#endif
|
||||
|
||||
#ifdef DEBUG_FSENSOR_LOG
|
||||
//! log flag: 0=log disabled, 1=log enabled
|
||||
uint8_t fsensor_log = 1;
|
||||
#endif //DEBUG_FSENSOR_LOG
|
||||
|
||||
|
||||
//! @name filament autoload variables
|
||||
|
@ -78,6 +82,8 @@ uint8_t fsensor_log = 1;
|
|||
bool fsensor_autoload_enabled = true;
|
||||
//! autoload watching enable/disable flag
|
||||
bool fsensor_watch_autoload = false;
|
||||
|
||||
#ifdef PAT9125
|
||||
//
|
||||
uint16_t fsensor_autoload_y;
|
||||
//
|
||||
|
@ -87,6 +93,7 @@ uint32_t fsensor_autoload_last_millis;
|
|||
//
|
||||
uint8_t fsensor_autoload_sum;
|
||||
//! @}
|
||||
#endif
|
||||
|
||||
|
||||
//! @name filament optical quality measurement variables
|
||||
|
@ -114,7 +121,7 @@ int16_t fsensor_oq_yd_max;
|
|||
uint16_t fsensor_oq_sh_sum;
|
||||
//! @}
|
||||
|
||||
#if IR_SENSOR_ANALOG
|
||||
#ifdef IR_SENSOR_ANALOG
|
||||
ClFsensorPCB oFsensorPCB;
|
||||
ClFsensorActionNA oFsensorActionNA;
|
||||
bool bIRsensorStateFlag=false;
|
||||
|
@ -124,14 +131,34 @@ unsigned long nIRsensorLastTime;
|
|||
void fsensor_stop_and_save_print(void)
|
||||
{
|
||||
printf_P(PSTR("fsensor_stop_and_save_print\n"));
|
||||
stop_and_save_print_to_ram(0, 0); //XYZE - no change
|
||||
stop_and_save_print_to_ram(0, 0);
|
||||
fsensor_watch_runout = false;
|
||||
}
|
||||
|
||||
#ifdef PAT9125
|
||||
// Reset all internal counters to zero, including stepper callbacks
|
||||
void fsensor_reset_err_cnt()
|
||||
{
|
||||
fsensor_err_cnt = 0;
|
||||
pat9125_y = 0;
|
||||
st_reset_fsensor();
|
||||
}
|
||||
|
||||
void fsensor_set_axis_steps_per_unit(float u)
|
||||
{
|
||||
fsensor_chunk_len = (int16_t)(FSENSOR_CHUNK_LEN * u);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
void fsensor_restore_print_and_continue(void)
|
||||
{
|
||||
printf_P(PSTR("fsensor_restore_print_and_continue\n"));
|
||||
fsensor_err_cnt = 0;
|
||||
restore_print_from_ram_and_continue(0); //XYZ = orig, E - no change
|
||||
fsensor_watch_runout = true;
|
||||
#ifdef PAT9125
|
||||
fsensor_reset_err_cnt();
|
||||
#endif
|
||||
restore_print_from_ram_and_continue(0);
|
||||
}
|
||||
|
||||
// fsensor_checkpoint_print cuts the current print job at the current position,
|
||||
|
@ -143,43 +170,65 @@ void fsensor_checkpoint_print(void)
|
|||
restore_print_from_ram_and_continue(0);
|
||||
}
|
||||
|
||||
#ifdef IR_SENSOR_ANALOG
|
||||
const char* FsensorIRVersionText()
|
||||
{
|
||||
switch(oFsensorPCB)
|
||||
{
|
||||
case ClFsensorPCB::_Old:
|
||||
return _T(MSG_IR_03_OR_OLDER);
|
||||
case ClFsensorPCB::_Rev04:
|
||||
return _T(MSG_IR_04_OR_NEWER);
|
||||
default:
|
||||
return _T(MSG_IR_UNKNOWN);
|
||||
}
|
||||
}
|
||||
#endif //IR_SENSOR_ANALOG
|
||||
|
||||
void fsensor_init(void)
|
||||
{
|
||||
#ifdef PAT9125
|
||||
uint8_t pat9125 = pat9125_init();
|
||||
printf_P(PSTR("PAT9125_init:%hhu\n"), pat9125);
|
||||
printf_P(PSTR("PAT9125_init:%hhu\n"), pat9125);
|
||||
#endif //PAT9125
|
||||
uint8_t fsensor = eeprom_read_byte((uint8_t*)EEPROM_FSENSOR);
|
||||
uint8_t fsensor_enabled = eeprom_read_byte((uint8_t*)EEPROM_FSENSOR);
|
||||
fsensor_autoload_enabled=eeprom_read_byte((uint8_t*)EEPROM_FSENS_AUTOLOAD_ENABLED);
|
||||
fsensor_not_responding = false;
|
||||
fsensor_not_responding = false;
|
||||
#ifdef PAT9125
|
||||
uint8_t oq_meassure_enabled = eeprom_read_byte((uint8_t*)EEPROM_FSENS_OQ_MEASS_ENABLED);
|
||||
fsensor_oq_meassure_enabled = (oq_meassure_enabled == 1)?true:false;
|
||||
fsensor_chunk_len = (int16_t)(FSENSOR_CHUNK_LEN * cs.axis_steps_per_unit[E_AXIS]);
|
||||
|
||||
if (!pat9125)
|
||||
{
|
||||
fsensor = 0; //disable sensor
|
||||
fsensor_set_axis_steps_per_unit(cs.axis_steps_per_unit[E_AXIS]);
|
||||
|
||||
if (!pat9125){
|
||||
fsensor_enabled = 0; //disable sensor
|
||||
fsensor_not_responding = true;
|
||||
}
|
||||
#endif //PAT9125
|
||||
#if IR_SENSOR_ANALOG
|
||||
bIRsensorStateFlag=false;
|
||||
oFsensorPCB=(ClFsensorPCB)eeprom_read_byte((uint8_t*)EEPROM_FSENSOR_PCB);
|
||||
oFsensorActionNA=(ClFsensorActionNA)eeprom_read_byte((uint8_t*)EEPROM_FSENSOR_ACTION_NA);
|
||||
#endif //IR_SENSOR_ANALOG
|
||||
if (fsensor)
|
||||
fsensor_enable(false); // (in this case) EEPROM update is not necessary
|
||||
else
|
||||
fsensor_disable(false); // (in this case) EEPROM update is not necessary
|
||||
printf_P(PSTR("FSensor %S"), (fsensor_enabled?PSTR("ENABLED"):PSTR("DISABLED")));
|
||||
#if IR_SENSOR_ANALOG
|
||||
printf_P(PSTR(" (sensor board revision: %S)\n"),(oFsensorPCB==ClFsensorPCB::_Rev03b)?PSTR("03b or newer"):PSTR("03 or older"));
|
||||
#else //IR_SENSOR_ANALOG
|
||||
printf_P(PSTR("\n"));
|
||||
#endif //IR_SENSOR_ANALOG
|
||||
if (check_for_ir_sensor()) ir_sensor_detected = true;
|
||||
#ifdef IR_SENSOR_ANALOG
|
||||
bIRsensorStateFlag=false;
|
||||
oFsensorPCB = (ClFsensorPCB)eeprom_read_byte((uint8_t*)EEPROM_FSENSOR_PCB);
|
||||
oFsensorActionNA = (ClFsensorActionNA)eeprom_read_byte((uint8_t*)EEPROM_FSENSOR_ACTION_NA);
|
||||
|
||||
// If the fsensor is not responding even at the start of the printer,
|
||||
// set this flag accordingly to show N/A in Settings->Filament sensor.
|
||||
// This is even valid for both fsensor board revisions (0.3 or older and 0.4).
|
||||
// Must be done after reading what type of fsensor board we have
|
||||
fsensor_not_responding = ! fsensor_IR_check();
|
||||
#endif //IR_SENSOR_ANALOG
|
||||
if (fsensor_enabled){
|
||||
fsensor_enable(false); // (in this case) EEPROM update is not necessary
|
||||
} else {
|
||||
fsensor_disable(false); // (in this case) EEPROM update is not necessary
|
||||
}
|
||||
printf_P(PSTR("FSensor %S"), (fsensor_enabled?PSTR("ENABLED"):PSTR("DISABLED")));
|
||||
#ifdef IR_SENSOR_ANALOG
|
||||
printf_P(PSTR(" (sensor board revision:%S)\n"), FsensorIRVersionText());
|
||||
#else //IR_SENSOR_ANALOG
|
||||
MYSERIAL.println();
|
||||
#endif //IR_SENSOR_ANALOG
|
||||
if (check_for_ir_sensor()){
|
||||
ir_sensor_detected = true;
|
||||
}
|
||||
}
|
||||
|
||||
bool fsensor_enable(bool bUpdateEEPROM)
|
||||
|
@ -195,8 +244,7 @@ bool fsensor_enable(bool bUpdateEEPROM)
|
|||
fsensor_enabled = pat9125 ? true : false;
|
||||
fsensor_watch_runout = true;
|
||||
fsensor_oq_meassure = false;
|
||||
fsensor_err_cnt = 0;
|
||||
fsensor_dy_old = 0;
|
||||
fsensor_reset_err_cnt();
|
||||
eeprom_update_byte((uint8_t*)EEPROM_FSENSOR, fsensor_enabled ? 0x01 : 0x00);
|
||||
FSensorStateMenu = fsensor_enabled ? 1 : 0;
|
||||
}
|
||||
|
@ -207,7 +255,7 @@ bool fsensor_enable(bool bUpdateEEPROM)
|
|||
FSensorStateMenu = 1;
|
||||
}
|
||||
#else // PAT9125
|
||||
#if IR_SENSOR_ANALOG
|
||||
#ifdef IR_SENSOR_ANALOG
|
||||
if(!fsensor_IR_check())
|
||||
{
|
||||
bUpdateEEPROM=true;
|
||||
|
@ -220,7 +268,7 @@ bool fsensor_enable(bool bUpdateEEPROM)
|
|||
fsensor_enabled=true;
|
||||
fsensor_not_responding=false;
|
||||
FSensorStateMenu=1;
|
||||
#if IR_SENSOR_ANALOG
|
||||
#ifdef IR_SENSOR_ANALOG
|
||||
}
|
||||
#endif //IR_SENSOR_ANALOG
|
||||
if(bUpdateEEPROM)
|
||||
|
@ -261,7 +309,7 @@ void fsensor_autoload_check_start(void)
|
|||
if (!fsensor_enabled) return;
|
||||
if (!fsensor_autoload_enabled) return;
|
||||
if (fsensor_watch_autoload) return;
|
||||
if (!pat9125_update_y()) //update sensor
|
||||
if (!pat9125_update()) //update sensor
|
||||
{
|
||||
fsensor_disable();
|
||||
fsensor_not_responding = true;
|
||||
|
@ -276,12 +324,11 @@ void fsensor_autoload_check_start(void)
|
|||
fsensor_autoload_last_millis = _millis();
|
||||
fsensor_watch_runout = false;
|
||||
fsensor_watch_autoload = true;
|
||||
fsensor_err_cnt = 0;
|
||||
}
|
||||
|
||||
|
||||
void fsensor_autoload_check_stop(void)
|
||||
{
|
||||
|
||||
// puts_P(_N("fsensor_autoload_check_stop\n"));
|
||||
if (!fsensor_enabled) return;
|
||||
// puts_P(_N("fsensor_autoload_check_stop 1\n"));
|
||||
|
@ -292,7 +339,7 @@ void fsensor_autoload_check_stop(void)
|
|||
fsensor_autoload_sum = 0;
|
||||
fsensor_watch_autoload = false;
|
||||
fsensor_watch_runout = true;
|
||||
fsensor_err_cnt = 0;
|
||||
fsensor_reset_err_cnt();
|
||||
}
|
||||
#endif //PAT9125
|
||||
|
||||
|
@ -357,6 +404,7 @@ bool fsensor_check_autoload(void)
|
|||
return false;
|
||||
}
|
||||
|
||||
#ifdef PAT9125
|
||||
void fsensor_oq_meassure_set(bool State)
|
||||
{
|
||||
fsensor_oq_meassure_enabled = State;
|
||||
|
@ -374,12 +422,11 @@ void fsensor_oq_meassure_start(uint8_t skip)
|
|||
fsensor_oq_yd_sum = 0;
|
||||
fsensor_oq_er_sum = 0;
|
||||
fsensor_oq_er_max = 0;
|
||||
fsensor_oq_yd_min = FSENSOR_OQ_MAX_YD;
|
||||
fsensor_oq_yd_min = INT16_MAX;
|
||||
fsensor_oq_yd_max = 0;
|
||||
fsensor_oq_sh_sum = 0;
|
||||
pat9125_update();
|
||||
pat9125_y = 0;
|
||||
fsensor_watch_runout = false;
|
||||
fsensor_oq_meassure = true;
|
||||
}
|
||||
|
||||
|
@ -391,10 +438,9 @@ void fsensor_oq_meassure_stop(void)
|
|||
printf_P(_N(" st_sum=%u yd_sum=%u er_sum=%u er_max=%hhu\n"), fsensor_oq_st_sum, fsensor_oq_yd_sum, fsensor_oq_er_sum, fsensor_oq_er_max);
|
||||
printf_P(_N(" yd_min=%u yd_max=%u yd_avg=%u sh_avg=%u\n"), fsensor_oq_yd_min, fsensor_oq_yd_max, (uint16_t)((uint32_t)fsensor_oq_yd_sum * fsensor_chunk_len / fsensor_oq_st_sum), (uint16_t)(fsensor_oq_sh_sum / fsensor_oq_samples));
|
||||
fsensor_oq_meassure = false;
|
||||
fsensor_watch_runout = true;
|
||||
fsensor_err_cnt = 0;
|
||||
}
|
||||
|
||||
#ifdef FSENSOR_QUALITY
|
||||
const char _OK[] PROGMEM = "OK";
|
||||
const char _NG[] PROGMEM = "NG!";
|
||||
|
||||
|
@ -430,18 +476,10 @@ bool fsensor_oq_result(void)
|
|||
printf_P(_N("fsensor_oq_result %S\n"), (res?_OK:_NG));
|
||||
return res;
|
||||
}
|
||||
#ifdef PAT9125
|
||||
ISR(FSENSOR_INT_PIN_VECT)
|
||||
#endif //FSENSOR_QUALITY
|
||||
|
||||
FORCE_INLINE static void fsensor_isr(int st_cnt)
|
||||
{
|
||||
if (mmu_enabled || ir_sensor_detected) return;
|
||||
if (!((fsensor_int_pin_old ^ FSENSOR_INT_PIN_PIN_REG) & FSENSOR_INT_PIN_MASK)) return;
|
||||
fsensor_int_pin_old = FSENSOR_INT_PIN_PIN_REG;
|
||||
static bool _lock = false;
|
||||
if (_lock) return;
|
||||
_lock = true;
|
||||
int st_cnt = fsensor_st_cnt;
|
||||
fsensor_st_cnt = 0;
|
||||
sei();
|
||||
uint8_t old_err_cnt = fsensor_err_cnt;
|
||||
uint8_t pat9125_res = fsensor_oq_meassure?pat9125_update():pat9125_update_y();
|
||||
if (!pat9125_res)
|
||||
|
@ -450,56 +488,71 @@ ISR(FSENSOR_INT_PIN_VECT)
|
|||
fsensor_not_responding = true;
|
||||
printf_P(ERRMSG_PAT9125_NOT_RESP, 1);
|
||||
}
|
||||
|
||||
if (st_cnt != 0)
|
||||
{ //movement
|
||||
if (st_cnt > 0) //positive movement
|
||||
{
|
||||
if (pat9125_y < 0)
|
||||
{
|
||||
if (fsensor_err_cnt)
|
||||
fsensor_err_cnt += 2;
|
||||
else
|
||||
fsensor_err_cnt++;
|
||||
}
|
||||
else if (pat9125_y > 0)
|
||||
{
|
||||
if (fsensor_err_cnt)
|
||||
fsensor_err_cnt--;
|
||||
}
|
||||
else //(pat9125_y == 0)
|
||||
if (((fsensor_dy_old <= 0) || (fsensor_err_cnt)) && (st_cnt > (fsensor_chunk_len >> 1)))
|
||||
fsensor_err_cnt++;
|
||||
if (fsensor_oq_meassure)
|
||||
{
|
||||
if (fsensor_oq_skipchunk)
|
||||
{
|
||||
fsensor_oq_skipchunk--;
|
||||
fsensor_err_cnt = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (st_cnt == fsensor_chunk_len)
|
||||
{
|
||||
if (pat9125_y > 0) if (fsensor_oq_yd_min > pat9125_y) fsensor_oq_yd_min = (fsensor_oq_yd_min + pat9125_y) / 2;
|
||||
if (pat9125_y >= 0) if (fsensor_oq_yd_max < pat9125_y) fsensor_oq_yd_max = (fsensor_oq_yd_max + pat9125_y) / 2;
|
||||
}
|
||||
fsensor_oq_samples++;
|
||||
fsensor_oq_st_sum += st_cnt;
|
||||
if (pat9125_y > 0) fsensor_oq_yd_sum += pat9125_y;
|
||||
if (fsensor_err_cnt > old_err_cnt)
|
||||
fsensor_oq_er_sum += (fsensor_err_cnt - old_err_cnt);
|
||||
if (fsensor_oq_er_max < fsensor_err_cnt)
|
||||
fsensor_oq_er_max = fsensor_err_cnt;
|
||||
fsensor_oq_sh_sum += pat9125_s;
|
||||
}
|
||||
}
|
||||
}
|
||||
else //negative movement
|
||||
{
|
||||
}
|
||||
}
|
||||
else
|
||||
{ //no movement
|
||||
{
|
||||
// movement was planned, check for sensor movement
|
||||
int8_t st_dir = st_cnt >= 0;
|
||||
int8_t pat9125_dir = pat9125_y >= 0;
|
||||
|
||||
if (pat9125_y == 0)
|
||||
{
|
||||
if (st_dir)
|
||||
{
|
||||
// no movement detected: we might be within a blind sensor range,
|
||||
// update the frame and shutter parameters we didn't earlier
|
||||
if (!fsensor_oq_meassure)
|
||||
pat9125_update_bs();
|
||||
|
||||
// increment the error count only if underexposed: filament likely missing
|
||||
if ((pat9125_b < FSENSOR_OQ_MIN_BR) && (pat9125_s > FSENSOR_OQ_MAX_SH))
|
||||
{
|
||||
// check for a dark frame (<30% avg brightness) with long exposure
|
||||
++fsensor_err_cnt;
|
||||
}
|
||||
else
|
||||
{
|
||||
// good frame, filament likely present
|
||||
if(fsensor_err_cnt) --fsensor_err_cnt;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (pat9125_dir != st_dir)
|
||||
{
|
||||
// detected direction opposite of motor movement
|
||||
if (st_dir) ++fsensor_err_cnt;
|
||||
}
|
||||
else if (pat9125_dir == st_dir)
|
||||
{
|
||||
// direction agreeing with planned movement
|
||||
if (fsensor_err_cnt) --fsensor_err_cnt;
|
||||
}
|
||||
|
||||
if (st_dir && fsensor_oq_meassure)
|
||||
{
|
||||
// extruding with quality assessment
|
||||
if (fsensor_oq_skipchunk)
|
||||
{
|
||||
fsensor_oq_skipchunk--;
|
||||
fsensor_err_cnt = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (st_cnt == fsensor_chunk_len)
|
||||
{
|
||||
if (pat9125_y > 0) if (fsensor_oq_yd_min > pat9125_y) fsensor_oq_yd_min = (fsensor_oq_yd_min + pat9125_y) / 2;
|
||||
if (pat9125_y >= 0) if (fsensor_oq_yd_max < pat9125_y) fsensor_oq_yd_max = (fsensor_oq_yd_max + pat9125_y) / 2;
|
||||
}
|
||||
fsensor_oq_samples++;
|
||||
fsensor_oq_st_sum += st_cnt;
|
||||
if (pat9125_y > 0) fsensor_oq_yd_sum += pat9125_y;
|
||||
if (fsensor_err_cnt > old_err_cnt)
|
||||
fsensor_oq_er_sum += (fsensor_err_cnt - old_err_cnt);
|
||||
if (fsensor_oq_er_max < fsensor_err_cnt)
|
||||
fsensor_oq_er_max = fsensor_err_cnt;
|
||||
fsensor_oq_sh_sum += pat9125_s;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef DEBUG_FSENSOR_LOG
|
||||
|
@ -510,11 +563,29 @@ ISR(FSENSOR_INT_PIN_VECT)
|
|||
}
|
||||
#endif //DEBUG_FSENSOR_LOG
|
||||
|
||||
fsensor_dy_old = pat9125_y;
|
||||
pat9125_y = 0;
|
||||
}
|
||||
|
||||
_lock = false;
|
||||
return;
|
||||
ISR(FSENSOR_INT_PIN_VECT)
|
||||
{
|
||||
if (mmu_enabled || ir_sensor_detected) return;
|
||||
if (!((fsensor_int_pin_old ^ FSENSOR_INT_PIN_PIN_REG) & FSENSOR_INT_PIN_MASK)) return;
|
||||
fsensor_int_pin_old = FSENSOR_INT_PIN_PIN_REG;
|
||||
|
||||
// prevent isr re-entry
|
||||
static bool _lock = false;
|
||||
if (!_lock)
|
||||
{
|
||||
// fetch fsensor_st_cnt atomically
|
||||
int st_cnt = fsensor_st_cnt;
|
||||
fsensor_st_cnt = 0;
|
||||
|
||||
_lock = true;
|
||||
sei();
|
||||
fsensor_isr(st_cnt);
|
||||
cli();
|
||||
_lock = false;
|
||||
}
|
||||
}
|
||||
|
||||
void fsensor_setup_interrupt(void)
|
||||
|
@ -532,32 +603,17 @@ void fsensor_setup_interrupt(void)
|
|||
PCICR |= bit(FSENSOR_INT_PIN_PCICR_BIT); // enable corresponding PinChangeInterrupt (set of pins)
|
||||
}
|
||||
|
||||
void fsensor_st_block_chunk(int cnt)
|
||||
{
|
||||
if (!fsensor_enabled) return;
|
||||
fsensor_st_cnt += cnt;
|
||||
|
||||
// !!! bit toggling (PINxn <- 1) (for PinChangeInterrupt) does not work for some MCU pins
|
||||
if (PIN_GET(FSENSOR_INT_PIN)) {PIN_VAL(FSENSOR_INT_PIN, LOW);}
|
||||
else {PIN_VAL(FSENSOR_INT_PIN, HIGH);}
|
||||
}
|
||||
#endif //PAT9125
|
||||
|
||||
void fsensor_st_block_begin(block_t* bl)
|
||||
{
|
||||
if (!fsensor_enabled) return;
|
||||
if (((fsensor_st_cnt > 0) && (bl->direction_bits & 0x8)) ||
|
||||
((fsensor_st_cnt < 0) && !(bl->direction_bits & 0x8)))
|
||||
{
|
||||
// !!! bit toggling (PINxn <- 1) (for PinChangeInterrupt) does not work for some MCU pins
|
||||
if (PIN_GET(FSENSOR_INT_PIN)) {PIN_VAL(FSENSOR_INT_PIN, LOW);}
|
||||
else {PIN_VAL(FSENSOR_INT_PIN, HIGH);}
|
||||
}
|
||||
}
|
||||
|
||||
void fsensor_st_block_chunk(block_t* bl, int cnt)
|
||||
{
|
||||
if (!fsensor_enabled) return;
|
||||
fsensor_st_cnt += (bl->direction_bits & 0x8)?-cnt:cnt;
|
||||
if ((fsensor_st_cnt >= fsensor_chunk_len) || (fsensor_st_cnt <= -fsensor_chunk_len))
|
||||
{
|
||||
// !!! bit toggling (PINxn <- 1) (for PinChangeInterrupt) does not work for some MCU pins
|
||||
if (PIN_GET(FSENSOR_INT_PIN)) {PIN_VAL(FSENSOR_INT_PIN, LOW);}
|
||||
else {PIN_VAL(FSENSOR_INT_PIN, HIGH);}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//! Common code for enqueing M600 and supplemental codes into the command queue.
|
||||
//! Used both for the IR sensor and the PAT9125
|
||||
|
@ -576,119 +632,158 @@ void fsensor_enque_M600(){
|
|||
void fsensor_update(void)
|
||||
{
|
||||
#ifdef PAT9125
|
||||
if (fsensor_enabled && fsensor_watch_runout && (fsensor_err_cnt > FSENSOR_ERR_MAX))
|
||||
{
|
||||
bool autoload_enabled_tmp = fsensor_autoload_enabled;
|
||||
fsensor_autoload_enabled = false;
|
||||
bool oq_meassure_enabled_tmp = fsensor_oq_meassure_enabled;
|
||||
fsensor_oq_meassure_enabled = true;
|
||||
if (fsensor_watch_runout && (fsensor_err_cnt > FSENSOR_ERR_MAX))
|
||||
{
|
||||
fsensor_stop_and_save_print();
|
||||
KEEPALIVE_STATE(IN_HANDLER);
|
||||
|
||||
fsensor_stop_and_save_print();
|
||||
bool autoload_enabled_tmp = fsensor_autoload_enabled;
|
||||
fsensor_autoload_enabled = false;
|
||||
bool oq_meassure_enabled_tmp = fsensor_oq_meassure_enabled;
|
||||
fsensor_oq_meassure_enabled = true;
|
||||
|
||||
fsensor_err_cnt = 0;
|
||||
fsensor_oq_meassure_start(0);
|
||||
// move the nozzle away while checking the filament
|
||||
current_position[Z_AXIS] += 0.8;
|
||||
if(current_position[Z_AXIS] > Z_MAX_POS) current_position[Z_AXIS] = Z_MAX_POS;
|
||||
plan_buffer_line_curposXYZE(max_feedrate[Z_AXIS]);
|
||||
st_synchronize();
|
||||
|
||||
enquecommand_front_P((PSTR("G1 E-3 F200")));
|
||||
process_commands();
|
||||
KEEPALIVE_STATE(IN_HANDLER);
|
||||
cmdqueue_pop_front();
|
||||
st_synchronize();
|
||||
// check the filament in isolation
|
||||
fsensor_reset_err_cnt();
|
||||
fsensor_oq_meassure_start(0);
|
||||
float e_tmp = current_position[E_AXIS];
|
||||
current_position[E_AXIS] -= 3;
|
||||
plan_buffer_line_curposXYZE(250/60);
|
||||
current_position[E_AXIS] = e_tmp;
|
||||
plan_buffer_line_curposXYZE(200/60);
|
||||
st_synchronize();
|
||||
fsensor_oq_meassure_stop();
|
||||
|
||||
enquecommand_front_P((PSTR("G1 E3 F200")));
|
||||
process_commands();
|
||||
KEEPALIVE_STATE(IN_HANDLER);
|
||||
cmdqueue_pop_front();
|
||||
st_synchronize();
|
||||
|
||||
uint8_t err_cnt = fsensor_err_cnt;
|
||||
fsensor_oq_meassure_stop();
|
||||
|
||||
bool err = false;
|
||||
err |= (err_cnt > 1);
|
||||
|
||||
err |= (fsensor_oq_er_sum > 2);
|
||||
err |= (fsensor_oq_yd_sum < (4 * FSENSOR_OQ_MIN_YD));
|
||||
bool err = false;
|
||||
err |= (fsensor_err_cnt > 0); // final error count is non-zero
|
||||
err |= (fsensor_oq_er_sum > FSENSOR_OQ_MAX_ES); // total error count is above limit
|
||||
err |= (fsensor_oq_yd_sum < FSENSOR_OQ_MIN_YD); // total measured distance is below limit
|
||||
|
||||
fsensor_restore_print_and_continue();
|
||||
fsensor_autoload_enabled = autoload_enabled_tmp;
|
||||
fsensor_oq_meassure_enabled = oq_meassure_enabled_tmp;
|
||||
|
||||
if (!err)
|
||||
printf_P(PSTR("fsensor_err_cnt = 0\n"));
|
||||
else
|
||||
fsensor_enque_M600();
|
||||
}
|
||||
fsensor_autoload_enabled = autoload_enabled_tmp;
|
||||
fsensor_oq_meassure_enabled = oq_meassure_enabled_tmp;
|
||||
unsigned long now = _millis();
|
||||
if (!err && (now - fsensor_softfail_last) > FSENSOR_SOFTERR_DELTA)
|
||||
fsensor_softfail_ccnt = 0;
|
||||
if (!err && fsensor_softfail_ccnt <= FSENSOR_SOFTERR_CMAX)
|
||||
{
|
||||
printf_P(PSTR("fsensor_err_cnt = 0\n"));
|
||||
++fsensor_softfail;
|
||||
++fsensor_softfail_ccnt;
|
||||
fsensor_softfail_last = now;
|
||||
}
|
||||
else
|
||||
{
|
||||
fsensor_softfail_ccnt = 0;
|
||||
fsensor_softfail_last = 0;
|
||||
fsensor_enque_M600();
|
||||
}
|
||||
}
|
||||
#else //PAT9125
|
||||
if (CHECK_FSENSOR && fsensor_enabled && ir_sensor_detected)
|
||||
if (CHECK_FSENSOR && ir_sensor_detected)
|
||||
{
|
||||
if(digitalRead(IR_SENSOR_PIN))
|
||||
{ // IR_SENSOR_PIN ~ H
|
||||
#if IR_SENSOR_ANALOG
|
||||
if(!bIRsensorStateFlag)
|
||||
if(digitalRead(IR_SENSOR_PIN))
|
||||
{ // IR_SENSOR_PIN ~ H
|
||||
#ifdef IR_SENSOR_ANALOG
|
||||
if(!bIRsensorStateFlag)
|
||||
{
|
||||
bIRsensorStateFlag=true;
|
||||
nIRsensorLastTime=_millis();
|
||||
}
|
||||
else
|
||||
{
|
||||
if((_millis()-nIRsensorLastTime)>IR_SENSOR_STEADY)
|
||||
{
|
||||
bIRsensorStateFlag=true;
|
||||
nIRsensorLastTime=_millis();
|
||||
}
|
||||
else
|
||||
{
|
||||
if((_millis()-nIRsensorLastTime)>IR_SENSOR_STEADY)
|
||||
{
|
||||
uint8_t nMUX1,nMUX2;
|
||||
uint16_t nADC;
|
||||
bIRsensorStateFlag=false;
|
||||
// sequence for direct data reading from AD converter
|
||||
DISABLE_TEMPERATURE_INTERRUPT();
|
||||
nMUX1=ADMUX; // ADMUX saving
|
||||
nMUX2=ADCSRB;
|
||||
adc_setmux(VOLT_IR_PIN);
|
||||
ADCSRA|=(1<<ADSC); // first conversion after ADMUX change discarded (preventively)
|
||||
while(ADCSRA&(1<<ADSC))
|
||||
;
|
||||
ADCSRA|=(1<<ADSC); // second conversion used
|
||||
while(ADCSRA&(1<<ADSC))
|
||||
;
|
||||
nADC=ADC;
|
||||
ADMUX=nMUX1; // ADMUX restoring
|
||||
ADCSRB=nMUX2;
|
||||
ENABLE_TEMPERATURE_INTERRUPT();
|
||||
// end of sequence for ...
|
||||
if((oFsensorPCB==ClFsensorPCB::_Rev03b)&&((nADC*OVERSAMPLENR)>((int)IRsensor_Hopen_TRESHOLD)))
|
||||
{
|
||||
fsensor_disable();
|
||||
fsensor_not_responding = true;
|
||||
printf_P(PSTR("IR sensor not responding (%d)!\n"),1);
|
||||
if((ClFsensorActionNA)eeprom_read_byte((uint8_t*)EEPROM_FSENSOR_ACTION_NA)==ClFsensorActionNA::_Pause)
|
||||
if(oFsensorActionNA==ClFsensorActionNA::_Pause)
|
||||
lcd_pause_print();
|
||||
}
|
||||
else
|
||||
{
|
||||
uint8_t nMUX1,nMUX2;
|
||||
uint16_t nADC;
|
||||
bIRsensorStateFlag=false;
|
||||
// sequence for direct data reading from AD converter
|
||||
DISABLE_TEMPERATURE_INTERRUPT();
|
||||
nMUX1=ADMUX; // ADMUX saving
|
||||
nMUX2=ADCSRB;
|
||||
adc_setmux(VOLT_IR_PIN);
|
||||
ADCSRA|=(1<<ADSC); // first conversion after ADMUX change discarded (preventively)
|
||||
while(ADCSRA&(1<<ADSC))
|
||||
;
|
||||
ADCSRA|=(1<<ADSC); // second conversion used
|
||||
while(ADCSRA&(1<<ADSC))
|
||||
;
|
||||
nADC=ADC;
|
||||
ADMUX=nMUX1; // ADMUX restoring
|
||||
ADCSRB=nMUX2;
|
||||
ENABLE_TEMPERATURE_INTERRUPT();
|
||||
// end of sequence for ...
|
||||
// Detection of correct function of fsensor v04 - it must NOT read >4.6V
|
||||
// If it does, it means a disconnected cables or faulty board
|
||||
if( (oFsensorPCB == ClFsensorPCB::_Rev04) && ( (nADC*OVERSAMPLENR) > IRsensor_Hopen_TRESHOLD ) )
|
||||
{
|
||||
fsensor_disable();
|
||||
fsensor_not_responding = true;
|
||||
printf_P(PSTR("IR sensor not responding (%d)!\n"),1);
|
||||
if((ClFsensorActionNA)eeprom_read_byte((uint8_t*)EEPROM_FSENSOR_ACTION_NA)==ClFsensorActionNA::_Pause)
|
||||
|
||||
// if we are printing and FS action is set to "Pause", force pause the print
|
||||
if(oFsensorActionNA==ClFsensorActionNA::_Pause)
|
||||
lcd_pause_print();
|
||||
}
|
||||
else
|
||||
{
|
||||
#endif //IR_SENSOR_ANALOG
|
||||
fsensor_checkpoint_print();
|
||||
fsensor_enque_M600();
|
||||
#if IR_SENSOR_ANALOG
|
||||
}
|
||||
}
|
||||
fsensor_checkpoint_print();
|
||||
fsensor_enque_M600();
|
||||
#ifdef IR_SENSOR_ANALOG
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{ // IR_SENSOR_PIN ~ L
|
||||
bIRsensorStateFlag=false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{ // IR_SENSOR_PIN ~ L
|
||||
bIRsensorStateFlag=false;
|
||||
#endif //IR_SENSOR_ANALOG
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif //PAT9125
|
||||
}
|
||||
|
||||
#if IR_SENSOR_ANALOG
|
||||
bool fsensor_IR_check()
|
||||
{
|
||||
uint16_t volt_IR_int;
|
||||
bool bCheckResult;
|
||||
|
||||
volt_IR_int=current_voltage_raw_IR;
|
||||
bCheckResult=(volt_IR_int<((int)IRsensor_Lmax_TRESHOLD))||(volt_IR_int>((int)IRsensor_Hmin_TRESHOLD));
|
||||
bCheckResult=bCheckResult&&(!((oFsensorPCB==ClFsensorPCB::_Rev03b)&&(volt_IR_int>((int)IRsensor_Hopen_TRESHOLD))));
|
||||
return(bCheckResult);
|
||||
#ifdef IR_SENSOR_ANALOG
|
||||
/// This is called only upon start of the printer or when switching the fsensor ON in the menu
|
||||
/// We cannot do temporal window checks here (aka the voltage has been in some range for a period of time)
|
||||
bool fsensor_IR_check(){
|
||||
if( IRsensor_Lmax_TRESHOLD <= current_voltage_raw_IR && current_voltage_raw_IR <= IRsensor_Hmin_TRESHOLD ){
|
||||
/// If the voltage is in forbidden range, the fsensor is ok, but the lever is mounted improperly.
|
||||
/// Or the user is so creative so that he can hold a piece of fillament in the hole in such a genius way,
|
||||
/// that the IR fsensor reading is within 1.5 and 3V ... this would have been highly unusual
|
||||
/// and would have been considered more like a sabotage than normal printer operation
|
||||
printf_P(PSTR("fsensor in forbidden range 1.5-3V - check sensor\n"));
|
||||
return false;
|
||||
}
|
||||
if( oFsensorPCB == ClFsensorPCB::_Rev04 ){
|
||||
/// newer IR sensor cannot normally produce 4.6-5V, this is considered a failure/bad mount
|
||||
if( IRsensor_Hopen_TRESHOLD <= current_voltage_raw_IR && current_voltage_raw_IR <= IRsensor_VMax_TRESHOLD ){
|
||||
printf_P(PSTR("fsensor v0.4 in fault range 4.6-5V - unconnected\n"));
|
||||
return false;
|
||||
}
|
||||
/// newer IR sensor cannot normally produce 0-0.3V, this is considered a failure
|
||||
#if 0 //Disabled as it has to be decided if we gonna use this or not.
|
||||
if( IRsensor_Hopen_TRESHOLD <= current_voltage_raw_IR && current_voltage_raw_IR <= IRsensor_VMax_TRESHOLD ){
|
||||
printf_P(PSTR("fsensor v0.4 in fault range 0.0-0.3V - wrong IR sensor\n"));
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
/// If IR sensor is "uknown state" and filament is not loaded > 1.5V return false
|
||||
#if 0
|
||||
if( (oFsensorPCB == ClFsensorPCB::_Undef) && ( current_voltage_raw_IR > IRsensor_Lmax_TRESHOLD ) ){
|
||||
printf_P(PSTR("Unknown IR sensor version and no filament loaded detected.\n"));
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
// otherwise the IR fsensor is considered working correctly
|
||||
return true;
|
||||
}
|
||||
#endif //IR_SENSOR_ANALOG
|
||||
|
|
|
@ -6,15 +6,16 @@
|
|||
#include "config.h"
|
||||
|
||||
|
||||
//! minimum meassured chunk length in steps
|
||||
extern int16_t fsensor_chunk_len;
|
||||
// enable/disable flag
|
||||
extern bool fsensor_enabled;
|
||||
// not responding flag
|
||||
extern bool fsensor_not_responding;
|
||||
//enable/disable quality meassurement
|
||||
extern bool fsensor_oq_meassure_enabled;
|
||||
|
||||
#ifdef PAT9125
|
||||
// optical checking "chunk lenght" (already in steps)
|
||||
extern int16_t fsensor_chunk_len;
|
||||
// count of soft failures
|
||||
extern uint8_t fsensor_softfail;
|
||||
#endif
|
||||
|
||||
//! @name save restore printing
|
||||
//! @{
|
||||
|
@ -28,6 +29,11 @@ extern void fsensor_checkpoint_print(void);
|
|||
//! initialize
|
||||
extern void fsensor_init(void);
|
||||
|
||||
#ifdef PAT9125
|
||||
//! update axis resolution
|
||||
extern void fsensor_set_axis_steps_per_unit(float u);
|
||||
#endif
|
||||
|
||||
//! @name enable/disable
|
||||
//! @{
|
||||
extern bool fsensor_enable(bool bUpdateEEPROM=true);
|
||||
|
@ -52,30 +58,40 @@ extern void fsensor_autoload_check_stop(void);
|
|||
extern bool fsensor_check_autoload(void);
|
||||
//! @}
|
||||
|
||||
#ifdef PAT9125
|
||||
//! @name optical quality measurement support
|
||||
//! @{
|
||||
extern bool fsensor_oq_meassure_enabled;
|
||||
extern void fsensor_oq_meassure_set(bool State);
|
||||
extern void fsensor_oq_meassure_start(uint8_t skip);
|
||||
extern void fsensor_oq_meassure_stop(void);
|
||||
extern bool fsensor_oq_result(void);
|
||||
//! @}
|
||||
|
||||
|
||||
#include "planner.h"
|
||||
//! @name callbacks from stepper
|
||||
//! @{
|
||||
extern void fsensor_st_block_begin(block_t* bl);
|
||||
extern void fsensor_st_block_chunk(block_t* bl, int cnt);
|
||||
extern void fsensor_st_block_chunk(int cnt);
|
||||
|
||||
// debugging
|
||||
extern uint8_t fsensor_log;
|
||||
|
||||
// There's really nothing to do in block_begin: the stepper ISR likely has
|
||||
// called us already at the end of the last block, making this integration
|
||||
// redundant. LA1.5 might not always do that during a coasting move, so attempt
|
||||
// to drain fsensor_st_cnt anyway at the beginning of the new block.
|
||||
#define fsensor_st_block_begin(rev) fsensor_st_block_chunk(0)
|
||||
//! @}
|
||||
#endif //PAT9125
|
||||
|
||||
#define VOLT_DIV_REF 5
|
||||
|
||||
#if IR_SENSOR_ANALOG
|
||||
#ifdef IR_SENSOR_ANALOG
|
||||
#define IR_SENSOR_STEADY 10 // [ms]
|
||||
|
||||
enum class ClFsensorPCB:uint_least8_t
|
||||
{
|
||||
_Old=0,
|
||||
_Rev03b=1,
|
||||
_Rev04=1,
|
||||
_Undef=EEPROM_EMPTY_VALUE
|
||||
};
|
||||
|
||||
|
@ -88,8 +104,21 @@ enum class ClFsensorActionNA:uint_least8_t
|
|||
|
||||
extern ClFsensorPCB oFsensorPCB;
|
||||
extern ClFsensorActionNA oFsensorActionNA;
|
||||
extern const char* FsensorIRVersionText();
|
||||
|
||||
extern bool fsensor_IR_check();
|
||||
constexpr uint16_t Voltage2Raw(float V){
|
||||
return ( V * 1023 * OVERSAMPLENR / VOLT_DIV_REF ) + 0.5F;
|
||||
}
|
||||
constexpr float Raw2Voltage(uint16_t raw){
|
||||
return VOLT_DIV_REF*(raw / (1023.F * OVERSAMPLENR) );
|
||||
}
|
||||
constexpr uint16_t IRsensor_Ldiode_TRESHOLD = Voltage2Raw(0.3F); // ~0.3V, raw value=982
|
||||
constexpr uint16_t IRsensor_Lmax_TRESHOLD = Voltage2Raw(1.5F); // ~1.5V (0.3*Vcc), raw value=4910
|
||||
constexpr uint16_t IRsensor_Hmin_TRESHOLD = Voltage2Raw(3.0F); // ~3.0V (0.6*Vcc), raw value=9821
|
||||
constexpr uint16_t IRsensor_Hopen_TRESHOLD = Voltage2Raw(4.6F); // ~4.6V (N.C. @ Ru~20-50k, Rd'=56k, Ru'=10k), raw value=15059
|
||||
constexpr uint16_t IRsensor_VMax_TRESHOLD = Voltage2Raw(5.F); // ~5V, raw value=16368
|
||||
|
||||
#endif //IR_SENSOR_ANALOG
|
||||
|
||||
#endif //FSENSOR_H
|
||||
|
|
|
@ -1,180 +1,184 @@
|
|||
#include <avr/io.h>
|
||||
#include <avr/interrupt.h>
|
||||
#include "io_atmega2560.h"
|
||||
|
||||
// All this is about silencing the heat bed, as it behaves like a loudspeaker.
|
||||
// Basically, we want the PWM heating switched at 30Hz (or so) which is a well ballanced
|
||||
// frequency for both power supply units (i.e. both PSUs are reasonably silent).
|
||||
// The only trouble is the rising or falling edge of bed heating - that creates an audible click.
|
||||
// This audible click may be suppressed by making the rising or falling edge NOT sharp.
|
||||
// Of course, making non-sharp edges in digital technology is not easy, but there is a solution.
|
||||
// It is possible to do a fast PWM sequence with duty starting from 0 to 255.
|
||||
// Doing this at higher frequency than the bed "loudspeaker" can handle makes the click barely audible.
|
||||
// Technically:
|
||||
// timer0 is set to fast PWM mode at 62.5kHz (timer0 is linked to the bed heating pin) (zero prescaler)
|
||||
// To keep the bed switching at 30Hz - we don't want the PWM running at 62kHz all the time
|
||||
// since it would burn the heatbed's MOSFET:
|
||||
// 16MHz/256 levels of PWM duty gives us 62.5kHz
|
||||
// 62.5kHz/256 gives ~244Hz, that is still too fast - 244/8 gives ~30Hz, that's what we need
|
||||
// So the automaton runs atop of inner 8 (or 16) cycles.
|
||||
// The finite automaton is running in the ISR(TIMER0_OVF_vect)
|
||||
|
||||
// 2019-08-14 update: the original algorithm worked very well, however there were 2 regressions:
|
||||
// 1. 62kHz ISR requires considerable amount of processing power,
|
||||
// USB transfer speed dropped by 20%, which was most notable when doing short G-code segments.
|
||||
// 2. Some users reported TLed PSU started clicking when running at 120V/60Hz.
|
||||
// This looks like the original algorithm didn't maintain base PWM 30Hz, but only 15Hz
|
||||
// To address both issues, there is an improved approach based on the idea of leveraging
|
||||
// different CLK prescalers in some automaton states - i.e. when holding LOW or HIGH on the output pin,
|
||||
// we don't have to clock 62kHz, but we can increase the CLK prescaler for these states to 8 (or even 64).
|
||||
// That shall result in the ISR not being called that much resulting in regained performance
|
||||
// Theoretically this is relatively easy, however one must be very carefull handling the AVR's timer
|
||||
// control registers correctly, especially setting them in a correct order.
|
||||
// Some registers are double buffered, some changes are applied in next cycles etc.
|
||||
// The biggest problem was with the CLK prescaler itself - this circuit is shared among almost all timers,
|
||||
// we don't want to reset the prescaler counted value when transiting among automaton states.
|
||||
// Resetting the prescaler would make the PWM more precise, right now there are temporal segments
|
||||
// of variable period ranging from 0 to 7 62kHz ticks - that's logical, the timer must "sync"
|
||||
// to the new slower CLK after setting the slower prescaler value.
|
||||
// In our application, this isn't any significant problem and may be ignored.
|
||||
// Doing changes in timer's registers non-correctly results in artefacts on the output pin
|
||||
// - it can toggle unnoticed, which will result in bed clicking again.
|
||||
// That's why there are special transition states ZERO_TO_RISE and ONE_TO_FALL, which enable the
|
||||
// counter change its operation atomically and without artefacts on the output pin.
|
||||
// The resulting signal on the output pin was checked with an osciloscope.
|
||||
// If there are any change requirements in the future, the signal must be checked with an osciloscope again,
|
||||
// ad-hoc changes may completely screw things up!
|
||||
|
||||
///! Definition off finite automaton states
|
||||
enum class States : uint8_t {
|
||||
ZERO_START = 0,///< entry point of the automaton - reads the soft_pwm_bed value for the next whole PWM cycle
|
||||
ZERO, ///< steady 0 (OFF), no change for the whole period
|
||||
ZERO_TO_RISE, ///< metastate allowing the timer change its state atomically without artefacts on the output pin
|
||||
RISE, ///< 16 fast PWM cycles with increasing duty up to steady ON
|
||||
RISE_TO_ONE, ///< metastate allowing the timer change its state atomically without artefacts on the output pin
|
||||
ONE, ///< steady 1 (ON), no change for the whole period
|
||||
ONE_TO_FALL, ///< metastate allowing the timer change its state atomically without artefacts on the output pin
|
||||
FALL, ///< 16 fast PWM cycles with decreasing duty down to steady OFF
|
||||
FALL_TO_ZERO ///< metastate allowing the timer change its state atomically without artefacts on the output pin
|
||||
};
|
||||
|
||||
///! Inner states of the finite automaton
|
||||
static States state = States::ZERO_START;
|
||||
|
||||
///! Fast PWM counter is used in the RISE and FALL states (62.5kHz)
|
||||
static uint8_t slowCounter = 0;
|
||||
///! Slow PWM counter is used in the ZERO and ONE states (62.5kHz/8 or 64)
|
||||
static uint8_t fastCounter = 0;
|
||||
///! PWM counter for the whole cycle - a cache for soft_pwm_bed
|
||||
static uint8_t pwm = 0;
|
||||
|
||||
///! The slow PWM duty for the next 30Hz cycle
|
||||
///! Set in the whole firmware at various places
|
||||
extern unsigned char soft_pwm_bed;
|
||||
|
||||
/// fastMax - how many fast PWM steps to do in RISE and FALL states
|
||||
/// 16 is a good compromise between silenced bed ("smooth" edges)
|
||||
/// and not burning the switching MOSFET
|
||||
static const uint8_t fastMax = 16;
|
||||
|
||||
/// Scaler 16->256 for fast PWM
|
||||
static const uint8_t fastShift = 4;
|
||||
|
||||
/// Increment slow PWM counter by slowInc every ZERO or ONE state
|
||||
/// This allows for fine-tuning the basic PWM switching frequency
|
||||
/// A possible further optimization - use a 64 prescaler (instead of 8)
|
||||
/// increment slowCounter by 1
|
||||
/// but use less bits of soft PWM - something like soft_pwm_bed >> 2
|
||||
/// that may further reduce the CPU cycles required by the bed heating automaton
|
||||
/// Due to the nature of bed heating the reduced PID precision may not be a major issue, however doing 8x less ISR(timer0_ovf) may significantly improve the performance
|
||||
static const uint8_t slowInc = 1;
|
||||
|
||||
ISR(TIMER0_OVF_vect) // timer compare interrupt service routine
|
||||
{
|
||||
switch(state){
|
||||
case States::ZERO_START:
|
||||
pwm = soft_pwm_bed << 1;// expecting soft_pwm_bed to be 7bit!
|
||||
if( pwm != 0 ){
|
||||
state = States::ZERO; // do nothing, let it tick once again after the 30Hz period
|
||||
}
|
||||
break;
|
||||
case States::ZERO: // end of state ZERO - we'll either stay in ZERO or change to RISE
|
||||
// In any case update our cache of pwm value for the next whole cycle from soft_pwm_bed
|
||||
slowCounter += slowInc; // this does software timer_clk/256 or less (depends on slowInc)
|
||||
if( slowCounter > pwm ){
|
||||
return;
|
||||
} // otherwise moving towards RISE
|
||||
state = States::ZERO_TO_RISE; // and finalize the change in a transitional state RISE0
|
||||
break;
|
||||
// even though it may look like the ZERO state may be glued together with the ZERO_TO_RISE, don't do it
|
||||
// the timer must tick once more in order to get rid of occasional output pin toggles.
|
||||
case States::ZERO_TO_RISE: // special state for handling transition between prescalers and switching inverted->non-inverted fast-PWM without toggling the output pin.
|
||||
// It must be done in consequent steps, otherwise the pin will get flipped up and down during one PWM cycle.
|
||||
// Also beware of the correct sequence of the following timer control registers initialization - it really matters!
|
||||
state = States::RISE; // prepare for standard RISE cycles
|
||||
fastCounter = fastMax - 1;// we'll do 16-1 cycles of RISE
|
||||
TCNT0 = 255; // force overflow on the next clock cycle
|
||||
TCCR0B = (1 << CS00); // change prescaler to 1, i.e. 62.5kHz
|
||||
TCCR0A &= ~(1 << COM0B0); // Clear OC0B on Compare Match, set OC0B at BOTTOM (non-inverting mode)
|
||||
break;
|
||||
case States::RISE:
|
||||
OCR0B = (fastMax - fastCounter) << fastShift;
|
||||
if( fastCounter ){
|
||||
--fastCounter;
|
||||
} else { // end of RISE cycles, changing into state ONE
|
||||
state = States::RISE_TO_ONE;
|
||||
OCR0B = 255; // full duty
|
||||
TCNT0 = 254; // make the timer overflow in the next cycle
|
||||
// @@TODO these constants are still subject to investigation
|
||||
}
|
||||
break;
|
||||
case States::RISE_TO_ONE:
|
||||
state = States::ONE;
|
||||
OCR0B = 255; // full duty
|
||||
TCNT0 = 255; // make the timer overflow in the next cycle
|
||||
TCCR0B = (1 << CS01); // change prescaler to 8, i.e. 7.8kHz
|
||||
break;
|
||||
case States::ONE: // state ONE - we'll either stay in ONE or change to FALL
|
||||
OCR0B = 255;
|
||||
slowCounter += slowInc; // this does software timer_clk/256 or less
|
||||
if( slowCounter < pwm ){
|
||||
return;
|
||||
}
|
||||
if( (soft_pwm_bed << 1) >= (255 - slowInc - 1) ){ //@@TODO simplify & explain
|
||||
// if slowInc==2, soft_pwm == 251 will be the first to do short drops to zero. 252 will keep full heating
|
||||
return; // want full duty for the next ONE cycle again - so keep on heating and just wait for the next timer ovf
|
||||
}
|
||||
// otherwise moving towards FALL
|
||||
// @@TODO it looks like ONE_TO_FALL isn't necessary, there are no artefacts at all
|
||||
state = States::ONE;//_TO_FALL;
|
||||
// TCCR0B = (1 << CS00); // change prescaler to 1, i.e. 62.5kHz
|
||||
// break;
|
||||
// case States::ONE_TO_FALL:
|
||||
// OCR0B = 255; // zero duty
|
||||
state=States::FALL;
|
||||
fastCounter = fastMax - 1;// we'll do 16-1 cycles of RISE
|
||||
TCNT0 = 255; // force overflow on the next clock cycle
|
||||
TCCR0B = (1 << CS00); // change prescaler to 1, i.e. 62.5kHz
|
||||
// must switch to inverting mode already here, because it takes a whole PWM cycle and it would make a "1" at the end of this pwm cycle
|
||||
// COM0B1 remains set both in inverting and non-inverting mode
|
||||
TCCR0A |= (1 << COM0B0); // inverting mode
|
||||
break;
|
||||
case States::FALL:
|
||||
OCR0B = (fastMax - fastCounter) << fastShift; // this is the same as in RISE, because now we are setting the zero part of duty due to inverting mode
|
||||
//TCCR0A |= (1 << COM0B0); // already set in ONE_TO_FALL
|
||||
if( fastCounter ){
|
||||
--fastCounter;
|
||||
} else { // end of FALL cycles, changing into state ZERO
|
||||
state = States::FALL_TO_ZERO;
|
||||
TCNT0 = 128; //@@TODO again - need to wait long enough to propagate the timer state changes
|
||||
OCR0B = 255;
|
||||
}
|
||||
break;
|
||||
case States::FALL_TO_ZERO:
|
||||
state = States::ZERO_START; // go to read new soft_pwm_bed value for the next cycle
|
||||
TCNT0 = 128;
|
||||
OCR0B = 255;
|
||||
TCCR0B = (1 << CS01); // change prescaler to 8, i.e. 7.8kHz
|
||||
break;
|
||||
}
|
||||
}
|
||||
#include <avr/io.h>
|
||||
#include <avr/interrupt.h>
|
||||
#include "io_atmega2560.h"
|
||||
|
||||
// All this is about silencing the heat bed, as it behaves like a loudspeaker.
|
||||
// Basically, we want the PWM heating switched at 30Hz (or so) which is a well ballanced
|
||||
// frequency for both power supply units (i.e. both PSUs are reasonably silent).
|
||||
// The only trouble is the rising or falling edge of bed heating - that creates an audible click.
|
||||
// This audible click may be suppressed by making the rising or falling edge NOT sharp.
|
||||
// Of course, making non-sharp edges in digital technology is not easy, but there is a solution.
|
||||
// It is possible to do a fast PWM sequence with duty starting from 0 to 255.
|
||||
// Doing this at higher frequency than the bed "loudspeaker" can handle makes the click barely audible.
|
||||
// Technically:
|
||||
// timer0 is set to fast PWM mode at 62.5kHz (timer0 is linked to the bed heating pin) (zero prescaler)
|
||||
// To keep the bed switching at 30Hz - we don't want the PWM running at 62kHz all the time
|
||||
// since it would burn the heatbed's MOSFET:
|
||||
// 16MHz/256 levels of PWM duty gives us 62.5kHz
|
||||
// 62.5kHz/256 gives ~244Hz, that is still too fast - 244/8 gives ~30Hz, that's what we need
|
||||
// So the automaton runs atop of inner 8 (or 16) cycles.
|
||||
// The finite automaton is running in the ISR(TIMER0_OVF_vect)
|
||||
|
||||
// 2019-08-14 update: the original algorithm worked very well, however there were 2 regressions:
|
||||
// 1. 62kHz ISR requires considerable amount of processing power,
|
||||
// USB transfer speed dropped by 20%, which was most notable when doing short G-code segments.
|
||||
// 2. Some users reported TLed PSU started clicking when running at 120V/60Hz.
|
||||
// This looks like the original algorithm didn't maintain base PWM 30Hz, but only 15Hz
|
||||
// To address both issues, there is an improved approach based on the idea of leveraging
|
||||
// different CLK prescalers in some automaton states - i.e. when holding LOW or HIGH on the output pin,
|
||||
// we don't have to clock 62kHz, but we can increase the CLK prescaler for these states to 8 (or even 64).
|
||||
// That shall result in the ISR not being called that much resulting in regained performance
|
||||
// Theoretically this is relatively easy, however one must be very carefull handling the AVR's timer
|
||||
// control registers correctly, especially setting them in a correct order.
|
||||
// Some registers are double buffered, some changes are applied in next cycles etc.
|
||||
// The biggest problem was with the CLK prescaler itself - this circuit is shared among almost all timers,
|
||||
// we don't want to reset the prescaler counted value when transiting among automaton states.
|
||||
// Resetting the prescaler would make the PWM more precise, right now there are temporal segments
|
||||
// of variable period ranging from 0 to 7 62kHz ticks - that's logical, the timer must "sync"
|
||||
// to the new slower CLK after setting the slower prescaler value.
|
||||
// In our application, this isn't any significant problem and may be ignored.
|
||||
// Doing changes in timer's registers non-correctly results in artefacts on the output pin
|
||||
// - it can toggle unnoticed, which will result in bed clicking again.
|
||||
// That's why there are special transition states ZERO_TO_RISE and ONE_TO_FALL, which enable the
|
||||
// counter change its operation atomically and without artefacts on the output pin.
|
||||
// The resulting signal on the output pin was checked with an osciloscope.
|
||||
// If there are any change requirements in the future, the signal must be checked with an osciloscope again,
|
||||
// ad-hoc changes may completely screw things up!
|
||||
|
||||
// 2020-01-29 update: we are introducing a new option to the automaton that will allow us to force the output state
|
||||
// to either full ON or OFF. This is so that interference during the MBL probing is minimal.
|
||||
// To accomplish this goal we use bedPWMDisabled. It is only supposed to be used for brief periods of time as to
|
||||
// not make the bed temperature too unstable. Also, careful consideration should be used when using this
|
||||
// option as leaving this enabled will also keep the bed output in the state it stopped in.
|
||||
|
||||
///! Definition off finite automaton states
|
||||
enum class States : uint8_t {
|
||||
ZERO_START = 0,///< entry point of the automaton - reads the soft_pwm_bed value for the next whole PWM cycle
|
||||
ZERO, ///< steady 0 (OFF), no change for the whole period
|
||||
ZERO_TO_RISE, ///< metastate allowing the timer change its state atomically without artefacts on the output pin
|
||||
RISE, ///< 16 fast PWM cycles with increasing duty up to steady ON
|
||||
RISE_TO_ONE, ///< metastate allowing the timer change its state atomically without artefacts on the output pin
|
||||
ONE, ///< steady 1 (ON), no change for the whole period
|
||||
FALL, ///< 16 fast PWM cycles with decreasing duty down to steady OFF
|
||||
FALL_TO_ZERO ///< metastate allowing the timer change its state atomically without artefacts on the output pin
|
||||
};
|
||||
|
||||
///! Inner states of the finite automaton
|
||||
static States state = States::ZERO_START;
|
||||
|
||||
bool bedPWMDisabled = 0;
|
||||
|
||||
///! Fast PWM counter is used in the RISE and FALL states (62.5kHz)
|
||||
static uint8_t slowCounter = 0;
|
||||
///! Slow PWM counter is used in the ZERO and ONE states (62.5kHz/8 or 64)
|
||||
static uint8_t fastCounter = 0;
|
||||
///! PWM counter for the whole cycle - a cache for soft_pwm_bed
|
||||
static uint8_t pwm = 0;
|
||||
|
||||
///! The slow PWM duty for the next 30Hz cycle
|
||||
///! Set in the whole firmware at various places
|
||||
extern unsigned char soft_pwm_bed;
|
||||
|
||||
/// fastMax - how many fast PWM steps to do in RISE and FALL states
|
||||
/// 16 is a good compromise between silenced bed ("smooth" edges)
|
||||
/// and not burning the switching MOSFET
|
||||
static const uint8_t fastMax = 16;
|
||||
|
||||
/// Scaler 16->256 for fast PWM
|
||||
static const uint8_t fastShift = 4;
|
||||
|
||||
/// Increment slow PWM counter by slowInc every ZERO or ONE state
|
||||
/// This allows for fine-tuning the basic PWM switching frequency
|
||||
/// A possible further optimization - use a 64 prescaler (instead of 8)
|
||||
/// increment slowCounter by 1
|
||||
/// but use less bits of soft PWM - something like soft_pwm_bed >> 2
|
||||
/// that may further reduce the CPU cycles required by the bed heating automaton
|
||||
/// Due to the nature of bed heating the reduced PID precision may not be a major issue, however doing 8x less ISR(timer0_ovf) may significantly improve the performance
|
||||
static const uint8_t slowInc = 1;
|
||||
|
||||
ISR(TIMER0_OVF_vect) // timer compare interrupt service routine
|
||||
{
|
||||
switch(state){
|
||||
case States::ZERO_START:
|
||||
if (bedPWMDisabled) return; // stay in the OFF state and do not change the output pin
|
||||
pwm = soft_pwm_bed << 1;// expecting soft_pwm_bed to be 7bit!
|
||||
if( pwm != 0 ){
|
||||
state = States::ZERO; // do nothing, let it tick once again after the 30Hz period
|
||||
}
|
||||
break;
|
||||
case States::ZERO: // end of state ZERO - we'll either stay in ZERO or change to RISE
|
||||
// In any case update our cache of pwm value for the next whole cycle from soft_pwm_bed
|
||||
slowCounter += slowInc; // this does software timer_clk/256 or less (depends on slowInc)
|
||||
if( slowCounter > pwm ){
|
||||
return;
|
||||
} // otherwise moving towards RISE
|
||||
state = States::ZERO_TO_RISE; // and finalize the change in a transitional state RISE0
|
||||
break;
|
||||
// even though it may look like the ZERO state may be glued together with the ZERO_TO_RISE, don't do it
|
||||
// the timer must tick once more in order to get rid of occasional output pin toggles.
|
||||
case States::ZERO_TO_RISE: // special state for handling transition between prescalers and switching inverted->non-inverted fast-PWM without toggling the output pin.
|
||||
// It must be done in consequent steps, otherwise the pin will get flipped up and down during one PWM cycle.
|
||||
// Also beware of the correct sequence of the following timer control registers initialization - it really matters!
|
||||
state = States::RISE; // prepare for standard RISE cycles
|
||||
fastCounter = fastMax - 1;// we'll do 16-1 cycles of RISE
|
||||
TCNT0 = 255; // force overflow on the next clock cycle
|
||||
TCCR0B = (1 << CS00); // change prescaler to 1, i.e. 62.5kHz
|
||||
TCCR0A &= ~(1 << COM0B0); // Clear OC0B on Compare Match, set OC0B at BOTTOM (non-inverting mode)
|
||||
break;
|
||||
case States::RISE:
|
||||
OCR0B = (fastMax - fastCounter) << fastShift;
|
||||
if( fastCounter ){
|
||||
--fastCounter;
|
||||
} else { // end of RISE cycles, changing into state ONE
|
||||
state = States::RISE_TO_ONE;
|
||||
OCR0B = 255; // full duty
|
||||
TCNT0 = 254; // make the timer overflow in the next cycle
|
||||
// @@TODO these constants are still subject to investigation
|
||||
}
|
||||
break;
|
||||
case States::RISE_TO_ONE:
|
||||
state = States::ONE;
|
||||
OCR0B = 255; // full duty
|
||||
TCNT0 = 255; // make the timer overflow in the next cycle
|
||||
TCCR0B = (1 << CS01); // change prescaler to 8, i.e. 7.8kHz
|
||||
break;
|
||||
case States::ONE: // state ONE - we'll either stay in ONE or change to FALL
|
||||
OCR0B = 255;
|
||||
if (bedPWMDisabled) return; // stay in the ON state and do not change the output pin
|
||||
slowCounter += slowInc; // this does software timer_clk/256 or less
|
||||
if( slowCounter < pwm ){
|
||||
return;
|
||||
}
|
||||
if( (soft_pwm_bed << 1) >= (255 - slowInc - 1) ){ //@@TODO simplify & explain
|
||||
// if slowInc==2, soft_pwm == 251 will be the first to do short drops to zero. 252 will keep full heating
|
||||
return; // want full duty for the next ONE cycle again - so keep on heating and just wait for the next timer ovf
|
||||
}
|
||||
// otherwise moving towards FALL
|
||||
state = States::ONE;//_TO_FALL;
|
||||
state=States::FALL;
|
||||
fastCounter = fastMax - 1;// we'll do 16-1 cycles of RISE
|
||||
TCNT0 = 255; // force overflow on the next clock cycle
|
||||
TCCR0B = (1 << CS00); // change prescaler to 1, i.e. 62.5kHz
|
||||
// must switch to inverting mode already here, because it takes a whole PWM cycle and it would make a "1" at the end of this pwm cycle
|
||||
// COM0B1 remains set both in inverting and non-inverting mode
|
||||
TCCR0A |= (1 << COM0B0); // inverting mode
|
||||
break;
|
||||
case States::FALL:
|
||||
OCR0B = (fastMax - fastCounter) << fastShift; // this is the same as in RISE, because now we are setting the zero part of duty due to inverting mode
|
||||
//TCCR0A |= (1 << COM0B0); // already set in ONE_TO_FALL
|
||||
if( fastCounter ){
|
||||
--fastCounter;
|
||||
} else { // end of FALL cycles, changing into state ZERO
|
||||
state = States::FALL_TO_ZERO;
|
||||
TCNT0 = 128; //@@TODO again - need to wait long enough to propagate the timer state changes
|
||||
OCR0B = 255;
|
||||
}
|
||||
break;
|
||||
case States::FALL_TO_ZERO:
|
||||
state = States::ZERO_START; // go to read new soft_pwm_bed value for the next cycle
|
||||
TCNT0 = 128;
|
||||
OCR0B = 255;
|
||||
TCCR0B = (1 << CS01); // change prescaler to 8, i.e. 7.8kHz
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
91
Firmware/la10compat.cpp
Normal file
91
Firmware/la10compat.cpp
Normal file
|
@ -0,0 +1,91 @@
|
|||
#include "la10compat.h"
|
||||
#include "Marlin.h"
|
||||
#include <float.h>
|
||||
|
||||
|
||||
static LA10C_MODE la10c_mode = LA10C_UNKNOWN; // Current LA compatibility mode
|
||||
static float la10c_orig_jerk = 0; // Unadjusted/saved e-jerk
|
||||
|
||||
|
||||
LA10C_MODE la10c_mode_get()
|
||||
{
|
||||
return la10c_mode;
|
||||
}
|
||||
|
||||
|
||||
void la10c_mode_change(LA10C_MODE mode)
|
||||
{
|
||||
if(mode == la10c_mode) return;
|
||||
|
||||
// always restore to the last unadjusted E-jerk value
|
||||
if(la10c_orig_jerk)
|
||||
cs.max_jerk[E_AXIS] = la10c_orig_jerk;
|
||||
|
||||
SERIAL_ECHOPGM("LA10C: Linear Advance mode: ");
|
||||
switch(mode)
|
||||
{
|
||||
case LA10C_UNKNOWN: SERIAL_ECHOLNPGM("UNKNOWN"); break;
|
||||
case LA10C_LA15: SERIAL_ECHOLNPGM("1.5"); break;
|
||||
case LA10C_LA10: SERIAL_ECHOLNPGM("1.0"); break;
|
||||
}
|
||||
la10c_mode = mode;
|
||||
|
||||
// adjust the E-jerk if needed
|
||||
cs.max_jerk[E_AXIS] = la10c_jerk(cs.max_jerk[E_AXIS]);
|
||||
}
|
||||
|
||||
|
||||
// Approximate a LA10 value to a LA15 equivalent.
|
||||
static float la10c_convert(float k)
|
||||
{
|
||||
float new_K = k * 0.004 - 0.05;
|
||||
return new_K < 0? 0:
|
||||
new_K > (LA_K_MAX - FLT_EPSILON)? (LA_K_MAX - FLT_EPSILON):
|
||||
new_K;
|
||||
}
|
||||
|
||||
|
||||
float la10c_value(float k)
|
||||
{
|
||||
if(la10c_mode == LA10C_UNKNOWN)
|
||||
{
|
||||
// do not autodetect until a valid value is seen
|
||||
if(k == 0)
|
||||
return 0;
|
||||
else if(k < 0)
|
||||
return -1;
|
||||
|
||||
la10c_mode_change(k < LA_LA10_MIN? LA10C_LA15: LA10C_LA10);
|
||||
}
|
||||
|
||||
if(la10c_mode == LA10C_LA15)
|
||||
return (k >= 0 && k < LA_K_MAX? k: -1);
|
||||
else
|
||||
return (k >= 0? la10c_convert(k): -1);
|
||||
}
|
||||
|
||||
|
||||
float la10c_jerk(float j)
|
||||
{
|
||||
la10c_orig_jerk = j;
|
||||
|
||||
if(la10c_mode != LA10C_LA10)
|
||||
return j;
|
||||
|
||||
// check for a compatible range of values prior to convert (be sure that
|
||||
// a higher E-jerk would still be compatible wrt the E accell range)
|
||||
if(j < 4.5 && cs.max_acceleration_units_per_sq_second_normal[E_AXIS] < 2000)
|
||||
return j;
|
||||
|
||||
// bring low E-jerk values into equivalent LA 1.5 values by
|
||||
// flattening the response in the (0.3-4.5) range using a piecewise
|
||||
// function. Is it truly worth to preserve the difference between
|
||||
// 1.5/2.5 E-jerk for LA1.0? Probably not, but we try nonetheless.
|
||||
j = j < 0.3? j * 11.5:
|
||||
j < 4.5? j * 0.25 + 3.375:
|
||||
j;
|
||||
|
||||
SERIAL_ECHOPGM("LA10C: Adjusted E-Jerk: ");
|
||||
SERIAL_ECHOLN(j);
|
||||
return j;
|
||||
}
|
46
Firmware/la10compat.h
Normal file
46
Firmware/la10compat.h
Normal file
|
@ -0,0 +1,46 @@
|
|||
// la10compat: LA10->LA15 conversion
|
||||
//
|
||||
// When the current mode is UNKNOWN autodetection is active and any K<10
|
||||
// will set the mode to LA15, LA10 is set otherwise. When LA10
|
||||
// compatbility mode is active the K factor is converted to a LA15
|
||||
// equivalent (that is, the return value is always a LA15 value).
|
||||
//
|
||||
// E-jerk<2 is also bumped in LA10 mode to restore the the printing speed
|
||||
// to values comparable to existing settings.
|
||||
//
|
||||
// Once the interpretation mode has been set it is kept until the mode
|
||||
// is explicitly reset. This is done to handle transparent fallback for
|
||||
// old firmware revisions in combination with the following gcode
|
||||
// sequence:
|
||||
//
|
||||
// M900 K0.01 ; set LA15 value (interpreted by any firmware)
|
||||
// M900 K10 ; set LA10 value (ignored by LA15 firmware)
|
||||
//
|
||||
// A LA15 firmware without this module will only parse the first
|
||||
// correctly, rejecting the second. A LA10 FW will parse both, but keep
|
||||
// the last value. Since the LA15 value, if present, corresponds to the
|
||||
// truth value, the compatibility stub needs to "lock" onto the first
|
||||
// seen value for the current print.
|
||||
//
|
||||
// The mode needs to be carefully reset for each print in order for
|
||||
// diffent versions of M900 to be interpreted independently.
|
||||
|
||||
#pragma once
|
||||
|
||||
enum __attribute__((packed)) LA10C_MODE
|
||||
{
|
||||
LA10C_UNKNOWN = 0,
|
||||
LA10C_LA15 = 1,
|
||||
LA10C_LA10 = 2
|
||||
};
|
||||
|
||||
// Explicitly set/get/reset the interpretation mode for la10c_value()
|
||||
void la10c_mode_change(LA10C_MODE mode);
|
||||
LA10C_MODE la10c_mode_get();
|
||||
static inline void la10c_reset() { la10c_mode_change(LA10C_UNKNOWN); }
|
||||
|
||||
// Return a LA15 K value according to the supplied value and mode
|
||||
float la10c_value(float k);
|
||||
|
||||
// Return an updated LA15 E-jerk value according to the current mode
|
||||
float la10c_jerk(float j);
|
|
@ -6,7 +6,9 @@
|
|||
|
||||
#include "config.h"
|
||||
#include <inttypes.h>
|
||||
//#include <stdio.h>
|
||||
#ifdef DEBUG_SEC_LANG
|
||||
#include <stdio.h>
|
||||
#endif //DEBUG_SEC_LANG
|
||||
|
||||
#define PROTOCOL_VERSION "1.0"
|
||||
|
||||
|
|
|
@ -48,6 +48,7 @@ void menu_goto(menu_func_t menu, const uint32_t encoder, const bool feedback, bo
|
|||
{
|
||||
menu_menu = menu;
|
||||
lcd_encoder = encoder;
|
||||
menu_top = 0; //reset menu view. Needed if menu_back() is called from deep inside a menu, such as Support
|
||||
asm("sei");
|
||||
if (reset_menu_state)
|
||||
{
|
||||
|
@ -102,7 +103,7 @@ void menu_back(void)
|
|||
menu_back(1);
|
||||
}
|
||||
|
||||
static void menu_back_no_reset(void)
|
||||
void menu_back_no_reset(void)
|
||||
{
|
||||
if (menu_depth > 0)
|
||||
{
|
||||
|
@ -136,7 +137,7 @@ void menu_submenu(menu_func_t submenu)
|
|||
}
|
||||
}
|
||||
|
||||
static void menu_submenu_no_reset(menu_func_t submenu)
|
||||
void menu_submenu_no_reset(menu_func_t submenu)
|
||||
{
|
||||
if (menu_depth < MENU_DEPTH_MAX)
|
||||
{
|
||||
|
|
|
@ -76,6 +76,7 @@ void menu_start(void);
|
|||
extern void menu_end(void);
|
||||
|
||||
extern void menu_back(void);
|
||||
extern void menu_back_no_reset(void);
|
||||
extern void menu_back(uint8_t nLevel);
|
||||
|
||||
extern void menu_back_if_clicked(void);
|
||||
|
@ -83,6 +84,7 @@ extern void menu_back_if_clicked(void);
|
|||
extern void menu_back_if_clicked_fb(void);
|
||||
|
||||
extern void menu_submenu(menu_func_t submenu);
|
||||
extern void menu_submenu_no_reset(menu_func_t submenu);
|
||||
|
||||
extern uint8_t menu_item_ret(void);
|
||||
|
||||
|
@ -131,7 +133,6 @@ extern const char menu_fmt_int3[];
|
|||
extern const char menu_fmt_float31[];
|
||||
extern const char menu_fmt_float13[];
|
||||
|
||||
|
||||
extern void menu_draw_float31(const char* str, float val);
|
||||
|
||||
extern void menu_draw_float13(const char* str, float val);
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
#include "mesh_bed_leveling.h"
|
||||
#include "stepper.h"
|
||||
#include "ultralcd.h"
|
||||
#include "temperature.h"
|
||||
|
||||
#ifdef TMC2130
|
||||
#include "tmc2130.h"
|
||||
|
@ -919,7 +920,7 @@ static inline void go_xy(float x, float y, float fr)
|
|||
|
||||
static inline void go_to_current(float fr)
|
||||
{
|
||||
plan_buffer_line_curposXYZE(fr, active_extruder);
|
||||
plan_buffer_line_curposXYZE(fr);
|
||||
st_synchronize();
|
||||
}
|
||||
|
||||
|
@ -928,7 +929,7 @@ static inline void update_current_position_xyz()
|
|||
current_position[X_AXIS] = st_get_position_mm(X_AXIS);
|
||||
current_position[Y_AXIS] = st_get_position_mm(Y_AXIS);
|
||||
current_position[Z_AXIS] = st_get_position_mm(Z_AXIS);
|
||||
plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
|
||||
plan_set_position_curposXYZE();
|
||||
}
|
||||
|
||||
static inline void update_current_position_z()
|
||||
|
@ -946,6 +947,7 @@ inline bool find_bed_induction_sensor_point_z(float minimum_z, uint8_t n_iter, i
|
|||
)
|
||||
{
|
||||
bool high_deviation_occured = false;
|
||||
bedPWMDisabled = 1;
|
||||
#ifdef TMC2130
|
||||
FORCE_HIGH_POWER_START;
|
||||
#endif
|
||||
|
@ -1044,6 +1046,7 @@ inline bool find_bed_induction_sensor_point_z(float minimum_z, uint8_t n_iter, i
|
|||
#ifdef TMC2130
|
||||
FORCE_HIGH_POWER_END;
|
||||
#endif
|
||||
bedPWMDisabled = 0;
|
||||
return true;
|
||||
|
||||
error:
|
||||
|
@ -1053,6 +1056,7 @@ error:
|
|||
#ifdef TMC2130
|
||||
FORCE_HIGH_POWER_END;
|
||||
#endif
|
||||
bedPWMDisabled = 0;
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
@ -14,14 +14,14 @@ const char MSG_BABYSTEP_Z_NOT_SET[] PROGMEM_I1 = ISTR("Distance between tip of t
|
|||
const char MSG_BED[] PROGMEM_I1 = ISTR("Bed"); ////
|
||||
const char MSG_BED_DONE[] PROGMEM_I1 = ISTR("Bed done"); ////
|
||||
const char MSG_BED_HEATING[] PROGMEM_I1 = ISTR("Bed Heating"); ////
|
||||
const char MSG_BED_LEVELING_FAILED_POINT_LOW[] PROGMEM_I1 = ISTR("Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset."); ////c=20 r=4
|
||||
const char MSG_BED_LEVELING_FAILED_POINT_LOW[] PROGMEM_I1 = ISTR("Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset."); ////c=20 r=5
|
||||
const char MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED[] PROGMEM_I1 = ISTR("XYZ calibration failed. Please consult the manual."); ////c=20 r=8
|
||||
const char MSG_CALIBRATE_Z_AUTO[] PROGMEM_I1 = ISTR("Calibrating Z"); ////c=20 r=2
|
||||
const char MSG_CARD_MENU[] PROGMEM_I1 = ISTR("Print from SD"); ////
|
||||
const char MSG_CONFIRM_NOZZLE_CLEAN[] PROGMEM_I1 = ISTR("Please clean the nozzle for calibration. Click when done."); ////c=20 r=8
|
||||
const char MSG_COOLDOWN[] PROGMEM_I1 = ISTR("Cooldown"); ////
|
||||
const char MSG_CRASH_DETECTED[] PROGMEM_I1 = ISTR("Crash detected."); ////c=20 r=1
|
||||
const char MSG_CRASHDETECT[] PROGMEM_I1 = ISTR("Crash det."); ////
|
||||
const char MSG_CRASHDETECT[] PROGMEM_I1 = ISTR("Crash det."); ////c=13
|
||||
const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); ////
|
||||
const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17 r=1
|
||||
const char MSG_FILAMENT[] PROGMEM_I1 = ISTR("Filament"); ////c=17 r=1
|
||||
|
@ -34,10 +34,10 @@ const char MSG_FILAMENT_LOADING_T3[] PROGMEM_I1 = ISTR("Insert filament into ext
|
|||
const char MSG_FILAMENTCHANGE[] PROGMEM_I1 = ISTR("Change filament"); ////
|
||||
const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE1[] PROGMEM_I1 = ISTR("Searching bed calibration point"); ////c=60
|
||||
const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE2[] PROGMEM_I1 = ISTR(" of 4"); ////c=14
|
||||
const char MSG_FINISHING_MOVEMENTS[] PROGMEM_I1 = ISTR("Finishing movements"); ////c=20 r=1
|
||||
const char MSG_FINISHING_MOVEMENTS[] PROGMEM_I1 = ISTR("Finishing movements"); ////c=20
|
||||
const char MSG_FOLLOW_CALIBRATION_FLOW[] PROGMEM_I1 = ISTR("Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow."); ////c=20 r=8
|
||||
const char MSG_FOLLOW_Z_CALIBRATION_FLOW[] PROGMEM_I1 = ISTR("There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."); ////c=20 r=8
|
||||
const char MSG_FSENSOR_AUTOLOAD[] PROGMEM_I1 = ISTR("F. autoload"); ////c=17 r=1
|
||||
const char MSG_FOLLOW_Z_CALIBRATION_FLOW[] PROGMEM_I1 = ISTR("There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."); ////c=20 r=9
|
||||
const char MSG_FSENSOR_AUTOLOAD[] PROGMEM_I1 = ISTR("F. autoload"); ////c=13
|
||||
const char MSG_FSENSOR[] PROGMEM_I1 = ISTR("Fil. sensor"); ////
|
||||
const char MSG_HEATING[] PROGMEM_I1 = ISTR("Heating"); ////
|
||||
const char MSG_HEATING_COMPLETE[] PROGMEM_I1 = ISTR("Heating done."); ////c=20
|
||||
|
@ -48,7 +48,7 @@ const char MSG_LOAD_FILAMENT[] PROGMEM_I1 = ISTR("Load filament"); //// Number 1
|
|||
const char MSG_LOADING_FILAMENT[] PROGMEM_I1 = ISTR("Loading filament"); ////c=20
|
||||
const char MSG_EJECT_FILAMENT[] PROGMEM_I1 = ISTR("Eject filament"); //// Number 1 to 5 is added behind text e.g. "Eject filament 1" c=16
|
||||
const char MSG_CUT_FILAMENT[] PROGMEM_I1 = ISTR("Cut filament"); //// Number 1 to 5 is added behind text e.g. "Cut filament 1" c=16
|
||||
const char MSG_M117_V2_CALIBRATION[] PROGMEM_I1 = ISTR("M117 First layer cal."); ////c=25 r=1
|
||||
const char MSG_M117_V2_CALIBRATION[] PROGMEM_I1 = ISTR("M117 First layer cal."); ////c=25
|
||||
const char MSG_MAIN[] PROGMEM_I1 = ISTR("Main"); ////
|
||||
const char MSG_BACK[] PROGMEM_I1 = ISTR("Back"); ////
|
||||
const char MSG_SHEET[] PROGMEM_I1 = ISTR("Sheet"); ////c=10
|
||||
|
@ -57,7 +57,7 @@ const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[] PROGMEM_I1 = ISTR(" of 9");
|
|||
const char MSG_MENU_CALIBRATION[] PROGMEM_I1 = ISTR("Calibration"); ////
|
||||
const char MSG_NO[] PROGMEM_I1 = ISTR("No"); ////
|
||||
const char MSG_NOZZLE[] PROGMEM_I1 = ISTR("Nozzle"); ////
|
||||
const char MSG_PAPER[] PROGMEM_I1 = ISTR("Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."); ////c=20 r=8
|
||||
const char MSG_PAPER[] PROGMEM_I1 = ISTR("Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."); ////c=20 r=10
|
||||
const char MSG_PLACE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please place steel sheet on heatbed."); ////c=20 r=4
|
||||
const char MSG_PLEASE_WAIT[] PROGMEM_I1 = ISTR("Please wait"); ////c=20
|
||||
const char MSG_PREHEAT_NOZZLE[] PROGMEM_I1 = ISTR("Preheat the nozzle!"); ////c=20
|
||||
|
@ -90,7 +90,7 @@ const char MSG_STEALTH[] PROGMEM_I1 = ISTR("Stealth"); ////
|
|||
const char MSG_STEEL_SHEET_CHECK[] PROGMEM_I1 = ISTR("Is steel sheet on heatbed?"); ////c=20 r=2
|
||||
const char MSG_STOP_PRINT[] PROGMEM_I1 = ISTR("Stop print"); ////
|
||||
const char MSG_STOPPED[] PROGMEM_I1 = ISTR("STOPPED. "); ////
|
||||
const char MSG_TEMP_CALIBRATION[] PROGMEM_I1 = ISTR("Temp. cal."); ////c=12 r=1
|
||||
const char MSG_TEMP_CALIBRATION[] PROGMEM_I1 = ISTR("Temp. cal."); ////c=14
|
||||
const char MSG_TEMP_CALIBRATION_DONE[] PROGMEM_I1 = ISTR("Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."); ////c=20 r=12
|
||||
const char MSG_UNLOAD_FILAMENT[] PROGMEM_I1 = ISTR("Unload filament"); ////c=17
|
||||
const char MSG_UNLOADING_FILAMENT[] PROGMEM_I1 = ISTR("Unloading filament"); ////c=20 r=1
|
||||
|
@ -100,13 +100,13 @@ const char MSG_WIZARD_DONE[] PROGMEM_I1 = ISTR("All is done. Happy printing!");
|
|||
const char MSG_WIZARD_HEATING[] PROGMEM_I1 = ISTR("Preheating nozzle. Please wait."); ////c=20 r=3
|
||||
const char MSG_WIZARD_QUIT[] PROGMEM_I1 = ISTR("You can always resume the Wizard from Calibration -> Wizard."); ////c=20 r=8
|
||||
const char MSG_YES[] PROGMEM_I1 = ISTR("Yes"); ////
|
||||
const char MSG_V2_CALIBRATION[] PROGMEM_I1 = ISTR("First layer cal."); ////c=17 r=1
|
||||
const char MSG_V2_CALIBRATION[] PROGMEM_I1 = ISTR("First layer cal."); ////c=18
|
||||
const char WELCOME_MSG[] PROGMEM_I1 = ISTR(CUSTOM_MENDEL_NAME " OK."); ////c=20
|
||||
const char MSG_OFF[] PROGMEM_I1 = ISTR("Off"); ////
|
||||
const char MSG_ON[] PROGMEM_I1 = ISTR("On"); ////
|
||||
const char MSG_NA[] PROGMEM_I1 = ISTR("N/A"); ////
|
||||
const char MSG_AUTO_DEPLETE[] PROGMEM_I1 = ISTR("SpoolJoin"); ////
|
||||
const char MSG_CUTTER[] PROGMEM_I1 = ISTR("Cutter"); ////
|
||||
const char MSG_CUTTER[] PROGMEM_I1 = ISTR("Cutter"); ////c=9
|
||||
const char MSG_NONE[] PROGMEM_I1 = ISTR("None"); ////
|
||||
const char MSG_WARN[] PROGMEM_I1 = ISTR("Warn"); ////
|
||||
const char MSG_STRICT[] PROGMEM_I1 = ISTR("Strict"); ////
|
||||
|
@ -128,16 +128,22 @@ const char MSG_SOUND_BLIND[] PROGMEM_I1 = ISTR("Assist"); ////
|
|||
const char MSG_MESH[] PROGMEM_I1 = ISTR("Mesh"); ////
|
||||
const char MSG_Z_PROBE_NR[] PROGMEM_I1 = ISTR("Z-probe nr."); ////
|
||||
const char MSG_MAGNETS_COMP[] PROGMEM_I1 = ISTR("Magnets comp."); ////
|
||||
const char MSG_FS_ACTION[] PROGMEM_I1 = ISTR("FS Action"); ////
|
||||
const char MSG_FS_CONTINUE[] PROGMEM_I1 = ISTR("Cont."); ////
|
||||
const char MSG_FS_PAUSE[] PROGMEM_I1 = ISTR("Pause"); ////
|
||||
const char MSG_BRIGHTNESS[] PROGMEM_I1 = ISTR("Brightness"); ////
|
||||
const char MSG_BL_HIGH[] PROGMEM_I1 = ISTR("Level Bright"); ////
|
||||
const char MSG_BL_LOW[] PROGMEM_I1 = ISTR("Level Dimmed"); ////
|
||||
const char MSG_TIMEOUT[] PROGMEM_I1 = ISTR("Timeout"); ////
|
||||
const char MSG_BRIGHT[] PROGMEM_I1 = ISTR("Bright"); ////
|
||||
const char MSG_DIM[] PROGMEM_I1 = ISTR("Dim"); ////
|
||||
const char MSG_AUTO[] PROGMEM_I1 = ISTR("Auto"); ////
|
||||
const char MSG_FS_ACTION[] PROGMEM_I1 = ISTR("FS Action"); ////c=10
|
||||
const char MSG_FS_CONTINUE[] PROGMEM_I1 = ISTR("Cont."); ////c=5
|
||||
const char MSG_FS_PAUSE[] PROGMEM_I1 = ISTR("Pause"); ////c=5
|
||||
const char MSG_BRIGHTNESS[] PROGMEM_I1 = ISTR("Brightness"); ////c=18
|
||||
const char MSG_BL_HIGH[] PROGMEM_I1 = ISTR("Level Bright"); ////c=12
|
||||
const char MSG_BL_LOW[] PROGMEM_I1 = ISTR("Level Dimmed"); ////c=12
|
||||
const char MSG_TIMEOUT[] PROGMEM_I1 = ISTR("Timeout"); ////c=12
|
||||
const char MSG_BRIGHT[] PROGMEM_I1 = ISTR("Bright"); ////c=6
|
||||
const char MSG_DIM[] PROGMEM_I1 = ISTR("Dim"); ////c=6
|
||||
const char MSG_AUTO[] PROGMEM_I1 = ISTR("Auto"); ////c=6
|
||||
#ifdef IR_SENSOR_ANALOG
|
||||
// Beware - the space at the beginning is necessary since it is reused in LCD menu items which are to be with a space
|
||||
const char MSG_IR_04_OR_NEWER[] PROGMEM_I1 = ISTR(" 0.4 or newer");////c=18
|
||||
const char MSG_IR_03_OR_OLDER[] PROGMEM_I1 = ISTR(" 0.3 or older");////c=18
|
||||
const char MSG_IR_UNKNOWN[] PROGMEM_I1 = ISTR("unknown state");////c=18
|
||||
#endif
|
||||
|
||||
//not internationalized messages
|
||||
const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; ////
|
||||
|
@ -168,3 +174,6 @@ const char MSG_OCTOPRINT_CANCEL[] PROGMEM_N1 = "// action:cancel"; ////
|
|||
const char MSG_FANCHECK_EXTRUDER[] PROGMEM_N1 = "Err: EXTR. FAN ERROR"; ////c=20
|
||||
const char MSG_FANCHECK_PRINT[] PROGMEM_N1 = "Err: PRINT FAN ERROR"; ////c=20
|
||||
const char MSG_M112_KILL[] PROGMEM_N1 = "M112 called. Emergency Stop."; ////c=20
|
||||
const char MSG_ADVANCE_K[] PROGMEM_N1 = "Advance K:"; ////c=13
|
||||
const char MSG_POWERPANIC_DETECTED[] PROGMEM_N1 = "POWER PANIC DETECTED"; ////c=20
|
||||
|
||||
|
|
|
@ -138,6 +138,11 @@ extern const char MSG_TIMEOUT[];
|
|||
extern const char MSG_BRIGHT[];
|
||||
extern const char MSG_DIM[];
|
||||
extern const char MSG_AUTO[];
|
||||
#ifdef IR_SENSOR_ANALOG
|
||||
extern const char MSG_IR_04_OR_NEWER[];
|
||||
extern const char MSG_IR_03_OR_OLDER[];
|
||||
extern const char MSG_IR_UNKNOWN[];
|
||||
#endif
|
||||
|
||||
//not internationalized messages
|
||||
extern const char MSG_BROWNOUT_RESET[];
|
||||
|
@ -169,6 +174,8 @@ extern const char MSG_OCTOPRINT_CANCEL[];
|
|||
extern const char MSG_FANCHECK_EXTRUDER[];
|
||||
extern const char MSG_FANCHECK_PRINT[];
|
||||
extern const char MSG_M112_KILL[];
|
||||
extern const char MSG_ADVANCE_K[];
|
||||
extern const char MSG_POWERPANIC_DETECTED[];
|
||||
|
||||
#if defined(__cplusplus)
|
||||
}
|
||||
|
|
|
@ -383,8 +383,9 @@ void mmu_loop(void)
|
|||
//printf_P(PSTR("Eact: %d\n"), int(e_active()));
|
||||
if (!mmu_finda && CHECK_FSENSOR && fsensor_enabled) {
|
||||
fsensor_checkpoint_print();
|
||||
ad_markDepleted(mmu_extruder);
|
||||
if (lcd_autoDepleteEnabled() && !ad_allDepleted())
|
||||
if (mmu_extruder != MMU_FILAMENT_UNKNOWN) // Can't deplete unknown extruder.
|
||||
ad_markDepleted(mmu_extruder);
|
||||
if (lcd_autoDepleteEnabled() && !ad_allDepleted() && mmu_extruder != MMU_FILAMENT_UNKNOWN) // Can't auto if F=?
|
||||
{
|
||||
enquecommand_front_P(PSTR("M600 AUTO")); //save print and run M600 command
|
||||
}
|
||||
|
@ -539,7 +540,7 @@ void mmu_command(MmuCmd cmd)
|
|||
void mmu_load_step(bool synchronize)
|
||||
{
|
||||
current_position[E_AXIS] = current_position[E_AXIS] + MMU_LOAD_FEEDRATE * 0.1;
|
||||
plan_buffer_line_curposXYZE(MMU_LOAD_FEEDRATE, active_extruder);
|
||||
plan_buffer_line_curposXYZE(MMU_LOAD_FEEDRATE);
|
||||
if (synchronize) st_synchronize();
|
||||
}
|
||||
|
||||
|
@ -604,7 +605,7 @@ bool mmu_get_response(uint8_t move)
|
|||
{
|
||||
printf_P(PSTR("Unload 1\n"));
|
||||
current_position[E_AXIS] = current_position[E_AXIS] - MMU_LOAD_FEEDRATE * MMU_LOAD_TIME_MS*0.001;
|
||||
plan_buffer_line_curposXYZE(MMU_LOAD_FEEDRATE, active_extruder);
|
||||
plan_buffer_line_curposXYZE(MMU_LOAD_FEEDRATE);
|
||||
st_synchronize();
|
||||
}
|
||||
}
|
||||
|
@ -622,7 +623,7 @@ bool mmu_get_response(uint8_t move)
|
|||
{
|
||||
printf_P(PSTR("Unload 2\n"));
|
||||
current_position[E_AXIS] = current_position[E_AXIS] - MMU_LOAD_FEEDRATE * MMU_LOAD_TIME_MS*0.001;
|
||||
plan_buffer_line_curposXYZE(MMU_LOAD_FEEDRATE, active_extruder);
|
||||
plan_buffer_line_curposXYZE(MMU_LOAD_FEEDRATE);
|
||||
st_synchronize();
|
||||
}
|
||||
}
|
||||
|
@ -700,13 +701,13 @@ void manage_response(bool move_axes, bool turn_off_nozzle, uint8_t move)
|
|||
//lift z
|
||||
current_position[Z_AXIS] += Z_PAUSE_LIFT;
|
||||
if (current_position[Z_AXIS] > Z_MAX_POS) current_position[Z_AXIS] = Z_MAX_POS;
|
||||
plan_buffer_line_curposXYZE(15, active_extruder);
|
||||
plan_buffer_line_curposXYZE(15);
|
||||
st_synchronize();
|
||||
|
||||
//Move XY to side
|
||||
current_position[X_AXIS] = X_PAUSE_POS;
|
||||
current_position[Y_AXIS] = Y_PAUSE_POS;
|
||||
plan_buffer_line_curposXYZE(50, active_extruder);
|
||||
plan_buffer_line_curposXYZE(50);
|
||||
st_synchronize();
|
||||
}
|
||||
if (turn_off_nozzle) {
|
||||
|
@ -757,17 +758,17 @@ void manage_response(bool move_axes, bool turn_off_nozzle, uint8_t move)
|
|||
lcd_display_message_fullscreen_P(_i("MMU OK. Resuming temperature..."));
|
||||
delay_keep_alive(3000);
|
||||
}
|
||||
mmu_wait_for_heater_blocking();
|
||||
mmu_wait_for_heater_blocking();
|
||||
}
|
||||
if (move_axes) {
|
||||
lcd_clear();
|
||||
lcd_display_message_fullscreen_P(_i("MMU OK. Resuming position..."));
|
||||
current_position[X_AXIS] = x_position_bckp;
|
||||
current_position[Y_AXIS] = y_position_bckp;
|
||||
plan_buffer_line_curposXYZE(50, active_extruder);
|
||||
plan_buffer_line_curposXYZE(50);
|
||||
st_synchronize();
|
||||
current_position[Z_AXIS] = z_position_bckp;
|
||||
plan_buffer_line_curposXYZE(15, active_extruder);
|
||||
plan_buffer_line_curposXYZE(15);
|
||||
st_synchronize();
|
||||
}
|
||||
else {
|
||||
|
@ -795,8 +796,8 @@ void mmu_load_to_nozzle()
|
|||
{
|
||||
st_synchronize();
|
||||
|
||||
bool saved_e_relative_mode = axis_relative_modes[E_AXIS];
|
||||
if (!saved_e_relative_mode) axis_relative_modes[E_AXIS] = true;
|
||||
const bool saved_e_relative_mode = axis_relative_modes & E_AXIS_MASK;
|
||||
if (!saved_e_relative_mode) axis_relative_modes |= E_AXIS_MASK;
|
||||
if (ir_sensor_detected)
|
||||
{
|
||||
current_position[E_AXIS] += 3.0f;
|
||||
|
@ -806,21 +807,21 @@ void mmu_load_to_nozzle()
|
|||
current_position[E_AXIS] += 7.2f;
|
||||
}
|
||||
float feedrate = 562;
|
||||
plan_buffer_line_curposXYZE(feedrate / 60, active_extruder);
|
||||
plan_buffer_line_curposXYZE(feedrate / 60);
|
||||
st_synchronize();
|
||||
current_position[E_AXIS] += 14.4f;
|
||||
feedrate = 871;
|
||||
plan_buffer_line_curposXYZE(feedrate / 60, active_extruder);
|
||||
plan_buffer_line_curposXYZE(feedrate / 60);
|
||||
st_synchronize();
|
||||
current_position[E_AXIS] += 36.0f;
|
||||
feedrate = 1393;
|
||||
plan_buffer_line_curposXYZE(feedrate / 60, active_extruder);
|
||||
plan_buffer_line_curposXYZE(feedrate / 60);
|
||||
st_synchronize();
|
||||
current_position[E_AXIS] += 14.4f;
|
||||
feedrate = 871;
|
||||
plan_buffer_line_curposXYZE(feedrate / 60, active_extruder);
|
||||
plan_buffer_line_curposXYZE(feedrate / 60);
|
||||
st_synchronize();
|
||||
if (!saved_e_relative_mode) axis_relative_modes[E_AXIS] = false;
|
||||
if (!saved_e_relative_mode) axis_relative_modes &= ~E_AXIS_MASK;
|
||||
}
|
||||
|
||||
void mmu_M600_wait_and_beep() {
|
||||
|
@ -829,7 +830,7 @@ void mmu_M600_wait_and_beep() {
|
|||
KEEPALIVE_STATE(PAUSED_FOR_USER);
|
||||
|
||||
int counterBeep = 0;
|
||||
lcd_display_message_fullscreen_P(_i("Remove old filament and press the knob to start loading new filament."));
|
||||
lcd_display_message_fullscreen_P(_i("Remove old filament and press the knob to start loading new filament.")); ////MSG_REMOVE_OLD_FILAMENT c=20 r=5
|
||||
bool bFirst=true;
|
||||
|
||||
while (!lcd_clicked()){
|
||||
|
@ -1071,7 +1072,7 @@ void mmu_filament_ramming()
|
|||
for(uint8_t i = 0; i < (sizeof(ramming_sequence)/sizeof(E_step));++i)
|
||||
{
|
||||
current_position[E_AXIS] += pgm_read_float(&(ramming_sequence[i].extrude));
|
||||
plan_buffer_line_curposXYZE(pgm_read_float(&(ramming_sequence[i].feed_rate)), active_extruder);
|
||||
plan_buffer_line_curposXYZE(pgm_read_float(&(ramming_sequence[i].feed_rate)));
|
||||
st_synchronize();
|
||||
}
|
||||
}
|
||||
|
@ -1384,7 +1385,7 @@ void mmu_cut_filament(uint8_t filament_nr)
|
|||
{
|
||||
LcdUpdateDisabler disableLcdUpdate;
|
||||
lcd_clear();
|
||||
lcd_set_cursor(0, 1); lcd_puts_P(_i("Cutting filament")); //// c=18 r=1
|
||||
lcd_set_cursor(0, 1); lcd_puts_P(_i("Cutting filament")); //// c=18
|
||||
lcd_print(" ");
|
||||
lcd_print(filament_nr + 1);
|
||||
mmu_filament_ramming();
|
||||
|
@ -1445,9 +1446,9 @@ bFilamentAction=false; // NOT in "mmu_fil_eject_menu(
|
|||
static bool can_load()
|
||||
{
|
||||
current_position[E_AXIS] += 60;
|
||||
plan_buffer_line_curposXYZE(MMU_LOAD_FEEDRATE, active_extruder);
|
||||
plan_buffer_line_curposXYZE(MMU_LOAD_FEEDRATE);
|
||||
current_position[E_AXIS] -= 52;
|
||||
plan_buffer_line_curposXYZE(MMU_LOAD_FEEDRATE, active_extruder);
|
||||
plan_buffer_line_curposXYZE(MMU_LOAD_FEEDRATE);
|
||||
st_synchronize();
|
||||
|
||||
uint_least8_t filament_detected_count = 0;
|
||||
|
@ -1457,7 +1458,7 @@ static bool can_load()
|
|||
for(uint_least8_t i = 0; i < steps; ++i)
|
||||
{
|
||||
current_position[E_AXIS] -= e_increment;
|
||||
plan_buffer_line_curposXYZE(MMU_LOAD_FEEDRATE, active_extruder);
|
||||
plan_buffer_line_curposXYZE(MMU_LOAD_FEEDRATE);
|
||||
st_synchronize();
|
||||
if(0 == PIN_GET(IR_SENSOR_PIN))
|
||||
{
|
||||
|
@ -1547,7 +1548,7 @@ void mmu_continue_loading(bool blocking)
|
|||
};
|
||||
Ls state = Ls::Enter;
|
||||
|
||||
const uint_least8_t max_retry = 2;
|
||||
const uint_least8_t max_retry = 3;
|
||||
uint_least8_t retry = 0;
|
||||
|
||||
while (!success)
|
||||
|
@ -1589,6 +1590,7 @@ void mmu_continue_loading(bool blocking)
|
|||
if (blocking)
|
||||
{
|
||||
marlin_wait_for_click();
|
||||
st_synchronize();
|
||||
restore_print_from_ram_and_continue(0);
|
||||
state = Ls::Retry;
|
||||
}
|
||||
|
|
|
@ -99,9 +99,11 @@ struct block_t;
|
|||
extern struct block_t *block_buffer;
|
||||
|
||||
//! @brief Enter an STK500 compatible Optiboot boot loader waiting for flashing the languages to an external flash memory.
|
||||
void optiboot_w25x20cl_enter()
|
||||
//! @return 1 if "start\n" was not sent. Optiboot was skipped
|
||||
//! @return 0 if "start\n" was sent. Optiboot ran normally. No need to send "start\n" in setup()
|
||||
uint8_t optiboot_w25x20cl_enter()
|
||||
{
|
||||
if (boot_app_flags & BOOT_APP_FLG_USER0) return;
|
||||
if (boot_app_flags & BOOT_APP_FLG_USER0) return 1;
|
||||
uint8_t ch;
|
||||
uint8_t rampz = 0;
|
||||
register uint16_t address = 0;
|
||||
|
@ -120,38 +122,46 @@ void optiboot_w25x20cl_enter()
|
|||
unsigned long boot_timer = 0;
|
||||
const char *ptr = entry_magic_send;
|
||||
const char *end = strlen_P(entry_magic_send) + ptr;
|
||||
// Initialize the serial line.
|
||||
UCSR0A |= (1 << U2X0);
|
||||
UBRR0L = (((float)(F_CPU))/(((float)(115200))*8.0)-1.0+0.5);
|
||||
UCSR0B = (1 << RXEN0) | (1 << TXEN0);
|
||||
const uint8_t selectedSerialPort_bak = selectedSerialPort;
|
||||
// Flush the serial line.
|
||||
while (RECV_READY) {
|
||||
watchdogReset();
|
||||
// Dummy register read (discard)
|
||||
(void)(*(char *)UDR0);
|
||||
}
|
||||
selectedSerialPort = 0; //switch to Serial0
|
||||
MYSERIAL.flush(); //clear RX buffer
|
||||
int SerialHead = rx_buffer.head;
|
||||
// Send the initial magic string.
|
||||
while (ptr != end)
|
||||
putch(pgm_read_byte(ptr ++));
|
||||
watchdogReset();
|
||||
// Wait for one second until a magic string (constant entry_magic) is received
|
||||
// Wait for two seconds until a magic string (constant entry_magic) is received
|
||||
// from the serial line.
|
||||
ptr = entry_magic_receive;
|
||||
end = strlen_P(entry_magic_receive) + ptr;
|
||||
while (ptr != end) {
|
||||
while (! RECV_READY) {
|
||||
while (rx_buffer.head == SerialHead) {
|
||||
watchdogReset();
|
||||
delayMicroseconds(1);
|
||||
if (++ boot_timer > boot_timeout)
|
||||
{
|
||||
// Timeout expired, continue with the application.
|
||||
return;
|
||||
selectedSerialPort = selectedSerialPort_bak; //revert Serial setting
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
ch = UDR0;
|
||||
ch = rx_buffer.buffer[SerialHead];
|
||||
SerialHead = (unsigned int)(SerialHead + 1) % RX_BUFFER_SIZE;
|
||||
if (pgm_read_byte(ptr ++) != ch)
|
||||
{
|
||||
// Magic was not received correctly, continue with the application
|
||||
return;
|
||||
selectedSerialPort = selectedSerialPort_bak; //revert Serial setting
|
||||
return 0;
|
||||
}
|
||||
watchdogReset();
|
||||
}
|
||||
cbi(UCSR0B, RXCIE0); //disable the MarlinSerial0 interrupt
|
||||
// Send the cfm magic string.
|
||||
ptr = entry_magic_cfm;
|
||||
while (ptr != end)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#ifndef OPTIBOOT_W25X20CL_H
|
||||
#define OPTIBOOT_W25X20CL_H
|
||||
|
||||
extern void optiboot_w25x20cl_enter();
|
||||
extern uint8_t optiboot_w25x20cl_enter();
|
||||
|
||||
#endif /* OPTIBOOT_W25X20CL_H */
|
||||
|
|
|
@ -183,9 +183,9 @@ uint8_t pat9125_update(void)
|
|||
if (pat9125_PID1 == 0xff) return 0;
|
||||
if (ucMotion & 0x80)
|
||||
{
|
||||
uint8_t ucXL = pat9125_rd_reg(PAT9125_DELTA_XL);
|
||||
uint8_t ucYL = pat9125_rd_reg(PAT9125_DELTA_YL);
|
||||
uint8_t ucXYH = pat9125_rd_reg(PAT9125_DELTA_XYH);
|
||||
uint16_t ucXL = pat9125_rd_reg(PAT9125_DELTA_XL);
|
||||
uint16_t ucYL = pat9125_rd_reg(PAT9125_DELTA_YL);
|
||||
uint16_t ucXYH = pat9125_rd_reg(PAT9125_DELTA_XYH);
|
||||
if (pat9125_PID1 == 0xff) return 0;
|
||||
int16_t iDX = ucXL | ((ucXYH << 4) & 0xf00);
|
||||
int16_t iDY = ucYL | ((ucXYH << 8) & 0xf00);
|
||||
|
@ -207,8 +207,8 @@ uint8_t pat9125_update_y(void)
|
|||
if (pat9125_PID1 == 0xff) return 0;
|
||||
if (ucMotion & 0x80)
|
||||
{
|
||||
uint8_t ucYL = pat9125_rd_reg(PAT9125_DELTA_YL);
|
||||
uint8_t ucXYH = pat9125_rd_reg(PAT9125_DELTA_XYH);
|
||||
uint16_t ucYL = pat9125_rd_reg(PAT9125_DELTA_YL);
|
||||
uint16_t ucXYH = pat9125_rd_reg(PAT9125_DELTA_XYH);
|
||||
if (pat9125_PID1 == 0xff) return 0;
|
||||
int16_t iDY = ucYL | ((ucXYH << 8) & 0xf00);
|
||||
if (iDY & 0x800) iDY -= 4096;
|
||||
|
@ -219,18 +219,13 @@ uint8_t pat9125_update_y(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
uint8_t pat9125_update_y2(void)
|
||||
uint8_t pat9125_update_bs(void)
|
||||
{
|
||||
if ((pat9125_PID1 == 0x31) && (pat9125_PID2 == 0x91))
|
||||
{
|
||||
uint8_t ucMotion = pat9125_rd_reg(PAT9125_MOTION);
|
||||
if (pat9125_PID1 == 0xff) return 0; //NOACK error
|
||||
if (ucMotion & 0x80)
|
||||
{
|
||||
int8_t dy = pat9125_rd_reg(PAT9125_DELTA_YL);
|
||||
if (pat9125_PID1 == 0xff) return 0; //NOACK error
|
||||
pat9125_y -= dy; //negative number, because direction switching does not work
|
||||
}
|
||||
pat9125_b = pat9125_rd_reg(PAT9125_FRAME);
|
||||
pat9125_s = pat9125_rd_reg(PAT9125_SHUTTER);
|
||||
if (pat9125_PID1 == 0xff) return 0;
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
|
|
|
@ -19,9 +19,9 @@ extern uint8_t pat9125_b;
|
|||
extern uint8_t pat9125_s;
|
||||
|
||||
extern uint8_t pat9125_init(void);
|
||||
extern uint8_t pat9125_update(void);
|
||||
extern uint8_t pat9125_update_y(void);
|
||||
extern uint8_t pat9125_update_y2(void);
|
||||
extern uint8_t pat9125_update(void); // update all sensor data
|
||||
extern uint8_t pat9125_update_y(void); // update _y only
|
||||
extern uint8_t pat9125_update_bs(void); // update _b/_s only
|
||||
|
||||
|
||||
#if defined(__cplusplus)
|
||||
|
|
|
@ -126,11 +126,14 @@ float extrude_min_temp=EXTRUDE_MINTEMP;
|
|||
#endif
|
||||
|
||||
#ifdef LIN_ADVANCE
|
||||
float extruder_advance_k = LIN_ADVANCE_K,
|
||||
advance_ed_ratio = LIN_ADVANCE_E_D_RATIO,
|
||||
position_float[NUM_AXIS] = { 0 };
|
||||
float extruder_advance_K = LA_K_DEF;
|
||||
float position_float[NUM_AXIS];
|
||||
#endif
|
||||
|
||||
// Request the next block to start at zero E count
|
||||
static bool plan_reset_next_e_queue;
|
||||
static bool plan_reset_next_e_sched;
|
||||
|
||||
// Returns the index of the next block in the ring buffer
|
||||
// NOTE: Removed modulo (%) operator, which uses an expensive divide and multiplication.
|
||||
static inline int8_t next_block_index(int8_t block_index) {
|
||||
|
@ -223,11 +226,23 @@ void calculate_trapezoid_for_block(block_t *block, float entry_speed, float exit
|
|||
// Size of Plateau of Nominal Rate.
|
||||
uint32_t plateau_steps = 0;
|
||||
|
||||
#ifdef LIN_ADVANCE
|
||||
uint16_t final_adv_steps = 0;
|
||||
uint16_t max_adv_steps = 0;
|
||||
if (block->use_advance_lead) {
|
||||
final_adv_steps = final_rate * block->adv_comp;
|
||||
}
|
||||
#endif
|
||||
|
||||
// Is the Plateau of Nominal Rate smaller than nothing? That means no cruising, and we will
|
||||
// have to use intersection_distance() to calculate when to abort acceleration and start braking
|
||||
// in order to reach the final_rate exactly at the end of this block.
|
||||
if (accel_decel_steps < block->step_event_count.wide) {
|
||||
plateau_steps = block->step_event_count.wide - accel_decel_steps;
|
||||
#ifdef LIN_ADVANCE
|
||||
if (block->use_advance_lead)
|
||||
max_adv_steps = block->nominal_rate * block->adv_comp;
|
||||
#endif
|
||||
} else {
|
||||
uint32_t acceleration_x4 = acceleration << 2;
|
||||
// Avoid negative numbers
|
||||
|
@ -260,6 +275,19 @@ void calculate_trapezoid_for_block(block_t *block, float entry_speed, float exit
|
|||
decelerate_steps = block->step_event_count.wide;
|
||||
accelerate_steps = block->step_event_count.wide - decelerate_steps;
|
||||
}
|
||||
|
||||
#ifdef LIN_ADVANCE
|
||||
if (block->use_advance_lead) {
|
||||
if(!accelerate_steps || !decelerate_steps) {
|
||||
// accelerate_steps=0: deceleration-only ramp, max_rate is effectively unused
|
||||
// decelerate_steps=0: acceleration-only ramp, max_rate _is_ final_rate
|
||||
max_adv_steps = final_adv_steps;
|
||||
} else {
|
||||
float max_rate = sqrt(acceleration_x2 * accelerate_steps + initial_rate_sqr);
|
||||
max_adv_steps = max_rate * block->adv_comp;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
CRITICAL_SECTION_START; // Fill variables used by the stepper in a critical section
|
||||
|
@ -272,6 +300,10 @@ void calculate_trapezoid_for_block(block_t *block, float entry_speed, float exit
|
|||
block->decelerate_after = accelerate_steps+plateau_steps;
|
||||
block->initial_rate = initial_rate;
|
||||
block->final_rate = final_rate;
|
||||
#ifdef LIN_ADVANCE
|
||||
block->final_adv_steps = final_adv_steps;
|
||||
block->max_adv_steps = max_adv_steps;
|
||||
#endif
|
||||
}
|
||||
CRITICAL_SECTION_END;
|
||||
}
|
||||
|
@ -424,14 +456,16 @@ void plan_init() {
|
|||
block_buffer_head = 0;
|
||||
block_buffer_tail = 0;
|
||||
memset(position, 0, sizeof(position)); // clear position
|
||||
#ifdef LIN_ADVANCE
|
||||
memset(position_float, 0, sizeof(position)); // clear position
|
||||
#endif
|
||||
#ifdef LIN_ADVANCE
|
||||
memset(position_float, 0, sizeof(position_float)); // clear position
|
||||
#endif
|
||||
previous_speed[0] = 0.0;
|
||||
previous_speed[1] = 0.0;
|
||||
previous_speed[2] = 0.0;
|
||||
previous_speed[3] = 0.0;
|
||||
previous_nominal_speed = 0.0;
|
||||
plan_reset_next_e_queue = false;
|
||||
plan_reset_next_e_sched = false;
|
||||
}
|
||||
|
||||
|
||||
|
@ -639,7 +673,9 @@ void planner_abort_hard()
|
|||
// Apply inverse world correction matrix.
|
||||
machine2world(current_position[X_AXIS], current_position[Y_AXIS]);
|
||||
memcpy(destination, current_position, sizeof(destination));
|
||||
|
||||
#ifdef LIN_ADVANCE
|
||||
memcpy(position_float, current_position, sizeof(position_float));
|
||||
#endif
|
||||
// Resets planner junction speeds. Assumes start from rest.
|
||||
previous_nominal_speed = 0.0;
|
||||
previous_speed[0] = 0.0;
|
||||
|
@ -647,12 +683,23 @@ void planner_abort_hard()
|
|||
previous_speed[2] = 0.0;
|
||||
previous_speed[3] = 0.0;
|
||||
|
||||
plan_reset_next_e_queue = false;
|
||||
plan_reset_next_e_sched = false;
|
||||
|
||||
// Relay to planner wait routine, that the current line shall be canceled.
|
||||
waiting_inside_plan_buffer_line_print_aborted = true;
|
||||
}
|
||||
|
||||
void plan_buffer_line_curposXYZE(float feed_rate, uint8_t extruder) {
|
||||
plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], feed_rate, extruder );
|
||||
void plan_buffer_line_curposXYZE(float feed_rate) {
|
||||
plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], feed_rate, active_extruder );
|
||||
}
|
||||
|
||||
void plan_buffer_line_destinationXYZE(float feed_rate) {
|
||||
plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feed_rate, active_extruder);
|
||||
}
|
||||
|
||||
void plan_set_position_curposXYZE(){
|
||||
plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
|
||||
}
|
||||
|
||||
float junction_deviation = 0.1;
|
||||
|
@ -710,6 +757,20 @@ void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate
|
|||
// Save the global feedrate at scheduling time
|
||||
block->gcode_feedrate = feedrate;
|
||||
|
||||
// Reset the starting E position when requested
|
||||
if (plan_reset_next_e_queue)
|
||||
{
|
||||
position[E_AXIS] = 0;
|
||||
#ifdef LIN_ADVANCE
|
||||
position_float[E_AXIS] = 0;
|
||||
#endif
|
||||
|
||||
// the block might still be discarded later, but we need to ensure the lower-level
|
||||
// count_position is also reset correctly for consistent results!
|
||||
plan_reset_next_e_queue = false;
|
||||
plan_reset_next_e_sched = true;
|
||||
}
|
||||
|
||||
#ifdef ENABLE_AUTO_BED_LEVELING
|
||||
apply_rotation_xyz(plan_bed_level_matrix, x, y, z);
|
||||
#endif // ENABLE_AUTO_BED_LEVELING
|
||||
|
@ -775,21 +836,15 @@ void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate
|
|||
#endif // ENABLE_MESH_BED_LEVELING
|
||||
target[E_AXIS] = lround(e*cs.axis_steps_per_unit[E_AXIS]);
|
||||
|
||||
#ifdef LIN_ADVANCE
|
||||
const float mm_D_float = sqrt(sq(x - position_float[X_AXIS]) + sq(y - position_float[Y_AXIS]));
|
||||
float de_float = e - position_float[E_AXIS];
|
||||
#endif
|
||||
|
||||
#ifdef PREVENT_DANGEROUS_EXTRUDE
|
||||
if(target[E_AXIS]!=position[E_AXIS])
|
||||
{
|
||||
if(degHotend(active_extruder)<extrude_min_temp)
|
||||
{
|
||||
position[E_AXIS]=target[E_AXIS]; //behave as if the move really took place, but ignore E part
|
||||
#ifdef LIN_ADVANCE
|
||||
#ifdef LIN_ADVANCE
|
||||
position_float[E_AXIS] = e;
|
||||
de_float = 0;
|
||||
#endif
|
||||
#endif
|
||||
SERIAL_ECHO_START;
|
||||
SERIAL_ECHOLNRPGM(_n(" cold extrusion prevented"));////MSG_ERR_COLD_EXTRUDE_STOP
|
||||
}
|
||||
|
@ -798,10 +853,9 @@ void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate
|
|||
if(labs(target[E_AXIS]-position[E_AXIS])>cs.axis_steps_per_unit[E_AXIS]*EXTRUDE_MAXLENGTH)
|
||||
{
|
||||
position[E_AXIS]=target[E_AXIS]; //behave as if the move really took place, but ignore E part
|
||||
#ifdef LIN_ADVANCE
|
||||
position_float[E_AXIS] = e;
|
||||
de_float = 0;
|
||||
#endif
|
||||
#ifdef LIN_ADVANCE
|
||||
position_float[E_AXIS] = e;
|
||||
#endif
|
||||
SERIAL_ECHO_START;
|
||||
SERIAL_ECHOLNRPGM(_n(" too long extrusion prevented"));////MSG_ERR_LONG_EXTRUDE_STOP
|
||||
}
|
||||
|
@ -1012,6 +1066,9 @@ Having the real displacement of the head, we can calculate the total movement le
|
|||
block->nominal_rate *= speed_factor;
|
||||
}
|
||||
|
||||
#ifdef LIN_ADVANCE
|
||||
float e_D_ratio = 0;
|
||||
#endif
|
||||
// Compute and limit the acceleration rate for the trapezoid generator.
|
||||
// block->step_event_count ... event count of the fastest axis
|
||||
// block->millimeters ... Euclidian length of the XYZ movement or the E length, if no XYZ movement.
|
||||
|
@ -1019,10 +1076,59 @@ Having the real displacement of the head, we can calculate the total movement le
|
|||
if(block->steps_x.wide == 0 && block->steps_y.wide == 0 && block->steps_z.wide == 0)
|
||||
{
|
||||
block->acceleration_st = ceil(cs.retract_acceleration * steps_per_mm); // convert to: acceleration steps/sec^2
|
||||
#ifdef LIN_ADVANCE
|
||||
block->use_advance_lead = false;
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
block->acceleration_st = ceil(cs.acceleration * steps_per_mm); // convert to: acceleration steps/sec^2
|
||||
|
||||
#ifdef LIN_ADVANCE
|
||||
/**
|
||||
* Use LIN_ADVANCE within this block if all these are true:
|
||||
*
|
||||
* extruder_advance_K : There is an advance factor set.
|
||||
* delta_mm[E_AXIS] >= 0 : Extruding or traveling, but _not_ retracting.
|
||||
* |delta_mm[Z_AXIS]| < 0.5 : Z is only moved for leveling (_not_ for priming)
|
||||
*/
|
||||
block->use_advance_lead = extruder_advance_K > 0
|
||||
&& delta_mm[E_AXIS] >= 0
|
||||
&& abs(delta_mm[Z_AXIS]) < 0.5;
|
||||
if (block->use_advance_lead) {
|
||||
#ifdef LA_FLOWADJ
|
||||
// M221/FLOW should change uniformly the extrusion thickness
|
||||
float delta_e = (e - position_float[E_AXIS]) / extruder_multiplier[extruder];
|
||||
#else
|
||||
// M221/FLOW only adjusts for an incorrect source diameter
|
||||
float delta_e = (e - position_float[E_AXIS]);
|
||||
#endif
|
||||
float delta_D = sqrt(sq(x - position_float[X_AXIS])
|
||||
+ sq(y - position_float[Y_AXIS])
|
||||
+ sq(z - position_float[Z_AXIS]));
|
||||
|
||||
// all extrusion moves with LA require a compression which is proportional to the
|
||||
// extrusion_length to distance ratio (e/D)
|
||||
e_D_ratio = delta_e / delta_D;
|
||||
|
||||
// Check for unusual high e_D ratio to detect if a retract move was combined with the last
|
||||
// print move due to min. steps per segment. Never execute this with advance! This assumes
|
||||
// no one will use a retract length of 0mm < retr_length < ~0.2mm and no one will print
|
||||
// 100mm wide lines using 3mm filament or 35mm wide lines using 1.75mm filament.
|
||||
if (e_D_ratio > 3.0)
|
||||
block->use_advance_lead = false;
|
||||
else if (e_D_ratio > 0) {
|
||||
const float max_accel_per_s2 = cs.max_jerk[E_AXIS] / (extruder_advance_K * e_D_ratio);
|
||||
if (cs.acceleration > max_accel_per_s2) {
|
||||
block->acceleration_st = ceil(max_accel_per_s2 * steps_per_mm);
|
||||
#ifdef LA_DEBUG
|
||||
SERIAL_ECHOLNPGM("LA: Block acceleration limited due to max E-jerk");
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// Limit acceleration per axis
|
||||
//FIXME Vojtech: One shall rather limit a projection of the acceleration vector instead of using the limit.
|
||||
if(((float)block->acceleration_st * (float)block->steps_x.wide / (float)block->step_event_count.wide) > axis_steps_per_sqr_second[X_AXIS])
|
||||
|
@ -1053,7 +1159,7 @@ Having the real displacement of the head, we can calculate the total movement le
|
|||
block->acceleration_st = (block->acceleration_st + (bresenham_oversample >> 1)) / bresenham_oversample;
|
||||
#endif
|
||||
|
||||
block->acceleration_rate = (long)((float)block->acceleration_st * (16777216.0 / (F_CPU / 8.0)));
|
||||
block->acceleration_rate = ((float)block->acceleration_st * (16777216.0 / (F_CPU / 8.0)));
|
||||
|
||||
// Start with a safe speed.
|
||||
// Safe speed is the speed, from which the machine may halt to stop immediately.
|
||||
|
@ -1083,6 +1189,13 @@ Having the real displacement of the head, we can calculate the total movement le
|
|||
// Reset the block flag.
|
||||
block->flag = 0;
|
||||
|
||||
if (plan_reset_next_e_sched)
|
||||
{
|
||||
// finally propagate a pending reset
|
||||
block->flag |= BLOCK_FLAG_E_RESET;
|
||||
plan_reset_next_e_sched = false;
|
||||
}
|
||||
|
||||
// Initial limit on the segment entry velocity.
|
||||
float vmax_junction;
|
||||
|
||||
|
@ -1171,39 +1284,55 @@ Having the real displacement of the head, we can calculate the total movement le
|
|||
previous_nominal_speed = block->nominal_speed;
|
||||
previous_safe_speed = safe_speed;
|
||||
|
||||
#ifdef LIN_ADVANCE
|
||||
|
||||
//
|
||||
// Use LIN_ADVANCE for blocks if all these are true:
|
||||
//
|
||||
// esteps : We have E steps todo (a printing move)
|
||||
//
|
||||
// block->steps[X_AXIS] || block->steps[Y_AXIS] : We have a movement in XY direction (i.e., not retract / prime).
|
||||
//
|
||||
// extruder_advance_k : There is an advance factor set.
|
||||
//
|
||||
// block->steps[E_AXIS] != block->step_event_count : A problem occurs if the move before a retract is too small.
|
||||
// In that case, the retract and move will be executed together.
|
||||
// This leads to too many advance steps due to a huge e_acceleration.
|
||||
// The math is good, but we must avoid retract moves with advance!
|
||||
// de_float > 0.0 : Extruder is running forward (e.g., for "Wipe while retracting" (Slic3r) or "Combing" (Cura) moves)
|
||||
//
|
||||
block->use_advance_lead = block->steps_e.wide
|
||||
&& (block->steps_x.wide || block->steps_y.wide)
|
||||
&& extruder_advance_k
|
||||
&& (uint32_t)block->steps_e.wide != block->step_event_count.wide
|
||||
&& de_float > 0.0;
|
||||
if (block->use_advance_lead)
|
||||
block->abs_adv_steps_multiplier8 = lround(
|
||||
extruder_advance_k
|
||||
* ((advance_ed_ratio < 0.000001) ? de_float / mm_D_float : advance_ed_ratio) // Use the fixed ratio, if set
|
||||
* (block->nominal_speed / (float)block->nominal_rate)
|
||||
* cs.axis_steps_per_unit[E_AXIS] * 256.0
|
||||
);
|
||||
#endif
|
||||
|
||||
// Precalculate the division, so when all the trapezoids in the planner queue get recalculated, the division is not repeated.
|
||||
block->speed_factor = block->nominal_rate / block->nominal_speed;
|
||||
|
||||
#ifdef LIN_ADVANCE
|
||||
if (block->use_advance_lead) {
|
||||
// calculate the compression ratio for the segment (the required advance steps are computed
|
||||
// during trapezoid planning)
|
||||
float adv_comp = extruder_advance_K * e_D_ratio * cs.axis_steps_per_unit[E_AXIS]; // (step/(mm/s))
|
||||
block->adv_comp = adv_comp / block->speed_factor; // step/(step/min)
|
||||
|
||||
float advance_speed;
|
||||
if (e_D_ratio > 0)
|
||||
advance_speed = (extruder_advance_K * e_D_ratio * block->acceleration * cs.axis_steps_per_unit[E_AXIS]);
|
||||
else
|
||||
advance_speed = cs.max_jerk[E_AXIS] * cs.axis_steps_per_unit[E_AXIS];
|
||||
|
||||
// to save more space we avoid another copy of calc_timer and go through slow division, but we
|
||||
// still need to replicate the *exact* same step grouping policy (see below)
|
||||
if (advance_speed > MAX_STEP_FREQUENCY) advance_speed = MAX_STEP_FREQUENCY;
|
||||
float advance_rate = (F_CPU / 8.0) / advance_speed;
|
||||
if (advance_speed > 20000) {
|
||||
block->advance_rate = advance_rate * 4;
|
||||
block->advance_step_loops = 4;
|
||||
}
|
||||
else if (advance_speed > 10000) {
|
||||
block->advance_rate = advance_rate * 2;
|
||||
block->advance_step_loops = 2;
|
||||
}
|
||||
else
|
||||
{
|
||||
// never overflow the internal accumulator with very low rates
|
||||
if (advance_rate < UINT16_MAX)
|
||||
block->advance_rate = advance_rate;
|
||||
else
|
||||
block->advance_rate = UINT16_MAX;
|
||||
block->advance_step_loops = 1;
|
||||
}
|
||||
|
||||
#ifdef LA_DEBUG
|
||||
if (block->advance_step_loops > 2)
|
||||
// @wavexx: we should really check for the difference between step_loops and
|
||||
// advance_step_loops instead. A difference of more than 1 will lead
|
||||
// to uneven speed and *should* be adjusted here by furthermore
|
||||
// reducing the speed.
|
||||
SERIAL_ECHOLNPGM("LA: More than 2 steps per eISR loop executed.");
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
calculate_trapezoid_for_block(block, block->entry_speed, safe_speed);
|
||||
|
||||
if (block->step_event_count.wide <= 32767)
|
||||
|
@ -1215,12 +1344,12 @@ Having the real displacement of the head, we can calculate the total movement le
|
|||
// Update position
|
||||
memcpy(position, target, sizeof(target)); // position[] = target[]
|
||||
|
||||
#ifdef LIN_ADVANCE
|
||||
#ifdef LIN_ADVANCE
|
||||
position_float[X_AXIS] = x;
|
||||
position_float[Y_AXIS] = y;
|
||||
position_float[Z_AXIS] = z;
|
||||
position_float[E_AXIS] = e;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// Recalculate the trapezoids to maximize speed at the segment transitions while respecting
|
||||
// the machine limits (maximum acceleration and maximum jerk).
|
||||
|
@ -1264,14 +1393,7 @@ void plan_set_position(float x, float y, float z, const float &e)
|
|||
apply_rotation_xyz(plan_bed_level_matrix, x, y, z);
|
||||
#endif // ENABLE_AUTO_BED_LEVELING
|
||||
|
||||
// Apply the machine correction matrix.
|
||||
if (world2machine_correction_mode != WORLD2MACHINE_CORRECTION_NONE)
|
||||
{
|
||||
float tmpx = x;
|
||||
float tmpy = y;
|
||||
x = world2machine_rotation_and_skew[0][0] * tmpx + world2machine_rotation_and_skew[0][1] * tmpy + world2machine_shift[0];
|
||||
y = world2machine_rotation_and_skew[1][0] * tmpx + world2machine_rotation_and_skew[1][1] * tmpy + world2machine_shift[1];
|
||||
}
|
||||
world2machine(x, y);
|
||||
|
||||
position[X_AXIS] = lround(x*cs.axis_steps_per_unit[X_AXIS]);
|
||||
position[Y_AXIS] = lround(y*cs.axis_steps_per_unit[Y_AXIS]);
|
||||
|
@ -1283,12 +1405,12 @@ void plan_set_position(float x, float y, float z, const float &e)
|
|||
position[Z_AXIS] = lround(z*cs.axis_steps_per_unit[Z_AXIS]);
|
||||
#endif // ENABLE_MESH_BED_LEVELING
|
||||
position[E_AXIS] = lround(e*cs.axis_steps_per_unit[E_AXIS]);
|
||||
#ifdef LIN_ADVANCE
|
||||
#ifdef LIN_ADVANCE
|
||||
position_float[X_AXIS] = x;
|
||||
position_float[Y_AXIS] = y;
|
||||
position_float[Z_AXIS] = z;
|
||||
position_float[E_AXIS] = e;
|
||||
#endif
|
||||
#endif
|
||||
st_set_position(position[X_AXIS], position[Y_AXIS], position[Z_AXIS], position[E_AXIS]);
|
||||
previous_nominal_speed = 0.0; // Resets planner junction speeds. Assumes start from rest.
|
||||
previous_speed[0] = 0.0;
|
||||
|
@ -1300,11 +1422,11 @@ void plan_set_position(float x, float y, float z, const float &e)
|
|||
// Only useful in the bed leveling routine, when the mesh bed leveling is off.
|
||||
void plan_set_z_position(const float &z)
|
||||
{
|
||||
#ifdef LIN_ADVANCE
|
||||
position_float[Z_AXIS] = z;
|
||||
#endif
|
||||
position[Z_AXIS] = lround(z*cs.axis_steps_per_unit[Z_AXIS]);
|
||||
st_set_position(position[X_AXIS], position[Y_AXIS], position[Z_AXIS], position[E_AXIS]);
|
||||
#ifdef LIN_ADVANCE
|
||||
position_float[Z_AXIS] = z;
|
||||
#endif
|
||||
position[Z_AXIS] = lround(z*cs.axis_steps_per_unit[Z_AXIS]);
|
||||
st_set_position(position[X_AXIS], position[Y_AXIS], position[Z_AXIS], position[E_AXIS]);
|
||||
}
|
||||
|
||||
void plan_set_e_position(const float &e)
|
||||
|
@ -1316,6 +1438,11 @@ void plan_set_e_position(const float &e)
|
|||
st_set_e_position(position[E_AXIS]);
|
||||
}
|
||||
|
||||
void plan_reset_next_e()
|
||||
{
|
||||
plan_reset_next_e_queue = true;
|
||||
}
|
||||
|
||||
#ifdef PREVENT_DANGEROUS_EXTRUDE
|
||||
void set_extrude_min_temp(float temp)
|
||||
{
|
||||
|
|
|
@ -44,6 +44,8 @@ enum BlockFlag {
|
|||
// than 32767, therefore the DDA algorithm may run with 16bit resolution only.
|
||||
// In addition, the stepper routine will not do any end stop checking for higher performance.
|
||||
BLOCK_FLAG_DDA_LOWRES = 8,
|
||||
// Block starts with Zeroed E counter
|
||||
BLOCK_FLAG_E_RESET = 16,
|
||||
};
|
||||
|
||||
union dda_isteps_t
|
||||
|
@ -71,12 +73,12 @@ typedef struct {
|
|||
// steps_x.y,z, step_event_count, acceleration_rate, direction_bits and active_extruder are set by plan_buffer_line().
|
||||
dda_isteps_t steps_x, steps_y, steps_z, steps_e; // Step count along each axis
|
||||
dda_usteps_t step_event_count; // The number of step events required to complete this block
|
||||
long acceleration_rate; // The acceleration rate used for acceleration calculation
|
||||
uint32_t acceleration_rate; // The acceleration rate used for acceleration calculation
|
||||
unsigned char direction_bits; // The direction bit set for this block (refers to *_DIRECTION_BIT in config.h)
|
||||
unsigned char active_extruder; // Selects the active extruder
|
||||
// accelerate_until and decelerate_after are set by calculate_trapezoid_for_block() and they need to be synchronized with the stepper interrupt controller.
|
||||
long accelerate_until; // The index of the step event on which to stop acceleration
|
||||
long decelerate_after; // The index of the step event on which to start decelerating
|
||||
uint32_t accelerate_until; // The index of the step event on which to stop acceleration
|
||||
uint32_t decelerate_after; // The index of the step event on which to start decelerating
|
||||
|
||||
// Fields used by the motion planner to manage acceleration
|
||||
// float speed_x, speed_y, speed_z, speed_e; // Nominal mm/sec for each axis
|
||||
|
@ -98,22 +100,25 @@ typedef struct {
|
|||
|
||||
// Settings for the trapezoid generator (runs inside an interrupt handler).
|
||||
// Changing the following values in the planner needs to be synchronized with the interrupt handler by disabling the interrupts.
|
||||
//FIXME nominal_rate, initial_rate and final_rate are limited to uint16_t by MultiU24X24toH16 in the stepper interrupt anyway!
|
||||
unsigned long nominal_rate; // The nominal step rate for this block in step_events/sec
|
||||
unsigned long initial_rate; // The jerk-adjusted step rate at start of block
|
||||
unsigned long final_rate; // The minimal rate at exit
|
||||
unsigned long acceleration_st; // acceleration steps/sec^2
|
||||
//FIXME does it have to be unsigned long? Probably uint8_t would be just fine.
|
||||
unsigned long fan_speed;
|
||||
//FIXME does it have to be int? Probably uint8_t would be just fine. Need to change in other places as well
|
||||
int fan_speed;
|
||||
volatile char busy;
|
||||
|
||||
|
||||
// Pre-calculated division for the calculate_trapezoid_for_block() routine to run faster.
|
||||
float speed_factor;
|
||||
|
||||
|
||||
#ifdef LIN_ADVANCE
|
||||
bool use_advance_lead;
|
||||
unsigned long abs_adv_steps_multiplier8; // Factorised by 2^8 to avoid float
|
||||
bool use_advance_lead; // Whether the current block uses LA
|
||||
uint16_t advance_rate, // Step-rate for extruder speed
|
||||
max_adv_steps, // max. advance steps to get cruising speed pressure (not always nominal_speed!)
|
||||
final_adv_steps; // advance steps due to exit speed
|
||||
uint8_t advance_step_loops; // Number of stepper ticks for each advance isr
|
||||
float adv_comp; // Precomputed E compression factor
|
||||
#endif
|
||||
|
||||
// Save/recovery state data
|
||||
|
@ -123,7 +128,7 @@ typedef struct {
|
|||
} block_t;
|
||||
|
||||
#ifdef LIN_ADVANCE
|
||||
extern float extruder_advance_k, advance_ed_ratio;
|
||||
extern float extruder_advance_K; // Linear-advance K factor
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_AUTO_BED_LEVELING
|
||||
|
@ -148,7 +153,11 @@ vector_3 plan_get_position();
|
|||
/// plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], ...
|
||||
/// saves almost 5KB.
|
||||
/// The performance penalty is negligible, since these planned lines are usually maintenance moves with the extruder.
|
||||
void plan_buffer_line_curposXYZE(float feed_rate, uint8_t extruder);
|
||||
void plan_buffer_line_curposXYZE(float feed_rate);
|
||||
|
||||
void plan_buffer_line_destinationXYZE(float feed_rate);
|
||||
|
||||
void plan_set_position_curposXYZE();
|
||||
|
||||
void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate, uint8_t extruder, const float* gcode_target = NULL);
|
||||
//void plan_buffer_line(const float &x, const float &y, const float &z, const float &e, float feed_rate, const uint8_t &extruder);
|
||||
|
@ -164,6 +173,12 @@ void plan_set_position(float x, float y, float z, const float &e);
|
|||
void plan_set_z_position(const float &z);
|
||||
void plan_set_e_position(const float &e);
|
||||
|
||||
// Reset the E position to zero at the start of the next segment
|
||||
void plan_reset_next_e();
|
||||
|
||||
inline void set_current_to_destination() { memcpy(current_position, destination, sizeof(current_position)); }
|
||||
inline void set_destination_to_current() { memcpy(destination, current_position, sizeof(destination)); }
|
||||
|
||||
extern bool e_active();
|
||||
|
||||
void check_axes_activity();
|
||||
|
|
147
Firmware/speed_lookuptable.cpp
Normal file
147
Firmware/speed_lookuptable.cpp
Normal file
|
@ -0,0 +1,147 @@
|
|||
#include "speed_lookuptable.h"
|
||||
|
||||
#if F_CPU == 16000000
|
||||
|
||||
const uint16_t speed_lookuptable_fast[256][2] PROGMEM = {\
|
||||
{ 62500, 55556}, { 6944, 3268}, { 3676, 1176}, { 2500, 607}, { 1893, 369}, { 1524, 249}, { 1275, 179}, { 1096, 135},
|
||||
{ 961, 105}, { 856, 85}, { 771, 69}, { 702, 58}, { 644, 49}, { 595, 42}, { 553, 37}, { 516, 32},
|
||||
{ 484, 28}, { 456, 25}, { 431, 23}, { 408, 20}, { 388, 19}, { 369, 16}, { 353, 16}, { 337, 14},
|
||||
{ 323, 13}, { 310, 11}, { 299, 11}, { 288, 11}, { 277, 9}, { 268, 9}, { 259, 8}, { 251, 8},
|
||||
{ 243, 8}, { 235, 7}, { 228, 6}, { 222, 6}, { 216, 6}, { 210, 6}, { 204, 5}, { 199, 5},
|
||||
{ 194, 5}, { 189, 4}, { 185, 4}, { 181, 4}, { 177, 4}, { 173, 4}, { 169, 4}, { 165, 3},
|
||||
{ 162, 3}, { 159, 4}, { 155, 3}, { 152, 3}, { 149, 2}, { 147, 3}, { 144, 3}, { 141, 2},
|
||||
{ 139, 3}, { 136, 2}, { 134, 2}, { 132, 3}, { 129, 2}, { 127, 2}, { 125, 2}, { 123, 2},
|
||||
{ 121, 2}, { 119, 1}, { 118, 2}, { 116, 2}, { 114, 1}, { 113, 2}, { 111, 2}, { 109, 1},
|
||||
{ 108, 2}, { 106, 1}, { 105, 2}, { 103, 1}, { 102, 1}, { 101, 1}, { 100, 2}, { 98, 1},
|
||||
{ 97, 1}, { 96, 1}, { 95, 2}, { 93, 1}, { 92, 1}, { 91, 1}, { 90, 1}, { 89, 1},
|
||||
{ 88, 1}, { 87, 1}, { 86, 1}, { 85, 1}, { 84, 1}, { 83, 0}, { 83, 1}, { 82, 1},
|
||||
{ 81, 1}, { 80, 1}, { 79, 1}, { 78, 0}, { 78, 1}, { 77, 1}, { 76, 1}, { 75, 0},
|
||||
{ 75, 1}, { 74, 1}, { 73, 1}, { 72, 0}, { 72, 1}, { 71, 1}, { 70, 0}, { 70, 1},
|
||||
{ 69, 0}, { 69, 1}, { 68, 1}, { 67, 0}, { 67, 1}, { 66, 0}, { 66, 1}, { 65, 0},
|
||||
{ 65, 1}, { 64, 1}, { 63, 0}, { 63, 1}, { 62, 0}, { 62, 1}, { 61, 0}, { 61, 1},
|
||||
{ 60, 0}, { 60, 0}, { 60, 1}, { 59, 0}, { 59, 1}, { 58, 0}, { 58, 1}, { 57, 0},
|
||||
{ 57, 1}, { 56, 0}, { 56, 0}, { 56, 1}, { 55, 0}, { 55, 1}, { 54, 0}, { 54, 0},
|
||||
{ 54, 1}, { 53, 0}, { 53, 0}, { 53, 1}, { 52, 0}, { 52, 0}, { 52, 1}, { 51, 0},
|
||||
{ 51, 0}, { 51, 1}, { 50, 0}, { 50, 0}, { 50, 1}, { 49, 0}, { 49, 0}, { 49, 1},
|
||||
{ 48, 0}, { 48, 0}, { 48, 1}, { 47, 0}, { 47, 0}, { 47, 0}, { 47, 1}, { 46, 0},
|
||||
{ 46, 0}, { 46, 1}, { 45, 0}, { 45, 0}, { 45, 0}, { 45, 1}, { 44, 0}, { 44, 0},
|
||||
{ 44, 0}, { 44, 1}, { 43, 0}, { 43, 0}, { 43, 0}, { 43, 1}, { 42, 0}, { 42, 0},
|
||||
{ 42, 0}, { 42, 1}, { 41, 0}, { 41, 0}, { 41, 0}, { 41, 0}, { 41, 1}, { 40, 0},
|
||||
{ 40, 0}, { 40, 0}, { 40, 0}, { 40, 1}, { 39, 0}, { 39, 0}, { 39, 0}, { 39, 0},
|
||||
{ 39, 1}, { 38, 0}, { 38, 0}, { 38, 0}, { 38, 0}, { 38, 1}, { 37, 0}, { 37, 0},
|
||||
{ 37, 0}, { 37, 0}, { 37, 0}, { 37, 1}, { 36, 0}, { 36, 0}, { 36, 0}, { 36, 0},
|
||||
{ 36, 1}, { 35, 0}, { 35, 0}, { 35, 0}, { 35, 0}, { 35, 0}, { 35, 0}, { 35, 1},
|
||||
{ 34, 0}, { 34, 0}, { 34, 0}, { 34, 0}, { 34, 0}, { 34, 1}, { 33, 0}, { 33, 0},
|
||||
{ 33, 0}, { 33, 0}, { 33, 0}, { 33, 0}, { 33, 1}, { 32, 0}, { 32, 0}, { 32, 0},
|
||||
{ 32, 0}, { 32, 0}, { 32, 0}, { 32, 0}, { 32, 1}, { 31, 0}, { 31, 0}, { 31, 0},
|
||||
{ 31, 0}, { 31, 0}, { 31, 0}, { 31, 1}, { 30, 0}, { 30, 0}, { 30, 0}, { 30, 0}
|
||||
};
|
||||
|
||||
const uint16_t speed_lookuptable_slow[256][2] PROGMEM = {\
|
||||
{ 62500, 12500}, { 50000, 8334}, { 41666, 5952}, { 35714, 4464}, { 31250, 3473}, { 27777, 2777}, { 25000, 2273}, { 22727, 1894},
|
||||
{ 20833, 1603}, { 19230, 1373}, { 17857, 1191}, { 16666, 1041}, { 15625, 920}, { 14705, 817}, { 13888, 731}, { 13157, 657},
|
||||
{ 12500, 596}, { 11904, 541}, { 11363, 494}, { 10869, 453}, { 10416, 416}, { 10000, 385}, { 9615, 356}, { 9259, 331},
|
||||
{ 8928, 308}, { 8620, 287}, { 8333, 269}, { 8064, 252}, { 7812, 237}, { 7575, 223}, { 7352, 210}, { 7142, 198},
|
||||
{ 6944, 188}, { 6756, 178}, { 6578, 168}, { 6410, 160}, { 6250, 153}, { 6097, 145}, { 5952, 139}, { 5813, 132},
|
||||
{ 5681, 126}, { 5555, 121}, { 5434, 115}, { 5319, 111}, { 5208, 106}, { 5102, 102}, { 5000, 99}, { 4901, 94},
|
||||
{ 4807, 91}, { 4716, 87}, { 4629, 84}, { 4545, 81}, { 4464, 79}, { 4385, 75}, { 4310, 73}, { 4237, 71},
|
||||
{ 4166, 68}, { 4098, 66}, { 4032, 64}, { 3968, 62}, { 3906, 60}, { 3846, 59}, { 3787, 56}, { 3731, 55},
|
||||
{ 3676, 53}, { 3623, 52}, { 3571, 50}, { 3521, 49}, { 3472, 48}, { 3424, 46}, { 3378, 45}, { 3333, 44},
|
||||
{ 3289, 43}, { 3246, 41}, { 3205, 41}, { 3164, 39}, { 3125, 39}, { 3086, 38}, { 3048, 36}, { 3012, 36},
|
||||
{ 2976, 35}, { 2941, 35}, { 2906, 33}, { 2873, 33}, { 2840, 32}, { 2808, 31}, { 2777, 30}, { 2747, 30},
|
||||
{ 2717, 29}, { 2688, 29}, { 2659, 28}, { 2631, 27}, { 2604, 27}, { 2577, 26}, { 2551, 26}, { 2525, 25},
|
||||
{ 2500, 25}, { 2475, 25}, { 2450, 23}, { 2427, 24}, { 2403, 23}, { 2380, 22}, { 2358, 22}, { 2336, 22},
|
||||
{ 2314, 21}, { 2293, 21}, { 2272, 20}, { 2252, 20}, { 2232, 20}, { 2212, 20}, { 2192, 19}, { 2173, 18},
|
||||
{ 2155, 19}, { 2136, 18}, { 2118, 18}, { 2100, 17}, { 2083, 17}, { 2066, 17}, { 2049, 17}, { 2032, 16},
|
||||
{ 2016, 16}, { 2000, 16}, { 1984, 16}, { 1968, 15}, { 1953, 16}, { 1937, 14}, { 1923, 15}, { 1908, 15},
|
||||
{ 1893, 14}, { 1879, 14}, { 1865, 14}, { 1851, 13}, { 1838, 14}, { 1824, 13}, { 1811, 13}, { 1798, 13},
|
||||
{ 1785, 12}, { 1773, 13}, { 1760, 12}, { 1748, 12}, { 1736, 12}, { 1724, 12}, { 1712, 12}, { 1700, 11},
|
||||
{ 1689, 12}, { 1677, 11}, { 1666, 11}, { 1655, 11}, { 1644, 11}, { 1633, 10}, { 1623, 11}, { 1612, 10},
|
||||
{ 1602, 10}, { 1592, 10}, { 1582, 10}, { 1572, 10}, { 1562, 10}, { 1552, 9}, { 1543, 10}, { 1533, 9},
|
||||
{ 1524, 9}, { 1515, 9}, { 1506, 9}, { 1497, 9}, { 1488, 9}, { 1479, 9}, { 1470, 9}, { 1461, 8},
|
||||
{ 1453, 8}, { 1445, 9}, { 1436, 8}, { 1428, 8}, { 1420, 8}, { 1412, 8}, { 1404, 8}, { 1396, 8},
|
||||
{ 1388, 7}, { 1381, 8}, { 1373, 7}, { 1366, 8}, { 1358, 7}, { 1351, 7}, { 1344, 8}, { 1336, 7},
|
||||
{ 1329, 7}, { 1322, 7}, { 1315, 7}, { 1308, 6}, { 1302, 7}, { 1295, 7}, { 1288, 6}, { 1282, 7},
|
||||
{ 1275, 6}, { 1269, 7}, { 1262, 6}, { 1256, 6}, { 1250, 7}, { 1243, 6}, { 1237, 6}, { 1231, 6},
|
||||
{ 1225, 6}, { 1219, 6}, { 1213, 6}, { 1207, 6}, { 1201, 5}, { 1196, 6}, { 1190, 6}, { 1184, 5},
|
||||
{ 1179, 6}, { 1173, 5}, { 1168, 6}, { 1162, 5}, { 1157, 5}, { 1152, 6}, { 1146, 5}, { 1141, 5},
|
||||
{ 1136, 5}, { 1131, 5}, { 1126, 5}, { 1121, 5}, { 1116, 5}, { 1111, 5}, { 1106, 5}, { 1101, 5},
|
||||
{ 1096, 5}, { 1091, 5}, { 1086, 4}, { 1082, 5}, { 1077, 5}, { 1072, 4}, { 1068, 5}, { 1063, 4},
|
||||
{ 1059, 5}, { 1054, 4}, { 1050, 4}, { 1046, 5}, { 1041, 4}, { 1037, 4}, { 1033, 5}, { 1028, 4},
|
||||
{ 1024, 4}, { 1020, 4}, { 1016, 4}, { 1012, 4}, { 1008, 4}, { 1004, 4}, { 1000, 4}, { 996, 4},
|
||||
{ 992, 4}, { 988, 4}, { 984, 4}, { 980, 4}, { 976, 4}, { 972, 4}, { 968, 3}, { 965, 3}
|
||||
};
|
||||
|
||||
#elif F_CPU == 20000000
|
||||
|
||||
const uint16_t speed_lookuptable_fast[256][2] PROGMEM = {
|
||||
{62500, 54055}, {8445, 3917}, {4528, 1434}, {3094, 745}, {2349, 456}, {1893, 307}, {1586, 222}, {1364, 167},
|
||||
{1197, 131}, {1066, 105}, {961, 86}, {875, 72}, {803, 61}, {742, 53}, {689, 45}, {644, 40},
|
||||
{604, 35}, {569, 32}, {537, 28}, {509, 25}, {484, 23}, {461, 21}, {440, 19}, {421, 17},
|
||||
{404, 16}, {388, 15}, {373, 14}, {359, 13}, {346, 12}, {334, 11}, {323, 10}, {313, 10},
|
||||
{303, 9}, {294, 9}, {285, 8}, {277, 7}, {270, 8}, {262, 7}, {255, 6}, {249, 6},
|
||||
{243, 6}, {237, 6}, {231, 5}, {226, 5}, {221, 5}, {216, 5}, {211, 4}, {207, 5},
|
||||
{202, 4}, {198, 4}, {194, 4}, {190, 3}, {187, 4}, {183, 3}, {180, 3}, {177, 4},
|
||||
{173, 3}, {170, 3}, {167, 2}, {165, 3}, {162, 3}, {159, 2}, {157, 3}, {154, 2},
|
||||
{152, 3}, {149, 2}, {147, 2}, {145, 2}, {143, 2}, {141, 2}, {139, 2}, {137, 2},
|
||||
{135, 2}, {133, 2}, {131, 2}, {129, 1}, {128, 2}, {126, 2}, {124, 1}, {123, 2},
|
||||
{121, 1}, {120, 2}, {118, 1}, {117, 1}, {116, 2}, {114, 1}, {113, 1}, {112, 2},
|
||||
{110, 1}, {109, 1}, {108, 1}, {107, 2}, {105, 1}, {104, 1}, {103, 1}, {102, 1},
|
||||
{101, 1}, {100, 1}, {99, 1}, {98, 1}, {97, 1}, {96, 1}, {95, 1}, {94, 1},
|
||||
{93, 1}, {92, 1}, {91, 0}, {91, 1}, {90, 1}, {89, 1}, {88, 1}, {87, 0},
|
||||
{87, 1}, {86, 1}, {85, 1}, {84, 0}, {84, 1}, {83, 1}, {82, 1}, {81, 0},
|
||||
{81, 1}, {80, 1}, {79, 0}, {79, 1}, {78, 0}, {78, 1}, {77, 1}, {76, 0},
|
||||
{76, 1}, {75, 0}, {75, 1}, {74, 1}, {73, 0}, {73, 1}, {72, 0}, {72, 1},
|
||||
{71, 0}, {71, 1}, {70, 0}, {70, 1}, {69, 0}, {69, 1}, {68, 0}, {68, 1},
|
||||
{67, 0}, {67, 1}, {66, 0}, {66, 1}, {65, 0}, {65, 0}, {65, 1}, {64, 0},
|
||||
{64, 1}, {63, 0}, {63, 1}, {62, 0}, {62, 0}, {62, 1}, {61, 0}, {61, 1},
|
||||
{60, 0}, {60, 0}, {60, 1}, {59, 0}, {59, 0}, {59, 1}, {58, 0}, {58, 0},
|
||||
{58, 1}, {57, 0}, {57, 0}, {57, 1}, {56, 0}, {56, 0}, {56, 1}, {55, 0},
|
||||
{55, 0}, {55, 1}, {54, 0}, {54, 0}, {54, 1}, {53, 0}, {53, 0}, {53, 0},
|
||||
{53, 1}, {52, 0}, {52, 0}, {52, 1}, {51, 0}, {51, 0}, {51, 0}, {51, 1},
|
||||
{50, 0}, {50, 0}, {50, 0}, {50, 1}, {49, 0}, {49, 0}, {49, 0}, {49, 1},
|
||||
{48, 0}, {48, 0}, {48, 0}, {48, 1}, {47, 0}, {47, 0}, {47, 0}, {47, 1},
|
||||
{46, 0}, {46, 0}, {46, 0}, {46, 0}, {46, 1}, {45, 0}, {45, 0}, {45, 0},
|
||||
{45, 1}, {44, 0}, {44, 0}, {44, 0}, {44, 0}, {44, 1}, {43, 0}, {43, 0},
|
||||
{43, 0}, {43, 0}, {43, 1}, {42, 0}, {42, 0}, {42, 0}, {42, 0}, {42, 0},
|
||||
{42, 1}, {41, 0}, {41, 0}, {41, 0}, {41, 0}, {41, 0}, {41, 1}, {40, 0},
|
||||
{40, 0}, {40, 0}, {40, 0}, {40, 1}, {39, 0}, {39, 0}, {39, 0}, {39, 0},
|
||||
{39, 0}, {39, 0}, {39, 1}, {38, 0}, {38, 0}, {38, 0}, {38, 0}, {38, 0},
|
||||
};
|
||||
|
||||
const uint16_t speed_lookuptable_slow[256][2] PROGMEM = {
|
||||
{62500, 10417}, {52083, 7441}, {44642, 5580}, {39062, 4340}, {34722, 3472}, {31250, 2841}, {28409, 2368}, {26041, 2003},
|
||||
{24038, 1717}, {22321, 1488}, {20833, 1302}, {19531, 1149}, {18382, 1021}, {17361, 914}, {16447, 822}, {15625, 745},
|
||||
{14880, 676}, {14204, 618}, {13586, 566}, {13020, 520}, {12500, 481}, {12019, 445}, {11574, 414}, {11160, 385},
|
||||
{10775, 359}, {10416, 336}, {10080, 315}, {9765, 296}, {9469, 278}, {9191, 263}, {8928, 248}, {8680, 235},
|
||||
{8445, 222}, {8223, 211}, {8012, 200}, {7812, 191}, {7621, 181}, {7440, 173}, {7267, 165}, {7102, 158},
|
||||
{6944, 151}, {6793, 145}, {6648, 138}, {6510, 133}, {6377, 127}, {6250, 123}, {6127, 118}, {6009, 113},
|
||||
{5896, 109}, {5787, 106}, {5681, 101}, {5580, 98}, {5482, 95}, {5387, 91}, {5296, 88}, {5208, 86},
|
||||
{5122, 82}, {5040, 80}, {4960, 78}, {4882, 75}, {4807, 73}, {4734, 70}, {4664, 69}, {4595, 67},
|
||||
{4528, 64}, {4464, 63}, {4401, 61}, {4340, 60}, {4280, 58}, {4222, 56}, {4166, 55}, {4111, 53},
|
||||
{4058, 52}, {4006, 51}, {3955, 49}, {3906, 48}, {3858, 48}, {3810, 45}, {3765, 45}, {3720, 44},
|
||||
{3676, 43}, {3633, 42}, {3591, 40}, {3551, 40}, {3511, 39}, {3472, 38}, {3434, 38}, {3396, 36},
|
||||
{3360, 36}, {3324, 35}, {3289, 34}, {3255, 34}, {3221, 33}, {3188, 32}, {3156, 31}, {3125, 31},
|
||||
{3094, 31}, {3063, 30}, {3033, 29}, {3004, 28}, {2976, 28}, {2948, 28}, {2920, 27}, {2893, 27},
|
||||
{2866, 26}, {2840, 25}, {2815, 25}, {2790, 25}, {2765, 24}, {2741, 24}, {2717, 24}, {2693, 23},
|
||||
{2670, 22}, {2648, 22}, {2626, 22}, {2604, 22}, {2582, 21}, {2561, 21}, {2540, 20}, {2520, 20},
|
||||
{2500, 20}, {2480, 20}, {2460, 19}, {2441, 19}, {2422, 19}, {2403, 18}, {2385, 18}, {2367, 18},
|
||||
{2349, 17}, {2332, 18}, {2314, 17}, {2297, 16}, {2281, 17}, {2264, 16}, {2248, 16}, {2232, 16},
|
||||
{2216, 16}, {2200, 15}, {2185, 15}, {2170, 15}, {2155, 15}, {2140, 15}, {2125, 14}, {2111, 14},
|
||||
{2097, 14}, {2083, 14}, {2069, 14}, {2055, 13}, {2042, 13}, {2029, 13}, {2016, 13}, {2003, 13},
|
||||
{1990, 13}, {1977, 12}, {1965, 12}, {1953, 13}, {1940, 11}, {1929, 12}, {1917, 12}, {1905, 12},
|
||||
{1893, 11}, {1882, 11}, {1871, 11}, {1860, 11}, {1849, 11}, {1838, 11}, {1827, 11}, {1816, 10},
|
||||
{1806, 11}, {1795, 10}, {1785, 10}, {1775, 10}, {1765, 10}, {1755, 10}, {1745, 9}, {1736, 10},
|
||||
{1726, 9}, {1717, 10}, {1707, 9}, {1698, 9}, {1689, 9}, {1680, 9}, {1671, 9}, {1662, 9},
|
||||
{1653, 9}, {1644, 8}, {1636, 9}, {1627, 8}, {1619, 9}, {1610, 8}, {1602, 8}, {1594, 8},
|
||||
{1586, 8}, {1578, 8}, {1570, 8}, {1562, 8}, {1554, 7}, {1547, 8}, {1539, 8}, {1531, 7},
|
||||
{1524, 8}, {1516, 7}, {1509, 7}, {1502, 7}, {1495, 7}, {1488, 7}, {1481, 7}, {1474, 7},
|
||||
{1467, 7}, {1460, 7}, {1453, 7}, {1446, 6}, {1440, 7}, {1433, 7}, {1426, 6}, {1420, 6},
|
||||
{1414, 7}, {1407, 6}, {1401, 6}, {1395, 7}, {1388, 6}, {1382, 6}, {1376, 6}, {1370, 6},
|
||||
{1364, 6}, {1358, 6}, {1352, 6}, {1346, 5}, {1341, 6}, {1335, 6}, {1329, 5}, {1324, 6},
|
||||
{1318, 5}, {1313, 6}, {1307, 5}, {1302, 6}, {1296, 5}, {1291, 5}, {1286, 6}, {1280, 5},
|
||||
{1275, 5}, {1270, 5}, {1265, 5}, {1260, 5}, {1255, 5}, {1250, 5}, {1245, 5}, {1240, 5},
|
||||
{1235, 5}, {1230, 5}, {1225, 5}, {1220, 5}, {1215, 4}, {1211, 5}, {1206, 5}, {1201, 5},
|
||||
};
|
||||
|
||||
#endif
|
|
@ -3,150 +3,129 @@
|
|||
|
||||
#include "Marlin.h"
|
||||
|
||||
#if F_CPU == 16000000
|
||||
extern const uint16_t speed_lookuptable_fast[256][2] PROGMEM;
|
||||
extern const uint16_t speed_lookuptable_slow[256][2] PROGMEM;
|
||||
|
||||
const uint16_t speed_lookuptable_fast[256][2] PROGMEM = {\
|
||||
{ 62500, 55556}, { 6944, 3268}, { 3676, 1176}, { 2500, 607}, { 1893, 369}, { 1524, 249}, { 1275, 179}, { 1096, 135},
|
||||
{ 961, 105}, { 856, 85}, { 771, 69}, { 702, 58}, { 644, 49}, { 595, 42}, { 553, 37}, { 516, 32},
|
||||
{ 484, 28}, { 456, 25}, { 431, 23}, { 408, 20}, { 388, 19}, { 369, 16}, { 353, 16}, { 337, 14},
|
||||
{ 323, 13}, { 310, 11}, { 299, 11}, { 288, 11}, { 277, 9}, { 268, 9}, { 259, 8}, { 251, 8},
|
||||
{ 243, 8}, { 235, 7}, { 228, 6}, { 222, 6}, { 216, 6}, { 210, 6}, { 204, 5}, { 199, 5},
|
||||
{ 194, 5}, { 189, 4}, { 185, 4}, { 181, 4}, { 177, 4}, { 173, 4}, { 169, 4}, { 165, 3},
|
||||
{ 162, 3}, { 159, 4}, { 155, 3}, { 152, 3}, { 149, 2}, { 147, 3}, { 144, 3}, { 141, 2},
|
||||
{ 139, 3}, { 136, 2}, { 134, 2}, { 132, 3}, { 129, 2}, { 127, 2}, { 125, 2}, { 123, 2},
|
||||
{ 121, 2}, { 119, 1}, { 118, 2}, { 116, 2}, { 114, 1}, { 113, 2}, { 111, 2}, { 109, 1},
|
||||
{ 108, 2}, { 106, 1}, { 105, 2}, { 103, 1}, { 102, 1}, { 101, 1}, { 100, 2}, { 98, 1},
|
||||
{ 97, 1}, { 96, 1}, { 95, 2}, { 93, 1}, { 92, 1}, { 91, 1}, { 90, 1}, { 89, 1},
|
||||
{ 88, 1}, { 87, 1}, { 86, 1}, { 85, 1}, { 84, 1}, { 83, 0}, { 83, 1}, { 82, 1},
|
||||
{ 81, 1}, { 80, 1}, { 79, 1}, { 78, 0}, { 78, 1}, { 77, 1}, { 76, 1}, { 75, 0},
|
||||
{ 75, 1}, { 74, 1}, { 73, 1}, { 72, 0}, { 72, 1}, { 71, 1}, { 70, 0}, { 70, 1},
|
||||
{ 69, 0}, { 69, 1}, { 68, 1}, { 67, 0}, { 67, 1}, { 66, 0}, { 66, 1}, { 65, 0},
|
||||
{ 65, 1}, { 64, 1}, { 63, 0}, { 63, 1}, { 62, 0}, { 62, 1}, { 61, 0}, { 61, 1},
|
||||
{ 60, 0}, { 60, 0}, { 60, 1}, { 59, 0}, { 59, 1}, { 58, 0}, { 58, 1}, { 57, 0},
|
||||
{ 57, 1}, { 56, 0}, { 56, 0}, { 56, 1}, { 55, 0}, { 55, 1}, { 54, 0}, { 54, 0},
|
||||
{ 54, 1}, { 53, 0}, { 53, 0}, { 53, 1}, { 52, 0}, { 52, 0}, { 52, 1}, { 51, 0},
|
||||
{ 51, 0}, { 51, 1}, { 50, 0}, { 50, 0}, { 50, 1}, { 49, 0}, { 49, 0}, { 49, 1},
|
||||
{ 48, 0}, { 48, 0}, { 48, 1}, { 47, 0}, { 47, 0}, { 47, 0}, { 47, 1}, { 46, 0},
|
||||
{ 46, 0}, { 46, 1}, { 45, 0}, { 45, 0}, { 45, 0}, { 45, 1}, { 44, 0}, { 44, 0},
|
||||
{ 44, 0}, { 44, 1}, { 43, 0}, { 43, 0}, { 43, 0}, { 43, 1}, { 42, 0}, { 42, 0},
|
||||
{ 42, 0}, { 42, 1}, { 41, 0}, { 41, 0}, { 41, 0}, { 41, 0}, { 41, 1}, { 40, 0},
|
||||
{ 40, 0}, { 40, 0}, { 40, 0}, { 40, 1}, { 39, 0}, { 39, 0}, { 39, 0}, { 39, 0},
|
||||
{ 39, 1}, { 38, 0}, { 38, 0}, { 38, 0}, { 38, 0}, { 38, 1}, { 37, 0}, { 37, 0},
|
||||
{ 37, 0}, { 37, 0}, { 37, 0}, { 37, 1}, { 36, 0}, { 36, 0}, { 36, 0}, { 36, 0},
|
||||
{ 36, 1}, { 35, 0}, { 35, 0}, { 35, 0}, { 35, 0}, { 35, 0}, { 35, 0}, { 35, 1},
|
||||
{ 34, 0}, { 34, 0}, { 34, 0}, { 34, 0}, { 34, 0}, { 34, 1}, { 33, 0}, { 33, 0},
|
||||
{ 33, 0}, { 33, 0}, { 33, 0}, { 33, 0}, { 33, 1}, { 32, 0}, { 32, 0}, { 32, 0},
|
||||
{ 32, 0}, { 32, 0}, { 32, 0}, { 32, 0}, { 32, 1}, { 31, 0}, { 31, 0}, { 31, 0},
|
||||
{ 31, 0}, { 31, 0}, { 31, 0}, { 31, 1}, { 30, 0}, { 30, 0}, { 30, 0}, { 30, 0}
|
||||
};
|
||||
#ifndef _NO_ASM
|
||||
|
||||
const uint16_t speed_lookuptable_slow[256][2] PROGMEM = {\
|
||||
{ 62500, 12500}, { 50000, 8334}, { 41666, 5952}, { 35714, 4464}, { 31250, 3473}, { 27777, 2777}, { 25000, 2273}, { 22727, 1894},
|
||||
{ 20833, 1603}, { 19230, 1373}, { 17857, 1191}, { 16666, 1041}, { 15625, 920}, { 14705, 817}, { 13888, 731}, { 13157, 657},
|
||||
{ 12500, 596}, { 11904, 541}, { 11363, 494}, { 10869, 453}, { 10416, 416}, { 10000, 385}, { 9615, 356}, { 9259, 331},
|
||||
{ 8928, 308}, { 8620, 287}, { 8333, 269}, { 8064, 252}, { 7812, 237}, { 7575, 223}, { 7352, 210}, { 7142, 198},
|
||||
{ 6944, 188}, { 6756, 178}, { 6578, 168}, { 6410, 160}, { 6250, 153}, { 6097, 145}, { 5952, 139}, { 5813, 132},
|
||||
{ 5681, 126}, { 5555, 121}, { 5434, 115}, { 5319, 111}, { 5208, 106}, { 5102, 102}, { 5000, 99}, { 4901, 94},
|
||||
{ 4807, 91}, { 4716, 87}, { 4629, 84}, { 4545, 81}, { 4464, 79}, { 4385, 75}, { 4310, 73}, { 4237, 71},
|
||||
{ 4166, 68}, { 4098, 66}, { 4032, 64}, { 3968, 62}, { 3906, 60}, { 3846, 59}, { 3787, 56}, { 3731, 55},
|
||||
{ 3676, 53}, { 3623, 52}, { 3571, 50}, { 3521, 49}, { 3472, 48}, { 3424, 46}, { 3378, 45}, { 3333, 44},
|
||||
{ 3289, 43}, { 3246, 41}, { 3205, 41}, { 3164, 39}, { 3125, 39}, { 3086, 38}, { 3048, 36}, { 3012, 36},
|
||||
{ 2976, 35}, { 2941, 35}, { 2906, 33}, { 2873, 33}, { 2840, 32}, { 2808, 31}, { 2777, 30}, { 2747, 30},
|
||||
{ 2717, 29}, { 2688, 29}, { 2659, 28}, { 2631, 27}, { 2604, 27}, { 2577, 26}, { 2551, 26}, { 2525, 25},
|
||||
{ 2500, 25}, { 2475, 25}, { 2450, 23}, { 2427, 24}, { 2403, 23}, { 2380, 22}, { 2358, 22}, { 2336, 22},
|
||||
{ 2314, 21}, { 2293, 21}, { 2272, 20}, { 2252, 20}, { 2232, 20}, { 2212, 20}, { 2192, 19}, { 2173, 18},
|
||||
{ 2155, 19}, { 2136, 18}, { 2118, 18}, { 2100, 17}, { 2083, 17}, { 2066, 17}, { 2049, 17}, { 2032, 16},
|
||||
{ 2016, 16}, { 2000, 16}, { 1984, 16}, { 1968, 15}, { 1953, 16}, { 1937, 14}, { 1923, 15}, { 1908, 15},
|
||||
{ 1893, 14}, { 1879, 14}, { 1865, 14}, { 1851, 13}, { 1838, 14}, { 1824, 13}, { 1811, 13}, { 1798, 13},
|
||||
{ 1785, 12}, { 1773, 13}, { 1760, 12}, { 1748, 12}, { 1736, 12}, { 1724, 12}, { 1712, 12}, { 1700, 11},
|
||||
{ 1689, 12}, { 1677, 11}, { 1666, 11}, { 1655, 11}, { 1644, 11}, { 1633, 10}, { 1623, 11}, { 1612, 10},
|
||||
{ 1602, 10}, { 1592, 10}, { 1582, 10}, { 1572, 10}, { 1562, 10}, { 1552, 9}, { 1543, 10}, { 1533, 9},
|
||||
{ 1524, 9}, { 1515, 9}, { 1506, 9}, { 1497, 9}, { 1488, 9}, { 1479, 9}, { 1470, 9}, { 1461, 8},
|
||||
{ 1453, 8}, { 1445, 9}, { 1436, 8}, { 1428, 8}, { 1420, 8}, { 1412, 8}, { 1404, 8}, { 1396, 8},
|
||||
{ 1388, 7}, { 1381, 8}, { 1373, 7}, { 1366, 8}, { 1358, 7}, { 1351, 7}, { 1344, 8}, { 1336, 7},
|
||||
{ 1329, 7}, { 1322, 7}, { 1315, 7}, { 1308, 6}, { 1302, 7}, { 1295, 7}, { 1288, 6}, { 1282, 7},
|
||||
{ 1275, 6}, { 1269, 7}, { 1262, 6}, { 1256, 6}, { 1250, 7}, { 1243, 6}, { 1237, 6}, { 1231, 6},
|
||||
{ 1225, 6}, { 1219, 6}, { 1213, 6}, { 1207, 6}, { 1201, 5}, { 1196, 6}, { 1190, 6}, { 1184, 5},
|
||||
{ 1179, 6}, { 1173, 5}, { 1168, 6}, { 1162, 5}, { 1157, 5}, { 1152, 6}, { 1146, 5}, { 1141, 5},
|
||||
{ 1136, 5}, { 1131, 5}, { 1126, 5}, { 1121, 5}, { 1116, 5}, { 1111, 5}, { 1106, 5}, { 1101, 5},
|
||||
{ 1096, 5}, { 1091, 5}, { 1086, 4}, { 1082, 5}, { 1077, 5}, { 1072, 4}, { 1068, 5}, { 1063, 4},
|
||||
{ 1059, 5}, { 1054, 4}, { 1050, 4}, { 1046, 5}, { 1041, 4}, { 1037, 4}, { 1033, 5}, { 1028, 4},
|
||||
{ 1024, 4}, { 1020, 4}, { 1016, 4}, { 1012, 4}, { 1008, 4}, { 1004, 4}, { 1000, 4}, { 996, 4},
|
||||
{ 992, 4}, { 988, 4}, { 984, 4}, { 980, 4}, { 976, 4}, { 972, 4}, { 968, 3}, { 965, 3}
|
||||
};
|
||||
// intRes = intIn1 * intIn2 >> 16
|
||||
// uses:
|
||||
// r26 to store 0
|
||||
// r27 to store the byte 1 of the 24 bit result
|
||||
#define MultiU16X8toH16(intRes, charIn1, intIn2) \
|
||||
asm volatile ( \
|
||||
"clr r26 \n\t" \
|
||||
"mul %A1, %B2 \n\t" \
|
||||
"movw %A0, r0 \n\t" \
|
||||
"mul %A1, %A2 \n\t" \
|
||||
"add %A0, r1 \n\t" \
|
||||
"adc %B0, r26 \n\t" \
|
||||
"lsr r0 \n\t" \
|
||||
"adc %A0, r26 \n\t" \
|
||||
"adc %B0, r26 \n\t" \
|
||||
"clr r1 \n\t" \
|
||||
: \
|
||||
"=&r" (intRes) \
|
||||
: \
|
||||
"d" (charIn1), \
|
||||
"d" (intIn2) \
|
||||
: \
|
||||
"r26" \
|
||||
)
|
||||
|
||||
#elif F_CPU == 20000000
|
||||
// intRes = longIn1 * longIn2 >> 24
|
||||
// uses:
|
||||
// r26 to store 0
|
||||
// r27 to store the byte 1 of the 48bit result
|
||||
#define MultiU24X24toH16(intRes, longIn1, longIn2) \
|
||||
asm volatile ( \
|
||||
"clr r26 \n\t" \
|
||||
"mul %A1, %B2 \n\t" \
|
||||
"mov r27, r1 \n\t" \
|
||||
"mul %B1, %C2 \n\t" \
|
||||
"movw %A0, r0 \n\t" \
|
||||
"mul %C1, %C2 \n\t" \
|
||||
"add %B0, r0 \n\t" \
|
||||
"mul %C1, %B2 \n\t" \
|
||||
"add %A0, r0 \n\t" \
|
||||
"adc %B0, r1 \n\t" \
|
||||
"mul %A1, %C2 \n\t" \
|
||||
"add r27, r0 \n\t" \
|
||||
"adc %A0, r1 \n\t" \
|
||||
"adc %B0, r26 \n\t" \
|
||||
"mul %B1, %B2 \n\t" \
|
||||
"add r27, r0 \n\t" \
|
||||
"adc %A0, r1 \n\t" \
|
||||
"adc %B0, r26 \n\t" \
|
||||
"mul %C1, %A2 \n\t" \
|
||||
"add r27, r0 \n\t" \
|
||||
"adc %A0, r1 \n\t" \
|
||||
"adc %B0, r26 \n\t" \
|
||||
"mul %B1, %A2 \n\t" \
|
||||
"add r27, r1 \n\t" \
|
||||
"adc %A0, r26 \n\t" \
|
||||
"adc %B0, r26 \n\t" \
|
||||
"lsr r27 \n\t" \
|
||||
"adc %A0, r26 \n\t" \
|
||||
"adc %B0, r26 \n\t" \
|
||||
"clr r1 \n\t" \
|
||||
: \
|
||||
"=&r" (intRes) \
|
||||
: \
|
||||
"d" (longIn1), \
|
||||
"d" (longIn2) \
|
||||
: \
|
||||
"r26" , "r27" \
|
||||
)
|
||||
|
||||
const uint16_t speed_lookuptable_fast[256][2] PROGMEM = {
|
||||
{62500, 54055}, {8445, 3917}, {4528, 1434}, {3094, 745}, {2349, 456}, {1893, 307}, {1586, 222}, {1364, 167},
|
||||
{1197, 131}, {1066, 105}, {961, 86}, {875, 72}, {803, 61}, {742, 53}, {689, 45}, {644, 40},
|
||||
{604, 35}, {569, 32}, {537, 28}, {509, 25}, {484, 23}, {461, 21}, {440, 19}, {421, 17},
|
||||
{404, 16}, {388, 15}, {373, 14}, {359, 13}, {346, 12}, {334, 11}, {323, 10}, {313, 10},
|
||||
{303, 9}, {294, 9}, {285, 8}, {277, 7}, {270, 8}, {262, 7}, {255, 6}, {249, 6},
|
||||
{243, 6}, {237, 6}, {231, 5}, {226, 5}, {221, 5}, {216, 5}, {211, 4}, {207, 5},
|
||||
{202, 4}, {198, 4}, {194, 4}, {190, 3}, {187, 4}, {183, 3}, {180, 3}, {177, 4},
|
||||
{173, 3}, {170, 3}, {167, 2}, {165, 3}, {162, 3}, {159, 2}, {157, 3}, {154, 2},
|
||||
{152, 3}, {149, 2}, {147, 2}, {145, 2}, {143, 2}, {141, 2}, {139, 2}, {137, 2},
|
||||
{135, 2}, {133, 2}, {131, 2}, {129, 1}, {128, 2}, {126, 2}, {124, 1}, {123, 2},
|
||||
{121, 1}, {120, 2}, {118, 1}, {117, 1}, {116, 2}, {114, 1}, {113, 1}, {112, 2},
|
||||
{110, 1}, {109, 1}, {108, 1}, {107, 2}, {105, 1}, {104, 1}, {103, 1}, {102, 1},
|
||||
{101, 1}, {100, 1}, {99, 1}, {98, 1}, {97, 1}, {96, 1}, {95, 1}, {94, 1},
|
||||
{93, 1}, {92, 1}, {91, 0}, {91, 1}, {90, 1}, {89, 1}, {88, 1}, {87, 0},
|
||||
{87, 1}, {86, 1}, {85, 1}, {84, 0}, {84, 1}, {83, 1}, {82, 1}, {81, 0},
|
||||
{81, 1}, {80, 1}, {79, 0}, {79, 1}, {78, 0}, {78, 1}, {77, 1}, {76, 0},
|
||||
{76, 1}, {75, 0}, {75, 1}, {74, 1}, {73, 0}, {73, 1}, {72, 0}, {72, 1},
|
||||
{71, 0}, {71, 1}, {70, 0}, {70, 1}, {69, 0}, {69, 1}, {68, 0}, {68, 1},
|
||||
{67, 0}, {67, 1}, {66, 0}, {66, 1}, {65, 0}, {65, 0}, {65, 1}, {64, 0},
|
||||
{64, 1}, {63, 0}, {63, 1}, {62, 0}, {62, 0}, {62, 1}, {61, 0}, {61, 1},
|
||||
{60, 0}, {60, 0}, {60, 1}, {59, 0}, {59, 0}, {59, 1}, {58, 0}, {58, 0},
|
||||
{58, 1}, {57, 0}, {57, 0}, {57, 1}, {56, 0}, {56, 0}, {56, 1}, {55, 0},
|
||||
{55, 0}, {55, 1}, {54, 0}, {54, 0}, {54, 1}, {53, 0}, {53, 0}, {53, 0},
|
||||
{53, 1}, {52, 0}, {52, 0}, {52, 1}, {51, 0}, {51, 0}, {51, 0}, {51, 1},
|
||||
{50, 0}, {50, 0}, {50, 0}, {50, 1}, {49, 0}, {49, 0}, {49, 0}, {49, 1},
|
||||
{48, 0}, {48, 0}, {48, 0}, {48, 1}, {47, 0}, {47, 0}, {47, 0}, {47, 1},
|
||||
{46, 0}, {46, 0}, {46, 0}, {46, 0}, {46, 1}, {45, 0}, {45, 0}, {45, 0},
|
||||
{45, 1}, {44, 0}, {44, 0}, {44, 0}, {44, 0}, {44, 1}, {43, 0}, {43, 0},
|
||||
{43, 0}, {43, 0}, {43, 1}, {42, 0}, {42, 0}, {42, 0}, {42, 0}, {42, 0},
|
||||
{42, 1}, {41, 0}, {41, 0}, {41, 0}, {41, 0}, {41, 0}, {41, 1}, {40, 0},
|
||||
{40, 0}, {40, 0}, {40, 0}, {40, 1}, {39, 0}, {39, 0}, {39, 0}, {39, 0},
|
||||
{39, 0}, {39, 0}, {39, 1}, {38, 0}, {38, 0}, {38, 0}, {38, 0}, {38, 0},
|
||||
};
|
||||
#else //_NO_ASM
|
||||
|
||||
const uint16_t speed_lookuptable_slow[256][2] PROGMEM = {
|
||||
{62500, 10417}, {52083, 7441}, {44642, 5580}, {39062, 4340}, {34722, 3472}, {31250, 2841}, {28409, 2368}, {26041, 2003},
|
||||
{24038, 1717}, {22321, 1488}, {20833, 1302}, {19531, 1149}, {18382, 1021}, {17361, 914}, {16447, 822}, {15625, 745},
|
||||
{14880, 676}, {14204, 618}, {13586, 566}, {13020, 520}, {12500, 481}, {12019, 445}, {11574, 414}, {11160, 385},
|
||||
{10775, 359}, {10416, 336}, {10080, 315}, {9765, 296}, {9469, 278}, {9191, 263}, {8928, 248}, {8680, 235},
|
||||
{8445, 222}, {8223, 211}, {8012, 200}, {7812, 191}, {7621, 181}, {7440, 173}, {7267, 165}, {7102, 158},
|
||||
{6944, 151}, {6793, 145}, {6648, 138}, {6510, 133}, {6377, 127}, {6250, 123}, {6127, 118}, {6009, 113},
|
||||
{5896, 109}, {5787, 106}, {5681, 101}, {5580, 98}, {5482, 95}, {5387, 91}, {5296, 88}, {5208, 86},
|
||||
{5122, 82}, {5040, 80}, {4960, 78}, {4882, 75}, {4807, 73}, {4734, 70}, {4664, 69}, {4595, 67},
|
||||
{4528, 64}, {4464, 63}, {4401, 61}, {4340, 60}, {4280, 58}, {4222, 56}, {4166, 55}, {4111, 53},
|
||||
{4058, 52}, {4006, 51}, {3955, 49}, {3906, 48}, {3858, 48}, {3810, 45}, {3765, 45}, {3720, 44},
|
||||
{3676, 43}, {3633, 42}, {3591, 40}, {3551, 40}, {3511, 39}, {3472, 38}, {3434, 38}, {3396, 36},
|
||||
{3360, 36}, {3324, 35}, {3289, 34}, {3255, 34}, {3221, 33}, {3188, 32}, {3156, 31}, {3125, 31},
|
||||
{3094, 31}, {3063, 30}, {3033, 29}, {3004, 28}, {2976, 28}, {2948, 28}, {2920, 27}, {2893, 27},
|
||||
{2866, 26}, {2840, 25}, {2815, 25}, {2790, 25}, {2765, 24}, {2741, 24}, {2717, 24}, {2693, 23},
|
||||
{2670, 22}, {2648, 22}, {2626, 22}, {2604, 22}, {2582, 21}, {2561, 21}, {2540, 20}, {2520, 20},
|
||||
{2500, 20}, {2480, 20}, {2460, 19}, {2441, 19}, {2422, 19}, {2403, 18}, {2385, 18}, {2367, 18},
|
||||
{2349, 17}, {2332, 18}, {2314, 17}, {2297, 16}, {2281, 17}, {2264, 16}, {2248, 16}, {2232, 16},
|
||||
{2216, 16}, {2200, 15}, {2185, 15}, {2170, 15}, {2155, 15}, {2140, 15}, {2125, 14}, {2111, 14},
|
||||
{2097, 14}, {2083, 14}, {2069, 14}, {2055, 13}, {2042, 13}, {2029, 13}, {2016, 13}, {2003, 13},
|
||||
{1990, 13}, {1977, 12}, {1965, 12}, {1953, 13}, {1940, 11}, {1929, 12}, {1917, 12}, {1905, 12},
|
||||
{1893, 11}, {1882, 11}, {1871, 11}, {1860, 11}, {1849, 11}, {1838, 11}, {1827, 11}, {1816, 10},
|
||||
{1806, 11}, {1795, 10}, {1785, 10}, {1775, 10}, {1765, 10}, {1755, 10}, {1745, 9}, {1736, 10},
|
||||
{1726, 9}, {1717, 10}, {1707, 9}, {1698, 9}, {1689, 9}, {1680, 9}, {1671, 9}, {1662, 9},
|
||||
{1653, 9}, {1644, 8}, {1636, 9}, {1627, 8}, {1619, 9}, {1610, 8}, {1602, 8}, {1594, 8},
|
||||
{1586, 8}, {1578, 8}, {1570, 8}, {1562, 8}, {1554, 7}, {1547, 8}, {1539, 8}, {1531, 7},
|
||||
{1524, 8}, {1516, 7}, {1509, 7}, {1502, 7}, {1495, 7}, {1488, 7}, {1481, 7}, {1474, 7},
|
||||
{1467, 7}, {1460, 7}, {1453, 7}, {1446, 6}, {1440, 7}, {1433, 7}, {1426, 6}, {1420, 6},
|
||||
{1414, 7}, {1407, 6}, {1401, 6}, {1395, 7}, {1388, 6}, {1382, 6}, {1376, 6}, {1370, 6},
|
||||
{1364, 6}, {1358, 6}, {1352, 6}, {1346, 5}, {1341, 6}, {1335, 6}, {1329, 5}, {1324, 6},
|
||||
{1318, 5}, {1313, 6}, {1307, 5}, {1302, 6}, {1296, 5}, {1291, 5}, {1286, 6}, {1280, 5},
|
||||
{1275, 5}, {1270, 5}, {1265, 5}, {1260, 5}, {1255, 5}, {1250, 5}, {1245, 5}, {1240, 5},
|
||||
{1235, 5}, {1230, 5}, {1225, 5}, {1220, 5}, {1215, 4}, {1211, 5}, {1206, 5}, {1201, 5},
|
||||
};
|
||||
|
||||
#endif
|
||||
static inline void MultiU16X8toH16(uint16_t& intRes, uint8_t& charIn1, uint16_t& intIn2)
|
||||
{
|
||||
intRes = ((uint32_t)charIn1 * (uint32_t)intIn2) >> 16;
|
||||
}
|
||||
|
||||
static inline void MultiU24X24toH16(uint16_t& intRes, uint32_t& longIn1, uint32_t& longIn2)
|
||||
{
|
||||
intRes = ((uint64_t)longIn1 * (uint64_t)longIn2) >> 24;
|
||||
}
|
||||
|
||||
#endif //_NO_ASM
|
||||
|
||||
|
||||
FORCE_INLINE unsigned short calc_timer(uint16_t step_rate, uint8_t& step_loops) {
|
||||
uint16_t timer;
|
||||
if(step_rate > MAX_STEP_FREQUENCY) step_rate = MAX_STEP_FREQUENCY;
|
||||
|
||||
if(step_rate > 20000) { // If steprate > 20kHz >> step 4 times
|
||||
step_rate = (step_rate >> 2)&0x3fff;
|
||||
step_loops = 4;
|
||||
}
|
||||
else if(step_rate > 10000) { // If steprate > 10kHz >> step 2 times
|
||||
step_rate = (step_rate >> 1)&0x7fff;
|
||||
step_loops = 2;
|
||||
}
|
||||
else {
|
||||
step_loops = 1;
|
||||
}
|
||||
|
||||
if(step_rate < (F_CPU/500000)) step_rate = (F_CPU/500000);
|
||||
step_rate -= (F_CPU/500000); // Correct for minimal speed
|
||||
if(step_rate >= (8*256)){ // higher step rate
|
||||
unsigned short table_address = (unsigned short)&speed_lookuptable_fast[(unsigned char)(step_rate>>8)][0];
|
||||
unsigned char tmp_step_rate = (step_rate & 0x00ff);
|
||||
uint16_t gain = (uint16_t)pgm_read_word_near(table_address+2);
|
||||
MultiU16X8toH16(timer, tmp_step_rate, gain);
|
||||
timer = (unsigned short)pgm_read_word_near(table_address) - timer;
|
||||
}
|
||||
else { // lower step rates
|
||||
unsigned short table_address = (unsigned short)&speed_lookuptable_slow[0][0];
|
||||
table_address += ((step_rate)>>1) & 0xfffc;
|
||||
timer = (unsigned short)pgm_read_word_near(table_address);
|
||||
timer -= (((unsigned short)pgm_read_word_near(table_address+2) * (unsigned char)(step_rate & 0x0007))>>3);
|
||||
}
|
||||
if(timer < 100) { timer = 100; }//(20kHz this should never happen)////MSG_STEPPER_TOO_HIGH c=0 r=0
|
||||
return timer;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
@ -36,9 +36,9 @@
|
|||
#include "tmc2130.h"
|
||||
#endif //TMC2130
|
||||
|
||||
#ifdef FILAMENT_SENSOR
|
||||
#if defined(FILAMENT_SENSOR) && defined(PAT9125)
|
||||
#include "fsensor.h"
|
||||
int fsensor_counter = 0; //counter for e-steps
|
||||
int fsensor_counter; //counter for e-steps
|
||||
#endif //FILAMENT_SENSOR
|
||||
|
||||
#include "mmu.h"
|
||||
|
@ -71,8 +71,7 @@ static dda_isteps_t
|
|||
counter_z,
|
||||
counter_e;
|
||||
volatile dda_usteps_t step_events_completed; // The number of step events executed in the current block
|
||||
static int32_t acceleration_time, deceleration_time;
|
||||
//static unsigned long accelerate_until, decelerate_after, acceleration_rate, initial_rate, final_rate, nominal_rate;
|
||||
static uint32_t acceleration_time, deceleration_time;
|
||||
static uint16_t acc_step_rate; // needed for deccelaration start point
|
||||
static uint8_t step_loops;
|
||||
static uint16_t OCR1A_nominal;
|
||||
|
@ -113,23 +112,29 @@ volatile long count_position[NUM_AXIS] = { 0, 0, 0, 0};
|
|||
volatile signed char count_direction[NUM_AXIS] = { 1, 1, 1, 1};
|
||||
|
||||
#ifdef LIN_ADVANCE
|
||||
void advance_isr_scheduler();
|
||||
void advance_isr();
|
||||
|
||||
static uint16_t nextMainISR = 0;
|
||||
static const uint16_t ADV_NEVER = 0xFFFF;
|
||||
static const uint8_t ADV_INIT = 0b01; // initialize LA
|
||||
static const uint8_t ADV_ACC_VARY = 0b10; // varying acceleration phase
|
||||
|
||||
static uint16_t nextMainISR;
|
||||
static uint16_t nextAdvanceISR;
|
||||
|
||||
static uint16_t main_Rate;
|
||||
static uint16_t eISR_Rate;
|
||||
static uint32_t eISR_Err;
|
||||
|
||||
// Extrusion steps to be executed by the stepper.
|
||||
// If set to non zero, the timer ISR routine will tick the Linear Advance extruder ticks first.
|
||||
// If e_steps is zero, then the timer ISR routine will perform the usual DDA step.
|
||||
static volatile int16_t e_steps = 0;
|
||||
// How many extruder steps shall be ticked at a single ISR invocation?
|
||||
static uint8_t estep_loops;
|
||||
// The current speed of the extruder, scaled by the linear advance constant, so it has the same measure
|
||||
// as current_adv_steps.
|
||||
static int current_estep_rate;
|
||||
// The current pretension of filament expressed in extruder micro steps.
|
||||
static int current_adv_steps;
|
||||
static uint16_t current_adv_steps;
|
||||
static uint16_t target_adv_steps;
|
||||
|
||||
#define _NEXT_ISR(T) nextMainISR = T
|
||||
static int8_t e_steps; // scheduled e-steps during each isr loop
|
||||
static uint8_t e_step_loops; // e-steps to execute at most in each isr loop
|
||||
static uint8_t e_extruding; // current move is an extrusion move
|
||||
static int8_t LA_phase; // LA compensation phase
|
||||
|
||||
#define _NEXT_ISR(T) main_Rate = nextMainISR = T
|
||||
#else
|
||||
#define _NEXT_ISR(T) OCR1A = T
|
||||
#endif
|
||||
|
@ -143,92 +148,6 @@ extern uint16_t stepper_timer_overflow_last;
|
|||
//=============================functions ============================
|
||||
//===========================================================================
|
||||
|
||||
#ifndef _NO_ASM
|
||||
|
||||
// intRes = intIn1 * intIn2 >> 16
|
||||
// uses:
|
||||
// r26 to store 0
|
||||
// r27 to store the byte 1 of the 24 bit result
|
||||
#define MultiU16X8toH16(intRes, charIn1, intIn2) \
|
||||
asm volatile ( \
|
||||
"clr r26 \n\t" \
|
||||
"mul %A1, %B2 \n\t" \
|
||||
"movw %A0, r0 \n\t" \
|
||||
"mul %A1, %A2 \n\t" \
|
||||
"add %A0, r1 \n\t" \
|
||||
"adc %B0, r26 \n\t" \
|
||||
"lsr r0 \n\t" \
|
||||
"adc %A0, r26 \n\t" \
|
||||
"adc %B0, r26 \n\t" \
|
||||
"clr r1 \n\t" \
|
||||
: \
|
||||
"=&r" (intRes) \
|
||||
: \
|
||||
"d" (charIn1), \
|
||||
"d" (intIn2) \
|
||||
: \
|
||||
"r26" \
|
||||
)
|
||||
|
||||
// intRes = longIn1 * longIn2 >> 24
|
||||
// uses:
|
||||
// r26 to store 0
|
||||
// r27 to store the byte 1 of the 48bit result
|
||||
#define MultiU24X24toH16(intRes, longIn1, longIn2) \
|
||||
asm volatile ( \
|
||||
"clr r26 \n\t" \
|
||||
"mul %A1, %B2 \n\t" \
|
||||
"mov r27, r1 \n\t" \
|
||||
"mul %B1, %C2 \n\t" \
|
||||
"movw %A0, r0 \n\t" \
|
||||
"mul %C1, %C2 \n\t" \
|
||||
"add %B0, r0 \n\t" \
|
||||
"mul %C1, %B2 \n\t" \
|
||||
"add %A0, r0 \n\t" \
|
||||
"adc %B0, r1 \n\t" \
|
||||
"mul %A1, %C2 \n\t" \
|
||||
"add r27, r0 \n\t" \
|
||||
"adc %A0, r1 \n\t" \
|
||||
"adc %B0, r26 \n\t" \
|
||||
"mul %B1, %B2 \n\t" \
|
||||
"add r27, r0 \n\t" \
|
||||
"adc %A0, r1 \n\t" \
|
||||
"adc %B0, r26 \n\t" \
|
||||
"mul %C1, %A2 \n\t" \
|
||||
"add r27, r0 \n\t" \
|
||||
"adc %A0, r1 \n\t" \
|
||||
"adc %B0, r26 \n\t" \
|
||||
"mul %B1, %A2 \n\t" \
|
||||
"add r27, r1 \n\t" \
|
||||
"adc %A0, r26 \n\t" \
|
||||
"adc %B0, r26 \n\t" \
|
||||
"lsr r27 \n\t" \
|
||||
"adc %A0, r26 \n\t" \
|
||||
"adc %B0, r26 \n\t" \
|
||||
"clr r1 \n\t" \
|
||||
: \
|
||||
"=&r" (intRes) \
|
||||
: \
|
||||
"d" (longIn1), \
|
||||
"d" (longIn2) \
|
||||
: \
|
||||
"r26" , "r27" \
|
||||
)
|
||||
|
||||
#else //_NO_ASM
|
||||
|
||||
void MultiU16X8toH16(unsigned short& intRes, unsigned char& charIn1, unsigned short& intIn2)
|
||||
{
|
||||
}
|
||||
|
||||
void MultiU24X24toH16(uint16_t& intRes, int32_t& longIn1, long& longIn2)
|
||||
{
|
||||
}
|
||||
|
||||
#endif //_NO_ASM
|
||||
|
||||
// Some useful constants
|
||||
|
||||
void checkHitEndstops()
|
||||
{
|
||||
if( endstop_x_hit || endstop_y_hit || endstop_z_hit) {
|
||||
|
@ -314,43 +233,7 @@ void invert_z_endstop(bool endstop_invert)
|
|||
// The trapezoid is the shape the speed curve over time. It starts at block->initial_rate, accelerates
|
||||
// first block->accelerate_until step_events_completed, then keeps going at constant speed until
|
||||
// step_events_completed reaches block->decelerate_after after which it decelerates until the trapezoid generator is reset.
|
||||
// The slope of acceleration is calculated with the leib ramp alghorithm.
|
||||
|
||||
FORCE_INLINE unsigned short calc_timer(uint16_t step_rate) {
|
||||
unsigned short timer;
|
||||
if(step_rate > MAX_STEP_FREQUENCY) step_rate = MAX_STEP_FREQUENCY;
|
||||
|
||||
if(step_rate > 20000) { // If steprate > 20kHz >> step 4 times
|
||||
step_rate = (step_rate >> 2)&0x3fff;
|
||||
step_loops = 4;
|
||||
}
|
||||
else if(step_rate > 10000) { // If steprate > 10kHz >> step 2 times
|
||||
step_rate = (step_rate >> 1)&0x7fff;
|
||||
step_loops = 2;
|
||||
}
|
||||
else {
|
||||
step_loops = 1;
|
||||
}
|
||||
// step_loops = 1;
|
||||
|
||||
if(step_rate < (F_CPU/500000)) step_rate = (F_CPU/500000);
|
||||
step_rate -= (F_CPU/500000); // Correct for minimal speed
|
||||
if(step_rate >= (8*256)){ // higher step rate
|
||||
unsigned short table_address = (unsigned short)&speed_lookuptable_fast[(unsigned char)(step_rate>>8)][0];
|
||||
unsigned char tmp_step_rate = (step_rate & 0x00ff);
|
||||
unsigned short gain = (unsigned short)pgm_read_word_near(table_address+2);
|
||||
MultiU16X8toH16(timer, tmp_step_rate, gain);
|
||||
timer = (unsigned short)pgm_read_word_near(table_address) - timer;
|
||||
}
|
||||
else { // lower step rates
|
||||
unsigned short table_address = (unsigned short)&speed_lookuptable_slow[0][0];
|
||||
table_address += ((step_rate)>>1) & 0xfffc;
|
||||
timer = (unsigned short)pgm_read_word_near(table_address);
|
||||
timer -= (((unsigned short)pgm_read_word_near(table_address+2) * (unsigned char)(step_rate & 0x0007))>>3);
|
||||
}
|
||||
if(timer < 100) { timer = 100; MYSERIAL.print(_N("Steprate too high: ")); MYSERIAL.println(step_rate); }//(20kHz this should never happen)////MSG_STEPPER_TOO_HIGH
|
||||
return timer;
|
||||
}
|
||||
// The slope of acceleration is calculated using v = u + at where t is the accumulated timer values of the steps so far.
|
||||
|
||||
// "The Stepper Driver Interrupt" - This timer interrupt is the workhorse.
|
||||
// It pops blocks from the block_buffer and executes them by pulsing the stepper pins appropriately.
|
||||
|
@ -361,53 +244,10 @@ ISR(TIMER1_COMPA_vect) {
|
|||
#endif //DEBUG_STACK_MONITOR
|
||||
|
||||
#ifdef LIN_ADVANCE
|
||||
// If there are any e_steps planned, tick them.
|
||||
bool run_main_isr = false;
|
||||
if (e_steps) {
|
||||
//WRITE_NC(LOGIC_ANALYZER_CH7, true);
|
||||
uint8_t cnt = 0;
|
||||
for (uint8_t i = estep_loops; e_steps && i --;) {
|
||||
WRITE_NC(E0_STEP_PIN, !INVERT_E_STEP_PIN);
|
||||
-- e_steps;
|
||||
cnt++;
|
||||
WRITE_NC(E0_STEP_PIN, INVERT_E_STEP_PIN);
|
||||
}
|
||||
#ifdef FILAMENT_SENSOR
|
||||
if (READ(E0_DIR_PIN) == INVERT_E0_DIR)
|
||||
{
|
||||
if (count_direction[E_AXIS] == 1)
|
||||
fsensor_counter -= cnt;
|
||||
else
|
||||
fsensor_counter += cnt;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (count_direction[E_AXIS] == 1)
|
||||
fsensor_counter += cnt;
|
||||
else
|
||||
fsensor_counter -= cnt;
|
||||
}
|
||||
#endif //FILAMENT_SENSOR
|
||||
if (e_steps) {
|
||||
// Plan another Linear Advance tick.
|
||||
OCR1A = eISR_Rate;
|
||||
nextMainISR -= eISR_Rate;
|
||||
} else if (! (nextMainISR & 0x8000) || nextMainISR < 16) {
|
||||
// The timer did not overflow and it is big enough, so it makes sense to plan it.
|
||||
OCR1A = nextMainISR;
|
||||
} else {
|
||||
// The timer has overflown, or it is too small. Run the main ISR just after the Linear Advance routine
|
||||
// in the current interrupt tick.
|
||||
run_main_isr = true;
|
||||
//FIXME pick the serial line.
|
||||
}
|
||||
//WRITE_NC(LOGIC_ANALYZER_CH7, false);
|
||||
} else
|
||||
run_main_isr = true;
|
||||
|
||||
if (run_main_isr)
|
||||
#endif
|
||||
advance_isr_scheduler();
|
||||
#else
|
||||
isr();
|
||||
#endif
|
||||
|
||||
// Don't run the ISR faster than possible
|
||||
// Is there a 8us time left before the next interrupt triggers?
|
||||
|
@ -493,10 +333,6 @@ FORCE_INLINE void stepper_next_block()
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifdef FILAMENT_SENSOR
|
||||
fsensor_counter = 0;
|
||||
fsensor_st_block_begin(current_block);
|
||||
#endif //FILAMENT_SENSOR
|
||||
// The busy flag is set by the plan_get_current_block() call.
|
||||
// current_block->busy = true;
|
||||
// Initializes the trapezoid generator from the current block. Called whenever a new
|
||||
|
@ -507,21 +343,37 @@ FORCE_INLINE void stepper_next_block()
|
|||
// state is reached.
|
||||
step_loops_nominal = 0;
|
||||
acc_step_rate = uint16_t(current_block->initial_rate);
|
||||
acceleration_time = calc_timer(acc_step_rate);
|
||||
acceleration_time = calc_timer(acc_step_rate, step_loops);
|
||||
|
||||
#ifdef LIN_ADVANCE
|
||||
current_estep_rate = ((unsigned long)acc_step_rate * current_block->abs_adv_steps_multiplier8) >> 17;
|
||||
#endif /* LIN_ADVANCE */
|
||||
if (current_block->use_advance_lead) {
|
||||
target_adv_steps = current_block->max_adv_steps;
|
||||
}
|
||||
e_steps = 0;
|
||||
nextAdvanceISR = ADV_NEVER;
|
||||
LA_phase = -1;
|
||||
#endif
|
||||
|
||||
if (current_block->flag & BLOCK_FLAG_E_RESET) {
|
||||
count_position[E_AXIS] = 0;
|
||||
}
|
||||
|
||||
if (current_block->flag & BLOCK_FLAG_DDA_LOWRES) {
|
||||
counter_x.lo = -(current_block->step_event_count.lo >> 1);
|
||||
counter_y.lo = counter_x.lo;
|
||||
counter_z.lo = counter_x.lo;
|
||||
counter_e.lo = counter_x.lo;
|
||||
#ifdef LIN_ADVANCE
|
||||
e_extruding = current_block->steps_e.lo != 0;
|
||||
#endif
|
||||
} else {
|
||||
counter_x.wide = -(current_block->step_event_count.wide >> 1);
|
||||
counter_y.wide = counter_x.wide;
|
||||
counter_z.wide = counter_x.wide;
|
||||
counter_e.wide = counter_x.wide;
|
||||
#ifdef LIN_ADVANCE
|
||||
e_extruding = current_block->steps_e.wide != 0;
|
||||
#endif
|
||||
}
|
||||
step_events_completed.wide = 0;
|
||||
// Set directions.
|
||||
|
@ -567,9 +419,23 @@ FORCE_INLINE void stepper_next_block()
|
|||
#endif /* LIN_ADVANCE */
|
||||
count_direction[E_AXIS] = 1;
|
||||
}
|
||||
#if defined(FILAMENT_SENSOR) && defined(PAT9125)
|
||||
fsensor_st_block_begin(count_direction[E_AXIS] < 0);
|
||||
#endif //FILAMENT_SENSOR
|
||||
}
|
||||
else {
|
||||
OCR1A = 2000; // 1kHz.
|
||||
_NEXT_ISR(2000); // 1kHz.
|
||||
|
||||
#ifdef LIN_ADVANCE
|
||||
// reset LA state when there's no block
|
||||
nextAdvanceISR = ADV_NEVER;
|
||||
e_steps = 0;
|
||||
|
||||
// incrementally lose pressure to give a chance for
|
||||
// a new LA block to be scheduled and recover
|
||||
if(current_adv_steps)
|
||||
--current_adv_steps;
|
||||
#endif
|
||||
}
|
||||
//WRITE_NC(LOGIC_ANALYZER_CH2, false);
|
||||
}
|
||||
|
@ -779,10 +645,10 @@ FORCE_INLINE void stepper_tick_lowres()
|
|||
counter_e.lo -= current_block->step_event_count.lo;
|
||||
count_position[E_AXIS] += count_direction[E_AXIS];
|
||||
#ifdef LIN_ADVANCE
|
||||
++ e_steps;
|
||||
e_steps += count_direction[E_AXIS];
|
||||
#else
|
||||
#ifdef FILAMENT_SENSOR
|
||||
++ fsensor_counter;
|
||||
fsensor_counter += count_direction[E_AXIS];
|
||||
#endif //FILAMENT_SENSOR
|
||||
WRITE(E0_STEP_PIN, INVERT_E_STEP_PIN);
|
||||
#endif
|
||||
|
@ -841,11 +707,11 @@ FORCE_INLINE void stepper_tick_highres()
|
|||
counter_e.wide -= current_block->step_event_count.wide;
|
||||
count_position[E_AXIS]+=count_direction[E_AXIS];
|
||||
#ifdef LIN_ADVANCE
|
||||
++ e_steps;
|
||||
e_steps += count_direction[E_AXIS];
|
||||
#else
|
||||
#ifdef FILAMENT_SENSOR
|
||||
++ fsensor_counter;
|
||||
#endif //FILAMENT_SENSOR
|
||||
#ifdef FILAMENT_SENSOR
|
||||
fsensor_counter += count_direction[E_AXIS];
|
||||
#endif //FILAMENT_SENSOR
|
||||
WRITE(E0_STEP_PIN, INVERT_E_STEP_PIN);
|
||||
#endif
|
||||
}
|
||||
|
@ -854,8 +720,45 @@ FORCE_INLINE void stepper_tick_highres()
|
|||
}
|
||||
}
|
||||
|
||||
// 50us delay
|
||||
#define LIN_ADV_FIRST_TICK_DELAY 100
|
||||
|
||||
#ifdef LIN_ADVANCE
|
||||
// @wavexx: fast uint16_t division for small dividends<5
|
||||
// q/3 based on "Hacker's delight" formula
|
||||
FORCE_INLINE uint16_t fastdiv(uint16_t q, uint8_t d)
|
||||
{
|
||||
if(d != 3) return q >> (d / 2);
|
||||
else return ((uint32_t)0xAAAB * q) >> 17;
|
||||
}
|
||||
|
||||
FORCE_INLINE void advance_spread(uint16_t timer)
|
||||
{
|
||||
eISR_Err += timer;
|
||||
|
||||
uint8_t ticks = 0;
|
||||
while(eISR_Err >= current_block->advance_rate)
|
||||
{
|
||||
++ticks;
|
||||
eISR_Err -= current_block->advance_rate;
|
||||
}
|
||||
if(!ticks)
|
||||
{
|
||||
eISR_Rate = timer;
|
||||
nextAdvanceISR = timer;
|
||||
return;
|
||||
}
|
||||
|
||||
if (ticks <= 3)
|
||||
eISR_Rate = fastdiv(timer, ticks + 1);
|
||||
else
|
||||
{
|
||||
// >4 ticks are still possible on slow moves
|
||||
eISR_Rate = timer / (ticks + 1);
|
||||
}
|
||||
|
||||
nextAdvanceISR = eISR_Rate;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
FORCE_INLINE void isr() {
|
||||
//WRITE_NC(LOGIC_ANALYZER_CH0, true);
|
||||
|
@ -868,86 +771,23 @@ FORCE_INLINE void isr() {
|
|||
if (current_block != NULL)
|
||||
{
|
||||
stepper_check_endstops();
|
||||
#ifdef LIN_ADVANCE
|
||||
e_steps = 0;
|
||||
#endif /* LIN_ADVANCE */
|
||||
if (current_block->flag & BLOCK_FLAG_DDA_LOWRES)
|
||||
stepper_tick_lowres();
|
||||
else
|
||||
stepper_tick_highres();
|
||||
|
||||
|
||||
#ifdef LIN_ADVANCE
|
||||
if (out_bits&(1<<E_AXIS))
|
||||
// Move in negative direction.
|
||||
e_steps = - e_steps;
|
||||
if (current_block->use_advance_lead) {
|
||||
//int esteps_inc = 0;
|
||||
//esteps_inc = current_estep_rate - current_adv_steps;
|
||||
//e_steps += esteps_inc;
|
||||
e_steps += current_estep_rate - current_adv_steps;
|
||||
#if 0
|
||||
if (abs(esteps_inc) > 4) {
|
||||
LOGIC_ANALYZER_SERIAL_TX_WRITE(esteps_inc);
|
||||
if (esteps_inc < -511 || esteps_inc > 511)
|
||||
LOGIC_ANALYZER_SERIAL_TX_WRITE(esteps_inc >> 9);
|
||||
}
|
||||
#endif
|
||||
current_adv_steps = current_estep_rate;
|
||||
}
|
||||
// If we have esteps to execute, step some of them now.
|
||||
if (e_steps) {
|
||||
//WRITE_NC(LOGIC_ANALYZER_CH7, true);
|
||||
// Set the step direction.
|
||||
bool neg = e_steps < 0;
|
||||
{
|
||||
bool dir =
|
||||
#ifdef SNMM
|
||||
(neg == (mmu_extruder & 1))
|
||||
#else
|
||||
neg
|
||||
#endif
|
||||
? INVERT_E0_DIR : !INVERT_E0_DIR; //If we have SNMM, reverse every second extruder.
|
||||
WRITE_NC(E0_DIR_PIN, dir);
|
||||
if (neg)
|
||||
// Flip the e_steps counter to be always positive.
|
||||
e_steps = - e_steps;
|
||||
}
|
||||
// Tick min(step_loops, abs(e_steps)).
|
||||
estep_loops = (e_steps & 0x0ff00) ? 4 : e_steps;
|
||||
if (step_loops < estep_loops)
|
||||
estep_loops = step_loops;
|
||||
#ifdef FILAMENT_SENSOR
|
||||
if (READ(E0_DIR_PIN) == INVERT_E0_DIR)
|
||||
{
|
||||
if (count_direction[E_AXIS] == 1)
|
||||
fsensor_counter -= estep_loops;
|
||||
else
|
||||
fsensor_counter += estep_loops;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (count_direction[E_AXIS] == 1)
|
||||
fsensor_counter += estep_loops;
|
||||
else
|
||||
fsensor_counter -= estep_loops;
|
||||
}
|
||||
#endif //FILAMENT_SENSOR
|
||||
do {
|
||||
WRITE_NC(E0_STEP_PIN, !INVERT_E_STEP_PIN);
|
||||
-- e_steps;
|
||||
WRITE_NC(E0_STEP_PIN, INVERT_E_STEP_PIN);
|
||||
} while (-- estep_loops != 0);
|
||||
//WRITE_NC(LOGIC_ANALYZER_CH7, false);
|
||||
MSerial.checkRx(); // Check for serial chars.
|
||||
}
|
||||
if (e_steps) WRITE_NC(E0_DIR_PIN, e_steps < 0? INVERT_E0_DIR: !INVERT_E0_DIR);
|
||||
uint8_t la_state = 0;
|
||||
#endif
|
||||
|
||||
// Calculare new timer value
|
||||
// Calculate new timer value
|
||||
// 13.38-14.63us for steady state,
|
||||
// 25.12us for acceleration / deceleration.
|
||||
{
|
||||
//WRITE_NC(LOGIC_ANALYZER_CH1, true);
|
||||
if (step_events_completed.wide <= (unsigned long int)current_block->accelerate_until) {
|
||||
if (step_events_completed.wide <= current_block->accelerate_until) {
|
||||
// v = t * a -> acc_step_rate = acceleration_time * current_block->acceleration_rate
|
||||
MultiU24X24toH16(acc_step_rate, acceleration_time, current_block->acceleration_rate);
|
||||
acc_step_rate += uint16_t(current_block->initial_rate);
|
||||
|
@ -955,42 +795,67 @@ FORCE_INLINE void isr() {
|
|||
if(acc_step_rate > uint16_t(current_block->nominal_rate))
|
||||
acc_step_rate = current_block->nominal_rate;
|
||||
// step_rate to timer interval
|
||||
uint16_t timer = calc_timer(acc_step_rate);
|
||||
uint16_t timer = calc_timer(acc_step_rate, step_loops);
|
||||
_NEXT_ISR(timer);
|
||||
acceleration_time += timer;
|
||||
#ifdef LIN_ADVANCE
|
||||
if (current_block->use_advance_lead)
|
||||
// int32_t = (uint16_t * uint32_t) >> 17
|
||||
current_estep_rate = ((uint32_t)acc_step_rate * current_block->abs_adv_steps_multiplier8) >> 17;
|
||||
#endif
|
||||
#ifdef LIN_ADVANCE
|
||||
if (current_block->use_advance_lead) {
|
||||
if (step_events_completed.wide <= (unsigned long int)step_loops) {
|
||||
la_state = ADV_INIT | ADV_ACC_VARY;
|
||||
if (e_extruding && current_adv_steps > target_adv_steps)
|
||||
target_adv_steps = current_adv_steps;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
else if (step_events_completed.wide > (unsigned long int)current_block->decelerate_after) {
|
||||
else if (step_events_completed.wide > current_block->decelerate_after) {
|
||||
uint16_t step_rate;
|
||||
MultiU24X24toH16(step_rate, deceleration_time, current_block->acceleration_rate);
|
||||
step_rate = acc_step_rate - step_rate; // Decelerate from aceleration end point.
|
||||
if ((step_rate & 0x8000) || step_rate < uint16_t(current_block->final_rate)) {
|
||||
// Result is negative or too small.
|
||||
step_rate = uint16_t(current_block->final_rate);
|
||||
|
||||
if (step_rate > acc_step_rate) { // Check step_rate stays positive
|
||||
step_rate = uint16_t(current_block->final_rate);
|
||||
}
|
||||
else {
|
||||
step_rate = acc_step_rate - step_rate; // Decelerate from acceleration end point.
|
||||
|
||||
// lower limit
|
||||
if (step_rate < current_block->final_rate)
|
||||
step_rate = uint16_t(current_block->final_rate);
|
||||
}
|
||||
|
||||
// Step_rate to timer interval.
|
||||
uint16_t timer = calc_timer(step_rate);
|
||||
uint16_t timer = calc_timer(step_rate, step_loops);
|
||||
_NEXT_ISR(timer);
|
||||
deceleration_time += timer;
|
||||
#ifdef LIN_ADVANCE
|
||||
if (current_block->use_advance_lead)
|
||||
current_estep_rate = ((uint32_t)step_rate * current_block->abs_adv_steps_multiplier8) >> 17;
|
||||
#endif
|
||||
|
||||
#ifdef LIN_ADVANCE
|
||||
if (current_block->use_advance_lead) {
|
||||
if (step_events_completed.wide <= current_block->decelerate_after + step_loops) {
|
||||
target_adv_steps = current_block->final_adv_steps;
|
||||
la_state = ADV_INIT | ADV_ACC_VARY;
|
||||
if (e_extruding && current_adv_steps < target_adv_steps)
|
||||
target_adv_steps = current_adv_steps;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
else {
|
||||
if (! step_loops_nominal) {
|
||||
// Calculation of the steady state timer rate has been delayed to the 1st tick of the steady state to lower
|
||||
// the initial interrupt blocking.
|
||||
OCR1A_nominal = calc_timer(uint16_t(current_block->nominal_rate));
|
||||
OCR1A_nominal = calc_timer(uint16_t(current_block->nominal_rate), step_loops);
|
||||
step_loops_nominal = step_loops;
|
||||
#ifdef LIN_ADVANCE
|
||||
if (current_block->use_advance_lead)
|
||||
current_estep_rate = (current_block->nominal_rate * current_block->abs_adv_steps_multiplier8) >> 17;
|
||||
#endif
|
||||
|
||||
#ifdef LIN_ADVANCE
|
||||
if(current_block->use_advance_lead) {
|
||||
// Due to E-jerk, there can be discontinuities in pressure state where an
|
||||
// acceleration or deceleration can be skipped or joined with the previous block.
|
||||
// If LA was not previously active, re-check the pressure level
|
||||
la_state = ADV_INIT;
|
||||
if (e_extruding)
|
||||
target_adv_steps = current_adv_steps;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
_NEXT_ISR(OCR1A_nominal);
|
||||
}
|
||||
|
@ -998,110 +863,62 @@ FORCE_INLINE void isr() {
|
|||
}
|
||||
|
||||
#ifdef LIN_ADVANCE
|
||||
if (e_steps && current_block->use_advance_lead) {
|
||||
//WRITE_NC(LOGIC_ANALYZER_CH7, true);
|
||||
MSerial.checkRx(); // Check for serial chars.
|
||||
// Some of the E steps were not ticked yet. Plan additional interrupts.
|
||||
uint16_t now = TCNT1;
|
||||
// Plan the first linear advance interrupt after 50us from now.
|
||||
uint16_t to_go = nextMainISR - now - LIN_ADV_FIRST_TICK_DELAY;
|
||||
eISR_Rate = 0;
|
||||
if ((to_go & 0x8000) == 0) {
|
||||
// The to_go number is not negative.
|
||||
// Count the number of 7812,5 ticks, that fit into to_go 2MHz ticks.
|
||||
uint8_t ticks = to_go >> 8;
|
||||
if (ticks == 1) {
|
||||
// Avoid running the following loop for a very short interval.
|
||||
estep_loops = 255;
|
||||
eISR_Rate = 1;
|
||||
} else if ((e_steps & 0x0ff00) == 0) {
|
||||
// e_steps <= 0x0ff
|
||||
if (uint8_t(e_steps) <= ticks) {
|
||||
// Spread the e_steps along the whole go_to interval.
|
||||
eISR_Rate = to_go / uint8_t(e_steps);
|
||||
estep_loops = 1;
|
||||
} else if (ticks != 0) {
|
||||
// At least one tick fits into the to_go interval. Calculate the e-step grouping.
|
||||
uint8_t e = uint8_t(e_steps) >> 1;
|
||||
estep_loops = 2;
|
||||
while (e > ticks) {
|
||||
e >>= 1;
|
||||
estep_loops <<= 1;
|
||||
}
|
||||
// Now the estep_loops contains the number of loops of power of 2, that will be sufficient
|
||||
// to squeeze enough of Linear Advance ticks until nextMainISR.
|
||||
// Calculate the tick rate.
|
||||
eISR_Rate = to_go / ticks;
|
||||
}
|
||||
} else {
|
||||
// This is an exterme case with too many e_steps inserted by the linear advance.
|
||||
// At least one tick fits into the to_go interval. Calculate the e-step grouping.
|
||||
estep_loops = 2;
|
||||
uint16_t e = e_steps >> 1;
|
||||
while (e & 0x0ff00) {
|
||||
e >>= 1;
|
||||
estep_loops <<= 1;
|
||||
}
|
||||
while (uint8_t(e) > ticks) {
|
||||
e >>= 1;
|
||||
estep_loops <<= 1;
|
||||
}
|
||||
// Now the estep_loops contains the number of loops of power of 2, that will be sufficient
|
||||
// to squeeze enough of Linear Advance ticks until nextMainISR.
|
||||
// Calculate the tick rate.
|
||||
eISR_Rate = to_go / ticks;
|
||||
// avoid multiple instances or function calls to advance_spread
|
||||
if (la_state & ADV_INIT) {
|
||||
LA_phase = -1;
|
||||
|
||||
if (current_adv_steps == target_adv_steps) {
|
||||
// nothing to be done in this phase, cancel any pending eisr
|
||||
la_state = 0;
|
||||
nextAdvanceISR = ADV_NEVER;
|
||||
}
|
||||
}
|
||||
if (eISR_Rate == 0) {
|
||||
// There is not enough time to fit even a single additional tick.
|
||||
// Tick all the extruder ticks now.
|
||||
MSerial.checkRx(); // Check for serial chars.
|
||||
#ifdef FILAMENT_SENSOR
|
||||
if (READ(E0_DIR_PIN) == INVERT_E0_DIR)
|
||||
{
|
||||
if (count_direction[E_AXIS] == 1)
|
||||
fsensor_counter -= e_steps;
|
||||
else
|
||||
fsensor_counter += e_steps;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (count_direction[E_AXIS] == 1)
|
||||
fsensor_counter += e_steps;
|
||||
else
|
||||
fsensor_counter -= e_steps;
|
||||
}
|
||||
#endif //FILAMENT_SENSOR
|
||||
do {
|
||||
WRITE_NC(E0_STEP_PIN, !INVERT_E_STEP_PIN);
|
||||
-- e_steps;
|
||||
WRITE_NC(E0_STEP_PIN, INVERT_E_STEP_PIN);
|
||||
} while (e_steps);
|
||||
OCR1A = nextMainISR;
|
||||
} else {
|
||||
// Tick the 1st Linear Advance interrupt after 50us from now.
|
||||
nextMainISR -= LIN_ADV_FIRST_TICK_DELAY;
|
||||
OCR1A = now + LIN_ADV_FIRST_TICK_DELAY;
|
||||
}
|
||||
//WRITE_NC(LOGIC_ANALYZER_CH7, false);
|
||||
} else
|
||||
OCR1A = nextMainISR;
|
||||
else {
|
||||
// reset error and iterations per loop for this phase
|
||||
eISR_Err = current_block->advance_rate;
|
||||
e_step_loops = current_block->advance_step_loops;
|
||||
|
||||
if ((la_state & ADV_ACC_VARY) && e_extruding && (current_adv_steps > target_adv_steps)) {
|
||||
// LA could reverse the direction of extrusion in this phase
|
||||
eISR_Err += current_block->advance_rate;
|
||||
LA_phase = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (la_state & ADV_INIT || nextAdvanceISR != ADV_NEVER) {
|
||||
// update timers & phase for the next iteration
|
||||
advance_spread(main_Rate);
|
||||
if (LA_phase >= 0) {
|
||||
if (step_loops == e_step_loops)
|
||||
LA_phase = (current_block->advance_rate < main_Rate);
|
||||
else {
|
||||
// avoid overflow through division. warning: we need to _guarantee_ step_loops
|
||||
// and e_step_loops are <= 4 due to fastdiv's limit
|
||||
auto adv_rate_n = fastdiv(current_block->advance_rate, step_loops);
|
||||
auto main_rate_n = fastdiv(main_Rate, e_step_loops);
|
||||
LA_phase = (adv_rate_n < main_rate_n);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Check for serial chars. This executes roughtly inbetween 50-60% of the total runtime of the
|
||||
// entire isr, making this spot a much better choice than checking during esteps
|
||||
MSerial.checkRx();
|
||||
#endif
|
||||
|
||||
// If current block is finished, reset pointer
|
||||
if (step_events_completed.wide >= current_block->step_event_count.wide) {
|
||||
#ifdef FILAMENT_SENSOR
|
||||
fsensor_st_block_chunk(current_block, fsensor_counter);
|
||||
#if !defined(LIN_ADVANCE) && defined(FILAMENT_SENSOR)
|
||||
fsensor_st_block_chunk(fsensor_counter);
|
||||
fsensor_counter = 0;
|
||||
#endif //FILAMENT_SENSOR
|
||||
|
||||
current_block = NULL;
|
||||
plan_discard_current_block();
|
||||
}
|
||||
#ifdef FILAMENT_SENSOR
|
||||
else if ((fsensor_counter >= fsensor_chunk_len))
|
||||
#if !defined(LIN_ADVANCE) && defined(FILAMENT_SENSOR)
|
||||
else if ((abs(fsensor_counter) >= fsensor_chunk_len))
|
||||
{
|
||||
fsensor_st_block_chunk(current_block, fsensor_counter);
|
||||
fsensor_st_block_chunk(fsensor_counter);
|
||||
fsensor_counter = 0;
|
||||
}
|
||||
#endif //FILAMENT_SENSOR
|
||||
|
@ -1115,12 +932,113 @@ FORCE_INLINE void isr() {
|
|||
}
|
||||
|
||||
#ifdef LIN_ADVANCE
|
||||
// Timer interrupt for E. e_steps is set in the main routine.
|
||||
|
||||
void clear_current_adv_vars() {
|
||||
e_steps = 0; //Should be already 0 at an filament change event, but just to be sure..
|
||||
current_adv_steps = 0;
|
||||
FORCE_INLINE void advance_isr() {
|
||||
if (current_adv_steps > target_adv_steps) {
|
||||
// decompression
|
||||
if (e_step_loops != 1) {
|
||||
uint16_t d_steps = current_adv_steps - target_adv_steps;
|
||||
if (d_steps < e_step_loops)
|
||||
e_step_loops = d_steps;
|
||||
}
|
||||
e_steps -= e_step_loops;
|
||||
if (e_steps) WRITE_NC(E0_DIR_PIN, e_steps < 0? INVERT_E0_DIR: !INVERT_E0_DIR);
|
||||
current_adv_steps -= e_step_loops;
|
||||
}
|
||||
else if (current_adv_steps < target_adv_steps) {
|
||||
// compression
|
||||
if (e_step_loops != 1) {
|
||||
uint16_t d_steps = target_adv_steps - current_adv_steps;
|
||||
if (d_steps < e_step_loops)
|
||||
e_step_loops = d_steps;
|
||||
}
|
||||
e_steps += e_step_loops;
|
||||
if (e_steps) WRITE_NC(E0_DIR_PIN, e_steps < 0? INVERT_E0_DIR: !INVERT_E0_DIR);
|
||||
current_adv_steps += e_step_loops;
|
||||
}
|
||||
|
||||
if (current_adv_steps == target_adv_steps) {
|
||||
// advance steps completed
|
||||
nextAdvanceISR = ADV_NEVER;
|
||||
}
|
||||
else {
|
||||
// schedule another tick
|
||||
nextAdvanceISR = eISR_Rate;
|
||||
}
|
||||
}
|
||||
|
||||
FORCE_INLINE void advance_isr_scheduler() {
|
||||
// Integrate the final timer value, accounting for scheduling adjustments
|
||||
if(nextAdvanceISR && nextAdvanceISR != ADV_NEVER)
|
||||
{
|
||||
if(nextAdvanceISR > OCR1A)
|
||||
nextAdvanceISR -= OCR1A;
|
||||
else
|
||||
nextAdvanceISR = 0;
|
||||
}
|
||||
if(nextMainISR > OCR1A)
|
||||
nextMainISR -= OCR1A;
|
||||
else
|
||||
nextMainISR = 0;
|
||||
|
||||
// Run main stepping ISR if flagged
|
||||
if (!nextMainISR)
|
||||
{
|
||||
#ifdef LA_DEBUG_LOGIC
|
||||
WRITE_NC(LOGIC_ANALYZER_CH0, true);
|
||||
#endif
|
||||
isr();
|
||||
#ifdef LA_DEBUG_LOGIC
|
||||
WRITE_NC(LOGIC_ANALYZER_CH0, false);
|
||||
#endif
|
||||
}
|
||||
|
||||
// Run the next advance isr if triggered
|
||||
bool eisr = !nextAdvanceISR;
|
||||
if (eisr)
|
||||
{
|
||||
#ifdef LA_DEBUG_LOGIC
|
||||
WRITE_NC(LOGIC_ANALYZER_CH1, true);
|
||||
#endif
|
||||
advance_isr();
|
||||
#ifdef LA_DEBUG_LOGIC
|
||||
WRITE_NC(LOGIC_ANALYZER_CH1, false);
|
||||
#endif
|
||||
}
|
||||
|
||||
// Tick E steps if any
|
||||
if (e_steps && (LA_phase < 0 || LA_phase == eisr)) {
|
||||
uint8_t max_ticks = (eisr? e_step_loops: step_loops);
|
||||
max_ticks = min(abs(e_steps), max_ticks);
|
||||
bool rev = (e_steps < 0);
|
||||
do
|
||||
{
|
||||
WRITE_NC(E0_STEP_PIN, !INVERT_E_STEP_PIN);
|
||||
e_steps += (rev? 1: -1);
|
||||
WRITE_NC(E0_STEP_PIN, INVERT_E_STEP_PIN);
|
||||
#if defined(FILAMENT_SENSOR) && defined(PAT9125)
|
||||
fsensor_counter += (rev? -1: 1);
|
||||
#endif
|
||||
}
|
||||
while(--max_ticks);
|
||||
|
||||
#if defined(FILAMENT_SENSOR) && defined(PAT9125)
|
||||
if (abs(fsensor_counter) >= fsensor_chunk_len)
|
||||
{
|
||||
fsensor_st_block_chunk(fsensor_counter);
|
||||
fsensor_counter = 0;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
// Schedule the next closest tick, ignoring advance if scheduled too
|
||||
// soon in order to avoid skewing the regular stepper acceleration
|
||||
if (nextAdvanceISR != ADV_NEVER && (nextAdvanceISR + 40) < nextMainISR)
|
||||
OCR1A = nextAdvanceISR;
|
||||
else
|
||||
OCR1A = nextMainISR;
|
||||
}
|
||||
#endif // LIN_ADVANCE
|
||||
|
||||
void st_init()
|
||||
|
@ -1347,18 +1265,46 @@ void st_init()
|
|||
// Plan the first interrupt after 8ms from now.
|
||||
OCR1A = 0x4000;
|
||||
TCNT1 = 0;
|
||||
ENABLE_STEPPER_DRIVER_INTERRUPT();
|
||||
|
||||
#ifdef LIN_ADVANCE
|
||||
e_steps = 0;
|
||||
current_adv_steps = 0;
|
||||
#ifdef LA_DEBUG_LOGIC
|
||||
LOGIC_ANALYZER_CH0_ENABLE;
|
||||
LOGIC_ANALYZER_CH1_ENABLE;
|
||||
WRITE_NC(LOGIC_ANALYZER_CH0, false);
|
||||
WRITE_NC(LOGIC_ANALYZER_CH1, false);
|
||||
#endif
|
||||
|
||||
|
||||
// Initialize state for the linear advance scheduler
|
||||
nextMainISR = 0;
|
||||
nextAdvanceISR = ADV_NEVER;
|
||||
main_Rate = ADV_NEVER;
|
||||
current_adv_steps = 0;
|
||||
#endif
|
||||
|
||||
enable_endstops(true); // Start with endstops active. After homing they can be disabled
|
||||
|
||||
ENABLE_STEPPER_DRIVER_INTERRUPT();
|
||||
sei();
|
||||
}
|
||||
|
||||
|
||||
void st_reset_timer()
|
||||
{
|
||||
// Clear a possible pending interrupt on OCR1A overflow.
|
||||
TIFR1 |= 1 << OCF1A;
|
||||
// Reset the counter.
|
||||
TCNT1 = 0;
|
||||
// Wake up after 1ms from now.
|
||||
OCR1A = 2000;
|
||||
|
||||
#ifdef LIN_ADVANCE
|
||||
nextMainISR = 0;
|
||||
if(nextAdvanceISR && nextAdvanceISR != ADV_NEVER)
|
||||
nextAdvanceISR = 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
// Block until all buffered steps are executed
|
||||
void st_synchronize()
|
||||
{
|
||||
|
@ -1427,29 +1373,20 @@ float st_get_position_mm(uint8_t axis)
|
|||
}
|
||||
|
||||
|
||||
void finishAndDisableSteppers()
|
||||
{
|
||||
st_synchronize();
|
||||
disable_x();
|
||||
disable_y();
|
||||
disable_z();
|
||||
disable_e0();
|
||||
disable_e1();
|
||||
disable_e2();
|
||||
}
|
||||
|
||||
void quickStop()
|
||||
{
|
||||
DISABLE_STEPPER_DRIVER_INTERRUPT();
|
||||
while (blocks_queued()) plan_discard_current_block();
|
||||
current_block = NULL;
|
||||
#ifdef LIN_ADVANCE
|
||||
nextAdvanceISR = ADV_NEVER;
|
||||
current_adv_steps = 0;
|
||||
#endif
|
||||
st_reset_timer();
|
||||
ENABLE_STEPPER_DRIVER_INTERRUPT();
|
||||
}
|
||||
|
||||
#ifdef BABYSTEPPING
|
||||
|
||||
|
||||
void babystep(const uint8_t axis,const bool direction)
|
||||
{
|
||||
//MUST ONLY BE CALLED BY A ISR, it depends on that no other ISR interrupts this
|
||||
|
@ -1685,3 +1622,13 @@ void microstep_readings()
|
|||
#endif
|
||||
}
|
||||
#endif //TMC2130
|
||||
|
||||
|
||||
#if defined(FILAMENT_SENSOR) && defined(PAT9125)
|
||||
void st_reset_fsensor()
|
||||
{
|
||||
CRITICAL_SECTION_START;
|
||||
fsensor_counter = 0;
|
||||
CRITICAL_SECTION_END;
|
||||
}
|
||||
#endif //FILAMENT_SENSOR
|
||||
|
|
|
@ -37,12 +37,6 @@ void st_init();
|
|||
|
||||
void isr();
|
||||
|
||||
#ifdef LIN_ADVANCE
|
||||
void advance_isr();
|
||||
void advance_isr_scheduler();
|
||||
void clear_current_adv_vars(); //Used to reset the built up pretension and remaining esteps on filament change.
|
||||
#endif
|
||||
|
||||
// Block until all buffered steps are executed
|
||||
void st_synchronize();
|
||||
|
||||
|
@ -62,15 +56,7 @@ float st_get_position_mm(uint8_t axis);
|
|||
|
||||
// Call this function just before re-enabling the stepper driver interrupt and the global interrupts
|
||||
// to avoid a stepper timer overflow.
|
||||
FORCE_INLINE void st_reset_timer()
|
||||
{
|
||||
// Clear a possible pending interrupt on OCR1A overflow.
|
||||
TIFR1 |= 1 << OCF1A;
|
||||
// Reset the counter.
|
||||
TCNT1 = 0;
|
||||
// Wake up after 1ms from now.
|
||||
OCR1A = 2000;
|
||||
}
|
||||
void st_reset_timer();
|
||||
|
||||
void checkHitEndstops(); //call from somewhere to create an serial error message with the locations the endstops where hit, in case they were triggered
|
||||
bool endstops_hit_on_purpose(); //avoid creation of the message, i.e. after homing and before a routine call of checkHitEndstops();
|
||||
|
@ -83,8 +69,6 @@ void invert_z_endstop(bool endstop_invert);
|
|||
|
||||
void checkStepperErrors(); //Print errors detected by the stepper
|
||||
|
||||
void finishAndDisableSteppers();
|
||||
|
||||
extern block_t *current_block; // A pointer to the block currently being traced
|
||||
extern bool x_min_endstop;
|
||||
extern bool x_max_endstop;
|
||||
|
@ -106,7 +90,10 @@ void microstep_readings();
|
|||
#ifdef BABYSTEPPING
|
||||
void babystep(const uint8_t axis,const bool direction); // perform a short step with a single stepper motor, outside of any convention
|
||||
#endif
|
||||
|
||||
|
||||
#if defined(FILAMENT_SENSOR) && defined(PAT9125)
|
||||
// reset the internal filament sensor state
|
||||
void st_reset_fsensor();
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
|
@ -8,11 +8,12 @@
|
|||
|
||||
#ifdef SYSTEM_TIMER_2
|
||||
#include "timer02.h"
|
||||
#include "tone04.h"
|
||||
#define _millis millis2
|
||||
#define _micros micros2
|
||||
#define _delay delay2
|
||||
#define _tone tone2
|
||||
#define _noTone noTone2
|
||||
#define _tone tone4
|
||||
#define _noTone noTone4
|
||||
|
||||
#define timer02_set_pwm0(pwm0)
|
||||
|
||||
|
@ -20,8 +21,8 @@
|
|||
#define _millis millis
|
||||
#define _micros micros
|
||||
#define _delay delay
|
||||
#define _tone(x, y) /*tone*/
|
||||
#define _noTone(x) /*noTone*/
|
||||
#define _tone tone
|
||||
#define _noTone noTone
|
||||
#define timer02_set_pwm0(pwm0)
|
||||
#endif //SYSTEM_TIMER_2
|
||||
|
||||
|
|
|
@ -73,8 +73,8 @@ int current_voltage_raw_pwr = 0;
|
|||
int current_voltage_raw_bed = 0;
|
||||
#endif
|
||||
|
||||
#if IR_SENSOR_ANALOG
|
||||
int current_voltage_raw_IR = 0;
|
||||
#ifdef IR_SENSOR_ANALOG
|
||||
uint16_t current_voltage_raw_IR = 0;
|
||||
#endif //IR_SENSOR_ANALOG
|
||||
|
||||
int current_temperature_bed_raw = 0;
|
||||
|
@ -143,14 +143,22 @@ static volatile bool temp_meas_ready = false;
|
|||
#ifdef FAN_SOFT_PWM
|
||||
static unsigned char soft_pwm_fan;
|
||||
#endif
|
||||
#if (defined(EXTRUDER_0_AUTO_FAN_PIN) && EXTRUDER_0_AUTO_FAN_PIN > -1) || \
|
||||
(defined(EXTRUDER_1_AUTO_FAN_PIN) && EXTRUDER_1_AUTO_FAN_PIN > -1) || \
|
||||
(defined(EXTRUDER_2_AUTO_FAN_PIN) && EXTRUDER_2_AUTO_FAN_PIN > -1)
|
||||
unsigned long extruder_autofan_last_check = _millis();
|
||||
uint8_t fanSpeedBckp = 255;
|
||||
bool fan_measuring = false;
|
||||
|
||||
#endif
|
||||
uint8_t fanSpeedBckp = 255;
|
||||
|
||||
#if (defined(EXTRUDER_0_AUTO_FAN_PIN) && EXTRUDER_0_AUTO_FAN_PIN > -1)
|
||||
unsigned long extruder_autofan_last_check = _millis();
|
||||
|
||||
bool fan_measuring = false;
|
||||
uint8_t fanState = 0;
|
||||
#ifdef EXTRUDER_ALTFAN_DETECT
|
||||
struct
|
||||
{
|
||||
uint8_t isAltfan : 1;
|
||||
uint8_t altfanOverride : 1;
|
||||
} altfanStatus;
|
||||
#endif //EXTRUDER_ALTFAN_DETECT
|
||||
#endif
|
||||
|
||||
|
||||
#if EXTRUDERS > 3
|
||||
|
@ -176,6 +184,12 @@ static int bed_minttemp_raw = HEATER_BED_RAW_LO_TEMP;
|
|||
#ifdef BED_MAXTEMP
|
||||
static int bed_maxttemp_raw = HEATER_BED_RAW_HI_TEMP;
|
||||
#endif
|
||||
#ifdef AMBIENT_MINTEMP
|
||||
static int ambient_minttemp_raw = AMBIENT_RAW_LO_TEMP;
|
||||
#endif
|
||||
#ifdef AMBIENT_MAXTEMP
|
||||
static int ambient_maxttemp_raw = AMBIENT_RAW_HI_TEMP;
|
||||
#endif
|
||||
|
||||
static void *heater_ttbl_map[EXTRUDERS] = ARRAY_BY_EXTRUDERS( (void *)HEATER_0_TEMPTABLE, (void *)HEATER_1_TEMPTABLE, (void *)HEATER_2_TEMPTABLE );
|
||||
static uint8_t heater_ttbllen_map[EXTRUDERS] = ARRAY_BY_EXTRUDERS( HEATER_0_TEMPTABLE_LEN, HEATER_1_TEMPTABLE_LEN, HEATER_2_TEMPTABLE_LEN );
|
||||
|
@ -210,6 +224,64 @@ static void temp_runaway_check(int _heater_id, float _target_temperature, float
|
|||
static void temp_runaway_stop(bool isPreheat, bool isBed);
|
||||
#endif
|
||||
|
||||
#ifdef EXTRUDER_ALTFAN_DETECT
|
||||
ISR(INT6_vect) {
|
||||
fan_edge_counter[0]++;
|
||||
}
|
||||
|
||||
bool extruder_altfan_detect()
|
||||
{
|
||||
setExtruderAutoFanState(3);
|
||||
|
||||
SET_INPUT(TACH_0);
|
||||
|
||||
uint8_t overrideVal = eeprom_read_byte((uint8_t *)EEPROM_ALTFAN_OVERRIDE);
|
||||
if (overrideVal == EEPROM_EMPTY_VALUE)
|
||||
{
|
||||
overrideVal = (calibration_status() == CALIBRATION_STATUS_CALIBRATED) ? 1 : 0;
|
||||
eeprom_update_byte((uint8_t *)EEPROM_ALTFAN_OVERRIDE, overrideVal);
|
||||
}
|
||||
altfanStatus.altfanOverride = overrideVal;
|
||||
|
||||
CRITICAL_SECTION_START;
|
||||
EICRB &= ~(1 << ISC61);
|
||||
EICRB |= (1 << ISC60);
|
||||
EIMSK |= (1 << INT6);
|
||||
fan_edge_counter[0] = 0;
|
||||
CRITICAL_SECTION_END;
|
||||
extruder_autofan_last_check = _millis();
|
||||
|
||||
_delay(1000);
|
||||
|
||||
EIMSK &= ~(1 << INT6);
|
||||
|
||||
countFanSpeed();
|
||||
altfanStatus.isAltfan = fan_speed[0] > 100;
|
||||
setExtruderAutoFanState(1);
|
||||
return altfanStatus.isAltfan;
|
||||
}
|
||||
|
||||
void altfanOverride_toggle()
|
||||
{
|
||||
altfanStatus.altfanOverride = !altfanStatus.altfanOverride;
|
||||
eeprom_update_byte((uint8_t *)EEPROM_ALTFAN_OVERRIDE, altfanStatus.altfanOverride);
|
||||
}
|
||||
|
||||
bool altfanOverride_get()
|
||||
{
|
||||
return altfanStatus.altfanOverride;
|
||||
}
|
||||
|
||||
#endif //EXTRUDER_ALTFAN_DETECT
|
||||
|
||||
// return "false", if all extruder-heaters are 'off' (ie. "true", if any heater is 'on')
|
||||
bool checkAllHotends(void)
|
||||
{
|
||||
bool result=false;
|
||||
for(int i=0;i<EXTRUDERS;i++) result=(result||(target_temperature[i]!=0));
|
||||
return(result);
|
||||
}
|
||||
|
||||
void PID_autotune(float temp, int extruder, int ncycles)
|
||||
{
|
||||
pid_number_of_cycles = ncycles;
|
||||
|
@ -231,9 +303,7 @@ static void temp_runaway_stop(bool isPreheat, bool isBed);
|
|||
const uint8_t safety_check_cycles_count = (extruder < 0) ? 45 : 10; //10 cycles / 20s delay for extruder and 45 cycles / 90s for heatbed
|
||||
float temp_ambient;
|
||||
|
||||
#if (defined(EXTRUDER_0_AUTO_FAN_PIN) && EXTRUDER_0_AUTO_FAN_PIN > -1) || \
|
||||
(defined(EXTRUDER_1_AUTO_FAN_PIN) && EXTRUDER_1_AUTO_FAN_PIN > -1) || \
|
||||
(defined(EXTRUDER_2_AUTO_FAN_PIN) && EXTRUDER_2_AUTO_FAN_PIN > -1)
|
||||
#if (defined(EXTRUDER_0_AUTO_FAN_PIN) && EXTRUDER_0_AUTO_FAN_PIN > -1)
|
||||
unsigned long extruder_autofan_last_check = _millis();
|
||||
#endif
|
||||
|
||||
|
@ -281,9 +351,7 @@ static void temp_runaway_stop(bool isPreheat, bool isBed);
|
|||
max=max(max,input);
|
||||
min=min(min,input);
|
||||
|
||||
#if (defined(EXTRUDER_0_AUTO_FAN_PIN) && EXTRUDER_0_AUTO_FAN_PIN > -1) || \
|
||||
(defined(EXTRUDER_1_AUTO_FAN_PIN) && EXTRUDER_1_AUTO_FAN_PIN > -1) || \
|
||||
(defined(EXTRUDER_2_AUTO_FAN_PIN) && EXTRUDER_2_AUTO_FAN_PIN > -1)
|
||||
#if (defined(EXTRUDER_0_AUTO_FAN_PIN) && EXTRUDER_0_AUTO_FAN_PIN > -1)
|
||||
if(_millis() - extruder_autofan_last_check > 2500) {
|
||||
checkExtruderAutoFans();
|
||||
extruder_autofan_last_check = _millis();
|
||||
|
@ -439,29 +507,31 @@ int getHeaterPower(int heater) {
|
|||
return soft_pwm[heater];
|
||||
}
|
||||
|
||||
#if (defined(EXTRUDER_0_AUTO_FAN_PIN) && EXTRUDER_0_AUTO_FAN_PIN > -1) || \
|
||||
(defined(EXTRUDER_1_AUTO_FAN_PIN) && EXTRUDER_1_AUTO_FAN_PIN > -1) || \
|
||||
(defined(EXTRUDER_2_AUTO_FAN_PIN) && EXTRUDER_2_AUTO_FAN_PIN > -1)
|
||||
#if (defined(EXTRUDER_0_AUTO_FAN_PIN) && EXTRUDER_0_AUTO_FAN_PIN > -1)
|
||||
|
||||
#if defined(FAN_PIN) && FAN_PIN > -1
|
||||
#if EXTRUDER_0_AUTO_FAN_PIN == FAN_PIN
|
||||
#error "You cannot set EXTRUDER_0_AUTO_FAN_PIN equal to FAN_PIN"
|
||||
#endif
|
||||
#if EXTRUDER_1_AUTO_FAN_PIN == FAN_PIN
|
||||
#error "You cannot set EXTRUDER_1_AUTO_FAN_PIN equal to FAN_PIN"
|
||||
#endif
|
||||
#if EXTRUDER_2_AUTO_FAN_PIN == FAN_PIN
|
||||
#error "You cannot set EXTRUDER_2_AUTO_FAN_PIN equal to FAN_PIN"
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
void setExtruderAutoFanState(int pin, bool state)
|
||||
void setExtruderAutoFanState(uint8_t state)
|
||||
{
|
||||
unsigned char newFanSpeed = (state != 0) ? EXTRUDER_AUTO_FAN_SPEED : 0;
|
||||
// this idiom allows both digital and PWM fan outputs (see M42 handling).
|
||||
pinMode(pin, OUTPUT);
|
||||
digitalWrite(pin, newFanSpeed);
|
||||
//analogWrite(pin, newFanSpeed);
|
||||
//If bit 1 is set (0x02), then the extruder fan speed won't be adjusted according to temperature. Useful for forcing
|
||||
//the fan to either On or Off during certain tests/errors.
|
||||
|
||||
fanState = state;
|
||||
uint8_t newFanSpeed = 0;
|
||||
if (fanState & 0x01)
|
||||
{
|
||||
#ifdef EXTRUDER_ALTFAN_DETECT
|
||||
if (altfanStatus.isAltfan && !altfanStatus.altfanOverride) newFanSpeed = EXTRUDER_ALTFAN_SPEED_SILENT;
|
||||
else newFanSpeed = EXTRUDER_AUTO_FAN_SPEED;
|
||||
#else //EXTRUDER_ALTFAN_DETECT
|
||||
newFanSpeed = EXTRUDER_AUTO_FAN_SPEED;
|
||||
#endif //EXTRUDER_ALTFAN_DETECT
|
||||
}
|
||||
timer4_set_fan0(newFanSpeed);
|
||||
}
|
||||
|
||||
#if (defined(FANCHECK) && (((defined(TACH_0) && (TACH_0 >-1)) || (defined(TACH_1) && (TACH_1 > -1)))))
|
||||
|
@ -495,7 +565,7 @@ void checkFanSpeed()
|
|||
fans_check_enabled = (eeprom_read_byte((uint8_t*)EEPROM_FAN_CHECK_ENABLED) > 0);
|
||||
static unsigned char fan_speed_errors[2] = { 0,0 };
|
||||
#if (defined(FANCHECK) && defined(TACH_0) && (TACH_0 >-1))
|
||||
if ((fan_speed[0] == 0) && (current_temperature[0] > EXTRUDER_AUTO_FAN_TEMPERATURE)){ fan_speed_errors[0]++;}
|
||||
if ((fan_speed[0] < 20) && (current_temperature[0] > EXTRUDER_AUTO_FAN_TEMPERATURE)){ fan_speed_errors[0]++;}
|
||||
else{
|
||||
fan_speed_errors[0] = 0;
|
||||
host_keepalive();
|
||||
|
@ -569,47 +639,14 @@ void fanSpeedError(unsigned char _fan) {
|
|||
|
||||
void checkExtruderAutoFans()
|
||||
{
|
||||
uint8_t fanState = 0;
|
||||
|
||||
// which fan pins need to be turned on?
|
||||
#if defined(EXTRUDER_0_AUTO_FAN_PIN) && EXTRUDER_0_AUTO_FAN_PIN > -1
|
||||
if (current_temperature[0] > EXTRUDER_AUTO_FAN_TEMPERATURE)
|
||||
fanState |= 1;
|
||||
#endif
|
||||
#if defined(EXTRUDER_1_AUTO_FAN_PIN) && EXTRUDER_1_AUTO_FAN_PIN > -1
|
||||
if (current_temperature[1] > EXTRUDER_AUTO_FAN_TEMPERATURE)
|
||||
{
|
||||
if (EXTRUDER_1_AUTO_FAN_PIN == EXTRUDER_0_AUTO_FAN_PIN)
|
||||
fanState |= 1;
|
||||
else
|
||||
fanState |= 2;
|
||||
}
|
||||
#endif
|
||||
#if defined(EXTRUDER_2_AUTO_FAN_PIN) && EXTRUDER_2_AUTO_FAN_PIN > -1
|
||||
if (current_temperature[2] > EXTRUDER_AUTO_FAN_TEMPERATURE)
|
||||
{
|
||||
if (EXTRUDER_2_AUTO_FAN_PIN == EXTRUDER_0_AUTO_FAN_PIN)
|
||||
fanState |= 1;
|
||||
else if (EXTRUDER_2_AUTO_FAN_PIN == EXTRUDER_1_AUTO_FAN_PIN)
|
||||
fanState |= 2;
|
||||
else
|
||||
fanState |= 4;
|
||||
}
|
||||
#endif
|
||||
|
||||
// update extruder auto fan states
|
||||
#if defined(EXTRUDER_0_AUTO_FAN_PIN) && EXTRUDER_0_AUTO_FAN_PIN > -1
|
||||
setExtruderAutoFanState(EXTRUDER_0_AUTO_FAN_PIN, (fanState & 1) != 0);
|
||||
#endif
|
||||
#if defined(EXTRUDER_1_AUTO_FAN_PIN) && EXTRUDER_1_AUTO_FAN_PIN > -1
|
||||
if (EXTRUDER_1_AUTO_FAN_PIN != EXTRUDER_0_AUTO_FAN_PIN)
|
||||
setExtruderAutoFanState(EXTRUDER_1_AUTO_FAN_PIN, (fanState & 2) != 0);
|
||||
#endif
|
||||
#if defined(EXTRUDER_2_AUTO_FAN_PIN) && EXTRUDER_2_AUTO_FAN_PIN > -1
|
||||
if (EXTRUDER_2_AUTO_FAN_PIN != EXTRUDER_0_AUTO_FAN_PIN
|
||||
&& EXTRUDER_2_AUTO_FAN_PIN != EXTRUDER_1_AUTO_FAN_PIN)
|
||||
setExtruderAutoFanState(EXTRUDER_2_AUTO_FAN_PIN, (fanState & 4) != 0);
|
||||
#endif
|
||||
#if defined(EXTRUDER_0_AUTO_FAN_PIN) && EXTRUDER_0_AUTO_FAN_PIN > -1
|
||||
if (!(fanState & 0x02))
|
||||
{
|
||||
fanState &= ~1;
|
||||
fanState |= current_temperature[0] > EXTRUDER_AUTO_FAN_TEMPERATURE;
|
||||
}
|
||||
setExtruderAutoFanState(fanState);
|
||||
#endif
|
||||
}
|
||||
|
||||
#endif // any extruder auto fan pins set
|
||||
|
@ -633,6 +670,7 @@ void manage_heater()
|
|||
return;
|
||||
// more precisely - this condition partially stabilizes time interval for regulation values evaluation (@ ~ 230ms)
|
||||
|
||||
// ADC values need to be converted before checking: converted values are later used in MINTEMP
|
||||
updateTemperaturesFromRawValues();
|
||||
|
||||
check_max_temp();
|
||||
|
@ -729,9 +767,7 @@ void manage_heater()
|
|||
#define FAN_CHECK_DURATION 100 //100ms
|
||||
|
||||
#ifndef DEBUG_DISABLE_FANCHECK
|
||||
#if (defined(EXTRUDER_0_AUTO_FAN_PIN) && EXTRUDER_0_AUTO_FAN_PIN > -1) || \
|
||||
(defined(EXTRUDER_1_AUTO_FAN_PIN) && EXTRUDER_1_AUTO_FAN_PIN > -1) || \
|
||||
(defined(EXTRUDER_2_AUTO_FAN_PIN) && EXTRUDER_2_AUTO_FAN_PIN > -1)
|
||||
#if (defined(EXTRUDER_0_AUTO_FAN_PIN) && EXTRUDER_0_AUTO_FAN_PIN > -1)
|
||||
|
||||
#ifdef FAN_SOFT_PWM
|
||||
#ifdef FANCHECK
|
||||
|
@ -1090,7 +1126,9 @@ void tp_init()
|
|||
|
||||
timer0_init();
|
||||
OCR2B = 128;
|
||||
TIMSK2 |= (1<<OCIE2B);
|
||||
TIMSK2 |= (1<<OCIE2B);
|
||||
|
||||
timer4_init(); //for tone and Extruder fan PWM
|
||||
|
||||
// Wait for temperature measurement to settle
|
||||
_delay(250);
|
||||
|
@ -1159,7 +1197,6 @@ void tp_init()
|
|||
#endif //MAXTEMP 2
|
||||
|
||||
#ifdef BED_MINTEMP
|
||||
/* No bed MINTEMP error implemented?!? */
|
||||
while(analog2tempBed(bed_minttemp_raw) < BED_MINTEMP) {
|
||||
#if HEATER_BED_RAW_LO_TEMP < HEATER_BED_RAW_HI_TEMP
|
||||
bed_minttemp_raw += OVERSAMPLENR;
|
||||
|
@ -1167,7 +1204,6 @@ void tp_init()
|
|||
bed_minttemp_raw -= OVERSAMPLENR;
|
||||
#endif
|
||||
}
|
||||
|
||||
#endif //BED_MINTEMP
|
||||
#ifdef BED_MAXTEMP
|
||||
while(analog2tempBed(bed_maxttemp_raw) > BED_MAXTEMP) {
|
||||
|
@ -1178,6 +1214,25 @@ void tp_init()
|
|||
#endif
|
||||
}
|
||||
#endif //BED_MAXTEMP
|
||||
|
||||
#ifdef AMBIENT_MINTEMP
|
||||
while(analog2tempAmbient(ambient_minttemp_raw) < AMBIENT_MINTEMP) {
|
||||
#if HEATER_AMBIENT_RAW_LO_TEMP < HEATER_AMBIENT_RAW_HI_TEMP
|
||||
ambient_minttemp_raw += OVERSAMPLENR;
|
||||
#else
|
||||
ambient_minttemp_raw -= OVERSAMPLENR;
|
||||
#endif
|
||||
}
|
||||
#endif //AMBIENT_MINTEMP
|
||||
#ifdef AMBIENT_MAXTEMP
|
||||
while(analog2tempAmbient(ambient_maxttemp_raw) > AMBIENT_MAXTEMP) {
|
||||
#if HEATER_AMBIENT_RAW_LO_TEMP < HEATER_AMBIENT_RAW_HI_TEMP
|
||||
ambient_maxttemp_raw -= OVERSAMPLENR;
|
||||
#else
|
||||
ambient_maxttemp_raw += OVERSAMPLENR;
|
||||
#endif
|
||||
}
|
||||
#endif //AMBIENT_MAXTEMP
|
||||
}
|
||||
|
||||
#if (defined (TEMP_RUNAWAY_BED_HYSTERESIS) && TEMP_RUNAWAY_BED_TIMEOUT > 0) || (defined (TEMP_RUNAWAY_EXTRUDER_HYSTERESIS) && TEMP_RUNAWAY_EXTRUDER_TIMEOUT > 0)
|
||||
|
@ -1349,9 +1404,11 @@ void temp_runaway_stop(bool isPreheat, bool isBed)
|
|||
isBed ? LCD_ALERTMESSAGEPGM("BED PREHEAT ERROR") : LCD_ALERTMESSAGEPGM("PREHEAT ERROR");
|
||||
SERIAL_ERROR_START;
|
||||
isBed ? SERIAL_ERRORLNPGM(" THERMAL RUNAWAY ( PREHEAT HEATBED)") : SERIAL_ERRORLNPGM(" THERMAL RUNAWAY ( PREHEAT HOTEND)");
|
||||
SET_OUTPUT(EXTRUDER_0_AUTO_FAN_PIN);
|
||||
#ifdef EXTRUDER_ALTFAN_DETECT
|
||||
altfanStatus.altfanOverride = 1; //full speed
|
||||
#endif //EXTRUDER_ALTFAN_DETECT
|
||||
setExtruderAutoFanState(3);
|
||||
SET_OUTPUT(FAN_PIN);
|
||||
WRITE(EXTRUDER_0_AUTO_FAN_PIN, 1);
|
||||
#ifdef FAN_SOFT_PWM
|
||||
fanSpeedSoftPwm = 255;
|
||||
#else //FAN_SOFT_PWM
|
||||
|
@ -1403,6 +1460,7 @@ void disable_heater()
|
|||
target_temperature_bed=0;
|
||||
soft_pwm_bed=0;
|
||||
timer02_set_pwm0(soft_pwm_bed << 1);
|
||||
bedPWMDisabled = 0;
|
||||
#if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1
|
||||
//WRITE(HEATER_BED_PIN,LOW);
|
||||
#endif
|
||||
|
@ -1418,26 +1476,55 @@ enum { LCDALERT_NONE = 0, LCDALERT_HEATERMINTEMP, LCDALERT_BEDMINTEMP, LCDALERT_
|
|||
//! to prevent flicker and improve speed
|
||||
uint8_t last_alert_sent_to_lcd = LCDALERT_NONE;
|
||||
|
||||
|
||||
//! update the current temperature error message
|
||||
//! @param type short error abbreviation (PROGMEM)
|
||||
//! @param func optional lcd update function (lcd_setalertstatus when first setting the error)
|
||||
void temp_update_messagepgm(const char* PROGMEM type, void (*func)(const char*) = lcd_updatestatus)
|
||||
{
|
||||
char msg[LCD_WIDTH];
|
||||
strcpy_P(msg, PSTR("Err: "));
|
||||
strcat_P(msg, type);
|
||||
(*func)(msg);
|
||||
}
|
||||
|
||||
//! signal a temperature error on both the lcd and serial
|
||||
//! @param type short error abbreviation (PROGMEM)
|
||||
//! @param e optional extruder index for hotend errors
|
||||
void temp_error_messagepgm(const char* PROGMEM type, uint8_t e = EXTRUDERS)
|
||||
{
|
||||
temp_update_messagepgm(type, lcd_setalertstatus);
|
||||
|
||||
SERIAL_ERROR_START;
|
||||
|
||||
if(e != EXTRUDERS) {
|
||||
SERIAL_ERROR((int)e);
|
||||
SERIAL_ERRORPGM(": ");
|
||||
}
|
||||
|
||||
SERIAL_ERRORPGM("Heaters switched off. ");
|
||||
SERIAL_ERRORRPGM(type);
|
||||
SERIAL_ERRORLNPGM(" triggered!");
|
||||
}
|
||||
|
||||
|
||||
void max_temp_error(uint8_t e) {
|
||||
disable_heater();
|
||||
if(IsStopped() == false) {
|
||||
SERIAL_ERROR_START;
|
||||
SERIAL_ERRORLN((int)e);
|
||||
SERIAL_ERRORLNPGM(": Extruder switched off. MAXTEMP triggered !");
|
||||
LCD_ALERTMESSAGEPGM("Err: MAXTEMP");
|
||||
temp_error_messagepgm(PSTR("MAXTEMP"), e);
|
||||
}
|
||||
#ifndef BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
|
||||
Stop();
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
SET_OUTPUT(EXTRUDER_0_AUTO_FAN_PIN);
|
||||
|
||||
SET_OUTPUT(FAN_PIN);
|
||||
SET_OUTPUT(BEEPER);
|
||||
WRITE(FAN_PIN, 1);
|
||||
WRITE(EXTRUDER_0_AUTO_FAN_PIN, 1);
|
||||
WRITE(BEEPER, 1);
|
||||
#ifdef EXTRUDER_ALTFAN_DETECT
|
||||
altfanStatus.altfanOverride = 1; //full speed
|
||||
#endif //EXTRUDER_ALTFAN_DETECT
|
||||
setExtruderAutoFanState(3);
|
||||
// fanSpeed will consumed by the check_axes_activity() routine.
|
||||
fanSpeed=255;
|
||||
if (farm_mode) { prusa_statistics(93); }
|
||||
|
@ -1447,18 +1534,15 @@ void min_temp_error(uint8_t e) {
|
|||
#ifdef DEBUG_DISABLE_MINTEMP
|
||||
return;
|
||||
#endif
|
||||
//if (current_temperature_ambient < MINTEMP_MINAMBIENT) return;
|
||||
disable_heater();
|
||||
static const char err[] PROGMEM = "Err: MINTEMP";
|
||||
//if (current_temperature_ambient < MINTEMP_MINAMBIENT) return;
|
||||
static const char err[] PROGMEM = "MINTEMP";
|
||||
if(IsStopped() == false) {
|
||||
SERIAL_ERROR_START;
|
||||
SERIAL_ERRORLN((int)e);
|
||||
SERIAL_ERRORLNPGM(": Extruder switched off. MINTEMP triggered !");
|
||||
lcd_setalertstatuspgm(err);
|
||||
temp_error_messagepgm(err, e);
|
||||
last_alert_sent_to_lcd = LCDALERT_HEATERMINTEMP;
|
||||
} else if( last_alert_sent_to_lcd != LCDALERT_HEATERMINTEMP ){ // only update, if the lcd message is to be changed (i.e. not the same as last time)
|
||||
// we are already stopped due to some error, only update the status message without flickering
|
||||
lcd_updatestatuspgm(err);
|
||||
temp_update_messagepgm(err);
|
||||
last_alert_sent_to_lcd = LCDALERT_HEATERMINTEMP;
|
||||
}
|
||||
#ifndef BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
|
||||
|
@ -1473,37 +1557,27 @@ void min_temp_error(uint8_t e) {
|
|||
}
|
||||
|
||||
void bed_max_temp_error(void) {
|
||||
#if HEATER_BED_PIN > -1
|
||||
//WRITE(HEATER_BED_PIN, 0);
|
||||
#endif
|
||||
disable_heater();
|
||||
if(IsStopped() == false) {
|
||||
SERIAL_ERROR_START;
|
||||
SERIAL_ERRORLNPGM("Temperature heated bed switched off. MAXTEMP triggered !");
|
||||
LCD_ALERTMESSAGEPGM("Err: MAXTEMP BED");
|
||||
temp_error_messagepgm(PSTR("MAXTEMP BED"));
|
||||
}
|
||||
#ifndef BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
|
||||
Stop();
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
void bed_min_temp_error(void) {
|
||||
#ifdef DEBUG_DISABLE_MINTEMP
|
||||
return;
|
||||
#endif
|
||||
//if (current_temperature_ambient < MINTEMP_MINAMBIENT) return;
|
||||
#if HEATER_BED_PIN > -1
|
||||
//WRITE(HEATER_BED_PIN, 0);
|
||||
#endif
|
||||
static const char err[] PROGMEM = "Err: MINTEMP BED";
|
||||
disable_heater();
|
||||
static const char err[] PROGMEM = "MINTEMP BED";
|
||||
if(IsStopped() == false) {
|
||||
SERIAL_ERROR_START;
|
||||
SERIAL_ERRORLNPGM("Temperature heated bed switched off. MINTEMP triggered !");
|
||||
lcd_setalertstatuspgm(err);
|
||||
temp_error_messagepgm(err);
|
||||
last_alert_sent_to_lcd = LCDALERT_BEDMINTEMP;
|
||||
} else if( last_alert_sent_to_lcd != LCDALERT_BEDMINTEMP ){ // only update, if the lcd message is to be changed (i.e. not the same as last time)
|
||||
// we are already stopped due to some error, only update the status message without flickering
|
||||
lcd_updatestatuspgm(err);
|
||||
temp_update_messagepgm(err);
|
||||
last_alert_sent_to_lcd = LCDALERT_BEDMINTEMP;
|
||||
}
|
||||
#ifndef BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
|
||||
|
@ -1511,6 +1585,33 @@ void bed_min_temp_error(void) {
|
|||
#endif
|
||||
}
|
||||
|
||||
|
||||
#ifdef AMBIENT_THERMISTOR
|
||||
void ambient_max_temp_error(void) {
|
||||
disable_heater();
|
||||
if(IsStopped() == false) {
|
||||
temp_error_messagepgm(PSTR("MAXTEMP AMB"));
|
||||
}
|
||||
#ifndef BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
|
||||
Stop();
|
||||
#endif
|
||||
}
|
||||
|
||||
void ambient_min_temp_error(void) {
|
||||
#ifdef DEBUG_DISABLE_MINTEMP
|
||||
return;
|
||||
#endif
|
||||
disable_heater();
|
||||
if(IsStopped() == false) {
|
||||
temp_error_messagepgm(PSTR("MINTEMP AMB"));
|
||||
}
|
||||
#ifndef BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
|
||||
Stop();
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef HEATER_0_USES_MAX6675
|
||||
#define MAX6675_HEAT_INTERVAL 250
|
||||
long max6675_previous_millis = MAX6675_HEAT_INTERVAL;
|
||||
|
@ -1587,7 +1688,7 @@ void adc_ready(void) //callback from adc when sampling finished
|
|||
#ifdef VOLT_BED_PIN
|
||||
current_voltage_raw_bed = adc_values[ADC_PIN_IDX(VOLT_BED_PIN)]; // 6->9
|
||||
#endif
|
||||
#if IR_SENSOR_ANALOG
|
||||
#ifdef IR_SENSOR_ANALOG
|
||||
current_voltage_raw_IR = adc_values[ADC_PIN_IDX(VOLT_IR_PIN)];
|
||||
#endif //IR_SENSOR_ANALOG
|
||||
temp_meas_ready = true;
|
||||
|
@ -1595,18 +1696,8 @@ void adc_ready(void) //callback from adc when sampling finished
|
|||
|
||||
} // extern "C"
|
||||
|
||||
// Timer2 (originaly timer0) is shared with millies
|
||||
#ifdef SYSTEM_TIMER_2
|
||||
ISR(TIMER2_COMPB_vect)
|
||||
#else //SYSTEM_TIMER_2
|
||||
ISR(TIMER0_COMPB_vect)
|
||||
#endif //SYSTEM_TIMER_2
|
||||
FORCE_INLINE static void temperature_isr()
|
||||
{
|
||||
static bool _lock = false;
|
||||
if (_lock) return;
|
||||
_lock = true;
|
||||
asm("sei");
|
||||
|
||||
if (!temp_meas_ready) adc_cycle();
|
||||
lcd_buttons_update();
|
||||
|
||||
|
@ -1972,8 +2063,24 @@ ISR(TIMER0_COMPB_vect)
|
|||
#if (defined(FANCHECK) && defined(TACH_0) && (TACH_0 > -1))
|
||||
check_fans();
|
||||
#endif //(defined(TACH_0))
|
||||
}
|
||||
|
||||
_lock = false;
|
||||
// Timer2 (originaly timer0) is shared with millies
|
||||
#ifdef SYSTEM_TIMER_2
|
||||
ISR(TIMER2_COMPB_vect)
|
||||
#else //SYSTEM_TIMER_2
|
||||
ISR(TIMER0_COMPB_vect)
|
||||
#endif //SYSTEM_TIMER_2
|
||||
{
|
||||
static bool _lock = false;
|
||||
if (!_lock)
|
||||
{
|
||||
_lock = true;
|
||||
sei();
|
||||
temperature_isr();
|
||||
cli();
|
||||
_lock = false;
|
||||
}
|
||||
}
|
||||
|
||||
void check_max_temp()
|
||||
|
@ -1993,15 +2100,25 @@ void check_max_temp()
|
|||
#else
|
||||
if (current_temperature_bed_raw >= bed_maxttemp_raw) {
|
||||
#endif
|
||||
target_temperature_bed = 0;
|
||||
bed_max_temp_error();
|
||||
}
|
||||
#endif
|
||||
|
||||
//ambient
|
||||
#if defined(AMBIENT_MAXTEMP) && (TEMP_SENSOR_AMBIENT != 0)
|
||||
#if AMBIENT_RAW_LO_TEMP > AMBIENT_RAW_HI_TEMP
|
||||
if (current_temperature_raw_ambient <= ambient_maxttemp_raw) {
|
||||
#else
|
||||
if (current_temperature_raw_ambient >= ambient_maxttemp_raw) {
|
||||
#endif
|
||||
ambient_max_temp_error();
|
||||
}
|
||||
#endif
|
||||
}
|
||||
//! number of repeating the same state with consecutive step() calls
|
||||
//! used to slow down text switching
|
||||
struct alert_automaton_mintemp {
|
||||
const char *m2;
|
||||
alert_automaton_mintemp(const char *m2):m2(m2){}
|
||||
private:
|
||||
enum { ALERT_AUTOMATON_SPEED_DIV = 5 };
|
||||
enum class States : uint8_t { Init = 0, TempAboveMintemp, ShowPleaseRestart, ShowMintemp };
|
||||
|
@ -2021,7 +2138,6 @@ public:
|
|||
//! @param current_temp current hotend/bed temperature (for computing simple hysteresis)
|
||||
//! @param mintemp minimal temperature including hysteresis to check current_temp against
|
||||
void step(float current_temp, float mintemp){
|
||||
static const char m2[] PROGMEM = "MINTEMP fixed";
|
||||
static const char m1[] PROGMEM = "Please restart";
|
||||
switch(state){
|
||||
case States::Init: // initial state - check hysteresis
|
||||
|
@ -2049,8 +2165,9 @@ public:
|
|||
}
|
||||
}
|
||||
};
|
||||
|
||||
static alert_automaton_mintemp alert_automaton_hotend, alert_automaton_bed;
|
||||
static const char m2hotend[] PROGMEM = "MINTEMP HOTEND fixed";
|
||||
static const char m2bed[] PROGMEM = "MINTEMP BED fixed";
|
||||
static alert_automaton_mintemp alert_automaton_hotend(m2hotend), alert_automaton_bed(m2bed);
|
||||
|
||||
void check_min_temp_heater0()
|
||||
{
|
||||
|
@ -2090,12 +2207,32 @@ void check_min_temp_bed()
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef AMBIENT_MINTEMP
|
||||
void check_min_temp_ambient()
|
||||
{
|
||||
#if AMBIENT_RAW_LO_TEMP > AMBIENT_RAW_HI_TEMP
|
||||
if (current_temperature_raw_ambient >= ambient_minttemp_raw) {
|
||||
#else
|
||||
if (current_temperature_raw_ambient <= ambient_minttemp_raw) {
|
||||
#endif
|
||||
ambient_min_temp_error();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
void check_min_temp()
|
||||
{
|
||||
static bool bCheckingOnHeater=false; // state variable, which allows to short no-checking delay (is set, when temperature is (first time) over heaterMintemp)
|
||||
static bool bCheckingOnBed=false; // state variable, which allows to short no-checking delay (is set, when temperature is (first time) over bedMintemp)
|
||||
#ifdef AMBIENT_THERMISTOR
|
||||
if(current_temperature_raw_ambient>(OVERSAMPLENR*MINTEMP_MINAMBIENT_RAW)) // thermistor is NTC type, so operator is ">" ;-)
|
||||
#ifdef AMBIENT_MINTEMP
|
||||
check_min_temp_ambient();
|
||||
#endif
|
||||
#if AMBIENT_RAW_LO_TEMP > AMBIENT_RAW_HI_TEMP
|
||||
if(current_temperature_raw_ambient>(OVERSAMPLENR*MINTEMP_MINAMBIENT_RAW)) // thermistor is NTC type
|
||||
#else
|
||||
if(current_temperature_raw_ambient=<(OVERSAMPLENR*MINTEMP_MINAMBIENT_RAW))
|
||||
#endif
|
||||
{ // ambient temperature is low
|
||||
#endif //AMBIENT_THERMISTOR
|
||||
// *** 'common' part of code for MK2.5 & MK3
|
||||
|
@ -2183,4 +2320,20 @@ float unscalePID_d(float d)
|
|||
|
||||
#endif //PIDTEMP
|
||||
|
||||
#ifdef PINDA_THERMISTOR
|
||||
//! @brief PINDA thermistor detected
|
||||
//!
|
||||
//! @retval true firmware should do temperature compensation and allow calibration
|
||||
//! @retval false PINDA thermistor is not detected, disable temperature compensation and calibration
|
||||
//!
|
||||
bool has_temperature_compensation()
|
||||
{
|
||||
#ifdef DETECT_SUPERPINDA
|
||||
return (current_temperature_pinda >= PINDA_MINTEMP) ? true : false;
|
||||
#else
|
||||
return true;
|
||||
#endif
|
||||
}
|
||||
#endif //PINDA_THERMISTOR
|
||||
|
||||
|
||||
|
|
|
@ -47,6 +47,8 @@
|
|||
void tp_init(); //initialize the heating
|
||||
void manage_heater(); //it is critical that this is called periodically.
|
||||
|
||||
extern bool checkAllHotends(void);
|
||||
|
||||
// low level conversion routines
|
||||
// do not use these routines and variables outside of temperature.cpp
|
||||
extern int target_temperature[EXTRUDERS];
|
||||
|
@ -61,6 +63,7 @@ extern float current_temperature_bed;
|
|||
#ifdef PINDA_THERMISTOR
|
||||
extern uint16_t current_temperature_raw_pinda;
|
||||
extern float current_temperature_pinda;
|
||||
bool has_temperature_compensation();
|
||||
#endif
|
||||
|
||||
#ifdef AMBIENT_THERMISTOR
|
||||
|
@ -76,14 +79,16 @@ extern int current_voltage_raw_pwr;
|
|||
extern int current_voltage_raw_bed;
|
||||
#endif
|
||||
|
||||
#if IR_SENSOR_ANALOG
|
||||
extern int current_voltage_raw_IR;
|
||||
#ifdef IR_SENSOR_ANALOG
|
||||
extern uint16_t current_voltage_raw_IR;
|
||||
#endif //IR_SENSOR_ANALOG
|
||||
|
||||
#if defined(CONTROLLERFAN_PIN) && CONTROLLERFAN_PIN > -1
|
||||
extern unsigned char soft_pwm_bed;
|
||||
#endif
|
||||
|
||||
extern bool bedPWMDisabled;
|
||||
|
||||
#ifdef PIDTEMP
|
||||
extern int pid_cycle, pid_number_of_cycles;
|
||||
extern float Kc,_Kp,_Ki,_Kd;
|
||||
|
@ -220,6 +225,9 @@ FORCE_INLINE bool isCoolingBed() {
|
|||
#error Invalid number of extruders
|
||||
#endif
|
||||
|
||||
// return "false", if all heaters are 'off' (ie. "true", if any heater is 'on')
|
||||
#define CHECK_ALL_HEATERS (checkAllHotends()||(target_temperature_bed!=0))
|
||||
|
||||
int getHeaterPower(int heater);
|
||||
void disable_heater();
|
||||
void updatePID();
|
||||
|
@ -238,7 +246,7 @@ FORCE_INLINE void autotempShutdown(){
|
|||
|
||||
void PID_autotune(float temp, int extruder, int ncycles);
|
||||
|
||||
void setExtruderAutoFanState(int pin, bool state);
|
||||
void setExtruderAutoFanState(uint8_t state);
|
||||
void checkExtruderAutoFans();
|
||||
|
||||
|
||||
|
@ -263,10 +271,14 @@ void check_fans();
|
|||
void check_min_temp();
|
||||
void check_max_temp();
|
||||
|
||||
|
||||
#endif
|
||||
#ifdef EXTRUDER_ALTFAN_DETECT
|
||||
extern bool extruder_altfan_detect();
|
||||
extern void altfanOverride_toggle();
|
||||
extern bool altfanOverride_get();
|
||||
#endif //EXTRUDER_ALTFAN_DETECT
|
||||
|
||||
extern unsigned long extruder_autofan_last_check;
|
||||
extern uint8_t fanSpeedBckp;
|
||||
extern bool fan_measuring;
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1213,6 +1213,8 @@ const short temptable_1047[][2] PROGMEM = {
|
|||
#endif
|
||||
|
||||
#if (THERMISTORAMBIENT == 2000) //100k thermistor NTCG104LH104JT1
|
||||
# define AMBIENT_RAW_HI_TEMP 0
|
||||
# define AMBIENT_RAW_LO_TEMP 16383
|
||||
const short temptable_2000[][2] PROGMEM = {
|
||||
// Source: https://product.tdk.com/info/en/catalog/datasheets/503021/tpd_ntc-thermistor_ntcg_en.pdf
|
||||
// Calculated using 4.7kohm pullup, voltage divider math, and manufacturer provided temp/resistance
|
||||
|
|
|
@ -136,14 +136,4 @@ void delay2(unsigned long ms)
|
|||
}
|
||||
}
|
||||
|
||||
void tone2(__attribute__((unused)) uint8_t _pin, __attribute__((unused)) unsigned int frequency/*, unsigned long duration*/)
|
||||
{
|
||||
PIN_SET(BEEPER);
|
||||
}
|
||||
|
||||
void noTone2(__attribute__((unused)) uint8_t _pin)
|
||||
{
|
||||
PIN_CLR(BEEPER);
|
||||
}
|
||||
|
||||
#endif //SYSTEM_TIMER_2
|
||||
|
|
|
@ -23,13 +23,6 @@ extern unsigned long micros2(void);
|
|||
///! Reimplemented original delay() using timer2
|
||||
extern void delay2(unsigned long ms);
|
||||
|
||||
///! Reimplemented original tone() using timer2
|
||||
///! Does not perform any PWM tone generation, it just sets the beeper pin to 1
|
||||
extern void tone2(uint8_t _pin, unsigned int frequency/*, unsigned long duration*/);
|
||||
|
||||
///! Turn off beeping - set beeper pin to 0
|
||||
extern void noTone2(uint8_t _pin);
|
||||
|
||||
#if defined(__cplusplus)
|
||||
}
|
||||
#endif //defined(__cplusplus)
|
||||
|
|
126
Firmware/tone04.c
Normal file
126
Firmware/tone04.c
Normal file
|
@ -0,0 +1,126 @@
|
|||
//tone04.c
|
||||
// use atmega timer4 as main tone timer instead of timer2
|
||||
// timer2 is used for System timer.
|
||||
|
||||
#include "system_timer.h"
|
||||
#include "Configuration_prusa.h"
|
||||
|
||||
#ifdef SYSTEM_TIMER_2
|
||||
|
||||
#include <avr/io.h>
|
||||
#include <avr/interrupt.h>
|
||||
#include "pins.h"
|
||||
|
||||
#ifndef CRITICAL_SECTION_START
|
||||
#define CRITICAL_SECTION_START unsigned char _sreg = SREG; cli();
|
||||
#define CRITICAL_SECTION_END SREG = _sreg;
|
||||
#endif //CRITICAL_SECTION_START
|
||||
|
||||
|
||||
#include "fastio.h"
|
||||
|
||||
void timer4_init(void)
|
||||
{
|
||||
CRITICAL_SECTION_START;
|
||||
|
||||
SET_OUTPUT(BEEPER);
|
||||
WRITE(BEEPER, LOW);
|
||||
|
||||
SET_OUTPUT(EXTRUDER_0_AUTO_FAN_PIN);
|
||||
|
||||
// Set timer mode 9 (PWM,Phase and Frequency Correct)
|
||||
// Prescaler is CLK/1024
|
||||
// Output compare is disabled on all timer pins
|
||||
// Input capture is disabled
|
||||
// All interrupts are disabled
|
||||
TCCR4A = (1 << WGM40);
|
||||
TCCR4B = (1 << WGM43) | (1 << CS42) | (1 << CS40);
|
||||
OCR4A = 255;
|
||||
OCR4B = 255;
|
||||
OCR4C = 255;
|
||||
TIMSK4 = 0;
|
||||
|
||||
CRITICAL_SECTION_END;
|
||||
}
|
||||
|
||||
#ifdef EXTRUDER_0_AUTO_FAN_PIN
|
||||
void timer4_set_fan0(uint8_t duty)
|
||||
{
|
||||
if (duty == 0 || duty == 255)
|
||||
{
|
||||
// We use digital logic if the duty cycle is 0% or 100%
|
||||
TCCR4A &= ~(1 << COM4C1);
|
||||
OCR4C = 0;
|
||||
WRITE(EXTRUDER_0_AUTO_FAN_PIN, duty);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Use the timer for fan speed. Enable the timer compare output and set the duty cycle.
|
||||
// This function also handles the impossible scenario of a fan speed change during a Tone.
|
||||
// Better be safe than sorry.
|
||||
CRITICAL_SECTION_START;
|
||||
// Enable the PWM output on the fan pin.
|
||||
TCCR4A |= (1 << COM4C1);
|
||||
OCR4C = (((uint32_t)duty) * ((uint32_t)((TIMSK4 & (1 << OCIE4A))?OCR4A:255))) / ((uint32_t)255);
|
||||
CRITICAL_SECTION_END;
|
||||
}
|
||||
}
|
||||
#endif //EXTRUDER_0_AUTO_FAN_PIN
|
||||
|
||||
// Because of the timer mode change, we need two interrupts. We could also try to assume that the frequency is x2
|
||||
// and use a TOGGLE(), but this seems to work well enough so I left it as it is now.
|
||||
ISR(TIMER4_COMPA_vect)
|
||||
{
|
||||
WRITE(BEEPER, 1);
|
||||
}
|
||||
|
||||
ISR(TIMER4_OVF_vect)
|
||||
{
|
||||
WRITE(BEEPER, 0);
|
||||
}
|
||||
|
||||
void tone4(__attribute__((unused)) uint8_t _pin, uint16_t frequency)
|
||||
{
|
||||
//this ocr and prescalarbits calculation is taken from the Arduino core and simplified for one type of timer only
|
||||
uint8_t prescalarbits = 0b001;
|
||||
uint32_t ocr = F_CPU / frequency / 2 - 1;
|
||||
|
||||
if (ocr > 0xffff)
|
||||
{
|
||||
ocr = F_CPU / frequency / 2 / 64 - 1;
|
||||
prescalarbits = 0b011;
|
||||
}
|
||||
|
||||
CRITICAL_SECTION_START;
|
||||
// Set calcualted prescaler
|
||||
TCCR4B = (TCCR4B & 0b11111000) | prescalarbits;
|
||||
#ifdef EXTRUDER_0_AUTO_FAN_PIN
|
||||
// Scale the fan PWM duty cycle so that it remains constant, but at the tone frequency
|
||||
OCR4C = (((uint32_t)OCR4C) * ocr) / (uint32_t)((TIMSK4 & (1 << OCIE4A))?OCR4A:255);
|
||||
#endif //EXTRUDER_0_AUTO_FAN_PIN
|
||||
// Set calcualted ocr
|
||||
OCR4A = ocr;
|
||||
// Enable Output compare A interrupt and timer overflow interrupt
|
||||
TIMSK4 |= (1 << OCIE4A) | (1 << TOIE4);
|
||||
CRITICAL_SECTION_END;
|
||||
}
|
||||
|
||||
void noTone4(__attribute__((unused)) uint8_t _pin)
|
||||
{
|
||||
CRITICAL_SECTION_START;
|
||||
// Revert prescaler to CLK/1024
|
||||
TCCR4B = (TCCR4B & 0b11111000) | (1 << CS42) | (1 << CS40);
|
||||
#ifdef EXTRUDER_0_AUTO_FAN_PIN
|
||||
// Scale the fan OCR back to the original value.
|
||||
OCR4C = (((uint32_t)OCR4C) * (uint32_t)255) / (uint32_t)((TIMSK4 & (1 << OCIE4A))?OCR4A:255);
|
||||
#endif //EXTRUDER_0_AUTO_FAN_PIN
|
||||
OCR4A = 255;
|
||||
// Disable Output compare A interrupt and timer overflow interrupt
|
||||
TIMSK4 &= ~((1 << OCIE4A) | (1 << TOIE4));
|
||||
CRITICAL_SECTION_END;
|
||||
// Turn beeper off if it was on when noTone was called
|
||||
WRITE(BEEPER, 0);
|
||||
}
|
||||
|
||||
|
||||
#endif //SYSTEM_TIMER_2
|
25
Firmware/tone04.h
Normal file
25
Firmware/tone04.h
Normal file
|
@ -0,0 +1,25 @@
|
|||
//tone04.h
|
||||
// use atmega timer4 as main tone timer instead of timer2
|
||||
// timer2 is used for System timer.
|
||||
#ifndef TIMER04_H
|
||||
#define TIMER04_H
|
||||
|
||||
#include <inttypes.h>
|
||||
|
||||
#if defined(__cplusplus)
|
||||
extern "C" {
|
||||
#endif //defined(__cplusplus)
|
||||
|
||||
extern void timer4_init(void);
|
||||
|
||||
extern void timer4_set_fan0(uint8_t duty);
|
||||
|
||||
extern void tone4(uint8_t _pin, uint16_t frequency);
|
||||
|
||||
extern void noTone4(uint8_t _pin);
|
||||
|
||||
#if defined(__cplusplus)
|
||||
}
|
||||
#endif //defined(__cplusplus)
|
||||
|
||||
#endif //TIMER02_H
|
File diff suppressed because it is too large
Load diff
|
@ -23,9 +23,11 @@ void lcd_setstatuspgm(const char* message);
|
|||
//! - always returns the display to the main status screen
|
||||
//! - always makes lcd_reset (which is slow and causes flicker)
|
||||
//! - does not update the message if there is already one (i.e. lcd_status_message_level > 0)
|
||||
void lcd_setalertstatus(const char* message);
|
||||
void lcd_setalertstatuspgm(const char* message);
|
||||
//! only update the alert message on the main status screen
|
||||
//! has no sideeffects, may be called multiple times
|
||||
void lcd_updatestatus(const char *message);
|
||||
void lcd_updatestatuspgm(const char *message);
|
||||
|
||||
void lcd_reset_alert_level();
|
||||
|
@ -55,8 +57,10 @@ extern bool lcd_selftest();
|
|||
|
||||
void lcd_menu_statistics();
|
||||
|
||||
void lcd_status_screen(); // NOT static due to using inside "Marlin_main" module ("manage_inactivity()")
|
||||
void lcd_menu_extruder_info(); // NOT static due to using inside "Marlin_main" module ("manage_inactivity()")
|
||||
void lcd_menu_show_sensors_state(); // NOT static due to using inside "Marlin_main" module ("manage_inactivity()")
|
||||
|
||||
#ifdef TMC2130
|
||||
bool lcd_crash_detect_enabled();
|
||||
void lcd_crash_detect_enable();
|
||||
|
@ -138,6 +142,11 @@ extern uint8_t farm_status;
|
|||
#define SILENT_MODE_OFF SILENT_MODE_POWER
|
||||
#endif
|
||||
|
||||
#ifdef IR_SENSOR_ANALOG
|
||||
extern bool bMenuFSDetect;
|
||||
void printf_IRSensorAnalogBoardChange();
|
||||
#endif //IR_SENSOR_ANALOG
|
||||
|
||||
extern int8_t SilentModeMenu;
|
||||
extern uint8_t SilentModeMenu_MMU;
|
||||
|
||||
|
@ -250,12 +259,7 @@ enum class WizState : uint8_t
|
|||
|
||||
void lcd_wizard(WizState state);
|
||||
|
||||
#define VOLT_DIV_REF 5
|
||||
#if IR_SENSOR_ANALOG
|
||||
#define IRsensor_Hmin_TRESHOLD (3.0*1023*OVERSAMPLENR/VOLT_DIV_REF) // ~3.0V (0.6*Vcc)
|
||||
#define IRsensor_Lmax_TRESHOLD (1.5*1023*OVERSAMPLENR/VOLT_DIV_REF) // ~1.5V (0.3*Vcc)
|
||||
#define IRsensor_Hopen_TRESHOLD (4.6*1023*OVERSAMPLENR/VOLT_DIV_REF) // ~4.6V (N.C. @ Ru~20-50k, Rd'=56k, Ru'=10k)
|
||||
#define IRsensor_Ldiode_TRESHOLD (0.3*1023*OVERSAMPLENR/VOLT_DIV_REF) // ~0.3V
|
||||
#endif //IR_SENSOR_ANALOG
|
||||
extern void lcd_experimental_toggle();
|
||||
extern void lcd_experimental_menu();
|
||||
|
||||
#endif //ULTRALCD_H
|
||||
|
|
|
@ -330,6 +330,10 @@ PREHEAT SETTINGS
|
|||
#define ASA_PREHEAT_HPB_TEMP 105
|
||||
#define ASA_PREHEAT_FAN_SPEED 0
|
||||
|
||||
#define PC_PREHEAT_HOTEND_TEMP 275
|
||||
#define PC_PREHEAT_HPB_TEMP 105
|
||||
#define PC_PREHEAT_FAN_SPEED 0
|
||||
|
||||
#define ABS_PREHEAT_HOTEND_TEMP 255
|
||||
#define ABS_PREHEAT_HPB_TEMP 100
|
||||
#define ABS_PREHEAT_FAN_SPEED 0
|
||||
|
|
|
@ -326,6 +326,9 @@ PREHEAT SETTINGS
|
|||
#define ASA_PREHEAT_HOTEND_TEMP 260
|
||||
#define ASA_PREHEAT_HPB_TEMP 105
|
||||
|
||||
#define PC_PREHEAT_HOTEND_TEMP 275
|
||||
#define PC_PREHEAT_HPB_TEMP 105
|
||||
|
||||
#define ABS_PREHEAT_HOTEND_TEMP 255
|
||||
#define ABS_PREHEAT_HPB_TEMP 100
|
||||
|
||||
|
|
|
@ -384,6 +384,9 @@
|
|||
#define ASA_PREHEAT_HOTEND_TEMP 260
|
||||
#define ASA_PREHEAT_HPB_TEMP 105
|
||||
|
||||
#define PC_PREHEAT_HOTEND_TEMP 275
|
||||
#define PC_PREHEAT_HPB_TEMP 105
|
||||
|
||||
#define ABS_PREHEAT_HOTEND_TEMP 255
|
||||
#define ABS_PREHEAT_HPB_TEMP 100
|
||||
|
||||
|
@ -504,7 +507,7 @@
|
|||
#define MMU_REQUIRED_FW_BUILDNR 132
|
||||
#define MMU_FORCE_STEALTH_MODE
|
||||
#define MMU_DEBUG //print communication between MMU2 and printer on serial
|
||||
//#define MMU_HAS_CUTTER
|
||||
#define MMU_HAS_CUTTER
|
||||
|
||||
#define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning
|
||||
|
||||
|
|
|
@ -385,6 +385,9 @@
|
|||
#define ASA_PREHEAT_HOTEND_TEMP 260
|
||||
#define ASA_PREHEAT_HPB_TEMP 105
|
||||
|
||||
#define PC_PREHEAT_HOTEND_TEMP 275
|
||||
#define PC_PREHEAT_HPB_TEMP 105
|
||||
|
||||
#define ABS_PREHEAT_HOTEND_TEMP 255
|
||||
#define ABS_PREHEAT_HPB_TEMP 100
|
||||
|
||||
|
@ -505,7 +508,7 @@
|
|||
#define MMU_REQUIRED_FW_BUILDNR 132
|
||||
#define MMU_FORCE_STEALTH_MODE
|
||||
#define MMU_DEBUG //print communication between MMU2 and printer on serial
|
||||
//#define MMU_HAS_CUTTER
|
||||
#define MMU_HAS_CUTTER
|
||||
|
||||
#define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning
|
||||
|
||||
|
|
|
@ -384,6 +384,9 @@
|
|||
#define ASA_PREHEAT_HOTEND_TEMP 260
|
||||
#define ASA_PREHEAT_HPB_TEMP 105
|
||||
|
||||
#define PC_PREHEAT_HOTEND_TEMP 275
|
||||
#define PC_PREHEAT_HPB_TEMP 105
|
||||
|
||||
#define ABS_PREHEAT_HOTEND_TEMP 255
|
||||
#define ABS_PREHEAT_HPB_TEMP 100
|
||||
|
||||
|
@ -504,7 +507,7 @@
|
|||
#define MMU_REQUIRED_FW_BUILDNR 132
|
||||
#define MMU_FORCE_STEALTH_MODE
|
||||
#define MMU_DEBUG //print communication between MMU2 and printer on serial
|
||||
//#define MMU_HAS_CUTTER
|
||||
#define MMU_HAS_CUTTER
|
||||
|
||||
// This is experimental feature requested by our test department.
|
||||
// There is no known use for ordinary user. If enabled by this macro
|
||||
|
|
|
@ -385,6 +385,9 @@
|
|||
#define ASA_PREHEAT_HOTEND_TEMP 260
|
||||
#define ASA_PREHEAT_HPB_TEMP 105
|
||||
|
||||
#define PC_PREHEAT_HOTEND_TEMP 275
|
||||
#define PC_PREHEAT_HPB_TEMP 105
|
||||
|
||||
#define ABS_PREHEAT_HOTEND_TEMP 255
|
||||
#define ABS_PREHEAT_HPB_TEMP 100
|
||||
|
||||
|
@ -505,7 +508,7 @@
|
|||
#define MMU_REQUIRED_FW_BUILDNR 132
|
||||
#define MMU_FORCE_STEALTH_MODE
|
||||
#define MMU_DEBUG //print communication between MMU2 and printer on serial
|
||||
//#define MMU_HAS_CUTTER
|
||||
#define MMU_HAS_CUTTER
|
||||
|
||||
// This is experimental feature requested by our test department.
|
||||
// There is no known use for ordinary user. If enabled by this macro
|
||||
|
|
|
@ -151,8 +151,8 @@
|
|||
// this value is litlebit higher that real limit, because ambient termistor is on the board and is temperated from it,
|
||||
// temperature inside the case is around 31C for ambient temperature 25C, when the printer is powered on long time and idle
|
||||
// the real limit is 15C (same as MINTEMP limit), this is because 15C is end of scale for both used thermistors (bed, heater)
|
||||
#define MINTEMP_MINAMBIENT 25
|
||||
#define MINTEMP_MINAMBIENT_RAW 978
|
||||
#define MINTEMP_MINAMBIENT 10
|
||||
#define MINTEMP_MINAMBIENT_RAW 1002
|
||||
|
||||
#define DEBUG_DCODE3
|
||||
|
||||
|
@ -282,18 +282,21 @@
|
|||
*------------------------------------*/
|
||||
|
||||
// Mintemps
|
||||
#define HEATER_0_MINTEMP 15
|
||||
#define HEATER_0_MINTEMP 10
|
||||
#define HEATER_1_MINTEMP 5
|
||||
#define HEATER_2_MINTEMP 5
|
||||
#define HEATER_MINTEMP_DELAY 15000 // [ms] ! if changed, check maximal allowed value @ ShortTimer
|
||||
#if HEATER_MINTEMP_DELAY>USHRT_MAX
|
||||
#error "Check maximal allowed value @ ShortTimer (see HEATER_MINTEMP_DELAY definition)"
|
||||
#endif
|
||||
#define BED_MINTEMP 15
|
||||
#define BED_MINTEMP 10
|
||||
#define BED_MINTEMP_DELAY 50000 // [ms] ! if changed, check maximal allowed value @ ShortTimer
|
||||
#if BED_MINTEMP_DELAY>USHRT_MAX
|
||||
#error "Check maximal allowed value @ ShortTimer (see BED_MINTEMP_DELAY definition)"
|
||||
#endif
|
||||
#define DETECT_SUPERPINDA
|
||||
#define PINDA_MINTEMP BED_MINTEMP
|
||||
#define AMBIENT_MINTEMP -30
|
||||
|
||||
// Maxtemps
|
||||
#if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP)
|
||||
|
@ -304,6 +307,7 @@
|
|||
#define HEATER_1_MAXTEMP 305
|
||||
#define HEATER_2_MAXTEMP 305
|
||||
#define BED_MAXTEMP 125
|
||||
#define AMBIENT_MAXTEMP 100
|
||||
|
||||
#if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP)
|
||||
// Define PID constants for extruder with PT100
|
||||
|
@ -496,6 +500,9 @@
|
|||
#define ASA_PREHEAT_HOTEND_TEMP 260
|
||||
#define ASA_PREHEAT_HPB_TEMP 105
|
||||
|
||||
#define PC_PREHEAT_HOTEND_TEMP 275
|
||||
#define PC_PREHEAT_HPB_TEMP 110
|
||||
|
||||
#define ABS_PREHEAT_HOTEND_TEMP 255
|
||||
#define ABS_PREHEAT_HPB_TEMP 100
|
||||
|
||||
|
@ -618,6 +625,10 @@
|
|||
// The following example, 12 * (4 * 16 / 400) = 12 * 0.16mm = 1.92mm.
|
||||
//#define UVLO_Z_AXIS_SHIFT 1.92
|
||||
#define UVLO_Z_AXIS_SHIFT 0.64
|
||||
// When powered off during PP recovery, the Z axis position can still be re-adjusted. In this case
|
||||
// we just need to shift to the nearest fullstep, but we need a move which is at least
|
||||
// "dropsegments" steps long. All the above rules still need to apply.
|
||||
#define UVLO_TINY_Z_AXIS_SHIFT 0.16
|
||||
// If power panic occured, and the current temperature is higher then target temperature before interrupt minus this offset, print will be recovered automatically.
|
||||
#define AUTOMATIC_UVLO_BED_TEMP_OFFSET 5
|
||||
|
||||
|
@ -630,7 +641,7 @@
|
|||
#define MMU_REQUIRED_FW_BUILDNR 83
|
||||
#define MMU_HWRESET
|
||||
#define MMU_DEBUG //print communication between MMU2 and printer on serial
|
||||
//#define MMU_HAS_CUTTER
|
||||
#define MMU_HAS_CUTTER
|
||||
#define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning
|
||||
|
||||
#endif //__CONFIGURATION_PRUSA_H
|
||||
|
|
|
@ -153,8 +153,8 @@
|
|||
// this value is litlebit higher that real limit, because ambient termistor is on the board and is temperated from it,
|
||||
// temperature inside the case is around 31C for ambient temperature 25C, when the printer is powered on long time and idle
|
||||
// the real limit is 15C (same as MINTEMP limit), this is because 15C is end of scale for both used thermistors (bed, heater)
|
||||
#define MINTEMP_MINAMBIENT 25
|
||||
#define MINTEMP_MINAMBIENT_RAW 978
|
||||
#define MINTEMP_MINAMBIENT 10
|
||||
#define MINTEMP_MINAMBIENT_RAW 1002
|
||||
|
||||
#define DEBUG_DCODE3
|
||||
|
||||
|
@ -284,18 +284,21 @@
|
|||
*------------------------------------*/
|
||||
|
||||
// Mintemps
|
||||
#define HEATER_0_MINTEMP 15
|
||||
#define HEATER_0_MINTEMP 10
|
||||
#define HEATER_1_MINTEMP 5
|
||||
#define HEATER_2_MINTEMP 5
|
||||
#define HEATER_MINTEMP_DELAY 15000 // [ms] ! if changed, check maximal allowed value @ ShortTimer
|
||||
#if HEATER_MINTEMP_DELAY>USHRT_MAX
|
||||
#error "Check maximal allowed value @ ShortTimer (see HEATER_MINTEMP_DELAY definition)"
|
||||
#endif
|
||||
#define BED_MINTEMP 15
|
||||
#define BED_MINTEMP 10
|
||||
#define BED_MINTEMP_DELAY 50000 // [ms] ! if changed, check maximal allowed value @ ShortTimer
|
||||
#if BED_MINTEMP_DELAY>USHRT_MAX
|
||||
#error "Check maximal allowed value @ ShortTimer (see BED_MINTEMP_DELAY definition)"
|
||||
#endif
|
||||
#define DETECT_SUPERPINDA
|
||||
#define PINDA_MINTEMP BED_MINTEMP
|
||||
#define AMBIENT_MINTEMP -30
|
||||
|
||||
// Maxtemps
|
||||
#if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP)
|
||||
|
@ -306,6 +309,7 @@
|
|||
#define HEATER_1_MAXTEMP 305
|
||||
#define HEATER_2_MAXTEMP 305
|
||||
#define BED_MAXTEMP 125
|
||||
#define AMBIENT_MAXTEMP 100
|
||||
|
||||
#if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP)
|
||||
// Define PID constants for extruder with PT100
|
||||
|
@ -331,6 +335,8 @@
|
|||
#define EXTRUDER_2_AUTO_FAN_PIN -1
|
||||
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
|
||||
#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed
|
||||
#define EXTRUDER_ALTFAN_DETECT
|
||||
#define EXTRUDER_ALTFAN_SPEED_SILENT 128
|
||||
|
||||
|
||||
|
||||
|
@ -498,6 +504,9 @@
|
|||
#define ASA_PREHEAT_HOTEND_TEMP 260
|
||||
#define ASA_PREHEAT_HPB_TEMP 105
|
||||
|
||||
#define PC_PREHEAT_HOTEND_TEMP 275
|
||||
#define PC_PREHEAT_HPB_TEMP 110
|
||||
|
||||
#define ABS_PREHEAT_HOTEND_TEMP 255
|
||||
#define ABS_PREHEAT_HPB_TEMP 100
|
||||
|
||||
|
@ -620,7 +629,11 @@
|
|||
// The following example, 12 * (4 * 16 / 400) = 12 * 0.16mm = 1.92mm.
|
||||
//#define UVLO_Z_AXIS_SHIFT 1.92
|
||||
#define UVLO_Z_AXIS_SHIFT 0.64
|
||||
// If power panic occured, and the current temperature is higher then target temperature before interrupt minus this offset, print will be recovered automatically.
|
||||
// When powered off during PP recovery, the Z axis position can still be re-adjusted. In this case
|
||||
// we just need to shift to the nearest fullstep, but we need a move which is at least
|
||||
// "dropsegments" steps long. All the above rules still need to apply.
|
||||
#define UVLO_TINY_Z_AXIS_SHIFT 0.16
|
||||
// If power panic occured, and the current temperature is higher then target temperature before interrupt minus this offset, print will be recovered automatically.
|
||||
#define AUTOMATIC_UVLO_BED_TEMP_OFFSET 5
|
||||
|
||||
#define HEATBED_V2
|
||||
|
@ -632,7 +645,7 @@
|
|||
#define MMU_REQUIRED_FW_BUILDNR 83
|
||||
#define MMU_HWRESET
|
||||
#define MMU_DEBUG //print communication between MMU2 and printer on serial
|
||||
//#define MMU_HAS_CUTTER
|
||||
#define MMU_HAS_CUTTER
|
||||
|
||||
// This is experimental feature requested by our test department.
|
||||
// There is no known use for ordinary user. If enabled by this macro
|
||||
|
|
57
PF-build.sh
57
PF-build.sh
|
@ -56,7 +56,7 @@
|
|||
# Some may argue that this is only used by a script, BUT as soon someone accidentally or on purpose starts Arduino IDE
|
||||
# it will use the default Arduino IDE folders and so can corrupt the build environment.
|
||||
#
|
||||
# Version: 1.0.6-Build_10
|
||||
# Version: 1.0.6-Build_18
|
||||
# Change log:
|
||||
# 12 Jan 2019, 3d-gussner, Fixed "compiler.c.elf.flags=-w -Os -Wl,-u,vfprintf -lprintf_flt -lm -Wl,--gc-sections" in 'platform.txt'
|
||||
# 16 Jan 2019, 3d-gussner, Build_2, Added development check to modify 'Configuration.h' to prevent unwanted LCD messages that Firmware is unknown
|
||||
|
@ -114,7 +114,16 @@
|
|||
# 26 Jul 2019, 3d-gussner, Change JSON repository to prusa3d after PR https://github.com/prusa3d/Arduino_Boards/pull/1 was merged
|
||||
# 23 Sep 2019, 3d-gussner, Prepare PF-build.sh for comming Prusa3d/Arduino_Boards version 1.0.2 Pull Request
|
||||
# 17 Oct 2019, 3d-gussner, Changed folder and check file names to have seperated build enviroments depening on Arduino IDE version and
|
||||
# board-versions.
|
||||
# board-versions.
|
||||
# 15 Dec 2019, 3d-gussner, Prepare for switch to Prusa3d/PF-build-env repository
|
||||
# 15 Dec 2019, 3d-gussner, Fix Audrino user preferences for the chosen board.
|
||||
# 17 Dec 2019, 3d-gussner, Fix "timer0_fract = 0" warning by using Arduino_boards v1.0.3
|
||||
# 28 Apr 2020, 3d-gussner, Added RC3 detection
|
||||
# 03 May 2020, deliopoulos, Accept all RCx as RC versions
|
||||
# 05 May 2020, 3d-gussner, Make a copy of `not_tran.txt`and `not_used.txt` as `not_tran_$VARIANT.txt`and `not_used_$VARIANT.txt`
|
||||
# After compiling All multilanguage vairants it makes it easier to find missing or unused transltions.
|
||||
# 12 May 2020, DRracer , Cleanup double MK2/s MK25/s `not_tran` and `not_used` files
|
||||
# 13 May 2020, leptun , If cleanup files do not exist don't try to.
|
||||
#### Start check if OSTYPE is supported
|
||||
OS_FOUND=$( command -v uname)
|
||||
|
||||
|
@ -207,19 +216,22 @@ if ! type python > /dev/null; then
|
|||
fi
|
||||
fi
|
||||
|
||||
#### End prepare bash environment
|
||||
#### End prepare bash / Linux environment
|
||||
|
||||
|
||||
#### Set build environment
|
||||
ARDUINO_ENV="1.8.5"
|
||||
BUILD_ENV="1.0.6"
|
||||
BOARD="rambo"
|
||||
BOARD_PACKAGE_NAME="PrusaResearchRambo"
|
||||
BOARD_VERSION="1.0.1"
|
||||
BOARD="prusa_einsy_rambo"
|
||||
BOARD_PACKAGE_NAME="PrusaResearch"
|
||||
BOARD_VERSION="1.0.3"
|
||||
#BOARD_URL="https://raw.githubusercontent.com/3d-gussner/Arduino_Boards/Prusa_Merge_v1.0.3/IDE_Board_Manager/package_prusa3d_index.json"
|
||||
BOARD_URL="https://raw.githubusercontent.com/prusa3d/Arduino_Boards/master/IDE_Board_Manager/package_prusa3d_index.json"
|
||||
BOARD_FILENAME="prusa3drambo"
|
||||
BOARD_FILE_URL="https://raw.githubusercontent.com/prusa3d/Arduino_Boards/master/IDE_Board_Manager/prusa3drambo-1.0.1.tar.bz2"
|
||||
PF_BUILD_FILE_URL="https://github.com/3d-gussner/PF-build-env/releases/download/$BUILD_ENV/PF-build-env-$BUILD_ENV.zip"
|
||||
BOARD_FILENAME="prusa3dboards"
|
||||
#BOARD_FILE_URL="https://raw.githubusercontent.com/3d-gussner/Arduino_Boards/Prusa_Merge_v1.0.3/IDE_Board_Manager/prusa3dboards-1.0.3.tar.bz2"
|
||||
BOARD_FILE_URL="https://raw.githubusercontent.com/prusa3d/Arduino_Boards/master/IDE_Board_Manager/prusa3dboards-1.0.3.tar.bz2"
|
||||
#PF_BUILD_FILE_URL="https://github.com/3d-gussner/PF-build-env-1/releases/download/$BUILD_ENV-WinLin/PF-build-env-WinLin-$BUILD_ENV.zip"
|
||||
PF_BUILD_FILE_URL="https://github.com/prusa3d/PF-build-env/releases/download/$BUILD_ENV-WinLin/PF-build-env-WinLin-$BUILD_ENV.zip"
|
||||
LIB="PrusaLibrary"
|
||||
SCRIPT_PATH="$( cd "$(dirname "$0")" ; pwd -P )"
|
||||
|
||||
|
@ -233,6 +245,7 @@ echo "Ardunio IDE :" $ARDUINO_ENV
|
|||
echo "Build env :" $BUILD_ENV
|
||||
echo "Board :" $BOARD
|
||||
echo "Package name:" $BOARD_PACKAGE_NAME
|
||||
echo "Board v. :" $BOARD_VERSION
|
||||
echo "Specific Lib:" $LIB
|
||||
echo ""
|
||||
|
||||
|
@ -321,7 +334,7 @@ if [ ! -e ../PF-build-env-$BUILD_ENV/Preferences-$ARDUINO_ENV-$BOARD_VERSION-$TA
|
|||
echo "update.check"
|
||||
sed -i 's/update.check = true/update.check = false/g' ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/lib/preferences.txt
|
||||
echo "board"
|
||||
sed -i 's/board = uno/board = $BOARD/g' ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/lib/preferences.txt
|
||||
sed -i "s/board = uno/board = $BOARD/g" ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/lib/preferences.txt
|
||||
echo "editor.linenumbers"
|
||||
sed -i 's/editor.linenumbers = false/editor.linenumbers = true/g' ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor/lib/preferences.txt
|
||||
echo "boardsmanager.additional.urls"
|
||||
|
@ -364,7 +377,7 @@ if [[ ! -d "../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$P
|
|||
fi
|
||||
|
||||
# Download and extract Prusa Firmware specific library files
|
||||
if [ ! -f "PF-build-env-$BUILD_ENV.zip" ]; then
|
||||
if [ ! -f "PF-build-env-WinLin-$BUILD_ENV.zip" ]; then
|
||||
echo "$(tput setaf 6)Downloading Prusa Firmware build environment...$(tput setaf 2)"
|
||||
sleep 2
|
||||
wget $PF_BUILD_FILE_URL || exit 11
|
||||
|
@ -373,7 +386,7 @@ fi
|
|||
if [ ! -e "../PF-build-env-$BUILD_ENV/PF-build-env-$BUILD_ENV-$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor.txt" ]; then
|
||||
echo "$(tput setaf 6)Unzipping Prusa Firmware build environment...$(tput setaf 2)"
|
||||
sleep 2
|
||||
unzip -o PF-build-env-$BUILD_ENV.zip -d ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor || exit 12
|
||||
unzip -o PF-build-env-WinLin-$BUILD_ENV.zip -d ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor || exit 12
|
||||
echo "# PF-build-env-$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor-$BUILD_ENV" >> ../PF-build-env-$BUILD_ENV/PF-build-env-$BUILD_ENV-$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor.txt
|
||||
echo "$(tput sgr0)"
|
||||
fi
|
||||
|
@ -520,7 +533,7 @@ do
|
|||
# Check development status
|
||||
DEV_CHECK=$(grep --max-count=1 "\bFW_VERSION\b" $SCRIPT_PATH/Firmware/Configuration.h | sed -e's/ */ /g'|cut -d '"' -f2|sed 's/\.//g'|cut -d '-' -f2)
|
||||
if [ -z "$DEV_STATUS_SELECTED" ] ; then
|
||||
if [[ "$DEV_CHECK" == "RC1" || "$DEV_CHECK" == "RC2" ]] ; then
|
||||
if [[ "$DEV_CHECK" == *"RC"* ]] ; then
|
||||
DEV_STATUS="RC"
|
||||
elif [[ "$DEV_CHECK" == "ALPHA" ]]; then
|
||||
DEV_STATUS="ALPHA"
|
||||
|
@ -675,6 +688,8 @@ do
|
|||
./lang-build.sh || exit 32
|
||||
# Combine compiled firmware with languages
|
||||
./fw-build.sh || exit 33
|
||||
cp not_tran.txt not_tran_$VARIANT.txt
|
||||
cp not_used.txt not_used_$VARIANT.txt
|
||||
echo "$(tput sgr 0)"
|
||||
# Check if the motherboard is an EINSY and if so only one hex file will generated
|
||||
MOTHERBOARD=$(grep --max-count=1 "\bMOTHERBOARD\b" $SCRIPT_PATH/Firmware/variants/$VARIANT.h | sed -e's/ */ /g' |cut -d ' ' -f3)
|
||||
|
@ -709,6 +724,22 @@ do
|
|||
|
||||
# Cleanup Firmware
|
||||
rm $SCRIPT_PATH/Firmware/Configuration_prusa.h || exit 36
|
||||
if find $SCRIPT_PATH/lang/ -name '*RAMBo10a*.txt' -printf 1 -quit | grep -q 1
|
||||
then
|
||||
rm $SCRIPT_PATH/lang/*RAMBo10a*.txt
|
||||
fi
|
||||
if find $SCRIPT_PATH/lang/ -name '*MK2-RAMBo13a*' -printf 1 -quit | grep -q 1
|
||||
then
|
||||
rm $SCRIPT_PATH/lang/*MK2-RAMBo13a*.txt
|
||||
fi
|
||||
if find $SCRIPT_PATH/lang/ -name 'not_tran.txt' -printf 1 -quit | grep -q 1
|
||||
then
|
||||
rm $SCRIPT_PATH/lang/not_tran.txt
|
||||
fi
|
||||
if find $SCRIPT_PATH/lang/ -name 'not_used.txt' -printf 1 -quit | grep -q 1
|
||||
then
|
||||
rm $SCRIPT_PATH/lang/not_used.txt
|
||||
fi
|
||||
sed -i -- "s/^#define FW_DEV_VERSION FW_VERSION_$DEV_STATUS/#define FW_DEV_VERSION FW_VERSION_UNKNOWN/g" $SCRIPT_PATH/Firmware/Configuration.h
|
||||
sed -i -- 's/^#define FW_REPOSITORY "Prusa3d"/#define FW_REPOSITORY "Unknown"/g' $SCRIPT_PATH/Firmware/Configuration.h
|
||||
echo $MULTI_LANGUAGE_CHECK
|
||||
|
|
419
README.md
419
README.md
|
@ -1,198 +1,221 @@
|
|||
# Table of contents
|
||||
|
||||
<!--ts-->
|
||||
* [Linux build](#linux)
|
||||
* Windows build
|
||||
* [Using Arduino](#using-arduino)
|
||||
* [Using Linux subsystem](#using-linux-subsystem-under-windows-10-64-bit)
|
||||
* [Using Git-bash](#using-git-bash-under-windows-10-64-bit)
|
||||
* [Automated tests](#3-automated-tests)
|
||||
* [Documentation](#4-documentation)
|
||||
* [FAQ](#5-faq)
|
||||
<!--te-->
|
||||
|
||||
|
||||
# Build
|
||||
## Linux
|
||||
|
||||
1. Clone this repository and checkout the correct branch for your desired release version.
|
||||
|
||||
2. Set your printer model.
|
||||
- For MK3 --> skip to step 3.
|
||||
- If you have a different printer model, follow step [2.b](#2b) from Windows build
|
||||
|
||||
3. Run `sudo ./build.sh`
|
||||
- Output hex file is at `"PrusaFirmware/lang/firmware.hex"` . In the same folder you can hex files for other languages as well.
|
||||
|
||||
4. Connect your printer and flash with PrusaSlicer ( Configuration --> Flash printer firmware ) or Slic3r PE.
|
||||
- If you wish to flash from Arduino, follow step [2.c](#2c) from Windows build first.
|
||||
|
||||
|
||||
_Notes:_
|
||||
|
||||
The script downloads Arduino with our modifications and Rambo board support installed, unpacks it into folder `PF-build-env-\<version\>` on the same level, as your Prusa-Firmware folder is located, builds firmware for MK3 using that Arduino in Prusa-Firmware-build folder on the same level as Prusa-Firmware, runs secondary language support scripts. Firmware with secondary language support is generated in lang subfolder. Use firmware.hex for MK3 variant. Use `firmware_\<lang\>.hex` for other printers. Don't forget to follow step [2.b](#2b) first for non-MK3 printers.
|
||||
|
||||
## Windows
|
||||
### Using Arduino
|
||||
_Note: Multi language build is not supported._
|
||||
|
||||
#### 1. Development environment preparation
|
||||
|
||||
**a.** Install `"Arduino Software IDE"` from the official website `https://www.arduino.cc -> Software->Downloads`
|
||||
|
||||
_It is recommended to use version `"1.8.5"`, as it is used on out build server to produce official builds._
|
||||
|
||||
**b.** Setup Arduino to use Prusa Rambo board definition
|
||||
|
||||
* Open Arduino and navigate to File -> Preferences -> Settings
|
||||
* To the text field `"Additional Boards Manager URLSs"` add `https://raw.githubusercontent.com/prusa3d/Arduino_Boards/master/IDE_Board_Manager/package_prusa3d_index.json`
|
||||
* Open Board manager (`Tools->Board->Board manager`), and install `Prusa Research AVR MK3 RAMBo EINSy board`
|
||||
|
||||
**c.** Modify compiler flags in `platform.txt` file
|
||||
|
||||
* The platform.txt file can be found in Arduino instalation directory, or after Arduino has been updated at: `"C:\Users\(user)\AppData\Local\Arduino15\packages\arduino\hardware\avr\(version)"` If you can locate the file in both places, file from user profile is probably used.
|
||||
|
||||
* Add `"-Wl,-u,vfprintf -lprintf_flt -lm"` to `"compiler.c.elf.flags="` before existing flag "-Wl,--gc-sections"
|
||||
|
||||
For example: `"compiler.c.elf.flags=-w -Os -Wl,-u,vfprintf -lprintf_flt -lm -Wl,--gc-sections"`
|
||||
|
||||
_Notes:_
|
||||
|
||||
|
||||
_In the case of persistent compilation problems, check the version of the currently used C/C++ compiler (GCC) - should be at leas `4.8.1`;
|
||||
If you are not sure where the file is placed (depends on how `"Arduino Software IDE"` was installed), you can use the search feature within the file system_
|
||||
|
||||
_Name collision for `"LiquidCrystal"` library known from previous versions is now obsolete (so there is no need to delete or rename original file/-s)_
|
||||
|
||||
#### 2. Source code compilation
|
||||
|
||||
**a.** Clone this repository`https://github.com/prusa3d/Prusa-Firmware/` to your local drive.
|
||||
|
||||
**b.**<a name="2b"></a> In the subdirectory `"Firmware/variants/"` select the configuration file (`.h`) corresponding to your printer model, make copy named `"Configuration_prusa.h"` (or make simple renaming) and copy it into `"Firmware/"` directory.
|
||||
|
||||
**c.**<a name="2c"></a> In file `"Firmware/config.h"` set LANG_MODE to 0.
|
||||
|
||||
**d.** Run `"Arduino IDE"`; select the file `"Firmware.ino"` from the subdirectory `"Firmware/"` at the location, where you placed the source code `File->Open` Make the desired code customizations; **all changes are on your own risk!**
|
||||
|
||||
**e.** Select the target board `"Tools->Board->PrusaResearch Einsy RAMBo"`
|
||||
|
||||
**f.** Run the compilation `Sketch->Verify/Compile`
|
||||
|
||||
**g.** Upload the result code into the connected printer `Sketch->Upload`
|
||||
|
||||
* or you can also save the output code to the file (in so called `HEX`-format) `"Firmware.ino.rambo.hex"`: `Sketch->ExportCompiledBinary` and then upload it to the printer using the program `"FirmwareUpdater"`
|
||||
_note: this file is created in the directory `"Firmware/"`_
|
||||
|
||||
### Using Linux subsystem under Windows 10 64-bit
|
||||
_notes: Script and instructions contributed by 3d-gussner. Use at your own risk. Script downloads Arduino executables outside of Prusa control. Report problems [there.](https://github.com/3d-gussner/Prusa-Firmware/issues) Multi language build is supported._
|
||||
- follow the Microsoft guide https://docs.microsoft.com/en-us/windows/wsl/install-win10
|
||||
You can also use the 'prepare_winbuild.ps1' powershell script with Administrator rights
|
||||
- Tested versions are at this moment
|
||||
- Ubuntu other may different
|
||||
- After the installation and reboot please open your Ubuntu bash and do following steps
|
||||
- run command `apt-get update`
|
||||
- to install zip run `apt-get install zip`
|
||||
- add few lines at the top of `~/.bashrc` by running `sudo nano ~/.bashrc`
|
||||
|
||||
export OS="Linux"
|
||||
export JAVA_TOOL_OPTIONS="-Djava.net.preferIPv4Stack=true"
|
||||
export GPG_TTY=$(tty)
|
||||
|
||||
use `CRTL-X` to close nano and confirm to write the new entries
|
||||
- restart Ubuntu bash
|
||||
Now your Ubuntu subsystem is ready to use the automatic `PF-build.sh` script and compile your firmware correctly
|
||||
|
||||
#### Some Tips for Ubuntu
|
||||
- Linux is case sensetive so please don't forget to use capital letters where needed, like changing to a directory
|
||||
- To change the path to your Prusa-Firmware location you downloaded and unzipped
|
||||
- Example: You files are under `C:\Users\<your-username>\Downloads\Prusa-Firmware-MK3`
|
||||
- use under Ubuntu the following command `cd /mnt/c/Users/<your-username>/Downloads/Prusa-Firmware-MK3`
|
||||
to change to the right folder
|
||||
- Unix and windows have different line endings (LF vs CRLF), try dos2unix to convert
|
||||
- This should fix the `"$'\r': command not found"` error
|
||||
- to install run `apt-get install dos2unix`
|
||||
- If your Windows isn't in English the Paths may look different
|
||||
Example in other languages
|
||||
- English `/mnt/c/Users/<your-username>/Downloads/Prusa-Firmware-MK3` will be on a German Windows`/mnt/c/Anwender/<your-username>/Downloads/Prusa-Firmware-MK3`
|
||||
#### Compile Prusa-firmware with Ubuntu Linux subsystem installed
|
||||
- open Ubuntu bash
|
||||
- change to your source code folder (case sensitive)
|
||||
- run `./PF-build.sh`
|
||||
- follow the instructions
|
||||
|
||||
### Using Git-bash under Windows 10 64-bit
|
||||
_notes: Script and instructions contributed by 3d-gussner. Use at your own risk. Script downloads Arduino executables outside of Prusa control. Report problems [there.](https://github.com/3d-gussner/Prusa-Firmware/issues) Multi language build is supported._
|
||||
- Download and install the 64bit Git version https://git-scm.com/download/win
|
||||
- Also follow these instructions https://gist.github.com/evanwill/0207876c3243bbb6863e65ec5dc3f058
|
||||
- Download and install 7z-zip from its official website https://www.7-zip.org/
|
||||
By default, it is installed under the directory /c/Program\ Files/7-Zip in Windows 10
|
||||
- Run `Git-Bash` under Administrator privilege
|
||||
- navigate to the directory /c/Program\ Files/Git/mingw64/bin
|
||||
- run `ln -s /c/Program\ Files/7-Zip/7z.exe zip.exe`
|
||||
- If your Windows isn't in English the Paths may look different
|
||||
Example in other languages
|
||||
- English `/mnt/c/Users/<your-username>/Downloads/Prusa-Firmware-MK3` will be on a German Windows`/mnt/c/Anwender/<your-username>/Downloads/Prusa-Firmware-MK3`
|
||||
- English `ln -s /c/Program\ Files/7-Zip/7z.exe zip.exe` will be on a Spanish Windows `ln -s /c/Archivos\ de\ programa/7-Zip/7z.exe zip.exe`
|
||||
#### Compile Prusa-firmware with Git-bash installed
|
||||
- open Git-bash
|
||||
- change to your source code folder
|
||||
- run `bash PF-build.sh`
|
||||
- follow the instructions
|
||||
|
||||
|
||||
# 3. Automated tests
|
||||
## Prerequisites
|
||||
* c++11 compiler e.g. g++ 6.3.1
|
||||
* cmake
|
||||
* build system - ninja or gnu make
|
||||
|
||||
## Building
|
||||
Create a folder where you want to build tests.
|
||||
|
||||
Example:
|
||||
|
||||
`cd ..`
|
||||
|
||||
`mkdir Prusa-Firmware-test`
|
||||
|
||||
Generate build scripts in target folder.
|
||||
|
||||
Example:
|
||||
|
||||
`cd Prusa-Firmware-test`
|
||||
|
||||
`cmake -G "Eclipse CDT4 - Ninja" ../Prusa-Firmware`
|
||||
|
||||
or for DEBUG build:
|
||||
|
||||
`cmake -G "Eclipse CDT4 - Ninja" -DCMAKE_BUILD_TYPE=Debug ../Prusa-Firmware`
|
||||
|
||||
Build it.
|
||||
|
||||
Example:
|
||||
|
||||
`ninja`
|
||||
|
||||
## Runing
|
||||
`./tests`
|
||||
|
||||
# 4. Documentation
|
||||
run [doxygen](http://www.doxygen.nl/) in Firmware folder
|
||||
or visit https://prusa3d.github.io/Prusa-Firmware-Doc for doxygen generated output
|
||||
|
||||
# 5. FAQ
|
||||
Q:I built firmware using Arduino and I see "?" instead of numbers in printer user interface.
|
||||
|
||||
A:Step 1.c was ommited or you updated Arduino and now platform.txt located somewhere in your user profile is used.
|
||||
|
||||
Q:I built firmware using Arduino and printer now speaks Klingon (nonsense characters and symbols are displayed @^#$&*°;~ÿ)
|
||||
|
||||
A:Step 2.c was omitted.
|
||||
|
||||
Q:What environment does Prusa use to build the firmware in the first place?
|
||||
|
||||
A:Our production builds are 99.9% equivalent to https://github.com/prusa3d/Prusa-Firmware#linux this is also easiest way to build as only one step is needed - run single script, which downloads patched Arduino from github, builds using it, then extracts translated strings and creates language variants (for MK2x) or language hex file for external SPI flash (MK3x). But you need Linux or Linux in virtual machine. This is also what happens when you open pull request to our repository - all variants are built by Travis http://travis-ci.org/ (to check for compilation errors). You can see, what is happening in .travis.yml. It would be also possible to get hex built by travis, only deploy step is missing in .travis.yml. You can get inspiration how to deploy hex by travis and how to setup travis in https://github.com/prusa3d/MM-control-01/ repository. Final hex is located in ./lang/firmware.hex Community reproduced this for Windows in https://github.com/prusa3d/Prusa-Firmware#using-linux-subsystem-under-windows-10-64-bit or https://github.com/prusa3d/Prusa-Firmware#using-git-bash-under-windows-10-64-bit .
|
||||
|
||||
Q:Why are build instructions for Arduino mess.
|
||||
|
||||
Y:We are too lazy to ship proper board definition for Arduino. We plan to swich to cmake + ninja to be inherently multiplatform, easily integrate build tools, suport more IDEs, get 10 times shorter build times and be able to update compiler whenewer we want.
|
||||
# Prusa Firmware MK3
|
||||
|
||||
This repository contains the source code and the development versions of the firmware running on the [Original Prusa i3](https://prusa3d.com/) MK3S/MK3/MK2.5S/MK2.5 line of printers.
|
||||
|
||||
The latest official builds can be downloaded from [Prusa Drivers](https://www.prusa3d.com/drivers/). Pre-built development releases are also [available here](https://github.com/prusa3d/Prusa-Firmware/releases).
|
||||
|
||||
The firmware for the Original Prusa i3 printers is proudly based on [Marlin 1.0.x](https://github.com/MarlinFirmware/Marlin/) by Scott Lahteine (@thinkyhead) et al. and is distributed under the terms of the [GNU GPL 3 license](LICENSE).
|
||||
|
||||
|
||||
# Table of contents
|
||||
|
||||
<!--ts-->
|
||||
* [Linux build](#linux)
|
||||
* Windows build
|
||||
* [Using Arduino](#using-arduino)
|
||||
* [Using Linux subsystem](#using-linux-subsystem-under-windows-10-64-bit)
|
||||
* [Using Git-bash](#using-git-bash-under-windows-10-64-bit)
|
||||
* [Automated tests](#3-automated-tests)
|
||||
* [Documentation](#4-documentation)
|
||||
* [FAQ](#5-faq)
|
||||
<!--te-->
|
||||
|
||||
|
||||
# Build
|
||||
## Linux
|
||||
|
||||
1. Clone this repository and checkout the correct branch for your desired release version.
|
||||
|
||||
1. Set your printer model.
|
||||
- For MK3 --> skip to step 3.
|
||||
- If you have a different printer model, follow step [2.b](#2b) from Windows build
|
||||
1. Install GNU AWK `sudo apt-get install gawk`
|
||||
If you use mawk instead of gawk you get strange errors when multi language support is generated like:
|
||||
`awk: line 2: function strtonum never defined
|
||||
sed: couldn't write 4 items to stdout: Broken pipe
|
||||
./lang-build.sh: 121: ./lang-build.sh: arithmetic expression: expecting EOF: "0x"awk: line 2: function strtonum never defined
|
||||
sed: couldn't write 4 items to stdout: Broken pipe
|
||||
tr: write error: Broken pipe
|
||||
./lang-build.sh: 121: ./lang-build.sh: arithmetic expression: expecting EOF: "0x"awk: line 2: function strtonum never defined
|
||||
sed: couldn't write 4 items to stdout: Broken pipe
|
||||
tr: write error: Broken pipe
|
||||
tr: write error
|
||||
cut: write error: Broken pipeNG! - some texts not found in lang_en.txt! updating binary:
|
||||
primary language ids...awk: line 2: function strtonum never defined
|
||||
sed: couldn't flush stdout: Broken pipe`
|
||||
|
||||
1. Run `./build.sh`
|
||||
- Output hex file is at `"PrusaFirmware/lang/firmware.hex"` . In the same folder you can hex files for other languages as well.
|
||||
|
||||
1. Connect your printer and flash with PrusaSlicer ( Configuration --> Flash printer firmware ) or Slic3r PE.
|
||||
- If you wish to flash from Arduino, follow step [2.c](#2c) from Windows build first.
|
||||
|
||||
|
||||
_Notes:_
|
||||
|
||||
The script downloads Arduino with our modifications and Rambo board support installed, unpacks it into folder `PF-build-env-\<version\>` on the same level, as your Prusa-Firmware folder is located, builds firmware for MK3 using that Arduino in Prusa-Firmware-build folder on the same level as Prusa-Firmware, runs secondary language support scripts. Firmware with secondary language support is generated in lang subfolder. Use firmware.hex for MK3 variant. Use `firmware_\<lang\>.hex` for other printers. Don't forget to follow step [2.b](#2b) first for non-MK3 printers.
|
||||
|
||||
## Windows
|
||||
### Using Arduino
|
||||
_Note: Multi language build is not supported._
|
||||
|
||||
#### 1. Development environment preparation
|
||||
|
||||
**a.** Install `"Arduino Software IDE"` from the official website `https://www.arduino.cc -> Software->Downloads`
|
||||
|
||||
_It is recommended to use version `"1.8.5"`, as it is used on out build server to produce official builds._
|
||||
|
||||
**b.** Setup Arduino to use Prusa Rambo board definition
|
||||
|
||||
* Open Arduino and navigate to File -> Preferences -> Settings
|
||||
* To the text field `"Additional Boards Manager URLSs"` add `https://raw.githubusercontent.com/prusa3d/Arduino_Boards/master/IDE_Board_Manager/package_prusa3d_index.json`
|
||||
* Open Board manager (`Tools->Board->Board manager`), and install `Prusa Research AVR Boards by Prusa Research`
|
||||
|
||||
**c.** Modify compiler flags in `platform.txt` file
|
||||
|
||||
* The platform.txt file can be found in Arduino instalation directory, or after Arduino has been updated at: `"C:\Users\(user)\AppData\Local\Arduino15\packages\arduino\hardware\avr\(version)"` If you can locate the file in both places, file from user profile is probably used.
|
||||
|
||||
* Add `"-Wl,-u,vfprintf -lprintf_flt -lm"` to `"compiler.c.elf.flags="` before existing flag "-Wl,--gc-sections"
|
||||
|
||||
For example: `"compiler.c.elf.flags=-w -Os -Wl,-u,vfprintf -lprintf_flt -lm -Wl,--gc-sections"`
|
||||
|
||||
_Notes:_
|
||||
|
||||
|
||||
_In the case of persistent compilation problems, check the version of the currently used C/C++ compiler (GCC) - should be at leas `4.8.1`;
|
||||
If you are not sure where the file is placed (depends on how `"Arduino Software IDE"` was installed), you can use the search feature within the file system_
|
||||
|
||||
_Name collision for `"LiquidCrystal"` library known from previous versions is now obsolete (so there is no need to delete or rename original file/-s)_
|
||||
|
||||
#### 2. Source code compilation
|
||||
|
||||
**a.** Clone this repository`https://github.com/prusa3d/Prusa-Firmware/` to your local drive.
|
||||
|
||||
**b.**<a name="2b"></a> In the subdirectory `"Firmware/variants/"` select the configuration file (`.h`) corresponding to your printer model, make copy named `"Configuration_prusa.h"` (or make simple renaming) and copy it into `"Firmware/"` directory.
|
||||
|
||||
**c.**<a name="2c"></a> In file `"Firmware/config.h"` set LANG_MODE to 0.
|
||||
|
||||
**d.** Run `"Arduino IDE"`; select the file `"Firmware.ino"` from the subdirectory `"Firmware/"` at the location, where you placed the source code `File->Open` Make the desired code customizations; **all changes are on your own risk!**
|
||||
|
||||
**e.** Select the target board `"Tools->Board->PrusaResearch Einsy RAMBo"`
|
||||
|
||||
**f.** Run the compilation `Sketch->Verify/Compile`
|
||||
|
||||
**g.** Upload the result code into the connected printer `Sketch->Upload`
|
||||
|
||||
* or you can also save the output code to the file (in so called `HEX`-format) `"Firmware.ino.rambo.hex"`: `Sketch->ExportCompiledBinary` and then upload it to the printer using the program `"FirmwareUpdater"`
|
||||
_note: this file is created in the directory `"Firmware/"`_
|
||||
|
||||
### Using Linux subsystem under Windows 10 64-bit
|
||||
_notes: Script and instructions contributed by 3d-gussner. Use at your own risk. Script downloads Arduino executables outside of Prusa control. Report problems [there.](https://github.com/3d-gussner/Prusa-Firmware/issues) Multi language build is supported._
|
||||
- follow the Microsoft guide https://docs.microsoft.com/en-us/windows/wsl/install-win10
|
||||
You can also use the 'prepare_winbuild.ps1' powershell script with Administrator rights
|
||||
- Tested versions are at this moment
|
||||
- Ubuntu other may different
|
||||
- After the installation and reboot please open your Ubuntu bash and do following steps
|
||||
- run command `apt-get update`
|
||||
- to install zip run `apt-get install zip`
|
||||
- add few lines at the top of `~/.bashrc` by running `sudo nano ~/.bashrc`
|
||||
|
||||
export OS="Linux"
|
||||
export JAVA_TOOL_OPTIONS="-Djava.net.preferIPv4Stack=true"
|
||||
export GPG_TTY=$(tty)
|
||||
|
||||
use `CRTL-X` to close nano and confirm to write the new entries
|
||||
- restart Ubuntu bash
|
||||
Now your Ubuntu subsystem is ready to use the automatic `PF-build.sh` script and compile your firmware correctly
|
||||
|
||||
#### Some Tips for Ubuntu
|
||||
- Linux is case sensetive so please don't forget to use capital letters where needed, like changing to a directory
|
||||
- To change the path to your Prusa-Firmware location you downloaded and unzipped
|
||||
- Example: You files are under `C:\Users\<your-username>\Downloads\Prusa-Firmware-MK3`
|
||||
- use under Ubuntu the following command `cd /mnt/c/Users/<your-username>/Downloads/Prusa-Firmware-MK3`
|
||||
to change to the right folder
|
||||
- Unix and windows have different line endings (LF vs CRLF), try dos2unix to convert
|
||||
- This should fix the `"$'\r': command not found"` error
|
||||
- to install run `apt-get install dos2unix`
|
||||
- If your Windows isn't in English the Paths may look different
|
||||
Example in other languages
|
||||
- English `/mnt/c/Users/<your-username>/Downloads/Prusa-Firmware-MK3` will be on a German Windows`/mnt/c/Anwender/<your-username>/Downloads/Prusa-Firmware-MK3`
|
||||
#### Compile Prusa-firmware with Ubuntu Linux subsystem installed
|
||||
- open Ubuntu bash
|
||||
- change to your source code folder (case sensitive)
|
||||
- run `./PF-build.sh`
|
||||
- follow the instructions
|
||||
|
||||
### Using Git-bash under Windows 10 64-bit
|
||||
_notes: Script and instructions contributed by 3d-gussner. Use at your own risk. Script downloads Arduino executables outside of Prusa control. Report problems [there.](https://github.com/3d-gussner/Prusa-Firmware/issues) Multi language build is supported._
|
||||
- Download and install the 64bit Git version https://git-scm.com/download/win
|
||||
- Also follow these instructions https://gist.github.com/evanwill/0207876c3243bbb6863e65ec5dc3f058
|
||||
- Download and install 7z-zip from its official website https://www.7-zip.org/
|
||||
By default, it is installed under the directory /c/Program\ Files/7-Zip in Windows 10
|
||||
- Run `Git-Bash` under Administrator privilege
|
||||
- navigate to the directory /c/Program\ Files/Git/mingw64/bin
|
||||
- run `ln -s /c/Program\ Files/7-Zip/7z.exe zip.exe`
|
||||
- If your Windows isn't in English the Paths may look different
|
||||
Example in other languages
|
||||
- English `/mnt/c/Users/<your-username>/Downloads/Prusa-Firmware-MK3` will be on a German Windows`/mnt/c/Anwender/<your-username>/Downloads/Prusa-Firmware-MK3`
|
||||
- English `ln -s /c/Program\ Files/7-Zip/7z.exe zip.exe` will be on a Spanish Windows `ln -s /c/Archivos\ de\ programa/7-Zip/7z.exe zip.exe`
|
||||
#### Compile Prusa-firmware with Git-bash installed
|
||||
- open Git-bash
|
||||
- change to your source code folder
|
||||
- run `bash PF-build.sh`
|
||||
- follow the instructions
|
||||
|
||||
|
||||
# 3. Automated tests
|
||||
## Prerequisites
|
||||
* c++11 compiler e.g. g++ 6.3.1
|
||||
* cmake
|
||||
* build system - ninja or gnu make
|
||||
|
||||
## Building
|
||||
Create a folder where you want to build tests.
|
||||
|
||||
Example:
|
||||
|
||||
`cd ..`
|
||||
|
||||
`mkdir Prusa-Firmware-test`
|
||||
|
||||
Generate build scripts in target folder.
|
||||
|
||||
Example:
|
||||
|
||||
`cd Prusa-Firmware-test`
|
||||
|
||||
`cmake -G "Eclipse CDT4 - Ninja" ../Prusa-Firmware`
|
||||
|
||||
or for DEBUG build:
|
||||
|
||||
`cmake -G "Eclipse CDT4 - Ninja" -DCMAKE_BUILD_TYPE=Debug ../Prusa-Firmware`
|
||||
|
||||
Build it.
|
||||
|
||||
Example:
|
||||
|
||||
`ninja`
|
||||
|
||||
## Running
|
||||
`./tests`
|
||||
|
||||
# 4. Documentation
|
||||
run [doxygen](http://www.doxygen.nl/) in Firmware folder
|
||||
or visit https://prusa3d.github.io/Prusa-Firmware-Doc for doxygen generated output
|
||||
|
||||
# 5. FAQ
|
||||
Q:I built firmware using Arduino and I see "?" instead of numbers in printer user interface.
|
||||
|
||||
A:Step 1.c was ommited or you updated Arduino and now platform.txt located somewhere in your user profile is used.
|
||||
|
||||
Q:I built firmware using Arduino and printer now speaks Klingon (nonsense characters and symbols are displayed @^#$&*°;~ÿ)
|
||||
|
||||
A:Step 2.c was omitted.
|
||||
|
||||
Q:What environment does Prusa use to build the firmware in the first place?
|
||||
|
||||
A:Our production builds are 99.9% equivalent to https://github.com/prusa3d/Prusa-Firmware#linux this is also easiest way to build as only one step is needed - run single script, which downloads patched Arduino from github, builds using it, then extracts translated strings and creates language variants (for MK2x) or language hex file for external SPI flash (MK3x). But you need Linux or Linux in virtual machine. This is also what happens when you open pull request to our repository - all variants are built by Travis http://travis-ci.org/ (to check for compilation errors). You can see, what is happening in .travis.yml. It would be also possible to get hex built by travis, only deploy step is missing in .travis.yml. You can get inspiration how to deploy hex by travis and how to setup travis in https://github.com/prusa3d/MM-control-01/ repository. Final hex is located in ./lang/firmware.hex Community reproduced this for Windows in https://github.com/prusa3d/Prusa-Firmware#using-linux-subsystem-under-windows-10-64-bit or https://github.com/prusa3d/Prusa-Firmware#using-git-bash-under-windows-10-64-bit .
|
||||
|
||||
Q:Why are build instructions for Arduino mess.
|
||||
|
||||
Y:We are too lazy to ship proper board definition for Arduino. We plan to swich to cmake + ninja to be inherently multiplatform, easily integrate build tools, suport more IDEs, get 10 times shorter build times and be able to update compiler whenewer we want.
|
||||
|
|
5
build.sh
5
build.sh
|
@ -1,5 +1,5 @@
|
|||
#!/bin/bash
|
||||
BUILD_ENV="1.0.6"
|
||||
BUILD_ENV="1.0.6.1"
|
||||
SCRIPT_PATH="$( cd "$(dirname "$0")" ; pwd -P )"
|
||||
|
||||
if [ ! -d "build-env" ]; then
|
||||
|
@ -8,7 +8,8 @@ fi
|
|||
cd build-env || exit 2
|
||||
|
||||
if [ ! -f "PF-build-env-Linux64-$BUILD_ENV.zip" ]; then
|
||||
wget https://github.com/mkbel/PF-build-env/releases/download/$BUILD_ENV/PF-build-env-Linux64-$BUILD_ENV.zip || exit 3
|
||||
#wget https://github.com/3d-gussner/PF-build-env-1/releases/download/$BUILD_ENV-Linux64/PF-build-env-Linux64-$BUILD_ENV.zip || exit 3
|
||||
wget https://github.com/prusa3d/PF-build-env/releases/download/$BUILD_ENV-Linux64/PF-build-env-Linux64-$BUILD_ENV.zip || exit 3
|
||||
fi
|
||||
|
||||
if [ ! -d "../../PF-build-env-$BUILD_ENV" ]; then
|
||||
|
|
|
@ -70,5 +70,5 @@ cat lang_add.txt | sed 's/^/"/;s/$/"/' | while read new_s; do
|
|||
fi
|
||||
done
|
||||
|
||||
read x
|
||||
read -t 5
|
||||
exit 0
|
|
@ -71,5 +71,5 @@ else
|
|||
echo 'binary data NG!'
|
||||
fi
|
||||
|
||||
read
|
||||
read -t 5
|
||||
exit
|
||||
|
|
156
lang/lang_en.txt
156
lang/lang_en.txt
|
@ -1,6 +1,12 @@
|
|||
#
|
||||
"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset"
|
||||
|
||||
#MSG_03_OR_OLDER c=18
|
||||
" 0.3 or older"
|
||||
|
||||
#MSG_04_OR_NEWER c=18
|
||||
" 0.4 or newer"
|
||||
|
||||
#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14
|
||||
" of 4"
|
||||
|
||||
|
@ -31,7 +37,10 @@
|
|||
#
|
||||
"Ambient"
|
||||
|
||||
#MSG_PRESS c=20
|
||||
#MSG_AUTO c=6
|
||||
"Auto"
|
||||
|
||||
#MSG_PRESS c=20 r=2
|
||||
"and press the knob"
|
||||
|
||||
#MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2
|
||||
|
@ -43,7 +52,7 @@
|
|||
#MSG_AUTO_HOME
|
||||
"Auto home"
|
||||
|
||||
#MSG_AUTOLOAD_FILAMENT c=17
|
||||
#MSG_AUTOLOAD_FILAMENT c=18
|
||||
"AutoLoad filament"
|
||||
|
||||
#MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4
|
||||
|
@ -70,13 +79,22 @@
|
|||
#MSG_BED_CORRECTION_MENU
|
||||
"Bed level correct"
|
||||
|
||||
#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=4
|
||||
#MSG_BELTTEST c=17
|
||||
"Belt test "
|
||||
|
||||
#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5
|
||||
"Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset."
|
||||
|
||||
#MSG_BRIGHT c=6
|
||||
"Bright"
|
||||
|
||||
#MSG_BRIGHTNESS c=18
|
||||
"Brightness"
|
||||
|
||||
#MSG_BED
|
||||
"Bed"
|
||||
|
||||
#MSG_MENU_BELT_STATUS c=15 r=1
|
||||
#MSG_MENU_BELT_STATUS c=18
|
||||
"Belt status"
|
||||
|
||||
#MSG_RECOVER_PRINT c=20 r=2
|
||||
|
@ -124,8 +142,9 @@
|
|||
#
|
||||
"Copy selected language?"
|
||||
|
||||
#MSG_CRASHDETECT
|
||||
#MSG_CRASHDETECT c=13
|
||||
"Crash det."
|
||||
|
||||
#
|
||||
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
|
||||
|
||||
|
@ -150,10 +169,13 @@
|
|||
#MSG_BABYSTEP_Z_NOT_SET c=20 r=12
|
||||
"Distance between tip of the nozzle and the bed surface has not been set yet. Please follow the manual, chapter First steps, section First layer calibration."
|
||||
|
||||
#MSG_FS_CONTINUE c=5
|
||||
"Cont."
|
||||
|
||||
#MSG_WIZARD_REPEAT_V2_CAL c=20 r=7
|
||||
"Do you want to repeat last step to readjust distance between nozzle and heatbed?"
|
||||
|
||||
#MSG_EXTRUDER_CORRECTION c=10
|
||||
#MSG_EXTRUDER_CORRECTION c=13
|
||||
"E-correct:"
|
||||
|
||||
#MSG_EJECT_FILAMENT c=17 r=1
|
||||
|
@ -162,7 +184,7 @@
|
|||
#MSG_EJECTING_FILAMENT c=20 r=1
|
||||
"Ejecting filament"
|
||||
|
||||
#MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1
|
||||
#MSG_SELFTEST_ENDSTOP_NOTHIT c=20
|
||||
"Endstop not hit"
|
||||
|
||||
#MSG_SELFTEST_ENDSTOP
|
||||
|
@ -174,16 +196,28 @@
|
|||
#MSG_STACK_ERROR c=20 r=4
|
||||
"Error - static memory has been overwritten"
|
||||
|
||||
#MSG_CUT_FILAMENT c=16
|
||||
"Cut filament"
|
||||
|
||||
#MSG_CUTTER c=9
|
||||
"Cutter"
|
||||
|
||||
# c=18
|
||||
"Cutting filament"
|
||||
|
||||
#MSG_FSENS_NOT_RESPONDING c=20 r=4
|
||||
"ERROR: Filament sensor is not responding, please check connection."
|
||||
|
||||
#MSG_DIM c=6
|
||||
"Dim"
|
||||
|
||||
#MSG_ERROR
|
||||
"ERROR:"
|
||||
|
||||
#MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18
|
||||
"Extruder fan:"
|
||||
|
||||
#MSG_INFO_EXTRUDER c=15 r=1
|
||||
#MSG_INFO_EXTRUDER c=18
|
||||
"Extruder info"
|
||||
|
||||
#MSG_MOVE_E
|
||||
|
@ -192,7 +226,7 @@
|
|||
#
|
||||
"Fail stats MMU"
|
||||
|
||||
#MSG_FSENSOR_AUTOLOAD
|
||||
#MSG_FSENSOR_AUTOLOAD c=13
|
||||
"F. autoload"
|
||||
|
||||
#
|
||||
|
@ -210,7 +244,7 @@
|
|||
#MSG_FSENSOR
|
||||
"Fil. sensor"
|
||||
|
||||
#
|
||||
# c=14
|
||||
"Filam. runouts"
|
||||
|
||||
#MSG_FILAMENT_CLEAN c=20 r=2
|
||||
|
@ -222,19 +256,25 @@
|
|||
#MSG_FILAMENT_SENSOR c=20
|
||||
"Filament sensor"
|
||||
|
||||
#MSG_FILAMENT_USED c=19 r=1
|
||||
#MSG_FILAMENT_USED c=19
|
||||
"Filament used"
|
||||
|
||||
#MSG_PRINT_TIME c=19 r=1
|
||||
"Print time"
|
||||
|
||||
#MSG_FILE_INCOMPLETE c=20 r=2
|
||||
#MSG_FS_ACTION c=10
|
||||
"FS Action"
|
||||
|
||||
# c=18
|
||||
"FS v0.4 or newer"
|
||||
|
||||
#MSG_FILE_INCOMPLETE c=20 r=3
|
||||
"File incomplete. Continue anyway?"
|
||||
|
||||
#MSG_FINISHING_MOVEMENTS c=20 r=1
|
||||
#MSG_FINISHING_MOVEMENTS c=20
|
||||
"Finishing movements"
|
||||
|
||||
#MSG_V2_CALIBRATION c=17 r=1
|
||||
#MSG_V2_CALIBRATION c=18
|
||||
"First layer cal."
|
||||
|
||||
#MSG_WIZARD_SELFTEST c=20 r=8
|
||||
|
@ -357,6 +397,9 @@
|
|||
#MSG_BABYSTEP_Z
|
||||
"Live adjust Z"
|
||||
|
||||
# c=20 r=6
|
||||
"Insert the filament (do not load it) into the extruder and then press the knob."
|
||||
|
||||
#MSG_LOAD_FILAMENT c=17
|
||||
"Load filament"
|
||||
|
||||
|
@ -372,12 +415,18 @@
|
|||
#
|
||||
"Load to nozzle"
|
||||
|
||||
#MSG_M117_V2_CALIBRATION c=25 r=1
|
||||
#MSG_M117_V2_CALIBRATION c=25
|
||||
"M117 First layer cal."
|
||||
|
||||
#MSG_MAIN
|
||||
"Main"
|
||||
|
||||
#MSG_BL_HIGH c=12
|
||||
"Level Bright"
|
||||
|
||||
#MSG_BL_LOW c=12
|
||||
"Level Dimmed"
|
||||
|
||||
#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60
|
||||
"Measuring reference height of calibration point"
|
||||
|
||||
|
@ -408,6 +457,9 @@
|
|||
#MSG_MODE
|
||||
"Mode"
|
||||
|
||||
# c=20 r=3
|
||||
"MK3 firmware detected on MK3S printer"
|
||||
|
||||
#MSG_NORMAL
|
||||
"Normal"
|
||||
|
||||
|
@ -477,7 +529,7 @@
|
|||
#MSG_NOZZLE
|
||||
"Nozzle"
|
||||
|
||||
#MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
|
||||
#MSG_DEFAULT_SETTINGS_LOADED c=20 r=5
|
||||
"Old settings found. Default PID, Esteps etc. will be set."
|
||||
|
||||
#
|
||||
|
@ -501,7 +553,7 @@
|
|||
#MSG_PINDA_PREHEAT c=20 r=1
|
||||
"PINDA Heating"
|
||||
|
||||
#MSG_PAPER c=20 r=8
|
||||
#MSG_PAPER c=20 r=10
|
||||
"Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."
|
||||
|
||||
#MSG_WIZARD_CLEAN_HEATBED c=20 r=8
|
||||
|
@ -555,22 +607,28 @@
|
|||
#MSG_WIZARD_HEATING c=20 r=3
|
||||
"Preheating nozzle. Please wait."
|
||||
|
||||
# c=14
|
||||
"PINDA"
|
||||
|
||||
#
|
||||
"Please upgrade."
|
||||
|
||||
#MSG_PRESS_TO_PREHEAT c=20 r=4
|
||||
"Press knob to preheat nozzle and continue."
|
||||
|
||||
#MSG_FS_PAUSE c=5
|
||||
"Pause"
|
||||
|
||||
#
|
||||
"Power failures"
|
||||
|
||||
#MSG_PRINT_ABORTED c=20
|
||||
"Print aborted"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to load"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to unload"
|
||||
|
||||
#MSG_SELFTEST_PRINT_FAN_SPEED c=18
|
||||
|
@ -609,13 +667,16 @@
|
|||
#MSG_BED_CORRECTION_REAR c=14 r=1
|
||||
"Rear side [um]"
|
||||
|
||||
#MSG_RECOVERING_PRINT c=20 r=1
|
||||
# c=20 r=4
|
||||
"Please unload the filament first, then repeat this action."
|
||||
|
||||
#MSG_RECOVERING_PRINT c=20
|
||||
"Recovering print "
|
||||
|
||||
#MSG_REMOVE_OLD_FILAMENT c=20 r=4
|
||||
#MSG_REMOVE_OLD_FILAMENT c=20 r=5
|
||||
"Remove old filament and press the knob to start loading new filament."
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Prusa i3 MK3S OK."
|
||||
|
||||
#MSG_CALIBRATE_BED_RESET
|
||||
|
@ -627,7 +688,7 @@
|
|||
#MSG_RESUME_PRINT
|
||||
"Resume print"
|
||||
|
||||
#MSG_RESUMING_PRINT c=20 r=1
|
||||
#MSG_RESUMING_PRINT c=20
|
||||
"Resuming print"
|
||||
|
||||
#MSG_BED_CORRECTION_RIGHT c=14 r=1
|
||||
|
@ -678,16 +739,25 @@
|
|||
#MSG_SET_TEMPERATURE c=19 r=1
|
||||
"Set temperature:"
|
||||
|
||||
# c=20
|
||||
"Prusa i3 MK2.5 OK."
|
||||
|
||||
# c=20
|
||||
"Prusa i3 MK2.5S OK."
|
||||
|
||||
# c=20
|
||||
"Prusa i3 MK3 OK."
|
||||
|
||||
#MSG_SETTINGS
|
||||
"Settings"
|
||||
|
||||
#MSG_SHOW_END_STOPS c=17 r=1
|
||||
#MSG_SHOW_END_STOPS c=18
|
||||
"Show end stops"
|
||||
|
||||
#
|
||||
"Sensor state"
|
||||
|
||||
#MSG_FILE_CNT c=20 r=4
|
||||
#MSG_FILE_CNT c=20 r=6
|
||||
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
|
||||
|
||||
#MSG_SORT
|
||||
|
@ -717,6 +787,9 @@
|
|||
#MSG_SOUND
|
||||
"Sound"
|
||||
|
||||
# c=7
|
||||
"Runouts"
|
||||
|
||||
#
|
||||
"Some problem encountered, Z-leveling enforced ..."
|
||||
|
||||
|
@ -750,7 +823,7 @@
|
|||
#
|
||||
"Select filament:"
|
||||
|
||||
#MSG_TEMP_CALIBRATION c=12 r=1
|
||||
#MSG_TEMP_CALIBRATION c=14
|
||||
"Temp. cal."
|
||||
|
||||
#
|
||||
|
@ -765,13 +838,16 @@
|
|||
#MSG_TEMP_CALIBRATION_DONE c=20 r=12
|
||||
"Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."
|
||||
|
||||
# c=20 r=3
|
||||
"Sensor verified, remove the filament now."
|
||||
|
||||
#MSG_TEMPERATURE
|
||||
"Temperature"
|
||||
|
||||
#MSG_MENU_TEMPERATURES c=15 r=1
|
||||
"Temperatures"
|
||||
|
||||
#MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=4
|
||||
#MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9
|
||||
"There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
|
||||
|
||||
#
|
||||
|
@ -843,7 +919,7 @@
|
|||
#MSG_WIZARD c=17 r=1
|
||||
"Wizard"
|
||||
|
||||
#MSG_XYZ_DETAILS c=19 r=1
|
||||
#MSG_XYZ_DETAILS c=18
|
||||
"XYZ cal. details"
|
||||
|
||||
#MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8
|
||||
|
@ -861,7 +937,10 @@
|
|||
#MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8
|
||||
"XYZ calibration all right. X/Y axes are slightly skewed. Good job!"
|
||||
|
||||
#
|
||||
#MSG_TIMEOUT c=12
|
||||
"Timeout"
|
||||
|
||||
#MSG_X_CORRECTION c=13
|
||||
"X-correct:"
|
||||
|
||||
#MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8
|
||||
|
@ -891,7 +970,10 @@
|
|||
#
|
||||
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
|
||||
|
||||
#
|
||||
# c=20 r=5
|
||||
"Verification failed, remove the filament and try again."
|
||||
|
||||
#MSG_Y_CORRECTION c=13
|
||||
"Y-correct:"
|
||||
|
||||
#MSG_OFF
|
||||
|
@ -972,10 +1054,10 @@
|
|||
#
|
||||
"PINDA:"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to cut"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to eject"
|
||||
|
||||
#
|
||||
|
@ -984,6 +1066,9 @@
|
|||
#
|
||||
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
|
||||
|
||||
# c=20
|
||||
"%s level expected"
|
||||
|
||||
#
|
||||
"Rename"
|
||||
|
||||
|
@ -993,17 +1078,18 @@
|
|||
#
|
||||
"Sensor info"
|
||||
|
||||
#
|
||||
#MSG_SHEET c=10
|
||||
"Sheet"
|
||||
|
||||
#MSG_SOUND_BLIND
|
||||
"Assist"
|
||||
|
||||
#
|
||||
# c=18
|
||||
"Steel sheets"
|
||||
|
||||
#
|
||||
#MSG_Z_CORRECTION c=13
|
||||
"Z-correct:"
|
||||
|
||||
#MSG_Z_PROBE_NR
|
||||
"Z-probe nr."
|
||||
|
||||
|
|
|
@ -2,6 +2,14 @@
|
|||
"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset"
|
||||
"[%.7s]Doladeni Z\x0auz nastaveno, pouzit\x0anebo reset od nuly?\x0a%cPokracovat%cReset"
|
||||
|
||||
#MSG_03_OR_OLDER c=18
|
||||
" 0.3 or older"
|
||||
" 0.3 nebo starsi"
|
||||
|
||||
#MSG_04_OR_NEWER c=18
|
||||
" 0.4 or newer"
|
||||
" 0.4 nebo novejsi"
|
||||
|
||||
#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14
|
||||
" of 4"
|
||||
" z 4"
|
||||
|
@ -42,7 +50,11 @@
|
|||
"Ambient"
|
||||
"Okoli"
|
||||
|
||||
#MSG_PRESS c=20
|
||||
#MSG_AUTO c=6
|
||||
"Auto"
|
||||
"\x00"
|
||||
|
||||
#MSG_PRESS c=20 r=2
|
||||
"and press the knob"
|
||||
"a stisknete tlacitko"
|
||||
|
||||
|
@ -58,7 +70,7 @@
|
|||
"Auto home"
|
||||
"\x00"
|
||||
|
||||
#MSG_AUTOLOAD_FILAMENT c=17
|
||||
#MSG_AUTOLOAD_FILAMENT c=18
|
||||
"AutoLoad filament"
|
||||
"AutoZavedeni fil."
|
||||
|
||||
|
@ -94,15 +106,27 @@
|
|||
"Bed level correct"
|
||||
"Korekce podlozky"
|
||||
|
||||
#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=4
|
||||
#MSG_BELTTEST c=17
|
||||
"Belt test "
|
||||
"Test remenu "
|
||||
|
||||
#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5
|
||||
"Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset."
|
||||
"Kalibrace Z selhala. Sensor nesepnul. Znecistena tryska? Cekam na reset."
|
||||
|
||||
#MSG_BRIGHT c=6
|
||||
"Bright"
|
||||
"Jasny"
|
||||
|
||||
#MSG_BRIGHTNESS c=18
|
||||
"Brightness"
|
||||
"Podsviceni"
|
||||
|
||||
#MSG_BED
|
||||
"Bed"
|
||||
"Podlozka"
|
||||
|
||||
#MSG_MENU_BELT_STATUS c=15 r=1
|
||||
#MSG_MENU_BELT_STATUS c=18
|
||||
"Belt status"
|
||||
"Stav remenu"
|
||||
|
||||
|
@ -166,13 +190,13 @@
|
|||
"Copy selected language?"
|
||||
"Kopirovat vybrany jazyk?"
|
||||
|
||||
#MSG_CRASHDETECT
|
||||
#MSG_CRASHDETECT c=13
|
||||
"Crash det."
|
||||
"\x00"
|
||||
|
||||
#
|
||||
"Zvolte filament pro kalibraci prvni vrstvy z nasledujiciho menu"
|
||||
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
|
||||
"Zvolte filament pro kalibraci prvni vrstvy z nasledujiciho menu"
|
||||
|
||||
#MSG_CRASH_DETECTED c=20 r=1
|
||||
"Crash detected."
|
||||
|
@ -202,11 +226,15 @@
|
|||
"Distance between tip of the nozzle and the bed surface has not been set yet. Please follow the manual, chapter First steps, section First layer calibration."
|
||||
"Neni zkalibrovana vzdalenost trysky od tiskove podlozky. Postupujte prosim podle manualu, kapitola Zaciname, odstavec Nastaveni prvni vrstvy."
|
||||
|
||||
#MSG_FS_CONTINUE c=5
|
||||
"Cont."
|
||||
"Pokr."
|
||||
|
||||
#MSG_WIZARD_REPEAT_V2_CAL c=20 r=7
|
||||
"Do you want to repeat last step to readjust distance between nozzle and heatbed?"
|
||||
"Chcete opakovat posledni krok a pozmenit vzdalenost mezi tryskou a podlozkou?"
|
||||
|
||||
#MSG_EXTRUDER_CORRECTION c=10
|
||||
#MSG_EXTRUDER_CORRECTION c=13
|
||||
"E-correct:"
|
||||
"Korekce E:"
|
||||
|
||||
|
@ -218,7 +246,7 @@
|
|||
"Ejecting filament"
|
||||
"Vysouvam filament"
|
||||
|
||||
#MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1
|
||||
#MSG_SELFTEST_ENDSTOP_NOTHIT c=20
|
||||
"Endstop not hit"
|
||||
"Kon. spinac nesepnut"
|
||||
|
||||
|
@ -234,9 +262,25 @@
|
|||
"Error - static memory has been overwritten"
|
||||
"Chyba - Doslo k prepisu staticke pameti!"
|
||||
|
||||
#MSG_CUT_FILAMENT c=16
|
||||
"Cut filament"
|
||||
"Ustrihnout"
|
||||
|
||||
#MSG_CUTTER c=9
|
||||
"Cutter"
|
||||
"Strihani"
|
||||
|
||||
# c=18
|
||||
"Cutting filament"
|
||||
"Strihani filamentu"
|
||||
|
||||
#MSG_FSENS_NOT_RESPONDING c=20 r=4
|
||||
"ERROR: Filament sensor is not responding, please check connection."
|
||||
"CHYBA: Filament senzor nereaguje, zkontrolujte zapojeni."
|
||||
"CHYBA: Filament senzor nereaguje, zkontrolujte prosim zapojeni."
|
||||
|
||||
#MSG_DIM c=6
|
||||
"Dim"
|
||||
"Temny"
|
||||
|
||||
#MSG_ERROR
|
||||
"ERROR:"
|
||||
|
@ -246,7 +290,7 @@
|
|||
"Extruder fan:"
|
||||
"Levy vent.:"
|
||||
|
||||
#MSG_INFO_EXTRUDER c=15 r=1
|
||||
#MSG_INFO_EXTRUDER c=18
|
||||
"Extruder info"
|
||||
"\x00"
|
||||
|
||||
|
@ -258,7 +302,7 @@
|
|||
"Fail stats MMU"
|
||||
"Selhani MMU"
|
||||
|
||||
#MSG_FSENSOR_AUTOLOAD
|
||||
#MSG_FSENSOR_AUTOLOAD c=13
|
||||
"F. autoload"
|
||||
"F. autozav."
|
||||
|
||||
|
@ -282,7 +326,7 @@
|
|||
"Fil. sensor"
|
||||
"Fil. senzor"
|
||||
|
||||
#
|
||||
# c=14
|
||||
"Filam. runouts"
|
||||
"Vypadky filam."
|
||||
|
||||
|
@ -298,23 +342,31 @@
|
|||
"Filament sensor"
|
||||
"Senzor filamentu"
|
||||
|
||||
#MSG_FILAMENT_USED c=19 r=1
|
||||
#MSG_FILAMENT_USED c=19
|
||||
"Filament used"
|
||||
"Spotrebovano filamentu"
|
||||
"Spotrebovano filam."
|
||||
|
||||
#MSG_PRINT_TIME c=19 r=1
|
||||
"Print time"
|
||||
"Cas tisku"
|
||||
|
||||
#MSG_FILE_INCOMPLETE c=20 r=2
|
||||
#MSG_FS_ACTION c=10
|
||||
"FS Action"
|
||||
"FS reakce"
|
||||
|
||||
# c=18
|
||||
"FS v0.4 or newer"
|
||||
"FS v0.4 a novejsi"
|
||||
|
||||
#MSG_FILE_INCOMPLETE c=20 r=3
|
||||
"File incomplete. Continue anyway?"
|
||||
"Soubor nekompletni. Pokracovat?"
|
||||
|
||||
#MSG_FINISHING_MOVEMENTS c=20 r=1
|
||||
#MSG_FINISHING_MOVEMENTS c=20
|
||||
"Finishing movements"
|
||||
"Dokoncovani pohybu"
|
||||
|
||||
#MSG_V2_CALIBRATION c=17 r=1
|
||||
#MSG_V2_CALIBRATION c=18
|
||||
"First layer cal."
|
||||
"Kal. prvni vrstvy"
|
||||
|
||||
|
@ -478,6 +530,10 @@
|
|||
"Live adjust Z"
|
||||
"Doladeni osy Z"
|
||||
|
||||
# c=20 r=6
|
||||
"Insert the filament (do not load it) into the extruder and then press the knob."
|
||||
"Vlozte filament (nezavadejte) do extruderu a stisknete tlacitko"
|
||||
|
||||
#MSG_LOAD_FILAMENT c=17
|
||||
"Load filament"
|
||||
"Zavest filament"
|
||||
|
@ -498,7 +554,7 @@
|
|||
"Load to nozzle"
|
||||
"Zavest do trysky"
|
||||
|
||||
#MSG_M117_V2_CALIBRATION c=25 r=1
|
||||
#MSG_M117_V2_CALIBRATION c=25
|
||||
"M117 First layer cal."
|
||||
"M117 Kal. prvni vrstvy"
|
||||
|
||||
|
@ -506,6 +562,14 @@
|
|||
"Main"
|
||||
"Hlavni nabidka"
|
||||
|
||||
#MSG_BL_HIGH c=12
|
||||
"Level Bright"
|
||||
"\x00"
|
||||
|
||||
#MSG_BL_LOW c=12
|
||||
"Level Dimmed"
|
||||
"\x00"
|
||||
|
||||
#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60
|
||||
"Measuring reference height of calibration point"
|
||||
"Merim referencni vysku kalibracniho bodu"
|
||||
|
@ -546,6 +610,10 @@
|
|||
"Mode"
|
||||
"Mod"
|
||||
|
||||
# c=20 r=3
|
||||
"MK3 firmware detected on MK3S printer"
|
||||
"\x00"
|
||||
|
||||
#MSG_NORMAL
|
||||
"Normal"
|
||||
"\x00"
|
||||
|
@ -638,7 +706,7 @@
|
|||
"Nozzle"
|
||||
"Tryska"
|
||||
|
||||
#MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
|
||||
#MSG_DEFAULT_SETTINGS_LOADED c=20 r=5
|
||||
"Old settings found. Default PID, Esteps etc. will be set."
|
||||
"Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd."
|
||||
|
||||
|
@ -670,7 +738,7 @@
|
|||
"PINDA Heating"
|
||||
"Nahrivani PINDA"
|
||||
|
||||
#MSG_PAPER c=20 r=8
|
||||
#MSG_PAPER c=20 r=10
|
||||
"Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."
|
||||
"Umistete list papiru na podlozku a udrzujte jej pod tryskou behem mereni prvnich 4 bodu. Pokud tryska zachyti papir, okamzite vypnete tiskarnu."
|
||||
|
||||
|
@ -742,6 +810,10 @@
|
|||
"Preheating nozzle. Please wait."
|
||||
"Predehrev trysky. Prosim cekejte."
|
||||
|
||||
# c=14
|
||||
"PINDA"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
"Please upgrade."
|
||||
"Prosim aktualizujte."
|
||||
|
@ -750,6 +822,10 @@
|
|||
"Press knob to preheat nozzle and continue."
|
||||
"Pro nahrati trysky a pokracovani stisknete tlacitko."
|
||||
|
||||
#MSG_FS_PAUSE c=5
|
||||
"Pause"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
"Power failures"
|
||||
"Vypadky proudu"
|
||||
|
@ -758,11 +834,11 @@
|
|||
"Print aborted"
|
||||
"Tisk prerusen"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to load"
|
||||
"Predehrev k zavedeni"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to unload"
|
||||
"Predehrev k vyjmuti"
|
||||
|
||||
|
@ -814,15 +890,19 @@
|
|||
"Rear side [um]"
|
||||
"Vzadu [um]"
|
||||
|
||||
#MSG_RECOVERING_PRINT c=20 r=1
|
||||
"Recovering print "
|
||||
"Obnovovani tisku "
|
||||
# c=20 r=4
|
||||
"Please unload the filament first, then repeat this action."
|
||||
"Prosim vyjmete filament a zopakujte tuto akci"
|
||||
|
||||
#MSG_REMOVE_OLD_FILAMENT c=20 r=4
|
||||
#MSG_RECOVERING_PRINT c=20
|
||||
"Recovering print "
|
||||
"Obnovovani tisku "
|
||||
|
||||
#MSG_REMOVE_OLD_FILAMENT c=20 r=5
|
||||
"Remove old filament and press the knob to start loading new filament."
|
||||
"Vyjmete stary filament a stisknete tlacitko pro zavedeni noveho."
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Prusa i3 MK3S OK."
|
||||
"\x00"
|
||||
|
||||
|
@ -838,7 +918,7 @@
|
|||
"Resume print"
|
||||
"Pokracovat"
|
||||
|
||||
#MSG_RESUMING_PRINT c=20 r=1
|
||||
#MSG_RESUMING_PRINT c=20
|
||||
"Resuming print"
|
||||
"Obnoveni tisku"
|
||||
|
||||
|
@ -906,11 +986,23 @@
|
|||
"Set temperature:"
|
||||
"Nastavte teplotu:"
|
||||
|
||||
# c=20
|
||||
"Prusa i3 MK2.5 OK."
|
||||
"\x00"
|
||||
|
||||
# c=20
|
||||
"Prusa i3 MK2.5S OK."
|
||||
"\x00"
|
||||
|
||||
# c=20
|
||||
"Prusa i3 MK3 OK."
|
||||
"\x00"
|
||||
|
||||
#MSG_SETTINGS
|
||||
"Settings"
|
||||
"Nastaveni"
|
||||
|
||||
#MSG_SHOW_END_STOPS c=17 r=1
|
||||
#MSG_SHOW_END_STOPS c=18
|
||||
"Show end stops"
|
||||
"Stav konc. spin."
|
||||
|
||||
|
@ -918,7 +1010,7 @@
|
|||
"Sensor state"
|
||||
"Stav senzoru"
|
||||
|
||||
#MSG_FILE_CNT c=20 r=4
|
||||
#MSG_FILE_CNT c=20 r=6
|
||||
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
|
||||
"Nektere soubory nebudou setrideny. Maximalni pocet souboru ve slozce pro setrideni je 100."
|
||||
|
||||
|
@ -958,6 +1050,10 @@
|
|||
"Sound"
|
||||
"Zvuk"
|
||||
|
||||
# c=7
|
||||
"Runouts"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
"Some problem encountered, Z-leveling enforced ..."
|
||||
"Vyskytl se problem, srovnavam osu Z ..."
|
||||
|
@ -1002,7 +1098,7 @@
|
|||
"Select filament:"
|
||||
"Zvolte filament:"
|
||||
|
||||
#MSG_TEMP_CALIBRATION c=12 r=1
|
||||
#MSG_TEMP_CALIBRATION c=14
|
||||
"Temp. cal."
|
||||
"Tepl. kal."
|
||||
|
||||
|
@ -1022,6 +1118,10 @@
|
|||
"Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."
|
||||
"Teplotni kalibrace dokoncena a je nyni aktivni. Teplotni kalibraci je mozno deaktivovat v menu Nastaveni->Tepl. kal."
|
||||
|
||||
# c=20 r=3
|
||||
"Sensor verified, remove the filament now."
|
||||
"Senzor overen, vyjmete filament."
|
||||
|
||||
#MSG_TEMPERATURE
|
||||
"Temperature"
|
||||
"Teplota"
|
||||
|
@ -1030,7 +1130,7 @@
|
|||
"Temperatures"
|
||||
"Teploty"
|
||||
|
||||
#MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=4
|
||||
#MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9
|
||||
"There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
|
||||
"Je potreba kalibrovat osu Z. Prosim postupujte dle prirucky, kapitola Zaciname, sekce Postup kalibrace."
|
||||
|
||||
|
@ -1126,7 +1226,7 @@
|
|||
"Wizard"
|
||||
"Pruvodce"
|
||||
|
||||
#MSG_XYZ_DETAILS c=19 r=1
|
||||
#MSG_XYZ_DETAILS c=18
|
||||
"XYZ cal. details"
|
||||
"Detaily XYZ kal."
|
||||
|
||||
|
@ -1150,7 +1250,11 @@
|
|||
"XYZ calibration all right. X/Y axes are slightly skewed. Good job!"
|
||||
"Kalibrace XYZ v poradku. X/Y osy mirne zkosene. Dobra prace!"
|
||||
|
||||
#
|
||||
#MSG_TIMEOUT c=12
|
||||
"Timeout"
|
||||
"\x00"
|
||||
|
||||
#MSG_X_CORRECTION c=13
|
||||
"X-correct:"
|
||||
"Korekce X:"
|
||||
|
||||
|
@ -1190,7 +1294,11 @@
|
|||
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
|
||||
"Tiskarna zacne tisknout lomenou caru. Otacenim tlacitka nastavte optimalni vysku. Postupujte podle obrazku v handbooku (kapitola Kalibrace)."
|
||||
|
||||
#
|
||||
# c=20 r=5
|
||||
"Verification failed, remove the filament and try again."
|
||||
"Overeni selhalo, vyjmete filament a zkuste znovu."
|
||||
|
||||
#MSG_Y_CORRECTION c=13
|
||||
"Y-correct:"
|
||||
"Korekce Y:"
|
||||
|
||||
|
@ -1298,11 +1406,11 @@
|
|||
"PINDA:"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to cut"
|
||||
"Predehrev k ustrizeni"
|
||||
"Predehrev ke strihu"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to eject"
|
||||
"Predehrev k vysunuti"
|
||||
|
||||
|
@ -1314,6 +1422,10 @@
|
|||
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
|
||||
"Prumer trysky tiskarny se lisi od G-code. Prosim zkontrolujte nastaveni. Tisk zrusen."
|
||||
|
||||
# c=20
|
||||
"%s level expected"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
"Rename"
|
||||
"Prejmenovat"
|
||||
|
@ -1326,7 +1438,7 @@
|
|||
"Sensor info"
|
||||
"Senzor info"
|
||||
|
||||
#
|
||||
#MSG_SHEET c=10
|
||||
"Sheet"
|
||||
"Plat"
|
||||
|
||||
|
@ -1334,14 +1446,15 @@
|
|||
"Assist"
|
||||
"Asist."
|
||||
|
||||
#
|
||||
# c=18
|
||||
"Steel sheets"
|
||||
"Tiskove platy"
|
||||
|
||||
#
|
||||
#MSG_Z_CORRECTION c=13
|
||||
"Z-correct:"
|
||||
"Korekce Z:"
|
||||
|
||||
#MSG_Z_PROBE_NR
|
||||
"Z-probe nr."
|
||||
"Pocet mereni Z"
|
||||
|
||||
|
|
|
@ -2,6 +2,14 @@
|
|||
"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset"
|
||||
"[%.7s]Z Einstell.\x0aWert gesetzt,weiter\x0aoder mit 0 beginnen?\x0a%cWeiter%cNeu beginnen"
|
||||
|
||||
#MSG_03_OR_OLDER c=18
|
||||
" 0.3 or older"
|
||||
" 0.3 oder aelter"
|
||||
|
||||
#MSG_04_OR_NEWER c=18
|
||||
" 0.4 or newer"
|
||||
" 0.4 oder neuer"
|
||||
|
||||
#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14
|
||||
" of 4"
|
||||
" von 4"
|
||||
|
@ -42,7 +50,11 @@
|
|||
"Ambient"
|
||||
"Raumtemp."
|
||||
|
||||
#MSG_PRESS c=20
|
||||
#MSG_AUTO c=6
|
||||
"Auto"
|
||||
"\x00"
|
||||
|
||||
#MSG_PRESS c=20 r=2
|
||||
"and press the knob"
|
||||
"und Knopf druecken"
|
||||
|
||||
|
@ -58,7 +70,7 @@
|
|||
"Auto home"
|
||||
"Startposition"
|
||||
|
||||
#MSG_AUTOLOAD_FILAMENT c=17
|
||||
#MSG_AUTOLOAD_FILAMENT c=18
|
||||
"AutoLoad filament"
|
||||
"AutoLaden Filament"
|
||||
|
||||
|
@ -94,15 +106,27 @@
|
|||
"Bed level correct"
|
||||
"Ausgleich Bett ok"
|
||||
|
||||
#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=4
|
||||
#MSG_BELTTEST c=17
|
||||
"Belt test "
|
||||
"Riementest "
|
||||
|
||||
#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5
|
||||
"Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset."
|
||||
"Z-Kal. fehlgeschlg. Sensor nicht ausgeloest. Schmutzige Duese? Warte auf Reset."
|
||||
|
||||
#MSG_BRIGHT c=6
|
||||
"Bright"
|
||||
"Hell"
|
||||
|
||||
#MSG_BRIGHTNESS c=18
|
||||
"Brightness"
|
||||
"Helligkeit"
|
||||
|
||||
#MSG_BED
|
||||
"Bed"
|
||||
"Bett"
|
||||
|
||||
#MSG_MENU_BELT_STATUS c=15 r=1
|
||||
#MSG_MENU_BELT_STATUS c=18
|
||||
"Belt status"
|
||||
"Gurtstatus"
|
||||
|
||||
|
@ -166,7 +190,7 @@
|
|||
"Copy selected language?"
|
||||
"Gewaehlte Sprache kopieren?"
|
||||
|
||||
#MSG_CRASHDETECT
|
||||
#MSG_CRASHDETECT c=13
|
||||
"Crash det."
|
||||
"Crash Erk."
|
||||
|
||||
|
@ -202,11 +226,15 @@
|
|||
"Distance between tip of the nozzle and the bed surface has not been set yet. Please follow the manual, chapter First steps, section First layer calibration."
|
||||
"Der Abstand zwischen der Spitze der Duese und dem Bett ist noch nicht eingestellt. Bitte folgen Sie dem Handbuch, Kapitel Erste Schritte, Abschnitt Erste Schicht Kalibrierung."
|
||||
|
||||
#MSG_FS_CONTINUE c=5
|
||||
"Cont."
|
||||
"\x00"
|
||||
|
||||
#MSG_WIZARD_REPEAT_V2_CAL c=20 r=7
|
||||
"Do you want to repeat last step to readjust distance between nozzle and heatbed?"
|
||||
"Moechten Sie den letzten Schritt wiederholen, um den Abstand zwischen Duese und Druckbett neu einzustellen?"
|
||||
|
||||
#MSG_EXTRUDER_CORRECTION c=10
|
||||
#MSG_EXTRUDER_CORRECTION c=13
|
||||
"E-correct:"
|
||||
"E-Korrektur:"
|
||||
|
||||
|
@ -218,7 +246,7 @@
|
|||
"Ejecting filament"
|
||||
"werfe Filament aus"
|
||||
|
||||
#MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1
|
||||
#MSG_SELFTEST_ENDSTOP_NOTHIT c=20
|
||||
"Endstop not hit"
|
||||
"Ende nicht getroffen"
|
||||
|
||||
|
@ -234,10 +262,26 @@
|
|||
"Error - static memory has been overwritten"
|
||||
"Fehler - statischer Speicher wurde ueberschrieben"
|
||||
|
||||
#MSG_CUT_FILAMENT c=16
|
||||
"Cut filament"
|
||||
"Fil. schneiden"
|
||||
|
||||
#MSG_CUTTER c=9
|
||||
"Cutter"
|
||||
"Messer"
|
||||
|
||||
# c=18
|
||||
"Cutting filament"
|
||||
"Schneide filament"
|
||||
|
||||
#MSG_FSENS_NOT_RESPONDING c=20 r=4
|
||||
"ERROR: Filament sensor is not responding, please check connection."
|
||||
"FEHLER: Filament- sensor reagiert nicht, bitte Verbindung pruefen."
|
||||
|
||||
#MSG_DIM c=6
|
||||
"Dim"
|
||||
"Dimm"
|
||||
|
||||
#MSG_ERROR
|
||||
"ERROR:"
|
||||
"FEHLER:"
|
||||
|
@ -246,7 +290,7 @@
|
|||
"Extruder fan:"
|
||||
"Extruder Luefter:"
|
||||
|
||||
#MSG_INFO_EXTRUDER c=15 r=1
|
||||
#MSG_INFO_EXTRUDER c=18
|
||||
"Extruder info"
|
||||
"Extruder Info"
|
||||
|
||||
|
@ -258,7 +302,7 @@
|
|||
"Fail stats MMU"
|
||||
"MMU-Fehler"
|
||||
|
||||
#MSG_FSENSOR_AUTOLOAD
|
||||
#MSG_FSENSOR_AUTOLOAD c=13
|
||||
"F. autoload"
|
||||
"F. autoladen"
|
||||
|
||||
|
@ -280,9 +324,9 @@
|
|||
|
||||
#MSG_FSENSOR
|
||||
"Fil. sensor"
|
||||
"\x00"
|
||||
"Fil. Sensor"
|
||||
|
||||
#
|
||||
# c=14
|
||||
"Filam. runouts"
|
||||
"Filam. Maengel"
|
||||
|
||||
|
@ -298,7 +342,7 @@
|
|||
"Filament sensor"
|
||||
"Filamentsensor"
|
||||
|
||||
#MSG_FILAMENT_USED c=19 r=1
|
||||
#MSG_FILAMENT_USED c=19
|
||||
"Filament used"
|
||||
"Filament benutzt"
|
||||
|
||||
|
@ -306,15 +350,23 @@
|
|||
"Print time"
|
||||
"Druckzeit"
|
||||
|
||||
#MSG_FILE_INCOMPLETE c=20 r=2
|
||||
#MSG_FS_ACTION c=10
|
||||
"FS Action"
|
||||
"FS Aktion"
|
||||
|
||||
# c=18
|
||||
"FS v0.4 or newer"
|
||||
"FS v0.4 oder neuer"
|
||||
|
||||
#MSG_FILE_INCOMPLETE c=20 r=3
|
||||
"File incomplete. Continue anyway?"
|
||||
"Datei unvollstaendig Trotzdem fortfahren?"
|
||||
|
||||
#MSG_FINISHING_MOVEMENTS c=20 r=1
|
||||
#MSG_FINISHING_MOVEMENTS c=20
|
||||
"Finishing movements"
|
||||
"Bewegung beenden"
|
||||
|
||||
#MSG_V2_CALIBRATION c=17 r=1
|
||||
#MSG_V2_CALIBRATION c=18
|
||||
"First layer cal."
|
||||
"Erste-Schicht Kal."
|
||||
|
||||
|
@ -478,6 +530,10 @@
|
|||
"Live adjust Z"
|
||||
"Z einstellen"
|
||||
|
||||
# c=20 r=6
|
||||
"Insert the filament (do not load it) into the extruder and then press the knob."
|
||||
"Stecken Sie das Filament (nicht laden) in den Extruder und druecken Sie dann den Knopf."
|
||||
|
||||
#MSG_LOAD_FILAMENT c=17
|
||||
"Load filament"
|
||||
"Filament laden"
|
||||
|
@ -498,7 +554,7 @@
|
|||
"Load to nozzle"
|
||||
"In Druckduese laden"
|
||||
|
||||
#MSG_M117_V2_CALIBRATION c=25 r=1
|
||||
#MSG_M117_V2_CALIBRATION c=25
|
||||
"M117 First layer cal."
|
||||
"M117 Erste-Schicht Kal."
|
||||
|
||||
|
@ -506,6 +562,14 @@
|
|||
"Main"
|
||||
"Hauptmenue"
|
||||
|
||||
#MSG_BL_HIGH c=12
|
||||
"Level Bright"
|
||||
"Hell.wert"
|
||||
|
||||
#MSG_BL_LOW c=12
|
||||
"Level Dimmed"
|
||||
"Dimmwert"
|
||||
|
||||
#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60
|
||||
"Measuring reference height of calibration point"
|
||||
"Messen der Referenzhoehe des Kalibrierpunktes"
|
||||
|
@ -546,6 +610,10 @@
|
|||
"Mode"
|
||||
"Modus"
|
||||
|
||||
# c=20 r=3
|
||||
"MK3 firmware detected on MK3S printer"
|
||||
"MK3-Firmware am MK3S-Drucker erkannt"
|
||||
|
||||
#MSG_NORMAL
|
||||
"Normal"
|
||||
"\x00"
|
||||
|
@ -568,7 +636,7 @@
|
|||
|
||||
#MSG_AUTO_POWER
|
||||
"Auto power"
|
||||
"\x00"
|
||||
"Auto Leist"
|
||||
|
||||
#MSG_HIGH_POWER
|
||||
"High power"
|
||||
|
@ -638,7 +706,7 @@
|
|||
"Nozzle"
|
||||
"Duese"
|
||||
|
||||
#MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
|
||||
#MSG_DEFAULT_SETTINGS_LOADED c=20 r=5
|
||||
"Old settings found. Default PID, Esteps etc. will be set."
|
||||
"Alte Einstellungen gefunden. Standard PID, E-Steps u.s.w. werden gesetzt."
|
||||
|
||||
|
@ -670,7 +738,7 @@
|
|||
"PINDA Heating"
|
||||
"PINDA erwaermen"
|
||||
|
||||
#MSG_PAPER c=20 r=8
|
||||
#MSG_PAPER c=20 r=10
|
||||
"Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."
|
||||
"Legen Sie ein Blatt Papier unter die Duese waehrend der Kalibrierung der ersten 4 Punkte. Wenn die Duese das Papier erfasst, den Drucker sofort ausschalten."
|
||||
|
||||
|
@ -742,6 +810,10 @@
|
|||
"Preheating nozzle. Please wait."
|
||||
"Vorheizen der Duese. Bitte warten."
|
||||
|
||||
# c=14
|
||||
"PINDA"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
"Please upgrade."
|
||||
"Bitte aktualisieren."
|
||||
|
@ -750,6 +822,10 @@
|
|||
"Press knob to preheat nozzle and continue."
|
||||
"Bitte druecken Sie den Knopf um die Duese vorzuheizen und fortzufahren."
|
||||
|
||||
#MSG_FS_PAUSE c=5
|
||||
"Pause"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
"Power failures"
|
||||
"Netzfehler"
|
||||
|
@ -758,11 +834,11 @@
|
|||
"Print aborted"
|
||||
"Druck abgebrochen"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to load"
|
||||
"Heizen zum Laden"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to unload"
|
||||
"Heizen zum Entladen"
|
||||
|
||||
|
@ -814,15 +890,19 @@
|
|||
"Rear side [um]"
|
||||
"Hinten [um]"
|
||||
|
||||
#MSG_RECOVERING_PRINT c=20 r=1
|
||||
"Recovering print "
|
||||
"Druck wiederherst "
|
||||
# c=20 r=4
|
||||
"Please unload the filament first, then repeat this action."
|
||||
"Bitte entladen Sie erst das Filament und versuchen Sie es nochmal."
|
||||
|
||||
#MSG_REMOVE_OLD_FILAMENT c=20 r=4
|
||||
#MSG_RECOVERING_PRINT c=20
|
||||
"Recovering print "
|
||||
"Druck wiederherst "
|
||||
|
||||
#MSG_REMOVE_OLD_FILAMENT c=20 r=5
|
||||
"Remove old filament and press the knob to start loading new filament."
|
||||
"Entfernen Sie das alte Filament und druecken Sie den Knopf, um das neue zu laden."
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Prusa i3 MK3S OK."
|
||||
"\x00"
|
||||
|
||||
|
@ -838,7 +918,7 @@
|
|||
"Resume print"
|
||||
"Druck fortsetzen"
|
||||
|
||||
#MSG_RESUMING_PRINT c=20 r=1
|
||||
#MSG_RESUMING_PRINT c=20
|
||||
"Resuming print"
|
||||
"Druck fortgesetzt"
|
||||
|
||||
|
@ -906,11 +986,23 @@
|
|||
"Set temperature:"
|
||||
"Temp. einstellen:"
|
||||
|
||||
# c=20
|
||||
"Prusa i3 MK2.5 OK."
|
||||
"\x00"
|
||||
|
||||
# c=20
|
||||
"Prusa i3 MK2.5S OK."
|
||||
"\x00"
|
||||
|
||||
# c=20
|
||||
"Prusa i3 MK3 OK."
|
||||
"\x00"
|
||||
|
||||
#MSG_SETTINGS
|
||||
"Settings"
|
||||
"Einstellungen"
|
||||
|
||||
#MSG_SHOW_END_STOPS c=17 r=1
|
||||
#MSG_SHOW_END_STOPS c=18
|
||||
"Show end stops"
|
||||
"Endschalter Status"
|
||||
|
||||
|
@ -918,7 +1010,7 @@
|
|||
"Sensor state"
|
||||
"Sensorstatus"
|
||||
|
||||
#MSG_FILE_CNT c=20 r=4
|
||||
#MSG_FILE_CNT c=20 r=6
|
||||
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
|
||||
"Einige Dateien wur- den nicht sortiert. Max. Dateien pro Verzeichnis = 100."
|
||||
|
||||
|
@ -956,6 +1048,10 @@
|
|||
|
||||
#MSG_SOUND
|
||||
"Sound"
|
||||
"Ton"
|
||||
|
||||
# c=7
|
||||
"Runouts"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
|
@ -1002,7 +1098,7 @@
|
|||
"Select filament:"
|
||||
"Filament auswaehlen:"
|
||||
|
||||
#MSG_TEMP_CALIBRATION c=12 r=1
|
||||
#MSG_TEMP_CALIBRATION c=14
|
||||
"Temp. cal."
|
||||
"Temp Kalib."
|
||||
|
||||
|
@ -1022,6 +1118,10 @@
|
|||
"Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."
|
||||
"Temp.kalibrierung ist fertig + aktiv. Temp.kalibrierung kann ausgeschaltet werden im Menu Einstellungen -> Temp.kal."
|
||||
|
||||
# c=20 r=3
|
||||
"Sensor verified, remove the filament now."
|
||||
"Sensor ueberprueft, entladen Sie jetzt das Filament."
|
||||
|
||||
#MSG_TEMPERATURE
|
||||
"Temperature"
|
||||
"Temperatur"
|
||||
|
@ -1030,9 +1130,9 @@
|
|||
"Temperatures"
|
||||
"Temperaturen"
|
||||
|
||||
#MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=4
|
||||
#MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9
|
||||
"There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
|
||||
"Es ist noch notwendig die Z-Kalibrierung auszufuehren. Bitte befolgen Sie das Handbuch, Kapitel Erste Schritte, Abschnitt Kalibrierablauf."
|
||||
"Es ist noch not- wendig die Z- Kalibrierung aus- zufuehren. Bitte befolgen Sie das Handbuch, Kapitel Erste Schritte, Abschnitt Kalibrierablauf."
|
||||
|
||||
#
|
||||
"Total filament"
|
||||
|
@ -1126,7 +1226,7 @@
|
|||
"Wizard"
|
||||
"Assistent"
|
||||
|
||||
#MSG_XYZ_DETAILS c=19 r=1
|
||||
#MSG_XYZ_DETAILS c=18
|
||||
"XYZ cal. details"
|
||||
"XYZ Kal. Details"
|
||||
|
||||
|
@ -1150,7 +1250,11 @@
|
|||
"XYZ calibration all right. X/Y axes are slightly skewed. Good job!"
|
||||
"XYZ Kalibrierung in Ordnung. X/Y Achsen sind etwas schraeg."
|
||||
|
||||
#
|
||||
#MSG_TIMEOUT c=12
|
||||
"Timeout"
|
||||
"Verzoegerung"
|
||||
|
||||
#MSG_X_CORRECTION c=13
|
||||
"X-correct:"
|
||||
"X-Korrektur:"
|
||||
|
||||
|
@ -1190,7 +1294,11 @@
|
|||
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
|
||||
"Der Drucker beginnt mit dem Drucken einer Zickzacklinie. Drehen Sie den Knopf, bis Sie die optimale Hoehe erreicht haben. Ueberpruefen Sie die Bilder im Handbuch (Kapitel Kalibrierung)."
|
||||
|
||||
#
|
||||
# c=20 r=5
|
||||
"Verification failed, remove the filament and try again."
|
||||
"Ueberpruefung fehl- geschlagen, entladen Sie das Filament und versuchen Sie es erneut."
|
||||
|
||||
#MSG_Y_CORRECTION c=13
|
||||
"Y-correct:"
|
||||
"Y-Korrektur:"
|
||||
|
||||
|
@ -1298,11 +1406,11 @@
|
|||
"PINDA:"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to cut"
|
||||
"Heizen zum Schnitt"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to eject"
|
||||
"Heizen zum Auswurf"
|
||||
|
||||
|
@ -1314,6 +1422,10 @@
|
|||
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
|
||||
"Der Durchmesser der Druckerduese weicht vom G-Code ab. Bitte ueberpruefen Sie den Wert in den Einstellungen. Druck abgebrochen."
|
||||
|
||||
# c=20
|
||||
"%s level expected"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
"Rename"
|
||||
"Umbenennen"
|
||||
|
@ -1326,22 +1438,23 @@
|
|||
"Sensor info"
|
||||
"Sensor Info"
|
||||
|
||||
#
|
||||
#MSG_SHEET c=10
|
||||
"Sheet"
|
||||
"Blech"
|
||||
"Stahlblech"
|
||||
|
||||
#MSG_SOUND_BLIND
|
||||
"Assist"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
# c=18
|
||||
"Steel sheets"
|
||||
"Stahlbleche"
|
||||
|
||||
#
|
||||
#MSG_Z_CORRECTION c=13
|
||||
"Z-correct:"
|
||||
"Z-Korrektur:"
|
||||
|
||||
#MSG_Z_PROBE_NR
|
||||
"Z-probe nr."
|
||||
"\x00"
|
||||
|
||||
|
|
|
@ -2,6 +2,14 @@
|
|||
"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset"
|
||||
"[%.7s]Ajuste Z\x0aAjustado, continuar\x0ao empezar de nuevo?\x0a%cContinuar%cRepetir"
|
||||
|
||||
#MSG_03_OR_OLDER c=18
|
||||
" 0.3 or older"
|
||||
" 0.3 o mayor"
|
||||
|
||||
#MSG_04_OR_NEWER c=18
|
||||
" 0.4 or newer"
|
||||
" 0.4 o mas nueva"
|
||||
|
||||
#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14
|
||||
" of 4"
|
||||
" de 4"
|
||||
|
@ -42,7 +50,11 @@
|
|||
"Ambient"
|
||||
"Ambiente"
|
||||
|
||||
#MSG_PRESS c=20
|
||||
#MSG_AUTO c=6
|
||||
"Auto"
|
||||
"\x00"
|
||||
|
||||
#MSG_PRESS c=20 r=2
|
||||
"and press the knob"
|
||||
"Haz clic"
|
||||
|
||||
|
@ -58,9 +70,9 @@
|
|||
"Auto home"
|
||||
"Llevar al origen"
|
||||
|
||||
#MSG_AUTOLOAD_FILAMENT c=17
|
||||
#MSG_AUTOLOAD_FILAMENT c=18
|
||||
"AutoLoad filament"
|
||||
"Carga automatica de filamento"
|
||||
"Carga auto. filam."
|
||||
|
||||
#MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4
|
||||
"Autoloading filament available only when filament sensor is turned on..."
|
||||
|
@ -94,17 +106,29 @@
|
|||
"Bed level correct"
|
||||
"Corr. de la cama"
|
||||
|
||||
#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=4
|
||||
#MSG_BELTTEST c=17
|
||||
"Belt test "
|
||||
"Test cinturon "
|
||||
|
||||
#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5
|
||||
"Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset."
|
||||
"Nivelacion fallada. Sensor no funciona. Restos en boquilla? Esperando reset."
|
||||
|
||||
#MSG_BRIGHT c=6
|
||||
"Bright"
|
||||
"Brill."
|
||||
|
||||
#MSG_BRIGHTNESS c=18
|
||||
"Brightness"
|
||||
"Brillo"
|
||||
|
||||
#MSG_BED
|
||||
"Bed"
|
||||
"Base"
|
||||
|
||||
#MSG_MENU_BELT_STATUS c=15 r=1
|
||||
#MSG_MENU_BELT_STATUS c=18
|
||||
"Belt status"
|
||||
"Estado de la correa"
|
||||
"Estado de correa"
|
||||
|
||||
#MSG_RECOVER_PRINT c=20 r=2
|
||||
"Blackout occurred. Recover print?"
|
||||
|
@ -166,7 +190,7 @@
|
|||
"Copy selected language?"
|
||||
"Copiar idioma seleccionado?"
|
||||
|
||||
#MSG_CRASHDETECT
|
||||
#MSG_CRASHDETECT c=13
|
||||
"Crash det."
|
||||
"Det. choque"
|
||||
|
||||
|
@ -202,23 +226,27 @@
|
|||
"Distance between tip of the nozzle and the bed surface has not been set yet. Please follow the manual, chapter First steps, section First layer calibration."
|
||||
"Distancia entre la punta del boquilla y la superficie de la base aun no fijada. Por favor siga el manual, capitulo Primeros Pasos, Calibracion primera capa."
|
||||
|
||||
#MSG_FS_CONTINUE c=5
|
||||
"Cont."
|
||||
"\x00"
|
||||
|
||||
#MSG_WIZARD_REPEAT_V2_CAL c=20 r=7
|
||||
"Do you want to repeat last step to readjust distance between nozzle and heatbed?"
|
||||
"Quieres repetir el ultimo paso para reajustar la distancia boquilla-base?"
|
||||
|
||||
#MSG_EXTRUDER_CORRECTION c=10
|
||||
#MSG_EXTRUDER_CORRECTION c=13
|
||||
"E-correct:"
|
||||
"Corregir-E:"
|
||||
|
||||
#MSG_EJECT_FILAMENT c=17 r=1
|
||||
"Eject filament"
|
||||
"Expulsar filamento"
|
||||
"Expulsar fil."
|
||||
|
||||
#MSG_EJECTING_FILAMENT c=20 r=1
|
||||
"Ejecting filament"
|
||||
"Expulsando filamento"
|
||||
|
||||
#MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1
|
||||
#MSG_SELFTEST_ENDSTOP_NOTHIT c=20
|
||||
"Endstop not hit"
|
||||
"Endstop no alcanzado"
|
||||
|
||||
|
@ -234,10 +262,26 @@
|
|||
"Error - static memory has been overwritten"
|
||||
"Error - se ha sobre-escrito la memoria estatica"
|
||||
|
||||
#MSG_CUT_FILAMENT c=16
|
||||
"Cut filament"
|
||||
"Cortar filament"
|
||||
|
||||
#MSG_CUTTER c=9
|
||||
"Cutter"
|
||||
"Cuchillo"
|
||||
|
||||
# c=18
|
||||
"Cutting filament"
|
||||
"Corte de filament"
|
||||
|
||||
#MSG_FSENS_NOT_RESPONDING c=20 r=4
|
||||
"ERROR: Filament sensor is not responding, please check connection."
|
||||
"ERROR: El sensor de filamento no responde, por favor comprueba la conexion."
|
||||
|
||||
#MSG_DIM c=6
|
||||
"Dim"
|
||||
"\x00"
|
||||
|
||||
#MSG_ERROR
|
||||
"ERROR:"
|
||||
"\x00"
|
||||
|
@ -246,9 +290,9 @@
|
|||
"Extruder fan:"
|
||||
"Vent.extrusor:"
|
||||
|
||||
#MSG_INFO_EXTRUDER c=15 r=1
|
||||
#MSG_INFO_EXTRUDER c=18
|
||||
"Extruder info"
|
||||
"Informacion del extrusor"
|
||||
"Info. del extrusor"
|
||||
|
||||
#MSG_MOVE_E
|
||||
"Extruder"
|
||||
|
@ -258,7 +302,7 @@
|
|||
"Fail stats MMU"
|
||||
"Estadistica de fallos MMU"
|
||||
|
||||
#MSG_FSENSOR_AUTOLOAD
|
||||
#MSG_FSENSOR_AUTOLOAD c=13
|
||||
"F. autoload"
|
||||
"Autocarg.fil."
|
||||
|
||||
|
@ -268,7 +312,7 @@
|
|||
|
||||
#MSG_FAN_SPEED c=14
|
||||
"Fan speed"
|
||||
"Velocidad Vent."
|
||||
"Velocidad Vent"
|
||||
|
||||
#MSG_SELFTEST_FAN c=20
|
||||
"Fan test"
|
||||
|
@ -282,7 +326,7 @@
|
|||
"Fil. sensor"
|
||||
"Sensor Fil."
|
||||
|
||||
#
|
||||
# c=14
|
||||
"Filam. runouts"
|
||||
"Filam. acabado"
|
||||
|
||||
|
@ -298,7 +342,7 @@
|
|||
"Filament sensor"
|
||||
"Sensor de filamento"
|
||||
|
||||
#MSG_FILAMENT_USED c=19 r=1
|
||||
#MSG_FILAMENT_USED c=19
|
||||
"Filament used"
|
||||
"Filamento usado"
|
||||
|
||||
|
@ -306,15 +350,23 @@
|
|||
"Print time"
|
||||
"Tiempo de imp.:"
|
||||
|
||||
#MSG_FILE_INCOMPLETE c=20 r=2
|
||||
#MSG_FS_ACTION c=10
|
||||
"FS Action"
|
||||
"FS accion"
|
||||
|
||||
# c=18
|
||||
"FS v0.4 or newer"
|
||||
"FS v0.4 o +nueva"
|
||||
|
||||
#MSG_FILE_INCOMPLETE c=20 r=3
|
||||
"File incomplete. Continue anyway?"
|
||||
"Archivo incompleto. ?Continuar de todos modos?"
|
||||
|
||||
#MSG_FINISHING_MOVEMENTS c=20 r=1
|
||||
#MSG_FINISHING_MOVEMENTS c=20
|
||||
"Finishing movements"
|
||||
"Term. movimientos"
|
||||
|
||||
#MSG_V2_CALIBRATION c=17 r=1
|
||||
#MSG_V2_CALIBRATION c=18
|
||||
"First layer cal."
|
||||
"Cal. primera cap."
|
||||
|
||||
|
@ -356,7 +408,7 @@
|
|||
|
||||
#MSG_HEATING_COMPLETE c=20
|
||||
"Heating done."
|
||||
"Calentamiento acabado."
|
||||
"Calentando acabado."
|
||||
|
||||
#MSG_HEATING
|
||||
"Heating"
|
||||
|
@ -396,7 +448,7 @@
|
|||
|
||||
#MSG_SELFTEST_CHECK_FSENSOR c=20
|
||||
"Checking sensors "
|
||||
"Comprobando los sensores"
|
||||
"Comprobando sensores"
|
||||
|
||||
#MSG_SELFTEST_CHECK_X c=20
|
||||
"Checking X axis "
|
||||
|
@ -444,7 +496,7 @@
|
|||
|
||||
#MSG_STEEL_SHEET_CHECK c=20 r=2
|
||||
"Is steel sheet on heatbed?"
|
||||
"?Esta colocada la lamina de acero sobre la base?"
|
||||
"?Esta colocada la lamina sobre la base"
|
||||
|
||||
#
|
||||
"Last print failures"
|
||||
|
@ -478,6 +530,10 @@
|
|||
"Live adjust Z"
|
||||
"Micropaso Eje Z"
|
||||
|
||||
# c=20 r=6
|
||||
"Insert the filament (do not load it) into the extruder and then press the knob."
|
||||
"Inserte el filamento (no lo cargue) en el extrusor y luego presione el dial."
|
||||
|
||||
#MSG_LOAD_FILAMENT c=17
|
||||
"Load filament"
|
||||
"Introducir filam."
|
||||
|
@ -498,7 +554,7 @@
|
|||
"Load to nozzle"
|
||||
"Cargar a la boquilla"
|
||||
|
||||
#MSG_M117_V2_CALIBRATION c=25 r=1
|
||||
#MSG_M117_V2_CALIBRATION c=25
|
||||
"M117 First layer cal."
|
||||
"M117 Cal. primera cap."
|
||||
|
||||
|
@ -506,6 +562,14 @@
|
|||
"Main"
|
||||
"Menu principal"
|
||||
|
||||
#MSG_BL_HIGH c=12
|
||||
"Level Bright"
|
||||
"Valor brill."
|
||||
|
||||
#MSG_BL_LOW c=12
|
||||
"Level Dimmed"
|
||||
"\x00"
|
||||
|
||||
#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60
|
||||
"Measuring reference height of calibration point"
|
||||
"Midiendo altura del punto de calibracion"
|
||||
|
@ -546,6 +610,10 @@
|
|||
"Mode"
|
||||
"Modo"
|
||||
|
||||
# c=20 r=3
|
||||
"MK3 firmware detected on MK3S printer"
|
||||
"Firmware MK3 detectado en impresora MK3S"
|
||||
|
||||
#MSG_NORMAL
|
||||
"Normal"
|
||||
"\x00"
|
||||
|
@ -638,7 +706,7 @@
|
|||
"Nozzle"
|
||||
"Boquilla"
|
||||
|
||||
#MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
|
||||
#MSG_DEFAULT_SETTINGS_LOADED c=20 r=5
|
||||
"Old settings found. Default PID, Esteps etc. will be set."
|
||||
"Se han encontrado ajustes anteriores. Se ajustara el PID, los pasos del extrusor, etc"
|
||||
|
||||
|
@ -670,7 +738,7 @@
|
|||
"PINDA Heating"
|
||||
"Calentando PINDA"
|
||||
|
||||
#MSG_PAPER c=20 r=8
|
||||
#MSG_PAPER c=20 r=10
|
||||
"Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."
|
||||
"Colocar una hoja de papel sobre la superficie de impresion durante la calibracion de los primeros 4 puntos. Si la boquilla mueve el papel, apagar impresora inmediatamente."
|
||||
|
||||
|
@ -732,7 +800,7 @@
|
|||
|
||||
#MSG_PREHEAT_NOZZLE c=20
|
||||
"Preheat the nozzle!"
|
||||
"Precalienta extrusor!"
|
||||
"Precalienta extrusor"
|
||||
|
||||
#MSG_PREHEAT
|
||||
"Preheat"
|
||||
|
@ -742,6 +810,10 @@
|
|||
"Preheating nozzle. Please wait."
|
||||
"Precalentando nozzle. Espera por favor."
|
||||
|
||||
# c=14
|
||||
"PINDA"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
"Please upgrade."
|
||||
"Actualize por favor"
|
||||
|
@ -750,6 +822,10 @@
|
|||
"Press knob to preheat nozzle and continue."
|
||||
"Pulsa el dial para precalentar la boquilla y continue."
|
||||
|
||||
#MSG_FS_PAUSE c=5
|
||||
"Pause"
|
||||
"Pausa"
|
||||
|
||||
#
|
||||
"Power failures"
|
||||
"Cortes de energia"
|
||||
|
@ -758,13 +834,13 @@
|
|||
"Print aborted"
|
||||
"Impresion cancelada"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to load"
|
||||
"Precalentar para cargar"
|
||||
"Precalent. cargar"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to unload"
|
||||
"Precalentar para descargar"
|
||||
"Precalent. descargar"
|
||||
|
||||
#MSG_SELFTEST_PRINT_FAN_SPEED c=18
|
||||
"Print fan:"
|
||||
|
@ -814,15 +890,19 @@
|
|||
"Rear side [um]"
|
||||
"Trasera [um]"
|
||||
|
||||
#MSG_RECOVERING_PRINT c=20 r=1
|
||||
"Recovering print "
|
||||
"Recuperando impresion"
|
||||
# c=20 r=4
|
||||
"Please unload the filament first, then repeat this action."
|
||||
"Primero descargue el filamento, luego repita esta accion."
|
||||
|
||||
#MSG_REMOVE_OLD_FILAMENT c=20 r=4
|
||||
#MSG_RECOVERING_PRINT c=20
|
||||
"Recovering print "
|
||||
"Recuper. impresion "
|
||||
|
||||
#MSG_REMOVE_OLD_FILAMENT c=20 r=5
|
||||
"Remove old filament and press the knob to start loading new filament."
|
||||
"Retire el filamento viejo y presione el dial para comenzar a cargar el nuevo filamento."
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Prusa i3 MK3S OK."
|
||||
"\x00"
|
||||
|
||||
|
@ -838,9 +918,9 @@
|
|||
"Resume print"
|
||||
"Reanudar impres."
|
||||
|
||||
#MSG_RESUMING_PRINT c=20 r=1
|
||||
#MSG_RESUMING_PRINT c=20
|
||||
"Resuming print"
|
||||
"Continuando impresion"
|
||||
"Continuan. impresion"
|
||||
|
||||
#MSG_BED_CORRECTION_RIGHT c=14 r=1
|
||||
"Right side[um]"
|
||||
|
@ -884,7 +964,7 @@
|
|||
|
||||
#MSG_SELFTEST
|
||||
"Selftest "
|
||||
"Selftest"
|
||||
"\x00"
|
||||
|
||||
#MSG_SELFTEST_ERROR
|
||||
"Selftest error !"
|
||||
|
@ -906,11 +986,23 @@
|
|||
"Set temperature:"
|
||||
"Establecer temp.:"
|
||||
|
||||
# c=20
|
||||
"Prusa i3 MK2.5 OK."
|
||||
"\x00"
|
||||
|
||||
# c=20
|
||||
"Prusa i3 MK2.5S OK."
|
||||
"\x00"
|
||||
|
||||
# c=20
|
||||
"Prusa i3 MK3 OK."
|
||||
"\x00"
|
||||
|
||||
#MSG_SETTINGS
|
||||
"Settings"
|
||||
"Configuracion"
|
||||
|
||||
#MSG_SHOW_END_STOPS c=17 r=1
|
||||
#MSG_SHOW_END_STOPS c=18
|
||||
"Show end stops"
|
||||
"Mostrar endstops"
|
||||
|
||||
|
@ -918,7 +1010,7 @@
|
|||
"Sensor state"
|
||||
"Estado del sensor"
|
||||
|
||||
#MSG_FILE_CNT c=20 r=4
|
||||
#MSG_FILE_CNT c=20 r=6
|
||||
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
|
||||
"Algunos archivos no se ordenaran. Maximo 100 archivos por carpeta para ordenar. "
|
||||
|
||||
|
@ -958,6 +1050,10 @@
|
|||
"Sound"
|
||||
"Sonido"
|
||||
|
||||
# c=7
|
||||
"Runouts"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
"Some problem encountered, Z-leveling enforced ..."
|
||||
"Problema encontrado, nivelacion Z forzosa ..."
|
||||
|
@ -1002,7 +1098,7 @@
|
|||
"Select filament:"
|
||||
"Selecciona filamento:"
|
||||
|
||||
#MSG_TEMP_CALIBRATION c=12 r=1
|
||||
#MSG_TEMP_CALIBRATION c=14
|
||||
"Temp. cal."
|
||||
"Cal. temp."
|
||||
|
||||
|
@ -1022,6 +1118,10 @@
|
|||
"Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."
|
||||
"Calibracion temperatura terminada. Haz clic para continuar."
|
||||
|
||||
# c=20 r=3
|
||||
"Sensor verified, remove the filament now."
|
||||
"Sensor verificado, retire el filamento ahora."
|
||||
|
||||
#MSG_TEMPERATURE
|
||||
"Temperature"
|
||||
"Temperatura"
|
||||
|
@ -1030,7 +1130,7 @@
|
|||
"Temperatures"
|
||||
"Temperaturas"
|
||||
|
||||
#MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=4
|
||||
#MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9
|
||||
"There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
|
||||
"Todavia es necesario hacer una calibracion Z. Por favor siga el manual, capitulo Primeros pasos, seccion Calibracion del flujo."
|
||||
|
||||
|
@ -1126,9 +1226,9 @@
|
|||
"Wizard"
|
||||
"\x00"
|
||||
|
||||
#MSG_XYZ_DETAILS c=19 r=1
|
||||
#MSG_XYZ_DETAILS c=18
|
||||
"XYZ cal. details"
|
||||
"Detalles de calibracion XYZ"
|
||||
"Detalles cal. XYZ"
|
||||
|
||||
#MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8
|
||||
"XYZ calibration failed. Please consult the manual."
|
||||
|
@ -1150,7 +1250,11 @@
|
|||
"XYZ calibration all right. X/Y axes are slightly skewed. Good job!"
|
||||
"Calibracion XYZ correcta. Los ejes X / Y estan ligeramente inclinados. Buen trabajo!"
|
||||
|
||||
#
|
||||
#MSG_TIMEOUT c=12
|
||||
"Timeout"
|
||||
"Expirar"
|
||||
|
||||
#MSG_X_CORRECTION c=13
|
||||
"X-correct:"
|
||||
"Corregir-X:"
|
||||
|
||||
|
@ -1190,7 +1294,11 @@
|
|||
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
|
||||
"La impresora comenzara a imprimir una linea en zig-zag. Gira el dial hasta que la linea alcance la altura optima. Mira las fotos del manual (Capitulo de calibracion)."
|
||||
|
||||
#
|
||||
# c=20 r=5
|
||||
"Verification failed, remove the filament and try again."
|
||||
"La verificacion fallo, retire el filamento e intente nuevamente."
|
||||
|
||||
#MSG_Y_CORRECTION c=13
|
||||
"Y-correct:"
|
||||
"Corregir-Y:"
|
||||
|
||||
|
@ -1298,13 +1406,13 @@
|
|||
"PINDA:"
|
||||
"PINDA:"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to cut"
|
||||
"Precalentando para laminar"
|
||||
"Precalent. laminar"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to eject"
|
||||
"Precalentar para expulsar"
|
||||
"Precalent. expulsar"
|
||||
|
||||
#
|
||||
"Printer nozzle diameter differs from the G-code. Continue?"
|
||||
|
@ -1314,6 +1422,10 @@
|
|||
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
|
||||
"Diametro nozzle Impresora difiere de cod.G. Comprueba los valores en ajustes. Impresion cancelada."
|
||||
|
||||
# c=20
|
||||
"%s level expected"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
"Rename"
|
||||
"Renombrar"
|
||||
|
@ -1326,7 +1438,7 @@
|
|||
"Sensor info"
|
||||
"Info sensor"
|
||||
|
||||
#
|
||||
#MSG_SHEET c=10
|
||||
"Sheet"
|
||||
"Lamina"
|
||||
|
||||
|
@ -1334,14 +1446,15 @@
|
|||
"Assist"
|
||||
"Asistido"
|
||||
|
||||
#
|
||||
# c=18
|
||||
"Steel sheets"
|
||||
"Lamina de acero"
|
||||
|
||||
#
|
||||
#MSG_Z_CORRECTION c=13
|
||||
"Z-correct:"
|
||||
"Corregir-Z:"
|
||||
|
||||
#MSG_Z_PROBE_NR
|
||||
"Z-probe nr."
|
||||
"Z-sensor nr."
|
||||
|
||||
|
|
|
@ -2,6 +2,14 @@
|
|||
"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset"
|
||||
"[%.7s]Ajust. du Z\x0aValeur enreg, contin\x0aou depart a zero?\x0a%cContinuer%cReset"
|
||||
|
||||
#MSG_03_OR_OLDER c=18
|
||||
" 0.3 or older"
|
||||
" 0.3 ou +ancien"
|
||||
|
||||
#MSG_04_OR_NEWER c=18
|
||||
" 0.4 or newer"
|
||||
" 0.4 ou +recent"
|
||||
|
||||
#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14
|
||||
" of 4"
|
||||
" de 4"
|
||||
|
@ -20,7 +28,7 @@
|
|||
|
||||
#MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4
|
||||
"WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode"
|
||||
"ATTENTION:\x0aDetection de crash\x0adesactivee en\x0amode feutre"
|
||||
"ATTENTION:\x0aDetection de crash\x0adesactivee en\x0amode furtif"
|
||||
|
||||
#
|
||||
">Cancel"
|
||||
|
@ -42,9 +50,13 @@
|
|||
"Ambient"
|
||||
"Ambiant"
|
||||
|
||||
#MSG_PRESS c=20
|
||||
#MSG_AUTO c=6
|
||||
"Auto"
|
||||
"\x00"
|
||||
|
||||
#MSG_PRESS c=20 r=2
|
||||
"and press the knob"
|
||||
"et pressez le bouton"
|
||||
"et appuyez sur le bouton"
|
||||
|
||||
#MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2
|
||||
"Are left and right Z~carriages all up?"
|
||||
|
@ -58,7 +70,7 @@
|
|||
"Auto home"
|
||||
"Mise a 0 des axes"
|
||||
|
||||
#MSG_AUTOLOAD_FILAMENT c=17
|
||||
#MSG_AUTOLOAD_FILAMENT c=18
|
||||
"AutoLoad filament"
|
||||
"Autocharge du fil."
|
||||
|
||||
|
@ -94,15 +106,27 @@
|
|||
"Bed level correct"
|
||||
"Corr. niveau plateau"
|
||||
|
||||
#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=4
|
||||
#MSG_BELTTEST c=17
|
||||
"Belt test "
|
||||
"Test de courroie "
|
||||
|
||||
#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5
|
||||
"Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset."
|
||||
"Echec bed leveling. Capt. non declenche. Debris sur buse? En attente d'un reset."
|
||||
"Capt. non declenche pendant que je nivele le plateau. Debris sur buse? En attente d'un reset."
|
||||
|
||||
#MSG_BRIGHT c=6
|
||||
"Bright"
|
||||
"Brill."
|
||||
|
||||
#MSG_BRIGHTNESS c=18
|
||||
"Brightness"
|
||||
"Luminosite"
|
||||
|
||||
#MSG_BED
|
||||
"Bed"
|
||||
"Lit"
|
||||
|
||||
#MSG_MENU_BELT_STATUS c=15 r=1
|
||||
#MSG_MENU_BELT_STATUS c=18
|
||||
"Belt status"
|
||||
"Statut courroie"
|
||||
|
||||
|
@ -164,9 +188,9 @@
|
|||
|
||||
#
|
||||
"Copy selected language?"
|
||||
"Copier la langue selectionne?"
|
||||
"Copier la langue choisie?"
|
||||
|
||||
#MSG_CRASHDETECT
|
||||
#MSG_CRASHDETECT c=13
|
||||
"Crash det."
|
||||
"Detect.crash"
|
||||
|
||||
|
@ -202,11 +226,15 @@
|
|||
"Distance between tip of the nozzle and the bed surface has not been set yet. Please follow the manual, chapter First steps, section First layer calibration."
|
||||
"La distance entre la pointe de la buse et la surface du plateau n'a pas encore ete reglee. Suivez le manuel, chapitre Premiers pas, section Calibration de la premiere couche."
|
||||
|
||||
#MSG_FS_CONTINUE c=5
|
||||
"Cont."
|
||||
"\x00"
|
||||
|
||||
#MSG_WIZARD_REPEAT_V2_CAL c=20 r=7
|
||||
"Do you want to repeat last step to readjust distance between nozzle and heatbed?"
|
||||
"Voulez-vous repeter la derniere etape pour reajuster la distance entre la buse et le plateau chauffant?"
|
||||
"Voulez-vous refaire l'etape pour reajuster la hauteur entre la buse et le plateau chauffant?"
|
||||
|
||||
#MSG_EXTRUDER_CORRECTION c=10
|
||||
#MSG_EXTRUDER_CORRECTION c=13
|
||||
"E-correct:"
|
||||
"Correct-E:"
|
||||
|
||||
|
@ -218,7 +246,7 @@
|
|||
"Ejecting filament"
|
||||
"Le fil. remonte"
|
||||
|
||||
#MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1
|
||||
#MSG_SELFTEST_ENDSTOP_NOTHIT c=20
|
||||
"Endstop not hit"
|
||||
"Butee non atteinte"
|
||||
|
||||
|
@ -234,10 +262,26 @@
|
|||
"Error - static memory has been overwritten"
|
||||
"Erreur - la memoire statique a ete ecrasee"
|
||||
|
||||
#MSG_CUT_FILAMENT c=16
|
||||
"Cut filament"
|
||||
"Coupe filament"
|
||||
|
||||
#MSG_CUTTER c=9
|
||||
"Cutter"
|
||||
"Coupeur"
|
||||
|
||||
# c=18
|
||||
"Cutting filament"
|
||||
"Je coupe filament"
|
||||
|
||||
#MSG_FSENS_NOT_RESPONDING c=20 r=4
|
||||
"ERROR: Filament sensor is not responding, please check connection."
|
||||
"ERREUR: Le capteur de filament ne repond pas, verifiez le branchement."
|
||||
|
||||
#MSG_DIM c=6
|
||||
"Dim"
|
||||
"\x00"
|
||||
|
||||
#MSG_ERROR
|
||||
"ERROR:"
|
||||
"ERREUR:"
|
||||
|
@ -246,7 +290,7 @@
|
|||
"Extruder fan:"
|
||||
"Ventilo extrudeur:"
|
||||
|
||||
#MSG_INFO_EXTRUDER c=15 r=1
|
||||
#MSG_INFO_EXTRUDER c=18
|
||||
"Extruder info"
|
||||
"Infos extrudeur"
|
||||
|
||||
|
@ -258,9 +302,10 @@
|
|||
"Fail stats MMU"
|
||||
"Stat. d'echec MMU"
|
||||
|
||||
#MSG_FSENSOR_AUTOLOAD
|
||||
#MSG_FSENSOR_AUTOLOAD c=13
|
||||
"F. autoload"
|
||||
"Autochargeur"
|
||||
"F. autocharg."
|
||||
|
||||
#
|
||||
"Fail stats"
|
||||
"Stat. d'echec"
|
||||
|
@ -280,9 +325,10 @@
|
|||
#MSG_FSENSOR
|
||||
"Fil. sensor"
|
||||
"Capteur Fil."
|
||||
#
|
||||
|
||||
# c=14
|
||||
"Filam. runouts"
|
||||
"Fins de filament"
|
||||
"Fins filament"
|
||||
|
||||
#MSG_FILAMENT_CLEAN c=20 r=2
|
||||
"Filament extruding & with correct color?"
|
||||
|
@ -296,7 +342,7 @@
|
|||
"Filament sensor"
|
||||
"Capteur de filament"
|
||||
|
||||
#MSG_FILAMENT_USED c=19 r=1
|
||||
#MSG_FILAMENT_USED c=19
|
||||
"Filament used"
|
||||
"Filament utilise"
|
||||
|
||||
|
@ -304,15 +350,23 @@
|
|||
"Print time"
|
||||
"Temps d'impression"
|
||||
|
||||
#MSG_FILE_INCOMPLETE c=20 r=2
|
||||
#MSG_FS_ACTION c=10
|
||||
"FS Action"
|
||||
"\x00"
|
||||
|
||||
# c=18
|
||||
"FS v0.4 or newer"
|
||||
"FS v0.4 ou +recent"
|
||||
|
||||
#MSG_FILE_INCOMPLETE c=20 r=3
|
||||
"File incomplete. Continue anyway?"
|
||||
"Fichier incomplet. Continuer qd meme?"
|
||||
|
||||
#MSG_FINISHING_MOVEMENTS c=20 r=1
|
||||
#MSG_FINISHING_MOVEMENTS c=20
|
||||
"Finishing movements"
|
||||
"Mouvement final"
|
||||
|
||||
#MSG_V2_CALIBRATION c=17 r=1
|
||||
#MSG_V2_CALIBRATION c=18
|
||||
"First layer cal."
|
||||
"Cal. 1ere couche"
|
||||
|
||||
|
@ -382,7 +436,7 @@
|
|||
|
||||
#MSG_SELFTEST_CHECK_BED c=20
|
||||
"Checking bed "
|
||||
"Verification du lit"
|
||||
"Verif. plateau chauf"
|
||||
|
||||
#MSG_SELFTEST_CHECK_ENDSTOPS c=20
|
||||
"Checking endstops"
|
||||
|
@ -442,7 +496,7 @@
|
|||
|
||||
#MSG_STEEL_SHEET_CHECK c=20 r=2
|
||||
"Is steel sheet on heatbed?"
|
||||
"Plaque d'impression sur le lit chauffant?"
|
||||
"Est la plaque sur le plat. chauffant?"
|
||||
|
||||
#
|
||||
"Last print failures"
|
||||
|
@ -450,7 +504,7 @@
|
|||
|
||||
#
|
||||
"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
|
||||
"Si vous avez d'autres feuilles d'acier, calibrez leurs pre-reglages dans Reglages - Config HW - Feuilles d'acier."
|
||||
"Si vous avez d'autres feuilles d'acier, calibrez leurs pre-reglages dans Reglages - Config HW - Plaque en acier."
|
||||
|
||||
#
|
||||
"Last print"
|
||||
|
@ -458,7 +512,7 @@
|
|||
|
||||
#MSG_SELFTEST_EXTRUDER_FAN c=20
|
||||
"Left hotend fan?"
|
||||
"Ventilo tete gauche?"
|
||||
"Ventilo gauche?"
|
||||
|
||||
#
|
||||
"Left"
|
||||
|
@ -476,6 +530,10 @@
|
|||
"Live adjust Z"
|
||||
"Ajuster Z en dir."
|
||||
|
||||
# c=20 r=6
|
||||
"Insert the filament (do not load it) into the extruder and then press the knob."
|
||||
"Veuillez inserer le filament ( ne le chargez pas) dans l'extrudeur, puis appuyez sur le bouton."
|
||||
|
||||
#MSG_LOAD_FILAMENT c=17
|
||||
"Load filament"
|
||||
"Charger filament"
|
||||
|
@ -496,7 +554,7 @@
|
|||
"Load to nozzle"
|
||||
"Charger la buse"
|
||||
|
||||
#MSG_M117_V2_CALIBRATION c=25 r=1
|
||||
#MSG_M117_V2_CALIBRATION c=25
|
||||
"M117 First layer cal."
|
||||
"M117 Cal. 1ere couche"
|
||||
|
||||
|
@ -504,9 +562,17 @@
|
|||
"Main"
|
||||
"Menu principal"
|
||||
|
||||
#MSG_BL_HIGH c=12
|
||||
"Level Bright"
|
||||
"Niveau brill"
|
||||
|
||||
#MSG_BL_LOW c=12
|
||||
"Level Dimmed"
|
||||
"\x00"
|
||||
|
||||
#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60
|
||||
"Measuring reference height of calibration point"
|
||||
"Mesure de la hauteur de reference du point de calibration"
|
||||
"Je mesure la hauteur de reference du point de calibrage"
|
||||
|
||||
#MSG_MESH_BED_LEVELING
|
||||
"Mesh Bed Leveling"
|
||||
|
@ -544,13 +610,17 @@
|
|||
"Mode"
|
||||
"\x00"
|
||||
|
||||
# c=20 r=3
|
||||
"MK3 firmware detected on MK3S printer"
|
||||
"Firmware MK3 detecte sur imprimante MK3S"
|
||||
|
||||
#MSG_NORMAL
|
||||
"Normal"
|
||||
"\x00"
|
||||
|
||||
#MSG_SILENT
|
||||
"Silent"
|
||||
"Feutre"
|
||||
"Furtif"
|
||||
|
||||
#
|
||||
"MMU needs user attention."
|
||||
|
@ -636,7 +706,7 @@
|
|||
"Nozzle"
|
||||
"Buse"
|
||||
|
||||
#MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
|
||||
#MSG_DEFAULT_SETTINGS_LOADED c=20 r=5
|
||||
"Old settings found. Default PID, Esteps etc. will be set."
|
||||
"Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront regles"
|
||||
|
||||
|
@ -668,13 +738,13 @@
|
|||
"PINDA Heating"
|
||||
"Chauffe de la PINDA"
|
||||
|
||||
#MSG_PAPER c=20 r=8
|
||||
#MSG_PAPER c=20 r=10
|
||||
"Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."
|
||||
"Placez une feuille de papier sous la buse pendant la calibration des 4 premiers points. Si la buse accroche le papier, eteignez vite l'imprimante."
|
||||
|
||||
#MSG_WIZARD_CLEAN_HEATBED c=20 r=8
|
||||
"Please clean heatbed and then press the knob."
|
||||
"Nettoyez la plaque en acier et appuyez sur le bouton."
|
||||
"Nettoyez plateau chauffant en acier et appuyez sur le bouton."
|
||||
|
||||
#MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8
|
||||
"Please clean the nozzle for calibration. Click when done."
|
||||
|
@ -740,6 +810,10 @@
|
|||
"Preheating nozzle. Please wait."
|
||||
"Prechauffage de la buse. Merci de patienter."
|
||||
|
||||
# c=14
|
||||
"PINDA"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
"Please upgrade."
|
||||
"Mettez a jour le FW."
|
||||
|
@ -748,6 +822,10 @@
|
|||
"Press knob to preheat nozzle and continue."
|
||||
"Appuyez sur le bouton pour prechauffer la buse et continuer."
|
||||
|
||||
#MSG_FS_PAUSE c=5
|
||||
"Pause"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
"Power failures"
|
||||
"Coup.de courant"
|
||||
|
@ -756,11 +834,11 @@
|
|||
"Print aborted"
|
||||
"Impression annulee"
|
||||
|
||||
# c=20 r=1
|
||||
# c=20
|
||||
"Preheating to load"
|
||||
"Chauffe pour charger"
|
||||
|
||||
# c=20 r=1
|
||||
# c=20
|
||||
"Preheating to unload"
|
||||
"Chauf.pour decharger"
|
||||
|
||||
|
@ -812,15 +890,19 @@
|
|||
"Rear side [um]"
|
||||
"Arriere [um]"
|
||||
|
||||
#MSG_RECOVERING_PRINT c=20 r=1
|
||||
"Recovering print "
|
||||
"Recup. impression"
|
||||
# c=20 r=4
|
||||
"Please unload the filament first, then repeat this action."
|
||||
"SVP, dechargez le filament et reessayez."
|
||||
|
||||
#MSG_REMOVE_OLD_FILAMENT c=20 r=4
|
||||
#MSG_RECOVERING_PRINT c=20
|
||||
"Recovering print "
|
||||
"Recup. impression "
|
||||
|
||||
#MSG_REMOVE_OLD_FILAMENT c=20 r=5
|
||||
"Remove old filament and press the knob to start loading new filament."
|
||||
"Retirez l'ancien filament puis appuyez sur le bouton pour charger le nouveau."
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Prusa i3 MK3S OK."
|
||||
"\x00"
|
||||
|
||||
|
@ -836,7 +918,7 @@
|
|||
"Resume print"
|
||||
"Reprendre impression"
|
||||
|
||||
#MSG_RESUMING_PRINT c=20 r=1
|
||||
#MSG_RESUMING_PRINT c=20
|
||||
"Resuming print"
|
||||
"Reprise de l'impr."
|
||||
|
||||
|
@ -866,7 +948,7 @@
|
|||
|
||||
#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60
|
||||
"Searching bed calibration point"
|
||||
"Recherche du point de calibration du lit"
|
||||
"Recherche du point de calibration du plateau chauffant"
|
||||
|
||||
#MSG_LANGUAGE_SELECT
|
||||
"Select language"
|
||||
|
@ -904,11 +986,23 @@
|
|||
"Set temperature:"
|
||||
"Regler temp.:"
|
||||
|
||||
# c=20
|
||||
"Prusa i3 MK2.5 OK."
|
||||
"\x00"
|
||||
|
||||
# c=20
|
||||
"Prusa i3 MK2.5S OK."
|
||||
"\x00"
|
||||
|
||||
# c=20
|
||||
"Prusa i3 MK3 OK."
|
||||
"\x00"
|
||||
|
||||
#MSG_SETTINGS
|
||||
"Settings"
|
||||
"Reglages"
|
||||
|
||||
#MSG_SHOW_END_STOPS c=17 r=1
|
||||
#MSG_SHOW_END_STOPS c=18
|
||||
"Show end stops"
|
||||
"Afficher butees"
|
||||
|
||||
|
@ -916,7 +1010,7 @@
|
|||
"Sensor state"
|
||||
"Etat capteur"
|
||||
|
||||
#MSG_FILE_CNT c=20 r=4
|
||||
#MSG_FILE_CNT c=20 r=6
|
||||
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
|
||||
"Certains fichiers ne seront pas tries. Max 100 fichiers tries par dossier."
|
||||
|
||||
|
@ -956,6 +1050,10 @@
|
|||
"Sound"
|
||||
"Son"
|
||||
|
||||
# c=7
|
||||
"Runouts"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
"Some problem encountered, Z-leveling enforced ..."
|
||||
"Probleme rencontre, cliquez sur le bouton pour niveller l'axe Z..."
|
||||
|
@ -963,6 +1061,7 @@
|
|||
#MSG_SOUND_ONCE
|
||||
"Once"
|
||||
"Une fois"
|
||||
|
||||
#MSG_SPEED
|
||||
"Speed"
|
||||
"Vitesse"
|
||||
|
@ -999,7 +1098,7 @@
|
|||
"Select filament:"
|
||||
"Selectionnez le filament:"
|
||||
|
||||
#MSG_TEMP_CALIBRATION c=12 r=1
|
||||
#MSG_TEMP_CALIBRATION c=14
|
||||
"Temp. cal."
|
||||
"Calib. Temp."
|
||||
|
||||
|
@ -1019,6 +1118,10 @@
|
|||
"Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."
|
||||
"La calibration en temperature est terminee et activee. La calibration en temperature peut etre desactivee dans le menu Reglages-> Cal. Temp."
|
||||
|
||||
# c=20 r=3
|
||||
"Sensor verified, remove the filament now."
|
||||
"Capteur verifie, retirez le filament maintenant."
|
||||
|
||||
#MSG_TEMPERATURE
|
||||
"Temperature"
|
||||
"\x00"
|
||||
|
@ -1027,7 +1130,7 @@
|
|||
"Temperatures"
|
||||
"\x00"
|
||||
|
||||
#MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=4
|
||||
#MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9
|
||||
"There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
|
||||
"Il faut toujours effectuer la Calibration Z. Veuillez suivre le manuel, chapitre Premiers pas, section Processus de calibration."
|
||||
|
||||
|
@ -1069,7 +1172,7 @@
|
|||
|
||||
#
|
||||
"Total"
|
||||
"\x00"
|
||||
"Totale"
|
||||
|
||||
#MSG_USED c=19 r=1
|
||||
"Used during print"
|
||||
|
@ -1089,7 +1192,7 @@
|
|||
|
||||
#MSG_WAITING_TEMP c=20 r=3
|
||||
"Waiting for nozzle and bed cooling"
|
||||
"Attente du refroidissement des buse et plateau"
|
||||
"Attente du refroidissement des buse et plateau chauffant"
|
||||
|
||||
#MSG_WAITING_TEMP_PINDA c=20 r=3
|
||||
"Waiting for PINDA probe cooling"
|
||||
|
@ -1123,7 +1226,7 @@
|
|||
"Wizard"
|
||||
"Assistant"
|
||||
|
||||
#MSG_XYZ_DETAILS c=19 r=1
|
||||
#MSG_XYZ_DETAILS c=18
|
||||
"XYZ cal. details"
|
||||
"Details calib. XYZ"
|
||||
|
||||
|
@ -1147,7 +1250,11 @@
|
|||
"XYZ calibration all right. X/Y axes are slightly skewed. Good job!"
|
||||
"Calibration XYZ OK. Les axes X/Y sont legerement non perpendiculaires. Bon boulot!"
|
||||
|
||||
#
|
||||
#MSG_TIMEOUT c=12
|
||||
"Timeout"
|
||||
"\x00"
|
||||
|
||||
#MSG_X_CORRECTION c=13
|
||||
"X-correct:"
|
||||
"Correct-X:"
|
||||
|
||||
|
@ -1187,7 +1294,11 @@
|
|||
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
|
||||
"L'imprimante commencera a imprimer une ligne en zig-zag. Tournez le bouton jusqu'a atteindre la hauteur optimale. Consultez les photos dans le manuel (chapitre Calibration)."
|
||||
|
||||
#
|
||||
# c=20 r=5
|
||||
"Verification failed, remove the filament and try again."
|
||||
"Verification en echec, retirez le filament et reessayez."
|
||||
|
||||
#MSG_Y_CORRECTION c=13
|
||||
"Y-correct:"
|
||||
"Correct-Y:"
|
||||
|
||||
|
@ -1269,11 +1380,11 @@
|
|||
|
||||
#
|
||||
"G-code sliced for a different level. Continue?"
|
||||
"\x00"
|
||||
"Le G-code a ete prepare pour un niveau different. Continuer?"
|
||||
|
||||
#
|
||||
"G-code sliced for a different level. Please re-slice the model again. Print cancelled."
|
||||
"\x00"
|
||||
"Le G-code a ete prepare pour un niveau different. Veuillez decouper le modele a nouveau. L'impression a ete annulee."
|
||||
|
||||
#
|
||||
"G-code sliced for a different printer type. Continue?"
|
||||
|
@ -1295,11 +1406,11 @@
|
|||
"PINDA:"
|
||||
"PINDA:"
|
||||
|
||||
# c=20 r=1
|
||||
# c=20
|
||||
"Preheating to cut"
|
||||
"Chauffe pour couper"
|
||||
|
||||
# c=20 r=1
|
||||
# c=20
|
||||
"Preheating to eject"
|
||||
"Chauf. pour remonter"
|
||||
|
||||
|
@ -1311,6 +1422,10 @@
|
|||
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
|
||||
"Diametre de la buse dans les reglages ne correspond pas a celui dans le G-Code. Merci de verifier le parametre dans les reglages. Impression annulee."
|
||||
|
||||
# c=20
|
||||
"%s level expected"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
"Rename"
|
||||
"Renommer"
|
||||
|
@ -1323,7 +1438,7 @@
|
|||
"Sensor info"
|
||||
"Info capteur"
|
||||
|
||||
#
|
||||
#MSG_SHEET c=10
|
||||
"Sheet"
|
||||
"Plaque"
|
||||
|
||||
|
@ -1331,14 +1446,15 @@
|
|||
"Assist"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
# c=18
|
||||
"Steel sheets"
|
||||
"Plaques en acier"
|
||||
|
||||
#
|
||||
#MSG_Z_CORRECTION c=13
|
||||
"Z-correct:"
|
||||
"Correct-Z:"
|
||||
|
||||
#MSG_Z_PROBE_NR
|
||||
"Z-probe nr."
|
||||
"Mesurer x-fois"
|
||||
|
||||
|
|
|
@ -2,6 +2,14 @@
|
|||
"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset"
|
||||
"[%.7s]Set valori\x0aComp. Z, continuare\x0ao iniziare da zero?\x0a%cContinua%cReset"
|
||||
|
||||
#MSG_03_OR_OLDER c=18
|
||||
" 0.3 or older"
|
||||
" 0.3 o inferiore"
|
||||
|
||||
#MSG_04_OR_NEWER c=18
|
||||
" 0.4 or newer"
|
||||
" 0.4 o superiore"
|
||||
|
||||
#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14
|
||||
" of 4"
|
||||
" su 4"
|
||||
|
@ -42,7 +50,11 @@
|
|||
"Ambient"
|
||||
"Ambiente"
|
||||
|
||||
#MSG_PRESS c=20
|
||||
#MSG_AUTO c=6
|
||||
"Auto"
|
||||
"\x00"
|
||||
|
||||
#MSG_PRESS c=20 r=2
|
||||
"and press the knob"
|
||||
"e cliccare manopola"
|
||||
|
||||
|
@ -52,13 +64,13 @@
|
|||
|
||||
#MSG_AUTO_DEPLETE c=17 r=1
|
||||
"SpoolJoin"
|
||||
"\x00"
|
||||
""
|
||||
|
||||
#MSG_AUTO_HOME
|
||||
"Auto home"
|
||||
"Trova origine"
|
||||
|
||||
#MSG_AUTOLOAD_FILAMENT c=17
|
||||
#MSG_AUTOLOAD_FILAMENT c=18
|
||||
"AutoLoad filament"
|
||||
"Autocaric. filam."
|
||||
|
||||
|
@ -80,7 +92,7 @@
|
|||
|
||||
#MSG_SELFTEST_BEDHEATER
|
||||
"Bed / Heater"
|
||||
"Letto/Riscald."
|
||||
"Piano/Riscald."
|
||||
|
||||
#MSG_BED_DONE
|
||||
"Bed done"
|
||||
|
@ -88,27 +100,39 @@
|
|||
|
||||
#MSG_BED_HEATING
|
||||
"Bed Heating"
|
||||
"Riscald. letto"
|
||||
"Riscald. piano"
|
||||
|
||||
#MSG_BED_CORRECTION_MENU
|
||||
"Bed level correct"
|
||||
"Correz. liv.letto"
|
||||
"Correz. liv.piano"
|
||||
|
||||
#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=4
|
||||
#MSG_BELTTEST c=17
|
||||
"Belt test "
|
||||
"Test cinghie "
|
||||
|
||||
#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5
|
||||
"Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset."
|
||||
"Livellamento letto fallito.NoRispSensore.Residui su ugello? In attesa di reset."
|
||||
"Livellamento piano fallito. Sensore KO? Residui su ugello? In attesa di reset."
|
||||
|
||||
#MSG_BRIGHT c=6
|
||||
"Bright"
|
||||
"Chiaro"
|
||||
|
||||
#MSG_BRIGHTNESS c=18
|
||||
"Brightness"
|
||||
"Luminosita'"
|
||||
|
||||
#MSG_BED
|
||||
"Bed"
|
||||
"Letto"
|
||||
"Piano"
|
||||
|
||||
#MSG_MENU_BELT_STATUS c=15 r=1
|
||||
#MSG_MENU_BELT_STATUS c=18
|
||||
"Belt status"
|
||||
"Stato cinghie"
|
||||
|
||||
#MSG_RECOVER_PRINT c=20 r=2
|
||||
"Blackout occurred. Recover print?"
|
||||
"C'e stato un Blackout. Recuperare la stampa?"
|
||||
"Blackout rilevato. Recuperare la stampa?"
|
||||
|
||||
#
|
||||
"Calibrating home"
|
||||
|
@ -166,7 +190,7 @@
|
|||
"Copy selected language?"
|
||||
"Copiare la lingua selezionata?"
|
||||
|
||||
#MSG_CRASHDETECT
|
||||
#MSG_CRASHDETECT c=13
|
||||
"Crash det."
|
||||
"Rileva.crash"
|
||||
|
||||
|
@ -200,27 +224,31 @@
|
|||
|
||||
#MSG_BABYSTEP_Z_NOT_SET c=20 r=12
|
||||
"Distance between tip of the nozzle and the bed surface has not been set yet. Please follow the manual, chapter First steps, section First layer calibration."
|
||||
"Distanza tra la punta dell'ugello e la superficie del letto non ancora imposta. Si prega di seguire il manuale, capitolo Primi Passi, sezione Calibrazione primo layer."
|
||||
"Distanza tra la punta dell'ugello e la superficie del piano non ancora impostata. Si prega di seguire il manuale, capitolo Primi Passi, sezione Calibrazione primo strato."
|
||||
|
||||
#MSG_FS_CONTINUE c=5
|
||||
"Cont."
|
||||
"\x00"
|
||||
|
||||
#MSG_WIZARD_REPEAT_V2_CAL c=20 r=7
|
||||
"Do you want to repeat last step to readjust distance between nozzle and heatbed?"
|
||||
"Desideri ripetere l'ultimo passaggio per migliorare la distanza fra ugello e piatto?"
|
||||
|
||||
#MSG_EXTRUDER_CORRECTION c=10
|
||||
#MSG_EXTRUDER_CORRECTION c=13
|
||||
"E-correct:"
|
||||
"Correzione-E:"
|
||||
|
||||
#MSG_EJECT_FILAMENT c=17 r=1
|
||||
"Eject filament"
|
||||
"Espelli filamento "
|
||||
"Espelli filamento"
|
||||
|
||||
#MSG_EJECTING_FILAMENT c=20 r=1
|
||||
"Ejecting filament"
|
||||
"Espellendo filamento "
|
||||
"Espellendo filamento"
|
||||
|
||||
#MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1
|
||||
#MSG_SELFTEST_ENDSTOP_NOTHIT c=20
|
||||
"Endstop not hit"
|
||||
"Finecorsa fuori portata"
|
||||
"Finec. fuori portata"
|
||||
|
||||
#MSG_SELFTEST_ENDSTOP
|
||||
"Endstop"
|
||||
|
@ -232,12 +260,28 @@
|
|||
|
||||
#MSG_STACK_ERROR c=20 r=4
|
||||
"Error - static memory has been overwritten"
|
||||
"Errore - la memoria statica e stata sovrascritta"
|
||||
"Errore - la memoria statica e' stata sovrascritta"
|
||||
|
||||
#MSG_CUT_FILAMENT c=16
|
||||
"Cut filament"
|
||||
"Taglia filamento"
|
||||
|
||||
#MSG_CUTTER c=9
|
||||
"Cutter"
|
||||
"Tagliatr."
|
||||
|
||||
# c=18
|
||||
"Cutting filament"
|
||||
"Tagliando filam."
|
||||
|
||||
#MSG_FSENS_NOT_RESPONDING c=20 r=4
|
||||
"ERROR: Filament sensor is not responding, please check connection."
|
||||
"ERRORE: il sensore filam. non risponde,Controllare conness."
|
||||
|
||||
#MSG_DIM c=6
|
||||
"Dim"
|
||||
"Scuro"
|
||||
|
||||
#MSG_ERROR
|
||||
"ERROR:"
|
||||
"ERRORE:"
|
||||
|
@ -246,7 +290,7 @@
|
|||
"Extruder fan:"
|
||||
"Ventola estr:"
|
||||
|
||||
#MSG_INFO_EXTRUDER c=15 r=1
|
||||
#MSG_INFO_EXTRUDER c=18
|
||||
"Extruder info"
|
||||
"Info estrusore"
|
||||
|
||||
|
@ -258,7 +302,7 @@
|
|||
"Fail stats MMU"
|
||||
"Stat.fall. MMU"
|
||||
|
||||
#MSG_FSENSOR_AUTOLOAD
|
||||
#MSG_FSENSOR_AUTOLOAD c=13
|
||||
"F. autoload"
|
||||
"Autocar.fil."
|
||||
|
||||
|
@ -281,13 +325,14 @@
|
|||
#MSG_FSENSOR
|
||||
"Fil. sensor"
|
||||
"Sensore fil."
|
||||
#
|
||||
|
||||
# c=14
|
||||
"Filam. runouts"
|
||||
"Filam. esauriti"
|
||||
"Fil. esauriti"
|
||||
|
||||
#MSG_FILAMENT_CLEAN c=20 r=2
|
||||
"Filament extruding & with correct color?"
|
||||
"Filamento estruso & con il giusto colore?"
|
||||
"Filamento estruso e con colore corretto?"
|
||||
|
||||
#MSG_NOT_LOADED c=19
|
||||
"Filament not loaded"
|
||||
|
@ -297,23 +342,31 @@
|
|||
"Filament sensor"
|
||||
"Sensore filam."
|
||||
|
||||
#MSG_FILAMENT_USED c=19 r=1
|
||||
#MSG_FILAMENT_USED c=19
|
||||
"Filament used"
|
||||
"Filamento utilizzato"
|
||||
"Fil. utilizzato"
|
||||
|
||||
#MSG_PRINT_TIME c=19 r=1
|
||||
"Print time"
|
||||
"Tempo di stampa"
|
||||
|
||||
#MSG_FILE_INCOMPLETE c=20 r=2
|
||||
#MSG_FS_ACTION c=10
|
||||
"FS Action"
|
||||
"Azione FS"
|
||||
|
||||
# c=18
|
||||
"FS v0.4 or newer"
|
||||
"FS 0.4 o superiore"
|
||||
|
||||
#MSG_FILE_INCOMPLETE c=20 r=3
|
||||
"File incomplete. Continue anyway?"
|
||||
"File incompleto. Continuare comunque?"
|
||||
|
||||
#MSG_FINISHING_MOVEMENTS c=20 r=1
|
||||
#MSG_FINISHING_MOVEMENTS c=20
|
||||
"Finishing movements"
|
||||
"Finalizzando gli spostamenti"
|
||||
"Finaliz. spostamenti"
|
||||
|
||||
#MSG_V2_CALIBRATION c=17 r=1
|
||||
#MSG_V2_CALIBRATION c=18
|
||||
"First layer cal."
|
||||
"Cal. primo strato"
|
||||
|
||||
|
@ -323,7 +376,7 @@
|
|||
|
||||
#
|
||||
"Fix the issue and then press button on MMU unit."
|
||||
"Risolvi il problema e quindi premi il bottone sull'unita MMU. "
|
||||
"Risolvere il problema e premere il bottone sull'unita MMU. "
|
||||
|
||||
#MSG_FLOW
|
||||
"Flow"
|
||||
|
@ -379,7 +432,7 @@
|
|||
|
||||
#MSG_CORRECTLY c=20
|
||||
"Changed correctly?"
|
||||
"Cambiato correttamente?"
|
||||
"Cambio corretto?"
|
||||
|
||||
#MSG_SELFTEST_CHECK_BED c=20
|
||||
"Checking bed "
|
||||
|
@ -439,11 +492,11 @@
|
|||
|
||||
#MSG_WIZARD_FILAMENT_LOADED c=20 r=2
|
||||
"Is filament loaded?"
|
||||
"Il filamento e stato caricato?"
|
||||
"Il filamento e' stato caricato?"
|
||||
|
||||
#MSG_STEEL_SHEET_CHECK c=20 r=2
|
||||
"Is steel sheet on heatbed?"
|
||||
"La piastra d'acciaio e sul piano riscaldato?"
|
||||
"Piastra d'acciaio su piano riscaldato?"
|
||||
|
||||
#
|
||||
"Last print failures"
|
||||
|
@ -477,6 +530,10 @@
|
|||
"Live adjust Z"
|
||||
"Compensazione Z"
|
||||
|
||||
# c=20 r=6
|
||||
"Insert the filament (do not load it) into the extruder and then press the knob."
|
||||
"Inserire filamento (senza caricarlo) nell'estrusore e premere la manopola."
|
||||
|
||||
#MSG_LOAD_FILAMENT c=17
|
||||
"Load filament"
|
||||
"Carica filamento"
|
||||
|
@ -497,21 +554,29 @@
|
|||
"Load to nozzle"
|
||||
"Carica ugello"
|
||||
|
||||
#MSG_M117_V2_CALIBRATION c=25 r=1
|
||||
#MSG_M117_V2_CALIBRATION c=25
|
||||
"M117 First layer cal."
|
||||
"M117 Calibrazione primo layer."
|
||||
"M117 Calibr. primo strato"
|
||||
|
||||
#MSG_MAIN
|
||||
"Main"
|
||||
"Menu principale"
|
||||
|
||||
#MSG_BL_HIGH c=12
|
||||
"Level Bright"
|
||||
"Liv. Chiaro"
|
||||
|
||||
#MSG_BL_LOW c=12
|
||||
"Level Dimmed"
|
||||
"Liv. Scuro"
|
||||
|
||||
#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60
|
||||
"Measuring reference height of calibration point"
|
||||
"Misura altezza di rif. del punto di calib."
|
||||
|
||||
#MSG_MESH_BED_LEVELING
|
||||
"Mesh Bed Leveling"
|
||||
"Livel. piatto"
|
||||
"Liv. grilia piano"
|
||||
|
||||
#MSG_MMU_OK_RESUMING_POSITION c=20 r=4
|
||||
"MMU OK. Resuming position..."
|
||||
|
@ -545,6 +610,10 @@
|
|||
"Mode"
|
||||
"Mod."
|
||||
|
||||
# c=20 r=3
|
||||
"MK3 firmware detected on MK3S printer"
|
||||
"Firmware MK3 rilevato su stampante MK3S"
|
||||
|
||||
#MSG_NORMAL
|
||||
"Normal"
|
||||
"Normale"
|
||||
|
@ -607,7 +676,7 @@
|
|||
|
||||
#MSG_NA
|
||||
"N/A"
|
||||
"\x00"
|
||||
"N/D"
|
||||
|
||||
#MSG_NO
|
||||
"No"
|
||||
|
@ -637,7 +706,7 @@
|
|||
"Nozzle"
|
||||
"Ugello"
|
||||
|
||||
#MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
|
||||
#MSG_DEFAULT_SETTINGS_LOADED c=20 r=5
|
||||
"Old settings found. Default PID, Esteps etc. will be set."
|
||||
"Sono state trovate impostazioni vecchie. Verranno impostati i valori predefiniti di PID, Esteps etc."
|
||||
|
||||
|
@ -669,7 +738,7 @@
|
|||
"PINDA Heating"
|
||||
"Riscaldamento PINDA"
|
||||
|
||||
#MSG_PAPER c=20 r=8
|
||||
#MSG_PAPER c=20 r=10
|
||||
"Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."
|
||||
"Posizionare un foglio sotto l'ugello durante la calibrazione dei primi 4 punti. In caso l'ugello muova il foglio spegnere subito la stampante."
|
||||
|
||||
|
@ -741,6 +810,10 @@
|
|||
"Preheating nozzle. Please wait."
|
||||
"Preriscaldando l'ugello. Attendere prego."
|
||||
|
||||
# c=14
|
||||
"PINDA"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
"Please upgrade."
|
||||
"Prego aggiornare."
|
||||
|
@ -749,6 +822,10 @@
|
|||
"Press knob to preheat nozzle and continue."
|
||||
"Premete la manopola per preriscaldare l'ugello e continuare."
|
||||
|
||||
#MSG_FS_PAUSE c=5
|
||||
"Pause"
|
||||
"Pausa"
|
||||
|
||||
#
|
||||
"Power failures"
|
||||
"Mancanza corrente"
|
||||
|
@ -757,13 +834,13 @@
|
|||
"Print aborted"
|
||||
"Stampa interrotta"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to load"
|
||||
"Preriscaldamento per caricare"
|
||||
"Preriscald. carico"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to unload"
|
||||
"Preriscaldamento per scaricare"
|
||||
"Preriscald. scarico"
|
||||
|
||||
#MSG_SELFTEST_PRINT_FAN_SPEED c=18
|
||||
"Print fan:"
|
||||
|
@ -813,15 +890,19 @@
|
|||
"Rear side [um]"
|
||||
"Retro [um]"
|
||||
|
||||
#MSG_RECOVERING_PRINT c=20 r=1
|
||||
# c=20 r=4
|
||||
"Please unload the filament first, then repeat this action."
|
||||
"Scaricare prima il filamento, poi ripetere l'operazione."
|
||||
|
||||
#MSG_RECOVERING_PRINT c=20
|
||||
"Recovering print "
|
||||
"Recupero stampa"
|
||||
"Recupero stampa "
|
||||
|
||||
#MSG_REMOVE_OLD_FILAMENT c=20 r=4
|
||||
#MSG_REMOVE_OLD_FILAMENT c=20 r=5
|
||||
"Remove old filament and press the knob to start loading new filament."
|
||||
"Rimuovi il filamento precedente e premi la manopola per caricare il nuovo filamento. "
|
||||
"Rimuovi il filamento precedente e premi la manopola per caricare il nuovo filamento."
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Prusa i3 MK3S OK."
|
||||
"\x00"
|
||||
|
||||
|
@ -837,7 +918,7 @@
|
|||
"Resume print"
|
||||
"Riprendi stampa"
|
||||
|
||||
#MSG_RESUMING_PRINT c=20 r=1
|
||||
#MSG_RESUMING_PRINT c=20
|
||||
"Resuming print"
|
||||
"Riprendi stampa"
|
||||
|
||||
|
@ -883,7 +964,7 @@
|
|||
|
||||
#MSG_SELFTEST
|
||||
"Selftest "
|
||||
"Autotest"
|
||||
"Autotest "
|
||||
|
||||
#MSG_SELFTEST_ERROR
|
||||
"Selftest error !"
|
||||
|
@ -903,13 +984,25 @@
|
|||
|
||||
#MSG_SET_TEMPERATURE c=19 r=1
|
||||
"Set temperature:"
|
||||
"Imposta temperatura:"
|
||||
"Imposta temperatura"
|
||||
|
||||
# c=20
|
||||
"Prusa i3 MK2.5 OK."
|
||||
"\x00"
|
||||
|
||||
# c=20
|
||||
"Prusa i3 MK2.5S OK."
|
||||
"\x00"
|
||||
|
||||
# c=20
|
||||
"Prusa i3 MK3 OK."
|
||||
"\x00"
|
||||
|
||||
#MSG_SETTINGS
|
||||
"Settings"
|
||||
"Impostazioni"
|
||||
|
||||
#MSG_SHOW_END_STOPS c=17 r=1
|
||||
#MSG_SHOW_END_STOPS c=18
|
||||
"Show end stops"
|
||||
"Stato finecorsa"
|
||||
|
||||
|
@ -917,7 +1010,7 @@
|
|||
"Sensor state"
|
||||
"Stato sensore"
|
||||
|
||||
#MSG_FILE_CNT c=20 r=4
|
||||
#MSG_FILE_CNT c=20 r=6
|
||||
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
|
||||
"Alcuni file non saranno ordinati. Il numero massimo di file in una cartella e 100 perche siano ordinati."
|
||||
|
||||
|
@ -957,6 +1050,10 @@
|
|||
"Sound"
|
||||
"Suono"
|
||||
|
||||
# c=7
|
||||
"Runouts"
|
||||
"Esaurim"
|
||||
|
||||
#
|
||||
"Some problem encountered, Z-leveling enforced ..."
|
||||
"Sono stati rilevati problemi, avviato livellamento Z ..."
|
||||
|
@ -1001,7 +1098,7 @@
|
|||
"Select filament:"
|
||||
"Seleziona il filamento:"
|
||||
|
||||
#MSG_TEMP_CALIBRATION c=12 r=1
|
||||
#MSG_TEMP_CALIBRATION c=14
|
||||
"Temp. cal."
|
||||
"Calib. temp."
|
||||
|
||||
|
@ -1021,6 +1118,10 @@
|
|||
"Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."
|
||||
"Calibrazione temperatura completata e attiva. Puo essere disattivata dal menu Impostazioni ->Cal. Temp."
|
||||
|
||||
# c=20 r=3
|
||||
"Sensor verified, remove the filament now."
|
||||
"Sensore verificato, rimuovere il filamento."
|
||||
|
||||
#MSG_TEMPERATURE
|
||||
"Temperature"
|
||||
"\x00"
|
||||
|
@ -1029,7 +1130,7 @@
|
|||
"Temperatures"
|
||||
"Temperature"
|
||||
|
||||
#MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=4
|
||||
#MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9
|
||||
"There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
|
||||
"E ancora necessario effettuare la calibrazione Z. Segui il manuale, capitolo Primi Passi, sezione Sequenza di Calibrazione. "
|
||||
|
||||
|
@ -1125,7 +1226,7 @@
|
|||
"Wizard"
|
||||
"\x00"
|
||||
|
||||
#MSG_XYZ_DETAILS c=19 r=1
|
||||
#MSG_XYZ_DETAILS c=18
|
||||
"XYZ cal. details"
|
||||
"XYZ Cal. dettagli"
|
||||
|
||||
|
@ -1149,7 +1250,11 @@
|
|||
"XYZ calibration all right. X/Y axes are slightly skewed. Good job!"
|
||||
"Calibrazion XYZ corretta. Assi X/Y leggermente storti. Ben fatto!"
|
||||
|
||||
#
|
||||
#MSG_TIMEOUT c=12
|
||||
"Timeout"
|
||||
"\x00"
|
||||
|
||||
#MSG_X_CORRECTION c=13
|
||||
"X-correct:"
|
||||
"Correzione-X:"
|
||||
|
||||
|
@ -1171,7 +1276,7 @@
|
|||
|
||||
#
|
||||
"XYZ calibration failed. Bed calibration point was not found."
|
||||
"Calibrazione XYZ fallita. Il punto di calibrazione sul letto non e' stato trovato."
|
||||
"Calibrazione XYZ fallita. Il punto di calibrazione sul piano non e' stato trovato."
|
||||
|
||||
#
|
||||
"XYZ calibration failed. Front calibration points not reachable."
|
||||
|
@ -1189,7 +1294,11 @@
|
|||
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
|
||||
"La stampante iniziera a stampare una linea a zig-zag. Gira la manopola fino a che non hai raggiungo l'altezza ottimale. Verifica con le immagini nel manuale (capitolo sulla calibrazione):"
|
||||
|
||||
#
|
||||
# c=20 r=5
|
||||
"Verification failed, remove the filament and try again."
|
||||
"Verifica fallita, rimuovere il filamento e riprovare."
|
||||
|
||||
#MSG_Y_CORRECTION c=13
|
||||
"Y-correct:"
|
||||
"Correzione-Y:"
|
||||
|
||||
|
@ -1231,7 +1340,7 @@
|
|||
|
||||
#
|
||||
"HW Setup"
|
||||
"Installazione HW"
|
||||
"Impostazioni HW"
|
||||
|
||||
#
|
||||
"IR:"
|
||||
|
@ -1247,7 +1356,7 @@
|
|||
|
||||
#
|
||||
"Mesh bed leveling"
|
||||
"Mesh livel. letto"
|
||||
"Liv. griglia piano"
|
||||
|
||||
#
|
||||
"MK3S firmware detected on MK3 printer"
|
||||
|
@ -1297,13 +1406,13 @@
|
|||
"PINDA:"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to cut"
|
||||
"Preriscaldamento per taglio"
|
||||
"Preriscalda. taglio"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to eject"
|
||||
"Preriscaldamento per espulsione"
|
||||
"Preriscalda. espuls."
|
||||
|
||||
#
|
||||
"Printer nozzle diameter differs from the G-code. Continue?"
|
||||
|
@ -1313,6 +1422,10 @@
|
|||
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
|
||||
"Diametro ugello diverso dal G-Code. Controlla il valore nelle impostazioni. Stampa annullata."
|
||||
|
||||
# c=20
|
||||
"%s level expected"
|
||||
"atteso livello %s"
|
||||
|
||||
#
|
||||
"Rename"
|
||||
"Rinomina"
|
||||
|
@ -1325,7 +1438,7 @@
|
|||
"Sensor info"
|
||||
"Info Sensore"
|
||||
|
||||
#
|
||||
#MSG_SHEET c=10
|
||||
"Sheet"
|
||||
"Piano"
|
||||
|
||||
|
@ -1333,14 +1446,15 @@
|
|||
"Assist"
|
||||
"Assist."
|
||||
|
||||
#
|
||||
# c=18
|
||||
"Steel sheets"
|
||||
"Piani d'acciaio"
|
||||
|
||||
#
|
||||
#MSG_Z_CORRECTION c=13
|
||||
"Z-correct:"
|
||||
"Correzione-Z:"
|
||||
|
||||
#MSG_Z_PROBE_NR
|
||||
"Z-probe nr."
|
||||
"\x00"
|
||||
"Nr. Z-test"
|
||||
|
||||
|
|
|
@ -2,6 +2,14 @@
|
|||
"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset"
|
||||
"[%.7s]Z instell.\x0awaarde ingesteld,\x0averder of bij 0\x0abeginen?\x0a%cVerder%cReset"
|
||||
|
||||
#MSG_03_OR_OLDER c=18
|
||||
" 0.3 or older"
|
||||
" 0.3 of ouder"
|
||||
|
||||
#MSG_04_OR_NEWER c=18
|
||||
" 0.4 or newer"
|
||||
" 0.4 of nieuwer"
|
||||
|
||||
#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14
|
||||
" of 4"
|
||||
" van 4"
|
||||
|
@ -40,9 +48,13 @@
|
|||
|
||||
#
|
||||
"Ambient"
|
||||
"EINSY "
|
||||
"Kamertemp."
|
||||
|
||||
#MSG_PRESS c=20
|
||||
#MSG_AUTO c=6
|
||||
"Auto"
|
||||
"\x00"
|
||||
|
||||
#MSG_PRESS c=20 r=2
|
||||
"and press the knob"
|
||||
"en druk op knop"
|
||||
|
||||
|
@ -50,29 +62,21 @@
|
|||
"Are left and right Z~carriages all up?"
|
||||
"Zijn beide Z wagen heelemaal boven?"
|
||||
|
||||
#MSG_AUTO_DEPLETE_ON c=17 r=1
|
||||
"SpoolJoin [on]"
|
||||
"SpoolJoin [aan]"
|
||||
|
||||
#
|
||||
"SpoolJoin [N/A]"
|
||||
"SpoolJoin [N/V]"
|
||||
|
||||
#MSG_AUTO_DEPLETE_OFF c=17 r=1
|
||||
"SpoolJoin [off]"
|
||||
"SpoolJoin [uit]"
|
||||
#MSG_AUTO_DEPLETE c=17 r=1
|
||||
"SpoolJoin"
|
||||
"\x00"
|
||||
|
||||
#MSG_AUTO_HOME
|
||||
"Auto home"
|
||||
"Startpositie"
|
||||
|
||||
#MSG_AUTOLOAD_FILAMENT c=17
|
||||
#MSG_AUTOLOAD_FILAMENT c=18
|
||||
"AutoLoad filament"
|
||||
"Auto-Laden Filament"
|
||||
"Autoladen Filament"
|
||||
|
||||
#MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4
|
||||
"Autoloading filament available only when filament sensor is turned on..."
|
||||
"Autoloading filament alleen beschikbaar wanneer filamentsensor is ingeschakeld ..."
|
||||
"Auto. laden van fil. is enkel beschikbaar wanneer fil.sensor is ingeschakeld ..."
|
||||
|
||||
#MSG_AUTOLOADING_ENABLED c=20 r=4
|
||||
"Autoloading filament is active, just press the knob and insert filament..."
|
||||
|
@ -102,15 +106,27 @@
|
|||
"Bed level correct"
|
||||
"Bed niveau correct"
|
||||
|
||||
#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=4
|
||||
#MSG_BELTTEST c=17
|
||||
"Belt test "
|
||||
"Riemtest "
|
||||
|
||||
#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5
|
||||
"Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset."
|
||||
"Bed leveling mislukt. Sensor heeft niet geactiveerd. Puin op tuit? Wacht op reset."
|
||||
|
||||
#MSG_BRIGHT c=6
|
||||
"Bright"
|
||||
"Helder"
|
||||
|
||||
#MSG_BRIGHTNESS c=18
|
||||
"Brightness"
|
||||
"Helderheid"
|
||||
|
||||
#MSG_BED
|
||||
"Bed"
|
||||
"Bed"
|
||||
|
||||
#MSG_MENU_BELT_STATUS c=15 r=1
|
||||
#MSG_MENU_BELT_STATUS c=18
|
||||
"Belt status"
|
||||
"Riem status"
|
||||
|
||||
|
@ -174,22 +190,14 @@
|
|||
"Copy selected language?"
|
||||
"Geselecteerde taal kopieren?"
|
||||
|
||||
#MSG_CRASHDETECT_ON
|
||||
"Crash det. [on]"
|
||||
"Crashdet. [aan]"
|
||||
#MSG_CRASHDETECT c=13
|
||||
"Crash det."
|
||||
"Crashdet."
|
||||
|
||||
#
|
||||
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
|
||||
"Kies een filament voor de kalibratie van de eerste laag en selecteer deze in het schermmenu."
|
||||
|
||||
#MSG_CRASHDETECT_NA
|
||||
"Crash det. [N/A]"
|
||||
"Crashdet. [N/V]"
|
||||
|
||||
#MSG_CRASHDETECT_OFF
|
||||
"Crash det. [off]"
|
||||
"Crashdet. [uit]"
|
||||
|
||||
#MSG_CRASH_DETECTED c=20 r=1
|
||||
"Crash detected."
|
||||
"Crash gedetecteerd."
|
||||
|
@ -218,11 +226,15 @@
|
|||
"Distance between tip of the nozzle and the bed surface has not been set yet. Please follow the manual, chapter First steps, section First layer calibration."
|
||||
"Afstand tussen tip van de tuit en het print oppervlak is nog niet vastgesteld. Volg de handleiding, First steps, sectie First layer calibration."
|
||||
|
||||
#MSG_FS_CONTINUE c=5
|
||||
"Cont."
|
||||
"\x00"
|
||||
|
||||
#MSG_WIZARD_REPEAT_V2_CAL c=20 r=7
|
||||
"Do you want to repeat last step to readjust distance between nozzle and heatbed?"
|
||||
"Wilt u de laatste stap herhalen om de afstand tussen de tuit en de bed opnieuw in te stellen?"
|
||||
|
||||
#MSG_EXTRUDER_CORRECTION c=10
|
||||
#MSG_EXTRUDER_CORRECTION c=13
|
||||
"E-correct:"
|
||||
"E-correctie:"
|
||||
|
||||
|
@ -234,7 +246,7 @@
|
|||
"Ejecting filament"
|
||||
"Werp filament uit"
|
||||
|
||||
#MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1
|
||||
#MSG_SELFTEST_ENDSTOP_NOTHIT c=20
|
||||
"Endstop not hit"
|
||||
"Endstop niet geraakt"
|
||||
|
||||
|
@ -250,10 +262,26 @@
|
|||
"Error - static memory has been overwritten"
|
||||
"Fout - het statische geheugen is overschreven"
|
||||
|
||||
#MSG_CUT_FILAMENT c=16
|
||||
"Cut filament"
|
||||
"Fil. knippen"
|
||||
|
||||
#MSG_CUTTER c=9
|
||||
"Cutter"
|
||||
"Mes"
|
||||
|
||||
# c=18
|
||||
"Cutting filament"
|
||||
"Knippe filament"
|
||||
|
||||
#MSG_FSENS_NOT_RESPONDING c=20 r=4
|
||||
"ERROR: Filament sensor is not responding, please check connection."
|
||||
"FOUT: Filamentsensor reageert niet, controleer de verbinding."
|
||||
|
||||
#MSG_DIM c=6
|
||||
"Dim"
|
||||
"\x00"
|
||||
|
||||
#MSG_ERROR
|
||||
"ERROR:"
|
||||
"FOUT:"
|
||||
|
@ -262,9 +290,9 @@
|
|||
"Extruder fan:"
|
||||
"Extruder fan:"
|
||||
|
||||
#MSG_INFO_EXTRUDER c=15 r=1
|
||||
#MSG_INFO_EXTRUDER c=18
|
||||
"Extruder info"
|
||||
"Extruder Info"
|
||||
"\x00"
|
||||
|
||||
#MSG_MOVE_E
|
||||
"Extruder"
|
||||
|
@ -274,17 +302,9 @@
|
|||
"Fail stats MMU"
|
||||
"MMU-Fouten"
|
||||
|
||||
#MSG_FSENS_AUTOLOAD_ON c=17 r=1
|
||||
"F. autoload [on]"
|
||||
"F.autoladen [aan]"
|
||||
|
||||
#MSG_FSENS_AUTOLOAD_NA c=17 r=1
|
||||
"F. autoload [N/A]"
|
||||
"F.autoladen [N/V]"
|
||||
|
||||
#MSG_FSENS_AUTOLOAD_OFF c=17 r=1
|
||||
"F. autoload [off]"
|
||||
"F.autoladen [uit]"
|
||||
#MSG_FSENSOR_AUTOLOAD c=13
|
||||
"F. autoload"
|
||||
"F. autoladen"
|
||||
|
||||
#
|
||||
"Fail stats"
|
||||
|
@ -298,27 +318,15 @@
|
|||
"Fan test"
|
||||
"Fan test"
|
||||
|
||||
#MSG_FANS_CHECK_ON c=17 r=1
|
||||
"Fans check [on]"
|
||||
"Fans check [aan]"
|
||||
#MSG_FANS_CHECK
|
||||
"Fans check"
|
||||
"Fans check"
|
||||
|
||||
#MSG_FANS_CHECK_OFF c=17 r=1
|
||||
"Fans check [off]"
|
||||
"Fans check [uit]"
|
||||
#MSG_FSENSOR
|
||||
"Fil. sensor"
|
||||
"\x00"
|
||||
|
||||
#MSG_FSENSOR_ON
|
||||
"Fil. sensor [on]"
|
||||
"Fil. sensor [aan]"
|
||||
|
||||
#MSG_FSENSOR_NA
|
||||
"Fil. sensor [N/A]"
|
||||
"Fil. sensor [N/V]"
|
||||
|
||||
#MSG_FSENSOR_OFF
|
||||
"Fil. sensor [off]"
|
||||
"Fil. sensor [uit]"
|
||||
|
||||
#
|
||||
# c=14
|
||||
"Filam. runouts"
|
||||
"Fil. fouten"
|
||||
|
||||
|
@ -334,7 +342,7 @@
|
|||
"Filament sensor"
|
||||
"Filamentsensor"
|
||||
|
||||
#MSG_FILAMENT_USED c=19 r=1
|
||||
#MSG_FILAMENT_USED c=19
|
||||
"Filament used"
|
||||
"Gebruikte filament"
|
||||
|
||||
|
@ -342,15 +350,23 @@
|
|||
"Print time"
|
||||
"Print tijd"
|
||||
|
||||
#MSG_FILE_INCOMPLETE c=20 r=2
|
||||
#MSG_FS_ACTION c=10
|
||||
"FS Action"
|
||||
"FS actie"
|
||||
|
||||
# c=18
|
||||
"FS v0.4 or newer"
|
||||
"FS v0.4 of nieuwer"
|
||||
|
||||
#MSG_FILE_INCOMPLETE c=20 r=3
|
||||
"File incomplete. Continue anyway?"
|
||||
"Bestand onvolledig. Toch doorgaan?"
|
||||
|
||||
#MSG_FINISHING_MOVEMENTS c=20 r=1
|
||||
#MSG_FINISHING_MOVEMENTS c=20
|
||||
"Finishing movements"
|
||||
"Voortgang afwerken"
|
||||
|
||||
#MSG_V2_CALIBRATION c=17 r=1
|
||||
#MSG_V2_CALIBRATION c=18
|
||||
"First layer cal."
|
||||
"Eerste laag kal."
|
||||
|
||||
|
@ -514,6 +530,10 @@
|
|||
"Live adjust Z"
|
||||
"Live Z aanpassen"
|
||||
|
||||
# c=20 r=6
|
||||
"Insert the filament (do not load it) into the extruder and then press the knob."
|
||||
"Steek a.u.b. filament (maar niet laden) in de extruder en druk op knop."
|
||||
|
||||
#MSG_LOAD_FILAMENT c=17
|
||||
"Load filament"
|
||||
"Filament laden"
|
||||
|
@ -534,14 +554,22 @@
|
|||
"Load to nozzle"
|
||||
"Tot tuit laden"
|
||||
|
||||
#MSG_M117_V2_CALIBRATION c=25 r=1
|
||||
#MSG_M117_V2_CALIBRATION c=25
|
||||
"M117 First layer cal."
|
||||
"M117 eerste laag kal."
|
||||
"M117 Eerste laag kal."
|
||||
|
||||
#MSG_MAIN
|
||||
"Main"
|
||||
"Hoofdmenu"
|
||||
|
||||
#MSG_BL_HIGH c=12
|
||||
"Level Bright"
|
||||
"Helder waard"
|
||||
|
||||
#MSG_BL_LOW c=12
|
||||
"Level Dimmed"
|
||||
"Dim waarde"
|
||||
|
||||
#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60
|
||||
"Measuring reference height of calibration point"
|
||||
"Referentie hoogte van het kalibratiepunt meten"
|
||||
|
@ -578,13 +606,21 @@
|
|||
"MMU OK. Resuming..."
|
||||
"MMU OK. Hervatten..."
|
||||
|
||||
#MSG_STEALTH_MODE_OFF
|
||||
"Mode [Normal]"
|
||||
"Stand [Normaal]"
|
||||
#MSG_MODE
|
||||
"Mode"
|
||||
"Stand"
|
||||
|
||||
#MSG_SILENT_MODE_ON
|
||||
"Mode [silent]"
|
||||
"Stand [stil]"
|
||||
# c=20 r=3
|
||||
"MK3 firmware detected on MK3S printer"
|
||||
"MK3-firmware bij MK3S-printer gedetecteerd"
|
||||
|
||||
#MSG_NORMAL
|
||||
"Normal"
|
||||
"Normaal"
|
||||
|
||||
#MSG_SILENT
|
||||
"Silent"
|
||||
"Stil"
|
||||
|
||||
#
|
||||
"MMU needs user attention."
|
||||
|
@ -594,17 +630,17 @@
|
|||
"MMU power fails"
|
||||
"MMU stroomstor."
|
||||
|
||||
#MSG_STEALTH_MODE_ON
|
||||
"Mode [Stealth]"
|
||||
"Stand [Stealth]"
|
||||
#MSG_STEALTH
|
||||
"Stealth"
|
||||
"\x00"
|
||||
|
||||
#MSG_AUTO_MODE_ON
|
||||
"Mode [auto power]"
|
||||
"Mode[automatisch]"
|
||||
#MSG_AUTO_POWER
|
||||
"Auto power"
|
||||
"\x00"
|
||||
|
||||
#MSG_SILENT_MODE_OFF
|
||||
"Mode [high power]"
|
||||
"Stand [hoog]"
|
||||
#MSG_HIGH_POWER
|
||||
"High power"
|
||||
"Hoog verm."
|
||||
|
||||
#
|
||||
"MMU2 connected"
|
||||
|
@ -638,7 +674,7 @@
|
|||
"No SD card"
|
||||
"Geen SD kaart"
|
||||
|
||||
#
|
||||
#MSG_NA
|
||||
"N/A"
|
||||
"N/V"
|
||||
|
||||
|
@ -670,7 +706,7 @@
|
|||
"Nozzle"
|
||||
"Tuit"
|
||||
|
||||
#MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
|
||||
#MSG_DEFAULT_SETTINGS_LOADED c=20 r=5
|
||||
"Old settings found. Default PID, Esteps etc. will be set."
|
||||
"Oude instellingen gevonden. Standaard PID, E-steps etc. instellingen worden geladen."
|
||||
|
||||
|
@ -702,7 +738,7 @@
|
|||
"PINDA Heating"
|
||||
"PINDA opwarmen"
|
||||
|
||||
#MSG_PAPER c=20 r=8
|
||||
#MSG_PAPER c=20 r=10
|
||||
"Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."
|
||||
"Leg een vel papier onder de tuit tijdens de kalibratie van de eerste 4 punten. Als de tuit het papier beweegt, de printer onmiddellijk uitschakelen."
|
||||
|
||||
|
@ -774,6 +810,10 @@
|
|||
"Preheating nozzle. Please wait."
|
||||
"Opwarmen van de tuit. Wacht aub."
|
||||
|
||||
# c=14
|
||||
"PINDA"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
"Please upgrade."
|
||||
"Voer een upgrade uit."
|
||||
|
@ -782,6 +822,10 @@
|
|||
"Press knob to preheat nozzle and continue."
|
||||
"Druk op de knop om de tuit voor te verwarmen en door te gaan."
|
||||
|
||||
#MSG_FS_PAUSE c=5
|
||||
"Pause"
|
||||
"Pauze"
|
||||
|
||||
#
|
||||
"Power failures"
|
||||
"Stroomstoringen"
|
||||
|
@ -790,11 +834,11 @@
|
|||
"Print aborted"
|
||||
"Print afgebroken"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to load"
|
||||
"Opwarmen invoeren"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to unload"
|
||||
"Opwarmen uitwerpen"
|
||||
|
||||
|
@ -846,15 +890,19 @@
|
|||
"Rear side [um]"
|
||||
"Achterkant[um]"
|
||||
|
||||
#MSG_RECOVERING_PRINT c=20 r=1
|
||||
# c=20 r=4
|
||||
"Please unload the filament first, then repeat this action."
|
||||
"Verwijder eerst het filament en probeer het opnieuw."
|
||||
|
||||
#MSG_RECOVERING_PRINT c=20
|
||||
"Recovering print "
|
||||
"Print herstellen "
|
||||
|
||||
#MSG_REMOVE_OLD_FILAMENT c=20 r=4
|
||||
#MSG_REMOVE_OLD_FILAMENT c=20 r=5
|
||||
"Remove old filament and press the knob to start loading new filament."
|
||||
"Verwijder de oude filament en druk op de knop om nieuwe filament te laden."
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Prusa i3 MK3S OK."
|
||||
"\x00"
|
||||
|
||||
|
@ -870,7 +918,7 @@
|
|||
"Resume print"
|
||||
"Print hervatten"
|
||||
|
||||
#MSG_RESUMING_PRINT c=20 r=1
|
||||
#MSG_RESUMING_PRINT c=20
|
||||
"Resuming print"
|
||||
"Hervatten print"
|
||||
|
||||
|
@ -878,25 +926,21 @@
|
|||
"Right side[um]"
|
||||
"Recht.kant[um]"
|
||||
|
||||
#MSG_SECOND_SERIAL_ON c=17 r=1
|
||||
"RPi port [on]"
|
||||
"RPi port [aan]"
|
||||
|
||||
#MSG_SECOND_SERIAL_OFF c=17 r=1
|
||||
"RPi port [off]"
|
||||
"RPi port [uit]"
|
||||
#MSG_RPI_PORT
|
||||
"RPi port"
|
||||
"\x00"
|
||||
|
||||
#MSG_WIZARD_RERUN c=20 r=7
|
||||
"Running Wizard will delete current calibration results and start from the beginning. Continue?"
|
||||
"Starten van de Wizard verwijdert de huidige kalibreringsresultaten en begint vanaf het begin. Doorgaan?"
|
||||
|
||||
#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1
|
||||
"SD card [normal]"
|
||||
"SD card [normaal]"
|
||||
#MSG_SD_CARD
|
||||
"SD card"
|
||||
"SD kaart"
|
||||
|
||||
#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1
|
||||
"SD card [flshAir]"
|
||||
"SD Karte[flshAir]"
|
||||
#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY
|
||||
"FlashAir"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
"Right"
|
||||
|
@ -942,11 +986,23 @@
|
|||
"Set temperature:"
|
||||
"Temp. instellen:"
|
||||
|
||||
# c=20
|
||||
"Prusa i3 MK2.5 OK."
|
||||
"\x00"
|
||||
|
||||
# c=20
|
||||
"Prusa i3 MK2.5S OK."
|
||||
"\x00"
|
||||
|
||||
# c=20
|
||||
"Prusa i3 MK3 OK."
|
||||
"\x00"
|
||||
|
||||
#MSG_SETTINGS
|
||||
"Settings"
|
||||
"Instellingen"
|
||||
|
||||
#MSG_SHOW_END_STOPS c=17 r=1
|
||||
#MSG_SHOW_END_STOPS c=18
|
||||
"Show end stops"
|
||||
"Toon endstops"
|
||||
|
||||
|
@ -954,53 +1010,57 @@
|
|||
"Sensor state"
|
||||
"Sensorstatus"
|
||||
|
||||
#MSG_FILE_CNT c=20 r=4
|
||||
#MSG_FILE_CNT c=20 r=6
|
||||
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
|
||||
"Sommige bestanden worden niet gesorteerd omdat het maximum aantal bestanden per map 100 is."
|
||||
|
||||
#MSG_SORT_NONE c=17 r=1
|
||||
"Sort [none]"
|
||||
"Sortering [geen]"
|
||||
#MSG_SORT
|
||||
"Sort"
|
||||
"Sort."
|
||||
|
||||
#MSG_SORT_TIME c=17 r=1
|
||||
"Sort [time]"
|
||||
"Sortering [tijd]"
|
||||
#MSG_NONE
|
||||
"None"
|
||||
"Geen"
|
||||
|
||||
#MSG_SORT_TIME
|
||||
"Time"
|
||||
"Tijd"
|
||||
|
||||
#
|
||||
"Severe skew:"
|
||||
"Erg scheef:"
|
||||
|
||||
#MSG_SORT_ALPHA c=17 r=1
|
||||
"Sort [alphabet]"
|
||||
"Sort [alfabet]"
|
||||
#MSG_SORT_ALPHA
|
||||
"Alphabet"
|
||||
"Alfabet"
|
||||
|
||||
#MSG_SORTING c=20 r=1
|
||||
"Sorting files"
|
||||
"Bestanden sorteren"
|
||||
|
||||
#MSG_SOUND_LOUD c=17 r=1
|
||||
"Sound [loud]"
|
||||
"Geluid [hard]"
|
||||
#MSG_SOUND_LOUD
|
||||
"Loud"
|
||||
"Hard"
|
||||
|
||||
#
|
||||
"Slight skew:"
|
||||
"Iets scheef:"
|
||||
|
||||
#MSG_SOUND_MUTE c=17 r=1
|
||||
"Sound [mute]"
|
||||
"Geluid [uit]"
|
||||
#MSG_SOUND
|
||||
"Sound"
|
||||
"Geluid"
|
||||
|
||||
# c=7
|
||||
"Runouts"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
"Some problem encountered, Z-leveling enforced ..."
|
||||
"Er is een probleem opgetreden, Z-kalibratie afgedwongen ..."
|
||||
|
||||
#MSG_SOUND_ONCE c=17 r=1
|
||||
"Sound [once]"
|
||||
"Geluid [eenmaal]"
|
||||
|
||||
#MSG_SOUND_SILENT c=17 r=1
|
||||
"Sound [silent]"
|
||||
"Geluid [stil]"
|
||||
#MSG_SOUND_ONCE
|
||||
"Once"
|
||||
"Eenmaal"
|
||||
|
||||
#MSG_SPEED
|
||||
"Speed"
|
||||
|
@ -1038,22 +1098,14 @@
|
|||
"Select filament:"
|
||||
"Kies filament:"
|
||||
|
||||
#MSG_TEMP_CALIBRATION c=20 r=1
|
||||
"Temp. cal. "
|
||||
"Tempkalibratie "
|
||||
|
||||
#MSG_TEMP_CALIBRATION_ON c=20 r=1
|
||||
"Temp. cal. [on]"
|
||||
"Tempkal. [aan]"
|
||||
#MSG_TEMP_CALIBRATION c=14
|
||||
"Temp. cal."
|
||||
"Tempkalib."
|
||||
|
||||
#
|
||||
"Select temperature which matches your material."
|
||||
"Selecteer de temperatuur die overeenkomt met uw materiaal."
|
||||
|
||||
#MSG_TEMP_CALIBRATION_OFF c=20 r=1
|
||||
"Temp. cal. [off]"
|
||||
"Tempkal. [uit]"
|
||||
|
||||
#MSG_CALIBRATION_PINDA_MENU c=17 r=1
|
||||
"Temp. calibration"
|
||||
"Tempkalibratie"
|
||||
|
@ -1066,6 +1118,10 @@
|
|||
"Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."
|
||||
"Temperatuurkalibratie kan worden uitgeschakeld in het menu Instellingen-> Tempkalibratie."
|
||||
|
||||
# c=20 r=3
|
||||
"Sensor verified, remove the filament now."
|
||||
"Sensor geverifieerd, verwijder nu het filament."
|
||||
|
||||
#MSG_TEMPERATURE
|
||||
"Temperature"
|
||||
"Temperatuur"
|
||||
|
@ -1074,7 +1130,7 @@
|
|||
"Temperatures"
|
||||
"Temperaturen"
|
||||
|
||||
#MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=4
|
||||
#MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9
|
||||
"There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
|
||||
"Er is nog steeds een noodzaak om de Z-kalibratie uit te voeren. Volg de handleiding, hoofdstuk First steps, section Calibration flow."
|
||||
|
||||
|
@ -1170,7 +1226,7 @@
|
|||
"Wizard"
|
||||
"Wizard"
|
||||
|
||||
#MSG_XYZ_DETAILS c=19 r=1
|
||||
#MSG_XYZ_DETAILS c=18
|
||||
"XYZ cal. details"
|
||||
"XZY kal. details"
|
||||
|
||||
|
@ -1194,7 +1250,11 @@
|
|||
"XYZ calibration all right. X/Y axes are slightly skewed. Good job!"
|
||||
"XYZ-kalibratie in orde. X / Y-assen zijn licht scheef. Goed gedaan!"
|
||||
|
||||
#
|
||||
#MSG_TIMEOUT c=12
|
||||
"Timeout"
|
||||
"Time-out"
|
||||
|
||||
#MSG_X_CORRECTION c=13
|
||||
"X-correct:"
|
||||
"X-correctie:"
|
||||
|
||||
|
@ -1234,13 +1294,21 @@
|
|||
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
|
||||
"\x00"
|
||||
|
||||
#
|
||||
# c=20 r=5
|
||||
"Verification failed, remove the filament and try again."
|
||||
"Verificatie mislukt, verwijder het filament en probeer het opnieuw."
|
||||
|
||||
#MSG_Y_CORRECTION c=13
|
||||
"Y-correct:"
|
||||
"Y-correctie:"
|
||||
|
||||
#MSG_OFF
|
||||
" [off]"
|
||||
" [uit]"
|
||||
"Off"
|
||||
"Uit"
|
||||
|
||||
#MSG_ON
|
||||
"On"
|
||||
"Aan"
|
||||
|
||||
#
|
||||
"Back"
|
||||
|
@ -1258,16 +1326,16 @@
|
|||
"FINDA:"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
"Firmware [none]"
|
||||
"Firmware [geen]"
|
||||
#MSG_FIRMWARE
|
||||
"Firmware"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
"Firmware [strict]"
|
||||
"Firmware [strikt]"
|
||||
#MSG_STRICT
|
||||
"Strict"
|
||||
"Strikt"
|
||||
|
||||
#
|
||||
"Firmware [warn]"
|
||||
#MSG_WARN
|
||||
"Warn"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
|
@ -1278,24 +1346,12 @@
|
|||
"IR:"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
"Magnets comp.[N/A]"
|
||||
"Magnet. comp.[N/V]"
|
||||
#MSG_MAGNETS_COMP
|
||||
"Magnets comp."
|
||||
"Magnet. comp."
|
||||
|
||||
#
|
||||
"Magnets comp.[Off]"
|
||||
"Magnet. comp.[Uit]"
|
||||
|
||||
#
|
||||
"Magnets comp. [On]"
|
||||
"Magnet. comp.[Aan]"
|
||||
|
||||
#
|
||||
"Mesh [3x3]"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
"Mesh [7x7]"
|
||||
#MSG_MESH
|
||||
"Mesh"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
|
@ -1306,53 +1362,21 @@
|
|||
"MK3S firmware detected on MK3 printer"
|
||||
"MK3S-firmware op MK3-printer ontdekt"
|
||||
|
||||
#
|
||||
"MMU Mode [Normal]"
|
||||
"MMU Mod.[Normaal]"
|
||||
|
||||
#
|
||||
"MMU Mode[Stealth]"
|
||||
"MMU Mod.[Stealth]"
|
||||
#MSG_MMU_MODE
|
||||
"MMU Mode"
|
||||
"MMU Mod"
|
||||
|
||||
#
|
||||
"Mode change in progress ..."
|
||||
"Moduswijziging bezig..."
|
||||
|
||||
#
|
||||
"Model [none]"
|
||||
"Model [geen]"
|
||||
#MSG_MODEL
|
||||
"Model"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
"Model [strict]"
|
||||
"Model [strikt]"
|
||||
|
||||
#
|
||||
"Model [warn]"
|
||||
"Model [alarm.]"
|
||||
|
||||
#
|
||||
"Nozzle d. [0.25]"
|
||||
"Tuit d. [0.25]"
|
||||
|
||||
#
|
||||
"Nozzle d. [0.40]"
|
||||
"Tuit d. [0.40]"
|
||||
|
||||
#
|
||||
"Nozzle d. [0.60]"
|
||||
"Tuit d. [0.60]"
|
||||
|
||||
#
|
||||
"Nozzle [none]"
|
||||
"Tuit [geen]"
|
||||
|
||||
#
|
||||
"Nozzle [strict]"
|
||||
"Tuit [strikt]"
|
||||
|
||||
#
|
||||
"Nozzle [warn]"
|
||||
"Tuit [alarm.]"
|
||||
#MSG_NOZZLE_DIAMETER
|
||||
"Nozzle d."
|
||||
"Tuit d."
|
||||
|
||||
#
|
||||
"G-code sliced for a different level. Continue?"
|
||||
|
@ -1382,11 +1406,11 @@
|
|||
"PINDA:"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to cut"
|
||||
"Opwarm. te snijden"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to eject"
|
||||
"Opwarm.te uitwerpen"
|
||||
|
||||
|
@ -1398,6 +1422,10 @@
|
|||
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
|
||||
"De diameter van de tuit van de printer verschilt van de G-code. Controleer de waarde in de instellingen. Afdrukken geannuleerd."
|
||||
|
||||
# c=20
|
||||
"%s level expected"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
"Rename"
|
||||
"Hernoem"
|
||||
|
@ -1410,30 +1438,23 @@
|
|||
"Sensor info"
|
||||
"Sensor info"
|
||||
|
||||
#
|
||||
#MSG_SHEET c=10
|
||||
"Sheet"
|
||||
"Plaat"
|
||||
"Staalplaat"
|
||||
|
||||
#
|
||||
"Sound [assist]"
|
||||
"Geluid [assist]"
|
||||
#MSG_SOUND_BLIND
|
||||
"Assist"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
# c=18
|
||||
"Steel sheets"
|
||||
"Staalplaten"
|
||||
|
||||
#
|
||||
#MSG_Z_CORRECTION c=13
|
||||
"Z-correct:"
|
||||
"Z-correctie:"
|
||||
|
||||
#
|
||||
"Z-probe nr. [1]"
|
||||
"Z-probe nr. [1]"
|
||||
#MSG_Z_PROBE_NR
|
||||
"Z-probe nr."
|
||||
"\x00"
|
||||
|
||||
#
|
||||
"Z-probe nr. [3]"
|
||||
"Z-probe nr. [3]"
|
||||
|
||||
#
|
||||
"Z-probe nr. [5]"
|
||||
"Z-probe nr. [5]"
|
||||
|
|
|
@ -2,6 +2,14 @@
|
|||
"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset"
|
||||
"[%.7s]Live Adj. Z\x0austaw., kontynuowac\x0aczy zaczac od 0?\x0a%cKontynuuj%cReset"
|
||||
|
||||
#MSG_03_OR_OLDER c=18
|
||||
" 0.3 or older"
|
||||
" 0.3 lub starszy"
|
||||
|
||||
#MSG_04_OR_NEWER c=18
|
||||
" 0.4 or newer"
|
||||
" 0.4 lub nowszy"
|
||||
|
||||
#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14
|
||||
" of 4"
|
||||
" z 4"
|
||||
|
@ -42,7 +50,11 @@
|
|||
"Ambient"
|
||||
"Otoczenie"
|
||||
|
||||
#MSG_PRESS c=20
|
||||
#MSG_AUTO c=6
|
||||
"Auto"
|
||||
"\x00"
|
||||
|
||||
#MSG_PRESS c=20 r=2
|
||||
"and press the knob"
|
||||
"i nacisnij pokretlo"
|
||||
|
||||
|
@ -58,7 +70,7 @@
|
|||
"Auto home"
|
||||
"Auto zerowanie"
|
||||
|
||||
#MSG_AUTOLOAD_FILAMENT c=17
|
||||
#MSG_AUTOLOAD_FILAMENT c=18
|
||||
"AutoLoad filament"
|
||||
"Autoladowanie fil."
|
||||
|
||||
|
@ -94,15 +106,27 @@
|
|||
"Bed level correct"
|
||||
"Korekta stolu"
|
||||
|
||||
#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=4
|
||||
#MSG_BELTTEST c=17
|
||||
"Belt test "
|
||||
"Test paskow"
|
||||
|
||||
#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5
|
||||
"Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset."
|
||||
"Kalibracja nieudana. Sensor nie aktywowal sie. Zanieczysz. dysza? Czekam na reset."
|
||||
|
||||
#MSG_BRIGHT c=6
|
||||
"Bright"
|
||||
"Jasny"
|
||||
|
||||
#MSG_BRIGHTNESS c=18
|
||||
"Brightness"
|
||||
"Jasnosc"
|
||||
|
||||
#MSG_BED
|
||||
"Bed"
|
||||
"Stol"
|
||||
|
||||
#MSG_MENU_BELT_STATUS c=15 r=1
|
||||
#MSG_MENU_BELT_STATUS c=18
|
||||
"Belt status"
|
||||
"Stan paskow"
|
||||
|
||||
|
@ -202,11 +226,15 @@
|
|||
"Distance between tip of the nozzle and the bed surface has not been set yet. Please follow the manual, chapter First steps, section First layer calibration."
|
||||
"Odleglosc dyszy od powierzchni druku nie jest skalibrowana. Postepuj zgodnie z instrukcja: rozdzial Wprowadzenie - Kalibracja pierwszej warstwy."
|
||||
|
||||
#MSG_FS_CONTINUE c=5
|
||||
"Cont."
|
||||
"Kont."
|
||||
|
||||
#MSG_WIZARD_REPEAT_V2_CAL c=20 r=7
|
||||
"Do you want to repeat last step to readjust distance between nozzle and heatbed?"
|
||||
"Chcesz powtorzyc ostatni krok i ponownie ustawic odleglosc miedzy dysza a stolikiem?"
|
||||
|
||||
#MSG_EXTRUDER_CORRECTION c=10
|
||||
#MSG_EXTRUDER_CORRECTION c=13
|
||||
"E-correct:"
|
||||
"Korekcja-E:"
|
||||
|
||||
|
@ -218,7 +246,7 @@
|
|||
"Ejecting filament"
|
||||
"Wysuwanie filamentu"
|
||||
|
||||
#MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1
|
||||
#MSG_SELFTEST_ENDSTOP_NOTHIT c=20
|
||||
"Endstop not hit"
|
||||
"Krancowka nie aktyw."
|
||||
|
||||
|
@ -234,10 +262,26 @@
|
|||
"Error - static memory has been overwritten"
|
||||
"Blad - pamiec statyczna zostala nadpisana"
|
||||
|
||||
#MSG_CUT_FILAMENT c=16
|
||||
"Cut filament"
|
||||
"Ciecie filamentu"
|
||||
|
||||
#MSG_CUTTER c=9
|
||||
"Cutter"
|
||||
"Nozyk"
|
||||
|
||||
# c=18
|
||||
"Cutting filament"
|
||||
"Obcinanie fil."
|
||||
|
||||
#MSG_FSENS_NOT_RESPONDING c=20 r=4
|
||||
"ERROR: Filament sensor is not responding, please check connection."
|
||||
"BLAD: Czujnik filamentu nie odpowiada, sprawdz polaczenie."
|
||||
|
||||
#MSG_DIM c=6
|
||||
"Dim"
|
||||
"Sciemn"
|
||||
|
||||
#MSG_ERROR
|
||||
"ERROR:"
|
||||
"BLAD:"
|
||||
|
@ -246,7 +290,7 @@
|
|||
"Extruder fan:"
|
||||
"WentHotend:"
|
||||
|
||||
#MSG_INFO_EXTRUDER c=15 r=1
|
||||
#MSG_INFO_EXTRUDER c=18
|
||||
"Extruder info"
|
||||
"Ekstruder - info"
|
||||
|
||||
|
@ -258,7 +302,7 @@
|
|||
"Fail stats MMU"
|
||||
"Bledy MMU"
|
||||
|
||||
#MSG_FSENSOR_AUTOLOAD
|
||||
#MSG_FSENSOR_AUTOLOAD c=13
|
||||
"F. autoload"
|
||||
"Autolad. fil."
|
||||
|
||||
|
@ -282,13 +326,13 @@
|
|||
"Fil. sensor"
|
||||
"Czuj. filam."
|
||||
|
||||
#
|
||||
# c=14
|
||||
"Filam. runouts"
|
||||
"Konc. filamentu"
|
||||
"Konc.filamentu"
|
||||
|
||||
#MSG_FILAMENT_CLEAN c=20 r=2
|
||||
"Filament extruding & with correct color?"
|
||||
"Filament wychodzi z dyszy, kolor jest ok?"
|
||||
"Filament wychodzi z dyszy,kolor jest ok?"
|
||||
|
||||
#MSG_NOT_LOADED c=19
|
||||
"Filament not loaded"
|
||||
|
@ -298,7 +342,7 @@
|
|||
"Filament sensor"
|
||||
"Czujnik filamentu"
|
||||
|
||||
#MSG_FILAMENT_USED c=19 r=1
|
||||
#MSG_FILAMENT_USED c=19
|
||||
"Filament used"
|
||||
"Uzyty filament"
|
||||
|
||||
|
@ -306,15 +350,23 @@
|
|||
"Print time"
|
||||
"Czas druku"
|
||||
|
||||
#MSG_FILE_INCOMPLETE c=20 r=2
|
||||
#MSG_FS_ACTION c=10
|
||||
"FS Action"
|
||||
"Akcja FS"
|
||||
|
||||
# c=18
|
||||
"FS v0.4 or newer"
|
||||
"FS v0.4 lub nowszy"
|
||||
|
||||
#MSG_FILE_INCOMPLETE c=20 r=3
|
||||
"File incomplete. Continue anyway?"
|
||||
"Plik niekompletny. Kontynowac?"
|
||||
|
||||
#MSG_FINISHING_MOVEMENTS c=20 r=1
|
||||
#MSG_FINISHING_MOVEMENTS c=20
|
||||
"Finishing movements"
|
||||
"Konczenie druku"
|
||||
|
||||
#MSG_V2_CALIBRATION c=17 r=1
|
||||
#MSG_V2_CALIBRATION c=18
|
||||
"First layer cal."
|
||||
"Kal. 1. warstwy"
|
||||
|
||||
|
@ -396,7 +448,7 @@
|
|||
|
||||
#MSG_SELFTEST_CHECK_FSENSOR c=20
|
||||
"Checking sensors "
|
||||
"Sprawdzanie czujnikow"
|
||||
"Kontrola czujnikow"
|
||||
|
||||
#MSG_SELFTEST_CHECK_X c=20
|
||||
"Checking X axis "
|
||||
|
@ -478,6 +530,10 @@
|
|||
"Live adjust Z"
|
||||
"Ustaw. Live Z"
|
||||
|
||||
# c=20 r=6
|
||||
"Insert the filament (do not load it) into the extruder and then press the knob."
|
||||
"Wsun filament (nie uzywaj funkcji ladowania) do ekstrudera i nacisnij pokretlo."
|
||||
|
||||
#MSG_LOAD_FILAMENT c=17
|
||||
"Load filament"
|
||||
"Ladowanie fil."
|
||||
|
@ -498,7 +554,7 @@
|
|||
"Load to nozzle"
|
||||
"Zaladuj do dyszy"
|
||||
|
||||
#MSG_M117_V2_CALIBRATION c=25 r=1
|
||||
#MSG_M117_V2_CALIBRATION c=25
|
||||
"M117 First layer cal."
|
||||
"M117 Kal. 1. warstwy"
|
||||
|
||||
|
@ -506,6 +562,14 @@
|
|||
"Main"
|
||||
"Menu glowne"
|
||||
|
||||
#MSG_BL_HIGH c=12
|
||||
"Level Bright"
|
||||
"Poziom jasn."
|
||||
|
||||
#MSG_BL_LOW c=12
|
||||
"Level Dimmed"
|
||||
"Poziom ciem."
|
||||
|
||||
#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60
|
||||
"Measuring reference height of calibration point"
|
||||
"Okreslam wysokosc odniesienia punktu kalibracyjnego"
|
||||
|
@ -546,9 +610,13 @@
|
|||
"Mode"
|
||||
"Tryb"
|
||||
|
||||
# c=20 r=3
|
||||
"MK3 firmware detected on MK3S printer"
|
||||
"Wykryto firmware MK3 w drukarce MK3S"
|
||||
|
||||
#MSG_NORMAL
|
||||
"Normal"
|
||||
"Normalny"
|
||||
"Normalni"
|
||||
|
||||
#MSG_SILENT
|
||||
"Silent"
|
||||
|
@ -638,7 +706,7 @@
|
|||
"Nozzle"
|
||||
"Dysza"
|
||||
|
||||
#MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
|
||||
#MSG_DEFAULT_SETTINGS_LOADED c=20 r=5
|
||||
"Old settings found. Default PID, Esteps etc. will be set."
|
||||
"Znaleziono stare ustawienia. Zostana przywrocone domyslne ust. PID, Esteps, itp."
|
||||
|
||||
|
@ -670,7 +738,7 @@
|
|||
"PINDA Heating"
|
||||
"Grzanie sondy PINDA"
|
||||
|
||||
#MSG_PAPER c=20 r=8
|
||||
#MSG_PAPER c=20 r=10
|
||||
"Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."
|
||||
"Umiesc kartke papieru na stole roboczym i podczas pomiaru pierwszych 4 punktow. Jesli dysza zahaczy o papier, natychmiast wylacz drukarke."
|
||||
|
||||
|
@ -742,6 +810,10 @@
|
|||
"Preheating nozzle. Please wait."
|
||||
"Nagrzewanie dyszy. Prosze czekac."
|
||||
|
||||
# c=14
|
||||
"PINDA"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
"Please upgrade."
|
||||
"Prosze zaktualizowac."
|
||||
|
@ -750,6 +822,10 @@
|
|||
"Press knob to preheat nozzle and continue."
|
||||
"Wcisnij pokretlo aby rozgrzac dysze i kontynuowac."
|
||||
|
||||
#MSG_FS_PAUSE c=5
|
||||
"Pause"
|
||||
"Pauza"
|
||||
|
||||
#
|
||||
"Power failures"
|
||||
"Zaniki zasilania"
|
||||
|
@ -758,11 +834,11 @@
|
|||
"Print aborted"
|
||||
"Druk przerwany"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to load"
|
||||
"Nagrzew. do ladowania"
|
||||
"Nagrzew.do ladowania"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to unload"
|
||||
"Nagrzew. do rozlad."
|
||||
|
||||
|
@ -814,17 +890,21 @@
|
|||
"Rear side [um]"
|
||||
"Tyl [um]"
|
||||
|
||||
#MSG_RECOVERING_PRINT c=20 r=1
|
||||
"Recovering print "
|
||||
"Wznawianie wydruku"
|
||||
# c=20 r=4
|
||||
"Please unload the filament first, then repeat this action."
|
||||
"Najpierw rozladuj filament, nastepnie powtorz czynnosc."
|
||||
|
||||
#MSG_REMOVE_OLD_FILAMENT c=20 r=4
|
||||
#MSG_RECOVERING_PRINT c=20
|
||||
"Recovering print "
|
||||
"Wznawianie wydruku "
|
||||
|
||||
#MSG_REMOVE_OLD_FILAMENT c=20 r=5
|
||||
"Remove old filament and press the knob to start loading new filament."
|
||||
"Wyciagnij poprzedni filament i nacisnij pokretlo aby zaladowac nowy."
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Prusa i3 MK3S OK."
|
||||
"Prusa i3 MK3S OK"
|
||||
"\x00"
|
||||
|
||||
#MSG_CALIBRATE_BED_RESET
|
||||
"Reset XYZ calibr."
|
||||
|
@ -838,7 +918,7 @@
|
|||
"Resume print"
|
||||
"Wznowic wydruk"
|
||||
|
||||
#MSG_RESUMING_PRINT c=20 r=1
|
||||
#MSG_RESUMING_PRINT c=20
|
||||
"Resuming print"
|
||||
"Wznawianie druku"
|
||||
|
||||
|
@ -906,11 +986,23 @@
|
|||
"Set temperature:"
|
||||
"Ustaw temperature:"
|
||||
|
||||
# c=20
|
||||
"Prusa i3 MK2.5 OK."
|
||||
"\x00"
|
||||
|
||||
# c=20
|
||||
"Prusa i3 MK2.5S OK."
|
||||
"\x00"
|
||||
|
||||
# c=20
|
||||
"Prusa i3 MK3 OK."
|
||||
"\x00"
|
||||
|
||||
#MSG_SETTINGS
|
||||
"Settings"
|
||||
"Ustawienia"
|
||||
|
||||
#MSG_SHOW_END_STOPS c=17 r=1
|
||||
#MSG_SHOW_END_STOPS c=18
|
||||
"Show end stops"
|
||||
"Pokaz krancowki"
|
||||
|
||||
|
@ -918,7 +1010,7 @@
|
|||
"Sensor state"
|
||||
"Stan czujnikow"
|
||||
|
||||
#MSG_FILE_CNT c=20 r=4
|
||||
#MSG_FILE_CNT c=20 r=6
|
||||
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
|
||||
"Niektore pliki nie zostana posortowane. Max. liczba plikow w 1 folderze = 100."
|
||||
|
||||
|
@ -958,6 +1050,10 @@
|
|||
"Sound"
|
||||
"Dzwiek"
|
||||
|
||||
# c=7
|
||||
"Runouts"
|
||||
"Konce f"
|
||||
|
||||
#
|
||||
"Some problem encountered, Z-leveling enforced ..."
|
||||
"Wykryto problem, wymuszono poziomowanie osi Z."
|
||||
|
@ -965,6 +1061,7 @@
|
|||
#MSG_SOUND_ONCE
|
||||
"Once"
|
||||
"1-raz"
|
||||
|
||||
#MSG_SPEED
|
||||
"Speed"
|
||||
"Predkosc"
|
||||
|
@ -1001,9 +1098,9 @@
|
|||
"Select filament:"
|
||||
"Wybierz filament:"
|
||||
|
||||
#MSG_TEMP_CALIBRATION c=12 r=1
|
||||
#MSG_TEMP_CALIBRATION c=14
|
||||
"Temp. cal."
|
||||
"Kalibracja temp."
|
||||
"Kalib. temp."
|
||||
|
||||
#
|
||||
"Select temperature which matches your material."
|
||||
|
@ -1021,6 +1118,10 @@
|
|||
"Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."
|
||||
"Kalibracja temperaturowa zakonczona i wlaczona. Moze byc wylaczona z menu Ustawienia -> Kalibracja temp."
|
||||
|
||||
# c=20 r=3
|
||||
"Sensor verified, remove the filament now."
|
||||
"Czujnik sprawdzony, wyciagnij filament."
|
||||
|
||||
#MSG_TEMPERATURE
|
||||
"Temperature"
|
||||
"Temperatura"
|
||||
|
@ -1029,7 +1130,7 @@
|
|||
"Temperatures"
|
||||
"Temperatury"
|
||||
|
||||
#MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=4
|
||||
#MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9
|
||||
"There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
|
||||
"Musimy przeprowadzic kalibracje Z. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Kalibracja."
|
||||
|
||||
|
@ -1125,7 +1226,7 @@
|
|||
"Wizard"
|
||||
"Asystent"
|
||||
|
||||
#MSG_XYZ_DETAILS c=19 r=1
|
||||
#MSG_XYZ_DETAILS c=18
|
||||
"XYZ cal. details"
|
||||
"Szczegoly kal. XYZ"
|
||||
|
||||
|
@ -1149,7 +1250,11 @@
|
|||
"XYZ calibration all right. X/Y axes are slightly skewed. Good job!"
|
||||
"Kalibracja XYZ prawidlowa. Osie X/Y lekko skosne. Dobra robota!"
|
||||
|
||||
#
|
||||
#MSG_TIMEOUT c=12
|
||||
"Timeout"
|
||||
"Wyl. czas."
|
||||
|
||||
#MSG_X_CORRECTION c=13
|
||||
"X-correct:"
|
||||
"Korekcja-X:"
|
||||
|
||||
|
@ -1189,7 +1294,11 @@
|
|||
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
|
||||
"Drukarka zacznie drukowanie linii w ksztalcie zygzaka. Ustaw optymalna wysokosc obracajac pokretlo. Porownaj z ilustracjami w Podreczniku (rozdzial Kalibracja)."
|
||||
|
||||
#
|
||||
# c=20 r=5
|
||||
"Verification failed, remove the filament and try again."
|
||||
"Niepowodzenie sprawdzenia, wyciagnij filament i sprobuj ponownie."
|
||||
|
||||
#MSG_Y_CORRECTION c=13
|
||||
"Y-correct:"
|
||||
"Korekcja-Y:"
|
||||
|
||||
|
@ -1271,7 +1380,7 @@
|
|||
|
||||
#
|
||||
"G-code sliced for a different level. Continue?"
|
||||
"\x00"
|
||||
"G-code pociety dla innej wersji. Kontynuowac?"
|
||||
|
||||
#
|
||||
"G-code sliced for a different level. Please re-slice the model again. Print cancelled."
|
||||
|
@ -1297,13 +1406,13 @@
|
|||
"PINDA:"
|
||||
"\x00"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to cut"
|
||||
"Nagrzewanie do obciecia"
|
||||
"Nagrzew. obciecia"
|
||||
|
||||
#
|
||||
# c=20
|
||||
"Preheating to eject"
|
||||
"Nagrzewanie do wysuniecia"
|
||||
"Nagrzew. wysuniecia"
|
||||
|
||||
#
|
||||
"Printer nozzle diameter differs from the G-code. Continue?"
|
||||
|
@ -1313,6 +1422,10 @@
|
|||
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
|
||||
"Srednica dyszy rozni sie od tej w G-code. Sprawdz ustawienia. Druk anulowany."
|
||||
|
||||
# c=20
|
||||
"%s level expected"
|
||||
"Oczekiwano wersji %s"
|
||||
|
||||
#
|
||||
"Rename"
|
||||
"Zmien nazwe"
|
||||
|
@ -1325,7 +1438,7 @@
|
|||
"Sensor info"
|
||||
"Info o sensorach"
|
||||
|
||||
#
|
||||
#MSG_SHEET c=10
|
||||
"Sheet"
|
||||
"Plyta"
|
||||
|
||||
|
@ -1333,14 +1446,15 @@
|
|||
"Assist"
|
||||
"Asyst."
|
||||
|
||||
#
|
||||
# c=18
|
||||
"Steel sheets"
|
||||
"Plyty stalowe"
|
||||
|
||||
#
|
||||
#MSG_Z_CORRECTION c=13
|
||||
"Z-correct:"
|
||||
"Korekcja-Z:"
|
||||
|
||||
#MSG_Z_PROBE_NR
|
||||
"Z-probe nr."
|
||||
"Ilosc Pomiarow"
|
||||
|
||||
|
|
1137
lang/po/Firmware.pot
1137
lang/po/Firmware.pot
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
1201
lang/po/new/cs.po
1201
lang/po/new/cs.po
File diff suppressed because it is too large
Load diff
1217
lang/po/new/de.po
1217
lang/po/new/de.po
File diff suppressed because it is too large
Load diff
1238
lang/po/new/es.po
1238
lang/po/new/es.po
File diff suppressed because it is too large
Load diff
1232
lang/po/new/fr.po
1232
lang/po/new/fr.po
File diff suppressed because it is too large
Load diff
1262
lang/po/new/it.po
1262
lang/po/new/it.po
File diff suppressed because it is too large
Load diff
1207
lang/po/new/nl.po
1207
lang/po/new/nl.po
File diff suppressed because it is too large
Load diff
1224
lang/po/new/pl.po
1224
lang/po/new/pl.po
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue