tijmen/home-data-collection-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove solar server make recipes

Browse Source
This commit is contained in:
Tijmen van Nesselrooij
2023-08-21 21:22:13 +02:00
parent 71b6fe37a0
commit 04d8bf336f
1 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
makefile
View File

@@ -2,22 +2,16 @@ CC = g++
CFLAGS = -DSPDLOG_FMT_EXTERNAL -Wall -Wextra -std=c++20 -O2 -Iinclude/ -MMD CFLAGS = -DSPDLOG_FMT_EXTERNAL -Wall -Wextra -std=c++20 -O2 -Iinclude/ -MMD
ELECTRICITY_LOGGER_LFLAGS = -lsqlite3 -lspdlog -lfmt ELECTRICITY_LOGGER_LFLAGS = -lsqlite3 -lspdlog -lfmt
SOLAR_LOGGER_LFLAGS = -lsqlite3 -lcurl -lspdlog -lfmt SOLAR_LOGGER_LFLAGS = -lsqlite3 -lcurl -lspdlog -lfmt
SERVER_LFLAGS = -lpistache -lsqlite3 -lstdc++fs -lspdlog -lfmt
SOLAR_LOGGER_CPPS = $(shell find src/solar-logger/ -name *.cpp) SOLAR_LOGGER_CPPS = $(shell find src/solar-logger/ -name *.cpp)
SOLAR_LOGGER_OBJS = $(patsubst src/%.cpp, build/%.o, ${SOLAR_LOGGER_CPPS}) SOLAR_LOGGER_OBJS = $(patsubst src/%.cpp, build/%.o, ${SOLAR_LOGGER_CPPS})
SOLAR_LOGGER_DEPS = $(patsubst src/%.cpp, build/%.d, ${SOLAR_LOGGER_CPPS}) SOLAR_LOGGER_DEPS = $(patsubst src/%.cpp, build/%.d, ${SOLAR_LOGGER_CPPS})
SOLAR_SRV_CPPS = $(shell find src/solar-server/ -name *.cpp)
SOLAR_SRV_OBJS = $(patsubst src/%.cpp, build/%.o, ${SOLAR_SRV_CPPS})
SOLAR_SRV_DEPS = $(patsubst src/%.cpp, build/%.d, ${SOLAR_SRV_CPPS})
ELECT_LOGGER_CPPS = $(shell find src/electricity-logger/ -name *.cpp) ELECT_LOGGER_CPPS = $(shell find src/electricity-logger/ -name *.cpp)
ELECT_LOGGER_OBJS = $(patsubst src/%.cpp, build/%.o, ${ELECT_LOGGER_CPPS}) ELECT_LOGGER_OBJS = $(patsubst src/%.cpp, build/%.o, ${ELECT_LOGGER_CPPS})
ELECT_LOGGER_DEPS = $(patsubst src/%.cpp, build/%.d, ${ELECT_LOGGER_CPPS}) ELECT_LOGGER_DEPS = $(patsubst src/%.cpp, build/%.d, ${ELECT_LOGGER_CPPS})
SOLAR_LOGGER_BINARY_PATH = bin/solar-logger SOLAR_LOGGER_BINARY_PATH = bin/solar-logger
SOLAR_SRV_BINARY_PATH = bin/solar-server
ELECT_LOGGER_BINARY_PATH = bin/electricity-logger ELECT_LOGGER_BINARY_PATH = bin/electricity-logger
INSTALL_PATH = /usr/local/bin/ INSTALL_PATH = /usr/local/bin/
@@ -25,7 +19,7 @@ INSTALL_PATH = /usr/local/bin/
# Test variables # Test variables
SOLAR_TEST_DATABASE = solarpaneloutput.db SOLAR_TEST_DATABASE = solarpaneloutput.db
all: ${SOLAR_LOGGER_BINARY_PATH} ${SOLAR_SRV_BINARY_PATH} ${ELECT_LOGGER_BINARY_PATH} all: ${SOLAR_LOGGER_BINARY_PATH} ${ELECT_LOGGER_BINARY_PATH}
clean: clean:
-rm -rf bin/* build/* -rm -rf bin/* build/*
@@ -33,27 +27,20 @@ clean:
check-solar-logger: ${SOLAR_LOGGER_BINARY_PATH} ${SOLAR_TEST_DATABASE} check-solar-logger: ${SOLAR_LOGGER_BINARY_PATH} ${SOLAR_TEST_DATABASE}
./${SOLAR_LOGGER_BINARY_PATH} -d ${SOLAR_TEST_DATABASE} -u "http://192.168.2.26/home.cgi" ./${SOLAR_LOGGER_BINARY_PATH} -d ${SOLAR_TEST_DATABASE} -u "http://192.168.2.26/home.cgi"
check-solar-server: ${SOLAR_SRV_BINARY_PATH} ${SOLAR_TEST_DATABASE}
./${SOLAR_SRV_BINARY_PATH} -d ${SOLAR_TEST_DATABASE} -c public/ -p 8080
check-electricity-logger: ${ELECT_LOGGER_BINARY_PATH} check-electricity-logger: ${ELECT_LOGGER_BINARY_PATH}
./${ELECT_LOGGER_BINARY_PATH} -d /dev/ttyUSB0 -c additional_column_value ./${ELECT_LOGGER_BINARY_PATH} -d /dev/ttyUSB0 -c additional_column_value
install: install-loggers install-solar-server install: install-loggers
install-loggers: ${SOLAR_LOGGER_BINARY_PATH} ${ELECT_LOGGER_BINARY_PATH} install-loggers: ${SOLAR_LOGGER_BINARY_PATH} ${ELECT_LOGGER_BINARY_PATH}
cp -uv ${SOLAR_LOGGER_BINARY_PATH} ${INSTALL_PATH} cp -uv ${SOLAR_LOGGER_BINARY_PATH} ${INSTALL_PATH}
cp -uv ${ELECT_LOGGER_BINARY_PATH} ${INSTALL_PATH} cp -uv ${ELECT_LOGGER_BINARY_PATH} ${INSTALL_PATH}
install-solar-server: ${SOLAR_SRV_BINARY_PATH}
cp -uv ${SOLAR_SRV_BINARY_PATH} ${INSTALL_PATH}
.PHONY: all \ .PHONY: all \
clean \ clean \
check-solar-logger check-solar-server \ check-solar-logger \
install \ install \
install-loggers \ install-loggers
install-solar-server
${SOLAR_TEST_DATABASE}: ${SOLAR_TEST_DATABASE}:
./script/createdb.sh ${SOLAR_TEST_DATABASE} ./script/createdb.sh ${SOLAR_TEST_DATABASE}
@@ -62,10 +49,6 @@ ${SOLAR_LOGGER_BINARY_PATH}: ${SOLAR_LOGGER_OBJS}
mkdir -p ${@D} mkdir -p ${@D}
${CC} $^ ${SOLAR_LOGGER_LFLAGS} -o $@ ${CC} $^ ${SOLAR_LOGGER_LFLAGS} -o $@
${SOLAR_SRV_BINARY_PATH}: ${SOLAR_SRV_OBJS}
mkdir -p ${@D}
${CC} $^ ${SERVER_LFLAGS} -o $@
${ELECT_LOGGER_BINARY_PATH}: ${ELECT_LOGGER_OBJS} ${ELECT_LOGGER_BINARY_PATH}: ${ELECT_LOGGER_OBJS}
mkdir -p ${@D} mkdir -p ${@D}
${CC} $^ ${ELECTRICITY_LOGGER_LFLAGS} -o $@ ${CC} $^ ${ELECTRICITY_LOGGER_LFLAGS} -o $@
@@ -74,6 +57,5 @@ build/%.o: src/%.cpp
mkdir -p ${@D} mkdir -p ${@D}
${CC} ${CFLAGS} -c $< -o $@ ${CC} ${CFLAGS} -c $< -o $@
-include ${SOLAR_SRV_DEPS}
-include ${SOLAR_LOGGER_DEPS} -include ${SOLAR_LOGGER_DEPS}
-include ${ELECT_LOGGER_DEPS} -include ${ELECT_LOGGER_DEPS}