From f61d578c7ed1c19b7ddca20f0993dc8f2b53b99e Mon Sep 17 00:00:00 2001 From: Rob McKenzie Date: Sun, 8 Mar 2020 19:30:22 +1000 Subject: [PATCH] Small Tweaks --- CHANGELOG.md | 11 +++++++++-- README.md | 5 ++++- src/config.h | 14 +++++++------- src/tmc2130.c | 4 ++-- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af28aeeb..a57d64d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ -Changelog of MMU 2.0 Firmware +Changelog of MMU2S Firmware ============================= +# v3.0.3 RMM +* Implemented PlatformIO build scripts for variants +* Pulled Printer Code upstream to 3.9.0-RC1 +* Resolved M600 on stock start gcode issue +* Current tuning for MMU2S drivers to improve reliability + # v3.0.2 RMM * Printer FW Changes * Added LA1.5 Support @@ -7,6 +13,7 @@ Changelog of MMU 2.0 Firmware * M600 Eject issue fixed. * SE HT Thermistor fix, brought to my attention by gussner * Pulled printer FW to 3.8.1 Final + # v3.0.1 RMM * MK2.5S Changes * Initial home is in stealth mode for 12v situations @@ -14,7 +21,7 @@ Changelog of MMU 2.0 Firmware * Pulled thermistor table for SE HT sensor on Bondtech builds * Rebased to Stock 3.8.1-RC1 -# V3.0.0 RMM +# V3.0.0 RMM * Incorporated changes from 3.8.0 (7x7, ASA, Sheet Setups, menu updates & autodeplete) * Exactly PRUSA Stock FW COMMIT_NR:3274 of 3.8.0+ * Implemented timer0 @ 30Hz for PWM of Heatbed. diff --git a/README.md b/README.md index 786c9935..fd6ad7a2 100755 --- a/README.md +++ b/README.md @@ -20,7 +20,10 @@ This is configured to work directly with **MMU2S** with matching **MK3S** FW at https://github.com/TheZeroBeast/TZB-MK3S-Firmware ### PlatformIO -Download, open in PlatformIO and build. +Download, open in PlatformIO +Follow these steps to install EINSY board +https://community.platformio.org/t/error-when-building-latest-3d-printer-firmware/9506/2 +Build. The HEX which is placed within the .pio root folder still requires the addition of the **; device = mm-control** line as bellow. ### Arduino diff --git a/src/config.h b/src/config.h index 17aaba11..b0c57120 100644 --- a/src/config.h +++ b/src/config.h @@ -2,7 +2,7 @@ #define FW_VERSION 303 // example: 103 means version 1.0.3 -#define FW_BUILDNR 363 // number of commits in 'master' +#define FW_BUILDNR 364 // number of commits in 'master' #define WAKE_TIMER 300000 // 5m @@ -61,17 +61,17 @@ #define TMC2130_TCOOLTHRS_AX_IDL 450 // currents for pulley, selector and idler -#define CURRENT_HOLDING_STEALTH { 1, 7, 10} +#define CURRENT_HOLDING_STEALTH { 1, 7, 20} #define CURRENT_HOLDING_STEALTH_LOADING { 1, 7, 40} -#define CURRENT_HOLDING_NORMAL { 1, 10, 10} -#define CURRENT_HOLDING_NORMAL_LOADING { 1, 10, 40} +#define CURRENT_HOLDING_NORMAL { 1, 7, 20} +#define CURRENT_HOLDING_NORMAL_LOADING { 1, 7, 40} #define CURRENT_RUNNING_STEALTH {35, 35, 40} #define CURRENT_RUNNING_NORMAL {30, 35, 40} #define CURRENT_HOMING { 1, 35, 30} // speeds and accelerations #define MAX_SPEED_SEL_DEF_NORMAL 6000 // micro steps -#define MAX_SPEED_IDL_DEF_NORMAL 6000 // micro steps +#define MAX_SPEED_IDL_DEF_NORMAL 5000 // micro steps #define GLOBAL_ACC_DEF_NORMAL 80000 // micro steps / s² #define MAX_SPEED_SEL_DEF_STEALTH 2000 // micro steps #define MAX_SPEED_IDL_DEF_STEALTH 3000 // micro steps @@ -138,7 +138,7 @@ // Default #define TYPE_0_MAX_SPPED_PUL 4000 // S/S #define TYPE_0_ACC_FEED_PUL 3000 // S/S/S -#define TYPE_0_FILAMENT_PARKING_STEPS -650 // STEPS +#define TYPE_0_FILAMENT_PARKING_STEPS -670 // STEPS #define TYPE_0_FSensor_Sense_STEPS 1500 // STEPS #define TYPE_0_FEED_SPEED_PUL 760 // S/S #define TYPE_0_L2ExStageOne 350 // S/S @@ -156,7 +156,7 @@ // PVA #define TYPE_2_MAX_SPPED_PUL 2800 // S/S #define TYPE_2_ACC_FEED_PUL 2000 // S/S/S -#define TYPE_2_FILAMENT_PARKING_STEPS -650 // STEPS +#define TYPE_2_FILAMENT_PARKING_STEPS -670 // STEPS #define TYPE_2_FSensor_Sense_STEPS 1500 // STEPS #define TYPE_2_FEED_SPEED_PUL 760 // S/S #define TYPE_2_L2ExStageOne 350 // S/S diff --git a/src/tmc2130.c b/src/tmc2130.c index 563286d5..0b393661 100644 --- a/src/tmc2130.c +++ b/src/tmc2130.c @@ -220,7 +220,7 @@ int8_t tmc2130_init_axis_current_stealth(uint8_t axis, uint8_t current_h, uint8_ shr16_set_ena(axis); //stealth mode if (tmc2130_setup_chopper(axis, (uint32_t)__res(axis), current_h, current_r)) return -1; - tmc2130_wr(axis, TMC2130_REG_TPOWERDOWN, 0x00000000); + tmc2130_wr(axis, TMC2130_REG_TPOWERDOWN, 0x01000000); tmc2130_wr(axis, TMC2130_REG_COOLCONF, (((uint32_t)TMC2130_SG_THR) << 16)); tmc2130_wr(axis, TMC2130_REG_TCOOLTHRS, 0); tmc2130_wr(axis, TMC2130_REG_GCONF, 0x00000004); @@ -234,7 +234,7 @@ int8_t tmc2130_init_axis_current_normal(uint8_t axis, uint8_t current_h, uint8_t shr16_set_ena(axis); //normal mode if (tmc2130_setup_chopper(axis, (uint32_t)__res(axis), current_h, current_r)) return -1; - tmc2130_wr(axis, TMC2130_REG_TPOWERDOWN, 0x00000000); + tmc2130_wr(axis, TMC2130_REG_TPOWERDOWN, 0x01000000); if (homing && (axis == AX_IDL)) tmc2130_wr(axis, TMC2130_REG_COOLCONF, ((int32_t)TMC2130_SG_THR_HOM_IDL << 16)); else tmc2130_wr(axis, TMC2130_REG_COOLCONF, (((int32_t)__sg_thr(axis)) << 16)); tmc2130_wr(axis, TMC2130_REG_TCOOLTHRS, __tcoolthrs(axis));