revert "adjust structure for yocto" This reverts commit 173e139

kianwasabi · Jan 5, 2024 · 8a46b23 · 8a46b23
1 parent 173e139
commit 8a46b23
Show file tree

Hide file tree

Showing 30 changed files with 13 additions and 9 deletions.
diff --git a/.github/workflows/codegenerator.yaml b/.github/workflows/codegenerator.yaml
@@ -10,8 +10,8 @@ on:
     # branches: [ "car_control" ]
     branches: [ "main" ]
     paths:
-      - 'fidl/**.fidl'
-      - 'fidl/**.fdepl'
+      - 'car_control/fidl/**.fidl'
+      - 'car_control/fidl/**.fdepl'
   workflow_dispatch:
 
 jobs:
@@ -25,9 +25,9 @@ jobs:
 
       - name: 1) Delete old generated code, if exists. And create new folders.
         run: |
-          rm -rf ${{ github.workspace }}/src-gen
-          mkdir -p ${{ github.workspace }}/src-gen/core
-          mkdir -p ${{ github.workspace }}/src-gen/someip
+          rm -rf ${{ github.workspace }}/car_control/src-gen
+          mkdir -p ${{ github.workspace }}/car_control/src-gen/core
+          mkdir -p ${{ github.workspace }}/car_control/src-gen/someip
 
       - name: 2) Download CommonAPI Core Generator.
         run: |
@@ -42,18 +42,18 @@ jobs:
       - name: 4) Generate CommonAPI Code from Core Generator.
         run: |
           echo $(find ${{ github.workspace }} -type f -name '*.fidl')
-          core-generator/commonapi-core-generator-linux-x86_64 -sk $(find ${{ github.workspace }} -type f -name '*.fidl') -d ${{ github.workspace }}/src-gen/core
+          core-generator/commonapi-core-generator-linux-x86_64 -sk $(find ${{ github.workspace }} -type f -name '*.fidl') -d ${{ github.workspace }}/car_control/src-gen/core
 
       - name: 5) Generate CommonAPI Code with the vSOME/IP Generator.
         run: |
           echo $(find ${{ github.workspace }} -type f -name '*.fdepl')
-          someip-generator/commonapi-someip-generator-linux-x86_64 $(find ${{ github.workspace }} -type f -name '*.fdepl') -d ${{ github.workspace }}/src-gen/someip
+          someip-generator/commonapi-someip-generator-linux-x86_64 $(find ${{ github.workspace }} -type f -name '*.fdepl') -d ${{ github.workspace }}/car_control/src-gen/someip
 
       - name: 6) Save generated code in src-gen (Commit and Push)
         if: github.event_name == 'push'
         run: |
           git config user.name "$(git log -n 1 --pretty=format:%an)"
           git config user.email "$(git log -n 1 --pretty=format:%ae)"
-          git add src-gen
+          git add car_control/src-gen
           git commit -m "Auto Generated fidl" || true 
           git push
diff --git a/.gitignore b/.gitignore
@@ -3,10 +3,14 @@
 sample
 .DS_Store
 
-# temporary files
+# QT temporary files
 build*/
 *.o
 *.stash
+.qtc_clangd/
+qrc*.cpp
+app/dashboard/dashboard
+dashboard.app/
 Makefile
 *.pro.user
 

diff --git a/CMakeLists.txt → car_control/CMakeLists.txt b/CMakeLists.txt → car_control/CMakeLists.txt
diff --git a/fidl/carcontrol.fdepl → car_control/fidl/carcontrol.fdepl b/fidl/carcontrol.fdepl → car_control/fidl/carcontrol.fdepl
diff --git a/fidl/carcontrol.fidl → car_control/fidl/carcontrol.fidl b/fidl/carcontrol.fidl → car_control/fidl/carcontrol.fidl
diff --git a/include/CarControlStubImpl.hpp → car_control/include/CarControlStubImpl.hpp b/include/CarControlStubImpl.hpp → car_control/include/CarControlStubImpl.hpp
diff --git a/include/GamePad.hpp → car_control/include/GamePad.hpp b/include/GamePad.hpp → car_control/include/GamePad.hpp
diff --git a/include/PiRacer.hpp → car_control/include/PiRacer.hpp b/include/PiRacer.hpp → car_control/include/PiRacer.hpp
diff --git a/piracer/gamepads.py → car_control/piracer/gamepads.py b/piracer/gamepads.py → car_control/piracer/gamepads.py
diff --git a/piracer/vehicles.py → car_control/piracer/vehicles.py b/piracer/vehicles.py → car_control/piracer/vehicles.py
diff --git a/scripts/Build.sh → car_control/scripts/Build.sh b/scripts/Build.sh → car_control/scripts/Build.sh
diff --git a/scripts/Run_Client.sh → car_control/scripts/Run_Client.sh b/scripts/Run_Client.sh → car_control/scripts/Run_Client.sh
diff --git a/scripts/Run_Service.sh → car_control/scripts/Run_Service.sh b/scripts/Run_Service.sh → car_control/scripts/Run_Service.sh
diff --git a/src-gen/core/v0/commonapi/CarControl.hpp → .../src-gen/core/v0/commonapi/CarControl.hpp b/src-gen/core/v0/commonapi/CarControl.hpp → .../src-gen/core/v0/commonapi/CarControl.hpp
diff --git a/...gen/core/v0/commonapi/CarControlProxy.hpp → ...gen/core/v0/commonapi/CarControlProxy.hpp b/...gen/core/v0/commonapi/CarControlProxy.hpp → ...gen/core/v0/commonapi/CarControlProxy.hpp
diff --git a/...core/v0/commonapi/CarControlProxyBase.hpp → ...core/v0/commonapi/CarControlProxyBase.hpp b/...core/v0/commonapi/CarControlProxyBase.hpp → ...core/v0/commonapi/CarControlProxyBase.hpp
diff --git a/src-gen/core/v0/commonapi/CarControlStub.hpp → ...-gen/core/v0/commonapi/CarControlStub.hpp b/src-gen/core/v0/commonapi/CarControlStub.hpp → ...-gen/core/v0/commonapi/CarControlStub.hpp
diff --git a/...re/v0/commonapi/CarControlStubDefault.hpp → ...re/v0/commonapi/CarControlStubDefault.hpp b/...re/v0/commonapi/CarControlStubDefault.hpp → ...re/v0/commonapi/CarControlStubDefault.hpp
diff --git a/...v0/commonapi/CarControlSomeIPCatalog.json → ...v0/commonapi/CarControlSomeIPCatalog.json b/...v0/commonapi/CarControlSomeIPCatalog.json → ...v0/commonapi/CarControlSomeIPCatalog.json
diff --git a/.../commonapi/CarControlSomeIPDeployment.cpp → .../commonapi/CarControlSomeIPDeployment.cpp b/.../commonapi/CarControlSomeIPDeployment.cpp → .../commonapi/CarControlSomeIPDeployment.cpp
diff --git a/.../commonapi/CarControlSomeIPDeployment.hpp → .../commonapi/CarControlSomeIPDeployment.hpp b/.../commonapi/CarControlSomeIPDeployment.hpp → .../commonapi/CarControlSomeIPDeployment.hpp
diff --git a/...ip/v0/commonapi/CarControlSomeIPProxy.cpp → ...ip/v0/commonapi/CarControlSomeIPProxy.cpp b/...ip/v0/commonapi/CarControlSomeIPProxy.cpp → ...ip/v0/commonapi/CarControlSomeIPProxy.cpp
diff --git a/...ip/v0/commonapi/CarControlSomeIPProxy.hpp → ...ip/v0/commonapi/CarControlSomeIPProxy.hpp b/...ip/v0/commonapi/CarControlSomeIPProxy.hpp → ...ip/v0/commonapi/CarControlSomeIPProxy.hpp
diff --git a/...commonapi/CarControlSomeIPStubAdapter.cpp → ...commonapi/CarControlSomeIPStubAdapter.cpp b/...commonapi/CarControlSomeIPStubAdapter.cpp → ...commonapi/CarControlSomeIPStubAdapter.cpp
diff --git a/...commonapi/CarControlSomeIPStubAdapter.hpp → ...commonapi/CarControlSomeIPStubAdapter.hpp b/...commonapi/CarControlSomeIPStubAdapter.hpp → ...commonapi/CarControlSomeIPStubAdapter.hpp
diff --git a/src/CarControlClient.cpp → car_control/src/CarControlClient.cpp b/src/CarControlClient.cpp → car_control/src/CarControlClient.cpp
diff --git a/src/CarControlService.cpp → car_control/src/CarControlService.cpp b/src/CarControlService.cpp → car_control/src/CarControlService.cpp
diff --git a/src/CarControlStubImpl.cpp → car_control/src/CarControlStubImpl.cpp b/src/CarControlStubImpl.cpp → car_control/src/CarControlStubImpl.cpp
diff --git a/src/GamePad.cpp → car_control/src/GamePad.cpp b/src/GamePad.cpp → car_control/src/GamePad.cpp
diff --git a/src/PiRacer.cpp → car_control/src/PiRacer.cpp b/src/PiRacer.cpp → car_control/src/PiRacer.cpp