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

fix(color) - Layout updates and bug fixes for curve editor. #2973

Merged
merged 2 commits into from
Jan 15, 2023

Conversation

philmoz
Copy link
Collaborator

@philmoz philmoz commented Jan 2, 2023

The other curve rework PR has diverged into more discussion on how to do a better UI/UX which will probably be for the more distant future.

Raising this one to address more immediate concerns and bugs.

Fixes #2972
Fixes #1284

  • Fix issue where an invalid curve could be created
  • Use vertical layout for list of points
  • Add border to preview to better show end points
  • Fix issue where preview was redrawn very frequently
  • Better organisation of curve edit classes

@philmoz philmoz marked this pull request as draft January 2, 2023 06:37
@philmoz philmoz marked this pull request as ready for review January 2, 2023 08:16
@pfeerick pfeerick added enhancement ✨ New feature or request color Related generally to color LCD radios labels Jan 8, 2023
@pfeerick pfeerick added this to the 2.9 milestone Jan 8, 2023
Phil Mitchell added 2 commits January 11, 2023 17:35
- Fix issue 2972 where an invalid curve could be created
- Use vertical layout or list of points
- Add border to preview to better show end points
- Fix issue where preview was redrawn very frequently
- Better organisation of curve edit classes
@pfeerick
Copy link
Member

The most visible changes in this PR look good on TX16S and NV14, and indeed fixes that bug.

image

image

@pfeerick pfeerick merged commit cb9f411 into EdgeTX:main Jan 15, 2023
@pfeerick pfeerick linked an issue Jan 15, 2023 that may be closed by this pull request
1 task
pfeerick pushed a commit that referenced this pull request May 16, 2023
Formatting.

chore(ui): Convert GVAR tab to LVGL (#2945)

fix(ui): Adjust model setup button layout to better fit portrait screen (#2956)

* Adjust model setup layout to better fix on portrait LCD screen.

* Set buttons to fixed width and allow to grow vertically to fit text.

* Cleanup layout logic - buttons stretched horizontally, centered vertically.

fix(color): Invalid custom curves + layout updates (#2973)

* Layout updates and bug fixes for curve editor.
- Fix issue 2972 where an invalid curve could be created
- Use vertical layout or list of points
- Add border to preview to better show end points
- Fix issue where preview was redrawn very frequently
- Better organisation of curve edit classes

* Fix to refresh curve preview on input edit page when parameters changed.

chore: freeRTOS task stack diagnostics (#2976)

* migrated stack diagnostics (available, free) to using built in FreeRTOS builtin function

Note: main stack must be and is treated differently as it is not under FreeRTOS control. main stack is painted by the STM32 startup routine. free main stack is calculated checking the remaining painted stack area.

* corrected my merge error

* missed a blank

fix(lua): fix drawHudRectangle for roll = 0 (#2978)

- fixed an extra line at the bottom of the hud rectangle
- fixed overflowing hud rectangle for horizon outside viewport (pitch > 0)

fix(lua): Remove faulty carryTrim, replace with trimSource (#2995)

* Fix carryTrim in LUA

* Remove carryTrim

feat(diags): Red LED before RTC data, blue LED after (#3006)

* Added turning the red LED before RTC data and blue LED afterwards

With the LED turned RED if the RTC data retrieval fails it will stay red.
This will at least be an indication that the RTC startup encountered
a problem. For now there is no indication that this problem occurred.

* GH-3005 Moved LED manipulation to conditionally compiled when RTC operation happens

fix(color): Update top bar date & time when in setup pages (#3037)

fix(translation): JP had overlapping strings due to line breaks (#3004)

fix(cpn): Translate OFF in external module setup (#2998)

* Translate OFF in external module setup

* Update moduledata.cpp

Add B/W and CP support

Init enabled to 1

delete extra file

Fix Save/Read operations

Cleanup and fix R/W

Cleanup based on review

Change the fields order to match YAML

change the fields order to match the YAML

Add headers, set new CF to enabled

Remove "ON" label from "Enabled" field.
Fix "disabled" when swicthing functions.

Set enable==1 when changing the function.

Set "enabled" if function is changed on B/W radios
@philmoz philmoz deleted the curve-edit-fixes branch September 20, 2023 02:45
philmoz pushed a commit that referenced this pull request Oct 28, 2023
Formatting.

chore(ui): Convert GVAR tab to LVGL (#2945)

fix(ui): Adjust model setup button layout to better fit portrait screen (#2956)

* Adjust model setup layout to better fix on portrait LCD screen.

* Set buttons to fixed width and allow to grow vertically to fit text.

* Cleanup layout logic - buttons stretched horizontally, centered vertically.

fix(color): Invalid custom curves + layout updates (#2973)

* Layout updates and bug fixes for curve editor.
- Fix issue 2972 where an invalid curve could be created
- Use vertical layout or list of points
- Add border to preview to better show end points
- Fix issue where preview was redrawn very frequently
- Better organisation of curve edit classes

* Fix to refresh curve preview on input edit page when parameters changed.

chore: freeRTOS task stack diagnostics (#2976)

* migrated stack diagnostics (available, free) to using built in FreeRTOS builtin function

Note: main stack must be and is treated differently as it is not under FreeRTOS control. main stack is painted by the STM32 startup routine. free main stack is calculated checking the remaining painted stack area.

* corrected my merge error

* missed a blank

fix(lua): fix drawHudRectangle for roll = 0 (#2978)

- fixed an extra line at the bottom of the hud rectangle
- fixed overflowing hud rectangle for horizon outside viewport (pitch > 0)

fix(lua): Remove faulty carryTrim, replace with trimSource (#2995)

* Fix carryTrim in LUA

* Remove carryTrim

feat(diags): Red LED before RTC data, blue LED after (#3006)

* Added turning the red LED before RTC data and blue LED afterwards

With the LED turned RED if the RTC data retrieval fails it will stay red.
This will at least be an indication that the RTC startup encountered
a problem. For now there is no indication that this problem occurred.

* GH-3005 Moved LED manipulation to conditionally compiled when RTC operation happens

fix(color): Update top bar date & time when in setup pages (#3037)

fix(translation): JP had overlapping strings due to line breaks (#3004)

fix(cpn): Translate OFF in external module setup (#2998)

* Translate OFF in external module setup

* Update moduledata.cpp

Add B/W and CP support

Init enabled to 1

delete extra file

Fix Save/Read operations

Cleanup and fix R/W

Cleanup based on review

Change the fields order to match YAML

change the fields order to match the YAML

Add headers, set new CF to enabled

Remove "ON" label from "Enabled" field.
Fix "disabled" when swicthing functions.

Set enable==1 when changing the function.

Set "enabled" if function is changed on B/W radios
pfeerick pushed a commit that referenced this pull request Nov 12, 2023
Formatting.

chore(ui): Convert GVAR tab to LVGL (#2945)

fix(ui): Adjust model setup button layout to better fit portrait screen (#2956)

* Adjust model setup layout to better fix on portrait LCD screen.

* Set buttons to fixed width and allow to grow vertically to fit text.

* Cleanup layout logic - buttons stretched horizontally, centered vertically.

fix(color): Invalid custom curves + layout updates (#2973)

* Layout updates and bug fixes for curve editor.
- Fix issue 2972 where an invalid curve could be created
- Use vertical layout or list of points
- Add border to preview to better show end points
- Fix issue where preview was redrawn very frequently
- Better organisation of curve edit classes

* Fix to refresh curve preview on input edit page when parameters changed.

chore: freeRTOS task stack diagnostics (#2976)

* migrated stack diagnostics (available, free) to using built in FreeRTOS builtin function

Note: main stack must be and is treated differently as it is not under FreeRTOS control. main stack is painted by the STM32 startup routine. free main stack is calculated checking the remaining painted stack area.

* corrected my merge error

* missed a blank

fix(lua): fix drawHudRectangle for roll = 0 (#2978)

- fixed an extra line at the bottom of the hud rectangle
- fixed overflowing hud rectangle for horizon outside viewport (pitch > 0)

fix(lua): Remove faulty carryTrim, replace with trimSource (#2995)

* Fix carryTrim in LUA

* Remove carryTrim

feat(diags): Red LED before RTC data, blue LED after (#3006)

* Added turning the red LED before RTC data and blue LED afterwards

With the LED turned RED if the RTC data retrieval fails it will stay red.
This will at least be an indication that the RTC startup encountered
a problem. For now there is no indication that this problem occurred.

* GH-3005 Moved LED manipulation to conditionally compiled when RTC operation happens

fix(color): Update top bar date & time when in setup pages (#3037)

fix(translation): JP had overlapping strings due to line breaks (#3004)

fix(cpn): Translate OFF in external module setup (#2998)

* Translate OFF in external module setup

* Update moduledata.cpp

Add B/W and CP support

Init enabled to 1

delete extra file

Fix Save/Read operations

Cleanup and fix R/W

Cleanup based on review

Change the fields order to match YAML

change the fields order to match the YAML

Add headers, set new CF to enabled

Remove "ON" label from "Enabled" field.
Fix "disabled" when swicthing functions.

Set enable==1 when changing the function.

Set "enabled" if function is changed on B/W radios
pfeerick pushed a commit that referenced this pull request Nov 12, 2023
Formatting.

chore(ui): Convert GVAR tab to LVGL (#2945)

fix(ui): Adjust model setup button layout to better fit portrait screen (#2956)

* Adjust model setup layout to better fix on portrait LCD screen.

* Set buttons to fixed width and allow to grow vertically to fit text.

* Cleanup layout logic - buttons stretched horizontally, centered vertically.

fix(color): Invalid custom curves + layout updates (#2973)

* Layout updates and bug fixes for curve editor.
- Fix issue 2972 where an invalid curve could be created
- Use vertical layout or list of points
- Add border to preview to better show end points
- Fix issue where preview was redrawn very frequently
- Better organisation of curve edit classes

* Fix to refresh curve preview on input edit page when parameters changed.

chore: freeRTOS task stack diagnostics (#2976)

* migrated stack diagnostics (available, free) to using built in FreeRTOS builtin function

Note: main stack must be and is treated differently as it is not under FreeRTOS control. main stack is painted by the STM32 startup routine. free main stack is calculated checking the remaining painted stack area.

* corrected my merge error

* missed a blank

fix(lua): fix drawHudRectangle for roll = 0 (#2978)

- fixed an extra line at the bottom of the hud rectangle
- fixed overflowing hud rectangle for horizon outside viewport (pitch > 0)

fix(lua): Remove faulty carryTrim, replace with trimSource (#2995)

* Fix carryTrim in LUA

* Remove carryTrim

feat(diags): Red LED before RTC data, blue LED after (#3006)

* Added turning the red LED before RTC data and blue LED afterwards

With the LED turned RED if the RTC data retrieval fails it will stay red.
This will at least be an indication that the RTC startup encountered
a problem. For now there is no indication that this problem occurred.

* GH-3005 Moved LED manipulation to conditionally compiled when RTC operation happens

fix(color): Update top bar date & time when in setup pages (#3037)

fix(translation): JP had overlapping strings due to line breaks (#3004)

fix(cpn): Translate OFF in external module setup (#2998)

* Translate OFF in external module setup

* Update moduledata.cpp

Add B/W and CP support

Init enabled to 1

delete extra file

Fix Save/Read operations

Cleanup and fix R/W

Cleanup based on review

Change the fields order to match YAML

change the fields order to match the YAML

Add headers, set new CF to enabled

Remove "ON" label from "Enabled" field.
Fix "disabled" when swicthing functions.

Set enable==1 when changing the function.

Set "enabled" if function is changed on B/W radios
pfeerick pushed a commit that referenced this pull request Nov 27, 2023
Formatting.

chore(ui): Convert GVAR tab to LVGL (#2945)

fix(ui): Adjust model setup button layout to better fit portrait screen (#2956)

* Adjust model setup layout to better fix on portrait LCD screen.

* Set buttons to fixed width and allow to grow vertically to fit text.

* Cleanup layout logic - buttons stretched horizontally, centered vertically.

fix(color): Invalid custom curves + layout updates (#2973)

* Layout updates and bug fixes for curve editor.
- Fix issue 2972 where an invalid curve could be created
- Use vertical layout or list of points
- Add border to preview to better show end points
- Fix issue where preview was redrawn very frequently
- Better organisation of curve edit classes

* Fix to refresh curve preview on input edit page when parameters changed.

chore: freeRTOS task stack diagnostics (#2976)

* migrated stack diagnostics (available, free) to using built in FreeRTOS builtin function

Note: main stack must be and is treated differently as it is not under FreeRTOS control. main stack is painted by the STM32 startup routine. free main stack is calculated checking the remaining painted stack area.

* corrected my merge error

* missed a blank

fix(lua): fix drawHudRectangle for roll = 0 (#2978)

- fixed an extra line at the bottom of the hud rectangle
- fixed overflowing hud rectangle for horizon outside viewport (pitch > 0)

fix(lua): Remove faulty carryTrim, replace with trimSource (#2995)

* Fix carryTrim in LUA

* Remove carryTrim

feat(diags): Red LED before RTC data, blue LED after (#3006)

* Added turning the red LED before RTC data and blue LED afterwards

With the LED turned RED if the RTC data retrieval fails it will stay red.
This will at least be an indication that the RTC startup encountered
a problem. For now there is no indication that this problem occurred.

* GH-3005 Moved LED manipulation to conditionally compiled when RTC operation happens

fix(color): Update top bar date & time when in setup pages (#3037)

fix(translation): JP had overlapping strings due to line breaks (#3004)

fix(cpn): Translate OFF in external module setup (#2998)

* Translate OFF in external module setup

* Update moduledata.cpp

Add B/W and CP support

Init enabled to 1

delete extra file

Fix Save/Read operations

Cleanup and fix R/W

Cleanup based on review

Change the fields order to match YAML

change the fields order to match the YAML

Add headers, set new CF to enabled

Remove "ON" label from "Enabled" field.
Fix "disabled" when swicthing functions.

Set enable==1 when changing the function.

Set "enabled" if function is changed on B/W radios
pfeerick pushed a commit that referenced this pull request Dec 3, 2023
Formatting.

chore(ui): Convert GVAR tab to LVGL (#2945)

fix(ui): Adjust model setup button layout to better fit portrait screen (#2956)

* Adjust model setup layout to better fix on portrait LCD screen.

* Set buttons to fixed width and allow to grow vertically to fit text.

* Cleanup layout logic - buttons stretched horizontally, centered vertically.

fix(color): Invalid custom curves + layout updates (#2973)

* Layout updates and bug fixes for curve editor.
- Fix issue 2972 where an invalid curve could be created
- Use vertical layout or list of points
- Add border to preview to better show end points
- Fix issue where preview was redrawn very frequently
- Better organisation of curve edit classes

* Fix to refresh curve preview on input edit page when parameters changed.

chore: freeRTOS task stack diagnostics (#2976)

* migrated stack diagnostics (available, free) to using built in FreeRTOS builtin function

Note: main stack must be and is treated differently as it is not under FreeRTOS control. main stack is painted by the STM32 startup routine. free main stack is calculated checking the remaining painted stack area.

* corrected my merge error

* missed a blank

fix(lua): fix drawHudRectangle for roll = 0 (#2978)

- fixed an extra line at the bottom of the hud rectangle
- fixed overflowing hud rectangle for horizon outside viewport (pitch > 0)

fix(lua): Remove faulty carryTrim, replace with trimSource (#2995)

* Fix carryTrim in LUA

* Remove carryTrim

feat(diags): Red LED before RTC data, blue LED after (#3006)

* Added turning the red LED before RTC data and blue LED afterwards

With the LED turned RED if the RTC data retrieval fails it will stay red.
This will at least be an indication that the RTC startup encountered
a problem. For now there is no indication that this problem occurred.

* GH-3005 Moved LED manipulation to conditionally compiled when RTC operation happens

fix(color): Update top bar date & time when in setup pages (#3037)

fix(translation): JP had overlapping strings due to line breaks (#3004)

fix(cpn): Translate OFF in external module setup (#2998)

* Translate OFF in external module setup

* Update moduledata.cpp

Add B/W and CP support

Init enabled to 1

delete extra file

Fix Save/Read operations

Cleanup and fix R/W

Cleanup based on review

Change the fields order to match YAML

change the fields order to match the YAML

Add headers, set new CF to enabled

Remove "ON" label from "Enabled" field.
Fix "disabled" when swicthing functions.

Set enable==1 when changing the function.

Set "enabled" if function is changed on B/W radios
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
color Related generally to color LCD radios enhancement ✨ New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Curve editor allows creation of invalid curve Curve-Editor does not immediately update x-coordinates
2 participants