Skip to content

Commit bc534e5

Browse files
committed
Merge pull request #109 from diydrones/Manually-Do-Pull-Request--(
Manually Re-Code Pull Request
2 parents 2664ee8 + ead96aa commit bc534e5

File tree

5 files changed

+0
-37
lines changed

5 files changed

+0
-37
lines changed

AMP Log Analiser x1.v12.suo

0 Bytes
Binary file not shown.

AMP Log Analiser x1/Classes/modFile_Handling.vb

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,6 @@ Module modFile_Handling
3535
FileDataSuitable = False
3636
' Function returns True if we need to exit the file processing.
3737

38-
' v3.2 Issue - Display warning if Params have been found at the end
39-
If WarnAboutExtraParams = True Then
40-
WriteTextLog("WARNING: Curruption Of Parameter Lines Detected!")
41-
WriteTextLog("WARNING: the Analyzer tried to handle them.")
42-
WriteTextLog("WARNING: This is a v3.2 firmware issue that has been reported!")
43-
WriteTextLog("")
44-
End If
45-
4638
' v3.2 Issue - Display warning if FMTs have been found at the end
4739
If WarnAboutExtraFMT = True Then
4840
WriteTextLog("WARNING: Curruption Of FMT Lines Detected!")
@@ -257,11 +249,6 @@ Module modFile_Handling
257249
' Parameter Support for all Firmwares
258250
'A Parameter value should have only 3 pieces of data!
259251
If DataArray(0) = "PARM" Then
260-
If EndOfPARAM = True And IgnoreMoreParam = False Then
261-
WarnAboutExtraParams = True
262-
'MsgBox("Curruption Of Parameters Detected, the Analyzer is trying to handle them (V3.2 issue)!", vbOKOnly & vbExclamation, "Warning!")
263-
IgnoreMoreParam = True
264-
End If
265252
EndOfFMT = True
266253
If IsNumeric(DataArray(2)) = False Or IsNothing(DataArray(3)) = False Then
267254
Debug.Print("================================================================")

AMP Log Analiser x1/Classes/modPARAM_Checks.vb

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,12 @@
1414
'and advise that if the Motors do not spin on Arming then increase the
1515
'Motor Spin Arm upto a Max of Throttle Min.
1616
If PARM_THR_MIN <> 99 Or PARM_MOT_SPIN_ARMED <> 99 Then
17-
If PARM_MOT_SPIN_ARMED = 70 Then
18-
Call WriteParamHeader()
19-
WriteTextLog("MOT_SPIN_ARMED = " & PARM_MOT_SPIN_ARMED)
20-
WriteTextLog("Advice: If motors do not spin when armed calibrate ESC and then try increasing")
21-
WriteTextLog("the parameter MOT_SPIN_ARMED up from 70 in small increments.")
22-
WriteTextLog("http://ardupilot.com/forum/viewtopic.php?f=25&t=5345&sid=3171087bcf7d84e03491e1845eaa9393")
23-
WriteTextLog(vbNewLine)
24-
End If
25-
If PARM_THR_MIN <> 0 And PARM_MOT_SPIN_ARMED <> 0 Then
26-
If PARM_THR_MIN <> 130 Or PARM_MOT_SPIN_ARMED <> 70 Then
27-
Call WriteParamHeader()
28-
WriteTextLog("THR_MIN = " & PARM_THR_MIN)
29-
WriteTextLog("MOT_SPIN_ARMED = " & PARM_MOT_SPIN_ARMED)
30-
WriteTextLog("Warning: MOT_SPIN_ARMED & THR_MIN parameters have been altered from their defaults.")
31-
WriteTextLog("They should be 70 & 130 respectively unless the motors do not spin when armed.")
32-
WriteTextLog("http://ardupilot.com/forum/viewtopic.php?f=25&t=5345&sid=3171087bcf7d84e03491e1845eaa9393")
33-
WriteTextLog(vbNewLine)
34-
End If
35-
End If
3617
If PARM_THR_MIN <> 0 And PARM_MOT_SPIN_ARMED <> 0 Then
3718
If PARM_MOT_SPIN_ARMED > PARM_THR_MIN Then
3819
Call WriteParamHeader()
3920
WriteTextLog("THR_MIN = " & PARM_THR_MIN)
4021
WriteTextLog("MOT_SPIN_ARMED = " & PARM_MOT_SPIN_ARMED)
4122
WriteTextLog("Warning: MOT_SPIN_ARMED is greater then THR_MIN parameter, this is dangerous!")
42-
WriteTextLog("These parameter should be 70 & 130 respectively unless the motors do not spin when armed.")
4323
WriteTextLog("http://ardupilot.com/forum/viewtopic.php?f=25&t=5345&sid=3171087bcf7d84e03491e1845eaa9393")
4424
WriteTextLog(vbNewLine)
4525
End If

AMP Log Analiser x1/Classes/modVariable_Declarations.vb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,6 @@ Module modVariable_Declarations
8484
Public EndOfFMT As Boolean = False 'True when we find the first parameter of data.
8585
Public FoundPARAM As Boolean = False 'True when the first PARAM line is found.
8686
Public EndOfPARAM As Boolean = False 'True when we find the first Data
87-
Public IgnoreMoreParam As Boolean = False ' True when the user has already been warned about the extra Parameters found.
88-
Public WarnAboutExtraParams As Boolean = False ' True if the log should report that parameters were found at the end (v3.2 issue)
8987
Public WarnAboutExtraFMT As Boolean = False ' True if the log should report that FMTs were found at the end (v3.2 issue)
9088
Public TruncationIssue As Boolean = False 'Used during DataLog file reading to detect truncation issues.
9189

AMP Log Analiser x1/Classes/modVariable_Initialisation.vb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
EndOfFMT = False 'True when we find the first parameter of data.
1111
FoundPARAM = False 'True when the first PARAM line is found.
1212
EndOfPARAM = False 'True when we find the first Data
13-
IgnoreMoreParam = False ' True when the user has already been warned about the extra Parameters found.
14-
WarnAboutExtraParams = False ' True if the log should report that parameters were found at the end (v3.2 issue)
1513
WarnAboutExtraFMT = False ' True if the log should report that FMTs were found at the end (v3.2 issue)
1614
TruncationIssue = False 'Used during DataLog file reading to detect truncation issues.
1715

0 commit comments

Comments
 (0)