Skip to content

Issue97- v3.3 PM lines fail the resilience checks #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 22, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified AMP Log Analiser x1.v12.suo
Binary file not shown.
1 change: 1 addition & 0 deletions AMP Log Analiser x1/AMP Log Analiser x1.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@
<Compile Include="Classes\modOther_Functions.vb" />
<Compile Include="Classes\modPARAM_Checks.vb" />
<Compile Include="Classes\modPM_Checks_v3_1.vb" />
<Compile Include="Classes\modPM_Checks_v3_3.vb" />
<Compile Include="Classes\modPM_Checks_v3_2.vb" />
<Compile Include="Classes\modPM_MainAnalysis.vb" />
<Compile Include="Classes\modTakeOffEvent.vb" />
Expand Down
4 changes: 3 additions & 1 deletion AMP Log Analiser x1/Classes/modMainReadFile.vb
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,10 @@ Module modMainReadFile
If DataArray(0) = "PM" Then
If ReadFileVersion = 3.1 Then
Call PM_Checks_v3_1()
Else
ElseIf ReadFileVersion = 3.2 Then
Call PM_Checks_v3_2()
Else
Call PM_Checks_v3_3()
End If
End If
End If
Expand Down
27 changes: 27 additions & 0 deletions AMP Log Analiser x1/Classes/modPM_Checks_v3_3.vb
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
Module modPM_Checks_v3_3
Public Sub PM_Checks_v3_3()

'This part only check the correct data structure of the data line
'and prepares the variables ready for the MainAnalysis which
'is called directly after by this code.

' THIS CODE MUST ONLY BE CALLED AFTER THE DATA LINE HAS BEEN VALIDATED AS THE CORRECT TYPE !!!

If ReadFileResilienceCheck(6) = True Then
'v3.2 - FMT, 6, 17, PM, HHIhBHB, NLon, NLoop, MaxT, Pmt, I2CErr, INSErr, INAVErr
'v3.3 - FMT, 6, 16, PM, HHIhBH, NLon, NLoop, MaxT, PMT, I2CErr, INSErr
Log_PM_RenCnt = 0
Log_PM_RenBlw = 0
Log_PM_NLon = Val(DataArray(1))
Log_PM_NLoop = Val(DataArray(2))
Log_PM_MaxT = Val(DataArray(3))
Log_PM_PMT = Val(DataArray(4))
Log_PM_I2CErr = Val(DataArray(5))
Log_PM_INSErr = Val(DataArray(6))
'Debug.Print("Processing:- " & Str(DataLine) & ": " & Data)
PM_Delay_Counter = PM_Delay_Counter + 1
Call PM_MainAnalysis()
End If

End Sub
End Module
2 changes: 0 additions & 2 deletions AMP Log Analiser x1/Forms/Form1.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 25 additions & 25 deletions AMP Log Analiser x1/Forms/Form1.resx

Large diffs are not rendered by default.

Binary file not shown.