diff --git a/motors/synrm_5f_40s.py b/motors/synrm_5f_40s.py index de271c9..0f0d588 100644 --- a/motors/synrm_5f_40s.py +++ b/motors/synrm_5f_40s.py @@ -239,8 +239,8 @@ def extract_results(self, solutions): Flux_d1, Flux_q1 = to_dq(flux_phases, theta_el, harmonic=1) Flux_d3, Flux_q3 = to_dq(flux_phases, theta_el, harmonic=3) - Vind_d1, Vind_q1 = to_dq(vind_phases, theta_el, harmonic=1) - Vind_d3, Vind_q3 = to_dq(vind_phases, theta_el, harmonic=3) + Vind_d1, Vind_q1 = (v / 1e3 for v in to_dq(vind_phases, theta_el, harmonic=1)) + Vind_d3, Vind_q3 = (v / 1e3 for v in to_dq(vind_phases, theta_el, harmonic=3)) I_d1, I_q1 = (v / 1e3 for v in to_dq(current_phases, theta_el, harmonic=1)) I_d3, I_q3 = (v / 1e3 for v in to_dq(current_phases, theta_el, harmonic=3)) # mA to A @@ -256,7 +256,7 @@ def extract_results(self, solutions): phase_offset = -2 * np.pi * k / 5 # 5 angles, 0deg, -72deg, -144deg, -216deg, -288deg dI_dt_phases[:, k] = -Im1 * self.w * np.sin(self.w * time + phase_offset + epsI1 - np.pi) - Im3 * 3 * self.w * np.sin(3 * (self.w * time + phase_offset) + epsI3 - np.pi) - V_phases = vind_phases + self.Rstat * current_phases + self.Lew * dI_dt_phases + V_phases = vind_phases / 1e3 + self.Rstat * current_phases / 1e3 + self.Lew * dI_dt_phases V_d1, V_q1 = to_dq(V_phases, theta_el, harmonic=1) V_d3, V_q3 = to_dq(V_phases, theta_el, harmonic=3)