Code Review
/
apps
/
low-level-can-service.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Refactor diagnostic fields for decoding payload.
[apps/low-level-can-service.git]
/
gen
/
cpp
/
openxc.pb.h
diff --git
a/gen/cpp/openxc.pb.h
b/gen/cpp/openxc.pb.h
index
82ab987
..
e70324f
100644
(file)
--- a/
gen/cpp/openxc.pb.h
+++ b/
gen/cpp/openxc.pb.h
@@
-1,5
+1,5
@@
/* Automatically generated nanopb header */
/* Automatically generated nanopb header */
-/* Generated by nanopb-0.2.5 at
Mon Mar 24 17:19:53
2014. */
+/* Generated by nanopb-0.2.5 at
Wed Mar 26 09:29:06
2014. */
#ifndef _PB_OPENXC_PB_H_
#define _PB_OPENXC_PB_H_
#ifndef _PB_OPENXC_PB_H_
#define _PB_OPENXC_PB_H_
@@
-24,6
+24,11
@@
typedef enum _openxc_ControlCommand_Type {
openxc_ControlCommand_Type_DIAGNOSTIC = 3
} openxc_ControlCommand_Type;
openxc_ControlCommand_Type_DIAGNOSTIC = 3
} openxc_ControlCommand_Type;
+typedef enum _openxc_DiagnosticRequest_DecodedType {
+ openxc_DiagnosticRequest_DecodedType_NONE = 1,
+ openxc_DiagnosticRequest_DecodedType_OBD2 = 2
+} openxc_DiagnosticRequest_DecodedType;
+
typedef enum _openxc_DynamicField_Type {
openxc_DynamicField_Type_STRING = 1,
openxc_DynamicField_Type_NUM = 2,
typedef enum _openxc_DynamicField_Type {
openxc_DynamicField_Type_STRING = 1,
openxc_DynamicField_Type_NUM = 2,
@@
-65,14
+70,12
@@
typedef struct _openxc_DiagnosticRequest {
openxc_DiagnosticRequest_payload_t payload;
bool has_multiple_responses;
bool multiple_responses;
openxc_DiagnosticRequest_payload_t payload;
bool has_multiple_responses;
bool multiple_responses;
- bool has_factor;
- double factor;
- bool has_offset;
- double offset;
bool has_frequency;
double frequency;
bool has_name;
char name[10];
bool has_frequency;
double frequency;
bool has_name;
char name[10];
+ bool has_decoded_type;
+ openxc_DiagnosticRequest_DecodedType decoded_type;
} openxc_DiagnosticRequest;
typedef struct {
} openxc_DiagnosticRequest;
typedef struct {
@@
-168,10
+171,9
@@
typedef struct _openxc_VehicleMessage {
#define openxc_DiagnosticRequest_pid_tag 4
#define openxc_DiagnosticRequest_payload_tag 5
#define openxc_DiagnosticRequest_multiple_responses_tag 6
#define openxc_DiagnosticRequest_pid_tag 4
#define openxc_DiagnosticRequest_payload_tag 5
#define openxc_DiagnosticRequest_multiple_responses_tag 6
-#define openxc_DiagnosticRequest_factor_tag 7
-#define openxc_DiagnosticRequest_offset_tag 8
-#define openxc_DiagnosticRequest_frequency_tag 9
-#define openxc_DiagnosticRequest_name_tag 10
+#define openxc_DiagnosticRequest_frequency_tag 7
+#define openxc_DiagnosticRequest_name_tag 8
+#define openxc_DiagnosticRequest_decoded_type_tag 9
#define openxc_DiagnosticResponse_bus_tag 1
#define openxc_DiagnosticResponse_message_id_tag 2
#define openxc_DiagnosticResponse_mode_tag 3
#define openxc_DiagnosticResponse_bus_tag 1
#define openxc_DiagnosticResponse_message_id_tag 2
#define openxc_DiagnosticResponse_mode_tag 3
@@
-205,17
+207,17
@@
extern const pb_field_t openxc_VehicleMessage_fields[7];
extern const pb_field_t openxc_RawMessage_fields[4];
extern const pb_field_t openxc_ControlCommand_fields[3];
extern const pb_field_t openxc_CommandResponse_fields[3];
extern const pb_field_t openxc_RawMessage_fields[4];
extern const pb_field_t openxc_ControlCommand_fields[3];
extern const pb_field_t openxc_CommandResponse_fields[3];
-extern const pb_field_t openxc_DiagnosticRequest_fields[1
1
];
+extern const pb_field_t openxc_DiagnosticRequest_fields[1
0
];
extern const pb_field_t openxc_DiagnosticResponse_fields[9];
extern const pb_field_t openxc_DynamicField_fields[5];
extern const pb_field_t openxc_TranslatedMessage_fields[5];
/* Maximum encoded size of messages (where known) */
extern const pb_field_t openxc_DiagnosticResponse_fields[9];
extern const pb_field_t openxc_DynamicField_fields[5];
extern const pb_field_t openxc_TranslatedMessage_fields[5];
/* Maximum encoded size of messages (where known) */
-#define openxc_VehicleMessage_size 6
76
+#define openxc_VehicleMessage_size 6
64
#define openxc_RawMessage_size 27
#define openxc_RawMessage_size 27
-#define openxc_ControlCommand_size
88
+#define openxc_ControlCommand_size
76
#define openxc_CommandResponse_size 137
#define openxc_CommandResponse_size 137
-#define openxc_DiagnosticRequest_size
80
+#define openxc_DiagnosticRequest_size
68
#define openxc_DiagnosticResponse_size 56
#define openxc_DynamicField_size 119
#define openxc_TranslatedMessage_size 350
#define openxc_DiagnosticResponse_size 56
#define openxc_DynamicField_size 119
#define openxc_TranslatedMessage_size 350