Merge pull request #4 from PDXostc/mfeuer1-integrate-with-vss

Mfeuer1 integrate with vss

Makefile

@@ -5,12 +5,29 @@
 CFLAGS += -ggdb
 VSD_DIR ?= /usr/local/include
 
-vsd_swig_wrap.o: vsd_swig_wrap.c
+
+ifndef VSS_SPEC_FILE
+${info Please set VSS_SPEC_FILE variable to point to the}
+${info vehicle signal specification generated by}
+${info https://github.com/GENIVI/vehicle_signal_specification/tree/master/tools/vspec2c}
+all:
+else
+all: vsd_swig_wrap.o
+endif
+
+vsd_swig_wrap.o: vsd_swig_wrap.c vss_spec.c
 	python3 setup.py build_ext --inplace -I${VSD_DIR}
 
 vsd_swig_wrap.c: vsd_swig.i
 	swig -I${VSD_DIR} -python -includeall vsd_swig.i
 
+
+vss_spec.c: ${VSS_SPEC_FILE}
+	cp ${VSS_SPEC_FILE} ./vss_spec.c
+
+
+${VSS_SPEC_FILE}:
+
 clean:
 	rm -rf _vsd*.so build vsd_swig.py vsd_swig_wrap.* __pycache__ \
-	dist jlr_vsd.egg-info **~
+	dist jlr_vsd.egg-info vss_spec.* *~

setup.py

@@ -1,3 +1,5 @@
+#!/usr/bin/python3
+
 """
 setup.py file for VSD SWIG
 """
@@ -16,6 +18,6 @@
        description = """SWIG wrapper for VSD.""",
        py_modules  = [ 'vsd', 'vsd_swig' ],
        ext_modules = [
-           Extension('_vsd_swig', sources=['vsd_swig_wrap.c',],libraries=['vsd', 'dstc', 'rmc', 'vss'])
+           Extension('_vsd_swig', sources=['vsd_swig_wrap.c', 'vss_spec.c' ],libraries=['vsd', 'dstc', 'rmc', 'vss'])
        ],
        )

vsd_swig.i

@@ -18,15 +18,15 @@
         PyObject *result = 0;
         PyObject *cb = (PyObject*) vsd_get_user_data(ctx);
         vss_signal_t* elem = node->data;
-        char* sig_name = vsd_signal_to_path_static(elem);
+        const char* sig_name = vsd_signal_to_path_static(elem);
 
         if (elem->element_type == VSS_BRANCH) {
             printf("FATAL: Tried to print branch: %u:%s", elem->index, elem->name);
             exit(255);
         }
 
         vsd_data_u res;
-        vsd_get_value(elem, &res);  
+        vsd_get_value(elem, &res);
 
         switch(elem->data_type) {
         case VSS_INT8:
@@ -102,7 +102,7 @@
 
     extern const char* vsd_signal_to_path_static(vss_signal_t* desc);
 
-    void log_debug(char* msg) 
+    void log_debug(char* msg)
     {
        RMC_LOG_DEBUG(msg);
     }
@@ -147,69 +147,69 @@
     signed char swig_vsd_value_i8(vss_signal_t* sig) {
 
         vsd_data_u res;
-        vsd_get_value(sig, &res);        
+        vsd_get_value(sig, &res);
 
         return res.i8;
     }
 
     unsigned char swig_vsd_value_u8(vss_signal_t* sig) {
 
         vsd_data_u res;
-        vsd_get_value(sig, &res);  
+        vsd_get_value(sig, &res);
 
         return res.u8;
     }
 
     signed short swig_vsd_value_i16(vss_signal_t* sig) {
 
         vsd_data_u res;
-        vsd_get_value(sig, &res);  
+        vsd_get_value(sig, &res);
 
         return res.i16;
     }
 
     unsigned short swig_vsd_value_u16(vss_signal_t* sig) {
 
         vsd_data_u res;
-        vsd_get_value(sig, &res);  
+        vsd_get_value(sig, &res);
 
         return res.u16;
     }
 
     signed int swig_vsd_value_i32(vss_signal_t* sig) {
 
         vsd_data_u res;
-        vsd_get_value(sig, &res);  
+        vsd_get_value(sig, &res);
 
         return res.i32;
     }
 
     unsigned int swig_vsd_value_u32(vss_signal_t* sig) {
-        
+
         vsd_data_u res;
-        vsd_get_value(sig, &res);  
+        vsd_get_value(sig, &res);
 
         return res.u32;
     }
 
     float swig_vsd_value_f(vss_signal_t* sig) {
-        
+
         vsd_data_u res;
-        vsd_get_value(sig, &res);  
+        vsd_get_value(sig, &res);
 
         return res.f;
     }
 
     double swig_vsd_value_d(vss_signal_t* sig) {
-                
+
         vsd_data_u res;
-        vsd_get_value(sig, &res);  
+        vsd_get_value(sig, &res);
 
         return res.d;
     }
 
     unsigned int swig_vsd_value_b(vss_signal_t* sig) {
-                        
+
         vsd_data_u res;
         vsd_get_value(sig, &res);
 
@@ -285,7 +285,7 @@
 %cstring_output_allocate_size(char** str, int *len, free(*$1));
 %{
     int swig_vsd_value_s(vss_signal_t* sig, char** str, int *len) {
-                                
+
         vsd_data_u res;
         vsd_get_value(sig, &res);