3DPrinting/MarlinFirmware
0
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-02-18 07:10:58 +00:00
Code Issues Releases Wiki Activity

⚡️ Fix MMU2 sscanf bug, optimize (#26449)

Browse source 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
Erkan Ozgur Yilmaz 2023-11-23 02:39:40 +00:00 committed by GitHub
parent 993cc9463e
commit 2d9262cc5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Marlin/src/feature/mmu/mmu2.cpp
View file

@ -76,7 +76,7 @@ MMU2 mmu2;
#define MMU2_NO_TOOL 99 #define MMU2_NO_TOOL 99
#define MMU_BAUD 115200 #define MMU_BAUD 115200
bool MMU2::_enabled, MMU2::ready, MMU2::mmu_print_saved; bool MMU2::_enabled, MMU2::ready;
#if HAS_PRUSA_MMU2S #if HAS_PRUSA_MMU2S
bool MMU2::mmu2s_triggered; bool MMU2::mmu2s_triggered;
#endif #endif
@ -84,7 +84,6 @@ uint8_t MMU2::cmd, MMU2::cmd_arg, MMU2::last_cmd, MMU2::extruder;
int8_t MMU2::state = 0; int8_t MMU2::state = 0;
volatile int8_t MMU2::finda = 1; volatile int8_t MMU2::finda = 1;
volatile bool MMU2::finda_runout_valid; volatile bool MMU2::finda_runout_valid;
uint16_t MMU2::version = 0, MMU2::buildnr = 0;
millis_t MMU2::prev_request, MMU2::prev_P0_request; millis_t MMU2::prev_request, MMU2::prev_P0_request;
char MMU2::rx_buffer[MMU_RX_SIZE], MMU2::tx_buffer[MMU_TX_SIZE]; char MMU2::rx_buffer[MMU_RX_SIZE], MMU2::tx_buffer[MMU_TX_SIZE];
@ -146,6 +145,7 @@ void mmu2_attn_buzz(const bool two=false) {
if (two) { BUZZ(10, 0); BUZZ(200, 404); } if (two) { BUZZ(10, 0); BUZZ(200, 404); }
} }
// Avoiding sscanf significantly reduces build size
void MMU2::mmu_loop() { void MMU2::mmu_loop() {
switch (state) { switch (state) {
@ -168,7 +168,7 @@ void MMU2::mmu_loop() {
case -2: case -2:
if (rx_ok()) { if (rx_ok()) {
sscanf(rx_buffer, "%huok\n", &version); const uint16_t version = uint16_t(strtoul(rx_buffer, nullptr, 10));
DEBUG_ECHOLNPGM("MMU => ", version, "\nMMU <= 'S2'"); DEBUG_ECHOLNPGM("MMU => ", version, "\nMMU <= 'S2'");
MMU2_SEND("S2"); // Read Build Number MMU2_SEND("S2"); // Read Build Number
state = -3; state = -3;
@ -177,17 +177,15 @@ void MMU2::mmu_loop() {
case -3: case -3:
if (rx_ok()) { if (rx_ok()) {
sscanf(rx_buffer, "%huok\n", &buildnr); const uint16_t buildnr = uint16_t(strtoul(rx_buffer, nullptr, 10));
DEBUG_ECHOLNPGM("MMU => ", buildnr); DEBUG_ECHOLNPGM("MMU => ", buildnr);
check_version(); check_version(buildnr);
#if ENABLED(MMU2_MODE_12V) #if ENABLED(MMU2_MODE_12V)
DEBUG_ECHOLNPGM("MMU <= 'M1'"); DEBUG_ECHOLNPGM("MMU <= 'M1'");
MMU2_SEND("M1"); // Stealth Mode MMU2_SEND("M1"); // Stealth Mode
state = -5; state = -5;
#else #else
DEBUG_ECHOLNPGM("MMU <= 'P0'"); DEBUG_ECHOLNPGM("MMU <= 'P0'");
MMU2_SEND("P0"); // Read FINDA MMU2_SEND("P0"); // Read FINDA
@ -210,7 +208,8 @@ void MMU2::mmu_loop() {
case -4: case -4:
if (rx_ok()) { if (rx_ok()) {
sscanf(rx_buffer, "%hhuok\n", &finda); const uint8_t findex = uint8_t(rx_buffer[0] - '0');
if (findex <= 1) finda = findex;
DEBUG_ECHOLNPGM("MMU => ", finda, "\nMMU - ENABLED"); DEBUG_ECHOLNPGM("MMU => ", finda, "\nMMU - ENABLED");
@ -283,7 +282,8 @@ void MMU2::mmu_loop() {
case 2: // response to command P0 case 2: // response to command P0
if (rx_ok()) { if (rx_ok()) {
sscanf(rx_buffer, "%hhuok\n", &finda); const uint8_t findex = uint8_t(rx_buffer[0] - '0');
if (findex <= 1) finda = findex;
// This is super annoying. Only activate if necessary // This is super annoying. Only activate if necessary
//if (finda_runout_valid) DEBUG_ECHOLNPGM("MMU <= 'P0'\nMMU => ", p_float_t(finda, 6)); //if (finda_runout_valid) DEBUG_ECHOLNPGM("MMU <= 'P0'\nMMU => ", p_float_t(finda, 6));
@ -439,7 +439,7 @@ bool MMU2::rx_ok() {
/** /**
* Check if MMU has compatible firmware * Check if MMU has compatible firmware
*/ */
void MMU2::check_version() { void MMU2::check_version(const uint16_t buildnr) {
if (buildnr < MMU_REQUIRED_FW_BUILDNR) { if (buildnr < MMU_REQUIRED_FW_BUILDNR) {
SERIAL_ERROR_MSG("Invalid MMU2 firmware. Version >= " STRINGIFY(MMU_REQUIRED_FW_BUILDNR) " required."); SERIAL_ERROR_MSG("Invalid MMU2 firmware. Version >= " STRINGIFY(MMU_REQUIRED_FW_BUILDNR) " required.");
kill(GET_TEXT_F(MSG_KILL_MMU2_FIRMWARE)); kill(GET_TEXT_F(MSG_KILL_MMU2_FIRMWARE));
@ -801,8 +801,7 @@ bool MMU2::get_response() {
void MMU2::manage_response(const bool move_axes, const bool turn_off_nozzle) { void MMU2::manage_response(const bool move_axes, const bool turn_off_nozzle) {
constexpr xyz_pos_t park_point = NOZZLE_PARK_POINT; constexpr xyz_pos_t park_point = NOZZLE_PARK_POINT;
bool response = false; bool response = false, mmu_print_saved = false;
mmu_print_saved = false;
xyz_pos_t resume_position; xyz_pos_t resume_position;
celsius_t resume_hotend_temp = thermalManager.degTargetHotend(active_extruder); celsius_t resume_hotend_temp = thermalManager.degTargetHotend(active_extruder);

5
Marlin/src/feature/mmu/mmu2.h
View file

@ -64,7 +64,7 @@ private:
static bool rx_ok(); static bool rx_ok();
static bool rx_start(); static bool rx_start();
static void check_version(); static void check_version(const uint16_t buildnr);
static void command(const uint8_t cmd); static void command(const uint8_t cmd);
static bool get_response(); static bool get_response();
@ -90,13 +90,12 @@ private:
static void mmu_continue_loading(); static void mmu_continue_loading();
#endif #endif
static bool _enabled, ready, mmu_print_saved; static bool _enabled, ready;
static uint8_t cmd, cmd_arg, last_cmd, extruder; static uint8_t cmd, cmd_arg, last_cmd, extruder;
static int8_t state; static int8_t state;
static volatile int8_t finda; static volatile int8_t finda;
static volatile bool finda_runout_valid; static volatile bool finda_runout_valid;
static uint16_t version, buildnr;
static millis_t prev_request, prev_P0_request; static millis_t prev_request, prev_P0_request;
static char rx_buffer[MMU_RX_SIZE], tx_buffer[MMU_TX_SIZE]; static char rx_buffer[MMU_RX_SIZE], tx_buffer[MMU_TX_SIZE];