Rearrange directory structure

develop
Jason Wenger 2020-05-12 21:55:03 -05:00
parent 204c2edbe3
commit f9f02815d0
271 changed files with 614 additions and 954 deletions

View File

@ -78,7 +78,7 @@ target_link_libraries(aasdk
${WINSOCK2_LIBRARIES}) ${WINSOCK2_LIBRARIES})
install(TARGETS aasdk DESTINATION lib) install(TARGETS aasdk DESTINATION lib)
install(DIRECTORY include/f1x DESTINATION include) install(DIRECTORY include/aasdk DESTINATION include)
if(AASDK_TEST) if(AASDK_TEST)
add_executable(aasdk_ut add_executable(aasdk_ut

View File

@ -23,7 +23,7 @@ import "AudioTypeEnum.proto";
import "AudioConfigData.proto"; import "AudioConfigData.proto";
import "VideoConfigData.proto"; import "VideoConfigData.proto";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message AVChannel message AVChannel
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.ids; package aasdk.proto.ids;
message AVChannelMessage message AVChannelMessage
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message AVChannelSetupRequest message AVChannelSetupRequest
{ {

View File

@ -20,7 +20,7 @@ syntax="proto2";
import "AVChannelSetupStatusEnum.proto"; import "AVChannelSetupStatusEnum.proto";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message AVChannelSetupResponse message AVChannelSetupResponse
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.enums; package aasdk.proto.enums;
message AVChannelSetupStatus message AVChannelSetupStatus
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message AVChannelStartIndication message AVChannelStartIndication
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message AVChannelStopIndication message AVChannelStopIndication
{ {

View File

@ -21,7 +21,7 @@ syntax="proto2";
import "AVStreamTypeEnum.proto"; import "AVStreamTypeEnum.proto";
import "AudioConfigData.proto"; import "AudioConfigData.proto";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message AVInputChannel message AVInputChannel
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message AVInputOpenRequest message AVInputOpenRequest
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message AVInputOpenResponse message AVInputOpenResponse
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message AVMediaAckIndication message AVMediaAckIndication
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.enums; package aasdk.proto.enums;
message AVStreamType message AVStreamType
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message AbsoluteInputEvent message AbsoluteInputEvent
{ {

View File

@ -20,7 +20,7 @@ syntax="proto2";
import "AbsoluteInputEventData.proto"; import "AbsoluteInputEventData.proto";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message AbsoluteInputEvents message AbsoluteInputEvents
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message Accel message Accel
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message AudioConfig message AudioConfig
{ {

View File

@ -20,7 +20,7 @@ syntax="proto2";
import "AudioFocusTypeEnum.proto"; import "AudioFocusTypeEnum.proto";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message AudioFocusRequest message AudioFocusRequest
{ {

View File

@ -20,7 +20,7 @@ syntax="proto2";
import "AudioFocusStateEnum.proto"; import "AudioFocusStateEnum.proto";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message AudioFocusResponse message AudioFocusResponse
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.enums; package aasdk.proto.enums;
message AudioFocusState message AudioFocusState
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.enums; package aasdk.proto.enums;
message AudioFocusType message AudioFocusType
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.enums; package aasdk.proto.enums;
message AudioType message AudioType
{ {

View File

@ -20,7 +20,7 @@ syntax="proto2";
import "StatusEnum.proto"; import "StatusEnum.proto";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message AuthCompleteIndication message AuthCompleteIndication
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message BindingRequest message BindingRequest
{ {

View File

@ -20,7 +20,7 @@ syntax="proto2";
import "StatusEnum.proto"; import "StatusEnum.proto";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message BindingResponse message BindingResponse
{ {

View File

@ -20,7 +20,7 @@ syntax="proto2";
import "BluetoothPairingMethodEnum.proto"; import "BluetoothPairingMethodEnum.proto";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message BluetoothChannel message BluetoothChannel
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.ids; package aasdk.proto.ids;
message BluetoothChannelMessage message BluetoothChannelMessage
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.enums; package aasdk.proto.enums;
message BluetoothPairingMethod message BluetoothPairingMethod
{ {

View File

@ -20,7 +20,7 @@ syntax="proto2";
import "BluetoothPairingMethodEnum.proto"; import "BluetoothPairingMethodEnum.proto";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message BluetoothPairingRequest message BluetoothPairingRequest
{ {

View File

@ -20,7 +20,7 @@ syntax="proto2";
import "BluetoothPairingStatusEnum.proto"; import "BluetoothPairingStatusEnum.proto";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message BluetoothPairingResponse message BluetoothPairingResponse
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.enums; package aasdk.proto.enums;
message BluetoothPairingStatus message BluetoothPairingStatus
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.enums; package aasdk.proto.enums;
message ButtonCode message ButtonCode
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message ButtonEvent message ButtonEvent
{ {

View File

@ -20,7 +20,7 @@ syntax="proto2";
import "ButtonEventData.proto"; import "ButtonEventData.proto";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message ButtonEvents message ButtonEvents
{ {

View File

@ -30,7 +30,7 @@ import "VendorExtensionChannelData.proto";
import "MediaChannelData.proto"; import "MediaChannelData.proto";
import "WifiChannelData.proto"; import "WifiChannelData.proto";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message ChannelDescriptor message ChannelDescriptor
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message ChannelOpenRequest message ChannelOpenRequest
{ {

View File

@ -20,7 +20,7 @@ syntax="proto2";
import "StatusEnum.proto"; import "StatusEnum.proto";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message ChannelOpenResponse message ChannelOpenResponse
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message Compass message Compass
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.ids; package aasdk.proto.ids;
message ControlMessage message ControlMessage
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message Diagnostics message Diagnostics
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message Door message Door
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message DrivingStatus message DrivingStatus
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.enums; package aasdk.proto.enums;
message DrivingStatus message DrivingStatus
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message Environment message Environment
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message FuelLevel message FuelLevel
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message GPSLocation message GPSLocation
{ {

View File

@ -20,7 +20,7 @@ syntax="proto2";
import "GearEnum.proto"; import "GearEnum.proto";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message Gear message Gear
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.enums; package aasdk.proto.enums;
message Gear message Gear
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message Gyro message Gyro
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message HVAC message HVAC
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.enums; package aasdk.proto.enums;
message HeadlightStatus message HeadlightStatus
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.enums; package aasdk.proto.enums;
message IndicatorStatus message IndicatorStatus
{ {

View File

@ -20,7 +20,7 @@ syntax="proto2";
import "TouchConfigData.proto"; import "TouchConfigData.proto";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message InputChannel message InputChannel
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.ids; package aasdk.proto.ids;
message InputChannelMessage message InputChannelMessage
{ {

View File

@ -23,7 +23,7 @@ import "ButtonEventsData.proto";
import "AbsoluteInputEventsData.proto"; import "AbsoluteInputEventsData.proto";
import "RelativeInputEventsData.proto"; import "RelativeInputEventsData.proto";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message InputEventIndication message InputEventIndication
{ {

View File

@ -21,7 +21,7 @@ syntax="proto2";
import "HeadlightStatusEnum.proto"; import "HeadlightStatusEnum.proto";
import "IndicatorStatusEnum.proto"; import "IndicatorStatusEnum.proto";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message Light message Light
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message MediaInfoChannel message MediaInfoChannel
{ {

View File

@ -20,7 +20,7 @@ syntax="proto2";
import "NavigationImageOptionsData.proto"; import "NavigationImageOptionsData.proto";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message NavigationChannel message NavigationChannel
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message NavigationFocusRequest message NavigationFocusRequest
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message NavigationFocusResponse message NavigationFocusResponse
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message NavigationImageOptions message NavigationImageOptions
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message NightMode message NightMode
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message Odometer message Odometer
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message ParkingBrake message ParkingBrake
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message Passenger message Passenger
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message PingRequest message PingRequest
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message PingResponse message PingResponse
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message RPM message RPM
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message RelativeInputEvent message RelativeInputEvent
{ {

View File

@ -20,7 +20,7 @@ syntax="proto2";
import "RelativeInputEventData.proto"; import "RelativeInputEventData.proto";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message RelativeInputEvents message RelativeInputEvents
{ {

View File

@ -20,7 +20,7 @@ syntax="proto2";
import "SensorData.proto"; import "SensorData.proto";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message SensorChannel message SensorChannel
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.ids; package aasdk.proto.ids;
message SensorChannelMessage message SensorChannelMessage
{ {

View File

@ -20,7 +20,7 @@ syntax="proto2";
import "SensorTypeEnum.proto"; import "SensorTypeEnum.proto";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message Sensor message Sensor
{ {

View File

@ -38,7 +38,7 @@ import "LightData.proto";
import "AccelData.proto"; import "AccelData.proto";
import "GyroData.proto"; import "GyroData.proto";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message SensorEventIndication message SensorEventIndication
{ {

View File

@ -20,7 +20,7 @@ syntax="proto2";
import "SensorTypeEnum.proto"; import "SensorTypeEnum.proto";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message SensorStartRequestMessage message SensorStartRequestMessage
{ {

View File

@ -20,7 +20,7 @@ syntax="proto2";
import "StatusEnum.proto"; import "StatusEnum.proto";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message SensorStartResponseMessage message SensorStartResponseMessage
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.enums; package aasdk.proto.enums;
message SensorType message SensorType
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message ServiceDiscoveryRequest message ServiceDiscoveryRequest
{ {

View File

@ -20,7 +20,7 @@ syntax="proto2";
import "ChannelDescriptorData.proto"; import "ChannelDescriptorData.proto";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message ServiceDiscoveryResponse message ServiceDiscoveryResponse
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.enums; package aasdk.proto.enums;
message ShutdownReason message ShutdownReason
{ {

View File

@ -20,7 +20,7 @@ syntax="proto2";
import "ShutdownReasonEnum.proto"; import "ShutdownReasonEnum.proto";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message ShutdownRequest message ShutdownRequest
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message ShutdownResponse message ShutdownResponse
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message Speed message Speed
{ {

View File

@ -19,7 +19,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.enums; package aasdk.proto.enums;
message Status message Status
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message SteeringWheel message SteeringWheel
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.enums; package aasdk.proto.enums;
message TouchAction message TouchAction
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message TouchConfig message TouchConfig
{ {

View File

@ -21,7 +21,7 @@ syntax="proto2";
import "TouchLocationData.proto"; import "TouchLocationData.proto";
import "TouchActionEnum.proto"; import "TouchActionEnum.proto";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message TouchEvent message TouchEvent
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message TouchLocation message TouchLocation
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message VendorExtensionChannel message VendorExtensionChannel
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.enums; package aasdk.proto.enums;
message VersionResponseStatus message VersionResponseStatus
{ {

View File

@ -21,7 +21,7 @@ syntax="proto2";
import "VideoResolutionEnum.proto"; import "VideoResolutionEnum.proto";
import "VideoFPSEnum.proto"; import "VideoFPSEnum.proto";
package f1x.aasdk.proto.data; package aasdk.proto.data;
message VideoConfig message VideoConfig
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.enums; package aasdk.proto.enums;
message VideoFPS message VideoFPS
{ {

View File

@ -20,7 +20,7 @@ syntax="proto2";
import "VideoFocusModeEnum.proto"; import "VideoFocusModeEnum.proto";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message VideoFocusIndication message VideoFocusIndication
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.enums; package aasdk.proto.enums;
message VideoFocusMode message VideoFocusMode
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.enums; package aasdk.proto.enums;
message VideoFocusReason message VideoFocusReason
{ {

View File

@ -21,7 +21,7 @@ syntax="proto2";
import "VideoFocusModeEnum.proto"; import "VideoFocusModeEnum.proto";
import "VideoFocusReasonEnum.proto"; import "VideoFocusReasonEnum.proto";
package f1x.aasdk.proto.messages; package aasdk.proto.messages;
message VideoFocusRequest message VideoFocusRequest
{ {

View File

@ -18,7 +18,7 @@
syntax="proto2"; syntax="proto2";
package f1x.aasdk.proto.enums; package aasdk.proto.enums;
message VideoResolution message VideoResolution
{ {

View File

@ -22,7 +22,7 @@ option optimize_for=SPEED;
package f1x.aasdk.proto.data; package aasdk.proto.data;
message WifiChannel message WifiChannel
{ {

View File

@ -18,13 +18,12 @@
#pragma once #pragma once
#include <f1x/aasdk/Messenger/MessageId.hpp> #include <aasdk/Messenger/MessageId.hpp>
#include <f1x/aasdk/Messenger/Timestamp.hpp> #include <aasdk/Messenger/Timestamp.hpp>
#include <f1x/aasdk/Channel/ServiceChannel.hpp> #include <aasdk/Channel/ServiceChannel.hpp>
#include <f1x/aasdk/Channel/AV/IAVInputServiceChannel.hpp> #include <aasdk/Channel/AV/IAVInputServiceChannel.hpp>
namespace f1x
{
namespace aasdk namespace aasdk
{ {
namespace channel namespace channel
@ -56,4 +55,3 @@ private:
} }
} }
} }
}

Some files were not shown because too many files have changed in this diff Show More