Make the opencardev aasdk work with newdev
This commit is contained in:
dice14u
parent
dd2c0a445e
commit
9ea379fa8e
@ -1 +0,0 @@
|
|||||||
../../../aasdk/include/aasdk/
|
|
||||||
@ -19,8 +19,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <f1x/aasdk/IO/Promise.hpp>
|
#include <aasdk/IO/Promise.hpp>
|
||||||
#include <f1x/aasdk/Common/Data.hpp>
|
#include <aasdk/Common/Data.hpp>
|
||||||
|
|
||||||
namespace f1x
|
namespace f1x
|
||||||
{
|
{
|
||||||
|
|||||||
@ -19,8 +19,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <f1x/aasdk/Messenger/Timestamp.hpp>
|
#include <aasdk/Messenger/Timestamp.hpp>
|
||||||
#include <f1x/aasdk/Common/Data.hpp>
|
#include <aasdk/Common/Data.hpp>
|
||||||
|
|
||||||
namespace f1x
|
namespace f1x
|
||||||
{
|
{
|
||||||
|
|||||||
@ -16,7 +16,7 @@
|
|||||||
* along with openauto. If not, see <http://www.gnu.org/licenses/>.
|
* along with openauto. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <f1x/aasdk/IO/Promise.hpp>
|
#include <aasdk/IO/Promise.hpp>
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
|||||||
@ -19,7 +19,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <QRect>
|
#include <QRect>
|
||||||
#include <f1x/aasdk/IO/Promise.hpp>
|
#include <aasdk/IO/Promise.hpp>
|
||||||
#include <f1x/openauto/autoapp/Projection/InputEvent.hpp>
|
#include <f1x/openauto/autoapp/Projection/InputEvent.hpp>
|
||||||
|
|
||||||
namespace f1x
|
namespace f1x
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
#include <QRect>
|
#include <QRect>
|
||||||
#include <aasdk_proto/VideoFPSEnum.pb.h>
|
#include <aasdk_proto/VideoFPSEnum.pb.h>
|
||||||
#include <aasdk_proto/VideoResolutionEnum.pb.h>
|
#include <aasdk_proto/VideoResolutionEnum.pb.h>
|
||||||
#include <f1x/aasdk/Common/Data.hpp>
|
#include <aasdk/Common/Data.hpp>
|
||||||
|
|
||||||
namespace f1x
|
namespace f1x
|
||||||
{
|
{
|
||||||
|
|||||||
@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
#include <aasdk_proto/ButtonCodeEnum.pb.h>
|
#include <aasdk_proto/ButtonCodeEnum.pb.h>
|
||||||
#include <aasdk_proto/TouchActionEnum.pb.h>
|
#include <aasdk_proto/TouchActionEnum.pb.h>
|
||||||
#include <f1x/aasdk/IO/Promise.hpp>
|
#include <aasdk/IO/Promise.hpp>
|
||||||
|
|
||||||
namespace f1x
|
namespace f1x
|
||||||
{
|
{
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
#include <QIODevice>
|
#include <QIODevice>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
#include <boost/circular_buffer.hpp>
|
#include <boost/circular_buffer.hpp>
|
||||||
#include <f1x/aasdk/Common/Data.hpp>
|
#include <aasdk/Common/Data.hpp>
|
||||||
|
|
||||||
namespace f1x
|
namespace f1x
|
||||||
{
|
{
|
||||||
|
|||||||
@ -19,10 +19,10 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <boost/asio.hpp>
|
#include <boost/asio.hpp>
|
||||||
#include <f1x/aasdk/Transport/ITransport.hpp>
|
#include <aasdk/Transport/ITransport.hpp>
|
||||||
#include <f1x/aasdk/Channel/Control/IControlServiceChannel.hpp>
|
#include <aasdk/Channel/Control/IControlServiceChannel.hpp>
|
||||||
#include <f1x/aasdk/Channel/Control/IControlServiceChannelEventHandler.hpp>
|
#include <aasdk/Channel/Control/IControlServiceChannelEventHandler.hpp>
|
||||||
#include <f1x/aasdk/Channel/AV/VideoServiceChannel.hpp>
|
#include <aasdk/Channel/AV/VideoServiceChannel.hpp>
|
||||||
#include <f1x/openauto/autoapp/Configuration/IConfiguration.hpp>
|
#include <f1x/openauto/autoapp/Configuration/IConfiguration.hpp>
|
||||||
#include <f1x/openauto/autoapp/Service/IAndroidAutoEntity.hpp>
|
#include <f1x/openauto/autoapp/Service/IAndroidAutoEntity.hpp>
|
||||||
#include <f1x/openauto/autoapp/Service/IService.hpp>
|
#include <f1x/openauto/autoapp/Service/IService.hpp>
|
||||||
|
|||||||
@ -19,7 +19,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <boost/asio.hpp>
|
#include <boost/asio.hpp>
|
||||||
#include <f1x/aasdk/Transport/ITransport.hpp>
|
#include <aasdk/Transport/ITransport.hpp>
|
||||||
#include <f1x/openauto/autoapp/Configuration/IConfiguration.hpp>
|
#include <f1x/openauto/autoapp/Configuration/IConfiguration.hpp>
|
||||||
#include <f1x/openauto/autoapp/Service/IAndroidAutoEntityFactory.hpp>
|
#include <f1x/openauto/autoapp/Service/IAndroidAutoEntityFactory.hpp>
|
||||||
#include <f1x/openauto/autoapp/Service/IServiceFactory.hpp>
|
#include <f1x/openauto/autoapp/Service/IServiceFactory.hpp>
|
||||||
|
|||||||
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <f1x/aasdk/Channel/AV/AVInputServiceChannel.hpp>
|
#include <aasdk/Channel/AV/AVInputServiceChannel.hpp>
|
||||||
#include <f1x/openauto/autoapp/Service/IService.hpp>
|
#include <f1x/openauto/autoapp/Service/IService.hpp>
|
||||||
#include <f1x/openauto/autoapp/Projection/IAudioInput.hpp>
|
#include <f1x/openauto/autoapp/Projection/IAudioInput.hpp>
|
||||||
|
|
||||||
|
|||||||
@ -18,8 +18,8 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <f1x/aasdk/Channel/AV/IAudioServiceChannel.hpp>
|
#include <aasdk/Channel/AV/IAudioServiceChannel.hpp>
|
||||||
#include <f1x/aasdk/Channel/AV/IAudioServiceChannelEventHandler.hpp>
|
#include <aasdk/Channel/AV/IAudioServiceChannelEventHandler.hpp>
|
||||||
#include <f1x/openauto/autoapp/Projection/IAudioOutput.hpp>
|
#include <f1x/openauto/autoapp/Projection/IAudioOutput.hpp>
|
||||||
#include <f1x/openauto/autoapp/Service/IService.hpp>
|
#include <f1x/openauto/autoapp/Service/IService.hpp>
|
||||||
|
|
||||||
|
|||||||
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <f1x/aasdk/Channel/Bluetooth/BluetoothServiceChannel.hpp>
|
#include <aasdk/Channel/Bluetooth/BluetoothServiceChannel.hpp>
|
||||||
#include <f1x/openauto/autoapp/Projection/IBluetoothDevice.hpp>
|
#include <f1x/openauto/autoapp/Projection/IBluetoothDevice.hpp>
|
||||||
#include <f1x/openauto/autoapp/Service/IService.hpp>
|
#include <f1x/openauto/autoapp/Service/IService.hpp>
|
||||||
|
|
||||||
|
|||||||
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <f1x/aasdk/Error/Error.hpp>
|
#include <aasdk/Error/Error.hpp>
|
||||||
|
|
||||||
namespace f1x
|
namespace f1x
|
||||||
{
|
{
|
||||||
|
|||||||
@ -18,8 +18,8 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <f1x/aasdk/TCP/ITCPEndpoint.hpp>
|
#include <aasdk/TCP/ITCPEndpoint.hpp>
|
||||||
#include <f1x/aasdk/USB/IAOAPDevice.hpp>
|
#include <aasdk/USB/IAOAPDevice.hpp>
|
||||||
#include <f1x/openauto/autoapp/Service/IAndroidAutoEntity.hpp>
|
#include <f1x/openauto/autoapp/Service/IAndroidAutoEntity.hpp>
|
||||||
|
|
||||||
namespace f1x
|
namespace f1x
|
||||||
|
|||||||
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <f1x/aasdk/IO/Promise.hpp>
|
#include <aasdk/IO/Promise.hpp>
|
||||||
|
|
||||||
namespace f1x
|
namespace f1x
|
||||||
{
|
{
|
||||||
|
|||||||
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <f1x/aasdk/Messenger/IMessenger.hpp>
|
#include <aasdk/Messenger/IMessenger.hpp>
|
||||||
#include <f1x/openauto/autoapp/Service/IService.hpp>
|
#include <f1x/openauto/autoapp/Service/IService.hpp>
|
||||||
|
|
||||||
namespace f1x
|
namespace f1x
|
||||||
|
|||||||
@ -19,7 +19,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <aasdk_proto/ButtonCodeEnum.pb.h>
|
#include <aasdk_proto/ButtonCodeEnum.pb.h>
|
||||||
#include <f1x/aasdk/Channel/Input/InputServiceChannel.hpp>
|
#include <aasdk/Channel/Input/InputServiceChannel.hpp>
|
||||||
#include <f1x/openauto/autoapp/Service/IService.hpp>
|
#include <f1x/openauto/autoapp/Service/IService.hpp>
|
||||||
#include <f1x/openauto/autoapp/Projection/IInputDevice.hpp>
|
#include <f1x/openauto/autoapp/Projection/IInputDevice.hpp>
|
||||||
#include <f1x/openauto/autoapp/Projection/IInputDeviceEventHandler.hpp>
|
#include <f1x/openauto/autoapp/Projection/IInputDeviceEventHandler.hpp>
|
||||||
|
|||||||
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <f1x/aasdk/Messenger/IMessenger.hpp>
|
#include <aasdk/Messenger/IMessenger.hpp>
|
||||||
#include <f1x/openauto/autoapp/Service/AudioService.hpp>
|
#include <f1x/openauto/autoapp/Service/AudioService.hpp>
|
||||||
|
|
||||||
namespace f1x
|
namespace f1x
|
||||||
|
|||||||
@ -19,7 +19,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <gps.h>
|
#include <gps.h>
|
||||||
#include <f1x/aasdk/Channel/Sensor/SensorServiceChannel.hpp>
|
#include <aasdk/Channel/Sensor/SensorServiceChannel.hpp>
|
||||||
#include <f1x/openauto/autoapp/Service/IService.hpp>
|
#include <f1x/openauto/autoapp/Service/IService.hpp>
|
||||||
|
|
||||||
namespace f1x
|
namespace f1x
|
||||||
|
|||||||
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <f1x/aasdk/Messenger/IMessenger.hpp>
|
#include <aasdk/Messenger/IMessenger.hpp>
|
||||||
#include <f1x/openauto/autoapp/Service/AudioService.hpp>
|
#include <f1x/openauto/autoapp/Service/AudioService.hpp>
|
||||||
|
|
||||||
namespace f1x
|
namespace f1x
|
||||||
|
|||||||
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <f1x/aasdk/Messenger/IMessenger.hpp>
|
#include <aasdk/Messenger/IMessenger.hpp>
|
||||||
#include <f1x/openauto/autoapp/Service/AudioService.hpp>
|
#include <f1x/openauto/autoapp/Service/AudioService.hpp>
|
||||||
|
|
||||||
namespace f1x
|
namespace f1x
|
||||||
|
|||||||
@ -19,8 +19,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <f1x/aasdk/Channel/AV/VideoServiceChannel.hpp>
|
#include <aasdk/Channel/AV/VideoServiceChannel.hpp>
|
||||||
#include <f1x/aasdk/Channel/AV/IVideoServiceChannelEventHandler.hpp>
|
#include <aasdk/Channel/AV/IVideoServiceChannelEventHandler.hpp>
|
||||||
#include <f1x/openauto/autoapp/Projection/IVideoOutput.hpp>
|
#include <f1x/openauto/autoapp/Projection/IVideoOutput.hpp>
|
||||||
#include <f1x/openauto/autoapp/Service/IService.hpp>
|
#include <f1x/openauto/autoapp/Service/IService.hpp>
|
||||||
|
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
#include <f1x/openauto/autoapp/Configuration/IConfiguration.hpp>
|
#include <f1x/openauto/autoapp/Configuration/IConfiguration.hpp>
|
||||||
#include <f1x/openauto/autoapp/Service/IService.hpp>
|
#include <f1x/openauto/autoapp/Service/IService.hpp>
|
||||||
#include <boost/asio/io_service.hpp>
|
#include <boost/asio/io_service.hpp>
|
||||||
#include <f1x/aasdk/Messenger/IMessenger.hpp>
|
#include <aasdk/Messenger/IMessenger.hpp>
|
||||||
|
|
||||||
namespace f1x
|
namespace f1x
|
||||||
{
|
{
|
||||||
|
|||||||
@ -3,8 +3,8 @@
|
|||||||
#include <QDialog>
|
#include <QDialog>
|
||||||
#include <QStringListModel>
|
#include <QStringListModel>
|
||||||
#include <QKeyEvent>
|
#include <QKeyEvent>
|
||||||
#include <f1x/aasdk/TCP/ITCPEndpoint.hpp>
|
#include <aasdk/TCP/ITCPEndpoint.hpp>
|
||||||
#include <f1x/aasdk/TCP/ITCPWrapper.hpp>
|
#include <aasdk/TCP/ITCPWrapper.hpp>
|
||||||
#include <f1x/openauto/autoapp/Configuration/IRecentAddressesList.hpp>
|
#include <f1x/openauto/autoapp/Configuration/IRecentAddressesList.hpp>
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
|
|||||||
@ -16,7 +16,7 @@
|
|||||||
* along with openauto. If not, see <http://www.gnu.org/licenses/>.
|
* along with openauto. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <f1x/aasdk/Channel/Control/ControlServiceChannel.hpp>
|
#include <aasdk/Channel/Control/ControlServiceChannel.hpp>
|
||||||
#include <f1x/openauto/autoapp/Service/AndroidAutoEntity.hpp>
|
#include <f1x/openauto/autoapp/Service/AndroidAutoEntity.hpp>
|
||||||
#include <f1x/openauto/Common/Log.hpp>
|
#include <f1x/openauto/Common/Log.hpp>
|
||||||
|
|
||||||
|
|||||||
@ -16,14 +16,14 @@
|
|||||||
* along with openauto. If not, see <http://www.gnu.org/licenses/>.
|
* along with openauto. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <f1x/aasdk/USB/AOAPDevice.hpp>
|
#include <aasdk/USB/AOAPDevice.hpp>
|
||||||
#include <f1x/aasdk/Transport/SSLWrapper.hpp>
|
#include <aasdk/Transport/SSLWrapper.hpp>
|
||||||
#include <f1x/aasdk/Transport/USBTransport.hpp>
|
#include <aasdk/Transport/USBTransport.hpp>
|
||||||
#include <f1x/aasdk/Transport/TCPTransport.hpp>
|
#include <aasdk/Transport/TCPTransport.hpp>
|
||||||
#include <f1x/aasdk/Messenger/Cryptor.hpp>
|
#include <aasdk/Messenger/Cryptor.hpp>
|
||||||
#include <f1x/aasdk/Messenger/MessageInStream.hpp>
|
#include <aasdk/Messenger/MessageInStream.hpp>
|
||||||
#include <f1x/aasdk/Messenger/MessageOutStream.hpp>
|
#include <aasdk/Messenger/MessageOutStream.hpp>
|
||||||
#include <f1x/aasdk/Messenger/Messenger.hpp>
|
#include <aasdk/Messenger/Messenger.hpp>
|
||||||
#include <f1x/openauto/autoapp/Service/AndroidAutoEntityFactory.hpp>
|
#include <f1x/openauto/autoapp/Service/AndroidAutoEntityFactory.hpp>
|
||||||
#include <f1x/openauto/autoapp/Service/AndroidAutoEntity.hpp>
|
#include <f1x/openauto/autoapp/Service/AndroidAutoEntity.hpp>
|
||||||
#include <f1x/openauto/autoapp/Service/Pinger.hpp>
|
#include <f1x/openauto/autoapp/Service/Pinger.hpp>
|
||||||
|
|||||||
@ -16,7 +16,7 @@
|
|||||||
* along with openauto. If not, see <http://www.gnu.org/licenses/>.
|
* along with openauto. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <f1x/aasdk/Channel/AV/MediaAudioServiceChannel.hpp>
|
#include <aasdk/Channel/AV/MediaAudioServiceChannel.hpp>
|
||||||
#include <f1x/openauto/autoapp/Service/MediaAudioService.hpp>
|
#include <f1x/openauto/autoapp/Service/MediaAudioService.hpp>
|
||||||
|
|
||||||
namespace f1x
|
namespace f1x
|
||||||
|
|||||||
@ -18,9 +18,9 @@
|
|||||||
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QScreen>
|
#include <QScreen>
|
||||||
#include <f1x/aasdk/Channel/AV/MediaAudioServiceChannel.hpp>
|
#include <aasdk/Channel/AV/MediaAudioServiceChannel.hpp>
|
||||||
#include <f1x/aasdk/Channel/AV/SystemAudioServiceChannel.hpp>
|
#include <aasdk/Channel/AV/SystemAudioServiceChannel.hpp>
|
||||||
#include <f1x/aasdk/Channel/AV/SpeechAudioServiceChannel.hpp>
|
#include <aasdk/Channel/AV/SpeechAudioServiceChannel.hpp>
|
||||||
#include <f1x/openauto/autoapp/Service/ServiceFactory.hpp>
|
#include <f1x/openauto/autoapp/Service/ServiceFactory.hpp>
|
||||||
#include <f1x/openauto/autoapp/Service/VideoService.hpp>
|
#include <f1x/openauto/autoapp/Service/VideoService.hpp>
|
||||||
#include <f1x/openauto/autoapp/Service/MediaAudioService.hpp>
|
#include <f1x/openauto/autoapp/Service/MediaAudioService.hpp>
|
||||||
|
|||||||
@ -16,7 +16,7 @@
|
|||||||
* along with openauto. If not, see <http://www.gnu.org/licenses/>.
|
* along with openauto. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <f1x/aasdk/Channel/AV/SpeechAudioServiceChannel.hpp>
|
#include <aasdk/Channel/AV/SpeechAudioServiceChannel.hpp>
|
||||||
#include <f1x/openauto/autoapp/Service/SpeechAudioService.hpp>
|
#include <f1x/openauto/autoapp/Service/SpeechAudioService.hpp>
|
||||||
|
|
||||||
namespace f1x
|
namespace f1x
|
||||||
|
|||||||
@ -16,7 +16,7 @@
|
|||||||
* along with openauto. If not, see <http://www.gnu.org/licenses/>.
|
* along with openauto. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <f1x/aasdk/Channel/AV/SystemAudioServiceChannel.hpp>
|
#include <aasdk/Channel/AV/SystemAudioServiceChannel.hpp>
|
||||||
#include <f1x/openauto/autoapp/Service/SystemAudioService.hpp>
|
#include <f1x/openauto/autoapp/Service/SystemAudioService.hpp>
|
||||||
|
|
||||||
namespace f1x
|
namespace f1x
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user