From cba21b34b2e2cdb6dce29c0a7ca079b98b1d6708 Mon Sep 17 00:00:00 2001 From: "yu.dongliang" <18588496441@163.com> Date: Wed, 19 Jul 2023 17:05:56 +0800 Subject: [PATCH] scf_eda.proto --- scf_eda.pb-c.c | 135 +++++++++++++++++++++++++++++++++++++++++-------- scf_eda.pb-c.h | 13 +++-- scf_eda.proto | 32 ++++++++---- 3 files changed, 145 insertions(+), 35 deletions(-) diff --git a/scf_eda.pb-c.c b/scf_eda.pb-c.c index 70d1464..7c45572 100644 --- a/scf_eda.pb-c.c +++ b/scf_eda.pb-c.c @@ -578,7 +578,7 @@ const ProtobufCMessageDescriptor scf_econn__descriptor = (ProtobufCMessageInit) scf_econn__init, NULL,NULL,NULL /* reserved[123] */ }; -static const ProtobufCFieldDescriptor scf_eline__field_descriptors[7] = +static const ProtobufCFieldDescriptor scf_eline__field_descriptors[9] = { { "id", @@ -653,9 +653,33 @@ static const ProtobufCFieldDescriptor scf_eline__field_descriptors[7] = 0,NULL,NULL /* reserved1,reserved2, etc */ }, { - "vflag", + "V", 7, PROTOBUF_C_LABEL_REQUIRED, + PROTOBUF_C_TYPE_DOUBLE, + 0, /* quantifier_offset */ + offsetof(ScfEline, v), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "A", + 8, + PROTOBUF_C_LABEL_REQUIRED, + PROTOBUF_C_TYPE_DOUBLE, + 0, /* quantifier_offset */ + offsetof(ScfEline, a), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "vflag", + 9, + PROTOBUF_C_LABEL_REQUIRED, PROTOBUF_C_TYPE_BOOL, 0, /* quantifier_offset */ offsetof(ScfEline, vflag), @@ -666,18 +690,20 @@ static const ProtobufCFieldDescriptor scf_eline__field_descriptors[7] = }, }; static const unsigned scf_eline__field_indices_by_name[] = { + 7, /* field[7] = A */ + 6, /* field[6] = V */ 4, /* field[4] = conns */ 3, /* field[3] = dfo */ 2, /* field[2] = flags */ 0, /* field[0] = id */ 5, /* field[5] = lines */ 1, /* field[1] = pins */ - 6, /* field[6] = vflag */ + 8, /* field[8] = vflag */ }; static const ProtobufCIntRange scf_eline__number_ranges[1 + 1] = { { 1, 0 }, - { 0, 7 } + { 0, 9 } }; const ProtobufCMessageDescriptor scf_eline__descriptor = { @@ -687,14 +713,14 @@ const ProtobufCMessageDescriptor scf_eline__descriptor = "ScfEline", "", sizeof(ScfEline), - 7, + 9, scf_eline__field_descriptors, scf_eline__field_indices_by_name, 1, scf_eline__number_ranges, (ProtobufCMessageInit) scf_eline__init, NULL,NULL,NULL /* reserved[123] */ }; -static const ProtobufCFieldDescriptor scf_ecomponent__field_descriptors[9] = +static const ProtobufCFieldDescriptor scf_ecomponent__field_descriptors[14] = { { "id", @@ -721,12 +747,12 @@ static const ProtobufCFieldDescriptor scf_ecomponent__field_descriptors[9] = 0,NULL,NULL /* reserved1,reserved2, etc */ }, { - "dfo", + "model", 3, PROTOBUF_C_LABEL_REQUIRED, - PROTOBUF_C_TYPE_INT64, + PROTOBUF_C_TYPE_UINT64, 0, /* quantifier_offset */ - offsetof(ScfEcomponent, dfo), + offsetof(ScfEcomponent, model), NULL, NULL, 0, /* flags */ @@ -745,9 +771,69 @@ static const ProtobufCFieldDescriptor scf_ecomponent__field_descriptors[9] = 0,NULL,NULL /* reserved1,reserved2, etc */ }, { - "x", + "V", 5, PROTOBUF_C_LABEL_REQUIRED, + PROTOBUF_C_TYPE_DOUBLE, + 0, /* quantifier_offset */ + offsetof(ScfEcomponent, v), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "A", + 6, + PROTOBUF_C_LABEL_REQUIRED, + PROTOBUF_C_TYPE_DOUBLE, + 0, /* quantifier_offset */ + offsetof(ScfEcomponent, a), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "data", + 7, + PROTOBUF_C_LABEL_REQUIRED, + PROTOBUF_C_TYPE_DOUBLE, + 0, /* quantifier_offset */ + offsetof(ScfEcomponent, data), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "dfo", + 8, + PROTOBUF_C_LABEL_REQUIRED, + PROTOBUF_C_TYPE_INT64, + 0, /* quantifier_offset */ + offsetof(ScfEcomponent, dfo), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "status", + 9, + PROTOBUF_C_LABEL_REQUIRED, + PROTOBUF_C_TYPE_INT32, + 0, /* quantifier_offset */ + offsetof(ScfEcomponent, status), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "x", + 10, + PROTOBUF_C_LABEL_REQUIRED, PROTOBUF_C_TYPE_INT32, 0, /* quantifier_offset */ offsetof(ScfEcomponent, x), @@ -758,7 +844,7 @@ static const ProtobufCFieldDescriptor scf_ecomponent__field_descriptors[9] = }, { "y", - 6, + 11, PROTOBUF_C_LABEL_REQUIRED, PROTOBUF_C_TYPE_INT32, 0, /* quantifier_offset */ @@ -770,7 +856,7 @@ static const ProtobufCFieldDescriptor scf_ecomponent__field_descriptors[9] = }, { "w", - 7, + 12, PROTOBUF_C_LABEL_REQUIRED, PROTOBUF_C_TYPE_INT32, 0, /* quantifier_offset */ @@ -782,7 +868,7 @@ static const ProtobufCFieldDescriptor scf_ecomponent__field_descriptors[9] = }, { "h", - 8, + 13, PROTOBUF_C_LABEL_REQUIRED, PROTOBUF_C_TYPE_INT32, 0, /* quantifier_offset */ @@ -794,7 +880,7 @@ static const ProtobufCFieldDescriptor scf_ecomponent__field_descriptors[9] = }, { "vflag", - 9, + 14, PROTOBUF_C_LABEL_REQUIRED, PROTOBUF_C_TYPE_BOOL, 0, /* quantifier_offset */ @@ -806,20 +892,25 @@ static const ProtobufCFieldDescriptor scf_ecomponent__field_descriptors[9] = }, }; static const unsigned scf_ecomponent__field_indices_by_name[] = { - 2, /* field[2] = dfo */ - 7, /* field[7] = h */ + 5, /* field[5] = A */ + 4, /* field[4] = V */ + 6, /* field[6] = data */ + 7, /* field[7] = dfo */ + 12, /* field[12] = h */ 0, /* field[0] = id */ + 2, /* field[2] = model */ 3, /* field[3] = pins */ + 8, /* field[8] = status */ 1, /* field[1] = type */ - 8, /* field[8] = vflag */ - 6, /* field[6] = w */ - 4, /* field[4] = x */ - 5, /* field[5] = y */ + 13, /* field[13] = vflag */ + 11, /* field[11] = w */ + 9, /* field[9] = x */ + 10, /* field[10] = y */ }; static const ProtobufCIntRange scf_ecomponent__number_ranges[1 + 1] = { { 1, 0 }, - { 0, 9 } + { 0, 14 } }; const ProtobufCMessageDescriptor scf_ecomponent__descriptor = { @@ -829,7 +920,7 @@ const ProtobufCMessageDescriptor scf_ecomponent__descriptor = "ScfEcomponent", "", sizeof(ScfEcomponent), - 9, + 14, scf_ecomponent__field_descriptors, scf_ecomponent__field_indices_by_name, 1, scf_ecomponent__number_ranges, diff --git a/scf_eda.pb-c.h b/scf_eda.pb-c.h index 9f24e0d..92ed591 100644 --- a/scf_eda.pb-c.h +++ b/scf_eda.pb-c.h @@ -85,11 +85,13 @@ struct _ScfEline ScfEconn **conns; size_t n_lines; ScfLine **lines; + double v; + double a; protobuf_c_boolean vflag; }; #define SCF_ELINE__INIT \ { PROTOBUF_C_MESSAGE_INIT (&scf_eline__descriptor) \ - , 0, 0,NULL, 0, 0, 0,NULL, 0,NULL, 0 } + , 0, 0,NULL, 0, 0, 0,NULL, 0,NULL, 0, 0, 0 } struct _ScfEcomponent @@ -97,9 +99,14 @@ struct _ScfEcomponent ProtobufCMessage base; uint64_t id; uint64_t type; - int64_t dfo; + uint64_t model; size_t n_pins; ScfEpin **pins; + double v; + double a; + double data; + int64_t dfo; + int32_t status; int32_t x; int32_t y; int32_t w; @@ -108,7 +115,7 @@ struct _ScfEcomponent }; #define SCF_ECOMPONENT__INIT \ { PROTOBUF_C_MESSAGE_INIT (&scf_ecomponent__descriptor) \ - , 0, 0, 0, 0,NULL, 0, 0, 0, 0, 0 } + , 0, 0, 0, 0,NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } struct _ScfEfunction diff --git a/scf_eda.proto b/scf_eda.proto index beb5a0e..526ef37 100644 --- a/scf_eda.proto +++ b/scf_eda.proto @@ -36,21 +36,33 @@ message scf_eline required int64 dfo = 4; repeated scf_econn conns = 5; repeated scf_line lines = 6; - required bool vflag = 7; + + required double V = 7; + required double A = 8; + + required bool vflag = 9; } message scf_ecomponent { - required uint64 id = 1; - required uint64 type = 2; - required int64 dfo = 3; - repeated scf_epin pins = 4; + required uint64 id = 1; + required uint64 type = 2; + required uint64 model = 3; + repeated scf_epin pins = 4; - required int32 x = 5; - required int32 y = 6; - required int32 w = 7; - required int32 h = 8; - required bool vflag = 9; + required double V = 5; + required double A = 6; + required double data = 7; + required int64 dfo = 8; + + required int32 status = 9; + + required int32 x = 10; + required int32 y = 11; + required int32 w = 12; + required int32 h = 13; + + required bool vflag = 14; } message scf_efunction -- 2.25.1