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

Merge branch 'MK3' into MK3_MMU2_fix1

This commit is contained in:
DRracer 2022-09-21 15:18:44 +02:00 committed by GitHub
parent 183e21aa0b 86944d9ff6
commit f7d4095479
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/Configuration.h
View File

@ -17,8 +17,8 @@ extern PGM_P sPrinterName;
// Firmware version // Firmware version
#define FW_MAJOR 3 #define FW_MAJOR 3
#define FW_MINOR 11 #define FW_MINOR 13
#define FW_REVISION 1 #define FW_REVISION 0
//#define FW_FLAVOR RC //uncomment if DEBUG, DEVEL, ALPHA, BETA or RC //#define FW_FLAVOR RC //uncomment if DEBUG, DEVEL, ALPHA, BETA or RC
//#define FW_FLAVERSION 1 //uncomment if FW_FLAVOR is defined and versioning is needed. //#define FW_FLAVERSION 1 //uncomment if FW_FLAVOR is defined and versioning is needed.
#ifndef FW_FLAVOR #ifndef FW_FLAVOR

6
Firmware/Marlin_main.cpp
View File

@ -787,7 +787,7 @@ int uart_putchar(char c, FILE *)
void lcd_splash() void lcd_splash()
{ {
lcd_clear(); // clears display and homes screen lcd_clear(); // clears display and homes screen
lcd_puts_P(PSTR("\n Original Prusa i3\n Prusa Research")); lcd_printf_P(PSTR("\n Original Prusa i3\n Prusa Research\n%20.20S"), PSTR(FW_VERSION));
} }
@ -4313,11 +4313,11 @@ void process_commands()
#endif //PRUSA_SN_SUPPORT #endif //PRUSA_SN_SUPPORT
else if(code_seen_P(PSTR("Fir"))){ // PRUSA Fir else if(code_seen_P(PSTR("Fir"))){ // PRUSA Fir
SERIAL_PROTOCOLLN(FW_VERSION_FULL); SERIAL_PROTOCOLLNPGM(FW_VERSION_FULL);
} else if(code_seen_P(PSTR("Rev"))){ // PRUSA Rev } else if(code_seen_P(PSTR("Rev"))){ // PRUSA Rev
SERIAL_PROTOCOLLN(FILAMENT_SIZE "-" ELECTRONICS "-" NOZZLE_TYPE ); SERIAL_PROTOCOLLNPGM(FILAMENT_SIZE "-" ELECTRONICS "-" NOZZLE_TYPE );
} else if(code_seen_P(PSTR("Lang"))) { // PRUSA Lang } else if(code_seen_P(PSTR("Lang"))) { // PRUSA Lang
lang_reset(); lang_reset();

10
Firmware/cmdqueue.cpp
View File

@ -27,10 +27,7 @@ bool comment_mode = false;
char *strchr_pointer; // just a pointer to find chars in the command string like X, Y, Z, E, etc char *strchr_pointer; // just a pointer to find chars in the command string like X, Y, Z, E, etc
ShortTimer serialTimeoutTimer; ShortTimer serialTimeoutTimer;
long gcode_N = 0;
long gcode_LastN = 0; long gcode_LastN = 0;
uint32_t sdpos_atomic = 0; uint32_t sdpos_atomic = 0;
@ -372,7 +369,7 @@ void get_command()
cmdbuffer[bufindw+serial_count+CMDHDRSIZE] = 0; //terminate string cmdbuffer[bufindw+serial_count+CMDHDRSIZE] = 0; //terminate string
if(!comment_mode){ if(!comment_mode){
gcode_N = 0; long gcode_N = -1;
// Line numbers must be first in buffer // Line numbers must be first in buffer
@ -459,7 +456,7 @@ void get_command()
// Command is complete: store the current line into buffer, move to the next line. // Command is complete: store the current line into buffer, move to the next line.
// Store type of entry // Store type of entry
cmdbuffer[bufindw] = gcode_N ? CMDBUFFER_CURRENT_TYPE_USB_WITH_LINENR : CMDBUFFER_CURRENT_TYPE_USB; cmdbuffer[bufindw] = gcode_N >= 0 ? CMDBUFFER_CURRENT_TYPE_USB_WITH_LINENR : CMDBUFFER_CURRENT_TYPE_USB;
#ifdef CMDBUFFER_DEBUG #ifdef CMDBUFFER_DEBUG
SERIAL_ECHO_START; SERIAL_ECHO_START;
@ -475,7 +472,8 @@ void get_command()
++ buflen; ++ buflen;
// Update the processed gcode line // Update the processed gcode line
gcode_LastN = gcode_N; if (gcode_N >= 0)
gcode_LastN = gcode_N;
#ifdef CMDBUFFER_DEBUG #ifdef CMDBUFFER_DEBUG
SERIAL_ECHOPGM("Number of commands in the buffer: "); SERIAL_ECHOPGM("Number of commands in the buffer: ");

1
Firmware/cmdqueue.h
View File

@ -52,7 +52,6 @@ extern int serial_count;
extern bool comment_mode; extern bool comment_mode;
extern char *strchr_pointer; extern char *strchr_pointer;
extern long gcode_N;
extern long gcode_LastN; extern long gcode_LastN;
extern bool cmdqueue_pop_front(); extern bool cmdqueue_pop_front();

10
Firmware/ultralcd.cpp Executable file → Normal file
View File

@ -82,7 +82,7 @@ static float manual_feedrate[] = MANUAL_FEEDRATE;
/* LCD message status */ /* LCD message status */
static LongTimer lcd_status_message_timeout; static LongTimer lcd_status_message_timeout;
static uint8_t lcd_status_message_level; static uint8_t lcd_status_message_level;
static char lcd_status_message[LCD_WIDTH + 1] = WELCOME_MSG; static char lcd_status_message[LCD_WIDTH + 1];
/* !Configuration settings */ /* !Configuration settings */
@ -679,11 +679,6 @@ void lcdui_print_status_line(void) {
break; break;
} }
} }
// Fill the rest of line to have nice and clean output
for (uint8_t fillspace = 0; fillspace < LCD_WIDTH; fillspace++)
if ((lcd_status_message[fillspace] <= 31))
lcd_print(' ');
} }
//! @brief Show Status Screen //! @brief Show Status Screen
@ -7502,6 +7497,9 @@ void ultralcd_init()
lcd_oldcardstatus = IS_SD_INSERTED; lcd_oldcardstatus = IS_SD_INSERTED;
#endif//(SDCARDDETECT > 0) #endif//(SDCARDDETECT > 0)
lcd_encoder_diff = 0; lcd_encoder_diff = 0;
// Initialise status line
lcd_setstatuspgm(MSG_WELCOME);
} }
void lcd_ignore_click(bool b) void lcd_ignore_click(bool b)

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

@ -422,7 +422,7 @@
#define TEMP_MODEL_C_thr 0.01 // C estimation iteration threshold #define TEMP_MODEL_C_thr 0.01 // C estimation iteration threshold
#define TEMP_MODEL_C_itr 30 // C estimation iteration limit #define TEMP_MODEL_C_itr 30 // C estimation iteration limit
#define TEMP_MODEL_R 29.7 // initial guess for heatblock resistance (K/W) #define TEMP_MODEL_R 20.5 // initial guess for heatblock resistance (K/W)
#define TEMP_MODEL_Rl 5 // R estimation lower limit #define TEMP_MODEL_Rl 5 // R estimation lower limit
#define TEMP_MODEL_Rh 50 // R estimation upper limit #define TEMP_MODEL_Rh 50 // R estimation upper limit
#define TEMP_MODEL_R_thr 0.01 // R estimation iteration threshold #define TEMP_MODEL_R_thr 0.01 // R estimation iteration threshold

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

@ -426,7 +426,7 @@
#define TEMP_MODEL_C_thr 0.01 // C estimation iteration threshold #define TEMP_MODEL_C_thr 0.01 // C estimation iteration threshold
#define TEMP_MODEL_C_itr 30 // C estimation iteration limit #define TEMP_MODEL_C_itr 30 // C estimation iteration limit
#define TEMP_MODEL_R 29.7 // initial guess for heatblock resistance (K/W) #define TEMP_MODEL_R 20.5 // initial guess for heatblock resistance (K/W)
#define TEMP_MODEL_Rl 5 // R estimation lower limit #define TEMP_MODEL_Rl 5 // R estimation lower limit
#define TEMP_MODEL_Rh 50 // R estimation upper limit #define TEMP_MODEL_Rh 50 // R estimation upper limit
#define TEMP_MODEL_R_thr 0.01 // R estimation iteration threshold #define TEMP_MODEL_R_thr 0.01 // R estimation iteration threshold