diff options
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | gen/cpp/openxc.pb | bin | 3483 -> 3497 bytes | |||
| -rw-r--r-- | gen/cpp/openxc.pb.c | 2 | ||||
| -rw-r--r-- | gen/cpp/openxc.pb.h | 5 | ||||
| -rw-r--r-- | gen/java/com/openxc/BinaryMessages.java | 116 | ||||
| -rw-r--r-- | gen/python/openxc_pb2.py | 98 | ||||
| -rw-r--r-- | openxc.proto | 1 |
7 files changed, 120 insertions, 106 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f2f8a7a5..4ef70eff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # OpenXC Message Format Changelog +## v0.7.0 + +* Feature: Added command to get device's platform + ## v0.6.1 * Improvement: Increase diagnostic response payload size to accommodate diff --git a/gen/cpp/openxc.pb b/gen/cpp/openxc.pb Binary files differindex 20543fe9..104c2065 100644 --- a/gen/cpp/openxc.pb +++ b/gen/cpp/openxc.pb diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c index dc90530e..9b90c36b 100644 --- a/gen/cpp/openxc.pb.c +++ b/gen/cpp/openxc.pb.c @@ -1,5 +1,5 @@ /* Automatically generated nanopb constant definitions */ -/* Generated by nanopb-0.3.1 at Thu Aug 4 17:56:35 2016. */ +/* Generated by nanopb-0.3.1 at Wed Sep 14 16:47:53 2016. */ #include "openxc.pb.h" diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h index a15e44ba..09735ee7 100644 --- a/gen/cpp/openxc.pb.h +++ b/gen/cpp/openxc.pb.h @@ -1,5 +1,5 @@ /* Automatically generated nanopb header */ -/* Generated by nanopb-0.3.1 at Thu Aug 4 17:56:35 2016. */ +/* Generated by nanopb-0.3.1 at Wed Sep 14 16:47:53 2016. */ #ifndef PB_OPENXC_PB_H_INCLUDED #define PB_OPENXC_PB_H_INCLUDED @@ -37,7 +37,8 @@ typedef enum _openxc_ControlCommand_Type { openxc_ControlCommand_Type_PREDEFINED_OBD2_REQUESTS = 7, openxc_ControlCommand_Type_MODEM_CONFIGURATION = 8, openxc_ControlCommand_Type_RTC_CONFIGURATION = 9, - openxc_ControlCommand_Type_SD_MOUNT_STATUS = 10 + openxc_ControlCommand_Type_SD_MOUNT_STATUS = 10, + openxc_ControlCommand_Type_PLATFORM = 11 } openxc_ControlCommand_Type; typedef enum _openxc_DiagnosticControlCommand_Action { diff --git a/gen/java/com/openxc/BinaryMessages.java b/gen/java/com/openxc/BinaryMessages.java index 534b2231..4fad1d6a 100644 --- a/gen/java/com/openxc/BinaryMessages.java +++ b/gen/java/com/openxc/BinaryMessages.java @@ -1877,6 +1877,7 @@ public final class BinaryMessages { MODEM_CONFIGURATION(7, 8), RTC_CONFIGURATION(8, 9), SD_MOUNT_STATUS(9, 10), + PLATFORM(10, 11), ; public static final int VERSION_VALUE = 1; @@ -1889,6 +1890,7 @@ public final class BinaryMessages { public static final int MODEM_CONFIGURATION_VALUE = 8; public static final int RTC_CONFIGURATION_VALUE = 9; public static final int SD_MOUNT_STATUS_VALUE = 10; + public static final int PLATFORM_VALUE = 11; public final int getNumber() { return value; } @@ -1905,6 +1907,7 @@ public final class BinaryMessages { case 8: return MODEM_CONFIGURATION; case 9: return RTC_CONFIGURATION; case 10: return SD_MOUNT_STATUS; + case 11: return PLATFORM; default: return null; } } @@ -1935,7 +1938,7 @@ public final class BinaryMessages { } private static final Type[] VALUES = { - VERSION, DEVICE_ID, DIAGNOSTIC, PASSTHROUGH, ACCEPTANCE_FILTER_BYPASS, PAYLOAD_FORMAT, PREDEFINED_OBD2_REQUESTS, MODEM_CONFIGURATION, RTC_CONFIGURATION, SD_MOUNT_STATUS, + VERSION, DEVICE_ID, DIAGNOSTIC, PASSTHROUGH, ACCEPTANCE_FILTER_BYPASS, PAYLOAD_FORMAT, PREDEFINED_OBD2_REQUESTS, MODEM_CONFIGURATION, RTC_CONFIGURATION, SD_MOUNT_STATUS, PLATFORM, }; public static Type valueOf( @@ -11851,7 +11854,7 @@ public final class BinaryMessages { "\nCanMessage\022\013\n\003bus\030\001 \001(\005\022\n\n\002id\030\002 \001(\r\022\014\n\004" + "data\030\003 \001(\014\0224\n\014frame_format\030\004 \001(\0162\036.openx" + "c.CanMessage.FrameFormat\")\n\013FrameFormat\022" + - "\014\n\010STANDARD\020\001\022\014\n\010EXTENDED\020\002\"\211\006\n\016ControlC" + + "\014\n\010STANDARD\020\001\022\014\n\010EXTENDED\020\002\"\227\006\n\016ControlC" + "ommand\022)\n\004type\030\001 \001(\0162\033.openxc.ControlCom" + "mand.Type\022<\n\022diagnostic_request\030\002 \001(\0132 ." + "openxc.DiagnosticControlCommand\022G\n\030passt" + @@ -11865,65 +11868,66 @@ public final class BinaryMessages { "sCommand\022F\n\033modem_configuration_command\030" + "\007 \001(\0132!.openxc.ModemConfigurationCommand" + "\022B\n\031rtc_configuration_command\030\010 \001(\0132\037.op" + - "enxc.RTCConfigurationCommand\"\330\001\n\004Type\022\013\n" + + "enxc.RTCConfigurationCommand\"\346\001\n\004Type\022\013\n" + "\007VERSION\020\001\022\r\n\tDEVICE_ID\020\002\022\016\n\nDIAGNOSTIC\020", "\003\022\017\n\013PASSTHROUGH\020\004\022\034\n\030ACCEPTANCE_FILTER_" + "BYPASS\020\005\022\022\n\016PAYLOAD_FORMAT\020\006\022\034\n\030PREDEFIN" + "ED_OBD2_REQUESTS\020\007\022\027\n\023MODEM_CONFIGURATIO" + "N\020\010\022\025\n\021RTC_CONFIGURATION\020\t\022\023\n\017SD_MOUNT_S" + - "TATUS\020\n\"\236\001\n\030DiagnosticControlCommand\022*\n\007" + - "request\030\001 \001(\0132\031.openxc.DiagnosticRequest" + - "\0227\n\006action\030\002 \001(\0162\'.openxc.DiagnosticCont" + - "rolCommand.Action\"\035\n\006Action\022\007\n\003ADD\020\001\022\n\n\006" + - "CANCEL\020\002\"=\n\035PassthroughModeControlComman" + - "d\022\013\n\003bus\030\001 \001(\005\022\017\n\007enabled\030\002 \001(\010\"<\n\035Accep", - "tanceFilterBypassCommand\022\013\n\003bus\030\001 \001(\005\022\016\n" + - "\006bypass\030\002 \001(\010\"\214\001\n\024PayloadFormatCommand\022:" + - "\n\006format\030\001 \001(\0162*.openxc.PayloadFormatCom" + - "mand.PayloadFormat\"8\n\rPayloadFormat\022\010\n\004J" + - "SON\020\001\022\014\n\010PROTOBUF\020\002\022\017\n\013MESSAGEPACK\020\003\"0\n\035" + - "PredefinedObd2RequestsCommand\022\017\n\007enabled" + - "\030\001 \001(\010\"\321\003\n\027NetworkOperatorSettings\022\030\n\020al" + - "lowDataRoaming\030\001 \001(\010\022N\n\022operatorSelectMo" + - "de\030\002 \001(\01622.openxc.NetworkOperatorSetting" + - "s.OperatorSelectMode\022L\n\021networkDescripto", - "r\030\003 \001(\01321.openxc.NetworkOperatorSettings" + - ".NetworkDescriptor\032\230\001\n\021NetworkDescriptor" + - "\022\014\n\004PLMN\030\001 \001(\r\022R\n\013networkType\030\002 \001(\0162=.op" + - "enxc.NetworkOperatorSettings.NetworkDesc" + - "riptor.NetworkType\"!\n\013NetworkType\022\007\n\003GSM" + - "\020\000\022\t\n\005UTRAN\020\002\"c\n\022OperatorSelectMode\022\r\n\tA" + - "UTOMATIC\020\000\022\n\n\006MANUAL\020\001\022\016\n\nDEREGISTER\020\002\022\014" + - "\n\010SET_ONLY\020\003\022\024\n\020MANUAL_AUTOMATIC\020\004\"\"\n\023Ne" + - "tworkDataSettings\022\013\n\003APN\030\001 \001(\t\"3\n\025Server" + - "ConnectSettings\022\014\n\004host\030\001 \001(\t\022\014\n\004port\030\002 ", - "\001(\r\"\325\001\n\031ModemConfigurationCommand\022@\n\027net" + - "workOperatorSettings\030\001 \001(\0132\037.openxc.Netw" + - "orkOperatorSettings\0228\n\023networkDataSettin" + - "gs\030\002 \001(\0132\033.openxc.NetworkDataSettings\022<\n" + - "\025serverConnectSettings\030\003 \001(\0132\035.openxc.Se" + - "rverConnectSettings\",\n\027RTCConfigurationC" + - "ommand\022\021\n\tunix_time\030\001 \001(\r\"]\n\017CommandResp" + - "onse\022)\n\004type\030\001 \001(\0162\033.openxc.ControlComma" + - "nd.Type\022\017\n\007message\030\002 \001(\t\022\016\n\006status\030\003 \001(\010" + - "\"\375\001\n\021DiagnosticRequest\022\013\n\003bus\030\001 \001(\005\022\022\n\nm", - "essage_id\030\002 \001(\r\022\014\n\004mode\030\003 \001(\r\022\013\n\003pid\030\004 \001" + - "(\r\022\017\n\007payload\030\005 \001(\014\022\032\n\022multiple_response" + - "s\030\006 \001(\010\022\021\n\tfrequency\030\007 \001(\001\022\014\n\004name\030\010 \001(\t" + - "\022;\n\014decoded_type\030\t \001(\0162%.openxc.Diagnost" + - "icRequest.DecodedType\"!\n\013DecodedType\022\010\n\004" + - "NONE\020\001\022\010\n\004OBD2\020\002\"\241\001\n\022DiagnosticResponse\022" + - "\013\n\003bus\030\001 \001(\005\022\022\n\nmessage_id\030\002 \001(\r\022\014\n\004mode" + - "\030\003 \001(\r\022\013\n\003pid\030\004 \001(\r\022\017\n\007success\030\005 \001(\010\022\036\n\026" + - "negative_response_code\030\006 \001(\r\022\017\n\007payload\030" + - "\007 \001(\014\022\r\n\005value\030\010 \001(\001\"\242\001\n\014DynamicField\022\'\n", - "\004type\030\001 \001(\0162\031.openxc.DynamicField.Type\022\024" + - "\n\014string_value\030\002 \001(\t\022\025\n\rnumeric_value\030\003 " + - "\001(\001\022\025\n\rboolean_value\030\004 \001(\010\"%\n\004Type\022\n\n\006ST" + - "RING\020\001\022\007\n\003NUM\020\002\022\010\n\004BOOL\020\003\"g\n\rSimpleMessa" + - "ge\022\014\n\004name\030\001 \001(\t\022#\n\005value\030\002 \001(\0132\024.openxc" + - ".DynamicField\022#\n\005event\030\003 \001(\0132\024.openxc.Dy" + - "namicFieldB\034\n\ncom.openxcB\016BinaryMessages" + "TATUS\020\n\022\014\n\010PLATFORM\020\013\"\236\001\n\030DiagnosticCont" + + "rolCommand\022*\n\007request\030\001 \001(\0132\031.openxc.Dia" + + "gnosticRequest\0227\n\006action\030\002 \001(\0162\'.openxc." + + "DiagnosticControlCommand.Action\"\035\n\006Actio" + + "n\022\007\n\003ADD\020\001\022\n\n\006CANCEL\020\002\"=\n\035PassthroughMod" + + "eControlCommand\022\013\n\003bus\030\001 \001(\005\022\017\n\007enabled\030", + "\002 \001(\010\"<\n\035AcceptanceFilterBypassCommand\022\013" + + "\n\003bus\030\001 \001(\005\022\016\n\006bypass\030\002 \001(\010\"\214\001\n\024PayloadF" + + "ormatCommand\022:\n\006format\030\001 \001(\0162*.openxc.Pa" + + "yloadFormatCommand.PayloadFormat\"8\n\rPayl" + + "oadFormat\022\010\n\004JSON\020\001\022\014\n\010PROTOBUF\020\002\022\017\n\013MES" + + "SAGEPACK\020\003\"0\n\035PredefinedObd2RequestsComm" + + "and\022\017\n\007enabled\030\001 \001(\010\"\321\003\n\027NetworkOperator" + + "Settings\022\030\n\020allowDataRoaming\030\001 \001(\010\022N\n\022op" + + "eratorSelectMode\030\002 \001(\01622.openxc.NetworkO" + + "peratorSettings.OperatorSelectMode\022L\n\021ne", + "tworkDescriptor\030\003 \001(\01321.openxc.NetworkOp" + + "eratorSettings.NetworkDescriptor\032\230\001\n\021Net" + + "workDescriptor\022\014\n\004PLMN\030\001 \001(\r\022R\n\013networkT" + + "ype\030\002 \001(\0162=.openxc.NetworkOperatorSettin" + + "gs.NetworkDescriptor.NetworkType\"!\n\013Netw" + + "orkType\022\007\n\003GSM\020\000\022\t\n\005UTRAN\020\002\"c\n\022OperatorS" + + "electMode\022\r\n\tAUTOMATIC\020\000\022\n\n\006MANUAL\020\001\022\016\n\n" + + "DEREGISTER\020\002\022\014\n\010SET_ONLY\020\003\022\024\n\020MANUAL_AUT" + + "OMATIC\020\004\"\"\n\023NetworkDataSettings\022\013\n\003APN\030\001" + + " \001(\t\"3\n\025ServerConnectSettings\022\014\n\004host\030\001 ", + "\001(\t\022\014\n\004port\030\002 \001(\r\"\325\001\n\031ModemConfiguration" + + "Command\022@\n\027networkOperatorSettings\030\001 \001(\013" + + "2\037.openxc.NetworkOperatorSettings\0228\n\023net" + + "workDataSettings\030\002 \001(\0132\033.openxc.NetworkD" + + "ataSettings\022<\n\025serverConnectSettings\030\003 \001" + + "(\0132\035.openxc.ServerConnectSettings\",\n\027RTC" + + "ConfigurationCommand\022\021\n\tunix_time\030\001 \001(\r\"" + + "]\n\017CommandResponse\022)\n\004type\030\001 \001(\0162\033.openx" + + "c.ControlCommand.Type\022\017\n\007message\030\002 \001(\t\022\016" + + "\n\006status\030\003 \001(\010\"\375\001\n\021DiagnosticRequest\022\013\n\003", + "bus\030\001 \001(\005\022\022\n\nmessage_id\030\002 \001(\r\022\014\n\004mode\030\003 " + + "\001(\r\022\013\n\003pid\030\004 \001(\r\022\017\n\007payload\030\005 \001(\014\022\032\n\022mul" + + "tiple_responses\030\006 \001(\010\022\021\n\tfrequency\030\007 \001(\001" + + "\022\014\n\004name\030\010 \001(\t\022;\n\014decoded_type\030\t \001(\0162%.o" + + "penxc.DiagnosticRequest.DecodedType\"!\n\013D" + + "ecodedType\022\010\n\004NONE\020\001\022\010\n\004OBD2\020\002\"\241\001\n\022Diagn" + + "osticResponse\022\013\n\003bus\030\001 \001(\005\022\022\n\nmessage_id" + + "\030\002 \001(\r\022\014\n\004mode\030\003 \001(\r\022\013\n\003pid\030\004 \001(\r\022\017\n\007suc" + + "cess\030\005 \001(\010\022\036\n\026negative_response_code\030\006 \001" + + "(\r\022\017\n\007payload\030\007 \001(\014\022\r\n\005value\030\010 \001(\001\"\242\001\n\014D", + "ynamicField\022\'\n\004type\030\001 \001(\0162\031.openxc.Dynam" + + "icField.Type\022\024\n\014string_value\030\002 \001(\t\022\025\n\rnu" + + "meric_value\030\003 \001(\001\022\025\n\rboolean_value\030\004 \001(\010" + + "\"%\n\004Type\022\n\n\006STRING\020\001\022\007\n\003NUM\020\002\022\010\n\004BOOL\020\003\"" + + "g\n\rSimpleMessage\022\014\n\004name\030\001 \001(\t\022#\n\005value\030" + + "\002 \001(\0132\024.openxc.DynamicField\022#\n\005event\030\003 \001" + + "(\0132\024.openxc.DynamicFieldB\034\n\ncom.openxcB\016" + + "BinaryMessages" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { diff --git a/gen/python/openxc_pb2.py b/gen/python/openxc_pb2.py index 718231b8..cd5ec5f0 100644 --- a/gen/python/openxc_pb2.py +++ b/gen/python/openxc_pb2.py @@ -11,7 +11,7 @@ from google.protobuf import descriptor_pb2 DESCRIPTOR = descriptor.FileDescriptor( name='openxc.proto', package='openxc', - serialized_pb='\n\x0copenxc.proto\x12\x06openxc\"\x9b\x03\n\x0eVehicleMessage\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.VehicleMessage.Type\x12\'\n\x0b\x63\x61n_message\x18\x02 \x01(\x0b\x32\x12.openxc.CanMessage\x12-\n\x0esimple_message\x18\x03 \x01(\x0b\x32\x15.openxc.SimpleMessage\x12\x37\n\x13\x64iagnostic_response\x18\x04 \x01(\x0b\x32\x1a.openxc.DiagnosticResponse\x12/\n\x0f\x63ontrol_command\x18\x05 \x01(\x0b\x32\x16.openxc.ControlCommand\x12\x31\n\x10\x63ommand_response\x18\x06 \x01(\x0b\x32\x17.openxc.CommandResponse\x12\x11\n\ttimestamp\x18\x07 \x01(\x04\"V\n\x04Type\x12\x07\n\x03\x43\x41N\x10\x01\x12\n\n\x06SIMPLE\x10\x02\x12\x0e\n\nDIAGNOSTIC\x10\x03\x12\x13\n\x0f\x43ONTROL_COMMAND\x10\x04\x12\x14\n\x10\x43OMMAND_RESPONSE\x10\x05\"\x94\x01\n\nCanMessage\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\n\n\x02id\x18\x02 \x01(\r\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x0c\x12\x34\n\x0c\x66rame_format\x18\x04 \x01(\x0e\x32\x1e.openxc.CanMessage.FrameFormat\")\n\x0b\x46rameFormat\x12\x0c\n\x08STANDARD\x10\x01\x12\x0c\n\x08\x45XTENDED\x10\x02\"\x89\x06\n\x0e\x43ontrolCommand\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.ControlCommand.Type\x12<\n\x12\x64iagnostic_request\x18\x02 \x01(\x0b\x32 .openxc.DiagnosticControlCommand\x12G\n\x18passthrough_mode_request\x18\x03 \x01(\x0b\x32%.openxc.PassthroughModeControlCommand\x12O\n acceptance_filter_bypass_command\x18\x04 \x01(\x0b\x32%.openxc.AcceptanceFilterBypassCommand\x12<\n\x16payload_format_command\x18\x05 \x01(\x0b\x32\x1c.openxc.PayloadFormatCommand\x12O\n predefined_obd2_requests_command\x18\x06 \x01(\x0b\x32%.openxc.PredefinedObd2RequestsCommand\x12\x46\n\x1bmodem_configuration_command\x18\x07 \x01(\x0b\x32!.openxc.ModemConfigurationCommand\x12\x42\n\x19rtc_configuration_command\x18\x08 \x01(\x0b\x32\x1f.openxc.RTCConfigurationCommand\"\xd8\x01\n\x04Type\x12\x0b\n\x07VERSION\x10\x01\x12\r\n\tDEVICE_ID\x10\x02\x12\x0e\n\nDIAGNOSTIC\x10\x03\x12\x0f\n\x0bPASSTHROUGH\x10\x04\x12\x1c\n\x18\x41\x43\x43\x45PTANCE_FILTER_BYPASS\x10\x05\x12\x12\n\x0ePAYLOAD_FORMAT\x10\x06\x12\x1c\n\x18PREDEFINED_OBD2_REQUESTS\x10\x07\x12\x17\n\x13MODEM_CONFIGURATION\x10\x08\x12\x15\n\x11RTC_CONFIGURATION\x10\t\x12\x13\n\x0fSD_MOUNT_STATUS\x10\n\"\x9e\x01\n\x18\x44iagnosticControlCommand\x12*\n\x07request\x18\x01 \x01(\x0b\x32\x19.openxc.DiagnosticRequest\x12\x37\n\x06\x61\x63tion\x18\x02 \x01(\x0e\x32\'.openxc.DiagnosticControlCommand.Action\"\x1d\n\x06\x41\x63tion\x12\x07\n\x03\x41\x44\x44\x10\x01\x12\n\n\x06\x43\x41NCEL\x10\x02\"=\n\x1dPassthroughModeControlCommand\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x0f\n\x07\x65nabled\x18\x02 \x01(\x08\"<\n\x1d\x41\x63\x63\x65ptanceFilterBypassCommand\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x0e\n\x06\x62ypass\x18\x02 \x01(\x08\"\x8c\x01\n\x14PayloadFormatCommand\x12:\n\x06\x66ormat\x18\x01 \x01(\x0e\x32*.openxc.PayloadFormatCommand.PayloadFormat\"8\n\rPayloadFormat\x12\x08\n\x04JSON\x10\x01\x12\x0c\n\x08PROTOBUF\x10\x02\x12\x0f\n\x0bMESSAGEPACK\x10\x03\"0\n\x1dPredefinedObd2RequestsCommand\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\"\xd1\x03\n\x17NetworkOperatorSettings\x12\x18\n\x10\x61llowDataRoaming\x18\x01 \x01(\x08\x12N\n\x12operatorSelectMode\x18\x02 \x01(\x0e\x32\x32.openxc.NetworkOperatorSettings.OperatorSelectMode\x12L\n\x11networkDescriptor\x18\x03 \x01(\x0b\x32\x31.openxc.NetworkOperatorSettings.NetworkDescriptor\x1a\x98\x01\n\x11NetworkDescriptor\x12\x0c\n\x04PLMN\x18\x01 \x01(\r\x12R\n\x0bnetworkType\x18\x02 \x01(\x0e\x32=.openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType\"!\n\x0bNetworkType\x12\x07\n\x03GSM\x10\x00\x12\t\n\x05UTRAN\x10\x02\"c\n\x12OperatorSelectMode\x12\r\n\tAUTOMATIC\x10\x00\x12\n\n\x06MANUAL\x10\x01\x12\x0e\n\nDEREGISTER\x10\x02\x12\x0c\n\x08SET_ONLY\x10\x03\x12\x14\n\x10MANUAL_AUTOMATIC\x10\x04\"\"\n\x13NetworkDataSettings\x12\x0b\n\x03\x41PN\x18\x01 \x01(\t\"3\n\x15ServerConnectSettings\x12\x0c\n\x04host\x18\x01 \x01(\t\x12\x0c\n\x04port\x18\x02 \x01(\r\"\xd5\x01\n\x19ModemConfigurationCommand\x12@\n\x17networkOperatorSettings\x18\x01 \x01(\x0b\x32\x1f.openxc.NetworkOperatorSettings\x12\x38\n\x13networkDataSettings\x18\x02 \x01(\x0b\x32\x1b.openxc.NetworkDataSettings\x12<\n\x15serverConnectSettings\x18\x03 \x01(\x0b\x32\x1d.openxc.ServerConnectSettings\",\n\x17RTCConfigurationCommand\x12\x11\n\tunix_time\x18\x01 \x01(\r\"]\n\x0f\x43ommandResponse\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.ControlCommand.Type\x12\x0f\n\x07message\x18\x02 \x01(\t\x12\x0e\n\x06status\x18\x03 \x01(\x08\"\xfd\x01\n\x11\x44iagnosticRequest\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04mode\x18\x03 \x01(\r\x12\x0b\n\x03pid\x18\x04 \x01(\r\x12\x0f\n\x07payload\x18\x05 \x01(\x0c\x12\x1a\n\x12multiple_responses\x18\x06 \x01(\x08\x12\x11\n\tfrequency\x18\x07 \x01(\x01\x12\x0c\n\x04name\x18\x08 \x01(\t\x12;\n\x0c\x64\x65\x63oded_type\x18\t \x01(\x0e\x32%.openxc.DiagnosticRequest.DecodedType\"!\n\x0b\x44\x65\x63odedType\x12\x08\n\x04NONE\x10\x01\x12\x08\n\x04OBD2\x10\x02\"\xa1\x01\n\x12\x44iagnosticResponse\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04mode\x18\x03 \x01(\r\x12\x0b\n\x03pid\x18\x04 \x01(\r\x12\x0f\n\x07success\x18\x05 \x01(\x08\x12\x1e\n\x16negative_response_code\x18\x06 \x01(\r\x12\x0f\n\x07payload\x18\x07 \x01(\x0c\x12\r\n\x05value\x18\x08 \x01(\x01\"\xa2\x01\n\x0c\x44ynamicField\x12\'\n\x04type\x18\x01 \x01(\x0e\x32\x19.openxc.DynamicField.Type\x12\x14\n\x0cstring_value\x18\x02 \x01(\t\x12\x15\n\rnumeric_value\x18\x03 \x01(\x01\x12\x15\n\rboolean_value\x18\x04 \x01(\x08\"%\n\x04Type\x12\n\n\x06STRING\x10\x01\x12\x07\n\x03NUM\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\"g\n\rSimpleMessage\x12\x0c\n\x04name\x18\x01 \x01(\t\x12#\n\x05value\x18\x02 \x01(\x0b\x32\x14.openxc.DynamicField\x12#\n\x05\x65vent\x18\x03 \x01(\x0b\x32\x14.openxc.DynamicFieldB\x1c\n\ncom.openxcB\x0e\x42inaryMessages') + serialized_pb='\n\x0copenxc.proto\x12\x06openxc\"\x9b\x03\n\x0eVehicleMessage\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.VehicleMessage.Type\x12\'\n\x0b\x63\x61n_message\x18\x02 \x01(\x0b\x32\x12.openxc.CanMessage\x12-\n\x0esimple_message\x18\x03 \x01(\x0b\x32\x15.openxc.SimpleMessage\x12\x37\n\x13\x64iagnostic_response\x18\x04 \x01(\x0b\x32\x1a.openxc.DiagnosticResponse\x12/\n\x0f\x63ontrol_command\x18\x05 \x01(\x0b\x32\x16.openxc.ControlCommand\x12\x31\n\x10\x63ommand_response\x18\x06 \x01(\x0b\x32\x17.openxc.CommandResponse\x12\x11\n\ttimestamp\x18\x07 \x01(\x04\"V\n\x04Type\x12\x07\n\x03\x43\x41N\x10\x01\x12\n\n\x06SIMPLE\x10\x02\x12\x0e\n\nDIAGNOSTIC\x10\x03\x12\x13\n\x0f\x43ONTROL_COMMAND\x10\x04\x12\x14\n\x10\x43OMMAND_RESPONSE\x10\x05\"\x94\x01\n\nCanMessage\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\n\n\x02id\x18\x02 \x01(\r\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x0c\x12\x34\n\x0c\x66rame_format\x18\x04 \x01(\x0e\x32\x1e.openxc.CanMessage.FrameFormat\")\n\x0b\x46rameFormat\x12\x0c\n\x08STANDARD\x10\x01\x12\x0c\n\x08\x45XTENDED\x10\x02\"\x97\x06\n\x0e\x43ontrolCommand\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.ControlCommand.Type\x12<\n\x12\x64iagnostic_request\x18\x02 \x01(\x0b\x32 .openxc.DiagnosticControlCommand\x12G\n\x18passthrough_mode_request\x18\x03 \x01(\x0b\x32%.openxc.PassthroughModeControlCommand\x12O\n acceptance_filter_bypass_command\x18\x04 \x01(\x0b\x32%.openxc.AcceptanceFilterBypassCommand\x12<\n\x16payload_format_command\x18\x05 \x01(\x0b\x32\x1c.openxc.PayloadFormatCommand\x12O\n predefined_obd2_requests_command\x18\x06 \x01(\x0b\x32%.openxc.PredefinedObd2RequestsCommand\x12\x46\n\x1bmodem_configuration_command\x18\x07 \x01(\x0b\x32!.openxc.ModemConfigurationCommand\x12\x42\n\x19rtc_configuration_command\x18\x08 \x01(\x0b\x32\x1f.openxc.RTCConfigurationCommand\"\xe6\x01\n\x04Type\x12\x0b\n\x07VERSION\x10\x01\x12\r\n\tDEVICE_ID\x10\x02\x12\x0e\n\nDIAGNOSTIC\x10\x03\x12\x0f\n\x0bPASSTHROUGH\x10\x04\x12\x1c\n\x18\x41\x43\x43\x45PTANCE_FILTER_BYPASS\x10\x05\x12\x12\n\x0ePAYLOAD_FORMAT\x10\x06\x12\x1c\n\x18PREDEFINED_OBD2_REQUESTS\x10\x07\x12\x17\n\x13MODEM_CONFIGURATION\x10\x08\x12\x15\n\x11RTC_CONFIGURATION\x10\t\x12\x13\n\x0fSD_MOUNT_STATUS\x10\n\x12\x0c\n\x08PLATFORM\x10\x0b\"\x9e\x01\n\x18\x44iagnosticControlCommand\x12*\n\x07request\x18\x01 \x01(\x0b\x32\x19.openxc.DiagnosticRequest\x12\x37\n\x06\x61\x63tion\x18\x02 \x01(\x0e\x32\'.openxc.DiagnosticControlCommand.Action\"\x1d\n\x06\x41\x63tion\x12\x07\n\x03\x41\x44\x44\x10\x01\x12\n\n\x06\x43\x41NCEL\x10\x02\"=\n\x1dPassthroughModeControlCommand\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x0f\n\x07\x65nabled\x18\x02 \x01(\x08\"<\n\x1d\x41\x63\x63\x65ptanceFilterBypassCommand\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x0e\n\x06\x62ypass\x18\x02 \x01(\x08\"\x8c\x01\n\x14PayloadFormatCommand\x12:\n\x06\x66ormat\x18\x01 \x01(\x0e\x32*.openxc.PayloadFormatCommand.PayloadFormat\"8\n\rPayloadFormat\x12\x08\n\x04JSON\x10\x01\x12\x0c\n\x08PROTOBUF\x10\x02\x12\x0f\n\x0bMESSAGEPACK\x10\x03\"0\n\x1dPredefinedObd2RequestsCommand\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08\"\xd1\x03\n\x17NetworkOperatorSettings\x12\x18\n\x10\x61llowDataRoaming\x18\x01 \x01(\x08\x12N\n\x12operatorSelectMode\x18\x02 \x01(\x0e\x32\x32.openxc.NetworkOperatorSettings.OperatorSelectMode\x12L\n\x11networkDescriptor\x18\x03 \x01(\x0b\x32\x31.openxc.NetworkOperatorSettings.NetworkDescriptor\x1a\x98\x01\n\x11NetworkDescriptor\x12\x0c\n\x04PLMN\x18\x01 \x01(\r\x12R\n\x0bnetworkType\x18\x02 \x01(\x0e\x32=.openxc.NetworkOperatorSettings.NetworkDescriptor.NetworkType\"!\n\x0bNetworkType\x12\x07\n\x03GSM\x10\x00\x12\t\n\x05UTRAN\x10\x02\"c\n\x12OperatorSelectMode\x12\r\n\tAUTOMATIC\x10\x00\x12\n\n\x06MANUAL\x10\x01\x12\x0e\n\nDEREGISTER\x10\x02\x12\x0c\n\x08SET_ONLY\x10\x03\x12\x14\n\x10MANUAL_AUTOMATIC\x10\x04\"\"\n\x13NetworkDataSettings\x12\x0b\n\x03\x41PN\x18\x01 \x01(\t\"3\n\x15ServerConnectSettings\x12\x0c\n\x04host\x18\x01 \x01(\t\x12\x0c\n\x04port\x18\x02 \x01(\r\"\xd5\x01\n\x19ModemConfigurationCommand\x12@\n\x17networkOperatorSettings\x18\x01 \x01(\x0b\x32\x1f.openxc.NetworkOperatorSettings\x12\x38\n\x13networkDataSettings\x18\x02 \x01(\x0b\x32\x1b.openxc.NetworkDataSettings\x12<\n\x15serverConnectSettings\x18\x03 \x01(\x0b\x32\x1d.openxc.ServerConnectSettings\",\n\x17RTCConfigurationCommand\x12\x11\n\tunix_time\x18\x01 \x01(\r\"]\n\x0f\x43ommandResponse\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.ControlCommand.Type\x12\x0f\n\x07message\x18\x02 \x01(\t\x12\x0e\n\x06status\x18\x03 \x01(\x08\"\xfd\x01\n\x11\x44iagnosticRequest\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04mode\x18\x03 \x01(\r\x12\x0b\n\x03pid\x18\x04 \x01(\r\x12\x0f\n\x07payload\x18\x05 \x01(\x0c\x12\x1a\n\x12multiple_responses\x18\x06 \x01(\x08\x12\x11\n\tfrequency\x18\x07 \x01(\x01\x12\x0c\n\x04name\x18\x08 \x01(\t\x12;\n\x0c\x64\x65\x63oded_type\x18\t \x01(\x0e\x32%.openxc.DiagnosticRequest.DecodedType\"!\n\x0b\x44\x65\x63odedType\x12\x08\n\x04NONE\x10\x01\x12\x08\n\x04OBD2\x10\x02\"\xa1\x01\n\x12\x44iagnosticResponse\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04mode\x18\x03 \x01(\r\x12\x0b\n\x03pid\x18\x04 \x01(\r\x12\x0f\n\x07success\x18\x05 \x01(\x08\x12\x1e\n\x16negative_response_code\x18\x06 \x01(\r\x12\x0f\n\x07payload\x18\x07 \x01(\x0c\x12\r\n\x05value\x18\x08 \x01(\x01\"\xa2\x01\n\x0c\x44ynamicField\x12\'\n\x04type\x18\x01 \x01(\x0e\x32\x19.openxc.DynamicField.Type\x12\x14\n\x0cstring_value\x18\x02 \x01(\t\x12\x15\n\rnumeric_value\x18\x03 \x01(\x01\x12\x15\n\rboolean_value\x18\x04 \x01(\x08\"%\n\x04Type\x12\n\n\x06STRING\x10\x01\x12\x07\n\x03NUM\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\"g\n\rSimpleMessage\x12\x0c\n\x04name\x18\x01 \x01(\t\x12#\n\x05value\x18\x02 \x01(\x0b\x32\x14.openxc.DynamicField\x12#\n\x05\x65vent\x18\x03 \x01(\x0b\x32\x14.openxc.DynamicFieldB\x1c\n\ncom.openxcB\x0e\x42inaryMessages') @@ -115,11 +115,15 @@ _CONTROLCOMMAND_TYPE = descriptor.EnumDescriptor( name='SD_MOUNT_STATUS', index=9, number=10, options=None, type=None), + descriptor.EnumValueDescriptor( + name='PLATFORM', index=10, number=11, + options=None, + type=None), ], containing_type=None, options=None, serialized_start=1151, - serialized_end=1367, + serialized_end=1381, ) _DIAGNOSTICCONTROLCOMMAND_ACTION = descriptor.EnumDescriptor( @@ -139,8 +143,8 @@ _DIAGNOSTICCONTROLCOMMAND_ACTION = descriptor.EnumDescriptor( ], containing_type=None, options=None, - serialized_start=1499, - serialized_end=1528, + serialized_start=1513, + serialized_end=1542, ) _PAYLOADFORMATCOMMAND_PAYLOADFORMAT = descriptor.EnumDescriptor( @@ -164,8 +168,8 @@ _PAYLOADFORMATCOMMAND_PAYLOADFORMAT = descriptor.EnumDescriptor( ], containing_type=None, options=None, - serialized_start=1740, - serialized_end=1796, + serialized_start=1754, + serialized_end=1810, ) _NETWORKOPERATORSETTINGS_NETWORKDESCRIPTOR_NETWORKTYPE = descriptor.EnumDescriptor( @@ -185,8 +189,8 @@ _NETWORKOPERATORSETTINGS_NETWORKDESCRIPTOR_NETWORKTYPE = descriptor.EnumDescript ], containing_type=None, options=None, - serialized_start=2180, - serialized_end=2213, + serialized_start=2194, + serialized_end=2227, ) _NETWORKOPERATORSETTINGS_OPERATORSELECTMODE = descriptor.EnumDescriptor( @@ -218,8 +222,8 @@ _NETWORKOPERATORSETTINGS_OPERATORSELECTMODE = descriptor.EnumDescriptor( ], containing_type=None, options=None, - serialized_start=2215, - serialized_end=2314, + serialized_start=2229, + serialized_end=2328, ) _DIAGNOSTICREQUEST_DECODEDTYPE = descriptor.EnumDescriptor( @@ -239,8 +243,8 @@ _DIAGNOSTICREQUEST_DECODEDTYPE = descriptor.EnumDescriptor( ], containing_type=None, options=None, - serialized_start=2983, - serialized_end=3016, + serialized_start=2997, + serialized_end=3030, ) _DYNAMICFIELD_TYPE = descriptor.EnumDescriptor( @@ -264,8 +268,8 @@ _DYNAMICFIELD_TYPE = descriptor.EnumDescriptor( ], containing_type=None, options=None, - serialized_start=3308, - serialized_end=3345, + serialized_start=3322, + serialized_end=3359, ) @@ -464,7 +468,7 @@ _CONTROLCOMMAND = descriptor.Descriptor( is_extendable=False, extension_ranges=[], serialized_start=590, - serialized_end=1367, + serialized_end=1381, ) @@ -499,8 +503,8 @@ _DIAGNOSTICCONTROLCOMMAND = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=1370, - serialized_end=1528, + serialized_start=1384, + serialized_end=1542, ) @@ -534,8 +538,8 @@ _PASSTHROUGHMODECONTROLCOMMAND = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=1530, - serialized_end=1591, + serialized_start=1544, + serialized_end=1605, ) @@ -569,8 +573,8 @@ _ACCEPTANCEFILTERBYPASSCOMMAND = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=1593, - serialized_end=1653, + serialized_start=1607, + serialized_end=1667, ) @@ -598,8 +602,8 @@ _PAYLOADFORMATCOMMAND = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=1656, - serialized_end=1796, + serialized_start=1670, + serialized_end=1810, ) @@ -626,8 +630,8 @@ _PREDEFINEDOBD2REQUESTSCOMMAND = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=1798, - serialized_end=1846, + serialized_start=1812, + serialized_end=1860, ) @@ -662,8 +666,8 @@ _NETWORKOPERATORSETTINGS_NETWORKDESCRIPTOR = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=2061, - serialized_end=2213, + serialized_start=2075, + serialized_end=2227, ) _NETWORKOPERATORSETTINGS = descriptor.Descriptor( @@ -704,8 +708,8 @@ _NETWORKOPERATORSETTINGS = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=1849, - serialized_end=2314, + serialized_start=1863, + serialized_end=2328, ) @@ -732,8 +736,8 @@ _NETWORKDATASETTINGS = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=2316, - serialized_end=2350, + serialized_start=2330, + serialized_end=2364, ) @@ -767,8 +771,8 @@ _SERVERCONNECTSETTINGS = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=2352, - serialized_end=2403, + serialized_start=2366, + serialized_end=2417, ) @@ -809,8 +813,8 @@ _MODEMCONFIGURATIONCOMMAND = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=2406, - serialized_end=2619, + serialized_start=2420, + serialized_end=2633, ) @@ -837,8 +841,8 @@ _RTCCONFIGURATIONCOMMAND = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=2621, - serialized_end=2665, + serialized_start=2635, + serialized_end=2679, ) @@ -879,8 +883,8 @@ _COMMANDRESPONSE = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=2667, - serialized_end=2760, + serialized_start=2681, + serialized_end=2774, ) @@ -964,8 +968,8 @@ _DIAGNOSTICREQUEST = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=2763, - serialized_end=3016, + serialized_start=2777, + serialized_end=3030, ) @@ -1041,8 +1045,8 @@ _DIAGNOSTICRESPONSE = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=3019, - serialized_end=3180, + serialized_start=3033, + serialized_end=3194, ) @@ -1091,8 +1095,8 @@ _DYNAMICFIELD = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=3183, - serialized_end=3345, + serialized_start=3197, + serialized_end=3359, ) @@ -1133,8 +1137,8 @@ _SIMPLEMESSAGE = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=3347, - serialized_end=3450, + serialized_start=3361, + serialized_end=3464, ) _VEHICLEMESSAGE.fields_by_name['type'].enum_type = _VEHICLEMESSAGE_TYPE diff --git a/openxc.proto b/openxc.proto index 80ffc507..db7164ff 100644 --- a/openxc.proto +++ b/openxc.proto @@ -39,6 +39,7 @@ message ControlCommand { MODEM_CONFIGURATION = 8; RTC_CONFIGURATION = 9; SD_MOUNT_STATUS = 10; + PLATFORM = 11; } optional Type type = 1; |