diff options
| author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-10-11 19:26:19 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-11 19:26:19 -0300 |
| commit | 28760ff098cf5ef68cb95c869c2cd96ea5c324ec (patch) | |
| tree | 9eea1f1d2622446b3bf64d8cf0864c9a9aafad34 /Project/GeneratorStabForm.cpp | |
| parent | a32372968abb2f4b3bf0472f59c18f5028d20206 (diff) | |
| parent | 7fb65c6ec6148a75830ad25b7f76500c17db0f3b (diff) | |
| download | PSP.git-28760ff098cf5ef68cb95c869c2cd96ea5c324ec.tar.gz PSP.git-28760ff098cf5ef68cb95c869c2cd96ea5c324ec.tar.xz PSP.git-28760ff098cf5ef68cb95c869c2cd96ea5c324ec.zip | |
Merge pull request #40 from Thales1330/wip-mimo-control-system
Wip mimo control system
Diffstat (limited to 'Project/GeneratorStabForm.cpp')
| -rw-r--r-- | Project/GeneratorStabForm.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Project/GeneratorStabForm.cpp b/Project/GeneratorStabForm.cpp index 7a68391..9a468b7 100644 --- a/Project/GeneratorStabForm.cpp +++ b/Project/GeneratorStabForm.cpp @@ -67,7 +67,10 @@ void GeneratorStabForm::OnEditAVRButtonClick(wxCommandEvent& event) data.avr = new ControlElementContainer(); m_syncGenerator->SetElectricalData(data); } - ControlEditor* cEditor = new ControlEditor(m_parent, IOControl::IN_TERMINAL_VOLTAGE | IOControl::OUT_FIELD_VOLTAGE); + ControlEditor* cEditor = new ControlEditor( + m_parent, IOControl::IN_TERMINAL_VOLTAGE | IOControl::IN_ACTIVE_POWER | IOControl::IN_REACTIVE_POWER | + IOControl::IN_INITIAL_TERMINAL_VOLTAGE | IOControl::IN_VELOCITY | IOControl::IN_INITIAL_VELOCITY | + IOControl::IN_DELTA_VELOCITY | IOControl::IN_DELTA_ACTIVE_POWER | IOControl::OUT_FIELD_VOLTAGE); cEditor->SetElementsList(data.avr->GetControlElementsList()); cEditor->SetConnectionsList(data.avr->GetConnectionLineList()); cEditor->SetControlContainer(data.avr); @@ -86,7 +89,9 @@ void GeneratorStabForm::OnSpeedGovernorButtonClick(wxCommandEvent& event) data.speedGov = new ControlElementContainer(); m_syncGenerator->SetElectricalData(data); } - ControlEditor* cEditor = new ControlEditor(m_parent, IOControl::IN_VELOCITY | IOControl::OUT_MEC_POWER); + ControlEditor* cEditor = new ControlEditor( + m_parent, IOControl::IN_VELOCITY | IOControl::IN_ACTIVE_POWER | IOControl::IN_REACTIVE_POWER | + IOControl::IN_INITIAL_VELOCITY | IOControl::IN_INITIAL_MEC_POWER | IOControl::OUT_MEC_POWER); cEditor->SetElementsList(data.speedGov->GetControlElementsList()); cEditor->SetConnectionsList(data.speedGov->GetConnectionLineList()); cEditor->SetControlContainer(data.speedGov); |