Self-commissioning of permanent-magnet (PM) synchronous machines (PMSMs) is of prime importance in an industrial drive system because control performance and system stability depend heavily on the accurate machine parameter information. This presentation focuses on a combination of offline and online parameter estimation for a non-salient pole PMSM which eliminates the need for any prior knowledge on machine parameters. Stator resistance and inductance are first identified at standstill utilising fundamental and high-frequency excitation signals, respectively. A novel method has been developed and employed for inductance estimation. Then, stator resistance, inductance and PM flux are updated online using a recursive least-squares (RLS) algorithm. The proposed controllers are designed using MATLAB/Simulink and implemented on the d-Space real-time system incorporating a commercially available PMSM drive.