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

fixing reference for other axis

pull/129/head
Tim Evers 2020-02-10 21:05:49 +01:00
parent a43f520711
commit 3a9f629034
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/MovementAxis.cpp
View File

@ -129,8 +129,8 @@ void MovementAxis::loadSettingsTMC2130(int motorCurrent, int stallSensitivity,
}
uint8_t MovementAxis::getStatus() {
return TMC2130X.read_STAT();
//return TMC2130A->getStatus();
//return TMC2130X.read_STAT();
return TMC2130A->read_STAT();
}
uint16_t MovementAxis::getLoad() {

23
src/farmbot_arduino_controller.cpp
View File

@ -350,6 +350,11 @@ void setPinInputOutput()
pinMode(FAN_PIN, OUTPUT);
pinMode(LED_PIN, OUTPUT);
digitalWrite(HEATER_0_PIN, LOW);
digitalWrite(HEATER_1_PIN, LOW);
digitalWrite(FAN_PIN, LOW);
digitalWrite(LED_PIN, LOW);
pinMode(UTM_C, INPUT_PULLUP);
pinMode(UTM_D, INPUT_PULLUP);
pinMode(UTM_E, INPUT_PULLUP);
@ -383,6 +388,11 @@ void setPinInputOutput()
pinMode(SERVO_2_PIN, OUTPUT);
pinMode(SERVO_3_PIN, OUTPUT);
digitalWrite(SERVO_0_PIN, LOW);
digitalWrite(SERVO_1_PIN, LOW);
digitalWrite(SERVO_2_PIN, LOW);
digitalWrite(SERVO_3_PIN, LOW);
Serial.print(COMM_REPORT_COMMENT);
Serial.print(SPACE);
Serial.print("Set input/output");
@ -444,6 +454,13 @@ void setPinInputOutput()
pinMode(PERIPHERAL_4_PIN, OUTPUT);
pinMode(PERIPHERAL_5_PIN, OUTPUT);
digitalWrite(LED_PIN, LOW);
digitalWrite(VACUUM_PIN, LOW);
digitalWrite(WATER_PIN, LOW);
digitalWrite(LIGHTING_PIN, LOW);
digitalWrite(PERIPHERAL_4_PIN, LOW);
digitalWrite(PERIPHERAL_5_PIN, LOW);
pinMode(UTM_C, INPUT_PULLUP);
pinMode(UTM_D, INPUT_PULLUP);
if (UTM_E > 0) { pinMode(UTM_E, INPUT_PULLUP); };
@ -460,6 +477,11 @@ void setPinInputOutput()
pinMode(SERVO_2_PIN, OUTPUT);
pinMode(SERVO_3_PIN, OUTPUT);
digitalWrite(SERVO_0_PIN, LOW);
digitalWrite(SERVO_1_PIN, LOW);
digitalWrite(SERVO_2_PIN, LOW);
digitalWrite(SERVO_3_PIN, LOW);
Serial.print(COMM_REPORT_COMMENT);
Serial.print(SPACE);
Serial.print("Set input/output");
@ -595,7 +617,6 @@ void startInterrupt()
Serial.print("Start interrupt");
Serial.print(CRLF);
// Start the interrupt used for moving
// Interrupt management code library written by Paul Stoffregen
// The default time 100 micro seconds

2
src/src.vcxproj
View File

@ -64,7 +64,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\..\..\..\Users\Bro\AppData\Local\arduino15\packages\arduino\hardware\avr\1.6.19\libraries\SPI\src;$(ProjectDir)..\..\..\..\Users\Bro\AppData\Local\arduino15\packages\arduino\hardware\avr\1.6.19\libraries\EEPROM\src;$(ProjectDir)..\..\..\..\Program Files (x86)\Arduino\libraries\Servo\src;$(ProjectDir)..\..\..\..\Users\Bro\AppData\Local\arduino15\packages\arduino\hardware\avr\1.6.19\cores\arduino;$(ProjectDir)..\..\..\..\Users\Bro\AppData\Local\arduino15\packages\arduino\hardware\avr\1.6.19\variants\mega;$(ProjectDir)..\..\..\..\Users\Bro\AppData\Local\arduino15\packages\arduino\tools\avr-gcc\4.9.2-atmel3.5.4-arduino2\avr\include;$(ProjectDir)..\..\..\..\Users\Bro\AppData\Local\arduino15\packages\arduino\tools\avr-gcc\4.9.2-atmel3.5.4-arduino2\avr\include\avr;$(ProjectDir)..\..\..\..\Users\Bro\AppData\Local\arduino15\packages\arduino\tools\avr-gcc\4.9.2-atmel3.5.4-arduino2\lib\gcc\avr\4.8.1\include;$(ProjectDir)..\..\..\..\Users\Bro\AppData\Local\arduino15\packages\arduino\tools\avr-gcc\4.9.2-atmel3.5.4-arduino2\lib\gcc\avr\4.9.2\include;$(ProjectDir)..\..\..\..\Users\Bro\AppData\Local\arduino15\packages\arduino\tools\avr-gcc\4.9.2-atmel3.5.4-arduino2\lib\gcc\avr\4.9.3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles>$(ProjectDir)__vm\.farmbot-arduino-firmware.vsarduino.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<ForcedIncludeFiles>$(ProjectDir)__vm\.farmbot-arduino-controller.vsarduino.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<WholeProgramOptimization>false</WholeProgramOptimization>
<PreprocessorDefinitions>__AVR_atmega2560__;__AVR_ATmega2560__;F_CPU=16000000L;ARDUINO=10802;ARDUINO_AVR_MEGA2560;ARDUINO_ARCH_AVR;__cplusplus=201103L;_VMICRO_INTELLISENSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>