Implement vision settings and start adding app settings

deps/tools/Makefile

@@ -1,4 +1,8 @@
-COMPILER=../02-extract/raspbian9/bin/arm-raspbian9-linux-gnueabihf-
+SYSROOT?=../02-extract/raspbian9/arm-raspbian9-linux-gnueabihf
+COMPILER?=../02-extract/raspbian9/bin/arm-raspbian9-linux-gnueabihf-
+WPILIB?=../allwpilib
+WPILIB_PLATFORM?=.
+OPENCV_INSTALL?=../03-build/opencv-build/install
 
 .PHONY: all
 .SUFFIXES:
@@ -9,21 +13,21 @@ clean:
 	rm -f setuidgids
 	rm -f _cscore.so
 	rm -f rpiConfigServer
-	rm -f rpiConfigServer/*.o
-	rm -f rpiConfigServer/resources/*.o
+	rm -f rpiConfigServer_src/*.o
+	rm -f rpiConfigServer_src/resources/*.o
 
 setuidgids: setuidgids.c
 	${COMPILER}gcc -O -Wall -D_GNU_SOURCE -o $@ $<
 
 _cscore.so: ../robotpy-cscore/src/_cscore.cpp ../robotpy-cscore/src/ndarray_converter.cpp
 	${COMPILER}g++ -O -Wall -fvisibility=hidden -shared -fPIC -o $@ \
-	    -I../03-build/opencv-build/install/include \
-	    -I../allwpilib/wpiutil/src/main/native/include \
-	    -I../allwpilib/cscore/src/main/native/include \
-	    -I../02-extract/raspbian9/arm-raspbian9-linux-gnueabihf/usr/include/python3.5 \
-	    -L../allwpilib/cscore/build/libs/cscore/shared/release \
-	    -L../allwpilib/wpiutil/build/libs/wpiutil/shared/release \
-	    -L../03-build/opencv-build/install/lib \
+	    -I${OPENCV_INSTALL}/include \
+	    -I${WPILIB}/wpiutil/src/main/native/include \
+	    -I${WPILIB}/cscore/src/main/native/include \
+	    -I${SYSROOT}/usr/include/python3.5 \
+	    -L${WPILIB}/cscore/build/libs/cscore/shared/${WPILIB_PLATFORM}/release \
+	    -L${WPILIB}/wpiutil/build/libs/wpiutil/shared/${WPILIB_PLATFORM}/release \
+	    -L${OPENCV_INSTALL}/lib \
 	    ../robotpy-cscore/src/_cscore.cpp \
 	    ../robotpy-cscore/src/ndarray_converter.cpp \
 	    -lcscore \
@@ -35,6 +39,7 @@ RPICONFIGSERVER_OBJS= \
     rpiConfigServer_src/MyHttpConnection.o \
     rpiConfigServer_src/NetworkSettings.o \
     rpiConfigServer_src/SystemStatus.o \
+    rpiConfigServer_src/VisionSettings.o \
     rpiConfigServer_src/VisionStatus.o \
     rpiConfigServer_src/WebSocketHandlers.o \
     rpiConfigServer_src/resources/index.html.o \
@@ -44,7 +49,7 @@ RPICONFIGSERVER_OBJS= \
 rpiConfigServer: ${RPICONFIGSERVER_OBJS}
 	${COMPILER}g++ -pthread -o $@ \
 	    ${RPICONFIGSERVER_OBJS} \
-	    -L../allwpilib/wpiutil/build/libs/wpiutil/static/release \
+	    -L${WPILIB}/wpiutil/build/libs/wpiutil/static/${WPILIB_PLATFORM}/release \
 	    -lwpiutil
 	${COMPILER}objcopy --only-keep-debug $@ $@.debug
 	${COMPILER}strip -g $@
@@ -52,7 +57,7 @@ rpiConfigServer: ${RPICONFIGSERVER_OBJS}
 
 %.o: %.cpp
 	${COMPILER}g++ -O -Wall -c -o $@ \
-	    -I../allwpilib/wpiutil/src/main/native/include \
+	    -I${WPILIB}/wpiutil/src/main/native/include \
 	    $<
 
 %.html.cpp: %.html