LogAnalyser fixes #2241
Closed
LogAnalyser fixes #2241
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -521,7 +521,7 @@ def process(self, lineNumber, e): | |||
| self.modeChanges[lineNumber] = (modes[int(e.Mode)], e.ThrCrs) | |||
| except: | |||
| self.modeChanges[lineNumber] = (e.Mode, e.ThrCrs) | |||
| elif self.vehicleType == "ArduPlane" or self.vehicleType == "ArduRover": | |||
| elif self.vehicleType in ["ArduPlane", "APM:Plane", "ArduRover", "APM:Rover", "APM:Copter"]: | |||
There was a problem hiding this comment.
I think APM:Copter should be moved to the entry above
There was a problem hiding this comment.
I am afraid that wouldn't work. I moved it here intentionally to fix AttributeError execptions, as newer Copter releases write a MODE line similar to Plane/Rover (e.Mode and e.ModeNum attributes instead of e.ThrCrs). The change as proposed above seems to work with logs from both ArduCopter 3.2.1 and AC 3.3-rc3.
|
Hi Holger. Can you make the simple fix I've outlined and re-submit the PR and we will merge it in. |
|
Thanks Holger for updating. We will get the change merged in. Keep the code coming! |
|
merged, thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2240. Seems to work again with ArduCopter 3.2.1 and ArduCopter 3.3-rc3 logs.