-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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
Reorganise stats screens #9617
Reorganise stats screens #9617
Conversation
Very nice update. I see the blackbox filename is available too - very useful. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a comment ...
I really don't like copying buff
onto itself, when instead one could:
tfp_sprintf(buff+strlen(buff), " %c%05" PRId32 " ", SYM_BLACKBOX, logNumber);
Couldn't you? For the same effect.
Done. I found a few other occurrences throughout the OSD.c file. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Couple of comments, one trivial / pedantry, the other needs at least a second opinion.
@MrD-RC We can't push it to 7.1. The change in |
I was wondering about that. But, I figured that both options for |
Then agreed. @MrD-RC please resolve conflicts and let's merge to |
Add some icons for ESP32Radar instead of have ?. Update displayport_msp_bf_compat.c fix some ;
- fixed buffer issue - agreed to pedantry ;)
4ded247
to
ac74878
Compare
I'll change that separately. |
- Show `stats` if enabled and space allows on the post flight statistics - Improve the layout of some elements
- Removed blank spaces from data, to make it look neater - Current and Power are now on a single row
I guess also missed to be merged and got a few new conflicts @DzikuVx |
I’ve been holding off merging until 7.1 comes out and those changes are merged with master. |
This is causing problems with MSP DisplayPort. I hope to fix the issue and reinstate it in #9688
I need to test in flight on an MSP DisplayPort platform and disarm in flight. If that all goes ok, this will be good to merge. |
Tested in flight with MSP DisplayPort. It worked as expected. |
This started as a basic re-organisation of the stats screens. But kinda grew a little. The main result is still a slightly more organised stats screen. But it adds a few more stats. Also, where things are now separated, it will be easier to make stats customisable.
Here's an example of the stats screen in Avatar (HITL) from 2 sequential flights.
![Stats - 2 sequential flights](https://private-user-images.githubusercontent.com/17590174/294128789-274109dc-704c-4f5f-98eb-c18707a47a47.jpg?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkyMzA2NjIsIm5iZiI6MTczOTIzMDM2MiwicGF0aCI6Ii8xNzU5MDE3NC8yOTQxMjg3ODktMjc0MTA5ZGMtNzA0Yy00ZjVmLTk4ZWItYzE4NzA3YTQ3YTQ3LmpwZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMTAlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjEwVDIzMzI0MlomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTJkYWZlNTNmMzBkYzkyNTNlZTA0MDM3NjQ4ZTIyNTA5OGQ0MDI2MWUxMWU3NjRiNTRmMjI2ZmQ5OTJmNzI1ZjImWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.HCqX-JuUuOQzTDCHRfM4hTjmSJT-jWdywORKwE_Unrg)
Here are examples of the analogue stats screen. Note, that I have updated the AVG EFFICIENCY F/T to fit.
![image](https://private-user-images.githubusercontent.com/17590174/294785472-abb76756-55ac-4835-999d-48bc32db1630.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzkyMzA2NjIsIm5iZiI6MTczOTIzMDM2MiwicGF0aCI6Ii8xNzU5MDE3NC8yOTQ3ODU0NzItYWJiNzY3NTYtNTVhYy00ODM1LTk5OWQtNDhiYzMyZGIxNjMwLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMTAlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjEwVDIzMzI0MlomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPWY4MDY2ZTNlOTNiOTk0ZjY2Mzc3ZWM3MzMyYTA3ZjhjMDc2ZDEwNjIyZGMyMzIxNDYzZmNkMThmMTA3Y2VmNGImWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.cjy7F673MM9vakPt9ZmMgTuQlsL21QA8gq3DUhMWziY)
Bug Fixes
Not all stats were resetting on arm. As these are flight stats, this should be the case. I have gone through and made sure that all stats now reset when armed. But, not reset after an in-flight re-arm. The exception is the energy used from the battery. It is understandable that this stat would be useful if it were persistent. So both are shown. Total from when the battery was plugged in and the amount since arming.
New data on the stats screen
set osd_stats_show_metric_efficiency = on
Other things of note
osd_stats_min_voltage_unit
has been removed, as both battery and cell voltages are shown nowRequires Configurator iNavFlight/inav-configurator#1941