Merge pull request #8 from hmeyers/master

PiGatewaySerial as propper daemon

Author: henrikekblad

Makefile

@@ -1,7 +1,21 @@
+##########################################################################
+# Configurable options                                                   #
+##########################################################################
+# Install Base location
+PREFIX=/usr/local
+# Bin Dir
+BINDIR=$(PREFIX)/sbin
+# Set the name of predictable tty
+TTY_NAME := /dev/ttyMySensorsGateway
+# Set the group name for the raw tty
+TTY_GROUPNAME := tty
+##########################################################################
+# Please do not change anything below this line                          #
+##########################################################################
 CC=g++
 # get PI Revision from cpuinfo
 PIREV := $(shell cat /proc/cpuinfo | grep Revision | cut -f 2 -d ":" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$$//')
-CCFLAGS=-Wall -Ofast -mfpu=vfp -lpthread -g -D__Raspberry_Pi -mfloat-abi=hard -mtune=arm1176jzf-s
+CCFLAGS=-Wall -Ofast -mfpu=vfp -lpthread -g -D__Raspberry_Pi -mfloat-abi=hard -mtune=arm1176jzf-s -D_TTY_NAME=\"${TTY_NAME}\" -D_TTY_GROUPNAME=\"${TTY_GROUPNAME}\"
 
 ifeq (${PIREV},$(filter ${PIREV},a01041 a21041))
 	# a01041 and a21041 are PI 2 Model B and armv7
@@ -51,3 +65,42 @@ ${GATEWAY_SERIAL}: ${OBJS} ${GATEWAY_SERIAL_OBJS}
 clean:
 	rm -rf $(PROGRAMS) $(GATEWAY) $(GATEWAY_SERIAL) ${OBJS} $(GATEWAY_OBJS) $(GATEWAY_SERIAL_OBJS)
 
+install: all install-gatewayserial install-gateway install-initscripts
+
+install-gatewayserial: 
+	@echo "Installing ${GATEWAY_SERIAL} to ${BINDIR}"
+	@install -m 0755 ${GATEWAY_SERIAL} ${BINDIR}
+
+install-gateway: 
+	@echo "Installing ${GATEWAY} to ${BINDIR}"
+	@install -m 0755 ${GATEWAY} ${BINDIR}
+	
+install-initscripts:
+	@echo "Installing initscripts to /etc/init.d"
+	@install -m 0755 initscripts/PiGatewaySerial /etc/init.d
+	@install -m 0755 initscripts/PiGateway /etc/init.d
+	@echo "Installing syslog config to /etc/rsyslog.d"
+	@install -m 0755 initscripts/30-PiGatewaySerial.conf /etc/rsyslog.d
+	@install -m 0755 initscripts/30-PiGateway.conf  /etc/rsyslog.d
+	@service rsyslog restart
+
+enable-gw: install
+	@update-rc.d PiGateway defaults
+	
+enable-gwserial: install
+	@update-rc.d PiGatewaySerial defaults
+	
+remove-gw:
+	@update-rc.d -f PiGateway remove
+	
+remove-gwserial:
+	@update-rc.d -f PiGatewaySerial remove
+	
+uninstall: remove-gw remove-gwserial
+	@echo "Stopping daemon PiGatewaySerial (ignore errors)"
+	-@service PiGatewaySerial stop
+	@echo "Stopping daemon PiGateway (ignore errors)"
+	-@service PiGateway stop
+	@echo "removing files"
+	rm ${BINDIR}/PiGatewaySerial ${BINDIR}/PiGateway /etc/init.d/PiGatewaySerial /etc/init.d/PiGateway /etc/rsyslog.d/30-PiGatewaySerial.conf /etc/rsyslog.d/30-PiGateway.conf
+	

MySensor.cpp

@@ -279,7 +279,7 @@ boolean MySensor::process() {
 
 	if (!available || pipe>6)
 		return false;
-
+	memset(&msg,0,sizeof(MyMessage));
 	uint8_t len = RF24::getDynamicPayloadSize();
 	RF24::read(&msg, len);
 	RF24::writeAckPayload(pipe,&pipe, 1 );

MySensor.h

@@ -44,10 +44,12 @@
 	#include <string>
 	#include <getopt.h>
 	#include <iostream>
+	#include <syslog.h>
 #endif
 
 #ifdef DEBUG
-	#define debug(x,...) debugPrint(x, ##__VA_ARGS__)
+	extern void log(int priority, const char *format, ...);
+	#define debug(x,...) log(LOG_DEBUG, x, ##__VA_ARGS__)
 #else
 	#define debug(x,...)
 #endif

PiGateway.cpp

@@ -15,15 +15,40 @@
 
 MyGateway *gw;
 
+int daemonizeFlag = 0;
+
+void openSyslog()
+{
+    setlogmask(LOG_UPTO (LOG_INFO));
+    openlog(NULL, 0, LOG_USER);
+}
+
+void closeSyslog()
+{
+    closelog();
+}
+
+void log(int priority, const char *format, ...)
+{
+	va_list argptr;
+    va_start(argptr, format);
+    if (daemonizeFlag == 1) {
+		vsyslog(priority, format, argptr);
+	} else {
+		vprintf(format, argptr);
+	}
+	va_end(argptr);
+}
+
 void msgCallback(char *msg){
 	printf("[CALLBACK]%s", msg);
 
 }
 
 void setup(void)
 {
-	printf("Starting Gateway...\n");
-	gw = new MyGateway(RPI_V2_GPIO_P1_22, RPI_V2_GPIO_P1_24, BCM2835_SPI_SPEED_8MHZ, 30000);
+	printf("Starting Gateway...\n"); 
+	gw = new MyGateway(RPI_V2_GPIO_P1_22, RPI_V2_GPIO_P1_24, BCM2835_SPI_SPEED_8MHZ, 60);
 
 	if (gw == NULL)
     {
@@ -39,9 +64,10 @@ void loop(void)
 
 int main(int argc, char** argv) 
 {
+	openSyslog();
 	setup();
 	while(1)
 		loop();
-	
+	closeSyslog();
 	return 0;
 }