From 73ed63729dd3eb8ceac5361fb2337343c35e2b6f Mon Sep 17 00:00:00 2001 From: "yu.dongliang" <18588496441@163.com> Date: Tue, 5 Sep 2023 16:06:33 +0800 Subject: [PATCH] scf_eda.proto --- scf_eda.pb-c.c | 36 +++++++++++++++++++++++++++++++----- scf_eda.pb-c.h | 4 +++- scf_eda.proto | 4 +++- ses_step_va.c | 2 +- 4 files changed, 38 insertions(+), 8 deletions(-) diff --git a/scf_eda.pb-c.c b/scf_eda.pb-c.c index 482c4cc..f81f035 100644 --- a/scf_eda.pb-c.c +++ b/scf_eda.pb-c.c @@ -721,7 +721,7 @@ const ProtobufCMessageDescriptor scf_econn__descriptor = (ProtobufCMessageInit) scf_econn__init, NULL,NULL,NULL /* reserved[123] */ }; -static const ProtobufCFieldDescriptor scf_eline__field_descriptors[12] = +static const ProtobufCFieldDescriptor scf_eline__field_descriptors[14] = { { "id", @@ -856,9 +856,33 @@ static const ProtobufCFieldDescriptor scf_eline__field_descriptors[12] = 0,NULL,NULL /* reserved1,reserved2, etc */ }, { - "vflag", + "r", 12, PROTOBUF_C_LABEL_REQUIRED, + PROTOBUF_C_TYPE_DOUBLE, + 0, /* quantifier_offset */ + offsetof(ScfEline, r), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "jr", + 13, + PROTOBUF_C_LABEL_REQUIRED, + PROTOBUF_C_TYPE_DOUBLE, + 0, /* quantifier_offset */ + offsetof(ScfEline, jr), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "vflag", + 14, + PROTOBUF_C_LABEL_REQUIRED, PROTOBUF_C_TYPE_BOOL, 0, /* quantifier_offset */ offsetof(ScfEline, vflag), @@ -876,16 +900,18 @@ static const unsigned scf_eline__field_indices_by_name[] = { 3, /* field[3] = flags */ 0, /* field[0] = id */ 10, /* field[10] = ja */ + 12, /* field[12] = jr */ 8, /* field[8] = jv */ 6, /* field[6] = lines */ 1, /* field[1] = pins */ + 11, /* field[11] = r */ 7, /* field[7] = v */ - 11, /* field[11] = vflag */ + 13, /* field[13] = vflag */ }; static const ProtobufCIntRange scf_eline__number_ranges[1 + 1] = { { 1, 0 }, - { 0, 12 } + { 0, 14 } }; const ProtobufCMessageDescriptor scf_eline__descriptor = { @@ -895,7 +921,7 @@ const ProtobufCMessageDescriptor scf_eline__descriptor = "ScfEline", "", sizeof(ScfEline), - 12, + 14, scf_eline__field_descriptors, scf_eline__field_indices_by_name, 1, scf_eline__number_ranges, diff --git a/scf_eda.pb-c.h b/scf_eda.pb-c.h index 8c58f90..465d09c 100644 --- a/scf_eda.pb-c.h +++ b/scf_eda.pb-c.h @@ -101,11 +101,13 @@ struct _ScfEline double jv; double a; double ja; + double r; + double jr; protobuf_c_boolean vflag; }; #define SCF_ELINE__INIT \ { PROTOBUF_C_MESSAGE_INIT (&scf_eline__descriptor) \ - , 0, 0,NULL, 0, 0, 0, 0,NULL, 0,NULL, 0, 0, 0, 0, 0 } + , 0, 0,NULL, 0, 0, 0, 0,NULL, 0,NULL, 0, 0, 0, 0, 0, 0, 0 } struct _ScfEcomponent diff --git a/scf_eda.proto b/scf_eda.proto index 94f583e..af4d150 100644 --- a/scf_eda.proto +++ b/scf_eda.proto @@ -57,8 +57,10 @@ message scf_eline required double jv = 9; required double a = 10; required double ja = 11; + required double r = 12; + required double jr = 13; - required bool vflag = 12; + required bool vflag = 14; } message scf_ecomponent diff --git a/ses_step_va.c b/ses_step_va.c index 52a8535..065e086 100644 --- a/ses_step_va.c +++ b/ses_step_va.c @@ -108,7 +108,7 @@ static int __ses_path_jr(ScfEfunction* f, ses_path_t* path) r = r / R; jr = -jr / R; - double dr = p1->tr - (p0->tr + r); + double dr = p1->tr - (p0->tr + r); double jdr = p1->jtr - (p0->jtr + jr); for ( ; j < path->pins->size; j++) { -- 2.25.1