spacecruft
/
farmbot-arduino-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix for minimum microstep setting

pull/123/head
Tim Evers 2020-01-06 22:06:59 +01:00
parent e8c97d9783
commit d4b91fba67
3 changed files with 43 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Movement.cpp
View File

@ -238,26 +238,18 @@ void Movement::loadSettings()
motorCurrentY = ParameterList::getInstance()->getValue(MOVEMENT_MOTOR_CURRENT_Y);
stallSensitivityY = ParameterList::getInstance()->getValue(MOVEMENT_STALL_SENSITIVITY_Y);
microStepsY = ParameterList::getInstance()->getValue(MOVEMENT_MICROSTEPS_Y);
//axisY.loadSettingsTMC2130(motorCurrent, stallSensitivity, microSteps);
motorCurrentZ = ParameterList::getInstance()->getValue(MOVEMENT_MOTOR_CURRENT_Z);
stallSensitivityZ = ParameterList::getInstance()->getValue(MOVEMENT_STALL_SENSITIVITY_Z);
microStepsX = ParameterList::getInstance()->getValue(MOVEMENT_MICROSTEPS_Z);
//axisZ.loadSettingsTMC2130(motorCurrent, stallSensitivity, microSteps);
/**/
motorCurrentX = 300;
stallSensitivityX = 0;
microStepsX = 8;
motorCurrentY = 300;
stallSensitivityX = 0;
stallSensitivityY = 0;
microStepsY = 8;
motorCurrentZ = 300;
stallSensitivityZ = 0;
microStepsZ = 8;
if (microStepsX <= 0) { microStepsX = 1; }
if (microStepsY <= 0) { microStepsY = 1; }
if (microStepsZ <= 0) { microStepsZ = 1; }
axisX.loadSettingsTMC2130(motorCurrentX, stallSensitivityX, microStepsX);
axisY.loadSettingsTMC2130(motorCurrentX, stallSensitivityX, microStepsX);

21
src/farmbot_arduino_controller.cpp
View File

@ -858,6 +858,27 @@ void runTestForDebug()
digitalWrite(E_STEP_PIN, LOW);
delayMicroseconds(100);
/*
TMC2130X.read_STAT();
if (TMC2130X.isStandstill() || TMC2130X.isStallguard()) {
Serial.print("X");
}
TMC2130Y.read_STAT();
if (TMC2130Y.isStandstill() || TMC2130Y.isStallguard()) {
Serial.print("Y");
}
TMC2130Z.read_STAT();
if (TMC2130Z.isStandstill() || TMC2130Z.isStallguard()) {
Serial.print("Z");
}
TMC2130E.read_STAT();
if (TMC2130E.isStandstill() || TMC2130E.isStallguard()) {
Serial.print("E");
}
*/
/*

73
src/src.ino
View File

@ -36,12 +36,12 @@ void setup()
initLastAction();
homeOnBoot();
setupTestForDebug();
//setupTestForDebug();
//Serial.print(COMM_REPORT_COMMENT);
//Serial.print(SPACE);
//Serial.print("ARDUINO STARTUP COMPLETE");
//Serial.print(CRLF);
Serial.print(COMM_REPORT_COMMENT);
Serial.print(SPACE);
Serial.print("ARDUINO STARTUP COMPLETE");
Serial.print(CRLF);
/*
Serial.begin(115200); //init serial port and set baudrate
@ -133,12 +133,12 @@ void setup()
//loadTMC2130ParametersMotor(&TMC2130E, 8, 200, 0);
Serial.println("Enable pins");
//Serial.println("Enable pins");
digitalWrite(X_ENABLE_PIN, LOW); // enable driver
digitalWrite(Y_ENABLE_PIN, LOW); // enable driver
digitalWrite(Z_ENABLE_PIN, LOW); // enable driver
digitalWrite(E_ENABLE_PIN, LOW); // enable driver
//digitalWrite(X_ENABLE_PIN, LOW); // enable driver
//digitalWrite(Y_ENABLE_PIN, LOW); // enable driver
//digitalWrite(Z_ENABLE_PIN, LOW); // enable driver
//digitalWrite(E_ENABLE_PIN, LOW); // enable driver
//Serial.println("Enable");
@ -147,52 +147,13 @@ void setup()
// the loop function runs over and over again until power down or reset
void loop()
{
runTestForDebug();
//runTestForDebug();
//checkEncoders();
//checkPinGuard();
//checkSerialInputs();
//checkEmergencyStop();
//checkParamsChanged();
//periodicChecksAndReport();
checkEncoders();
checkPinGuard();
checkSerialInputs();
checkEmergencyStop();
checkParamsChanged();
periodicChecksAndReport();
//static uint32_t last_time = 0;
//uint32_t ms = millis();
/*
// make a step
digitalWrite(X_STEP_PIN, HIGH);
digitalWrite(Y_STEP_PIN, HIGH);
digitalWrite(Z_STEP_PIN, HIGH);
digitalWrite(E_STEP_PIN, HIGH);
delayMicroseconds(100);
digitalWrite(X_STEP_PIN, LOW);
digitalWrite(Y_STEP_PIN, LOW);
digitalWrite(Z_STEP_PIN, LOW);
digitalWrite(E_STEP_PIN, LOW);
delayMicroseconds(100);
*/
/*
TMC2130X.read_STAT();
if (TMC2130X.isStandstill() || TMC2130X.isStallguard()) {
Serial.print("X");
}
TMC2130Y.read_STAT();
if (TMC2130Y.isStandstill() || TMC2130Y.isStallguard()) {
Serial.print("Y");
}
TMC2130Z.read_STAT();
if (TMC2130Z.isStandstill() || TMC2130Z.isStallguard()) {
Serial.print("Z");
}
TMC2130E.read_STAT();
if (TMC2130E.isStandstill() || TMC2130E.isStallguard()) {
Serial.print("E");
}
*/
}