Repository navigation
fix: S5 project conversion - #261
Merged
Merged
Conversation
This file contains hidden or 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
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.
We ran a bunch of conversions for S5 projects and saw some issues in the S5 implementations. Here are some fixes for exporting project data for old S5 projects
Projectfiles/Step5Project.cs: Comment blocks were read as a second FB/PB/OB/DB, because the library used the block's own type byte. => A block whose type byte doesn't match the type of the file section it sits in takes the section's type.
Step5BlocksFolder.cs: Name lookup compared "DV13" against "S5_DV13", so pre-headers and comments were never merged. => Strip the S5_ prefix before comparing.
PLCs/S5/MC5/MC5toDB.cs: DBs with a comment block but no pre-header failed with "error parsing the Block Comments". => Default rows are now added to the row list the comment parser indexes into.
PLCs/S5/MC5/MC5LIB_SYMTAB.cs: The opcode table gave L QB (0x5F00) a 6-bit parameter instead of 8, so FBs were parsed off word alignment and read past the end. 6 → 8.