structix/HumidityPi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added make install routine; Configreader settings.cfg points now to /etc/humitiypi/settings.cfg

Browse Source
This commit is contained in:
structix
2017-09-07 18:11:41 +02:00
parent 95bd30ec63
commit e6ce8e49a3
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RaspberryPi/configreader.c
View File

@@ -11,7 +11,7 @@ const config_setting_t *compareIDs;
void cfginit(void) { void cfginit(void) {
config_init(&cfg); 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)); fprintf(stderr, "%s:%d - %s\n", config_error_file(&cfg), config_error_line(&cfg), config_error_text(&cfg));
config_destroy(&cfg); config_destroy(&cfg);
//return(EXIT_FAILURE); //return(EXIT_FAILURE);

6
RaspberryPi/main.c
View File

@@ -93,7 +93,7 @@ int main(void) {
float avtemp_in = 0.0, avhum_in = 0.0; float avtemp_in = 0.0, avhum_in = 0.0;
float avtemp_out = 0.0, avhum_out = 0.0; float avtemp_out = 0.0, avhum_out = 0.0;
int inCount = 0, outCount = 0; int inCount = 0, outCount = 0;
for (j = 0; j < nodecount; j++) { for (j = 0; j <= nodecount; j++) {
if (nodedata[j].isoutside == 0) { if (nodedata[j].isoutside == 0) {
//This node is a indoor node //This node is a indoor node
avtemp_in += nodedata[j].temperature; avtemp_in += nodedata[j].temperature;
@@ -113,11 +113,11 @@ int main(void) {
float avgInsideHumidity = avhum_in / inCount; float avgInsideHumidity = avhum_in / inCount;
float avgOutsideTemperature = avtemp_in / outCount; float avgOutsideTemperature = avtemp_in / outCount;
float avgOutsideHumidity = avhum_in / outCount; float avgOutsideHumidity = avhum_in / outCount;
//Insert the results into the database //Insert the results into the database
//insertDataAverages(avgInsideTemperature, avgInsideHumidity, absoluteHumidityFloat(avgInsideTemperature, avgInsideHumidity)); //insertDataAverages(avgInsideTemperature, avgInsideHumidity, absoluteHumidityFloat(avgInsideTemperature, avgInsideHumidity));
//insertDataAverages(avgOutsideTemperature, avgOutsideHumidity, absoluteHumidityFloat(avgOutsideTemperature, avgOutsideHumidity)); //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 //free
//freeNodeLinkedList(nodes.next); //freeNodeLinkedList(nodes.next);

8
RaspberryPi/makefile
View File

@@ -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 OBJ = main.o dht22.o sendmysql.o configreader.o cJSON.o restcurl.o calculate.o
dht22: $(OBJ) dht22: $(OBJ)
$(CC) $(CFLAGS) -o humidityPi $(OBJ) $(LDFLAGS) $(CC) $(CFLAGS) -o humiditypi $(OBJ) $(LDFLAGS)
%.o: %.c %.o: %.c
$(CC) $(CFLAGS) -c $< $(CC) $(CFLAGS) -c $<
@@ -20,6 +20,6 @@ clean:
rm -r *.o rm -r *.o
install: install:
sudo cp -r lcdclock /usr/local/bin sudo cp humiditypi /usr/local/bin
sudo cp -r playsong.sh /usr/local/bin if [ ! -d /etc/humiditypi ]; then sudo mkdir /etc/humiditypi; fi
sudo cp -r settings.cfg /usr/local/bin sudo cp settings.cfg /etc/humiditypi