Skip to content
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

#120 Fix missing information on wind page #236

Merged
merged 2 commits into from
Sep 30, 2023

Conversation

charliefoxtwo
Copy link
Member

This is a follow-up to #222, which seems to have caused more issues than it fixed. This fixes most of the issues, but at least one remains that I'm not able to resolve at this time. I believe this to be an ED bug and I'm not sure how to work around it.

Background

It looks like WIND is the base page. WIND1 and WIND2 are the pages with the wind data. They seem to inherit from the base WIND page, as they have the same sort of header information. The SYS/SYS1/SYS2 pages seem to behave similarly in the code, however they hardly inherit anything and don't have conflicting definitions like these do.

It seems like what's going on here is that the WIND base page has an object called WINDTemp. This temperature is displayed in the top right, on line 2. The WIND1 page, responsible for showing the user-entered winds, also has an object called WINDTemp - which shows the temperature of the wind on the first line entered - but curiously, only when there isn't actually any temperature data to show.

As soon as data is added to that line, it's stored in WNDTemp1 and all is well.

What this PR does

This PR firstly rolls back the initial changes made in #222 as they were not effective.

Next, this PR stops showing WINDTemp on the subpages, and only on the base page. This has the side effect that if the first wind entry does not have a temperature, then *** is shown where the outside air temperature is supposed to be shown in the top right, and nothing is shown for that line. To the best of my knowledge, the outside air temperature isn't exposed anywhere for us to get during this time. This seems like an ED bug.

Finally, this PR adds support for parent pages to text displays. This means that WIND1 is able to show all items on WIND as well as all of its own items.

In pictures:

When no items are present, everything displays correctly

Screenshot_20230922_184001_TouchOSC

Upon adding an item with no temperature, OAT disappears

Screenshot_20230922_184015_TouchOSC
Screenshot_20230922_184024_TouchOSC

Upon adding a temperature, OAT is restored

Screenshot_20230922_184038_TouchOSC
Screenshot_20230922_184030_TouchOSC

There are no issues when items other than line 1 have no temperature

Screenshot_20230922_184057_TouchOSC

However, this issue occurs for line 1 on any page

Screenshot_20230922_184109_TouchOSC
Screenshot_20230922_184102_TouchOSC

And again, providing a temperature fixes the issue

Screenshot_20230922_184131_TouchOSC
Screenshot_20230922_184122_TouchOSC

@WarLord211
Copy link
Member

ready to merge? or need some tests?

@charliefoxtwo
Copy link
Member Author

Let's give some time for the person who opened #120 to provide feedback on these changes to make sure they're acceptable.

@charliefoxtwo charliefoxtwo linked an issue Sep 29, 2023 that may be closed by this pull request
@landre-cerp
Copy link

@charliefoxtwo Looks better ! Thanks.

@charliefoxtwo charliefoxtwo merged commit 844a923 into DCS-Skunkworks:master Sep 30, 2023
2 checks passed
@charliefoxtwo charliefoxtwo deleted the bugfix/a10-wind branch September 30, 2023 13:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

A10-C - CDU Display - CDU_Lines (SYS / LASTE / WIND )
3 participants