From e6ce8e49a3cf0b931dbe29843af9aeee377d546a Mon Sep 17 00:00:00 2001
From: structix <amateurdoedel@gmail.com>
Date: Thu, 7 Sep 2017 18:11:41 +0200
Subject: [PATCH] Added make install routine; Configreader settings.cfg points
 now to /etc/humitiypi/settings.cfg

---
 RaspberryPi/configreader.c | 2 +-
 RaspberryPi/main.c         | 6 +++---
 RaspberryPi/makefile       | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/RaspberryPi/configreader.c b/RaspberryPi/configreader.c
index c15d314..0bd865c 100644
--- a/RaspberryPi/configreader.c
+++ b/RaspberryPi/configreader.c
@@ -11,7 +11,7 @@ const config_setting_t *compareIDs;
 void cfginit(void) {
     
     config_init(&cfg);
-    if (!config_read_file(&cfg, "./settings.cfg")) {
+    if (!config_read_file(&cfg, "/etc/humiditypi/settings.cfg")) {
         fprintf(stderr, "%s:%d - %s\n", config_error_file(&cfg), config_error_line(&cfg), config_error_text(&cfg));
         config_destroy(&cfg);
         //return(EXIT_FAILURE);
diff --git a/RaspberryPi/main.c b/RaspberryPi/main.c
index 530bab2..efec008 100644
--- a/RaspberryPi/main.c
+++ b/RaspberryPi/main.c
@@ -93,7 +93,7 @@ int main(void) {
     float avtemp_in = 0.0, avhum_in = 0.0;
     float avtemp_out = 0.0, avhum_out = 0.0;
     int inCount = 0, outCount = 0;
-    for (j = 0; j < nodecount; j++) {
+    for (j = 0; j <= nodecount; j++) {
         if (nodedata[j].isoutside == 0) {
             //This node is a indoor node
             avtemp_in += nodedata[j].temperature;
@@ -113,11 +113,11 @@ int main(void) {
     float avgInsideHumidity = avhum_in / inCount;
     float avgOutsideTemperature = avtemp_in / outCount;
     float avgOutsideHumidity = avhum_in / outCount;
-
+    
     //Insert the results into the database
     //insertDataAverages(avgInsideTemperature, avgInsideHumidity, absoluteHumidityFloat(avgInsideTemperature, avgInsideHumidity));
     //insertDataAverages(avgOutsideTemperature, avgOutsideHumidity, absoluteHumidityFloat(avgOutsideTemperature, avgOutsideHumidity));
-    
+    printf("Averages:\n| Inside temperature: %f\n| Inside humidity: %f\n| Outside temperature: %f\n| Outside humidity: %f\n", avgInsideTemperature, avgInsideHumidity, avgOutsideTemperature, avgOutsideHumidity);
 
     //free
     //freeNodeLinkedList(nodes.next);
diff --git a/RaspberryPi/makefile b/RaspberryPi/makefile
index d6b766c..c304ddc 100644
--- a/RaspberryPi/makefile
+++ b/RaspberryPi/makefile
@@ -10,7 +10,7 @@ LDFLAGS = -lwiringPi -lconfig `mysql_config --libs` -lcurl
 OBJ = main.o dht22.o sendmysql.o configreader.o cJSON.o restcurl.o calculate.o
 
 dht22: $(OBJ)
-	$(CC) $(CFLAGS) -o humidityPi $(OBJ) $(LDFLAGS)
+	$(CC) $(CFLAGS) -o humiditypi $(OBJ) $(LDFLAGS)
         
 %.o: %.c
 	$(CC) $(CFLAGS) -c $<
@@ -20,6 +20,6 @@ clean:
 	rm -r *.o
 
 install:
-	sudo cp -r lcdclock /usr/local/bin
-	sudo cp -r playsong.sh /usr/local/bin
-	sudo cp -r settings.cfg /usr/local/bin
+	sudo cp humiditypi /usr/local/bin
+	if [ ! -d /etc/humiditypi ]; then sudo mkdir /etc/humiditypi; fi
+	sudo cp settings.cfg /etc/humiditypi