update native/eda

diff --git a/native/eda/scf_eda_pack.c b/native/eda/scf_eda_pack.c
index 6eec93497383acad0ce2e78cd0eea07929d65a1c..8d3988b3fe343cca00d469db86fe7dcc341c480b 100644 (file)
--- a/native/eda/scf_eda_pack.c
+++ b/native/eda/scf_eda_pack.c
@@ -17,25 +17,25 @@ static int component_pins[SCF_EDA_Components_NB] =
 
 static scf_edata_t  component_datas[] =
 {
-       {SCF_EDA_None,       0,                   0,  0, 0,         0,     0,    0, 0},
-       {SCF_EDA_Battery,    0, SCF_EDA_Battery_POS,  0, 0,         0,     0,    0, 0},
+       {SCF_EDA_None,       0,                   0, 0, 0,    0,   0,   0, 0},
+       {SCF_EDA_Battery,    0, SCF_EDA_Battery_POS, 0, 0,    0,   0,   0, 0},
 
-       {SCF_EDA_Resistor,   0,                   0,  0, 0, 10 * 1000,     0,    0, 0},
-       {SCF_EDA_Capacitor,  0,                   0,  0, 0,      1e12,   0.1,    0, 0},
-       {SCF_EDA_Inductor,   0,                   0,  0, 0,         0,     0, 1000, 0},
+       {SCF_EDA_Resistor,   0,                   0, 0, 0,  1e4,   0,   0, 0},
+       {SCF_EDA_Capacitor,  0,                   0, 0, 0,   10, 0.1,   0, 0},
+       {SCF_EDA_Inductor,   0,                   0, 0, 0,    0,   0, 1e3, 0},
 };
 
 static scf_edata_t  pin_datas[] =
 {
-       {SCF_EDA_None,  0,                 0, 0, 0,   0, 0, 0, 0},
+       {SCF_EDA_None,       0,                   0, 0, 0,    0,   0,   0, 0},
 
-       {SCF_EDA_Diode, 0, SCF_EDA_Diode_NEG, 0, 0, 750, 0, 0, 0},
+       {SCF_EDA_Diode,      0,   SCF_EDA_Diode_NEG, 0, 0,  750,   0,   0, 0},
 
-       {SCF_EDA_NPN,   0, SCF_EDA_NPN_B,     0, 0, 750, 0, 0, 0},
-       {SCF_EDA_NPN,   0, SCF_EDA_NPN_C,     0, 0,  10, 0, 0, 150},
+       {SCF_EDA_NPN,        0,       SCF_EDA_NPN_B, 0, 0,  750,   0,   0, 0},
+       {SCF_EDA_NPN,        0,       SCF_EDA_NPN_C, 0, 0,   10,   0,   0, 150},
 
-       {SCF_EDA_PNP,   0, SCF_EDA_PNP_B,     0, 0, 750, 0, 0, 0},
-       {SCF_EDA_PNP,   0, SCF_EDA_PNP_C,     0, 0,  10, 0, 0, 150},
+       {SCF_EDA_PNP,        0,       SCF_EDA_PNP_B, 0, 0,  750,   0,   0, 0},
+       {SCF_EDA_PNP,        0,       SCF_EDA_PNP_C, 0, 0,   10,   0,   0, 150},
 };
 
 static scf_edata_t* _pin_find_data(const uint64_t type, const uint64_t model, const uint64_t pid)

diff --git a/native/eda/scf_eda_pack.h b/native/eda/scf_eda_pack.h
index e5e6d3b59631804c3eac4ea26972b185d22d78e3..2cf8303057c0e89cde1d11771e952ad9d2d5b736 100644 (file)
--- a/native/eda/scf_eda_pack.h
+++ b/native/eda/scf_eda_pack.h
@@ -77,6 +77,7 @@ typedef struct {
        double    v;
        double    a;
        double    r;
+
        double    uf;
        double    uh;
        double    hfe;
@@ -118,10 +119,15 @@ struct scf_epin_s
        SCF_PACK_DEF_VAR(double, uh);
        SCF_PACK_DEF_VAR(double, hfe);
 
+       SCF_PACK_DEF_VAR(double, jdr);
        SCF_PACK_DEF_VAR(double, dr);
+
        SCF_PACK_DEF_VAR(double, sr);
        SCF_PACK_DEF_VAR(double, pr);
 
+       SCF_PACK_DEF_VAR(double, jsr);
+       SCF_PACK_DEF_VAR(double, jpr);
+
        SCF_PACK_DEF_VAR(uint64_t, path);
 
        SCF_PACK_DEF_VAR(int, x);
@@ -152,8 +158,13 @@ SCF_PACK_INFO_VAR(ScfEpin, uf),
 SCF_PACK_INFO_VAR(ScfEpin, uh),
 SCF_PACK_INFO_VAR(ScfEpin, hfe),
 
+SCF_PACK_INFO_VAR(ScfEpin, jdr),
 SCF_PACK_INFO_VAR(ScfEpin, dr),
+
 SCF_PACK_INFO_VAR(ScfEpin, sr),
+SCF_PACK_INFO_VAR(ScfEpin, pr),
+SCF_PACK_INFO_VAR(ScfEpin, jsr),
+SCF_PACK_INFO_VAR(ScfEpin, jpr),
 
 SCF_PACK_INFO_VAR(ScfEpin, path),
 SCF_PACK_INFO_VAR(ScfEpin, x),
@@ -222,10 +233,14 @@ struct scf_ecomponent_s
        SCF_PACK_DEF_VAR(double, v);
        SCF_PACK_DEF_VAR(double, a);
 
+       SCF_PACK_DEF_VAR(double, dr);
+       SCF_PACK_DEF_VAR(double, jdr);
+
        SCF_PACK_DEF_VAR(double, r);
        SCF_PACK_DEF_VAR(double, uf);
        SCF_PACK_DEF_VAR(double, uh);
 
+       SCF_PACK_DEF_VAR(int64_t, count);
        SCF_PACK_DEF_VAR(int64_t, color);
        SCF_PACK_DEF_VAR(int, status);
        SCF_PACK_DEF_VAR(int, x);
@@ -245,10 +260,14 @@ SCF_PACK_INFO_OBJS(ScfEcomponent, pins, ScfEpin),
 SCF_PACK_INFO_VAR(ScfEcomponent, v),
 SCF_PACK_INFO_VAR(ScfEcomponent, a),
 
+SCF_PACK_INFO_VAR(ScfEcomponent, dr),
+SCF_PACK_INFO_VAR(ScfEcomponent, jdr),
+
 SCF_PACK_INFO_VAR(ScfEcomponent, r),
 SCF_PACK_INFO_VAR(ScfEcomponent, uf),
 SCF_PACK_INFO_VAR(ScfEcomponent, uh),
 
+SCF_PACK_INFO_VAR(ScfEcomponent, count),
 SCF_PACK_INFO_VAR(ScfEcomponent, color),
 SCF_PACK_INFO_VAR(ScfEcomponent, status),
 SCF_PACK_INFO_VAR(ScfEcomponent, x),