diff options
author | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
---|---|---|
committer | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/lib/netlist/devices/nld_r2r_dac.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/lib/netlist/devices/nld_r2r_dac.cpp')
-rw-r--r-- | src/lib/netlist/devices/nld_r2r_dac.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/netlist/devices/nld_r2r_dac.cpp b/src/lib/netlist/devices/nld_r2r_dac.cpp index 284b6673f76..4c29389d491 100644 --- a/src/lib/netlist/devices/nld_r2r_dac.cpp +++ b/src/lib/netlist/devices/nld_r2r_dac.cpp @@ -5,9 +5,9 @@ * */ -#include "netlist/nl_base.h" -#include "netlist/analog/nlid_twoterm.h" -#include "netlist/nl_factory.h" +#include "../nl_base.h" +#include "../nl_factory.h" +#include "../analog/nlid_twoterm.h" namespace netlist { @@ -39,17 +39,17 @@ namespace netlist NETLIB_UPDATE_PARAM(r2r_dac) { - solve_now(); + update_dev(); double V = m_VIN() / static_cast<double>(1 << m_num()) * static_cast<double>(m_val()); - this->set_G_V_I(1.0 / m_R(), V, 0.0); + this->set(1.0 / m_R(), V, 0.0); } } //namespace analog namespace devices { - NETLIB_DEVICE_IMPL_NS(analog, r2r_dac, "R2R_DAC", "VIN,R,N") - } // namespace devices + NETLIB_DEVICE_IMPL_NS(analog, r2r_dac) + } } // namespace netlist |