From 16d4cd12cb4bdfc3eda3ec6019d093f971d8aca8 Mon Sep 17 00:00:00 2001
From: Aditya Naik
Date: Tue, 9 Jun 2020 12:40:35 -0400
Subject: Moved nanopb files to library dir; changed main filenames

---
 makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'makefile')

diff --git a/makefile b/makefile
index 640d80d..43f5d4d 100644
--- a/makefile
+++ b/makefile
@@ -36,13 +36,13 @@ BUILD_DIR = build
 ######################################
 # C sources
 C_SOURCES =  \
-src/main-master.c \
+src/master.c \
 src/stm32f4xx_it.c \
 src/stm32f4xx_hal_msp.c \
 src/system_stm32f4xx.c \
-src/pb_decode.c \
-src/pb_encode.c \
-src/pb_common.c \
+lib/nanopb/pb_decode.c \
+lib/nanopb/pb_encode.c \
+lib/nanopb/pb_common.c \
 src/handshake.pb.c \
 src/data.pb.c \
 lib/f4/stm32f4xx_hal_i2c.c \
@@ -123,7 +123,8 @@ C_INCLUDES =  \
 -Ilib/f4 \
 -Ilib/f4/Legacy \
 -Ilib/cmsis \
--Ilib/cmsis/f4
+-Ilib/cmsis/f4 \
+-Ilib/nanopb
 
 
 
-- 
cgit v1.2.3