aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md12
-rw-r--r--gen/cpp/openxc.pb19
-rw-r--r--gen/cpp/openxc.pb.c12
-rw-r--r--gen/cpp/openxc.pb.h42
-rw-r--r--gen/java/com/openxc/BinaryMessages.java438
-rw-r--r--gen/python/openxc_pb2.py74
-rw-r--r--openxc.proto12
7 files changed, 304 insertions, 305 deletions
diff --git a/README.md b/README.md
index 2cde1305..e127543f 100644
--- a/README.md
+++ b/README.md
@@ -328,16 +328,16 @@ changed.
{ "command_response": "af_bypass", "status": true}
-#### Message Format Control
+#### Payload Format Control
-The `message_format` command determines the format for output data from the VI
-and also the expected format of commands sent to the VI.
+The `payload_format` command determines the format for output data from the VI
+and the expected format of commands sent to the VI.
-Valid formats are `json` and `binary`.
+Valid formats are `json` and `protobuf`.
**Request**
- { "command": "message_format",
+ { "command": "payload_format",
"format": "json"
}
@@ -347,7 +347,7 @@ If the format was changed successfully, the `status` in the response will be
`true`. The response will be in the original message format, and all subsequent
messages will be in the new format.
- { "command_response": "message_format", "status": true}
+ { "command_response": "payload_format", "status": true}
### Trace File Format
diff --git a/gen/cpp/openxc.pb b/gen/cpp/openxc.pb
index 5b90df96..716d2689 100644
--- a/gen/cpp/openxc.pb
+++ b/gen/cpp/openxc.pb
@@ -1,5 +1,5 @@
-
+
openxc.protoopenxc"
VehicleMessage)
type (2.openxc.VehicleMessage.Type'
@@ -27,7 +27,7 @@ message_id ( 
diagnostic_request ( 2 .openxc.DiagnosticControlCommandG
passthrough_mode_request ( 2%.openxc.PassthroughModeControlCommandO
acceptance_filter_bypass_command ( 2%.openxc.AcceptanceFilterBypassCommand<
-message_format_command ( 2.openxc.MessageFormatCommand"u
+payload_format_command ( 2.openxc.PayloadFormatCommand"u
Type
VERSION
DEVICE_ID
@@ -35,7 +35,7 @@ message_id ( 
DIAGNOSTIC
PASSTHROUGH
ACCEPTANCE_FILTER_BYPASS
-MESSAGE_FORMAT"
+PAYLOAD_FORMAT"
DiagnosticControlCommand*
request ( 2.openxc.DiagnosticRequest7
action (2'.openxc.DiagnosticControlCommand.Action"
@@ -48,13 +48,12 @@ DIAGNOSTIC
enabled ("<
AcceptanceFilterBypassCommand
bus (
-bypass ("y
-MessageFormatCommand:
-format (2*.openxc.MessageFormatCommand.MessageFormat"%
- MessageFormat
-JSON
-
-BINARY"]
+bypass ("{
+PayloadFormatCommand:
+format (2*.openxc.PayloadFormatCommand.PayloadFormat"'
+ PayloadFormat
+JSON
+PROTOBUF"]
CommandResponse)
type (2.openxc.ControlCommand.Type
message ( 
diff --git a/gen/cpp/openxc.pb.c b/gen/cpp/openxc.pb.c
index 0c04bc4f..ffc0ec66 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 Sat Sep 27 20:17:56 2014. */
+/* Generated by nanopb-0.3.1 at Sat Sep 27 21:46:00 2014. */
#include "openxc.pb.h"
@@ -31,7 +31,7 @@ const pb_field_t openxc_ControlCommand_fields[6] = {
PB_FIELD( 2, MESSAGE , OPTIONAL, STATIC , OTHER, openxc_ControlCommand, diagnostic_request, type, &openxc_DiagnosticControlCommand_fields),
PB_FIELD( 3, MESSAGE , OPTIONAL, STATIC , OTHER, openxc_ControlCommand, passthrough_mode_request, diagnostic_request, &openxc_PassthroughModeControlCommand_fields),
PB_FIELD( 4, MESSAGE , OPTIONAL, STATIC , OTHER, openxc_ControlCommand, acceptance_filter_bypass_command, passthrough_mode_request, &openxc_AcceptanceFilterBypassCommand_fields),
- PB_FIELD( 5, MESSAGE , OPTIONAL, STATIC , OTHER, openxc_ControlCommand, message_format_command, acceptance_filter_bypass_command, &openxc_MessageFormatCommand_fields),
+ PB_FIELD( 5, MESSAGE , OPTIONAL, STATIC , OTHER, openxc_ControlCommand, payload_format_command, acceptance_filter_bypass_command, &openxc_PayloadFormatCommand_fields),
PB_LAST_FIELD
};
@@ -53,8 +53,8 @@ const pb_field_t openxc_AcceptanceFilterBypassCommand_fields[3] = {
PB_LAST_FIELD
};
-const pb_field_t openxc_MessageFormatCommand_fields[2] = {
- PB_FIELD( 1, ENUM , OPTIONAL, STATIC , FIRST, openxc_MessageFormatCommand, format, format, 0),
+const pb_field_t openxc_PayloadFormatCommand_fields[2] = {
+ PB_FIELD( 1, ENUM , OPTIONAL, STATIC , FIRST, openxc_PayloadFormatCommand, format, format, 0),
PB_LAST_FIELD
};
@@ -116,7 +116,7 @@ const pb_field_t openxc_TranslatedMessage_fields[5] = {
* numbers or field sizes that are larger than what can fit in 8 or 16 bit
* field descriptors.
*/
-PB_STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, raw_message) < 65536 && pb_membersize(openxc_VehicleMessage, translated_message) < 65536 && pb_membersize(openxc_VehicleMessage, diagnostic_response) < 65536 && pb_membersize(openxc_VehicleMessage, control_command) < 65536 && pb_membersize(openxc_VehicleMessage, command_response) < 65536 && pb_membersize(openxc_ControlCommand, diagnostic_request) < 65536 && pb_membersize(openxc_ControlCommand, passthrough_mode_request) < 65536 && pb_membersize(openxc_ControlCommand, acceptance_filter_bypass_command) < 65536 && pb_membersize(openxc_ControlCommand, message_format_command) < 65536 && pb_membersize(openxc_DiagnosticControlCommand, request) < 65536 && pb_membersize(openxc_TranslatedMessage, value) < 65536 && pb_membersize(openxc_TranslatedMessage, event) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_ControlCommand_openxc_DiagnosticControlCommand_openxc_PassthroughModeControlCommand_openxc_AcceptanceFilterBypassCommand_openxc_MessageFormatCommand_openxc_CommandResponse_openxc_DiagnosticRequest_openxc_DiagnosticResponse_openxc_DynamicField_openxc_TranslatedMessage)
+PB_STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, raw_message) < 65536 && pb_membersize(openxc_VehicleMessage, translated_message) < 65536 && pb_membersize(openxc_VehicleMessage, diagnostic_response) < 65536 && pb_membersize(openxc_VehicleMessage, control_command) < 65536 && pb_membersize(openxc_VehicleMessage, command_response) < 65536 && pb_membersize(openxc_ControlCommand, diagnostic_request) < 65536 && pb_membersize(openxc_ControlCommand, passthrough_mode_request) < 65536 && pb_membersize(openxc_ControlCommand, acceptance_filter_bypass_command) < 65536 && pb_membersize(openxc_ControlCommand, payload_format_command) < 65536 && pb_membersize(openxc_DiagnosticControlCommand, request) < 65536 && pb_membersize(openxc_TranslatedMessage, value) < 65536 && pb_membersize(openxc_TranslatedMessage, event) < 65536), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_ControlCommand_openxc_DiagnosticControlCommand_openxc_PassthroughModeControlCommand_openxc_AcceptanceFilterBypassCommand_openxc_PayloadFormatCommand_openxc_CommandResponse_openxc_DiagnosticRequest_openxc_DiagnosticResponse_openxc_DynamicField_openxc_TranslatedMessage)
#endif
#if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT)
@@ -127,7 +127,7 @@ PB_STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, raw_message) < 65536 && p
* numbers or field sizes that are larger than what can fit in the default
* 8 bit descriptors.
*/
-PB_STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, raw_message) < 256 && pb_membersize(openxc_VehicleMessage, translated_message) < 256 && pb_membersize(openxc_VehicleMessage, diagnostic_response) < 256 && pb_membersize(openxc_VehicleMessage, control_command) < 256 && pb_membersize(openxc_VehicleMessage, command_response) < 256 && pb_membersize(openxc_ControlCommand, diagnostic_request) < 256 && pb_membersize(openxc_ControlCommand, passthrough_mode_request) < 256 && pb_membersize(openxc_ControlCommand, acceptance_filter_bypass_command) < 256 && pb_membersize(openxc_ControlCommand, message_format_command) < 256 && pb_membersize(openxc_DiagnosticControlCommand, request) < 256 && pb_membersize(openxc_TranslatedMessage, value) < 256 && pb_membersize(openxc_TranslatedMessage, event) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_ControlCommand_openxc_DiagnosticControlCommand_openxc_PassthroughModeControlCommand_openxc_AcceptanceFilterBypassCommand_openxc_MessageFormatCommand_openxc_CommandResponse_openxc_DiagnosticRequest_openxc_DiagnosticResponse_openxc_DynamicField_openxc_TranslatedMessage)
+PB_STATIC_ASSERT((pb_membersize(openxc_VehicleMessage, raw_message) < 256 && pb_membersize(openxc_VehicleMessage, translated_message) < 256 && pb_membersize(openxc_VehicleMessage, diagnostic_response) < 256 && pb_membersize(openxc_VehicleMessage, control_command) < 256 && pb_membersize(openxc_VehicleMessage, command_response) < 256 && pb_membersize(openxc_ControlCommand, diagnostic_request) < 256 && pb_membersize(openxc_ControlCommand, passthrough_mode_request) < 256 && pb_membersize(openxc_ControlCommand, acceptance_filter_bypass_command) < 256 && pb_membersize(openxc_ControlCommand, payload_format_command) < 256 && pb_membersize(openxc_DiagnosticControlCommand, request) < 256 && pb_membersize(openxc_TranslatedMessage, value) < 256 && pb_membersize(openxc_TranslatedMessage, event) < 256), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_openxc_VehicleMessage_openxc_RawMessage_openxc_ControlCommand_openxc_DiagnosticControlCommand_openxc_PassthroughModeControlCommand_openxc_AcceptanceFilterBypassCommand_openxc_PayloadFormatCommand_openxc_CommandResponse_openxc_DiagnosticRequest_openxc_DiagnosticResponse_openxc_DynamicField_openxc_TranslatedMessage)
#endif
diff --git a/gen/cpp/openxc.pb.h b/gen/cpp/openxc.pb.h
index 2091dfaf..2df9a94b 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 Sat Sep 27 20:17:56 2014. */
+/* Generated by nanopb-0.3.1 at Sat Sep 27 21:46:00 2014. */
#ifndef PB_OPENXC_PB_H_INCLUDED
#define PB_OPENXC_PB_H_INCLUDED
@@ -28,7 +28,7 @@ typedef enum _openxc_ControlCommand_Type {
openxc_ControlCommand_Type_DIAGNOSTIC = 3,
openxc_ControlCommand_Type_PASSTHROUGH = 4,
openxc_ControlCommand_Type_ACCEPTANCE_FILTER_BYPASS = 5,
- openxc_ControlCommand_Type_MESSAGE_FORMAT = 6
+ openxc_ControlCommand_Type_PAYLOAD_FORMAT = 6
} openxc_ControlCommand_Type;
typedef enum _openxc_DiagnosticControlCommand_Action {
@@ -36,10 +36,10 @@ typedef enum _openxc_DiagnosticControlCommand_Action {
openxc_DiagnosticControlCommand_Action_CANCEL = 2
} openxc_DiagnosticControlCommand_Action;
-typedef enum _openxc_MessageFormatCommand_MessageFormat {
- openxc_MessageFormatCommand_MessageFormat_JSON = 1,
- openxc_MessageFormatCommand_MessageFormat_BINARY = 2
-} openxc_MessageFormatCommand_MessageFormat;
+typedef enum _openxc_PayloadFormatCommand_PayloadFormat {
+ openxc_PayloadFormatCommand_PayloadFormat_JSON = 1,
+ openxc_PayloadFormatCommand_PayloadFormat_PROTOBUF = 2
+} openxc_PayloadFormatCommand_PayloadFormat;
typedef enum _openxc_DiagnosticRequest_DecodedType {
openxc_DiagnosticRequest_DecodedType_NONE = 1,
@@ -133,11 +133,6 @@ typedef struct _openxc_DynamicField {
bool boolean_value;
} openxc_DynamicField;
-typedef struct _openxc_MessageFormatCommand {
- bool has_format;
- openxc_MessageFormatCommand_MessageFormat format;
-} openxc_MessageFormatCommand;
-
typedef struct _openxc_PassthroughModeControlCommand {
bool has_bus;
int32_t bus;
@@ -145,6 +140,11 @@ typedef struct _openxc_PassthroughModeControlCommand {
bool enabled;
} openxc_PassthroughModeControlCommand;
+typedef struct _openxc_PayloadFormatCommand {
+ bool has_format;
+ openxc_PayloadFormatCommand_PayloadFormat format;
+} openxc_PayloadFormatCommand;
+
typedef PB_BYTES_ARRAY_T(8) openxc_RawMessage_data_t;
typedef struct _openxc_RawMessage {
@@ -183,8 +183,8 @@ typedef struct _openxc_ControlCommand {
openxc_PassthroughModeControlCommand passthrough_mode_request;
bool has_acceptance_filter_bypass_command;
openxc_AcceptanceFilterBypassCommand acceptance_filter_bypass_command;
- bool has_message_format_command;
- openxc_MessageFormatCommand message_format_command;
+ bool has_payload_format_command;
+ openxc_PayloadFormatCommand payload_format_command;
} openxc_ControlCommand;
typedef struct _openxc_VehicleMessage {
@@ -207,11 +207,11 @@ typedef struct _openxc_VehicleMessage {
/* Initializer values for message structs */
#define openxc_VehicleMessage_init_default {false, (openxc_VehicleMessage_Type)0, false, openxc_RawMessage_init_default, false, openxc_TranslatedMessage_init_default, false, openxc_DiagnosticResponse_init_default, false, openxc_ControlCommand_init_default, false, openxc_CommandResponse_init_default}
#define openxc_RawMessage_init_default {false, 0, false, 0, false, {0, {0}}}
-#define openxc_ControlCommand_init_default {false, (openxc_ControlCommand_Type)0, false, openxc_DiagnosticControlCommand_init_default, false, openxc_PassthroughModeControlCommand_init_default, false, openxc_AcceptanceFilterBypassCommand_init_default, false, openxc_MessageFormatCommand_init_default}
+#define openxc_ControlCommand_init_default {false, (openxc_ControlCommand_Type)0, false, openxc_DiagnosticControlCommand_init_default, false, openxc_PassthroughModeControlCommand_init_default, false, openxc_AcceptanceFilterBypassCommand_init_default, false, openxc_PayloadFormatCommand_init_default}
#define openxc_DiagnosticControlCommand_init_default {false, openxc_DiagnosticRequest_init_default, false, (openxc_DiagnosticControlCommand_Action)0}
#define openxc_PassthroughModeControlCommand_init_default {false, 0, false, 0}
#define openxc_AcceptanceFilterBypassCommand_init_default {false, 0, false, 0}
-#define openxc_MessageFormatCommand_init_default {false, (openxc_MessageFormatCommand_MessageFormat)0}
+#define openxc_PayloadFormatCommand_init_default {false, (openxc_PayloadFormatCommand_PayloadFormat)0}
#define openxc_CommandResponse_init_default {false, (openxc_ControlCommand_Type)0, false, "", false, 0}
#define openxc_DiagnosticRequest_init_default {false, 0, false, 0, false, 0, false, 0, false, {0, {0}}, false, 0, false, 0, false, "", false, (openxc_DiagnosticRequest_DecodedType)0}
#define openxc_DiagnosticResponse_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, {0, {0}}, false, 0}
@@ -219,11 +219,11 @@ typedef struct _openxc_VehicleMessage {
#define openxc_TranslatedMessage_init_default {false, (openxc_TranslatedMessage_Type)0, false, "", false, openxc_DynamicField_init_default, false, openxc_DynamicField_init_default}
#define openxc_VehicleMessage_init_zero {false, (openxc_VehicleMessage_Type)0, false, openxc_RawMessage_init_zero, false, openxc_TranslatedMessage_init_zero, false, openxc_DiagnosticResponse_init_zero, false, openxc_ControlCommand_init_zero, false, openxc_CommandResponse_init_zero}
#define openxc_RawMessage_init_zero {false, 0, false, 0, false, {0, {0}}}
-#define openxc_ControlCommand_init_zero {false, (openxc_ControlCommand_Type)0, false, openxc_DiagnosticControlCommand_init_zero, false, openxc_PassthroughModeControlCommand_init_zero, false, openxc_AcceptanceFilterBypassCommand_init_zero, false, openxc_MessageFormatCommand_init_zero}
+#define openxc_ControlCommand_init_zero {false, (openxc_ControlCommand_Type)0, false, openxc_DiagnosticControlCommand_init_zero, false, openxc_PassthroughModeControlCommand_init_zero, false, openxc_AcceptanceFilterBypassCommand_init_zero, false, openxc_PayloadFormatCommand_init_zero}
#define openxc_DiagnosticControlCommand_init_zero {false, openxc_DiagnosticRequest_init_zero, false, (openxc_DiagnosticControlCommand_Action)0}
#define openxc_PassthroughModeControlCommand_init_zero {false, 0, false, 0}
#define openxc_AcceptanceFilterBypassCommand_init_zero {false, 0, false, 0}
-#define openxc_MessageFormatCommand_init_zero {false, (openxc_MessageFormatCommand_MessageFormat)0}
+#define openxc_PayloadFormatCommand_init_zero {false, (openxc_PayloadFormatCommand_PayloadFormat)0}
#define openxc_CommandResponse_init_zero {false, (openxc_ControlCommand_Type)0, false, "", false, 0}
#define openxc_DiagnosticRequest_init_zero {false, 0, false, 0, false, 0, false, 0, false, {0, {0}}, false, 0, false, 0, false, "", false, (openxc_DiagnosticRequest_DecodedType)0}
#define openxc_DiagnosticResponse_init_zero {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, {0, {0}}, false, 0}
@@ -257,9 +257,9 @@ typedef struct _openxc_VehicleMessage {
#define openxc_DynamicField_string_value_tag 2
#define openxc_DynamicField_numeric_value_tag 3
#define openxc_DynamicField_boolean_value_tag 4
-#define openxc_MessageFormatCommand_format_tag 1
#define openxc_PassthroughModeControlCommand_bus_tag 1
#define openxc_PassthroughModeControlCommand_enabled_tag 2
+#define openxc_PayloadFormatCommand_format_tag 1
#define openxc_RawMessage_bus_tag 1
#define openxc_RawMessage_message_id_tag 2
#define openxc_RawMessage_data_tag 3
@@ -273,7 +273,7 @@ typedef struct _openxc_VehicleMessage {
#define openxc_ControlCommand_diagnostic_request_tag 2
#define openxc_ControlCommand_passthrough_mode_request_tag 3
#define openxc_ControlCommand_acceptance_filter_bypass_command_tag 4
-#define openxc_ControlCommand_message_format_command_tag 5
+#define openxc_ControlCommand_payload_format_command_tag 5
#define openxc_VehicleMessage_type_tag 1
#define openxc_VehicleMessage_raw_message_tag 2
#define openxc_VehicleMessage_translated_message_tag 3
@@ -288,7 +288,7 @@ extern const pb_field_t openxc_ControlCommand_fields[6];
extern const pb_field_t openxc_DiagnosticControlCommand_fields[3];
extern const pb_field_t openxc_PassthroughModeControlCommand_fields[3];
extern const pb_field_t openxc_AcceptanceFilterBypassCommand_fields[3];
-extern const pb_field_t openxc_MessageFormatCommand_fields[2];
+extern const pb_field_t openxc_PayloadFormatCommand_fields[2];
extern const pb_field_t openxc_CommandResponse_fields[4];
extern const pb_field_t openxc_DiagnosticRequest_fields[10];
extern const pb_field_t openxc_DiagnosticResponse_fields[9];
@@ -302,7 +302,7 @@ extern const pb_field_t openxc_TranslatedMessage_fields[5];
#define openxc_DiagnosticControlCommand_size 76
#define openxc_PassthroughModeControlCommand_size 13
#define openxc_AcceptanceFilterBypassCommand_size 13
-#define openxc_MessageFormatCommand_size 6
+#define openxc_PayloadFormatCommand_size 6
#define openxc_CommandResponse_size 139
#define openxc_DiagnosticRequest_size 68
#define openxc_DiagnosticResponse_size 56
diff --git a/gen/java/com/openxc/BinaryMessages.java b/gen/java/com/openxc/BinaryMessages.java
index 902b0c30..bf424fbc 100644
--- a/gen/java/com/openxc/BinaryMessages.java
+++ b/gen/java/com/openxc/BinaryMessages.java
@@ -2098,19 +2098,19 @@ public final class BinaryMessages {
*/
com.openxc.BinaryMessages.AcceptanceFilterBypassCommandOrBuilder getAcceptanceFilterBypassCommandOrBuilder();
- // optional .openxc.MessageFormatCommand message_format_command = 5;
+ // optional .openxc.PayloadFormatCommand payload_format_command = 5;
/**
- * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+ * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
*/
- boolean hasMessageFormatCommand();
+ boolean hasPayloadFormatCommand();
/**
- * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+ * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
*/
- com.openxc.BinaryMessages.MessageFormatCommand getMessageFormatCommand();
+ com.openxc.BinaryMessages.PayloadFormatCommand getPayloadFormatCommand();
/**
- * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+ * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
*/
- com.openxc.BinaryMessages.MessageFormatCommandOrBuilder getMessageFormatCommandOrBuilder();
+ com.openxc.BinaryMessages.PayloadFormatCommandOrBuilder getPayloadFormatCommandOrBuilder();
}
/**
* Protobuf type {@code openxc.ControlCommand}
@@ -2214,14 +2214,14 @@ public final class BinaryMessages {
break;
}
case 42: {
- com.openxc.BinaryMessages.MessageFormatCommand.Builder subBuilder = null;
+ com.openxc.BinaryMessages.PayloadFormatCommand.Builder subBuilder = null;
if (((bitField0_ & 0x00000010) == 0x00000010)) {
- subBuilder = messageFormatCommand_.toBuilder();
+ subBuilder = payloadFormatCommand_.toBuilder();
}
- messageFormatCommand_ = input.readMessage(com.openxc.BinaryMessages.MessageFormatCommand.PARSER, extensionRegistry);
+ payloadFormatCommand_ = input.readMessage(com.openxc.BinaryMessages.PayloadFormatCommand.PARSER, extensionRegistry);
if (subBuilder != null) {
- subBuilder.mergeFrom(messageFormatCommand_);
- messageFormatCommand_ = subBuilder.buildPartial();
+ subBuilder.mergeFrom(payloadFormatCommand_);
+ payloadFormatCommand_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000010;
break;
@@ -2291,9 +2291,9 @@ public final class BinaryMessages {
*/
ACCEPTANCE_FILTER_BYPASS(4, 5),
/**
- * <code>MESSAGE_FORMAT = 6;</code>
+ * <code>PAYLOAD_FORMAT = 6;</code>
*/
- MESSAGE_FORMAT(5, 6),
+ PAYLOAD_FORMAT(5, 6),
;
/**
@@ -2317,9 +2317,9 @@ public final class BinaryMessages {
*/
public static final int ACCEPTANCE_FILTER_BYPASS_VALUE = 5;
/**
- * <code>MESSAGE_FORMAT = 6;</code>
+ * <code>PAYLOAD_FORMAT = 6;</code>
*/
- public static final int MESSAGE_FORMAT_VALUE = 6;
+ public static final int PAYLOAD_FORMAT_VALUE = 6;
public final int getNumber() { return value; }
@@ -2331,7 +2331,7 @@ public final class BinaryMessages {
case 3: return DIAGNOSTIC;
case 4: return PASSTHROUGH;
case 5: return ACCEPTANCE_FILTER_BYPASS;
- case 6: return MESSAGE_FORMAT;
+ case 6: return PAYLOAD_FORMAT;
default: return null;
}
}
@@ -2466,26 +2466,26 @@ public final class BinaryMessages {
return acceptanceFilterBypassCommand_;
}
- // optional .openxc.MessageFormatCommand message_format_command = 5;
- public static final int MESSAGE_FORMAT_COMMAND_FIELD_NUMBER = 5;
- private com.openxc.BinaryMessages.MessageFormatCommand messageFormatCommand_;
+ // optional .openxc.PayloadFormatCommand payload_format_command = 5;
+ public static final int PAYLOAD_FORMAT_COMMAND_FIELD_NUMBER = 5;
+ private com.openxc.BinaryMessages.PayloadFormatCommand payloadFormatCommand_;
/**
- * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+ * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
*/
- public boolean hasMessageFormatCommand() {
+ public boolean hasPayloadFormatCommand() {
return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
- * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+ * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
*/
- public com.openxc.BinaryMessages.MessageFormatCommand getMessageFormatCommand() {
- return messageFormatCommand_;
+ public com.openxc.BinaryMessages.PayloadFormatCommand getPayloadFormatCommand() {
+ return payloadFormatCommand_;
}
/**
- * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+ * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
*/
- public com.openxc.BinaryMessages.MessageFormatCommandOrBuilder getMessageFormatCommandOrBuilder() {
- return messageFormatCommand_;
+ public com.openxc.BinaryMessages.PayloadFormatCommandOrBuilder getPayloadFormatCommandOrBuilder() {
+ return payloadFormatCommand_;
}
private void initFields() {
@@ -2493,7 +2493,7 @@ public final class BinaryMessages {
diagnosticRequest_ = com.openxc.BinaryMessages.DiagnosticControlCommand.getDefaultInstance();
passthroughModeRequest_ = com.openxc.BinaryMessages.PassthroughModeControlCommand.getDefaultInstance();
acceptanceFilterBypassCommand_ = com.openxc.BinaryMessages.AcceptanceFilterBypassCommand.getDefaultInstance();
- messageFormatCommand_ = com.openxc.BinaryMessages.MessageFormatCommand.getDefaultInstance();
+ payloadFormatCommand_ = com.openxc.BinaryMessages.PayloadFormatCommand.getDefaultInstance();
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -2520,7 +2520,7 @@ public final class BinaryMessages {
output.writeMessage(4, acceptanceFilterBypassCommand_);
}
if (((bitField0_ & 0x00000010) == 0x00000010)) {
- output.writeMessage(5, messageFormatCommand_);
+ output.writeMessage(5, payloadFormatCommand_);
}
getUnknownFields().writeTo(output);
}
@@ -2549,7 +2549,7 @@ public final class BinaryMessages {
}
if (((bitField0_ & 0x00000010) == 0x00000010)) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(5, messageFormatCommand_);
+ .computeMessageSize(5, payloadFormatCommand_);
}
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
@@ -2662,7 +2662,7 @@ public final class BinaryMessages {
getDiagnosticRequestFieldBuilder();
getPassthroughModeRequestFieldBuilder();
getAcceptanceFilterBypassCommandFieldBuilder();
- getMessageFormatCommandFieldBuilder();
+ getPayloadFormatCommandFieldBuilder();
}
}
private static Builder create() {
@@ -2691,10 +2691,10 @@ public final class BinaryMessages {
acceptanceFilterBypassCommandBuilder_.clear();
}
bitField0_ = (bitField0_ & ~0x00000008);
- if (messageFormatCommandBuilder_ == null) {
- messageFormatCommand_ = com.openxc.BinaryMessages.MessageFormatCommand.getDefaultInstance();
+ if (payloadFormatCommandBuilder_ == null) {
+ payloadFormatCommand_ = com.openxc.BinaryMessages.PayloadFormatCommand.getDefaultInstance();
} else {
- messageFormatCommandBuilder_.clear();
+ payloadFormatCommandBuilder_.clear();
}
bitField0_ = (bitField0_ & ~0x00000010);
return this;
@@ -2756,10 +2756,10 @@ public final class BinaryMessages {
if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
to_bitField0_ |= 0x00000010;
}
- if (messageFormatCommandBuilder_ == null) {
- result.messageFormatCommand_ = messageFormatCommand_;
+ if (payloadFormatCommandBuilder_ == null) {
+ result.payloadFormatCommand_ = payloadFormatCommand_;
} else {
- result.messageFormatCommand_ = messageFormatCommandBuilder_.build();
+ result.payloadFormatCommand_ = payloadFormatCommandBuilder_.build();
}
result.bitField0_ = to_bitField0_;
onBuilt();
@@ -2789,8 +2789,8 @@ public final class BinaryMessages {
if (other.hasAcceptanceFilterBypassCommand()) {
mergeAcceptanceFilterBypassCommand(other.getAcceptanceFilterBypassCommand());
}
- if (other.hasMessageFormatCommand()) {
- mergeMessageFormatCommand(other.getMessageFormatCommand());
+ if (other.hasPayloadFormatCommand()) {
+ mergePayloadFormatCommand(other.getPayloadFormatCommand());
}
this.mergeUnknownFields(other.getUnknownFields());
return this;
@@ -3206,121 +3206,121 @@ public final class BinaryMessages {
return acceptanceFilterBypassCommandBuilder_;
}
- // optional .openxc.MessageFormatCommand message_format_command = 5;
- private com.openxc.BinaryMessages.MessageFormatCommand messageFormatCommand_ = com.openxc.BinaryMessages.MessageFormatCommand.getDefaultInstance();
+ // optional .openxc.PayloadFormatCommand payload_format_command = 5;
+ private com.openxc.BinaryMessages.PayloadFormatCommand payloadFormatCommand_ = com.openxc.BinaryMessages.PayloadFormatCommand.getDefaultInstance();
private com.google.protobuf.SingleFieldBuilder<
- com.openxc.BinaryMessages.MessageFormatCommand, com.openxc.BinaryMessages.MessageFormatCommand.Builder, com.openxc.BinaryMessages.MessageFormatCommandOrBuilder> messageFormatCommandBuilder_;
+ com.openxc.BinaryMessages.PayloadFormatCommand, com.openxc.BinaryMessages.PayloadFormatCommand.Builder, com.openxc.BinaryMessages.PayloadFormatCommandOrBuilder> payloadFormatCommandBuilder_;
/**
- * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+ * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
*/
- public boolean hasMessageFormatCommand() {
+ public boolean hasPayloadFormatCommand() {
return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
- * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+ * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
*/
- public com.openxc.BinaryMessages.MessageFormatCommand getMessageFormatCommand() {
- if (messageFormatCommandBuilder_ == null) {
- return messageFormatCommand_;
+ public com.openxc.BinaryMessages.PayloadFormatCommand getPayloadFormatCommand() {
+ if (payloadFormatCommandBuilder_ == null) {
+ return payloadFormatCommand_;
} else {
- return messageFormatCommandBuilder_.getMessage();
+ return payloadFormatCommandBuilder_.getMessage();
}
}
/**
- * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+ * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
*/
- public Builder setMessageFormatCommand(com.openxc.BinaryMessages.MessageFormatCommand value) {
- if (messageFormatCommandBuilder_ == null) {
+ public Builder setPayloadFormatCommand(com.openxc.BinaryMessages.PayloadFormatCommand value) {
+ if (payloadFormatCommandBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
- messageFormatCommand_ = value;
+ payloadFormatCommand_ = value;
onChanged();
} else {
- messageFormatCommandBuilder_.setMessage(value);
+ payloadFormatCommandBuilder_.setMessage(value);
}
bitField0_ |= 0x00000010;
return this;
}
/**
- * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+ * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
*/
- public Builder setMessageFormatCommand(
- com.openxc.BinaryMessages.MessageFormatCommand.Builder builderForValue) {
- if (messageFormatCommandBuilder_ == null) {
- messageFormatCommand_ = builderForValue.build();
+ public Builder setPayloadFormatCommand(
+ com.openxc.BinaryMessages.PayloadFormatCommand.Builder builderForValue) {
+ if (payloadFormatCommandBuilder_ == null) {
+ payloadFormatCommand_ = builderForValue.build();
onChanged();
} else {
- messageFormatCommandBuilder_.setMessage(builderForValue.build());
+ payloadFormatCommandBuilder_.setMessage(builderForValue.build());
}
bitField0_ |= 0x00000010;
return this;
}
/**
- * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+ * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
*/
- public Builder mergeMessageFormatCommand(com.openxc.BinaryMessages.MessageFormatCommand value) {
- if (messageFormatCommandBuilder_ == null) {
+ public Builder mergePayloadFormatCommand(com.openxc.BinaryMessages.PayloadFormatCommand value) {
+ if (payloadFormatCommandBuilder_ == null) {
if (((bitField0_ & 0x00000010) == 0x00000010) &&
- messageFormatCommand_ != com.openxc.BinaryMessages.MessageFormatCommand.getDefaultInstance()) {
- messageFormatCommand_ =
- com.openxc.BinaryMessages.MessageFormatCommand.newBuilder(messageFormatCommand_).mergeFrom(value).buildPartial();
+ payloadFormatCommand_ != com.openxc.BinaryMessages.PayloadFormatCommand.getDefaultInstance()) {
+ payloadFormatCommand_ =
+ com.openxc.BinaryMessages.PayloadFormatCommand.newBuilder(payloadFormatCommand_).mergeFrom(value).buildPartial();
} else {
- messageFormatCommand_ = value;
+ payloadFormatCommand_ = value;
}
onChanged();
} else {
- messageFormatCommandBuilder_.mergeFrom(value);
+ payloadFormatCommandBuilder_.mergeFrom(value);
}
bitField0_ |= 0x00000010;
return this;
}
/**
- * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+ * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
*/
- public Builder clearMessageFormatCommand() {
- if (messageFormatCommandBuilder_ == null) {
- messageFormatCommand_ = com.openxc.BinaryMessages.MessageFormatCommand.getDefaultInstance();
+ public Builder clearPayloadFormatCommand() {
+ if (payloadFormatCommandBuilder_ == null) {
+ payloadFormatCommand_ = com.openxc.BinaryMessages.PayloadFormatCommand.getDefaultInstance();
onChanged();
} else {
- messageFormatCommandBuilder_.clear();
+ payloadFormatCommandBuilder_.clear();
}
bitField0_ = (bitField0_ & ~0x00000010);
return this;
}
/**
- * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+ * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
*/
- public com.openxc.BinaryMessages.MessageFormatCommand.Builder getMessageFormatCommandBuilder() {
+ public com.openxc.BinaryMessages.PayloadFormatCommand.Builder getPayloadFormatCommandBuilder() {
bitField0_ |= 0x00000010;
onChanged();
- return getMessageFormatCommandFieldBuilder().getBuilder();
+ return getPayloadFormatCommandFieldBuilder().getBuilder();
}
/**
- * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+ * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
*/
- public com.openxc.BinaryMessages.MessageFormatCommandOrBuilder getMessageFormatCommandOrBuilder() {
- if (messageFormatCommandBuilder_ != null) {
- return messageFormatCommandBuilder_.getMessageOrBuilder();
+ public com.openxc.BinaryMessages.PayloadFormatCommandOrBuilder getPayloadFormatCommandOrBuilder() {
+ if (payloadFormatCommandBuilder_ != null) {
+ return payloadFormatCommandBuilder_.getMessageOrBuilder();
} else {
- return messageFormatCommand_;
+ return payloadFormatCommand_;
}
}
/**
- * <code>optional .openxc.MessageFormatCommand message_format_command = 5;</code>
+ * <code>optional .openxc.PayloadFormatCommand payload_format_command = 5;</code>
*/
private com.google.protobuf.SingleFieldBuilder<
- com.openxc.BinaryMessages.MessageFormatCommand, com.openxc.BinaryMessages.MessageFormatCommand.Builder, com.openxc.BinaryMessages.MessageFormatCommandOrBuilder>
- getMessageFormatCommandFieldBuilder() {
- if (messageFormatCommandBuilder_ == null) {
- messageFormatCommandBuilder_ = new com.google.protobuf.SingleFieldBuilder<
- com.openxc.BinaryMessages.MessageFormatCommand, com.openxc.BinaryMessages.MessageFormatCommand.Builder, com.openxc.BinaryMessages.MessageFormatCommandOrBuilder>(
- messageFormatCommand_,
+ com.openxc.BinaryMessages.PayloadFormatCommand, com.openxc.BinaryMessages.PayloadFormatCommand.Builder, com.openxc.BinaryMessages.PayloadFormatCommandOrBuilder>
+ getPayloadFormatCommandFieldBuilder() {
+ if (payloadFormatCommandBuilder_ == null) {
+ payloadFormatCommandBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ com.openxc.BinaryMessages.PayloadFormatCommand, com.openxc.BinaryMessages.PayloadFormatCommand.Builder, com.openxc.BinaryMessages.PayloadFormatCommandOrBuilder>(
+ payloadFormatCommand_,
getParentForChildren(),
isClean());
- messageFormatCommand_ = null;
+ payloadFormatCommand_ = null;
}
- return messageFormatCommandBuilder_;
+ return payloadFormatCommandBuilder_;
}
// @@protoc_insertion_point(builder_scope:openxc.ControlCommand)
@@ -4967,38 +4967,38 @@ public final class BinaryMessages {
// @@protoc_insertion_point(class_scope:openxc.AcceptanceFilterBypassCommand)
}
- public interface MessageFormatCommandOrBuilder
+ public interface PayloadFormatCommandOrBuilder
extends com.google.protobuf.MessageOrBuilder {
- // optional .openxc.MessageFormatCommand.MessageFormat format = 1;
+ // optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;
/**
- * <code>optional .openxc.MessageFormatCommand.MessageFormat format = 1;</code>
+ * <code>optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;</code>
*/
boolean hasFormat();
/**
- * <code>optional .openxc.MessageFormatCommand.MessageFormat format = 1;</code>
+ * <code>optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;</code>
*/
- com.openxc.BinaryMessages.MessageFormatCommand.MessageFormat getFormat();
+ com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat getFormat();
}
/**
- * Protobuf type {@code openxc.MessageFormatCommand}
+ * Protobuf type {@code openxc.PayloadFormatCommand}
*/
- public static final class MessageFormatCommand extends
+ public static final class PayloadFormatCommand extends
com.google.protobuf.GeneratedMessage
- implements MessageFormatCommandOrBuilder {
- // Use MessageFormatCommand.newBuilder() to construct.
- private MessageFormatCommand(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ implements PayloadFormatCommandOrBuilder {
+ // Use PayloadFormatCommand.newBuilder() to construct.
+ private PayloadFormatCommand(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private MessageFormatCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private PayloadFormatCommand(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
- private static final MessageFormatCommand defaultInstance;
- public static MessageFormatCommand getDefaultInstance() {
+ private static final PayloadFormatCommand defaultInstance;
+ public static PayloadFormatCommand getDefaultInstance() {
return defaultInstance;
}
- public MessageFormatCommand getDefaultInstanceForType() {
+ public PayloadFormatCommand getDefaultInstanceForType() {
return defaultInstance;
}
@@ -5008,7 +5008,7 @@ public final class BinaryMessages {
getUnknownFields() {
return this.unknownFields;
}
- private MessageFormatCommand(
+ private PayloadFormatCommand(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
@@ -5033,7 +5033,7 @@ public final class BinaryMessages {
}
case 8: {
int rawValue = input.readEnum();
- com.openxc.BinaryMessages.MessageFormatCommand.MessageFormat value = com.openxc.BinaryMessages.MessageFormatCommand.MessageFormat.valueOf(rawValue);
+ com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat value = com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat.valueOf(rawValue);
if (value == null) {
unknownFields.mergeVarintField(1, rawValue);
} else {
@@ -5056,44 +5056,44 @@ public final class BinaryMessages {
}
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return com.openxc.BinaryMessages.internal_static_openxc_MessageFormatCommand_descriptor;
+ return com.openxc.BinaryMessages.internal_static_openxc_PayloadFormatCommand_descriptor;
}
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
- return com.openxc.BinaryMessages.internal_static_openxc_MessageFormatCommand_fieldAccessorTable
+ return com.openxc.BinaryMessages.internal_static_openxc_PayloadFormatCommand_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- com.openxc.BinaryMessages.MessageFormatCommand.class, com.openxc.BinaryMessages.MessageFormatCommand.Builder.class);
+ com.openxc.BinaryMessages.PayloadFormatCommand.class, com.openxc.BinaryMessages.PayloadFormatCommand.Builder.class);
}
- public static com.google.protobuf.Parser<MessageFormatCommand> PARSER =
- new com.google.protobuf.AbstractParser<MessageFormatCommand>() {
- public MessageFormatCommand parsePartialFrom(
+ public static com.google.protobuf.Parser<PayloadFormatCommand> PARSER =
+ new com.google.protobuf.AbstractParser<PayloadFormatCommand>() {
+ public PayloadFormatCommand parsePartialFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
- return new MessageFormatCommand(input, extensionRegistry);
+ return new PayloadFormatCommand(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<MessageFormatCommand> getParserForType() {
+ public com.google.protobuf.Parser<PayloadFormatCommand> getParserForType() {
return PARSER;
}
/**
- * Protobuf enum {@code openxc.MessageFormatCommand.MessageFormat}
+ * Protobuf enum {@code openxc.PayloadFormatCommand.PayloadFormat}
*/
- public enum MessageFormat
+ public enum PayloadFormat
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>JSON = 1;</code>
*/
JSON(0, 1),
/**
- * <code>BINARY = 2;</code>
+ * <code>PROTOBUF = 2;</code>
*/
- BINARY(1, 2),
+ PROTOBUF(1, 2),
;
/**
@@ -5101,30 +5101,30 @@ public final class BinaryMessages {
*/
public static final int JSON_VALUE = 1;
/**
- * <code>BINARY = 2;</code>
+ * <code>PROTOBUF = 2;</code>
*/
- public static final int BINARY_VALUE = 2;
+ public static final int PROTOBUF_VALUE = 2;
public final int getNumber() { return value; }
- public static MessageFormat valueOf(int value) {
+ public static PayloadFormat valueOf(int value) {
switch (value) {
case 1: return JSON;
- case 2: return BINARY;
+ case 2: return PROTOBUF;
default: return null;
}
}
- public static com.google.protobuf.Internal.EnumLiteMap<MessageFormat>
+ public static com.google.protobuf.Internal.EnumLiteMap<PayloadFormat>
internalGetValueMap() {
return internalValueMap;
}
- private static com.google.protobuf.Internal.EnumLiteMap<MessageFormat>
+ private static com.google.protobuf.Internal.EnumLiteMap<PayloadFormat>
internalValueMap =
- new com.google.protobuf.Internal.EnumLiteMap<MessageFormat>() {
- public MessageFormat findValueByNumber(int number) {
- return MessageFormat.valueOf(number);
+ new com.google.protobuf.Internal.EnumLiteMap<PayloadFormat>() {
+ public PayloadFormat findValueByNumber(int number) {
+ return PayloadFormat.valueOf(number);
}
};
@@ -5138,12 +5138,12 @@ public final class BinaryMessages {
}
public static final com.google.protobuf.Descriptors.EnumDescriptor
getDescriptor() {
- return com.openxc.BinaryMessages.MessageFormatCommand.getDescriptor().getEnumTypes().get(0);
+ return com.openxc.BinaryMessages.PayloadFormatCommand.getDescriptor().getEnumTypes().get(0);
}
- private static final MessageFormat[] VALUES = values();
+ private static final PayloadFormat[] VALUES = values();
- public static MessageFormat valueOf(
+ public static PayloadFormat valueOf(
com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
if (desc.getType() != getDescriptor()) {
throw new java.lang.IllegalArgumentException(
@@ -5155,33 +5155,33 @@ public final class BinaryMessages {
private final int index;
private final int value;
- private MessageFormat(int index, int value) {
+ private PayloadFormat(int index, int value) {
this.index = index;
this.value = value;
}
- // @@protoc_insertion_point(enum_scope:openxc.MessageFormatCommand.MessageFormat)
+ // @@protoc_insertion_point(enum_scope:openxc.PayloadFormatCommand.PayloadFormat)
}
private int bitField0_;
- // optional .openxc.MessageFormatCommand.MessageFormat format = 1;
+ // optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;
public static final int FORMAT_FIELD_NUMBER = 1;
- private com.openxc.BinaryMessages.MessageFormatCommand.MessageFormat format_;
+ private com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat format_;
/**
- * <code>optional .openxc.MessageFormatCommand.MessageFormat format = 1;</code>
+ * <code>optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;</code>
*/
public boolean hasFormat() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
- * <code>optional .openxc.MessageFormatCommand.MessageFormat format = 1;</code>
+ * <code>optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;</code>
*/
- public com.openxc.BinaryMessages.MessageFormatCommand.MessageFormat getFormat() {
+ public com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat getFormat() {
return format_;
}
private void initFields() {
- format_ = com.openxc.BinaryMessages.MessageFormatCommand.MessageFormat.JSON;
+ format_ = com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat.JSON;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -5223,53 +5223,53 @@ public final class BinaryMessages {
return super.writeReplace();
}
- public static com.openxc.BinaryMessages.MessageFormatCommand parseFrom(
+ public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static com.openxc.BinaryMessages.MessageFormatCommand parseFrom(
+ public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom(
com.google.protobuf.ByteString data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static com.openxc.BinaryMessages.MessageFormatCommand parseFrom(byte[] data)
+ public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom(byte[] data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static com.openxc.BinaryMessages.MessageFormatCommand parseFrom(
+ public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom(
byte[] data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static com.openxc.BinaryMessages.MessageFormatCommand parseFrom(java.io.InputStream input)
+ public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
- public static com.openxc.BinaryMessages.MessageFormatCommand parseFrom(
+ public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
- public static com.openxc.BinaryMessages.MessageFormatCommand parseDelimitedFrom(java.io.InputStream input)
+ public static com.openxc.BinaryMessages.PayloadFormatCommand parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input);
}
- public static com.openxc.BinaryMessages.MessageFormatCommand parseDelimitedFrom(
+ public static com.openxc.BinaryMessages.PayloadFormatCommand parseDelimitedFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
- public static com.openxc.BinaryMessages.MessageFormatCommand parseFrom(
+ public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom(
com.google.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
- public static com.openxc.BinaryMessages.MessageFormatCommand parseFrom(
+ public static com.openxc.BinaryMessages.PayloadFormatCommand parseFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
@@ -5278,7 +5278,7 @@ public final class BinaryMessages {
public static Builder newBuilder() { return Builder.create(); }
public Builder newBuilderForType() { return newBuilder(); }
- public static Builder newBuilder(com.openxc.BinaryMessages.MessageFormatCommand prototype) {
+ public static Builder newBuilder(com.openxc.BinaryMessages.PayloadFormatCommand prototype) {
return newBuilder().mergeFrom(prototype);
}
public Builder toBuilder() { return newBuilder(this); }
@@ -5290,24 +5290,24 @@ public final class BinaryMessages {
return builder;
}
/**
- * Protobuf type {@code openxc.MessageFormatCommand}
+ * Protobuf type {@code openxc.PayloadFormatCommand}
*/
public static final class Builder extends
com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements com.openxc.BinaryMessages.MessageFormatCommandOrBuilder {
+ implements com.openxc.BinaryMessages.PayloadFormatCommandOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return com.openxc.BinaryMessages.internal_static_openxc_MessageFormatCommand_descriptor;
+ return com.openxc.BinaryMessages.internal_static_openxc_PayloadFormatCommand_descriptor;
}
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
- return com.openxc.BinaryMessages.internal_static_openxc_MessageFormatCommand_fieldAccessorTable
+ return com.openxc.BinaryMessages.internal_static_openxc_PayloadFormatCommand_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- com.openxc.BinaryMessages.MessageFormatCommand.class, com.openxc.BinaryMessages.MessageFormatCommand.Builder.class);
+ com.openxc.BinaryMessages.PayloadFormatCommand.class, com.openxc.BinaryMessages.PayloadFormatCommand.Builder.class);
}
- // Construct using com.openxc.BinaryMessages.MessageFormatCommand.newBuilder()
+ // Construct using com.openxc.BinaryMessages.PayloadFormatCommand.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
}
@@ -5327,7 +5327,7 @@ public final class BinaryMessages {
public Builder clear() {
super.clear();
- format_ = com.openxc.BinaryMessages.MessageFormatCommand.MessageFormat.JSON;
+ format_ = com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat.JSON;
bitField0_ = (bitField0_ & ~0x00000001);
return this;
}
@@ -5338,23 +5338,23 @@ public final class BinaryMessages {
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
- return com.openxc.BinaryMessages.internal_static_openxc_MessageFormatCommand_descriptor;
+ return com.openxc.BinaryMessages.internal_static_openxc_PayloadFormatCommand_descriptor;
}
- public com.openxc.BinaryMessages.MessageFormatCommand getDefaultInstanceForType() {
- return com.openxc.BinaryMessages.MessageFormatCommand.getDefaultInstance();
+ public com.openxc.BinaryMessages.PayloadFormatCommand getDefaultInstanceForType() {
+ return com.openxc.BinaryMessages.PayloadFormatCommand.getDefaultInstance();
}
- public com.openxc.BinaryMessages.MessageFormatCommand build() {
- com.openxc.BinaryMessages.MessageFormatCommand result = buildPartial();
+ public com.openxc.BinaryMessages.PayloadFormatCommand build() {
+ com.openxc.BinaryMessages.PayloadFormatCommand result = buildPartial();
if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
return result;
}
- public com.openxc.BinaryMessages.MessageFormatCommand buildPartial() {
- com.openxc.BinaryMessages.MessageFormatCommand result = new com.openxc.BinaryMessages.MessageFormatCommand(this);
+ public com.openxc.BinaryMessages.PayloadFormatCommand buildPartial() {
+ com.openxc.BinaryMessages.PayloadFormatCommand result = new com.openxc.BinaryMessages.PayloadFormatCommand(this);
int from_bitField0_ = bitField0_;
int to_bitField0_ = 0;
if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -5367,16 +5367,16 @@ public final class BinaryMessages {
}
public Builder mergeFrom(com.google.protobuf.Message other) {
- if (other instanceof com.openxc.BinaryMessages.MessageFormatCommand) {
- return mergeFrom((com.openxc.BinaryMessages.MessageFormatCommand)other);
+ if (other instanceof com.openxc.BinaryMessages.PayloadFormatCommand) {
+ return mergeFrom((com.openxc.BinaryMessages.PayloadFormatCommand)other);
} else {
super.mergeFrom(other);
return this;
}
}
- public Builder mergeFrom(com.openxc.BinaryMessages.MessageFormatCommand other) {
- if (other == com.openxc.BinaryMessages.MessageFormatCommand.getDefaultInstance()) return this;
+ public Builder mergeFrom(com.openxc.BinaryMessages.PayloadFormatCommand other) {
+ if (other == com.openxc.BinaryMessages.PayloadFormatCommand.getDefaultInstance()) return this;
if (other.hasFormat()) {
setFormat(other.getFormat());
}
@@ -5392,11 +5392,11 @@ public final class BinaryMessages {
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
- com.openxc.BinaryMessages.MessageFormatCommand parsedMessage = null;
+ com.openxc.BinaryMessages.PayloadFormatCommand parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
- parsedMessage = (com.openxc.BinaryMessages.MessageFormatCommand) e.getUnfinishedMessage();
+ parsedMessage = (com.openxc.BinaryMessages.PayloadFormatCommand) e.getUnfinishedMessage();
throw e;
} finally {
if (parsedMessage != null) {
@@ -5407,24 +5407,24 @@ public final class BinaryMessages {
}
private int bitField0_;
- // optional .openxc.MessageFormatCommand.MessageFormat format = 1;
- private com.openxc.BinaryMessages.MessageFormatCommand.MessageFormat format_ = com.openxc.BinaryMessages.MessageFormatCommand.MessageFormat.JSON;
+ // optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;
+ private com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat format_ = com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat.JSON;
/**
- * <code>optional .openxc.MessageFormatCommand.MessageFormat format = 1;</code>
+ * <code>optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;</code>
*/
public boolean hasFormat() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
- * <code>optional .openxc.MessageFormatCommand.MessageFormat format = 1;</code>
+ * <code>optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;</code>
*/
- public com.openxc.BinaryMessages.MessageFormatCommand.MessageFormat getFormat() {
+ public com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat getFormat() {
return format_;
}
/**
- * <code>optional .openxc.MessageFormatCommand.MessageFormat format = 1;</code>
+ * <code>optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;</code>
*/
- public Builder setFormat(com.openxc.BinaryMessages.MessageFormatCommand.MessageFormat value) {
+ public Builder setFormat(com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat value) {
if (value == null) {
throw new NullPointerException();
}
@@ -5434,24 +5434,24 @@ public final class BinaryMessages {
return this;
}
/**
- * <code>optional .openxc.MessageFormatCommand.MessageFormat format = 1;</code>
+ * <code>optional .openxc.PayloadFormatCommand.PayloadFormat format = 1;</code>
*/
public Builder clearFormat() {
bitField0_ = (bitField0_ & ~0x00000001);
- format_ = com.openxc.BinaryMessages.MessageFormatCommand.MessageFormat.JSON;
+ format_ = com.openxc.BinaryMessages.PayloadFormatCommand.PayloadFormat.JSON;
onChanged();
return this;
}
- // @@protoc_insertion_point(builder_scope:openxc.MessageFormatCommand)
+ // @@protoc_insertion_point(builder_scope:openxc.PayloadFormatCommand)
}
static {
- defaultInstance = new MessageFormatCommand(true);
+ defaultInstance = new PayloadFormatCommand(true);
defaultInstance.initFields();
}
- // @@protoc_insertion_point(class_scope:openxc.MessageFormatCommand)
+ // @@protoc_insertion_point(class_scope:openxc.PayloadFormatCommand)
}
public interface CommandResponseOrBuilder
@@ -10263,10 +10263,10 @@ public final class BinaryMessages {
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_openxc_AcceptanceFilterBypassCommand_fieldAccessorTable;
private static com.google.protobuf.Descriptors.Descriptor
- internal_static_openxc_MessageFormatCommand_descriptor;
+ internal_static_openxc_PayloadFormatCommand_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
- internal_static_openxc_MessageFormatCommand_fieldAccessorTable;
+ internal_static_openxc_PayloadFormatCommand_fieldAccessorTable;
private static com.google.protobuf.Descriptors.Descriptor
internal_static_openxc_CommandResponse_descriptor;
private static
@@ -10320,45 +10320,45 @@ public final class BinaryMessages {
"st\030\003 \001(\0132%.openxc.PassthroughModeControl" +
"Command\022O\n acceptance_filter_bypass_comm" +
"and\030\004 \001(\0132%.openxc.AcceptanceFilterBypas" +
- "sCommand\022<\n\026message_format_command\030\005 \001(\013",
- "2\034.openxc.MessageFormatCommand\"u\n\004Type\022\013" +
+ "sCommand\022<\n\026payload_format_command\030\005 \001(\013",
+ "2\034.openxc.PayloadFormatCommand\"u\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\016MESSAGE_FORMAT\020\006\"\236\001\n\030Diagno" +
+ "_BYPASS\020\005\022\022\n\016PAYLOAD_FORMAT\020\006\"\236\001\n\030Diagno" +
"sticControlCommand\022*\n\007request\030\001 \001(\0132\031.op" +
"enxc.DiagnosticRequest\0227\n\006action\030\002 \001(\0162\'" +
".openxc.DiagnosticControlCommand.Action\"" +
"\035\n\006Action\022\007\n\003ADD\020\001\022\n\n\006CANCEL\020\002\"=\n\035Passth" +
"roughModeControlCommand\022\013\n\003bus\030\001 \001(\005\022\017\n\007" +
"enabled\030\002 \001(\010\"<\n\035AcceptanceFilterBypassC",
- "ommand\022\013\n\003bus\030\001 \001(\005\022\016\n\006bypass\030\002 \001(\010\"y\n\024M" +
- "essageFormatCommand\022:\n\006format\030\001 \001(\0162*.op" +
- "enxc.MessageFormatCommand.MessageFormat\"" +
- "%\n\rMessageFormat\022\010\n\004JSON\020\001\022\n\n\006BINARY\020\002\"]" +
- "\n\017CommandResponse\022)\n\004type\030\001 \001(\0162\033.openxc" +
- ".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\003b" +
- "us\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\022mult" +
- "iple_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%.op" +
- "enxc.DiagnosticRequest.DecodedType\"!\n\013De" +
- "codedType\022\010\n\004NONE\020\001\022\010\n\004OBD2\020\002\"\241\001\n\022Diagno" +
- "sticResponse\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\007succ" +
- "ess\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\014Dy" +
- "namicField\022\'\n\004type\030\001 \001(\0162\031.openxc.Dynami" +
- "cField.Type\022\024\n\014string_value\030\002 \001(\t\022\025\n\rnum" +
- "eric_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\"\367" +
- "\001\n\021TranslatedMessage\022,\n\004type\030\001 \001(\0162\036.ope" +
- "nxc.TranslatedMessage.Type\022\014\n\004name\030\002 \001(\t" +
- "\022#\n\005value\030\003 \001(\0132\024.openxc.DynamicField\022#\n" +
- "\005event\030\004 \001(\0132\024.openxc.DynamicField\"\\\n\004Ty" +
- "pe\022\n\n\006STRING\020\001\022\007\n\003NUM\020\002\022\010\n\004BOOL\020\003\022\022\n\016EVE" +
- "NTED_STRING\020\004\022\017\n\013EVENTED_NUM\020\005\022\020\n\014EVENTE" +
- "D_BOOL\020\006B\034\n\ncom.openxcB\016BinaryMessages"
+ "ommand\022\013\n\003bus\030\001 \001(\005\022\016\n\006bypass\030\002 \001(\010\"{\n\024P" +
+ "ayloadFormatCommand\022:\n\006format\030\001 \001(\0162*.op" +
+ "enxc.PayloadFormatCommand.PayloadFormat\"" +
+ "\'\n\rPayloadFormat\022\010\n\004JSON\020\001\022\014\n\010PROTOBUF\020\002" +
+ "\"]\n\017CommandResponse\022)\n\004type\030\001 \001(\0162\033.open" +
+ "xc.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" +
+ "\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\007payload\030\005 \001(\014\022\032\n\022mu" +
+ "ltiple_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%." +
+ "openxc.DiagnosticRequest.DecodedType\"!\n\013" +
+ "DecodedType\022\010\n\004NONE\020\001\022\010\n\004OBD2\020\002\"\241\001\n\022Diag" +
+ "nosticResponse\022\013\n\003bus\030\001 \001(\005\022\022\n\nmessage_i" +
+ "d\030\002 \001(\r\022\014\n\004mode\030\003 \001(\r\022\013\n\003pid\030\004 \001(\r\022\017\n\007su" +
+ "ccess\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\014" +
+ "DynamicField\022\'\n\004type\030\001 \001(\0162\031.openxc.Dyna" +
+ "micField.Type\022\024\n\014string_value\030\002 \001(\t\022\025\n\rn" +
+ "umeric_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" +
+ "\"\367\001\n\021TranslatedMessage\022,\n\004type\030\001 \001(\0162\036.o" +
+ "penxc.TranslatedMessage.Type\022\014\n\004name\030\002 \001" +
+ "(\t\022#\n\005value\030\003 \001(\0132\024.openxc.DynamicField\022" +
+ "#\n\005event\030\004 \001(\0132\024.openxc.DynamicField\"\\\n\004" +
+ "Type\022\n\n\006STRING\020\001\022\007\n\003NUM\020\002\022\010\n\004BOOL\020\003\022\022\n\016E" +
+ "VENTED_STRING\020\004\022\017\n\013EVENTED_NUM\020\005\022\020\n\014EVEN" +
+ "TED_BOOL\020\006B\034\n\ncom.openxcB\016BinaryMessages"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -10382,7 +10382,7 @@ public final class BinaryMessages {
internal_static_openxc_ControlCommand_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_openxc_ControlCommand_descriptor,
- new java.lang.String[] { "Type", "DiagnosticRequest", "PassthroughModeRequest", "AcceptanceFilterBypassCommand", "MessageFormatCommand", });
+ new java.lang.String[] { "Type", "DiagnosticRequest", "PassthroughModeRequest", "AcceptanceFilterBypassCommand", "PayloadFormatCommand", });
internal_static_openxc_DiagnosticControlCommand_descriptor =
getDescriptor().getMessageTypes().get(3);
internal_static_openxc_DiagnosticControlCommand_fieldAccessorTable = new
@@ -10401,11 +10401,11 @@ public final class BinaryMessages {
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_openxc_AcceptanceFilterBypassCommand_descriptor,
new java.lang.String[] { "Bus", "Bypass", });
- internal_static_openxc_MessageFormatCommand_descriptor =
+ internal_static_openxc_PayloadFormatCommand_descriptor =
getDescriptor().getMessageTypes().get(6);
- internal_static_openxc_MessageFormatCommand_fieldAccessorTable = new
+ internal_static_openxc_PayloadFormatCommand_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_openxc_MessageFormatCommand_descriptor,
+ internal_static_openxc_PayloadFormatCommand_descriptor,
new java.lang.String[] { "Format", });
internal_static_openxc_CommandResponse_descriptor =
getDescriptor().getMessageTypes().get(7);
diff --git a/gen/python/openxc_pb2.py b/gen/python/openxc_pb2.py
index c5d42154..35e63518 100644
--- a/gen/python/openxc_pb2.py
+++ b/gen/python/openxc_pb2.py
@@ -13,7 +13,7 @@ from google.protobuf import descriptor_pb2
DESCRIPTOR = _descriptor.FileDescriptor(
name='openxc.proto',
package='openxc',
- serialized_pb='\n\x0copenxc.proto\x12\x06openxc\"\x94\x03\n\x0eVehicleMessage\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.VehicleMessage.Type\x12\'\n\x0braw_message\x18\x02 \x01(\x0b\x32\x12.openxc.RawMessage\x12\x35\n\x12translated_message\x18\x03 \x01(\x0b\x32\x19.openxc.TranslatedMessage\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\"Z\n\x04Type\x12\x07\n\x03RAW\x10\x01\x12\x0e\n\nTRANSLATED\x10\x02\x12\x0e\n\nDIAGNOSTIC\x10\x03\x12\x13\n\x0f\x43ONTROL_COMMAND\x10\x04\x12\x14\n\x10\x43OMMAND_RESPONSE\x10\x05\";\n\nRawMessage\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x0c\"\xc8\x03\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\x16message_format_command\x18\x05 \x01(\x0b\x32\x1c.openxc.MessageFormatCommand\"u\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\x0eMESSAGE_FORMAT\x10\x06\"\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\"y\n\x14MessageFormatCommand\x12:\n\x06\x66ormat\x18\x01 \x01(\x0e\x32*.openxc.MessageFormatCommand.MessageFormat\"%\n\rMessageFormat\x12\x08\n\x04JSON\x10\x01\x12\n\n\x06\x42INARY\x10\x02\"]\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\"\xf7\x01\n\x11TranslatedMessage\x12,\n\x04type\x18\x01 \x01(\x0e\x32\x1e.openxc.TranslatedMessage.Type\x12\x0c\n\x04name\x18\x02 \x01(\t\x12#\n\x05value\x18\x03 \x01(\x0b\x32\x14.openxc.DynamicField\x12#\n\x05\x65vent\x18\x04 \x01(\x0b\x32\x14.openxc.DynamicField\"\\\n\x04Type\x12\n\n\x06STRING\x10\x01\x12\x07\n\x03NUM\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\x12\x12\n\x0e\x45VENTED_STRING\x10\x04\x12\x0f\n\x0b\x45VENTED_NUM\x10\x05\x12\x10\n\x0c\x45VENTED_BOOL\x10\x06\x42\x1c\n\ncom.openxcB\x0e\x42inaryMessages')
+ serialized_pb='\n\x0copenxc.proto\x12\x06openxc\"\x94\x03\n\x0eVehicleMessage\x12)\n\x04type\x18\x01 \x01(\x0e\x32\x1b.openxc.VehicleMessage.Type\x12\'\n\x0braw_message\x18\x02 \x01(\x0b\x32\x12.openxc.RawMessage\x12\x35\n\x12translated_message\x18\x03 \x01(\x0b\x32\x19.openxc.TranslatedMessage\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\"Z\n\x04Type\x12\x07\n\x03RAW\x10\x01\x12\x0e\n\nTRANSLATED\x10\x02\x12\x0e\n\nDIAGNOSTIC\x10\x03\x12\x13\n\x0f\x43ONTROL_COMMAND\x10\x04\x12\x14\n\x10\x43OMMAND_RESPONSE\x10\x05\";\n\nRawMessage\x12\x0b\n\x03\x62us\x18\x01 \x01(\x05\x12\x12\n\nmessage_id\x18\x02 \x01(\r\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x0c\"\xc8\x03\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\"u\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\"\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\"{\n\x14PayloadFormatCommand\x12:\n\x06\x66ormat\x18\x01 \x01(\x0e\x32*.openxc.PayloadFormatCommand.PayloadFormat\"\'\n\rPayloadFormat\x12\x08\n\x04JSON\x10\x01\x12\x0c\n\x08PROTOBUF\x10\x02\"]\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\"\xf7\x01\n\x11TranslatedMessage\x12,\n\x04type\x18\x01 \x01(\x0e\x32\x1e.openxc.TranslatedMessage.Type\x12\x0c\n\x04name\x18\x02 \x01(\t\x12#\n\x05value\x18\x03 \x01(\x0b\x32\x14.openxc.DynamicField\x12#\n\x05\x65vent\x18\x04 \x01(\x0b\x32\x14.openxc.DynamicField\"\\\n\x04Type\x12\n\n\x06STRING\x10\x01\x12\x07\n\x03NUM\x10\x02\x12\x08\n\x04\x42OOL\x10\x03\x12\x12\n\x0e\x45VENTED_STRING\x10\x04\x12\x0f\n\x0b\x45VENTED_NUM\x10\x05\x12\x10\n\x0c\x45VENTED_BOOL\x10\x06\x42\x1c\n\ncom.openxcB\x0e\x42inaryMessages')
@@ -77,7 +77,7 @@ _CONTROLCOMMAND_TYPE = _descriptor.EnumDescriptor(
options=None,
type=None),
_descriptor.EnumValueDescriptor(
- name='MESSAGE_FORMAT', index=5, number=6,
+ name='PAYLOAD_FORMAT', index=5, number=6,
options=None,
type=None),
],
@@ -108,9 +108,9 @@ _DIAGNOSTICCONTROLCOMMAND_ACTION = _descriptor.EnumDescriptor(
serialized_end=1110,
)
-_MESSAGEFORMATCOMMAND_MESSAGEFORMAT = _descriptor.EnumDescriptor(
- name='MessageFormat',
- full_name='openxc.MessageFormatCommand.MessageFormat',
+_PAYLOADFORMATCOMMAND_PAYLOADFORMAT = _descriptor.EnumDescriptor(
+ name='PayloadFormat',
+ full_name='openxc.PayloadFormatCommand.PayloadFormat',
filename=None,
file=DESCRIPTOR,
values=[
@@ -119,14 +119,14 @@ _MESSAGEFORMATCOMMAND_MESSAGEFORMAT = _descriptor.EnumDescriptor(
options=None,
type=None),
_descriptor.EnumValueDescriptor(
- name='BINARY', index=1, number=2,
+ name='PROTOBUF', index=1, number=2,
options=None,
type=None),
],
containing_type=None,
options=None,
serialized_start=1321,
- serialized_end=1358,
+ serialized_end=1360,
)
_DIAGNOSTICREQUEST_DECODEDTYPE = _descriptor.EnumDescriptor(
@@ -146,8 +146,8 @@ _DIAGNOSTICREQUEST_DECODEDTYPE = _descriptor.EnumDescriptor(
],
containing_type=None,
options=None,
- serialized_start=1676,
- serialized_end=1709,
+ serialized_start=1678,
+ serialized_end=1711,
)
_DYNAMICFIELD_TYPE = _descriptor.EnumDescriptor(
@@ -171,8 +171,8 @@ _DYNAMICFIELD_TYPE = _descriptor.EnumDescriptor(
],
containing_type=None,
options=None,
- serialized_start=2001,
- serialized_end=2038,
+ serialized_start=2003,
+ serialized_end=2040,
)
_TRANSLATEDMESSAGE_TYPE = _descriptor.EnumDescriptor(
@@ -208,8 +208,8 @@ _TRANSLATEDMESSAGE_TYPE = _descriptor.EnumDescriptor(
],
containing_type=None,
options=None,
- serialized_start=2196,
- serialized_end=2288,
+ serialized_start=2198,
+ serialized_end=2290,
)
@@ -355,7 +355,7 @@ _CONTROLCOMMAND = _descriptor.Descriptor(
is_extension=False, extension_scope=None,
options=None),
_descriptor.FieldDescriptor(
- name='message_format_command', full_name='openxc.ControlCommand.message_format_command', index=4,
+ name='payload_format_command', full_name='openxc.ControlCommand.payload_format_command', index=4,
number=5, type=11, cpp_type=10, label=1,
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
@@ -482,15 +482,15 @@ _ACCEPTANCEFILTERBYPASSCOMMAND = _descriptor.Descriptor(
)
-_MESSAGEFORMATCOMMAND = _descriptor.Descriptor(
- name='MessageFormatCommand',
- full_name='openxc.MessageFormatCommand',
+_PAYLOADFORMATCOMMAND = _descriptor.Descriptor(
+ name='PayloadFormatCommand',
+ full_name='openxc.PayloadFormatCommand',
filename=None,
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(
- name='format', full_name='openxc.MessageFormatCommand.format', index=0,
+ name='format', full_name='openxc.PayloadFormatCommand.format', index=0,
number=1, type=14, cpp_type=8, label=1,
has_default_value=False, default_value=1,
message_type=None, enum_type=None, containing_type=None,
@@ -501,13 +501,13 @@ _MESSAGEFORMATCOMMAND = _descriptor.Descriptor(
],
nested_types=[],
enum_types=[
- _MESSAGEFORMATCOMMAND_MESSAGEFORMAT,
+ _PAYLOADFORMATCOMMAND_PAYLOADFORMAT,
],
options=None,
is_extendable=False,
extension_ranges=[],
serialized_start=1237,
- serialized_end=1358,
+ serialized_end=1360,
)
@@ -548,8 +548,8 @@ _COMMANDRESPONSE = _descriptor.Descriptor(
options=None,
is_extendable=False,
extension_ranges=[],
- serialized_start=1360,
- serialized_end=1453,
+ serialized_start=1362,
+ serialized_end=1455,
)
@@ -633,8 +633,8 @@ _DIAGNOSTICREQUEST = _descriptor.Descriptor(
options=None,
is_extendable=False,
extension_ranges=[],
- serialized_start=1456,
- serialized_end=1709,
+ serialized_start=1458,
+ serialized_end=1711,
)
@@ -710,8 +710,8 @@ _DIAGNOSTICRESPONSE = _descriptor.Descriptor(
options=None,
is_extendable=False,
extension_ranges=[],
- serialized_start=1712,
- serialized_end=1873,
+ serialized_start=1714,
+ serialized_end=1875,
)
@@ -760,8 +760,8 @@ _DYNAMICFIELD = _descriptor.Descriptor(
options=None,
is_extendable=False,
extension_ranges=[],
- serialized_start=1876,
- serialized_end=2038,
+ serialized_start=1878,
+ serialized_end=2040,
)
@@ -810,8 +810,8 @@ _TRANSLATEDMESSAGE = _descriptor.Descriptor(
options=None,
is_extendable=False,
extension_ranges=[],
- serialized_start=2041,
- serialized_end=2288,
+ serialized_start=2043,
+ serialized_end=2290,
)
_VEHICLEMESSAGE.fields_by_name['type'].enum_type = _VEHICLEMESSAGE_TYPE
@@ -825,13 +825,13 @@ _CONTROLCOMMAND.fields_by_name['type'].enum_type = _CONTROLCOMMAND_TYPE
_CONTROLCOMMAND.fields_by_name['diagnostic_request'].message_type = _DIAGNOSTICCONTROLCOMMAND
_CONTROLCOMMAND.fields_by_name['passthrough_mode_request'].message_type = _PASSTHROUGHMODECONTROLCOMMAND
_CONTROLCOMMAND.fields_by_name['acceptance_filter_bypass_command'].message_type = _ACCEPTANCEFILTERBYPASSCOMMAND
-_CONTROLCOMMAND.fields_by_name['message_format_command'].message_type = _MESSAGEFORMATCOMMAND
+_CONTROLCOMMAND.fields_by_name['payload_format_command'].message_type = _PAYLOADFORMATCOMMAND
_CONTROLCOMMAND_TYPE.containing_type = _CONTROLCOMMAND;
_DIAGNOSTICCONTROLCOMMAND.fields_by_name['request'].message_type = _DIAGNOSTICREQUEST
_DIAGNOSTICCONTROLCOMMAND.fields_by_name['action'].enum_type = _DIAGNOSTICCONTROLCOMMAND_ACTION
_DIAGNOSTICCONTROLCOMMAND_ACTION.containing_type = _DIAGNOSTICCONTROLCOMMAND;
-_MESSAGEFORMATCOMMAND.fields_by_name['format'].enum_type = _MESSAGEFORMATCOMMAND_MESSAGEFORMAT
-_MESSAGEFORMATCOMMAND_MESSAGEFORMAT.containing_type = _MESSAGEFORMATCOMMAND;
+_PAYLOADFORMATCOMMAND.fields_by_name['format'].enum_type = _PAYLOADFORMATCOMMAND_PAYLOADFORMAT
+_PAYLOADFORMATCOMMAND_PAYLOADFORMAT.containing_type = _PAYLOADFORMATCOMMAND;
_COMMANDRESPONSE.fields_by_name['type'].enum_type = _CONTROLCOMMAND_TYPE
_DIAGNOSTICREQUEST.fields_by_name['decoded_type'].enum_type = _DIAGNOSTICREQUEST_DECODEDTYPE
_DIAGNOSTICREQUEST_DECODEDTYPE.containing_type = _DIAGNOSTICREQUEST;
@@ -847,7 +847,7 @@ DESCRIPTOR.message_types_by_name['ControlCommand'] = _CONTROLCOMMAND
DESCRIPTOR.message_types_by_name['DiagnosticControlCommand'] = _DIAGNOSTICCONTROLCOMMAND
DESCRIPTOR.message_types_by_name['PassthroughModeControlCommand'] = _PASSTHROUGHMODECONTROLCOMMAND
DESCRIPTOR.message_types_by_name['AcceptanceFilterBypassCommand'] = _ACCEPTANCEFILTERBYPASSCOMMAND
-DESCRIPTOR.message_types_by_name['MessageFormatCommand'] = _MESSAGEFORMATCOMMAND
+DESCRIPTOR.message_types_by_name['PayloadFormatCommand'] = _PAYLOADFORMATCOMMAND
DESCRIPTOR.message_types_by_name['CommandResponse'] = _COMMANDRESPONSE
DESCRIPTOR.message_types_by_name['DiagnosticRequest'] = _DIAGNOSTICREQUEST
DESCRIPTOR.message_types_by_name['DiagnosticResponse'] = _DIAGNOSTICRESPONSE
@@ -890,11 +890,11 @@ class AcceptanceFilterBypassCommand(_message.Message):
# @@protoc_insertion_point(class_scope:openxc.AcceptanceFilterBypassCommand)
-class MessageFormatCommand(_message.Message):
+class PayloadFormatCommand(_message.Message):
__metaclass__ = _reflection.GeneratedProtocolMessageType
- DESCRIPTOR = _MESSAGEFORMATCOMMAND
+ DESCRIPTOR = _PAYLOADFORMATCOMMAND
- # @@protoc_insertion_point(class_scope:openxc.MessageFormatCommand)
+ # @@protoc_insertion_point(class_scope:openxc.PayloadFormatCommand)
class CommandResponse(_message.Message):
__metaclass__ = _reflection.GeneratedProtocolMessageType
diff --git a/openxc.proto b/openxc.proto
index e0264c6b..f54c0906 100644
--- a/openxc.proto
+++ b/openxc.proto
@@ -28,14 +28,14 @@ message ControlCommand {
DIAGNOSTIC = 3;
PASSTHROUGH = 4;
ACCEPTANCE_FILTER_BYPASS = 5;
- MESSAGE_FORMAT = 6;
+ PAYLOAD_FORMAT = 6;
}
optional Type type = 1;
optional DiagnosticControlCommand diagnostic_request = 2;
optional PassthroughModeControlCommand passthrough_mode_request = 3;
optional AcceptanceFilterBypassCommand acceptance_filter_bypass_command = 4;
- optional MessageFormatCommand message_format_command = 5;
+ optional PayloadFormatCommand payload_format_command = 5;
}
message DiagnosticControlCommand {
@@ -55,13 +55,13 @@ message AcceptanceFilterBypassCommand {
optional bool bypass = 2;
}
-message MessageFormatCommand {
- enum MessageFormat {
+message PayloadFormatCommand {
+ enum PayloadFormat {
JSON = 1;
- BINARY = 2;
+ PROTOBUF = 2;
}
- optional MessageFormat format = 1;
+ optional PayloadFormat format = 1;
}
message CommandResponse {