spacecruft
/
farmbot_os
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix arduino build 4 realz

pull/559/head
Connor Rigby 2018-06-05 14:30:11 -07:00
parent 073036a242
commit c97553d017
No known key found for this signature in database
GPG Key ID: 9B7C52AA37F36C18
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -13,9 +13,6 @@ endif
ifeq ($(SKIP_ARDUINO_BUILD),)
FBARDUINO_FIRMWARE_OUT_DIR := $(PWD)/_build
FBARDUINO_FIRMWARE_SRC_DIR := $(PWD)/c_src/farmbot-arduino-firmware/src
FBARDUINO_FIRMWARE_BIN_DIR := $(PWD)/priv
ALL += fbos_arduino_firmware
CLEAN += fbos_clean_arduino_firmware
@ -30,10 +27,10 @@ all: $(ALL)
clean: $(CLEAN)
fbos_arduino_firmware:
cd c_src/farmbot-arduino-firmware && make all FBARDUINO_FIRMWARE_OUT_DIR=$(PWD)/_build FBARDUINO_FIRMWARE_SRC_DIR=$(PWD)/c_src/farmbot-arduino-firmware/src FBARDUINO_FIRMWARE_BIN_DIR=$(PWD)/priv
cd c_src/farmbot-arduino-firmware && make all BUILD_DIR=$(PWD)/_build FBARDUINO_FIRMWARE_SRC_DIR=$(PWD)/c_src/farmbot-arduino-firmware/src BIN_DIR=$(PWD)/priv
fbos_clean_arduino_firmware:
cd c_src/farmbot-arduino-firmware && make clean FBARDUINO_FIRMWARE_OUT_DIR=$(PWD)/_build FBARDUINO_FIRMWARE_SRC_DIR=$(PWD)/c_src/farmbot-arduino-firmware/src FBARDUINO_FIRMWARE_BIN_DIR=$(PWD)/priv
cd c_src/farmbot-arduino-firmware && make clean BUILD_DIR=$(PWD)/_build FBARDUINO_FIRMWARE_SRC_DIR=$(PWD)/c_src/farmbot-arduino-firmware/src BIN_DIR=$(PWD)/priv
fbos_build_calendar_nif:
make -f c_src/build_calendar/Makefile all ERL_EI_INCLUDE_DIR=$(ERL_EI_INCLUDE_DIR) ERL_EI_LIBDIR=$(ERL_EI_LIBDIR)

2
c_src/farmbot-arduino-firmware

@ -1 +1 @@
Subproject commit c6fdf610fa1342a5527bd7f1a673736ff172a082
Subproject commit 66ff2bb36bb712e86ff889d2c7b4157cf27362da