Merge pull request #98 from diydrones/Issue97-v3.3-PM-Lines-fail-resilience-check

Issue97- v3.3 PM lines fail the resilience checks

Author: bionicbone

AMP Log Analiser x1.v12.suo

@@ -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" />

AMP Log Analiser x1/AMP Log Analiser x1.vbproj

@@ -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

AMP Log Analiser x1/Classes/modMainReadFile.vb

@@ -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