removes useless and meaningless string

Change-Id: I839aafd12abc6a9686fbebcf24af6d908a01715f

2 files changed, 167 insertions, 166 deletions

diff --git a/config.xml.in b/config.xml.in
index 6ca09f1..1d9c86d 100644
--- a/config.xml.in
+++ b/config.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <widget xmlns="http://www.w3.org/ns/widgets" id="@PROJECT_NAME@" version="@PROJECT_VERSION@">
-  <name>App Framework - @PROJECT_NAME@</name>
+  <name>@PROJECT_NAME@</name>
   <icon src="icon.png"/>
   <content src="qml/@PROJECT_NAME@-app.qml" type="application/vnd.agl.qml.hybrid"/>
   <description>This application is used to control and dialog with HVAC system</description>
diff --git a/hvac-hybrid-qml-binding.c b/hvac-hybrid-qml-binding.c
index b813d8a..9097d9a 100644
--- a/hvac-hybrid-qml-binding.c
+++ b/hvac-hybrid-qml-binding.c
@@ -15,109 +15,110 @@
  * limitations under the License.
  */
 #define _GNU_SOURCE
-#include <json-c/json.h>
 
+#include <string.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
 #include <linux/can.h>
-#include <string.h>
-#include <unistd.h>
+
+#include <json-c/json.h>
 
 #include <afb/afb-binding.h>
 
 #define CAN_DEV "can0"
 
-const struct afb_binding_interface *interface;
+static const struct afb_binding_interface *interface;
 
 // Initialize CAN hvac array that will be sent trough the socket
-char *can_hvac_components[8] = {
-    "LeftTemperature",
-    "RightTemperature",
-    "Temperature",
-    "Unknow3",
-    "FanSpeed",
-    "Unknow5",
-    "Unknow6",
-    "Unknow7"
+static char *can_hvac_components[8] = {
+	"LeftTemperature",
+	"RightTemperature",
+	"Temperature",
+	"Unknow3",
+	"FanSpeed",
+	"Unknow5",
+	"Unknow6",
+	"Unknow7"
 };
 
 // Initialize CAN hvac array that will be sent trough the socket
-__u8 can_hvac_values[8] = {
-    21,
-    21,
-    21,
-    240, // Don't know why 240 but it was 0xF0 in the original amb hvacplugin
-    0,
-    1, // Don't know why 1 but it was 0xF0 in the original amb hvacplugin
-    0, // Don't know why 0 but it was 0xF0 in the original amb hvacplugin
-    0 // Don't know why 0 but it was 0xF0 in the original amb hvacplugin
+static __u8 can_hvac_values[8] = {
+	21,
+	21,
+	21,
+	240, // Don't know why 240 but it was 0xF0 in the original amb hvacplugin
+	0,
+	1, // Don't know why 1 but it was 0xF0 in the original amb hvacplugin
+	0, // Don't know why 0 but it was 0xF0 in the original amb hvacplugin
+	0 // Don't know why 0 but it was 0xF0 in the original amb hvacplugin
 };
 
-struct can_handler{
-    int socket;
-    struct sockaddr_can txAddress;
+struct can_handler {
+	int socket;
+	struct sockaddr_can txAddress;
 };
 
 /***************************************************************************************/
 /***************************************************************************************/
-/**                                                                                   **/
-/**                                                                                   **/
-/**       SECTION: HANDLE CAN DEVICE                                                  **/
-/**                                                                                   **/
-/**                                                                                   **/
+/**																				   **/
+/**																				   **/
+/**	   SECTION: HANDLE CAN DEVICE												  **/
+/**																				   **/
+/**																				   **/
 /***************************************************************************************/
 /***************************************************************************************/
 
 static struct can_handler open_can_dev()
 {
-    struct can_handler ch;
-    ch.socket = -1;
-
-    ch.socket = socket(PF_CAN, SOCK_RAW, CAN_RAW);
-    if (ch.socket < 0)
-    {
-       printf("ERROR: socket could not be created\n");
-    }
-    else
-    {
-        struct ifreq ifr;
-
-        // Attemts to open a socket to CAN bus
-        strcpy(ifr.ifr_name, CAN_DEV);
-        if(ioctl(ch.socket, SIOCGIFINDEX, &ifr) < 0)
-        {
-            close(ch.socket);
-            ch.socket = -1;
-            printf("ERROR: ioctl failed\n");
-        }
-        else
-        {
-            ch.txAddress.can_family = AF_CAN;
-            ch.txAddress.can_ifindex = ifr.ifr_ifindex;
-
-            // And bind it to ch.txAddress struct
-            if (bind(ch.socket, (struct sockaddr *)&ch.txAddress, sizeof(ch.txAddress)) < 0)
-            {
-                close(ch.socket);
-                ch.socket = -1;
-                printf("ERROR: bind failed\n");
-            }
-            return ch;
-        }
-    }
-    printf("Error: unexpected behavior\n");
-    return ch;
+	struct can_handler ch;
+	ch.socket = -1;
+
+	ch.socket = socket(PF_CAN, SOCK_RAW, CAN_RAW);
+	if (ch.socket < 0)
+	{
+		ERROR(interface, "socket could not be created");
+	}
+	else
+	{
+		struct ifreq ifr;
+
+		// Attemts to open a socket to CAN bus
+		strcpy(ifr.ifr_name, CAN_DEV);
+		if(ioctl(ch.socket, SIOCGIFINDEX, &ifr) < 0)
+		{
+			close(ch.socket);
+			ch.socket = -1;
+			ERROR(interface, "ioctl failed");
+		}
+		else
+		{
+			ch.txAddress.can_family = AF_CAN;
+			ch.txAddress.can_ifindex = ifr.ifr_ifindex;
+
+			// And bind it to ch.txAddress struct
+			if (bind(ch.socket, (struct sockaddr *)&ch.txAddress, sizeof(ch.txAddress)) < 0)
+			{
+				close(ch.socket);
+				ch.socket = -1;
+				ERROR(interface, "bind failed");
+			}
+			return ch;
+		}
+	}
+	ERROR(interface, "unexpected behavior");
+	return ch;
 }
 
 static void close_can_dev(struct can_handler ch)
 {
-    int socketId = ch.socket;
-    if(socketId >= 0)
-    {
-        close(socketId);
-    }
+	int socketId = ch.socket;
+	if(socketId >= 0)
+	{
+		close(socketId);
+	}
 }
 
 // Get original get temperature function from cpp hvacplugin code
@@ -125,71 +126,71 @@ static uint8_t get_temperature(uint8_t value)
 {
    uint8_t result = ((0xF0 - 0x10) / 15) * value - 16;
    if (result < 0x10)
-       result = 0x10;
+	   result = 0x10;
    if (result > 0xF0)
-       result = 0xF0;
+	   result = 0xF0;
 
    return result;
 }
 
 static void write_can(struct can_handler ch)
 {
-    // Hardcoded can_id and dlc (data lenght code)
-    struct can_frame txCanFrame;
-    txCanFrame.can_id = 0x30;
-    txCanFrame.can_dlc = 8;
-
-    if (ch.socket >= 0)
-    {
-
-        txCanFrame.data[0] = get_temperature(can_hvac_values[0]);
-        txCanFrame.data[1] = get_temperature(can_hvac_values[1]);
-        txCanFrame.data[2] = get_temperature((can_hvac_values[0] + can_hvac_values[1]) & 0x02);
-        txCanFrame.data[3] = can_hvac_values[3];
-        txCanFrame.data[4] = can_hvac_values[4];
-        txCanFrame.data[5] = can_hvac_values[5];
-        txCanFrame.data[6] = can_hvac_values[6];
-        txCanFrame.data[7] = can_hvac_values[7];
-
-        sendto(ch.socket, &txCanFrame, sizeof(struct can_frame), 0,
-            (struct sockaddr*)&ch.txAddress, sizeof(ch.txAddress));
-        return;
-    }
-    else
-    {
-        printf("Error: socket not initialized\n");
-        return;
-    }
-    printf("Error sending on CAN bus. Unexpected behavior");
+	// Hardcoded can_id and dlc (data lenght code)
+	struct can_frame txCanFrame;
+	txCanFrame.can_id = 0x30;
+	txCanFrame.can_dlc = 8;
+
+	if (ch.socket >= 0)
+	{
+
+		txCanFrame.data[0] = get_temperature(can_hvac_values[0]);
+		txCanFrame.data[1] = get_temperature(can_hvac_values[1]);
+		txCanFrame.data[2] = get_temperature((can_hvac_values[0] + can_hvac_values[1]) & 0x02);
+		txCanFrame.data[3] = can_hvac_values[3];
+		txCanFrame.data[4] = can_hvac_values[4];
+		txCanFrame.data[5] = can_hvac_values[5];
+		txCanFrame.data[6] = can_hvac_values[6];
+		txCanFrame.data[7] = can_hvac_values[7];
+
+		sendto(ch.socket, &txCanFrame, sizeof(struct can_frame), 0,
+			(struct sockaddr*)&ch.txAddress, sizeof(ch.txAddress));
+		return;
+	}
+	else
+	{
+		ERROR(interface, "socket not initialized");
+		return;
+	}
+	ERROR(interface, "sending on CAN bus. Unexpected behavior");
 }
 
 static __u8 read_temp_left_zone()
 {
-    return can_hvac_values[0];
+	return can_hvac_values[0];
 }
 
 static __u8 read_temp_right_zone()
 {
-    return can_hvac_values[1];
+	return can_hvac_values[1];
 }
 
 static __u8 read_fanspeed()
 {
-    return can_hvac_values[4];
+	return can_hvac_values[4];
 }
 
 static uint8_t make_atoi(const char *str)
 {
-    return str ? atoi(str) : 0;
+	return str ? atoi(str) : 0;
 }
 
 /***************************************************************************************/
 /***************************************************************************************/
-/**                                                                                   **/
-/**                                                                                   **/
-/**       SECTION: BINDING VERBS IMPLEMENTATION                                       **/
-/**                                                                                   **/
-/**                                                                                   **/
+/**																				   **/
+/**																				   **/
+/**	   SECTION: BINDING VERBS IMPLEMENTATION									   **/
+/**																				   **/
+/**																				   **/
 /***************************************************************************************/
 /***************************************************************************************/
 
@@ -215,11 +216,11 @@ static void ping (struct afb_req request)
  */
 static void get_fanspeed(struct afb_req request)
 {
-    json_object *ret_json;
+	json_object *ret_json;
 	__u8 fanspeed = read_fanspeed();
 
-    ret_json = json_object_new_object();
-    json_object_object_add(ret_json, "FanSpeed", json_object_new_int(fanspeed));
+	ret_json = json_object_new_object();
+	json_object_object_add(ret_json, "FanSpeed", json_object_new_int(fanspeed));
 
 	json_object *query = afb_req_json(request);
 	afb_req_success_f(request, ret_json, "Fan Speed is:%d query=%s", fanspeed, json_object_to_json_string(query));
@@ -233,11 +234,11 @@ static void get_fanspeed(struct afb_req request)
  */
 static void get_temp_right_zone(struct afb_req request)
 {
-    json_object *ret_json;
+	json_object *ret_json;
 	__u8 temp = read_temp_right_zone();
 
-    ret_json = json_object_new_object();
-    json_object_object_add(ret_json, "RightTemperature", json_object_new_int(temp));
+	ret_json = json_object_new_object();
+	json_object_object_add(ret_json, "RightTemperature", json_object_new_int(temp));
 
 	json_object *query = afb_req_json(request);
 	afb_req_success_f(request, ret_json, "Right zone Temperature is:%d query=%s", temp, json_object_to_json_string(query));
@@ -251,11 +252,11 @@ static void get_temp_right_zone(struct afb_req request)
  */
 static void get_temp_left_zone(struct afb_req request)
 {
-    json_object *ret_json;
+	json_object *ret_json;
 	__u8 temp = read_temp_left_zone();
 
-    ret_json = json_object_new_object();
-    json_object_object_add(ret_json, "LeftTemperature", json_object_new_int(temp));
+	ret_json = json_object_new_object();
+	json_object_object_add(ret_json, "LeftTemperature", json_object_new_int(temp));
 
 	json_object *query = afb_req_json(request);
 	afb_req_success_f(request, ret_json, "Left zone Temperature is:%d query=%s", temp, json_object_to_json_string(query));
@@ -269,12 +270,12 @@ static void get_temp_left_zone(struct afb_req request)
  */
 static void get_all(struct afb_req request)
 {
-    json_object *ret_json;
+	json_object *ret_json;
 
-    ret_json = json_object_new_object();
-    json_object_object_add(ret_json, "LeftTemperature", json_object_new_int(read_temp_left_zone()));
-    json_object_object_add(ret_json, "RightTemperature", json_object_new_int(read_temp_right_zone()));
-    json_object_object_add(ret_json, "FanSpeed", json_object_new_int(read_fanspeed()));
+	ret_json = json_object_new_object();
+	json_object_object_add(ret_json, "LeftTemperature", json_object_new_int(read_temp_left_zone()));
+	json_object_object_add(ret_json, "RightTemperature", json_object_new_int(read_temp_right_zone()));
+	json_object_object_add(ret_json, "FanSpeed", json_object_new_int(read_fanspeed()));
 
 	afb_req_success(request, ret_json, NULL);
 }
@@ -287,53 +288,53 @@ static void get_all(struct afb_req request)
  */
 static void set(struct afb_req request)
 {
-    struct can_handler ch;
-    const char *val;
-    struct json_object *query;
-    struct json_object_iterator iter;
-    struct json_object_iterator iter_end;
-
-    query = afb_req_json(request);
-    iter = json_object_iter_begin(query);
-    iter_end = json_object_iter_end(query);
-
-    /*
-     * Loop over the json object that will set every component
-     * which it will find in it.
-     */
-    int i;
-    while(!json_object_iter_equal(&iter, &iter_end))
-    {
-        const char *key = json_object_iter_peek_name(&iter);
-        for (i=0;i<8;i++)
-        {
-            if(strcmp(can_hvac_components[i], key) == 0)
-            {
-                val = afb_req_value(request, key);
-                uint8_t comp_val = make_atoi(val);
-                can_hvac_values[i] = comp_val;
-                break;
-            }
-        }
-        json_object_iter_next(&iter);
-    }
-
-    ch = open_can_dev();
-    write_can(ch);
-    close_can_dev(ch);
+	struct can_handler ch;
+	const char *val;
+	struct json_object *query;
+	struct json_object_iterator iter;
+	struct json_object_iterator iter_end;
+
+	query = afb_req_json(request);
+	iter = json_object_iter_begin(query);
+	iter_end = json_object_iter_end(query);
+
+	/*
+	 * Loop over the json object that will set every component
+	 * which it will find in it.
+	 */
+	int i;
+	while(!json_object_iter_equal(&iter, &iter_end))
+	{
+		const char *key = json_object_iter_peek_name(&iter);
+		for (i=0;i<8;i++)
+		{
+			if(strcmp(can_hvac_components[i], key) == 0)
+			{
+				val = afb_req_value(request, key);
+				uint8_t comp_val = make_atoi(val);
+				can_hvac_values[i] = comp_val;
+				break;
+			}
+		}
+		json_object_iter_next(&iter);
+	}
+
+	ch = open_can_dev();
+	write_can(ch);
+	close_can_dev(ch);
 
 	afb_req_success(request, query, "HVAC settings updated");
 }
 
 // TODO: Have to change session management flag to AFB_SESSION_CHECK to use token auth
 static const struct afb_verb_desc_v1 verbs[]= {
-    {"ping"     , AFB_SESSION_NONE, ping    , "Ping the binder"},
-    {"get_temp_left_zone"     , AFB_SESSION_NONE, get_temp_left_zone    , "Get the left zone temperature"},
-    {"get_temp_right_zone"     , AFB_SESSION_NONE, get_temp_right_zone    , "Get the right zone temperature"},
-    {"get_fanspeed"     , AFB_SESSION_NONE, get_fanspeed    , "Read fan speed"},
-    {"get_all"     , AFB_SESSION_NONE, get_all    , "Read all values"},
-    {"set"     , AFB_SESSION_NONE, set    , "Set a HVAC component value"},
-    {NULL}
+	{"ping"	 , AFB_SESSION_NONE, ping	, "Ping the binder"},
+	{"get_temp_left_zone"	 , AFB_SESSION_NONE, get_temp_left_zone	, "Get the left zone temperature"},
+	{"get_temp_right_zone"	 , AFB_SESSION_NONE, get_temp_right_zone	, "Get the right zone temperature"},
+	{"get_fanspeed"	 , AFB_SESSION_NONE, get_fanspeed	, "Read fan speed"},
+	{"get_all"	 , AFB_SESSION_NONE, get_all	, "Read all values"},
+	{"set"	 , AFB_SESSION_NONE, set	, "Set a HVAC component value"},
+	{NULL}
 };
 
 static const struct afb_binding binding_desc = {