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.

Sign up for GitHub

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

Jump to bottom

WIP: Squashed rebase of #2085 #5392

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

WIP: Squashed rebase of #2085 #5392

wants to merge 6 commits into from
543 −171

Conversation

pfeerick
Copy link
Member

@pfeerick pfeerick commented Aug 6, 2024 •
edited
Loading

Squashed rebase of #2085.

Not holding my breath on if this will even compiled, as likely missed something in the rebase due to the codebase changes in the meantime, and I've not even attempted to build this locally yet

Additionally, there should also be 2ea61ed around somewhere, which is simply a squashed version of #2085 to a single commit.

Lets see how badly this breaks! 🤣 It's alive!

TODO:

  • will need adding to radio/src/cfn_sort.cpp
  • finish porting colorlcd UI changes
  • review companion changes as some rebase changes may be suspect, plus Add SF/LS custom names new "SAFE" LS #2085 said there was a bug there still
  • start testing to see if this still does what it is supposed to do!

@pfeerick pfeerick force-pushed the pfeerick/pr2085 branch 3 times, most recently from e13068c to 410555c Compare August 13, 2024 04:04
@pfeerick pfeerick force-pushed the pfeerick/pr2085 branch 2 times, most recently from 04b754a to baa031c Compare August 20, 2024 01:33
@pfeerick
Squashed commit of #2085
8d0d8ad 
commit e898e85
Author: Peter Feerick <[email protected]>
Date:   Wed Dec 7 19:43:16 2022  1000

    chore: Cleanup

commit e0b2b3e
Author: Peter Feerick <[email protected]>
Date:   Wed Dec 7 16:30:28 2022  1000

    fix: Updated translation files

commit 68863e6
Author: Peter Feerick <[email protected]>
Date:   Wed Dec 7 16:22:03 2022  1000

    fix: Add missing LR3 and TX12MKII, rebase cleanup

commit 55d0fa5
Author: shane-droid <61736830 [email protected]>
Date:   Mon Oct 10 20:14:57 2022  1100

    Companion: model edit Mixes view shows Mix name in a column for easy reference

commit ce36ca6
Author: elecpower <[email protected]>
Date:   Mon Oct 10 08:38:21 2022  1100

    cpn: refresh all model refs to LS when name changed. UI tweaks.

commit a58c3a4
Author: shane-droid <61736830 [email protected]>
Date:   Sun Oct 9 15:27:34 2022  1100

    display friendly LS name on viewlayout

commit 785c6b6
Author: Peter Feerick <[email protected]>
Date:   Mon Sep 26 16:40:38 2022  1000

    chore: Set codename

commit 6533374
Author: shane-droid <61736830 [email protected]>
Date:   Sat Oct 8 19:13:51 2022  1100

    TODO: put LS friendly name on radio output window.

commit 29b35fd
Author: shane-droid <61736830 [email protected]>
Date:   Sat Oct 8 16:47:57 2022  1100

    companion: dynamily populate list with LS name

commit 2fe540b
Author: shane-droid <61736830 [email protected]>
Date:   Sat Oct 8 14:36:42 2022  1100

    Companion: bug: display correct name

commit a54b5e4
Author: shane-droid <61736830 [email protected]>
Date:   Sat Oct 8 14:15:27 2022  1100

    companion: display LS friendly name in Comboxes

commit 3e8b1ab
Author: shane-droid <61736830 [email protected]>
Date:   Thu Oct 6 20:02:19 2022  1100

    special funcns: stop data loss in selectin new ch

commit 776ead9
Author: shane-droid <61736830 [email protected]>
Date:   Sun Oct 2 13:00:58 2022  1100

    logic sw & custom fn: friendly name copy & paste

commit 207650e
Author: shane-droid <61736830 [email protected]>
Date:   Sat Oct 1 22:40:40 2022  1000

    Companion: custom function Friendly Name Label

commit 45b0b7b
Author: shane-droid <61736830 [email protected]>
Date:   Sat Oct 1 15:29:57 2022  1000

    Companion: new Logic Switch & Friendly Name Label

commit f380a35
Author: shane-droid <61736830 [email protected]>
Date:   Sat Oct 1 15:25:50 2022  1000

    storage conversions for Logic switch Safe

commit 52601fd
Author: shane-droid <61736830 [email protected]>
Date:   Sat Oct 1 15:22:15 2022  1000

    bug: re enabled logic switch sticky.

commit 7c19f89
Author: shane-droid <61736830 [email protected]>
Date:   Sat Oct 1 05:16:05 2022  0000

    print logic switch safe

commit 42331d9
Author: shane-droid <61736830 [email protected]>
Date:   Mon Jun 20 14:30:37 2022  1000

    translations non English Texts

    (cherry picked from commit 8ee9c82)

commit 19cdbfd
Author: shane-droid <61736830 [email protected]>
Date:   Tue Jun 14 07:56:37 2022  0000

    update gui for new logic switch type

    (cherry picked from commit 6fd47d7)

commit 5a631cd
Author: shane-droid <61736830 [email protected]>
Date:   Tue Jun 14 01:14:20 2022  0000

    removed AndSw for Logic Switch mode Safe

    (cherry picked from commit 0d95f2f)

commit c7c7512
Author: shane-droid <61736830 [email protected]>
Date:   Tue Jun 14 01:04:56 2022  0000

    evaluation logic for LogicSwitchFunctionSafe: disassociates the AndSwitch from affecting the new Logic Switch Type

    (cherry picked from commit 62a3fd1)

commit 3da59ea
Author: shane-droid <61736830 [email protected]>
Date:   Mon Jun 13 02:26:14 2022  0000

    new logic switch type Safe graphical display

    (cherry picked from commit c3f1a32)

commit 90d27e7
Author: shane-droid <61736830 [email protected]>
Date:   Sun Jun 12 23:09:38 2022  0000

    English translations

commit 767b765
Author: shane-droid <61736830 [email protected]>
Date:   Sun Jun 12 22:49:41 2022  0000

    new logical switch function in dropdown

    (cherry picked from commit 5b165c0)

commit d1ae63d
Author: shane-droid <61736830 [email protected]>
Date:   Sun Jun 12 22:47:00 2022  0000

    new logic switch family

    (cherry picked from commit 514a60e)

commit 195c325
Author: shane-droid <61736830 [email protected]>
Date:   Tue Jun 7 15:56:55 2022  1000

    radio\src\gui\colorlcd\special_functions.cpp

    changed variable from  translation to dynamic string

    (cherry picked from commit 1d4a0f42b4e642389948a7e5b582545b450c78a9)

commit b372cd3
Author: shane-droid <61736830 [email protected]>
Date:   Tue Jun 7 15:26:25 2022  1000

    Update en.h

    re enabled definition inorder to compile simu

    (cherry picked from commit 2ca101cef51a132fd4d5c662792b2b508e99263d)

commit 41782df
Author: shane-droid <61736830 [email protected]>
Date:   Tue Jun 7 15:19:45 2022  1000

    radio\src\translations\en.h

    moved translations to txt file as requested by @eshifri

    (cherry picked from commit d10f5d634f10ca8eecf79f1ceef6c9b43554cee4)

commit ba8a0f7
Author: shane-droid <61736830 [email protected]>
Date:   Tue Jun 7 15:04:23 2022  1000

    Update special_functions.cpp

    changed variable from string to translation

    (cherry picked from commit 65df17bf1f03ab53fef98f1309b743234babd517)

commit 39661a0
Author: shane-droid <61736830 [email protected]>
Date:   Sun Jun 5 09:34:03 2022  1000

    Update special_functions.cpp

    fixed string changed to translation

    (cherry picked from commit 52366eed73004b1dea153dff35bd45a0f993a35e)

commit 114c69d
Author: shane-droid <61736830 [email protected]>
Date:   Sun Jun 5 09:01:28 2022  1000

    Update translations.cpp

    variable for model special function custom name

    (cherry picked from commit a8c494285d774c0d2268dd96ed615a957e3767c9)

commit 843ae4d
Author: shane-droid <61736830 [email protected]>
Date:   Sun Jun 5 08:51:21 2022  1000

    Update en.h

    in special functions edit screen, variable data for English translation

    (cherry picked from commit 82490e34094ea0ed740e58bcffe95ad66d084ca7)

commit 9d588e6
Author: shane-droid <61736830 [email protected]>
Date:   Sun Jun 5 07:56:55 2022  1000

    Update special_functions.cpp

    removed code comment

    (cherry picked from commit 391ad2f44d538c863e278e6be4bfc49714a5ff40)

commit 00030de
Author: shane-droid <61736830 [email protected]>
Date:   Sat Jun 4 21:11:28 2022  1000

    Update special_functions.cpp

    paint special function custom name

    (cherry picked from commit 59fc7c1938cd9cea8618d7b80af9c70a96cf0921)

commit 5c16aef
Author: shane-droid <61736830 [email protected]>
Date:   Sat Jun 4 20:52:24 2022  1000

    Update yaml_datastructs_funcs.cpp

    increase data size

    (cherry picked from commit 98276f4d3f1aab8ad4f699349ec7659df5f5225a)

commit 13581d1
Author: shane-droid <61736830 [email protected]>
Date:   Thu Jun 2 21:34:58 2022  1000

    special functions gui
@pfeerick
chore(cpn): remove change noise
99815f6
@pfeerick
fix(radio): remove change noise, fix extra brace
85f4af8
@pfeerick
fix(cpn): #4670 name validation related changes
7729027
@pfeerick
chore: remove more change noise
e677cc7
@pfeerick
chore: add missing translation string, limit some to colorlcd
51e58f3 
Use `TR_PHASES_HEADERS_NAME` as source text for missing language defines
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@pfeerick