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

build 143e

Browse Source 
Linear advance disabled
Max feedrate reduced to 200mm/s
Silent max accel reduced to 984mm/s^2
some debug logs removed, tmc_init - log message fixed
This commit is contained in:
Robert Pelnar 2018-01-04 18:08:22 +01:00
parent 8a5ba89a9c
commit 0a2087c1cb
5 changed files with 14954 additions and 15160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Configuration.h
View File

@ -11,7 +11,7 @@
#define FW_version "3.1.1-RC4"
#define FW_build 143
//#define FW_build --BUILD-NUMBER--
#define FW_version_build FW_version " b" STR(FW_build) "b"
#define FW_version_build FW_version " b" STR(FW_build) "e"
#define FW_PRUSA3D_MAGIC "PRUSA3DFW"

10
Firmware/Configuration_prusa.h
View File

@ -65,7 +65,7 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o
#define NUM_AXIS 4 // The axis order in all axis related arrays is X, Y, Z, E
#define HOMING_FEEDRATE {3000, 3000, 800, 0} // set the homing speeds (mm/min) // 3000 is also valid for stallGuard homing. Valid range: 2200 - 3000
#define DEFAULT_MAX_FEEDRATE {500, 500, 12, 120} // (mm/sec) max feedrate (M203)
#define DEFAULT_MAX_FEEDRATE {200, 200, 12, 120} // (mm/sec) max feedrate (M203)
#define DEFAULT_MAX_ACCELERATION {1000, 1000, 200, 5000} // (mm/sec^2) max acceleration (M201)
@ -75,8 +75,8 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o
#define MANUAL_FEEDRATE {2700, 2700, 1000, 100} // set the speeds for manual moves (mm/min)
//Silent mode limits
#define SILENT_MAX_ACCEL_X 1000 // X-axis max acceleration in silent mode in mm/s^2
#define SILENT_MAX_ACCEL_Y 1000 // Y-axis max axxeleration in silent mode in mm/s^2
#define SILENT_MAX_ACCEL_X 984 // X-axis max acceleration in silent mode in mm/s^2
#define SILENT_MAX_ACCEL_Y 984 // Y-axis max axxeleration in silent mode in mm/s^2
#define SILENT_MAX_ACCEL_X_ST (100*SILENT_MAX_ACCEL_X) // X max accel in steps/s^2
#define SILENT_MAX_ACCEL_Y_ST (100*SILENT_MAX_ACCEL_Y) // Y max accel in steps/s^2
#define SILENT_MAX_FEEDRATE 172 //max feedrate in mm/s, because mode switched to normal for homming , this value limits also homing, it should be greater (160mm/s=9600mm/min>2700mm/min)
@ -124,8 +124,8 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o
//#define DEBUG_XSTEP_DUP_PIN 21 //duplicate x-step output to pin 21 (SCL on P3)
//#define DEBUG_YSTEP_DUP_PIN 21 //duplicate y-step output to pin 21 (SCL on P3)
//#define DEBUG_BLINK_ACTIVE
#define DEBUG_DISABLE_FANCHECK //disable fan check (no ISR INT7, check disabled)
#define DEBUG_DISABLE_FSENSORCHECK //disable fsensor check (no ISR INT7, check disabled)
//#define DEBUG_DISABLE_FANCHECK //disable fan check (no ISR INT7, check disabled)
//#define DEBUG_DISABLE_FSENSORCHECK //disable fsensor check (no ISR INT7, check disabled)
#define DEBUG_DUMP_TO_2ND_SERIAL //dump received characters to 2nd serial line
#endif

30094
Firmware/Firmware.ino.rambo.hex
View File

File diff suppressed because it is too large Load Diff

6
Firmware/Marlin_main.cpp
View File

@ -914,7 +914,7 @@ void setup()
stdout = uartout;
SERIAL_PROTOCOLLNPGM("start");
SERIAL_ECHO_START;
printf_P(PSTR(" "FW_version_build"\n"));
#if 0
SERIAL_ECHOLN("Reading eeprom from 0 to 100: start");
@ -1020,7 +1020,7 @@ void setup()
setup_homepin();
if (1) {
SERIAL_ECHOPGM("initial zsteps on power up: "); MYSERIAL.println(tmc2130_rd_MSCNT(Z_TMC2130_CS));
/// SERIAL_ECHOPGM("initial zsteps on power up: "); MYSERIAL.println(tmc2130_rd_MSCNT(Z_TMC2130_CS));
// try to run to zero phase before powering the Z motor.
// Move in negative direction
WRITE(Z_DIR_PIN,INVERT_Z_DIR);
@ -1032,7 +1032,7 @@ void setup()
WRITE(Z_STEP_PIN, INVERT_Z_STEP_PIN);
delay(2);
}
SERIAL_ECHOPGM("initial zsteps after reset: "); MYSERIAL.println(tmc2130_rd_MSCNT(Z_TMC2130_CS));
// SERIAL_ECHOPGM("initial zsteps after reset: "); MYSERIAL.println(tmc2130_rd_MSCNT(Z_TMC2130_CS));
}
#if defined(Z_AXIS_ALWAYS_ON)

2
Firmware/tmc2130.cpp
View File

@ -127,7 +127,7 @@ void tmc2130_setup_chopper(uint8_t axis, uint8_t mres, uint8_t current_h, uint8_
void tmc2130_init()
{
DBG(_n("tmc2130_init(), mode=%S\n"), tmc2130_mode?_n("NORMAL"):_n("STEALTH"));
DBG(_n("tmc2130_init(), mode=%S\n"), tmc2130_mode?_n("STEALTH"):_n("NORMAL"));
tmc2130_mres[0] = tmc2130_calc_mres(TMC2130_USTEPS_XY);
tmc2130_mres[1] = tmc2130_calc_mres(TMC2130_USTEPS_XY);
tmc2130_mres[2] = tmc2130_calc_mres(TMC2130_USTEPS_Z);