scf_eda.proto

diff --git a/scf_eda.pb-c.c b/scf_eda.pb-c.c
index 646a1f1f01891f43f8ff3208320dcbbdc2eb2f1d..09a1cc3460a175c180fed4395d42c63bf8a625f0 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[12] =
+static const ProtobufCFieldDescriptor scf_epin__field_descriptors[16] =
 {
   {
     "id",
@@ -484,9 +484,57 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[12] =
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "x",
+    "R",
     9,
     PROTOBUF_C_LABEL_REQUIRED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    0,   /* quantifier_offset */
+    offsetof(ScfEpin, r),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "jR",
+    10,
+    PROTOBUF_C_LABEL_REQUIRED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    0,   /* quantifier_offset */
+    offsetof(ScfEpin, jr),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "uF",
+    11,
+    PROTOBUF_C_LABEL_REQUIRED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    0,   /* quantifier_offset */
+    offsetof(ScfEpin, uf),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "uH",
+    12,
+    PROTOBUF_C_LABEL_REQUIRED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    0,   /* quantifier_offset */
+    offsetof(ScfEpin, uh),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "x",
+    13,
+    PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT32,
     0,   /* quantifier_offset */
     offsetof(ScfEpin, x),
@@ -497,7 +545,7 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[12] =
   },
   {
     "y",
-    10,
+    14,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_INT32,
     0,   /* quantifier_offset */
@@ -509,7 +557,7 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[12] =
   },
   {
     "vflag",
-    11,
+    15,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_BOOL,
     0,   /* quantifier_offset */
@@ -521,7 +569,7 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[12] =
   },
   {
     "pflag",
-    12,
+    16,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_BOOL,
     0,   /* quantifier_offset */
@@ -534,22 +582,26 @@ static const ProtobufCFieldDescriptor scf_epin__field_descriptors[12] =
 };
 static const unsigned scf_epin__field_indices_by_name[] = {
   7,   /* field[7] = A */
+  8,   /* field[8] = R */
   6,   /* field[6] = V */
   5,   /* field[5] = c_lid */
   1,   /* field[1] = cid */
   3,   /* field[3] = flags */
   0,   /* field[0] = id */
+  9,   /* field[9] = jR */
   2,   /* field[2] = lid */
-  11,   /* field[11] = pflag */
+  15,   /* field[15] = pflag */
   4,   /* field[4] = tos */
-  10,   /* field[10] = vflag */
-  8,   /* field[8] = x */
-  9,   /* field[9] = y */
+  10,   /* field[10] = uF */
+  11,   /* field[11] = uH */
+  14,   /* field[14] = vflag */
+  12,   /* field[12] = x */
+  13,   /* field[13] = y */
 };
 static const ProtobufCIntRange scf_epin__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 12 }
+  { 0, 16 }
 };
 const ProtobufCMessageDescriptor scf_epin__descriptor =
 {
@@ -559,7 +611,7 @@ const ProtobufCMessageDescriptor scf_epin__descriptor =
   "ScfEpin",
   "",
   sizeof(ScfEpin),
-  12,
+  16,
   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 96f407f9e1f4c87bbd47c13f26f81ee52857b2fb..99273f6e90e2096f56cad1579857122384b9f315 100644 (file)
--- a/scf_eda.pb-c.h
+++ b/scf_eda.pb-c.h
@@ -54,6 +54,10 @@ struct  _ScfEpin
   uint64_t c_lid;
   double v;
   double a;
+  double r;
+  double jr;
+  double uf;
+  double uh;
   int32_t x;
   int32_t y;
   protobuf_c_boolean vflag;
@@ -61,7 +65,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,NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 
 struct  _ScfEconn

diff --git a/scf_eda.proto b/scf_eda.proto
index b6f6c56a111fe9f487ad07d19dd327a23ff8afa0..2d28c7215fca99a3dd86afdd3838ef2e1a75ffa4 100644 (file)
--- a/scf_eda.proto
+++ b/scf_eda.proto
@@ -19,11 +19,15 @@ message scf_epin
 
        required double    V     = 7;
        required double    A     = 8;
-
-       required int32     x     = 9;
-       required int32     y     = 10;
-       required bool      vflag = 11;
-       required bool      pflag = 12;
+       required double    R     = 9;
+       required double    jR    = 10;
+       required double    uF    = 11;
+       required double    uH    = 12;
+
+       required int32     x     = 13;
+       required int32     y     = 14;
+       required bool      vflag = 15;
+       required bool      pflag = 16;
 }
 
 message scf_econn