scf_eda.proto

diff --git a/scf_eda.pb-c.c b/scf_eda.pb-c.c
index 8419d8cd3f0c6aa954a304101aaf5c8272c0e741..8106cad515144eb3c7becf4588d061fc83c01628 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[22] =
+static const ProtobufCFieldDescriptor scf_epin__field_descriptors[24] =
 {
   {
     "id",
@@ -556,11 +556,35 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[22] =
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "sr",
+    "dr",
     15,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_DOUBLE,
     0,   /* quantifier_offset */
+    offsetof(ScfEpin, dr),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "jdr",
+    16,
+    PROTOBUF_C_LABEL_REQUIRED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    0,   /* quantifier_offset */
+    offsetof(ScfEpin, jdr),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "sr",
+    17,
+    PROTOBUF_C_LABEL_REQUIRED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    0,   /* quantifier_offset */
     offsetof(ScfEpin, sr),
     NULL,
     NULL,
@@ -569,7 +593,7 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[22] =
   },
   {
     "jsr",
-    16,
+    18,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_DOUBLE,
     0,   /* quantifier_offset */
@@ -581,7 +605,7 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[22] =
   },
   {
     "pr",
-    17,
+    19,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_DOUBLE,
     0,   /* quantifier_offset */
@@ -593,7 +617,7 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[22] =
   },
   {
     "jpr",
-    18,
+    20,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_DOUBLE,
     0,   /* quantifier_offset */
@@ -605,7 +629,7 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[22] =
   },
   {
     "x",
-    19,
+    21,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT32,
     0,   /* quantifier_offset */
@@ -617,7 +641,7 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[22] =
   },
   {
     "y",
-    20,
+    22,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT32,
     0,   /* quantifier_offset */
@@ -629,7 +653,7 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[22] =
   },
   {
     "vflag",
-    21,
+    23,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_BOOL,
     0,   /* quantifier_offset */
@@ -641,7 +665,7 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[22] =
   },
   {
     "pflag",
-    22,
+    24,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_BOOL,
     0,   /* quantifier_offset */
@@ -656,30 +680,32 @@ static const unsigned scf_epin__field_indices_by_name[] = {
   8,   /* field[8] = a */
   5,   /* field[5] = c_lid */
   1,   /* field[1] = cid */
+  14,   /* field[14] = dr */
   3,   /* field[3] = flags */
   0,   /* field[0] = id */
   9,   /* field[9] = ja */
-  17,   /* field[17] = jpr */
+  15,   /* field[15] = jdr */
+  19,   /* field[19] = jpr */
   11,   /* field[11] = jr */
-  15,   /* field[15] = jsr */
+  17,   /* field[17] = jsr */
   7,   /* field[7] = jv */
   2,   /* field[2] = lid */
-  21,   /* field[21] = pflag */
-  16,   /* field[16] = pr */
+  23,   /* field[23] = pflag */
+  18,   /* field[18] = pr */
   10,   /* field[10] = r */
-  14,   /* field[14] = sr */
+  16,   /* field[16] = sr */
   4,   /* field[4] = tos */
   12,   /* field[12] = uF */
   13,   /* field[13] = uH */
   6,   /* field[6] = v */
-  20,   /* field[20] = vflag */
-  18,   /* field[18] = x */
-  19,   /* field[19] = y */
+  22,   /* field[22] = vflag */
+  20,   /* field[20] = x */
+  21,   /* field[21] = y */
 };
 static const ProtobufCIntRange scf_epin__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 22 }
+  { 0, 24 }
 };
 const ProtobufCMessageDescriptor scf_epin__descriptor =
 {
@@ -689,7 +715,7 @@ const ProtobufCMessageDescriptor scf_epin__descriptor =
   "ScfEpin",
   "",
   sizeof(ScfEpin),
-  22,
+  24,
   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 512bf7d1062590859d238467fbd5b42c0bda0763..bd2ec8caa567af4c999859152a35c4423d1e655a 100644 (file)
--- a/scf_eda.pb-c.h
+++ b/scf_eda.pb-c.h
@@ -60,6 +60,8 @@ struct  _ScfEpin
   double jr;
   double uf;
   double uh;
+  double dr;
+  double jdr;
   double sr;
   double jsr;
   double pr;
@@ -71,7 +73,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, 0 }
+    , 0, 0, 0, 0, 0,NULL, 0, 0, 0, 0, 0, 0, 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 2a8aa984aa25abe5712269df2b82070a54b0c2a0..f7c3c1bfddb41b22b7071cfea3ffd9f19c549f68 100644 (file)
--- a/scf_eda.proto
+++ b/scf_eda.proto
@@ -27,16 +27,19 @@ message scf_epin
        required double    uF    = 13;
        required double    uH    = 14;
 
-       required double    sr    = 15;
-       required double    jsr   = 16;
+       required double    dr    = 15;
+       required double    jdr   = 16;
 
-       required double    pr    = 17;
-       required double    jpr   = 18;
+       required double    sr    = 17;
+       required double    jsr   = 18;
 
-       required int32     x     = 19;
-       required int32     y     = 20;
-       required bool      vflag = 21;
-       required bool      pflag = 22;
+       required double    pr    = 19;
+       required double    jpr   = 20;
+
+       required int32     x     = 21;
+       required int32     y     = 22;
+       required bool      vflag = 23;
+       required bool      pflag = 24;
 }
 
 message scf_econn