#27 #31 application works!

car_control/CMakeLists.txt

@@ -1,61 +1,76 @@
-project(carcontrol)
+### SETUP ###
+cmake_minimum_required (VERSION 3.0)
+set(PROJ_NAME Car_Control)
+project(${PROJ_NAME})
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-pthread -std=c++11 -fsanitize=thread -g ")
 
-cmake_minimum_required(VERSION 2.8)
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -std=c++0x -fsanitize=address -g")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -std=c++0x -fsanitize=thread -g")
-
-find_package(PythonLibs REQUIRED)
+### PACKAGES ###
+# python 
+find_package(Python3 COMPONENTS Development)
+find_package(Boost REQUIRED COMPONENTS python3)
+## common api 
 find_package(CommonAPI REQUIRED)
 find_package(CommonAPI-SomeIP REQUIRED)
-#find_package(vsomeip REQUIRED)
 
+### VARIABLES ###
+set(PRJ_SRC_GEN_PATH ${CMAKE_CURRENT_SOURCE_DIR}/src-gen-carcontrol)
+set(CORE_GEN_SRC_DIR ${PRJ_SRC_GEN_PATH}/core)
+set(SOMEIP_GEN_SRC_DIR ${PRJ_SRC_GEN_PATH}/someip)
+set(CORE_RUNTIME_DIR ~/capicxx-core-runtime)
+set(SOMEIP_RUNTIME_DIR ~/capicxx-someip-runtime)
+set(VSOMEIP_DIR ~/vsomeip)
+set(PRJ_SRC_PATH src)
+set(PRJ_SRC_GEN_PATH src-gen)
+
+### DIRECTORIES ###
 include_directories(
-    ./src-piracer
-    ${PYTHON_INCLUDE_DIRS}
-    ./src-gen-carcontrol
-    ~/capicxx-core-runtime/include
-    ~/capicxx-someip-runtime/include
-    ~/vsomeip/interface
+	./include
+	${Python3_INCLUDE_DIRS}
+    ${CORE_GEN_SRC_DIR}
+    ${SOMEIP_GEN_SRC_DIR}
+    # ~/capicxx-core-runtime/include
+    # ~/capicxx-someip-runtime/include
+    # ~/vsomeip/interface
+    ${SOMEIP_RUNTIME_DIR}/include
+    ${CORE_RUNTIME_DIR}/include
+    ${VSOMEIP_DIR}/include
 )
 
 link_directories(
-    ~/capicxx-core-runtime/build
-    ~/capicxx-someip-runtime/build
-    ~/vsomeip/build
+    # ~/capicxx-core-runtime/build
+    # ~/capicxx-someip-runtime/build
+    # ~/vsomeip/build
+    ${SOMEIP_RUNTIME_DIR}/build
+    ${CORE_RUNTIME_DIR}/build
+    ${VSOMEIP_DIR}/build
 )
+### FILES ###
 
+### BUILD ###
+# Services
+add_executable(CarControlService 
+    src/GamePad.cpp
+    src/PiRacer.cpp
+    src/CarControlService.cpp
+    src/CarControlStubImpl.cpp
+    src-gen-carcontrol/someip/v0/commonapi/CarControlSomeIPStubAdapter.cpp
+    src-gen-carcontrol/someip/v0/commonapi/CarControlSomeIPDeployment.cpp
+)
+target_link_libraries(CarControlService 
+    CommonAPI 
+    CommonAPI-SomeIP 
+    vsomeip3
+    Python3::Python 
+    Boost::python
+)
+# Client 
 add_executable(CarControlClient
-    client/CarControlClient.cpp
-    src-gen-carcontrol/v0/commonapi/CarControlSomeIPProxy.cpp
-    src-gen-carcontrol/v0/commonapi/CarControlSomeIPDeployment.cpp
+    src/CarControlClient.cpp
+    src-gen-carcontrol/someip/v0/commonapi/CarControlSomeIPProxy.cpp
+    src-gen-carcontrol/someip/v0/commonapi/CarControlSomeIPDeployment.cpp
 )
-target_link_libraries(CarControlClient CommonAPI CommonAPI-SomeIP vsomeip3)
-
-add_executable(CarControlService
-    service/CarControlService.cpp
-    service/CarControlStubImpl.cpp
-    src-piracer/PiRacerControlClass.cpp
-    src-gen-carcontrol/v0/commonapi/CarControlSomeIPStubAdapter.cpp
-    src-gen-carcontrol/v0/commonapi/CarControlSomeIPDeployment.cpp
+target_link_libraries(CarControlClient 
+    CommonAPI 
+    CommonAPI-SomeIP 
+    vsomeip3
 )
-#target_link_libraries(CarControlService CommonAPI CommonAPI-SomeIP vsomeip3 )
-target_link_libraries(CarControlService CommonAPI CommonAPI-SomeIP ${PYTHON_LIBRARIES})
-
-
-############## CMAKELISTS from PiRacerControlClass.cpp ################
-# set(CMAKE_CXX_STANDARD 14)
-# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -std=c++0x -fsanitize=address -g")
-# # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -std=c++0x -g")
-
-# cmake_minimum_required(VERSION 3.15)
-# project(PiRacerControl)
-
-# find_package(PythonLibs REQUIRED)
-# include_directories(${PYTHON_INCLUDE_DIRS})
-
-# add_executable(PiRacerControl
-#         main.cpp
-#         PiRacerControlClass.cpp
-# )
-# target_link_libraries(PiRacerControl ${PYTHON_LIBRARIES})

car_control/fidl/carcontrol.fdepl

@@ -2,20 +2,36 @@ import "platform:/plugin/org.genivi.commonapi.someip/deployment/CommonAPI-4-SOME
 import "carcontrol.fidl"
 
 define org.genivi.commonapi.someip.deployment for interface commonapi.CarControl {
+
     SomeIpServiceID = 4000
-        attribute indicator {
-            SomeIpNotifierEventGroups = { 4100 }
-            SomeIpNotifierID = 41000
-            SomeIpGetterID = 4101
-            SomeIpAttributeReliable = true
+
+    attribute indicator {
+        SomeIpNotifierEventGroups = { 4100 }
+        SomeIpNotifierID = 41000
+        SomeIpGetterID = 4101
+        SomeIpAttributeReliable = true
     }
+
     attribute gear {
             SomeIpNotifierEventGroups = { 4200 }
             SomeIpNotifierID = 42000
             SomeIpGetterID = 4201
-            SomeIpSetterID = 4202
             SomeIpAttributeReliable = true
     }
+
+    method gearSelectionHeadUnit {
+        SomeIpMethodID = 4200
+        SomeIpReliable = true
+        in {
+            selectedGear {
+                SomeIpStringEncoding = utf16le
+            }
+        }
+        out {
+            accepted {
+            }
+        }
+    }    
 }
 
 define org.genivi.commonapi.someip.deployment for provider as Service {
@@ -26,4 +42,4 @@ define org.genivi.commonapi.someip.deployment for provider as Service {
         SomeIpReliableUnicastPort = 40010
         SomeIpUnreliableUnicastPort = 40011
     }
-}
+}

car_control/fidl/carcontrol.fidl

@@ -2,6 +2,16 @@ package commonapi
 
 interface CarControl {
     version { major 0 minor 1 }
-        attribute String indicator readonly
-        attribute String gear  
+
+    attribute String indicator readonly
+    attribute String gear readonly
+
+    method gearSelectionHeadUnit {
+        in { 
+            String selectedGear
+        }
+        out { 
+            Boolean accepted
+        }
+    }
 }

car_control_v2/include/CarControlStubImpl.hpp → car_control/include/CarControlStubImpl.hpp

@@ -12,9 +12,8 @@ class CarControlStubImpl: public v0_1::commonapi::CarControlStubDefault {
         CarControlStubImpl();
         virtual ~CarControlStubImpl();
         virtual void gearSelectionHeadUnit(const std::shared_ptr<CommonAPI::ClientId> _client, 
-                                           const std::string& _gearSelectionHeadUnit, 
-                                           gearSelectionHeadUnitReply_t _reply);
-    private: 
+                                               std::string _selectedGear, 
+                                               gearSelectionHeadUnitReply_t _reply);
 };
 
 #endif //CarControlStubImpl_H