Merge pull request #3 from FarmBot/master

Merge upstream changes
pull/129/head
Tim Evers 2020-02-07 22:39:31 +01:00 committed by GitHub
commit 6eb801282c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 177 additions and 50 deletions

6
.gitignore vendored
View File

@ -35,5 +35,11 @@
# Setting files
Debug.h
/__vm
.vscode
# Build artifacts
_build
bin
src.ino.cpp
src.ino.mega.hex
src.ino.with_bootloader.mega.hex

View File

@ -6,9 +6,10 @@ FBARDUINO_FIRMWARE_SRC_DIR ?= src
FBARDUINO_FIRMWARE_BUILD_DIR ?= $(BUILD_DIR)/sketch
FBARDUINO_FIRMWARE_LIB_BUILD_DIR ?= $(BUILD_DIR)/libraries
ARDUINO_INSTALL_DIR ?= $(HOME)/arduino-1.8.5
ARDUINO_INSTALL_DIR ?= $(HOME)/arduino-1.8.11
# Files to be tracked for make to know to rebuild.
COPY_INO := $(shell cp $(FBARDUINO_FIRMWARE_SRC_DIR)/src.ino $(FBARDUINO_FIRMWARE_SRC_DIR)/src.ino.cpp)
CXX_SRC := $(wildcard $(FBARDUINO_FIRMWARE_SRC_DIR)/*.cpp)
SRC := $(CXX_SRC)
SRC_DEPS := $(SRC) $(wildcard $(FBARDUINO_FIRMWARE_SRC_DIR)/*.h)
@ -38,34 +39,45 @@ include lib/EEPROM.Makefile
include lib/targets/ramps_v14.Makefile
include lib/targets/farmduino_v10.Makefile
include lib/targets/farmduino_k14.Makefile
include lib/targets/farmduino_k15.Makefile
include lib/targets/express_k10.Makefile
.PHONY: all clean \
.PHONY: all clean force_clean remove_ino_copy \
dep_core dep_core_clean \
dep_Servo dep_Servo_clean \
dep_SPI dep_SPI_clean \
dep_EEPROM dep_EEPROM_clean \
target_ramps_v14 target_ramps_v14_clean \
target_farmduino_v10 target_farmduino_v10_clean \
target_farmduino_k14 target_farmduino_k14_clean
target_farmduino_k14 target_farmduino_k14_clean \
target_farmduino_k15 target_farmduino_k15_clean \
target_express_k10 target_express_k10_clean
DEPS := $(DEP_CORE) $(DEP_SPI) $(DEP_Servo) $(DEP_EEPROM)
DEPS_OBJ := $(DEP_SPI_OBJ) $(DEP_Servo_OBJ) $(DEP_EEPROM_OBJ)
DEPS_CFLAGS := $(DEP_CORE_CFLAGS) $(DEP_SPI_CFLAGS) $(DEP_Servo_CFLAGS) $(DEP_EEPROM_CFLAGS)
all: $(BIN_DIR) $(DEPS) target_ramps_v14 target_farmduino_v10 target_farmduino_k14
all: $(BIN_DIR) $(DEPS) target_ramps_v14 target_farmduino_v10 target_farmduino_k14 target_farmduino_k15 target_express_k10 remove_ino_copy
clean: target_ramps_v14_clean target_farmduino_v10_clean target_farmduino_k14_clean
clean: remove_ino_copy target_ramps_v14_clean target_farmduino_v10_clean target_farmduino_k14_clean target_farmduino_k15_clean target_express_k10_clean
strings_test: all
$(OBJ_COPY) -I ihex $(TARGET_ramps_v14_HEX) -O binary $(TARGET_ramps_v14_HEX).bin
$(OBJ_COPY) -I ihex $(TARGET_farmduino_v10_HEX) -O binary $(TARGET_farmduino_v10_HEX).bin
$(OBJ_COPY) -I ihex $(TARGET_farmduino_k14_HEX) -O binary $(TARGET_farmduino_k14_HEX).bin
@strings $(TARGET_ramps_v14_HEX).bin | grep -q "6.4.0.R"
@strings $(TARGET_farmduino_v10_HEX).bin | grep -q "6.4.0.F"
@strings $(TARGET_farmduino_k14_HEX).bin | grep -q "6.4.0.G"
$(OBJ_COPY) -I ihex $(TARGET_farmduino_k15_HEX) -O binary $(TARGET_farmduino_k15_HEX).bin
$(OBJ_COPY) -I ihex $(TARGET_express_k10_HEX) -O binary $(TARGET_express_k10_HEX).bin
@strings $(TARGET_ramps_v14_HEX).bin | grep -q "6.5.0.R"
@strings $(TARGET_farmduino_v10_HEX).bin | grep -q "6.5.0.F"
@strings $(TARGET_farmduino_k14_HEX).bin | grep -q "6.5.0.G"
@strings $(TARGET_farmduino_k15_HEX).bin | grep -q "6.5.0.H"
@strings $(TARGET_express_k10_HEX).bin | grep -q "6.5.0.E"
force_clean:
force_clean: remove_ino_copy
$(RM) -r $(BUILD_DIR) $(BIN_DIR)
$(BIN_DIR):
$(MKDIR_P) $(BIN_DIR)
remove_ino_copy:
$(RM) $(FBARDUINO_FIRMWARE_SRC_DIR)/src.ino.cpp

View File

@ -1,4 +1,4 @@
farmbot-arduino-controller
farmbot-arduino-firmware
==========================
This software is responsible for receiving G-Codes from the Raspberry Pi, executing them, and reporting back the results.
@ -6,24 +6,13 @@ Technicals
==========================
Created with eclipseArduino V2 - For more details see http://www.baeyens.it/eclipse/
Command line flash tool installation
Development build instructions
==========================
```
sudo apt-get install arduino gcc-avr avr-libc avrdude python-configobj python-jinja2 python-serial
mkdir tmp
cd tmp
git clone https://github.com/miracle2k/python-glob2
cd python-glob2
wget https://bootstrap.pypa.io/ez_setup.py -O - | sudo python
sudo python setup.py install
git clone git://github.com/amperka/ino.git
cd ino
sudo make install
```
**This firmware is automatically bundled into [FarmBot OS](https://github.com/FarmBot/farmbot_os).
The following instructions are for isolated Arduino development only.**
Command line flash tool use
==========================
**NOTE:** We tag releases when they are stable. The latest version (on master) is not guaranteed to be stable.
See [releases](https://github.com/FarmBot/farmbot-arduino-firmware/releases) to find a stable release.
@ -34,18 +23,34 @@ See [releases](https://github.com/FarmBot/farmbot-arduino-firmware/releases) to
git clone https://github.com/FarmBot/farmbot-arduino-firmware
```
**OPTION B:** For stable release 1.0:
**OPTION B:** For stable release v6.4.2:
```
git clone -b 'alpha-1.0' --single-branch https://github.com/FarmBot/farmbot-arduino-firmware
git clone -b 'v6.4.2' --single-branch https://github.com/FarmBot/farmbot-arduino-firmware
```
To flash the firmware onto the device, run this:
```
cd farmbot-arduino-firmware
ino build
ino upload
```
Options for compiling and uploading:
* [Arduino IDE](https://www.arduino.cc/en/main/software):
* Open `farmbot-arduino-firmware/src/src.ino`.
* Select the `Mega 2560` board in _Tools_ > _Board_.
* Uncomment only the desired board in `src/Board.h`.
* To compile and flash the firmware onto the device:
* Connect a device via USB.
* Select _Sketch_ > _Upload_ or click the _upload_ button.
* To compile without flashing:
* Select _Sketch_ > _Export compiled binary_.
* The `.hex` file will save to the `src` directory.
* Make (Linux)
* [Download the Arduino 1.8.11 IDE](https://www.arduino.cc/download_handler.php?f=/arduino-1.8.11-linux64.tar.xz) and unpack to the `/home` directory.
* `cd farmbot-arduino-firmware`
* To compile:
* `make`
* `.hex` files for each board type will save to the `bin` directory.
* VSCode
* Set Arduino path and board type.
* To compile and flash the firmware onto the device:
* Connect a device via USB.
* Select _Arduino: Upload_.
Software overview
=================
@ -71,11 +76,11 @@ Farmbot_arduino_controller contains the setup() and main(). This is the main seq
|***Handler |
+-------+-----------+------+
| |
| +---+
v v
+--------------+ +-----------+
|StepperControl| | PinControl|
+--------------+ +-----------+
| |
v v
+--------+ +-----------+
|Movement| | PinControl|
+--------+ +-----------+
```
@ -122,6 +127,8 @@ HEATER_0_PIN | 10 | RAMPS board heating pin 0
HEATER_1_PIN | 8 | RAMPS board heating pin 1
SERVO_0_PIN | 4 | Servo motor 0 signal pin
SERVO_1_PIN | 5 | Servo motor 1 signal pin
SERVO_2_PIN | 6 | Servo motor 2 signal pin
SERVO_3_PIN | 11 | Servo motor 3 signal pin
G-Codes
@ -133,7 +140,7 @@ Code type|Number|Parameters|Function
---------|------|----------|--------
_G_ | | |_G-Code, the codes working the same as a 3D printer_
G |00 |X Y Z S |Move to location at given speed for axis (don't have to be a straight line), in absolute coordinates
G |01 |X Y Z S |Move to location on a straight line
G |01 |X Y Z S |Move to location on a straight line (not implemented)
G |28 | |Move home all axis
_F_ | | |_Farm commands, commands specially added for FarmBot_
F |01 |T |Dose amount of water using time in millisecond (not implemented)
@ -157,7 +164,7 @@ F |43 |P M |Set the I/O mode M (input=0/output=1) of a pin P in
F |44 |P V W T M |Set the value V on an arduino pin P, wait for time T in milliseconds, set value W on the arduino pin P in mode M (digital=0/analog=1)
F |51 |E P V |Set a value on the tool mount with I2C (not implemented)
F |52 |E P |Read value from the tool mount with I2C (not implemented)
F |61 |P V |Set the servo on the pin P (only pin 4 and 5) to the requested angle V
F |61 |P V |Set the servo on the pin P (only pins 4, 5, 6, and 11) to the requested angle V
F |81 | |Report end stop
F |82 | |Report current position
F       |83   |         |Report software version
@ -174,7 +181,7 @@ _R_ | | |_Report messages_
R |00 | |Idle
R |01 | |Current command started
R |02 | |Current command finished successfully
R |03 | |Current command finished with error
R |03 |V |Current command finished with error
R |04 | |Current command running
R |05 |X Y Z |Report motor/axis state
R |06 |X Y Z |Report calibration state during execution
@ -202,8 +209,21 @@ R |84 |X Y Z |Report encoder position scaled
R |85 |X Y Z |Report encoder position raw
R |87 | |Emergency lock
R |88 | |No config (see [configuration approval](#important))
R |89 |X Y Z |Report axis motor load (TMC2130)
R |99 | |Debug message
Error codes (R03)
-----------------
Value |Description
------|------------
0 |No error
1 |Emergency stop
2 |Timeout
3 |Stall detected
14 |Invalid command
15 |No config
Axis states (R05)
-----------------
@ -310,6 +330,15 @@ ID | Name
75 | MOVEMENT_INVERT_2_ENDPOINTS_X
76 | MOVEMENT_INVERT_2_ENDPOINTS_Y
77 | MOVEMENT_INVERT_2_ENDPOINTS_Z
81 | MOVEMENT_MOTOR_CURRENT_X
82 | MOVEMENT_MOTOR_CURRENT_Y
83 | MOVEMENT_MOTOR_CURRENT_Z
85 | MOVEMENT_STALL_SENSITIVITY_X
86 | MOVEMENT_STALL_SENSITIVITY_Y
87 | MOVEMENT_STALL_SENSITIVITY_Z
91 | MOVEMENT_MICROSTEPS_X
92 | MOVEMENT_MICROSTEPS_Y
93 | MOVEMENT_MICROSTEPS_Z
101 | ENCODER_ENABLED_X
102 | ENCODER_ENABLED_Y
103 | ENCODER_ENABLED_Z

View File

@ -0,0 +1,25 @@
TARGET_express_k10_BUILD_DIR := $(BUILD_DIR)/express_k10
TARGET_express_k10_HEX := $(BIN_DIR)/express_k10.hex
TARGET_express_k10_OBJ := $(patsubst $(FBARDUINO_FIRMWARE_SRC_DIR)/%,$(TARGET_express_k10_BUILD_DIR)/%,$(CXX_OBJ))
$(TARGET_express_k10_HEX): $(TARGET_express_k10_BUILD_DIR) $(TARGET_express_k10_BUILD_DIR)/express_k10.eep $(TARGET_express_k10_BUILD_DIR)/express_k10.elf
$(OBJ_COPY) -O ihex -R .eeprom $(TARGET_express_k10_BUILD_DIR)/express_k10.elf $@
$(TARGET_express_k10_BUILD_DIR)/express_k10.eep: $(TARGET_express_k10_BUILD_DIR)/express_k10.elf
$(OBJ_COPY) -O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 $< $@
$(TARGET_express_k10_BUILD_DIR)/express_k10.elf: $(TARGET_express_k10_OBJ)
$(CC) -w -Os -g -flto -fuse-linker-plugin -Wl,--gc-sections,--relax -mmcu=atmega2560 -o $@ $(TARGET_express_k10_OBJ) $(DEPS_OBJ) $(DEP_CORE_LDFLAGS)
$(TARGET_express_k10_BUILD_DIR)/%.o: $(FBARDUINO_FIRMWARE_SRC_DIR)/%.cpp
$(CXX) $(CXX_FLAGS) -DFARMBOT_BOARD_ID=3 $(DEPS_CFLAGS) $< -o $@
$(TARGET_express_k10_BUILD_DIR):
$(MKDIR_P) $(TARGET_express_k10_BUILD_DIR)
target_express_k10: $(TARGET_express_k10_HEX)
target_express_k10_clean:
$(RM) -r $(TARGET_express_k10_BUILD_DIR)
$(RM) $(TARGET_express_k10_HEX)

View File

@ -0,0 +1,25 @@
TARGET_farmduino_k15_BUILD_DIR := $(BUILD_DIR)/farmduino_k15
TARGET_farmduino_k15_HEX := $(BIN_DIR)/farmduino_k15.hex
TARGET_farmduino_k15_OBJ := $(patsubst $(FBARDUINO_FIRMWARE_SRC_DIR)/%,$(TARGET_farmduino_k15_BUILD_DIR)/%,$(CXX_OBJ))
$(TARGET_farmduino_k15_HEX): $(TARGET_farmduino_k15_BUILD_DIR) $(TARGET_farmduino_k15_BUILD_DIR)/farmduino_k15.eep $(TARGET_farmduino_k15_BUILD_DIR)/farmduino_k15.elf
$(OBJ_COPY) -O ihex -R .eeprom $(TARGET_farmduino_k15_BUILD_DIR)/farmduino_k15.elf $@
$(TARGET_farmduino_k15_BUILD_DIR)/farmduino_k15.eep: $(TARGET_farmduino_k15_BUILD_DIR)/farmduino_k15.elf
$(OBJ_COPY) -O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 $< $@
$(TARGET_farmduino_k15_BUILD_DIR)/farmduino_k15.elf: $(TARGET_farmduino_k15_OBJ)
$(CC) -w -Os -g -flto -fuse-linker-plugin -Wl,--gc-sections,--relax -mmcu=atmega2560 -o $@ $(TARGET_farmduino_k15_OBJ) $(DEPS_OBJ) $(DEP_CORE_LDFLAGS)
$(TARGET_farmduino_k15_BUILD_DIR)/%.o: $(FBARDUINO_FIRMWARE_SRC_DIR)/%.cpp
$(CXX) $(CXX_FLAGS) -DFARMBOT_BOARD_ID=4 $(DEPS_CFLAGS) $< -o $@
$(TARGET_farmduino_k15_BUILD_DIR):
$(MKDIR_P) $(TARGET_farmduino_k15_BUILD_DIR)
target_farmduino_k15: $(TARGET_farmduino_k15_HEX)
target_farmduino_k15_clean:
$(RM) -r $(TARGET_farmduino_k15_BUILD_DIR)
$(RM) $(TARGET_farmduino_k15_HEX)

View File

@ -3,6 +3,7 @@
//#define RAMPS_V14
//#define FARMDUINO_V10
//#define FARMDUINO_V14
//#define FARMDUINO_V30
#define FARMDUINO_EXP_V20
#else
@ -10,6 +11,7 @@
#undef RAMPS_V14
#undef FARMDUINO_V10
#undef FARMDUINO_V14
#undef FARMDUINO_V30
#undef FARMDUINO_EXP_V20
#if FARMBOT_BOARD_ID == 0
@ -20,6 +22,9 @@
#define FARMDUINO_V14
#elif FARMBOT_BOARD_ID == 3
#define FARMDUINO_EXP_V20
#elif FARMBOT_BOARD_ID == 4
#define FARMDUINO_EXP_V20
#define FARMDUINO_V30
#endif
#endif

View File

@ -241,17 +241,21 @@ enum MdlSpiEncoders
#endif /* CONFIG_H_ */
#if defined(RAMPS_V14) && !defined(SOFTWARE_VERSION)
#define SOFTWARE_VERSION "6.4.2.R\0"
#define SOFTWARE_VERSION "6.5.0.R\0"
#endif
#if defined(FARMDUINO_V10) && !defined(SOFTWARE_VERSION)
#define SOFTWARE_VERSION "6.4.2.F\0"
#define SOFTWARE_VERSION "6.5.0.F\0"
#endif
#if defined(FARMDUINO_V14) && !defined(SOFTWARE_VERSION)
#define SOFTWARE_VERSION "6.4.2.G\0"
#define SOFTWARE_VERSION "6.5.0.G\0"
#endif
#if defined(FARMDUINO_V30) && !defined(SOFTWARE_VERSION)
#define SOFTWARE_VERSION "6.5.0.H\0"
#endif
#if defined(FARMDUINO_EXP_V20) && !defined(SOFTWARE_VERSION)
#define SOFTWARE_VERSION "6.4.2.E\0"
#define SOFTWARE_VERSION "6.5.0.E\0"
#endif

View File

@ -289,6 +289,7 @@ void Movement::loadSettings()
void Movement::test()
{
#if defined(FARMDUINO_EXP_V20)
//axisX.enableMotor();
//axisX.setMotorStep();
//delayMicroseconds(500);
@ -331,6 +332,7 @@ void Movement::test()
#endif
}
void Movement::test2()
@ -1831,4 +1833,4 @@ void Movement::checkEncoders()
ENC_Z_B_PORT & ENC_Z_B_BYTE,
ENC_Z_A_Q_PORT & ENC_Z_A_Q_BYTE,
ENC_Z_B_Q_PORT & ENC_Z_B_Q_BYTE);
}
}

View File

@ -4,7 +4,7 @@
#define _TMC2130_BASICS_h
#if defined(ARDUINO) && ARDUINO >= 100
#include "arduino.h"
#include "Arduino.h"
#else
#include "WProgram.h"
#endif

View File

@ -534,6 +534,10 @@ void setPinInputOutput()
pinMode(AUX_DIR_PIN, OUTPUT);
pinMode(AUX_ENABLE_PIN, OUTPUT);
digitalWrite(AUX_STEP_PIN, LOW);
digitalWrite(AUX_DIR_PIN, LOW);
digitalWrite(AUX_ENABLE_PIN, LOW);
pinMode(LED_PIN, OUTPUT);
pinMode(VACUUM_PIN, OUTPUT);
pinMode(WATER_PIN, OUTPUT);
@ -541,6 +545,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); };
@ -557,6 +568,10 @@ 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);
}
#endif

View File

@ -48,7 +48,7 @@
<Optimization>Disabled</Optimization>
<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-controller.vsarduino.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<ForcedIncludeFiles>$(ProjectDir)__vm\.farmbot-arduino-firmware.vsarduino.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
<PreprocessorDefinitions>__AVR_atmega2560__;__AVR_ATmega2560__;_VMDEBUG=1;F_CPU=16000000L;ARDUINO=10802;ARDUINO_AVR_MEGA2560;ARDUINO_ARCH_AVR;__cplusplus=201103L;_VMICRO_INTELLISENSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
@ -63,8 +63,8 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<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\Documents\Arduino\libraries\TMC2130Stepper\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-controller.vsarduino.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<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>
<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>
@ -177,6 +177,7 @@
<ClInclude Include="TMC2130_Basics.h" />
<ClInclude Include="TMC2130_Basics_Reg.h" />
<ClInclude Include="__vm\.farmbot-arduino-controller.vsarduino.h" />
<ClInclude Include="__vm\.farmbot-arduino-firmware.vsarduino.h" />
<ClInclude Include="__vm\.src.vsarduino.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

View File

@ -290,5 +290,8 @@
<ClInclude Include="TMC2130_Basics_Reg.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="__vm\.farmbot-arduino-firmware.vsarduino.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>