Seperate out most "Mazda" specific code to Platforms/Mazda, and creat…

…e Platforms/RPI to allow building/testing on Linux/Raspberry Pi

CMakeLists.txt

@@ -16,6 +16,7 @@ if (NOT DEFINED BUILD_RPI)
  set(BUILD_MAZDA ON)
 endif ()
 
+
 if (DEFINED BUILD_MAZDA)
  message("BUILD_MAZDA")
  add_compile_definitions(BUILD_MAZDA)
@@ -24,6 +25,8 @@ if (DEFINED BUILD_MAZDA)
  set(CMAKE_LINK_SEARCH_START_STATIC ON)
  set(OPENSSL_USE_STATIC_LIBS TRUE) #Statically link openssl for Mazda target
  set(Protobuf_USE_STATIC_LIBS ON) #Statically link protobuf for Mazda target
+elseif (DEFINED BUILD_RPI)
+ add_compile_definitions(BUILD_RPI)
 endif ()
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_modules/")
@@ -122,14 +125,16 @@ endif ()
 link_directories(${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
 
 set(autoapp_sources_directory ${sources_directory}/autoapp)
-set(autoapp_include_directory)
+set(autoapp_include_directory ${include_directory}/autoapp)
 file(GLOB_RECURSE autoapp_source_files ${autoapp_sources_directory}/*.cpp)
 
 add_executable(autoapp ${autoapp_source_files})
 target_include_directories(autoapp PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/generated/)
 target_include_directories(autoapp PRIVATE ${include_directory})
 
 if (DEFINED BUILD_MAZDA)
+ file(GLOB_RECURSE MAZDA_SRC_FILES ${sources_directory}/Platforms/Mazda/*.cpp)
+ target_sources(autoapp PRIVATE ${MAZDA_SRC_FILES})
  add_subdirectory(src/Mazda/Dbus/com.jci.bca)
  target_link_libraries(autoapp com.jci.bca)
 
@@ -159,6 +164,9 @@ if (DEFINED BUILD_MAZDA)
 
  add_subdirectory(src/Mazda/Dbus/com.jci.vbs.navi)
  target_link_libraries(autoapp com.jci.vbs.navi)
+elseif (DEFINED BUILD_RPI)
+ file(GLOB_RECURSE RPI_SRC_FILES ${sources_directory}/Platforms/RPI/*.cpp)
+ target_sources(autoapp PRIVATE ${RPI_SRC_FILES})
 endif ()
 
 target_compile_options(autoapp PUBLIC "-ffile-prefix-map=${CMAKE_SOURCE_DIR}=.")
@@ -173,6 +181,7 @@ if (DEFINED BUILD_MAZDA)
  target_link_libraries(autoapp nlohmann_json::nlohmann_json)
  target_link_libraries(autoapp tinyxml2)
  target_link_libraries(autoapp ${DBUS_LIBRARIES})
+ target_link_libraries(autoapp -static -static-libstdc++ -static-libgcc)
 endif ()
 
 target_link_libraries(autoapp
@@ -184,9 +193,6 @@ target_link_libraries(autoapp
  fdk-aac
  easylogging++
  toml++
- -static
- -static-libstdc++
- -static-libgcc
  -pthread
  )
 

include/autoapp/Managers/AAPA.hpp → include/Platforms/Mazda/Managers/AAPA.hpp

@@ -4,9 +4,9 @@
 
 #include <atomic>
 #include <set>
-#include <autoapp/Managers/IVideoManager.hpp>
-#include <autoapp/Service/VideoService.hpp>
-#include <autoapp/Signals/AASignals.hpp>
+#include "autoapp/Managers/IVideoManager.hpp"
+#include "autoapp/Service/VideoService.hpp"
+#include "autoapp/Signals/AASignals.hpp"
 
 #include <com_jci_aapa_objectAdapter.h>
 #include <com_jci_bucpsa_objectProxy.h>

include/autoapp/Managers/AudioManager.hpp → include/Platforms/Mazda/Managers/AudioManager.hpp

@@ -2,7 +2,7 @@
 #include <dbus-cxx.h>
 #include <nlohmann/json.hpp>
 
-#include <autoapp/Managers/IAudioManager.hpp>
+#include "autoapp/Managers/IAudioManager.hpp"
 
 #include <com_xsembedded_ServiceProvider_objectProxy.h>
 

include/autoapp/Managers/BluetoothManager.hpp → include/Platforms/Mazda/Managers/BluetoothManager.hpp

@@ -9,15 +9,15 @@
 
 #include <tinyxml2.h>
 
-#include <aasdk_proto/WifiInfoRequestMessage.pb.h>
-#include <aasdk_proto/WifiInfoResponseMessage.pb.h>
-#include <aasdk_proto/WifiSecurityResponseMessage.pb.h>
+#include "external/aasdk/aasdk_proto/WifiInfoRequestMessage.pb.h"
+#include "external/aasdk/aasdk_proto/WifiInfoResponseMessage.pb.h"
+#include "external/aasdk/aasdk_proto/WifiSecurityResponseMessage.pb.h"
 
-#include <autoapp/Configuration/IConfiguration.hpp>
+#include "autoapp/Configuration/IConfiguration.hpp"
 
 #include <com_jci_bca_objectProxy.h>
 
-#include <autoapp/Managers/IBluetoothManager.hpp>
+#include "autoapp/Managers/IBluetoothManager.hpp"
 
 class BluetoothManager : public IBluetoothManager {
  public:

include/autoapp/Managers/GPSManager.hpp → include/Platforms/Mazda/Managers/GPSManager.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ctime>
-#include <autoapp/Managers/IGPSManager.hpp>
+#include "autoapp/Managers/IGPSManager.hpp"
 
 #include <com_jci_lds_data_objectProxy.h>
 #include <com_jci_lds_control_objectProxy.h>

include/autoapp/Managers/HttpManager.hpp → include/Platforms/Mazda/Managers/HttpManager.hpp

@@ -10,7 +10,7 @@
 #include <vector>
 #include <nlohmann/json.hpp>
 
-#include <autoapp/Signals/Signals.hpp>
+#include "autoapp/Signals/Signals.hpp"
 
 using HttpServer = SimpleWeb::Server<SimpleWeb::HTTP>;
 

include/autoapp/Managers/NavigationManager.hpp → include/Platforms/Mazda/Managers/NavigationManager.hpp

@@ -1,7 +1,7 @@
 #include <set>
 #include <dbus-cxx.h>
 
-#include <autoapp/Signals/NavigationSignals.hpp>
+#include "autoapp/Signals/NavigationSignals.hpp"
 
 #include <com_jci_navi2IHU_HUDSettings_objectProxy.h>
 #include <com_jci_vbs_navi_tmc_objectProxy.h>

include/autoapp/Managers/NightManager.hpp → include/Platforms/Mazda/Managers/NightManager.hpp

@@ -5,7 +5,7 @@
 #include <mutex>
 #include <asio/io_service.hpp>
 #include <asio/basic_waitable_timer.hpp>
-#include <autoapp/Managers/INightManager.hpp>
+#include "autoapp/Managers/INightManager.hpp"
 
 
 class NightManager: public INightManager{

include/autoapp/Managers/VideoManager.hpp → include/Platforms/Mazda/Managers/VideoManager.hpp

@@ -4,8 +4,8 @@
 
 #include <atomic>
 #include <set>
-#include <autoapp/Managers/IVideoManager.hpp>
-#include <autoapp/Service/VideoService.hpp>
+#include "autoapp/Managers/IVideoManager.hpp"
+#include "autoapp/Service/VideoService.hpp"
 
 #include <com_jci_nativeguictrl_objectProxy.h>
 #include <com_jci_bucpsa_objectProxy.h>

include/autoapp/Platform/mazda.hpp → include/Platforms/Mazda/mazda.hpp

@@ -2,16 +2,18 @@
 #ifdef BUILD_MAZDA
 #include "autoapp/Platform/IPlatform.hpp"
 #include <dbus-cxx.h>
-#include "autoapp/Managers/VideoManager.hpp"
-#include "autoapp/Managers/AAPA.hpp"
-#include "autoapp/Managers/AudioManager.hpp"
-#include "autoapp/Managers/GPSManager.hpp"
-#include "autoapp/Managers/HttpManager.hpp"
-#include "autoapp/Managers/BluetoothManager.hpp"
-#include "autoapp/Managers/NavigationManager.hpp"
+
+#include "Platforms/Mazda/Managers/VideoManager.hpp"
+#include "Platforms/Mazda/Managers/AudioManager.hpp"
+#include "Platforms/Mazda/Managers/AAPA.hpp"
+#include "Platforms/Mazda/Managers/GPSManager.hpp"
+#include "Platforms/Mazda/Managers/HttpManager.hpp"
+#include "Platforms/Mazda/Managers/BluetoothManager.hpp"
 #include "autoapp/Managers/IVideoManager.hpp"
 #include "autoapp/Configuration/Configuration.hpp"
-#include "autoapp/Managers/NightManager.hpp"
+#include "Platforms/Mazda/Managers/NightManager.hpp"
+#include "Platforms/Mazda/Managers/NavigationManager.hpp"
+
 
 #include <cstdlib>
 #include <unistd.h>

include/Platforms/RPI/Managers/AudioManager.hpp

@@ -0,0 +1,24 @@
+#include <set>
+
+#include "autoapp/Managers/IAudioManager.hpp"
+
+#include <thread>
+#include <mutex>
+
+using AudioFocusState = aasdk::proto::enums::AudioFocusState;
+
+class AudioManager : public IAudioManager {
+ private:
+ public:
+ AudioManager();
+
+ ~AudioManager() override;
+
+ void start() override;
+ void stop() override;
+
+ //calling requestAudioFocus directly doesn't work on the audio mgr
+ void requestFocus(aasdk::messenger::ChannelId channelId, aasdk::proto::enums::AudioFocusType_Enum aa_type) override;
+ void releaseFocus(aasdk::messenger::ChannelId channelId) override;
+
+};

include/Platforms/RPI/Managers/BluetoothManager.hpp

@@ -0,0 +1,11 @@
+#pragma once
+#include "autoapp/Managers/IBluetoothManager.hpp"
+
+class BluetoothManager : public IBluetoothManager {
+ public:
+ explicit BluetoothManager();
+ ~BluetoothManager() override;
+
+ void start() override;
+ void stop() override;
+};

include/Platforms/RPI/Managers/GPSManager.hpp

@@ -0,0 +1,16 @@
+#pragma once
+
+#include <ctime>
+#include "autoapp/Managers/IGPSManager.hpp"
+
+class GPSManager: public IGPSManager{
+
+ public:
+ GPSManager();
+
+ ~GPSManager() = default;
+
+ void start() override;
+ void stop() override;
+
+};

include/Platforms/RPI/Managers/NightManager.hpp

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <vector>
+#include <functional>
+#include <mutex>
+#include <asio/io_service.hpp>
+#include <asio/basic_waitable_timer.hpp>
+#include "autoapp/Managers/INightManager.hpp"
+
+
+class NightManager: public INightManager{
+ public:
+ NightManager();
+ ~NightManager() override = default;
+
+ void start() override;
+ void stop() override;
+};

include/Platforms/RPI/Managers/RPI.cpp

@@ -0,0 +1,10 @@
+#include "Platforms/RPI/RPI.hpp"
+
+#ifdef BUILD_RPI
+
+
+
+#endif
+RPI::RPI() {
+
+}

include/Platforms/RPI/Managers/VideoManager.hpp

@@ -0,0 +1,19 @@
+#pragma once
+
+
+#include <atomic>
+#include <set>
+#include "autoapp/Managers/IVideoManager.hpp"
+
+
+class VideoManager: public IVideoManager{
+ public:
+ VideoManager();
+ ~VideoManager() override;
+
+ void start() override;
+ void stop() override;
+
+ void requestFocus() override ;
+ void releaseFocus() override ;
+};

include/Platforms/RPI/RPI.hpp

@@ -0,0 +1,31 @@
+#pragma once
+#ifdef BUILD_RPI
+#include "autoapp/Platform/IPlatform.hpp"
+
+#include <Platforms/RPI/Managers/VideoManager.hpp>
+#include <Platforms/RPI/Managers/AudioManager.hpp>
+#include <Platforms/RPI/Managers/GPSManager.hpp>
+#include <Platforms/RPI/Managers/NightManager.hpp>
+#include <Platforms/RPI/Managers/BluetoothManager.hpp>
+
+
+#include <cstdlib>
+#include <unistd.h>
+#include <fcntl.h>
+
+
+class RPI: public IPlatform{
+ public:
+ RPI();
+
+ IVideoManager::Pointer videoManager;
+ AASignals::Pointer aaSignals;
+
+ IGPSManager::Pointer gpsManager;
+ INightManager::Pointer nightManager;
+ IAudioManager::Pointer audioManager;
+ IBluetoothManager::Pointer bluetoothManager;
+
+};
+
+#endif

src/autoapp/Managers/AAPA.cpp → src/Platforms/Mazda/Managers/AAPA.cpp

@@ -1,5 +1,5 @@
-#include "autoapp/Managers/AAPA.hpp"
-#include <easylogging++.h>
+#include "Platforms/Mazda/Managers/AAPA.hpp"
+#include "easylogging++.h"
 
 #include <utility>
 

src/autoapp/Managers/AudioManager.cpp → src/Platforms/Mazda/Managers/AudioManager.cpp

@@ -1,5 +1,5 @@
-#include <autoapp/Managers/AudioManager.hpp>
-#include <easylogging++.h>
+#include "Platforms/Mazda/Managers/AudioManager.hpp"
+#include "easylogging++.h"
 #include <thread>
 
 void AudioManager::onRequestAudioFocusResult(json result, Stream *stream) {

src/autoapp/Managers/BluetoothManager.cpp → src/Platforms/Mazda/Managers/BluetoothManager.cpp

@@ -1,6 +1,6 @@
-#include <autoapp/Managers/BluetoothManager.hpp>
+#include "Platforms/Mazda/Managers/BluetoothManager.hpp"
 
-#include <easylogging++.h>
+#include "easylogging++.h"
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <net/if.h>

src/autoapp/Managers/GPSManager.cpp → src/Platforms/Mazda/Managers/GPSManager.cpp

@@ -1,5 +1,5 @@
-#include "autoapp/Managers/GPSManager.hpp"
-#include <easylogging++.h>
+#include "Platforms/Mazda/Managers/GPSManager.hpp"
+#include "easylogging++.h"
 
 void GPSManager::update_position(const asio::error_code &error) {
  std::lock_guard<std::mutex> lock(timerMutex);

src/autoapp/Managers/HttpManager.cpp → src/Platforms/Mazda/Managers/HttpManager.cpp

@@ -1,5 +1,5 @@
-#include <autoapp/Managers/HttpManager.hpp>
-#include <easylogging++.h>
+#include "Platforms/Mazda/Managers/HttpManager.hpp"
+#include "easylogging++.h"
 #include "version.h"
 
 HttpManager::HttpManager(IVideoManager::Pointer videosignals, AASignals::Pointer aasignals)

src/autoapp/Managers/NavigationManager.cpp → src/Platforms/Mazda/Managers/NavigationManager.cpp

@@ -1,5 +1,5 @@
-#include "autoapp/Managers/NavigationManager.hpp"
-#include <easylogging++.h>
+#include "Platforms/Mazda/Managers/NavigationManager.hpp"
+#include "easylogging++.h"
 
 NavigationManager::NavigationManager(NavigationSignals::Pointer navSignals,
  const std::shared_ptr<DBus::Connection> &systemconnection) : navSignals_(std::move(

src/autoapp/Managers/NightManager.cpp → src/Platforms/Mazda/Managers/NightManager.cpp

@@ -1,5 +1,5 @@
-#include <autoapp/Managers/NightManager.hpp>
-#include <easylogging++.h>
+#include "Platforms/Mazda/Managers/NightManager.hpp"
+#include "easylogging++.h"
 
 NightManager::NightManager(asio::io_service &IoService) : timer(IoService) {
 

src/autoapp/Managers/VideoManager.cpp → src/Platforms/Mazda/Managers/VideoManager.cpp

@@ -1,5 +1,5 @@
-#include "autoapp/Managers/VideoManager.hpp"
-#include <easylogging++.h>
+#include "Platforms/Mazda/Managers/VideoManager.hpp"
+#include "easylogging++.h"
 
 VideoManager::VideoManager(const std::shared_ptr<DBus::Connection> &session_connection){
  gui =