Skip to content

Commit b8f5ce6

Browse files
ashabelnikovashabelnikov
committed
Update version number, add ability to remap CKPS input
1 parent c048185 commit b8f5ce6

File tree

21 files changed

+541
-536
lines changed

21 files changed

+541
-536
lines changed

‎sources/Chart2D/resource.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
4444
/////////////////////////////////////////////////////////////////////////////
4545
//Version information
4646
VS_VERSION_INFO VERSIONINFO
47-
PRODUCTVERSION 4,3,0,0
47+
PRODUCTVERSION 4,4,0,0
4848
BEGIN
4949
BLOCK "StringFileInfo"
5050
BEGIN

‎sources/Chart3D/resource.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
6262
/////////////////////////////////////////////////////////////////////////////
6363
//Version information
6464
VS_VERSION_INFO VERSIONINFO
65-
PRODUCTVERSION 4,3,0,0
65+
PRODUCTVERSION 4,4,0,0
6666
BEGIN
6767
BLOCK "StringFileInfo"
6868
BEGIN

‎sources/FWImpExp/FWImpExp.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
183183
/////////////////////////////////////////////////////////////////////////////
184184
//Version information
185185
VS_VERSION_INFO VERSIONINFO
186-
PRODUCTVERSION 4,3,0,0
186+
PRODUCTVERSION 4,4,0,0
187187
BEGIN
188188
BLOCK "StringFileInfo"
189189
BEGIN

‎sources/HexUtils/hexutils.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
99
/////////////////////////////////////////////////////////////////////////////
1010
//Version information
1111
VS_VERSION_INFO VERSIONINFO
12-
PRODUCTVERSION 4,3,0,0
12+
PRODUCTVERSION 4,4,0,0
1313
BEGIN
1414
BLOCK "StringFileInfo"
1515
BEGIN

‎sources/HiSCCtrl/hiscctrl.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
99
/////////////////////////////////////////////////////////////////////////////
1010
//Version information
1111
VS_VERSION_INFO VERSIONINFO
12-
PRODUCTVERSION 4,3,0,0
12+
PRODUCTVERSION 4,4,0,0
1313
BEGIN
1414
BLOCK "StringFileInfo"
1515
BEGIN

‎sources/MIdesk/MIdesk.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
358358
/////////////////////////////////////////////////////////////////////////////
359359
//Version information
360360
VS_VERSION_INFO VERSIONINFO
361-
PRODUCTVERSION 4,3,0,0
361+
PRODUCTVERSION 4,4,0,0
362362
BEGIN
363363
BLOCK "StringFileInfo"
364364
BEGIN

‎sources/ParamDesk/Params/CKPSPageDlg.cpp

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ BEGIN_MESSAGE_MAP(CCKPSPageDlg, Super)
4141
ON_EN_CHANGE(IDC_PD_CKPS_MISS_NUM_EDIT, OnChangeDataCogsNum)
4242

4343
ON_BN_CLICKED(IDC_PD_CKPS_MERGE_IGN_OUTPUTS, OnChangeMergeOutputs)
44-
ON_BN_CLICKED(IDC_PD_CKPS_USE_CKPS_INPUT, OnChangeUseCKPSInput)
4544
ON_BN_CLICKED(IDC_PD_CKPS_POSFRONT_RADIOBOX, OnClickedPdPosFrontRadio)
4645
ON_BN_CLICKED(IDC_PD_CKPS_NEGFRONT_RADIOBOX, OnClickedPdNegFrontRadio)
4746
ON_BN_CLICKED(IDC_PD_REF_S_POSFRONT_RADIOBOX, OnClickedPdPosFrontRadio2)
@@ -76,7 +75,6 @@ BEGIN_MESSAGE_MAP(CCKPSPageDlg, Super)
7675
ON_UPDATE_COMMAND_UI(IDC_PD_CKPS_MISS_NUM_UNIT, OnUpdateControls)
7776

7877
ON_UPDATE_COMMAND_UI(IDC_PD_CKPS_MERGE_IGN_OUTPUTS, OnUpdateMergeOutputs)
79-
ON_UPDATE_COMMAND_UI(IDC_PD_CKPS_USE_CKPS_INPUT, OnUpdateUseCKPSInput)
8078
END_MESSAGE_MAP()
8179

8280
CCKPSPageDlg::CCKPSPageDlg(CWnd* pParent /*=NULL*/)
@@ -100,7 +98,6 @@ CCKPSPageDlg::CCKPSPageDlg(CWnd* pParent /*=NULL*/)
10098
m_params.ckps_cogs_num = 60;
10199
m_params.ckps_miss_num = 2;
102100
m_params.ckps_engine_cyl = 4;
103-
m_params.use_ckps_for_hall = 0;
104101
m_params.hall_wnd_width = 60.0f;
105102
}
106103

@@ -150,7 +147,6 @@ void CCKPSPageDlg::DoDataExchange(CDataExchange* pDX)
150147
DDX_Radio_UCHAR(pDX, IDC_PD_CKPS_NEGFRONT_RADIOBOX, m_params.ckps_edge_type);
151148
DDX_Radio_UCHAR(pDX, IDC_PD_REF_S_NEGFRONT_RADIOBOX, m_params.ref_s_edge_type);
152149
DDX_Check_UCHAR(pDX, IDC_PD_CKPS_MERGE_IGN_OUTPUTS, m_params.ckps_merge_ign_outs);
153-
DDX_Check_UCHAR(pDX, IDC_PD_CKPS_USE_CKPS_INPUT, m_params.use_ckps_for_hall);
154150
}
155151

156152
/////////////////////////////////////////////////////////////////////////////
@@ -164,12 +160,12 @@ void CCKPSPageDlg::OnUpdateControls(CCmdUI* pCmdUI)
164160

165161
void CCKPSPageDlg::OnUpdateCKPSFront(CCmdUI* pCmdUI)
166162
{
167-
pCmdUI->Enable(m_enabled && (m_ckps_enabled || m_params.use_ckps_for_hall));
163+
pCmdUI->Enable(m_enabled/* && (m_ckps_enabled)*/);
168164
}
169165

170166
void CCKPSPageDlg::OnUpdateControls_REF_S_Front(CCmdUI* pCmdUI)
171167
{
172-
pCmdUI->Enable(m_enabled && m_params.ckps_miss_num == 0 && m_ckps_enabled);
168+
pCmdUI->Enable(m_enabled/* && m_params.ckps_miss_num == 0 && m_ckps_enabled*/);
173169
}
174170

175171
void CCKPSPageDlg::OnUpdateIgnitionCogs(CCmdUI* pCmdUI)
@@ -188,11 +184,6 @@ void CCKPSPageDlg::OnUpdateMergeOutputs(CCmdUI* pCmdUI)
188184
pCmdUI->Enable(m_enabled && m_inpmrg_enabled && m_ckps_enabled);
189185
}
190186

191-
void CCKPSPageDlg::OnUpdateUseCKPSInput(CCmdUI* pCmdUI)
192-
{
193-
pCmdUI->Enable(m_enabled && !m_ckps_enabled); //enabled only for Hall sensor
194-
}
195-
196187
void CCKPSPageDlg::OnUpdateHallWndWidth(CCmdUI* pCmdUI)
197188
{
198189
pCmdUI->Enable(m_enabled && !m_ckps_enabled); //enabled only for Hall sensor
@@ -316,13 +307,6 @@ void CCKPSPageDlg::OnClickedPdNegFrontRadio2()
316307
OnChangeNotify();
317308
}
318309

319-
void CCKPSPageDlg::OnChangeUseCKPSInput()
320-
{
321-
UpdateData();
322-
UpdateDialogControls(this, TRUE);
323-
OnChangeNotify();
324-
}
325-
326310
void CCKPSPageDlg::OnChangeMergeOutputs()
327311
{
328312
UpdateData();

‎sources/ParamDesk/Params/CKPSPageDlg.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ class CCKPSPageDlg : public CParamTabBaseDlg, public ParamPageEvents
7272
afx_msg void OnUpdateHallWndWidth(CCmdUI* pCmdUI);
7373
afx_msg void OnUpdateCylNumber(CCmdUI* pCmdUI);
7474
afx_msg void OnUpdateMergeOutputs(CCmdUI* pCmdUI);
75-
afx_msg void OnUpdateUseCKPSInput(CCmdUI* pCmdUI);
7675
afx_msg void OnUpdateCKPSFront(CCmdUI* pCmdUI);
7776
DECLARE_MESSAGE_MAP()
7877

‎sources/ParamDesk/Params/IORemappingDlg.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ const UINT CIORemappingDlg::IDD = IDD_IO_REMAPPING;
4040

4141
//See also FirmwareDataMediator.h
4242
const UINT IOCaptionStart = IDC_IO_REMAPPING_IGN_OUT1_CAPTION;
43-
const UINT IOCaptionEnd = IDC_IO_REMAPPING_REF_S_CAPTION;
43+
const UINT IOCaptionEnd = IDC_IO_REMAPPING_CKPS_CAPTION;
4444
const UINT IOComboboxStart = IDC_IO_REMAPPING_IGN_OUT1_COMBOBOX;
45-
const UINT IOComboboxEnd = IDC_IO_REMAPPING_REF_S_COMBOBOX;
45+
const UINT IOComboboxEnd = IDC_IO_REMAPPING_CKPS_COMBOBOX;
4646
const UINT IOCheckboxStart = IDC_IO_REMAPPING_IGN_OUT1_CHECKBOX;
47-
const UINT IOCheckboxEnd = IDC_IO_REMAPPING_REF_S_CHECKBOX;
47+
const UINT IOCheckboxEnd = IDC_IO_REMAPPING_CKPS_CHECKBOX;
4848
const UINT IOTTStrStart = IDS_IO_REMAPPING_IGN_OUT1_TT;
49-
const UINT IOTTStrEnd = IDS_IO_REMAPPING_REF_S_TT;
49+
const UINT IOTTStrEnd = IDS_IO_REMAPPING_CKPS_TT;
5050

5151
BEGIN_MESSAGE_MAP(CIORemappingDlg, CModelessDialog)
5252
ON_CONTROL_RANGE(CBN_SELCHANGE, IOComboboxStart, IOComboboxEnd, OnChangeSelection)
@@ -123,7 +123,7 @@ BOOL CIORemappingDlg::OnInitDialog()
123123
//initialize window scroller
124124
mp_scr->Init(this);
125125
CRect wndRect; GetWindowRect(&wndRect);
126-
mp_scr->SetViewSize(0, int(wndRect.Height() * 1.28f));
126+
mp_scr->SetViewSize(0, int(wndRect.Height() * 1.32f));
127127

128128
UpdateDialogControls(this, TRUE);
129129
UpdateData(FALSE);

‎sources/ParamDesk/Resources/ParamDesk.rc

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -377,9 +377,6 @@ BEGIN
377377
CONTROL "�������.",IDC_PD_REF_S_NEGFRONT_RADIOBOX,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,93,14,48,10
378378
CONTROL "�����.",IDC_PD_REF_S_POSFRONT_RADIOBOX,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,93,28,41,10
379379
GROUPBOX "����� ���",IDC_PD_REF_S_FRONT_GROUPBOX,87,3,59,39
380-
CONTROL "������������ ��� �� ���� ����",
381-
IDC_PD_CKPS_USE_CKPS_INPUT,"Button",BS_AUTOCHECKBOX |
382-
BS_MULTILINE | WS_TABSTOP,16,43,148,12
383380
CONTROL "����������� ������� �����",
384381
IDC_PD_CKPS_MERGE_IGN_OUTPUTS,"Button",BS_AUTOCHECKBOX |
385382
BS_MULTILINE | WS_TABSTOP,16,54,148,12
@@ -842,6 +839,12 @@ BEGIN
842839
CONTROL "��������",
843840
IDC_IO_REMAPPING_GAS_V_CHECKBOX,"Button",BS_AUTOCHECKBOX |
844841
BS_RIGHTBUTTON | BS_RIGHT | WS_TABSTOP,123,231,48,12
842+
RTEXT "CKPS",IDC_IO_REMAPPING_CKPS_CAPTION,0,245,50,13
843+
COMBOBOX IDC_IO_REMAPPING_CKPS_COMBOBOX,53,244,55,100,
844+
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
845+
CONTROL "��������",
846+
IDC_IO_REMAPPING_CKPS_CHECKBOX,"Button",BS_AUTOCHECKBOX |
847+
BS_RIGHTBUTTON | BS_RIGHT | WS_TABSTOP,123,244,48,12
845848
END
846849

847850
IDD_MAP_CALC DIALOGEX 0, 0, 211, 140
@@ -955,6 +958,7 @@ BEGIN
955958
IDS_IO_REMAPPING_ADD_I2_TT "���� ���������� 2"
956959
IDS_IO_REMAPPING_REF_S_TT "���� ���"
957960
IDS_IO_REMAPPING_GAS_V_TT "���� �������� �������"
961+
IDS_IO_REMAPPING_CKPS_TT "���� ����"
958962
END
959963

960964
STRINGTABLE
@@ -1461,9 +1465,6 @@ BEGIN
14611465
CONTROL "Falling",IDC_PD_REF_S_NEGFRONT_RADIOBOX,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,93,14,48,10
14621466
CONTROL "Rising",IDC_PD_REF_S_POSFRONT_RADIOBOX,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,93,28,41,10
14631467
GROUPBOX "REF_S edge",IDC_PD_REF_S_FRONT_GROUPBOX,87,3,59,39
1464-
CONTROL "Use CKPS input for Hall sensor",
1465-
IDC_PD_CKPS_USE_CKPS_INPUT,"Button",BS_AUTOCHECKBOX |
1466-
BS_MULTILINE | WS_TABSTOP,16,43,148,12
14671468
CONTROL "Merge signals to single output",
14681469
IDC_PD_CKPS_MERGE_IGN_OUTPUTS,"Button",BS_AUTOCHECKBOX |
14691470
BS_MULTILINE | WS_TABSTOP,16,54,148,12
@@ -1926,6 +1927,12 @@ BEGIN
19261927
CONTROL "Invert",
19271928
IDC_IO_REMAPPING_GAS_V_CHECKBOX,"Button",BS_AUTOCHECKBOX |
19281929
BS_RIGHTBUTTON | BS_RIGHT | WS_TABSTOP,123,231,48,12
1930+
RTEXT "CKPS",IDC_IO_REMAPPING_CKPS_CAPTION,0,245,50,13
1931+
COMBOBOX IDC_IO_REMAPPING_CKPS_COMBOBOX,53,244,55,100,
1932+
CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
1933+
CONTROL "Invert",
1934+
IDC_IO_REMAPPING_CKPS_CHECKBOX,"Button",BS_AUTOCHECKBOX |
1935+
BS_RIGHTBUTTON | BS_RIGHT | WS_TABSTOP,123,244,48,12
19291936
END
19301937

19311938
IDD_MAP_CALC DIALOGEX 0, 0, 211, 140
@@ -2050,6 +2057,7 @@ BEGIN
20502057
IDS_IO_REMAPPING_ADD_I2_TT "Analog input 2"
20512058
IDS_IO_REMAPPING_REF_S_TT "Referense sensor input (VR)"
20522059
IDS_IO_REMAPPING_GAS_V_TT "Gas valve input"
2060+
IDS_IO_REMAPPING_CKPS_TT "CKP sensor input"
20532061
END
20542062

20552063
STRINGTABLE
@@ -2188,7 +2196,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
21882196
/////////////////////////////////////////////////////////////////////////////
21892197
//Version information
21902198
VS_VERSION_INFO VERSIONINFO
2191-
PRODUCTVERSION 4,3,0,0
2199+
PRODUCTVERSION 4,4,0,0
21922200
BEGIN
21932201
BLOCK "StringFileInfo"
21942202
BEGIN

0 commit comments

Comments
 (0)