Added HVC interface

Serial is now an external call

Added HVC interface
Serial is now an external call
henyxia
1 parent d4d5bb6d
Showing 9 changed files with 205 additions and 73 deletions Show diff stats
Makefile
hvc.c
hvc.h
main.c
nfc.c
serial.c
serial.h
ui.c
ui.h
@@ -3,7 +3,7 @@ CC_FLAGS=-c -Wall -Werror -std=gnu99 -g
 CC_LIBS=-pthread
 INCLUDES=
-SOURCES=main.c printx.c ui.c nfc.c bus.c
+SOURCES=main.c printx.c ui.c serial.c nfc.c bus.c hvc.c
 OBJECTS=$(SOURCES:.c=.o)
 OUTPUT=tweekd
@@ -0,0 +1,70 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <termios.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <strings.h>
+#include <inttypes.h>
+#include "ui.h"
+#include "hvc.h"
+#include "printx.h"
+#include "serial.h"
+
+#define	DEVICE1				"/dev/ttyACM1"
+#define	SPEED				B19200
+#define HVC_POLLING_TIME	500000
+#define	WAIT_BEFORE_RETRY	5000
+#define	GET_DEVICE_MODEL	'A'
+#define	DEVICE_MODEL_HVC	'C'
+#define	GET_TEMP			'H'
+
+// Globals
+int		hvc_fd = -1;
+bool	hvcStop = false;
+bool	sPump = false;
+bool	sHeat = false;
+struct	termios hvcSaveterm;
+
+bool initHVC()
+{
+	unsigned char data;
+	printx(DEBUG, HVC, "Connecting to interface 1\n");
+	if(init_serial(DEVICE1, SPEED, &hvc_fd, &hvcSaveterm))
+	{
+		printx(DEBUG, HVC, "Connected to an interface\n");
+		sendData(&hvc_fd, GET_DEVICE_MODEL);
+		printx(DEBUG, HVC, "Sended identification request %02x\n", GET_DEVICE_MODEL);
+		data = getData(&hvc_fd);
+		if(data == DEVICE_MODEL_HVC)
+			printx(INFO, HVC, "HVC Arduino connected\n");
+		else
+			printx(DEBUG, HVC, "HVC Arduino not found, response was %02x\n", data);
+	}
+	else
+	{
+		printx(WARNING, HVC, "Unable to connect to such interface\n");
+		return false;
+	}
+
+	return true;
+}
+
+void* processHVC(void* we)
+{
+	uint8_t data;
+
+	while(!hvcStop)
+	{
+		printx(DEBUG, HVC, "Querying data\n");
+		sendData(&hvc_fd, GET_TEMP);
+		data = getData(&hvc_fd);
+		setTemp(data);
+
+		usleep(HVC_POLLING_TIME);
+	}
+
+	return NULL;
+}
@@ -0,0 +1,10 @@
+#ifndef __HVC_H__
+#define __HVC_H__
+
+#include <stdbool.h>
+
+bool	initHVC();
+void*	processHVC();
+void	stopHVC();
+
+#endif
@@ -4,13 +4,14 @@
 #include "ui.h"
 #include "nfc.h"
 #include "bus.h"
+#include "hvc.h"
 #include <unistd.h>
 int main(void)
 {
 	int ret;
-	pthread_t tUI, tNFC, tBUS;//tHVC
+	pthread_t tUI, tNFC, tBUS, tHVC;
 	initUILog();
 	if(!initLog())
 	{
@@ -35,6 +36,12 @@ int main(void)
 		return 3;
 	}
 	pthread_create(&tBUS, NULL, processBus, NULL);
+	if(!initHVC())
+	{
+		printx(ERROR, MAIN, "Unable to start the HVC interface\n");
+		return 4;
+	}
+	pthread_create(&tHVC, NULL, processHVC, NULL);
 	pthread_join(tUI, NULL);
 	closeLog();
 	return 0;
@@ -11,11 +11,11 @@
 #include "ui.h"
 #include "nfc.h"
 #include "printx.h"
+#include "serial.h"
 #define	DEVICE1				"/dev/ttyACM0"
 #define	SPEED				B19200
 #define NFC_POLLING_TIME	500000
-#define	WAIT_BEFORE_RETRY	50000
 #define	NFC_TAG_LENGTH		9
 #define	GET_DEVICE_MODEL	'A'
 #define	DEVICE_MODEL_NFC	'B'
@@ -26,71 +26,20 @@
 #define	GET_TAG_DETAILS		'H'
 // Globals
-int		serial_fd = -1;
+int		nfc_fd = -1;
 bool	nfcStop = false;
 struct	termios saveterm;
-bool init_serial(char* device, int speed)
-{
-	struct termios new;
-
-	int fd=open(device,O_RDWR|O_NOCTTY|O_NONBLOCK);
-	
-	if(fd<0)
-		return false;
-
-	tcgetattr(fd,&saveterm); // save current port settings
-	bzero(&new,sizeof(new));
-	new.c_cflag=CLOCAL|CREAD|speed|CS8;
-	new.c_iflag=0;
-	new.c_oflag=0;
-	new.c_lflag=0;  // set input mode (non-canonical, no echo,...)
-	new.c_cc[VTIME]=0; // inter-character timer unused
-	new.c_cc[VMIN]=1; // blocking read until 1 char received
-	tcflush(fd, TCIFLUSH);
-	tcsetattr(fd,TCSANOW,&new);
-
-	serial_fd = fd;
-	sleep(2);
-	return true;
-}
-
-void close_serial()
-{
-	tcsetattr(serial_fd,TCSANOW,&saveterm);
-	close(serial_fd);
-}
-
-void stopNFC()
-{
-	close_serial();
-	nfcStop = true;
-}
-
-unsigned char getData()
-{
-	unsigned char buf;
-	while(read(serial_fd, &buf, 1) != 1)
-		usleep(WAIT_BEFORE_RETRY);
-		return buf;
-}
-
-void sendData(unsigned char data)
-{
-	while(write(serial_fd, &data, 1) != 1)
-		usleep(WAIT_BEFORE_RETRY);
-}
-
 bool initNFC()
 {
 	unsigned char data;
 	printx(DEBUG, NFC, "Connecting to interface 1\n");
-	if(init_serial(DEVICE1, SPEED))
+	if(init_serial(DEVICE1, SPEED, &nfc_fd, &saveterm))
 	{
 		printx(DEBUG, NFC, "Connected to an interface\n");
-		sendData(GET_DEVICE_MODEL);
+		sendData(&nfc_fd, GET_DEVICE_MODEL);
 		printx(DEBUG, NFC, "Sended identification request %02x\n", GET_DEVICE_MODEL);
-		data = getData();
+		data = getData(&nfc_fd);
 		if(data == DEVICE_MODEL_NFC)
 			printx(INFO, NFC, "NFC Arduino connected\n");
 		else
@@ -105,36 +54,42 @@ bool initNFC()
 	return true;
 }
+void stopNFC()
+{
+	close_serial(&nfc_fd, &saveterm);
+	nfcStop = true;
+}
+
 bool isTagPresent(char* tag)
 {
 	unsigned char data;
-	sendData(GET_NFC_STATUS);
-	data = getData();
+	sendData(&nfc_fd, GET_NFC_STATUS);
+	data = getData(&nfc_fd);
 	if(data == PROFESSOR_TAG)
 	{
-		sendData(GET_TAG_DETAILS);
+		sendData(&nfc_fd, GET_TAG_DETAILS);
 		printx(INFO, NFC, "Professor Tag Detected %02x\n", data);
-		return (read(serial_fd, tag, 6) == 6);
+		//return (read(serial_fd, tag, 6) == 6);
 	}
 	else if(data == STUDENT_TAG)
 	{
-		sendData(GET_TAG_DETAILS);
+		sendData(&nfc_fd, GET_TAG_DETAILS);
 		printx(INFO, NFC, "Student Tag Detected\n");
-		tag[0] = getData();
+		tag[0] = getData(&nfc_fd);
 		printx(DEBUG, NFC, "Last read %02x\n", tag[0]);
-		tag[1] = getData();
+		tag[1] = getData(&nfc_fd);
 		printx(DEBUG, NFC, "Last read %02x\n", tag[1]);
-		tag[2] = getData();
+		tag[2] = getData(&nfc_fd);
 		printx(DEBUG, NFC, "Last read %02x\n", tag[2]);
-		tag[3] = getData();
+		tag[3] = getData(&nfc_fd);
 		printx(DEBUG, NFC, "Last read %02x\n", tag[3]);
-		tag[4] = getData();
+		tag[4] = getData(&nfc_fd);
 		printx(DEBUG, NFC, "Last read %02x\n", tag[4]);
-		tag[5] = getData();
+		tag[5] = getData(&nfc_fd);
 		printx(DEBUG, NFC, "Last read %02x\n", tag[5]);
-		tag[6] = getData();
+		tag[6] = getData(&nfc_fd);
 		printx(DEBUG, NFC, "Last read %02x\n", tag[6]);
-		tag[7] = getData();
+		tag[7] = getData(&nfc_fd);
 		printx(DEBUG, NFC, "Last read %02x\n", tag[7]);
 		return true;
 	}
@@ -148,7 +103,7 @@ bool isTagPresent(char* tag)
 		printx(DEBUG, NFC, "Read data did not matched with expected data %02x\n", data);
 		return false;
 	}
-	return true;
+	return false;
 }
 void* processNFC(void* we)
@@ -0,0 +1,55 @@
+#include <stdbool.h>
+#include <termios.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <strings.h>
+#include "serial.h"
+
+#define	WAIT_BEFORE_RETRY	50000
+
+bool init_serial(char* device, int speed, int *serial_fd, struct termios *saveterm)
+{
+	struct termios new;
+
+	int fd=open(device,O_RDWR|O_NOCTTY|O_NONBLOCK);
+	
+	if(fd<0)
+		return false;
+
+	tcgetattr(fd,saveterm); // save current port settings
+	bzero(&new,sizeof(new));
+	new.c_cflag=CLOCAL|CREAD|speed|CS8;
+	new.c_iflag=0;
+	new.c_oflag=0;
+	new.c_lflag=0;  // set input mode (non-canonical, no echo,...)
+	new.c_cc[VTIME]=0; // inter-character timer unused
+	new.c_cc[VMIN]=1; // blocking read until 1 char received
+	tcflush(fd, TCIFLUSH);
+	tcsetattr(fd,TCSANOW,&new);
+
+	*serial_fd = fd;
+	sleep(2);
+	return true;
+}
+
+void close_serial(int *serial_fd, struct termios *saveterm)
+{
+	tcsetattr(*serial_fd,TCSANOW,saveterm);
+	close(*serial_fd);
+}
+
+unsigned char getData(int *serial_fd)
+{
+	unsigned char buf;
+	while(read(*serial_fd, &buf, 1) != 1)
+		usleep(WAIT_BEFORE_RETRY);
+		return buf;
+}
+
+void sendData(int *serial_fd, unsigned char data)
+{
+	while(write(*serial_fd, &data, 1) != 1)
+		usleep(WAIT_BEFORE_RETRY);
+}
+
@@ -0,0 +1,9 @@
+#ifndef __SERIAL_H__
+#define	__SERIAL_H__
+
+bool init_serial(char*, int, int*, struct termios*);
+void close_serial(int*, struct termios*);
+unsigned char getData(int*);
+void sendData(int*, unsigned char);
+
+#endif
@@ -34,6 +34,26 @@ void stopUI()
 	uiStop = true;
 }
+void setHeat(bool s)
+{
+	heat = s;
+}
+
+void setPump(bool s)
+{
+	pump = s;
+}
+
+void setTemp(unsigned int t)
+{
+	temp = t;
+}
+
+void setDebit(unsigned int d)
+{
+	debit = d;
+}
+
 void* drawUI(void* we)
 {
 	while(!uiStop)
@@ -150,7 +170,7 @@ void displayUI()
 	sprintf(buffer, "UID : %s", strlen(uid) > 0 ? uid : "Nope");
 	printf("%s \u2503\n", fillHeaderWithSpaces(buffer, buffer));
 	printf("\u2523\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u253B\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u253B\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u252B\n");
-	sprintf(buffer, "\u2503 HEAT[%s] %02d\u2103  PUMP[%s] %04d", heat ? "ON " : "OFF", temp, pump ? "ON " : "OFF", debit);
+	sprintf(buffer, "\u2503 HEAT[%s] %02d\u2103  PUMP[%s] %04d", heat ? "ON " : "OFF", temp+25, pump ? "ON " : "OFF", debit);
 	printf("%s  \u2503\n", fillStatusWithSpaces(buffer, buffer));
 	printf("\u2523\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u252B\n");
 	//body
 #ifndef __UI_H__
 #define __UI_H__
+#include <stdbool.h>
+
 void*	drawUI(void*);
 void	initUILog();
 void	addToLog(char*);
 void	displayUI();
+void	setDebit(unsigned int);
+void	setHeat(bool);
+void	setPump(bool);
 void	setStartTime(char*);
 void	setTagName(char*);
+void	setTemp(unsigned int);
 void	stopUI();
 #endif