Skip to content

Commit

Permalink
Storage and Refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
Bola Malek committed Mar 3, 2019
1 parent 06f3904 commit 385ee46
Show file tree
Hide file tree
Showing 9 changed files with 193 additions and 1,382 deletions.
20 changes: 11 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,6 @@ BSP = bsp
###############################################################################
# Objects and Paths

# main
OBJECTS += main.o

# drivers
OBJECTS += drivers/max11300/max11300.o
OBJECTS += drivers/ad9959/ad9959.o
OBJECTS += util/dds_config.o
OBJECTS += minig.o

#### Protobuf Build
# Include the nanopb provided Makefile rules
include $(VPATH)/nanopb/extra/nanopb.mk
Expand All @@ -69,6 +60,16 @@ OBJECTS += pb_decode.o # The nanopb decoder
OBJECTS += pb_common.o # The nanopb common parts
OBJECTS += gravity.pb.o # The compiled protocol definition

# drivers
OBJECTS += drivers/max11300/max11300.o
OBJECTS += drivers/ad9959/ad9959.o
OBJECTS += util/dds_config.o
OBJECTS += minig.o
OBJECTS += auto_g.o

# main
OBJECTS += main.o

SYS_OBJECTS += $(MBED)/drivers/AnalogIn.o
SYS_OBJECTS += $(MBED)/drivers/BusIn.o
SYS_OBJECTS += $(MBED)/drivers/BusInOut.o
Expand Down Expand Up @@ -438,6 +439,7 @@ all: $(PROJECT).bin $(PROJECT).hex size
# Build rule for the protocol
gravity.pb.c: gravity.proto
$(PROTOC) $(PROTOC_OPTS) --nanopb_out=. --proto_path=$(VPATH) gravity.proto
$(PROTOC) --python_out=/mnt/c/Users/Bola/Python\ Notebooks/AutoG/ --proto_path=$(VPATH) gravity.proto

.s.o:
+@$(call MAKEDIR,$(dir $@))
Expand Down
Loading

0 comments on commit 385ee46

Please sign in to comment.