scf_eda.proto

diff --git a/scf_eda.pb-c.c b/scf_eda.pb-c.c
index 09a1cc3460a175c180fed4395d42c63bf8a625f0..55150a64a6ce5a5bfa9317432a32caf7ecf46056 100644 (file)
--- a/scf_eda.pb-c.c
+++ b/scf_eda.pb-c.c
@@ -385,7 +385,7 @@ const ProtobufCMessageDescriptor scf_line__descriptor =
   (ProtobufCMessageInit) scf_line__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-static const ProtobufCFieldDescriptor scf_epin__field_descriptors[16] =
+static const ProtobufCFieldDescriptor scf_epin__field_descriptors[18] =
 {
   {
     "id",
@@ -532,9 +532,33 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[16] =
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "x",
+    "tr",
     13,
     PROTOBUF_C_LABEL_REQUIRED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    0,   /* quantifier_offset */
+    offsetof(ScfEpin, tr),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "jtr",
+    14,
+    PROTOBUF_C_LABEL_REQUIRED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    0,   /* quantifier_offset */
+    offsetof(ScfEpin, jtr),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "x",
+    15,
+    PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT32,
     0,   /* quantifier_offset */
     offsetof(ScfEpin, x),
@@ -545,7 +569,7 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[16] =
   },
   {
     "y",
-    14,
+    16,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT32,
     0,   /* quantifier_offset */
@@ -557,7 +581,7 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[16] =
   },
   {
     "vflag",
-    15,
+    17,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_BOOL,
     0,   /* quantifier_offset */
@@ -569,7 +593,7 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[16] =
   },
   {
     "pflag",
-    16,
+    18,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_BOOL,
     0,   /* quantifier_offset */
@@ -589,19 +613,21 @@ static const unsigned scf_epin__field_indices_by_name[] = {
   3,   /* field[3] = flags */
   0,   /* field[0] = id */
   9,   /* field[9] = jR */
+  13,   /* field[13] = jtr */
   2,   /* field[2] = lid */
-  15,   /* field[15] = pflag */
+  17,   /* field[17] = pflag */
   4,   /* field[4] = tos */
+  12,   /* field[12] = tr */
   10,   /* field[10] = uF */
   11,   /* field[11] = uH */
-  14,   /* field[14] = vflag */
-  12,   /* field[12] = x */
-  13,   /* field[13] = y */
+  16,   /* field[16] = vflag */
+  14,   /* field[14] = x */
+  15,   /* field[15] = y */
 };
 static const ProtobufCIntRange scf_epin__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 16 }
+  { 0, 18 }
 };
 const ProtobufCMessageDescriptor scf_epin__descriptor =
 {
@@ -611,7 +637,7 @@ const ProtobufCMessageDescriptor scf_epin__descriptor =
   "ScfEpin",
   "",
   sizeof(ScfEpin),
-  16,
+  18,
   scf_epin__field_descriptors,
   scf_epin__field_indices_by_name,
   1,  scf_epin__number_ranges,

diff --git a/scf_eda.pb-c.h b/scf_eda.pb-c.h
index 99273f6e90e2096f56cad1579857122384b9f315..6bd25ac7bf1f71b74bbdfd41e3c3871c5eb62766 100644 (file)
--- a/scf_eda.pb-c.h
+++ b/scf_eda.pb-c.h
@@ -58,6 +58,8 @@ struct  _ScfEpin
   double jr;
   double uf;
   double uh;
+  double tr;
+  double jtr;
   int32_t x;
   int32_t y;
   protobuf_c_boolean vflag;
@@ -65,7 +67,7 @@ struct  _ScfEpin
 };
 #define SCF_EPIN__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&scf_epin__descriptor) \
-    , 0, 0, 0, 0, 0,NULL, 0, 0, 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  _ScfEconn

diff --git a/scf_eda.proto b/scf_eda.proto
index 2d28c7215fca99a3dd86afdd3838ef2e1a75ffa4..c68bc6ab6418b6ee0f259a867dfb2f470463a301 100644 (file)
--- a/scf_eda.proto
+++ b/scf_eda.proto
@@ -24,10 +24,13 @@ message scf_epin
        required double    uF    = 11;
        required double    uH    = 12;
 
-       required int32     x     = 13;
-       required int32     y     = 14;
-       required bool      vflag = 15;
-       required bool      pflag = 16;
+       required double    tr    = 13;
+       required double    jtr   = 14;
+
+       required int32     x     = 15;
+       required int32     y     = 16;
+       required bool      vflag = 17;
+       required bool      pflag = 18;
 }
 
 message scf_econn