scf_eda.proto

diff --git a/scf_eda.pb-c.c b/scf_eda.pb-c.c
index 7c45572ac58a1bf217191398174bc0044978d969..cfd953a028135c8727f38fd33cbde3251caa057e 100644 (file)
--- a/scf_eda.pb-c.c
+++ b/scf_eda.pb-c.c
@@ -720,7 +720,7 @@ const ProtobufCMessageDescriptor scf_eline__descriptor =
   (ProtobufCMessageInit) scf_eline__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-static const ProtobufCFieldDescriptor scf_ecomponent__field_descriptors[14] =
+static const ProtobufCFieldDescriptor scf_ecomponent__field_descriptors[17] =
 {
   {
     "id",
@@ -795,21 +795,57 @@ static const ProtobufCFieldDescriptor scf_ecomponent__field_descriptors[14] =
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "data",
+    "R",
     7,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_DOUBLE,
     0,   /* quantifier_offset */
-    offsetof(ScfEcomponent, data),
+    offsetof(ScfEcomponent, r),
     NULL,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "dfo",
+    "jR",
     8,
     PROTOBUF_C_LABEL_REQUIRED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    0,   /* quantifier_offset */
+    offsetof(ScfEcomponent, jr),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "uF",
+    9,
+    PROTOBUF_C_LABEL_REQUIRED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    0,   /* quantifier_offset */
+    offsetof(ScfEcomponent, uf),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "uH",
+    10,
+    PROTOBUF_C_LABEL_REQUIRED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    0,   /* quantifier_offset */
+    offsetof(ScfEcomponent, uh),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "dfo",
+    11,
+    PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT64,
     0,   /* quantifier_offset */
     offsetof(ScfEcomponent, dfo),
@@ -820,7 +856,7 @@ static const ProtobufCFieldDescriptor scf_ecomponent__field_descriptors[14] =
   },
   {
     "status",
-    9,
+    12,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT32,
     0,   /* quantifier_offset */
@@ -832,7 +868,7 @@ static const ProtobufCFieldDescriptor scf_ecomponent__field_descriptors[14] =
   },
   {
     "x",
-    10,
+    13,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT32,
     0,   /* quantifier_offset */
@@ -844,7 +880,7 @@ static const ProtobufCFieldDescriptor scf_ecomponent__field_descriptors[14] =
   },
   {
     "y",
-    11,
+    14,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT32,
     0,   /* quantifier_offset */
@@ -856,7 +892,7 @@ static const ProtobufCFieldDescriptor scf_ecomponent__field_descriptors[14] =
   },
   {
     "w",
-    12,
+    15,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT32,
     0,   /* quantifier_offset */
@@ -868,7 +904,7 @@ static const ProtobufCFieldDescriptor scf_ecomponent__field_descriptors[14] =
   },
   {
     "h",
-    13,
+    16,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT32,
     0,   /* quantifier_offset */
@@ -880,7 +916,7 @@ static const ProtobufCFieldDescriptor scf_ecomponent__field_descriptors[14] =
   },
   {
     "vflag",
-    14,
+    17,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_BOOL,
     0,   /* quantifier_offset */
@@ -893,24 +929,27 @@ static const ProtobufCFieldDescriptor scf_ecomponent__field_descriptors[14] =
 };
 static const unsigned scf_ecomponent__field_indices_by_name[] = {
   5,   /* field[5] = A */
+  6,   /* field[6] = R */
   4,   /* field[4] = V */
-  6,   /* field[6] = data */
-  7,   /* field[7] = dfo */
-  12,   /* field[12] = h */
+  10,   /* field[10] = dfo */
+  15,   /* field[15] = h */
   0,   /* field[0] = id */
+  7,   /* field[7] = jR */
   2,   /* field[2] = model */
   3,   /* field[3] = pins */
-  8,   /* field[8] = status */
+  11,   /* field[11] = status */
   1,   /* field[1] = type */
-  13,   /* field[13] = vflag */
-  11,   /* field[11] = w */
-  9,   /* field[9] = x */
-  10,   /* field[10] = y */
+  8,   /* field[8] = uF */
+  9,   /* field[9] = uH */
+  16,   /* field[16] = vflag */
+  14,   /* field[14] = w */
+  12,   /* field[12] = x */
+  13,   /* field[13] = y */
 };
 static const ProtobufCIntRange scf_ecomponent__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 14 }
+  { 0, 17 }
 };
 const ProtobufCMessageDescriptor scf_ecomponent__descriptor =
 {
@@ -920,7 +959,7 @@ const ProtobufCMessageDescriptor scf_ecomponent__descriptor =
   "ScfEcomponent",
   "",
   sizeof(ScfEcomponent),
-  14,
+  17,
   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 92ed5917f674020fd243fb437d2bd6480bdff908..a994154c74e89af6e06019398f585976830222a4 100644 (file)
--- a/scf_eda.pb-c.h
+++ b/scf_eda.pb-c.h
@@ -104,7 +104,10 @@ struct  _ScfEcomponent
   ScfEpin **pins;
   double v;
   double a;
-  double data;
+  double r;
+  double jr;
+  double uf;
+  double uh;
   int64_t dfo;
   int32_t status;
   int32_t x;
@@ -115,7 +118,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, 0 }
+    , 0, 0, 0, 0,NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 
 struct  _ScfEfunction

diff --git a/scf_eda.proto b/scf_eda.proto
index 526ef3710f7f0b08802a28409303be35e26e05bb..e7e645919aab2d6ed2d061d09c8582e005573848 100644 (file)
--- a/scf_eda.proto
+++ b/scf_eda.proto
@@ -52,17 +52,20 @@ message scf_ecomponent
 
        required double    V      = 5;
        required double    A      = 6;
-       required double    data   = 7;
-       required int64     dfo    = 8;
+       required double    R      = 7;
+       required double    jR     = 8;
+       required double    uF     = 9;
+       required double    uH     = 10;
 
-       required int32     status = 9;
+       required int64     dfo    = 11;
+       required int32     status = 12;
 
-       required int32     x      = 10;
-       required int32     y      = 11;
-       required int32     w      = 12;
-       required int32     h      = 13;
+       required int32     x      = 13;
+       required int32     y      = 14;
+       required int32     w      = 15;
+       required int32     h      = 16;
 
-       required bool      vflag  = 14;
+       required bool      vflag  = 17;
 }
 
 message scf_efunction