X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fhvac-demo-binding.c;h=1b776cda1de1b99205fcea7613cd2f3bedabc1bc;hb=2554564b73a70cb34a1323430dffec17c0b9ee9f;hp=14af56bd1a08921d6fc0190aadfde04e2be94a5f;hpb=34869d07cacf6b0a4eebb0bc0d3f29027c0e6d9d;p=apps%2Fhvac.git

diff --git a/binding/hvac-demo-binding.c b/binding/hvac-demo-binding.c
index 14af56b..1b776cd 100644
--- a/binding/hvac-demo-binding.c
+++ b/binding/hvac-demo-binding.c
@@ -1,7 +1,9 @@
 /*
  * Copyright (C) 2015, 2016 "IoT.bzh"
+ * Copyright (C) 2016 Konsulko Group
  * Author "Romain Forlot"
  * Author "Jose Bolo"
+ * Author "Scott Murray <scott.murray@konsulko.com>"
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +20,7 @@
 #define _GNU_SOURCE
 
 #include <string.h>
+#include <stdbool.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -33,10 +36,51 @@
 
 #define CAN_DEV "vcan0"
 
-#define SIMULATE_HVAC
-
 static const struct afb_binding_interface *interface;
 
+/*****************************************************************************************/
+/*****************************************************************************************/
+/**											**/
+/**											**/
+/**	   SECTION: UTILITY FUNCTIONS							**/
+/**											**/
+/**											**/
+/*****************************************************************************************/
+/*****************************************************************************************/
+
+/*
+ * @brief Retry a function 3 times
+ *
+ * @param int function(): function that return an int wihtout any parameter
+ *
+ * @ return : 0 if ok, -1 if failed
+ *
+ */
+static int retry( int(*func)())
+{
+	int i;
+
+	for (i=0;i<4;i++)
+	{
+		if ( (*func)() >= 0)
+		{
+			return 0;
+		}
+		usleep(100000);
+	}
+	return -1;
+}
+
+/*****************************************************************************************/
+/*****************************************************************************************/
+/**											**/
+/**											**/
+/**	   SECTION: HANDLE CAN DEVICE							**/
+/**											**/
+/**											**/
+/*****************************************************************************************/
+/*****************************************************************************************/
+
 // Initialize CAN hvac array that will be sent trough the socket
 static struct {
 	const char *name;
@@ -50,30 +94,20 @@ static struct {
 
 struct can_handler {
 	int socket;
+	bool simulation;
+	char *send_msg;
 	struct sockaddr_can txAddress;
 };
 
-static struct can_handler can_handler = { .socket = -1 };
-
-/*****************************************************************************************/
-/*****************************************************************************************/
-/**											**/
-/**											**/
-/**	   SECTION: HANDLE CAN DEVICE							**/
-/**											**/
-/**											**/
-/*****************************************************************************************/
-/*****************************************************************************************/
+static struct can_handler can_handler = { .socket = -1, .simulation = false, .send_msg = "SENDING CAN FRAME"};
 
-static int open_can_dev()
+static int open_can_dev_helper()
 {
-#if defined(SIMULATE_HVAC)
-	DEBUG(interface, "Defining can handler socket to 0 and return");
-	can_handler.socket = 0;
-	return 0;
-#else
 	struct ifreq ifr;
 
+	DEBUG(interface, "CAN Handler socket : %d", can_handler.socket);
+	close(can_handler.socket);
+
 	can_handler.socket = socket(PF_CAN, SOCK_RAW, CAN_RAW);
 	if (can_handler.socket < 0)
 	{
@@ -105,13 +139,26 @@ static int open_can_dev()
 		can_handler.socket = -1;
 	}
 	return -1;
-#endif
+}
+
+static int open_can_dev()
+{
+	int rc = retry(open_can_dev_helper);
+	if(rc < 0)
+	{
+		ERROR(interface, "Open of interface %s failed. Falling back to simulation mode", CAN_DEV);
+		can_handler.socket = 0;
+		can_handler.simulation = true;
+		can_handler.send_msg = "FAKE CAN FRAME";
+		rc = 0;
+	}
+	return rc;
 }
 
 // Get original get temperature function from cpp hvacplugin code
 static uint8_t to_can_temp(uint8_t value)
 {
-	int result = ((0xF0 - 0x10) / 15) * value - 16;
+	int result = ((0xF0 - 0x10) / 15) * (value - 15) + 0x10;
 	if (result < 0x10)
 		result = 0x10;
 	if (result > 0xF0)
@@ -137,7 +184,7 @@ static uint8_t read_temp()
 
 static uint8_t read_fanspeed()
 {
-	return hvac_values[3].value;
+	return hvac_values[3].value ^ 0xFF;
 }
 
 static int write_can()
@@ -161,27 +208,25 @@ static int write_can()
 		txCanFrame.data[7] = 0;
 
 		DEBUG(interface, "%s: %d %d [%02x %02x %02x %02x %02x %02x %02x %02x]\n",
-#if defined(SIMULATE_HVAC)
-			"FAKE CAN FRAME",
-#else
-			"SENDING CAN FRAME",
-#endif
+			can_handler.send_msg,
 			txCanFrame.can_id, txCanFrame.can_dlc,
 			txCanFrame.data[0], txCanFrame.data[1], txCanFrame.data[2], txCanFrame.data[3],
 			txCanFrame.data[4], txCanFrame.data[5], txCanFrame.data[6], txCanFrame.data[7]);
 
-#if !defined(SIMULATE_HVAC)
-		rc = sendto(can_handler.socket, &txCanFrame, sizeof(struct can_frame), 0,
-			(struct sockaddr*)&can_handler.txAddress, sizeof(can_handler.txAddress));
-		if (rc < 0)
+		if(!can_handler.simulation)
 		{
-			ERROR(interface, "Sending can frame failed");
+			rc = sendto(can_handler.socket, &txCanFrame, sizeof(struct can_frame), 0,
+				    (struct sockaddr*)&can_handler.txAddress, sizeof(can_handler.txAddress));
+			if (rc < 0)
+			{
+				ERROR(interface, "Sending CAN frame failed.");
+			}
 		}
-#endif
 	}
 	else
 	{
-		ERROR(interface, "socket not initialized");
+		ERROR(interface, "socket not initialized. Attempt to reopen can device socket.");
+		open_can_dev();
 	}
 	return rc;
 }
@@ -343,7 +388,7 @@ static void set(struct afb_req request)
 		rc = write_can();
 		if (rc >= 0)
 			afb_req_success(request, NULL, NULL);
-		else {
+		else if (retry(write_can)) {
 			/* restore initial values */
 			i = (int)(sizeof hvac_values / sizeof *hvac_values);
 			while (i) {