From 74bcab795788f32cacb1f0f05e7a640845fc974c Mon Sep 17 00:00:00 2001
From: structix <amateurdoedel@gmail.com>
Date: Sat, 28 Jan 2017 15:30:56 +0100
Subject: [PATCH] libconfig pin configuration #2

---
 README.md      |  4 +++-
 configreader.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
 configreader.h |  5 +++++
 main.c         | 16 +++++++++++-----
 makefile       |  4 ++--
 settings.cfg   |  1 +
 6 files changed, 66 insertions(+), 8 deletions(-)
 create mode 100644 configreader.c
 create mode 100644 configreader.h
 create mode 100644 settings.cfg

diff --git a/README.md b/README.md
index dcb0f24..156e38c 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,8 @@ Use database: use dhtstats
 
 Create new table: CREATE TABLE stats (id MEDIUMINT NOT NULL AUTO_INCREMENT, pin int not null, humidity FLOAT NOT NULL, temperature FLOAT NOT NULL, created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (id) ); 
 
+Show all entries in table: select * from stats
+
 ## Dependencies
 
-sudo apt-get install libmysqlclient-dev libmysqld-dev mysql
+sudo apt-get install libmysqlclient-dev libmysqld-dev mysql libconfig-dev
diff --git a/configreader.c b/configreader.c
new file mode 100644
index 0000000..9756b32
--- /dev/null
+++ b/configreader.c
@@ -0,0 +1,44 @@
+#include "configreader.h"
+#include <libconfig.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+config_t cfg;
+const config_setting_t *pins;
+
+void cfginit(void) {
+    
+    config_init(&cfg);
+    if (!config_read_file(&cfg, "./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);
+    }
+}
+
+void cfgdestroy(void) {
+    //free ram
+    config_destroy(&cfg);
+}
+
+void cfgreinit(void) {
+    cfgdestroy();
+    cfginit();
+}
+
+int cfgreadpinnumber(int element) {
+    pins = config_lookup(&cfg, "pins");
+    int length = config_setting_length(pins);
+    if (element < length) {
+        return config_setting_get_int_elem(pins, element);
+    } else {
+        printf("No pins configuration item found.\n");
+        return 7;
+    }
+    
+}
+
+int cfgreadpinamount(void) {
+    pins = config_lookup(&cfg, "pins");
+    return config_setting_length(pins);
+} 
diff --git a/configreader.h b/configreader.h
new file mode 100644
index 0000000..269454d
--- /dev/null
+++ b/configreader.h
@@ -0,0 +1,5 @@
+void cfginit(void);
+void cfgdestroy(void);
+void cfgreinit(void);
+int cfgreadpinnumber(int element);
+int cfgreadpinamount(void);
diff --git a/main.c b/main.c
index 87184cc..ce44be4 100644
--- a/main.c
+++ b/main.c
@@ -4,6 +4,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include "sendmysql.h"
+#include "configreader.h"
 
 int main(void) {
     if (wiringPiSetup () == -1)
@@ -15,12 +16,17 @@ int main(void) {
         exit(EXIT_FAILURE);
     }
     
+    cfginit();
+    
     sensor data;
-    data.pin = 7;
-    getData(&data);
-    printf("%.2f, %.2f\n", data.temperature, data.humidity);
-
-    insertData(&data);
+    
+    int i;
+    for (i = 0; i < cfgreadpinamount(); i++) {
+        data.pin = cfgreadpinnumber(i);
+        getData(&data);
+        printf("Pin: %i, %.2f, %.2f\n", data.pin, data.temperature, data.humidity);
+        insertData(&data);
+    }
 
     return 0;
 }
diff --git a/makefile b/makefile
index 6882710..c675513 100644
--- a/makefile
+++ b/makefile
@@ -5,9 +5,9 @@ VERSION = 1.0
 CC      = /usr/bin/gcc
 CFLAGS  = -Wall -g -D_GNU_SOURCE -D_REENTRANT -DVERSION=\"$(VERSION)\" `mysql_config --cflags`
 #LDFLAGS = -lm -lpthread `gtk-config --cflags` `gtk-config --libs` -lgthread
-LDFLAGS = -lwiringPi `mysql_config --libs`
+LDFLAGS = -lwiringPi -lconfig `mysql_config --libs`
 
-OBJ = main.o dht22.o sendmysql.o
+OBJ = main.o dht22.o sendmysql.o configreader.o
 
 dht22: $(OBJ)
 	$(CC) $(CFLAGS) -o dht22 $(OBJ) $(LDFLAGS)
diff --git a/settings.cfg b/settings.cfg
new file mode 100644
index 0000000..c760cfb
--- /dev/null
+++ b/settings.cfg
@@ -0,0 +1 @@
+pins=[7];