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

Merge pull request #3617 from wavexx/merge_mk3_fixes 

Merge important bugfixes for the next 3.12 release
This commit is contained in:
Yuri D'Elia 2022-09-21 15:18:13 +02:00 committed by GitHub
parent 8cfd48cb08 7bd9e5e06e
commit 081501f832
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 41 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Firmware/Marlin_main.cpp
View File

@ -798,7 +798,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));
} }
@ -4285,11 +4285,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();

97
Firmware/cmdqueue.cpp
View File

@ -1,3 +1,4 @@
#include <util/atomic.h>
#include "cmdqueue.h" #include "cmdqueue.h"
#include "cardreader.h" #include "cardreader.h"
#include "ultralcd.h" #include "ultralcd.h"
@ -26,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;
@ -155,7 +153,7 @@ static bool cmdqueue_could_enqueue_front(size_t len_asked)
// len_asked does not contain the zero terminator size. // len_asked does not contain the zero terminator size.
// This function may update bufindw, therefore for the power panic to work, this function must be called // This function may update bufindw, therefore for the power panic to work, this function must be called
// with the interrupts disabled! // with the interrupts disabled!
static bool cmdqueue_could_enqueue_back(size_t len_asked, bool atomic_update = false) static bool __attribute__((noinline)) cmdqueue_could_enqueue_back(size_t len_asked)
{ {
// MAX_CMD_SIZE has to accommodate the zero terminator. // MAX_CMD_SIZE has to accommodate the zero terminator.
if (len_asked >= MAX_CMD_SIZE) if (len_asked >= MAX_CMD_SIZE)
@ -165,61 +163,29 @@ static bool cmdqueue_could_enqueue_back(size_t len_asked, bool atomic_update = f
// Full buffer. // Full buffer.
return false; return false;
if (serial_count > 0) { // If there is some data stored starting at bufindw, len_asked is certainly smaller than
// If there is some data stored starting at bufindw, len_asked is certainly smaller than // the allocated data buffer. Try to reserve a new buffer and to move the already received
// the allocated data buffer. Try to reserve a new buffer and to move the already received // serial data.
// serial data. // How much memory to reserve for the commands pushed to the front?
// How much memory to reserve for the commands pushed to the front? // End of the queue, when pushing to the end.
// End of the queue, when pushing to the end. size_t endw = bufindw + len_asked + (1 + CMDHDRSIZE);
size_t endw = bufindw + len_asked + (1 + CMDHDRSIZE); if (bufindw < bufindr)
if (bufindw < bufindr) // Simple case. There is a contiguous space between the write buffer and the read buffer.
// Simple case. There is a contiguous space between the write buffer and the read buffer. return endw + CMDBUFFER_RESERVE_FRONT <= bufindr;
return endw + CMDBUFFER_RESERVE_FRONT <= bufindr; // Otherwise the free space is split between the start and end.
// Otherwise the free space is split between the start and end. if (// Could one fit to the end, including the reserve?
if (// Could one fit to the end, including the reserve? endw + CMDBUFFER_RESERVE_FRONT <= sizeof(cmdbuffer) ||
endw + CMDBUFFER_RESERVE_FRONT <= sizeof(cmdbuffer) || // Could one fit to the end, and the reserve to the start?
// Could one fit to the end, and the reserve to the start? (endw <= sizeof(cmdbuffer) && CMDBUFFER_RESERVE_FRONT <= bufindr))
(endw <= sizeof(cmdbuffer) && CMDBUFFER_RESERVE_FRONT <= bufindr)) return true;
return true; // Could one fit both to the start?
// Could one fit both to the start? if (len_asked + (1 + CMDHDRSIZE) + CMDBUFFER_RESERVE_FRONT <= bufindr) {
if (len_asked + (1 + CMDHDRSIZE) + CMDBUFFER_RESERVE_FRONT <= bufindr) { // Mark the rest of the buffer as used.
// Mark the rest of the buffer as used. memset(cmdbuffer+bufindw, 0, sizeof(cmdbuffer)-bufindw);
memset(cmdbuffer+bufindw, 0, sizeof(cmdbuffer)-bufindw); // and point to the start.
// and point to the start. // Be careful! The bufindw needs to be changed atomically for the power panic & filament panic to work.
// Be careful! The bufindw needs to be changed atomically for the power panic & filament panic to work. ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { bufindw = 0; }
if (atomic_update) return true;
cli();
bufindw = 0;
if (atomic_update)
sei();
return true;
}
} else {
// How much memory to reserve for the commands pushed to the front?
// End of the queue, when pushing to the end.
size_t endw = bufindw + len_asked + (1 + CMDHDRSIZE);
if (bufindw < bufindr)
// Simple case. There is a contiguous space between the write buffer and the read buffer.
return endw + CMDBUFFER_RESERVE_FRONT <= bufindr;
// Otherwise the free space is split between the start and end.
if (// Could one fit to the end, including the reserve?
endw + CMDBUFFER_RESERVE_FRONT <= sizeof(cmdbuffer) ||
// Could one fit to the end, and the reserve to the start?
(endw <= sizeof(cmdbuffer) && CMDBUFFER_RESERVE_FRONT <= bufindr))
return true;
// Could one fit both to the start?
if (len_asked + (1 + CMDHDRSIZE) + CMDBUFFER_RESERVE_FRONT <= bufindr) {
// Mark the rest of the buffer as used.
memset(cmdbuffer+bufindw, 0, sizeof(cmdbuffer)-bufindw);
// and point to the start.
// Be careful! The bufindw needs to be changed atomically for the power panic & filament panic to work.
if (atomic_update)
cli();
bufindw = 0;
if (atomic_update)
sei();
return true;
}
} }
return false; return false;
} }
@ -371,7 +337,7 @@ void repeatcommand_front()
void get_command() void get_command()
{ {
// Test and reserve space for the new command string. // Test and reserve space for the new command string.
if (! cmdqueue_could_enqueue_back(MAX_CMD_SIZE - 1, true)) if (! cmdqueue_could_enqueue_back(MAX_CMD_SIZE - 1))
return; return;
if (MYSERIAL.available() == RX_BUFFER_SIZE - 1) { //compare number of chars buffered in rx buffer with rx buffer size if (MYSERIAL.available() == RX_BUFFER_SIZE - 1) { //compare number of chars buffered in rx buffer with rx buffer size
@ -403,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
@ -490,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;
@ -506,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: ");
@ -517,7 +484,7 @@ void get_command()
serial_count = 0; //clear buffer serial_count = 0; //clear buffer
// Don't call cmdqueue_could_enqueue_back if there are no characters waiting // Don't call cmdqueue_could_enqueue_back if there are no characters waiting
// in the queue, as this function will reserve the memory. // in the queue, as this function will reserve the memory.
if (MYSERIAL.available() == 0 || ! cmdqueue_could_enqueue_back(MAX_CMD_SIZE-1, true)) if (MYSERIAL.available() == 0 || ! cmdqueue_could_enqueue_back(MAX_CMD_SIZE-1))
return; return;
} // end of "end of line" processing } // end of "end of line" processing
else { else {
@ -615,7 +582,7 @@ void get_command()
if(card.eof()) break; if(card.eof()) break;
// The following line will reserve buffer space if available. // The following line will reserve buffer space if available.
if (! cmdqueue_could_enqueue_back(MAX_CMD_SIZE-1, true)) if (! cmdqueue_could_enqueue_back(MAX_CMD_SIZE-1))
return; return;
} }
else else

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
View File

@ -94,7 +94,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 */
@ -669,11 +669,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
@ -7518,6 +7513,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