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

Add SF/LS custom names + new "SAFE" LS #2085

Open
wants to merge 127 commits into
base: main
Choose a base branch
from
Open

Add SF/LS custom names + new "SAFE" LS #2085

wants to merge 127 commits into from

Conversation

shane-droid
Copy link

@shane-droid shane-droid commented Jun 23, 2022 •
edited
Loading

Summary of changes:

Firmware:

  • Adds custom name to MODEL special function
  • Adds custom name to logic switches
    creates a new logic switch type known as SAFE.
  • friendly name displays on 64 sw view page if name is not null, otherwise displays switch type

Companion:

  • new LS type: SAFE
  • custom friendly name to LS and SF.
  • quality of life: SF retains data for channel override after changing combobox
    selection.
    E.g: BEFORE:
    In SF1, changing CH1 override to CH2 override, will casues all fields for SF1
    to reset.
  • switch combo boxes now have LS friendly name as well. Eg LO1 now is L01:friendly Name

BUGS: must Shutdown Radio BEFORE disconnecting usb cable.
If editing Global functions in companion & then writing to radio, you must Shutdown Radio BEFORE disconnecting usb cable, otherwise the radio will use its inmemory data to overwrite any deletes or cuts that were made to global funtions.
see comment: #2085 (comment)

What Safe logic sw does:

Stops accidental physical switch ACTIVATIONS from effecting channel output.

  • The SAFE logic switch state [on/off], can only be changed when the secondary physical switch is in an active position.
  • When the secondary physical switch is off, then the SAFE logical switch is locked in either its Last state.

@shane-droid
Copy link
Author

@pfeerick hi, there was a conflict with src/datastructs.h : is this the correct way to resolve it, ie using 2 commits?

  1. merged main to my branch
  2. added a resoultion for the conflict?

@pfeerick
Copy link
Member

pfeerick commented Jul 2, 2022 •
edited
Loading

Something is still wrong here as compilation broke, and there is a change to libopenui which probably shouldn't have happened. Leave it with me for a day or two and I should be able to sort it out, and review this for merge also. This will still need a little more work, as Companion also needs to at minimum knows about the custom labels, otherwise it will obliterate them when the radio is next synced. And obviously/preferably, allow you to edit them lol. As well as the new LS type. It would also be nice to have on B&W, but I'm ok with it being a colorlcd feature to start with.

But to answer your question, since this will probably need to be squash merged, that should be fine. But normally if there was a conflict due to something in the base branch having changed, you would rebase your branch on the current state of main, and resolve the conflict when re-applying your commits. While this is 're-writing history', it has the effect of also keeping the commit history clean.

@pfeerick pfeerick changed the title Main logic switch2 Add SF/LS custom names + new "SAFE" LS Jul 2, 2022
@pfeerick pfeerick added enhancement ✨ New feature or request color Related generally to color LCD radios UX-UI Related to user experience (UX) or user interface (UI) behaviour labels Jul 2, 2022
@shane-droid
Copy link
Author

@pfeerick ok thanks, i'll have a look at companion

@shane-droid @pfeerick
special functions gui
0c0acb8
@shane-droid @pfeerick
Update yaml_datastructs_funcs.cpp
4edc814 
increase data size

(cherry picked from commit 98276f4d3f1aab8ad4f699349ec7659df5f5225a)
@shane-droid @pfeerick
Update special_functions.cpp
6666406 
paint special function custom name

(cherry picked from commit 59fc7c1938cd9cea8618d7b80af9c70a96cf0921)
@shane-droid @pfeerick
Update special_functions.cpp
219a16b 
removed code comment

(cherry picked from commit 391ad2f44d538c594e278e6be4bfc49714a5ff40)
@shane-droid @pfeerick
Update en.h
8e29612 
in special functions edit screen, variable data for English translation

(cherry picked from commit 82490e34094ea0ed740e58bcffe95ad66d084ca7)
@shane-droid @pfeerick
Update translations.cpp
c82b319 
variable for model special function custom name

(cherry picked from commit a8c494285d774c0d2268dd96ed615a957e3767c9)
@shane-droid @pfeerick
Update special_functions.cpp
2297c59 
fixed string changed to translation

(cherry picked from commit 52366eed73004b1dea153dff35bd45a0f993a35e)
@shane-droid @pfeerick
Update special_functions.cpp
281c8f8 
changed variable from string to translation

(cherry picked from commit 65df17bf1f03ab53fef98f1309b743234babd517)
@shane-droid @pfeerick
radio\src\translations\en.h
c49ef97 
moved translations to txt file as requested by @eshifri

(cherry picked from commit d10f5d634f10ca8eecf79f1ceef6c9b43554cee4)
@shane-droid @pfeerick
Update en.h
3252edc 
re enabled definition inorder to compile simu

(cherry picked from commit 2ca101cef51a132fd4d5c662792b2b508e99263d)
@shane-droid @pfeerick
radio\src\gui\colorlcd\special_functions.cpp
d9e0dc6 
changed variable from  translation to dynamic string

(cherry picked from commit 1d4a0f42b4e642389948a7e5b582545b450c78a9)
@shane-droid @pfeerick
new logic switch family
f9627d0 
(cherry picked from commit 514a60e)
@shane-droid @pfeerick
new logical switch function in dropdown
dd0504c 
(cherry picked from commit 5b165c0)
@shane-droid @pfeerick
English translations
5033fde
@shane-droid @pfeerick
new logic switch type Safe graphical display
41548d8 
(cherry picked from commit c3f1a32)
@shane-droid @pfeerick
evaluation logic for LogicSwitchFunctionSafe: disassociates the AndSw…
9d201a2 
…itch from affecting the new Logic Switch Type

(cherry picked from commit 62a3fd1)
@shane-droid @pfeerick
removed AndSw for Logic Switch mode Safe
92018c9 
(cherry picked from commit 0d95f2f)
@shane-droid @pfeerick
update gui for new logic switch type
5d060c2 
(cherry picked from commit 6fd47d7)
@shane-droid @pfeerick
translations non English Texts
2682362 
(cherry picked from commit 8ee9c82)
@pfeerick
Copy link
Member

pfeerick commented Jul 6, 2022 •
edited
Loading

I've rebased this against the current state of main, which has removed the libopenui conflict (as that is now in sync again), and also updated the datastructs as the current state would have reverted a change made in main due to another PR being merged. Next will be functional tests.

@pfeerick pfeerick self-assigned this Jul 6, 2022
@Eldenroot
Copy link
Contributor

Eldenroot commented Aug 20, 2022 •
edited
Loading

Companion side - will you work on it?

@raphaelcoeffic raphaelcoeffic marked this pull request as draft August 12, 2023 05:22
@shane-droid
Copy link
Author

@raphaelcoeffic will do

@shane-droid
Copy link
Author

@raphaelcoeffic since the memory allocation in datastructs is always developing, could I add a line :
SomeVariable = SomeVariable + my change.

This way no recalculation is needed, just merge code line?

@raphaelcoeffic
Copy link
Member

Not sure I understand properly. Would you mind specifying your thought more precisely?

@3djc
Copy link
Collaborator

3djc commented Aug 13, 2023

I see an increase in BW memory usage, but no UI side at all. Is that meant to be colorlcd only ?

@shane-droid
Merge branch 'main-LogicSwitch2' of https://github.com/shane-droid/ed…
1391f0a 
…getx into main-LogicSwitch2

# Conflicts:
#	companion/src/helpers.cpp
#	companion/src/helpers.h
#	companion/src/translations/companion_da.ts
#	companion/src/translations/companion_sv.ts
#	radio/src/datastructs.h
#	radio/src/fonts/lvgl/lv_font_noto_cn_24.c
#	radio/src/fonts/lvgl/lv_font_noto_tw_24.c
#	radio/src/gui/colorlcd/LvglWrapper.cpp
#	radio/src/gui/colorlcd/model_logical_switches.cpp
#	radio/src/gui/colorlcd/model_mixes.cpp
#	radio/src/gui/colorlcd/output_edit.cpp
#	radio/src/gui/colorlcd/screen_setup.cpp
#	radio/src/gui/colorlcd/special_functions.cpp
#	radio/src/gui/colorlcd/view_about.cpp
#	radio/src/gui/colorlcd/view_logical_switches.h
#	radio/src/lua/api_general.cpp
#	radio/src/storage/modelslist.cpp
#	radio/src/switches.cpp
#	radio/src/translations/cn.h
#	radio/src/translations/da.h
#	radio/src/translations/de.h
#	radio/src/translations/en.h
#	radio/src/translations/pl.h
#	radio/src/translations/se.h
#	radio/src/translations/tw.h
@shane-droid
Merge branch 'main' of https://github.com/EdgeTX/edgetx into main-Log…
c6311d1 
…icSwitch2

# Conflicts:
#	companion/src/helpers.cpp
#	companion/src/modeledit/customfunctions.cpp
#	companion/src/translations/companion_da.ts
#	radio/src/dataconstants.h
#	radio/src/datastructs.h
#	radio/src/datastructs_private.h
#	radio/src/fonts/lvgl/lv_font_noto_cn_24.c
#	radio/src/fonts/lvgl/lv_font_noto_tw_24.c
#	radio/src/gui/colorlcd/LvglWrapper.cpp
#	radio/src/gui/colorlcd/model_logical_switches.cpp
#	radio/src/gui/colorlcd/special_functions.cpp
#	radio/src/gui/colorlcd/view_logical_switches.h
#	radio/src/storage/conversions/conversions_216_218.cpp
#	radio/src/storage/conversions/conversions_218_219.cpp
#	radio/src/storage/conversions/yaml/myeeprom_220.h
#	radio/src/storage/conversions/yaml/yaml_datastructs_funcs.cpp
#	radio/src/storage/yaml/yaml_datastructs_128x64.cpp
#	radio/src/storage/yaml/yaml_datastructs_funcs.cpp
#	radio/src/storage/yaml/yaml_datastructs_lr3pro.cpp
#	radio/src/storage/yaml/yaml_datastructs_nv14.cpp
#	radio/src/storage/yaml/yaml_datastructs_t20.cpp
#	radio/src/storage/yaml/yaml_datastructs_tlite.cpp
#	radio/src/storage/yaml/yaml_datastructs_tpro.cpp
#	radio/src/storage/yaml/yaml_datastructs_tx12.cpp
#	radio/src/storage/yaml/yaml_datastructs_tx12mk2.cpp
#	radio/src/storage/yaml/yaml_datastructs_x10.cpp
#	radio/src/storage/yaml/yaml_datastructs_x12s.cpp
#	radio/src/storage/yaml/yaml_datastructs_x7.cpp
#	radio/src/storage/yaml/yaml_datastructs_x9d.cpp
#	radio/src/storage/yaml/yaml_datastructs_x9e.cpp
#	radio/src/storage/yaml/yaml_datastructs_x9lite.cpp
#	radio/src/storage/yaml/yaml_datastructs_x9lites.cpp
#	radio/src/storage/yaml/yaml_datastructs_xlite.cpp
#	radio/src/storage/yaml/yaml_datastructs_xlites.cpp
#	radio/src/storage/yaml/yaml_datastructs_zorro.cpp
#	radio/src/switches.cpp
#	radio/src/translations/cn.h
#	radio/src/translations/da.h
#	radio/src/translations/de.h
#	radio/src/translations/fr.h
#	radio/src/translations/it.h
#	radio/src/translations/pt.h
@shane-droid
Copy link
Author

@JimB40

image

perhaps, since L06 is only partially shown on screen, the height of each box can be increased slightly to accomodate a new line compleatly. what do you think?

@shane-droid
Copy link
Author

@raphaelcoeffic I merged in changes from the main branch, and resolved the conflicts in favour of the main branch. Is that okay?

@shane-droid shane-droid marked this pull request as ready for review August 13, 2023 09:34
@pfeerick pfeerick modified the milestones: 2.10, 2.11 Dec 12, 2023
@forbesmyester
Copy link

I just started work on a python script to take the set of logicalSw, customFn and mixData and apply to another, as I have functionality I want to package up and couldn't think how.

Realised it's likely too hard without names for some things...

Would love this PR in...

@shane-droid
Copy link
Author

shane-droid commented Mar 20, 2024 via email

@shane-droid
Copy link
Author

shane-droid commented Apr 16, 2024 •
edited
Loading

@forbesmyester Hi Mate , Be carfull with LUA, I was told it should not be used for filght critical functions, as it is not prioritised in code execution, hence why i went down the rabbit hole of this pull request

@Eldenroot
Copy link
Contributor

I desperately need this

@philmoz
Copy link
Collaborator

philmoz commented Apr 16, 2024

Looking at the 'Files changed' view in Github it would appear most of the radio changes for this PR have been lost somewhere along the way. Only the translations appear to be there and those look messed up with multiple .h.txt files instead of the .h files for the languages.

@pfeerick
Copy link
Member

Have a look at the merge commits from around 8 months ago... Most of the changes were probably lost then by favouring main instead of reintegrating this PR. It is actually very hard to completely kill a PR (even with a forced push, if you know the gitref), as it still exists on GitHub in some form.

@Eldenroot
Copy link
Contributor

Ouch, will.you work.on it?

@forbesmyester
Copy link

I hope this can go in, even if no UI on B&W, which is what have (MT12).

Reason is there's no way for me to group a set of logical switches as a piece of functionality. I've seen comments of people depending on spreadsheets for this grouping...

@shane-droid
Copy link
Author

@forbesmyester, I think @pfeerick has it scheduled for version 11. I think the hold up is integration to companion. Originally it was scheduled for 2.9. About 18 months ago

@pfeerick
Copy link
Member

pfeerick commented Apr 17, 2024 •
edited
Loading

Ouch, will.you work.on it?

Hopefully be able to start looking at it after this week... my internet seems to be working again 🤞 and may have some time to work on stuff again soon. First order of business will probably be to branch this off separately, reset it back to e898e85, and then rebase it on main to bring it up to date again... which should be fun.

@shane-droid
Copy link
Author

@pfeerick ofcourse, I'll reset my dev environment, and help with integration.

pfeerick added a commit that referenced this pull request Aug 6, 2024
@pfeerick
Squashed commit of #2085
2ea61ed 
commit e898e85
Author: Peter Feerick <peter.feerick@gmail.com>
Date:   Wed Dec 7 19:43:16 2022 +1000

    chore: Cleanup

commit e0b2b3e
Author: Peter Feerick <peter.feerick@gmail.com>
Date:   Wed Dec 7 16:30:28 2022 +1000

    fix: Updated translation files

commit 68594e6
Author: Peter Feerick <peter.feerick@gmail.com>
Date:   Wed Dec 7 16:22:03 2022 +1000

    fix: Add missing LR3 and TX12MKII, rebase cleanup

commit 55d0fa5
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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 <neilh713@tpg.com.au>
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+shane-droid@users.noreply.github.com>
Date:   Sun Oct 9 15:27:34 2022 +1100

    display friendly LS name on viewlayout

commit 785c6b6
Author: Peter Feerick <peter.feerick@gmail.com>
Date:   Mon Sep 26 16:40:38 2022 +1000

    chore: Set codename

commit 6533374
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 8 19:13:51 2022 +1100

    TODO: put LS friendly name on radio output window.

commit 29b35fd
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 8 16:47:57 2022 +1100

    companion: dynamily populate list with LS name

commit 2fe540b
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 8 14:36:42 2022 +1100

    Companion: bug: display correct name

commit a54b5e4
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 8 14:15:27 2022 +1100

    companion: display LS friendly name in Comboxes

commit 3e8b1ab
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Thu Oct 6 20:02:19 2022 +1100

    special funcns: stop data loss in selectin new ch

commit 776ead9
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sun Oct 2 13:00:58 2022 +1100

    logic sw & custom fn: friendly name copy & paste

commit 207650e
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 22:40:40 2022 +1000

    Companion: custom function Friendly Name Label

commit 45b0b7b
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 15:29:57 2022 +1000

    Companion: new Logic Switch & Friendly Name Label

commit f380a35
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 15:25:50 2022 +1000

    storage conversions for Logic switch Safe

commit 52601fd
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 15:22:15 2022 +1000

    bug: re enabled logic switch sticky.

commit 7c19f89
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 05:16:05 2022 +0000

    print logic switch safe

commit 42331d9
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Mon Jun 20 14:30:37 2022 +1000

    translations non English Texts

    (cherry picked from commit 8ee9c82)

commit 19cdbfd
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
Date:   Sun Jun 12 23:09:38 2022 +0000

    English translations

commit 767b765
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
Date:   Sun Jun 12 22:47:00 2022 +0000

    new logic switch family

    (cherry picked from commit 514a60e)

commit 195c325
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
Date:   Sun Jun 5 07:56:55 2022 +1000

    Update special_functions.cpp

    removed code comment

    (cherry picked from commit 391ad2f44d538c594e278e6be4bfc49714a5ff40)

commit 00030de
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
Date:   Thu Jun 2 21:34:58 2022 +1000

    special functions gui
pfeerick added a commit that referenced this pull request Aug 6, 2024
@pfeerick
Squashed commit of #2085
27cd498 
commit e898e85
Author: Peter Feerick <peter.feerick@gmail.com>
Date:   Wed Dec 7 19:43:16 2022 +1000

    chore: Cleanup

commit e0b2b3e
Author: Peter Feerick <peter.feerick@gmail.com>
Date:   Wed Dec 7 16:30:28 2022 +1000

    fix: Updated translation files

commit 68594e6
Author: Peter Feerick <peter.feerick@gmail.com>
Date:   Wed Dec 7 16:22:03 2022 +1000

    fix: Add missing LR3 and TX12MKII, rebase cleanup

commit 55d0fa5
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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 <neilh713@tpg.com.au>
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+shane-droid@users.noreply.github.com>
Date:   Sun Oct 9 15:27:34 2022 +1100

    display friendly LS name on viewlayout

commit 785c6b6
Author: Peter Feerick <peter.feerick@gmail.com>
Date:   Mon Sep 26 16:40:38 2022 +1000

    chore: Set codename

commit 6533374
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 8 19:13:51 2022 +1100

    TODO: put LS friendly name on radio output window.

commit 29b35fd
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 8 16:47:57 2022 +1100

    companion: dynamily populate list with LS name

commit 2fe540b
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 8 14:36:42 2022 +1100

    Companion: bug: display correct name

commit a54b5e4
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 8 14:15:27 2022 +1100

    companion: display LS friendly name in Comboxes

commit 3e8b1ab
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Thu Oct 6 20:02:19 2022 +1100

    special funcns: stop data loss in selectin new ch

commit 776ead9
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sun Oct 2 13:00:58 2022 +1100

    logic sw & custom fn: friendly name copy & paste

commit 207650e
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 22:40:40 2022 +1000

    Companion: custom function Friendly Name Label

commit 45b0b7b
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 15:29:57 2022 +1000

    Companion: new Logic Switch & Friendly Name Label

commit f380a35
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 15:25:50 2022 +1000

    storage conversions for Logic switch Safe

commit 52601fd
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 15:22:15 2022 +1000

    bug: re enabled logic switch sticky.

commit 7c19f89
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 05:16:05 2022 +0000

    print logic switch safe

commit 42331d9
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Mon Jun 20 14:30:37 2022 +1000

    translations non English Texts

    (cherry picked from commit 8ee9c82)

commit 19cdbfd
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
Date:   Sun Jun 12 23:09:38 2022 +0000

    English translations

commit 767b765
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
Date:   Sun Jun 12 22:47:00 2022 +0000

    new logic switch family

    (cherry picked from commit 514a60e)

commit 195c325
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
Date:   Sun Jun 5 07:56:55 2022 +1000

    Update special_functions.cpp

    removed code comment

    (cherry picked from commit 391ad2f44d538c594e278e6be4bfc49714a5ff40)

commit 00030de
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
Date:   Thu Jun 2 21:34:58 2022 +1000

    special functions gui
@pfeerick pfeerick mentioned this pull request Aug 6, 2024
Draft
3 tasks
pfeerick added a commit that referenced this pull request Aug 13, 2024
@pfeerick
Squashed commit of #2085
86e3525 
commit e898e85
Author: Peter Feerick <peter.feerick@gmail.com>
Date:   Wed Dec 7 19:43:16 2022 +1000

    chore: Cleanup

commit e0b2b3e
Author: Peter Feerick <peter.feerick@gmail.com>
Date:   Wed Dec 7 16:30:28 2022 +1000

    fix: Updated translation files

commit 68594e6
Author: Peter Feerick <peter.feerick@gmail.com>
Date:   Wed Dec 7 16:22:03 2022 +1000

    fix: Add missing LR3 and TX12MKII, rebase cleanup

commit 55d0fa5
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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 <neilh713@tpg.com.au>
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+shane-droid@users.noreply.github.com>
Date:   Sun Oct 9 15:27:34 2022 +1100

    display friendly LS name on viewlayout

commit 785c6b6
Author: Peter Feerick <peter.feerick@gmail.com>
Date:   Mon Sep 26 16:40:38 2022 +1000

    chore: Set codename

commit 6533374
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 8 19:13:51 2022 +1100

    TODO: put LS friendly name on radio output window.

commit 29b35fd
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 8 16:47:57 2022 +1100

    companion: dynamily populate list with LS name

commit 2fe540b
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 8 14:36:42 2022 +1100

    Companion: bug: display correct name

commit a54b5e4
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 8 14:15:27 2022 +1100

    companion: display LS friendly name in Comboxes

commit 3e8b1ab
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Thu Oct 6 20:02:19 2022 +1100

    special funcns: stop data loss in selectin new ch

commit 776ead9
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sun Oct 2 13:00:58 2022 +1100

    logic sw & custom fn: friendly name copy & paste

commit 207650e
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 22:40:40 2022 +1000

    Companion: custom function Friendly Name Label

commit 45b0b7b
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 15:29:57 2022 +1000

    Companion: new Logic Switch & Friendly Name Label

commit f380a35
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 15:25:50 2022 +1000

    storage conversions for Logic switch Safe

commit 52601fd
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 15:22:15 2022 +1000

    bug: re enabled logic switch sticky.

commit 7c19f89
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 05:16:05 2022 +0000

    print logic switch safe

commit 42331d9
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Mon Jun 20 14:30:37 2022 +1000

    translations non English Texts

    (cherry picked from commit 8ee9c82)

commit 19cdbfd
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
Date:   Sun Jun 12 23:09:38 2022 +0000

    English translations

commit 767b765
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
Date:   Sun Jun 12 22:47:00 2022 +0000

    new logic switch family

    (cherry picked from commit 514a60e)

commit 195c325
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
Date:   Sun Jun 5 07:56:55 2022 +1000

    Update special_functions.cpp

    removed code comment

    (cherry picked from commit 391ad2f44d538c594e278e6be4bfc49714a5ff40)

commit 00030de
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
Date:   Thu Jun 2 21:34:58 2022 +1000

    special functions gui
pfeerick added a commit that referenced this pull request Aug 18, 2024
@pfeerick
Squashed commit of #2085
f3e8a10 
commit e898e85
Author: Peter Feerick <peter.feerick@gmail.com>
Date:   Wed Dec 7 19:43:16 2022 +1000

    chore: Cleanup

commit e0b2b3e
Author: Peter Feerick <peter.feerick@gmail.com>
Date:   Wed Dec 7 16:30:28 2022 +1000

    fix: Updated translation files

commit 68594e6
Author: Peter Feerick <peter.feerick@gmail.com>
Date:   Wed Dec 7 16:22:03 2022 +1000

    fix: Add missing LR3 and TX12MKII, rebase cleanup

commit 55d0fa5
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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 <neilh713@tpg.com.au>
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+shane-droid@users.noreply.github.com>
Date:   Sun Oct 9 15:27:34 2022 +1100

    display friendly LS name on viewlayout

commit 785c6b6
Author: Peter Feerick <peter.feerick@gmail.com>
Date:   Mon Sep 26 16:40:38 2022 +1000

    chore: Set codename

commit 6533374
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 8 19:13:51 2022 +1100

    TODO: put LS friendly name on radio output window.

commit 29b35fd
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 8 16:47:57 2022 +1100

    companion: dynamily populate list with LS name

commit 2fe540b
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 8 14:36:42 2022 +1100

    Companion: bug: display correct name

commit a54b5e4
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 8 14:15:27 2022 +1100

    companion: display LS friendly name in Comboxes

commit 3e8b1ab
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Thu Oct 6 20:02:19 2022 +1100

    special funcns: stop data loss in selectin new ch

commit 776ead9
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sun Oct 2 13:00:58 2022 +1100

    logic sw & custom fn: friendly name copy & paste

commit 207650e
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 22:40:40 2022 +1000

    Companion: custom function Friendly Name Label

commit 45b0b7b
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 15:29:57 2022 +1000

    Companion: new Logic Switch & Friendly Name Label

commit f380a35
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 15:25:50 2022 +1000

    storage conversions for Logic switch Safe

commit 52601fd
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 15:22:15 2022 +1000

    bug: re enabled logic switch sticky.

commit 7c19f89
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 05:16:05 2022 +0000

    print logic switch safe

commit 42331d9
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Mon Jun 20 14:30:37 2022 +1000

    translations non English Texts

    (cherry picked from commit 8ee9c82)

commit 19cdbfd
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
Date:   Sun Jun 12 23:09:38 2022 +0000

    English translations

commit 767b765
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
Date:   Sun Jun 12 22:47:00 2022 +0000

    new logic switch family

    (cherry picked from commit 514a60e)

commit 195c325
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
Date:   Sun Jun 5 07:56:55 2022 +1000

    Update special_functions.cpp

    removed code comment

    (cherry picked from commit 391ad2f44d538c594e278e6be4bfc49714a5ff40)

commit 00030de
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
Date:   Thu Jun 2 21:34:58 2022 +1000

    special functions gui
pfeerick added a commit that referenced this pull request Aug 20, 2024
@pfeerick
Squashed commit of #2085
53b4c55 
commit e898e85
Author: Peter Feerick <peter.feerick@gmail.com>
Date:   Wed Dec 7 19:43:16 2022 +1000

    chore: Cleanup

commit e0b2b3e
Author: Peter Feerick <peter.feerick@gmail.com>
Date:   Wed Dec 7 16:30:28 2022 +1000

    fix: Updated translation files

commit 68594e6
Author: Peter Feerick <peter.feerick@gmail.com>
Date:   Wed Dec 7 16:22:03 2022 +1000

    fix: Add missing LR3 and TX12MKII, rebase cleanup

commit 55d0fa5
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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 <neilh713@tpg.com.au>
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+shane-droid@users.noreply.github.com>
Date:   Sun Oct 9 15:27:34 2022 +1100

    display friendly LS name on viewlayout

commit 785c6b6
Author: Peter Feerick <peter.feerick@gmail.com>
Date:   Mon Sep 26 16:40:38 2022 +1000

    chore: Set codename

commit 6533374
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 8 19:13:51 2022 +1100

    TODO: put LS friendly name on radio output window.

commit 29b35fd
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 8 16:47:57 2022 +1100

    companion: dynamily populate list with LS name

commit 2fe540b
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 8 14:36:42 2022 +1100

    Companion: bug: display correct name

commit a54b5e4
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 8 14:15:27 2022 +1100

    companion: display LS friendly name in Comboxes

commit 3e8b1ab
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Thu Oct 6 20:02:19 2022 +1100

    special funcns: stop data loss in selectin new ch

commit 776ead9
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sun Oct 2 13:00:58 2022 +1100

    logic sw & custom fn: friendly name copy & paste

commit 207650e
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 22:40:40 2022 +1000

    Companion: custom function Friendly Name Label

commit 45b0b7b
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 15:29:57 2022 +1000

    Companion: new Logic Switch & Friendly Name Label

commit f380a35
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 15:25:50 2022 +1000

    storage conversions for Logic switch Safe

commit 52601fd
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 15:22:15 2022 +1000

    bug: re enabled logic switch sticky.

commit 7c19f89
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 05:16:05 2022 +0000

    print logic switch safe

commit 42331d9
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Mon Jun 20 14:30:37 2022 +1000

    translations non English Texts

    (cherry picked from commit 8ee9c82)

commit 19cdbfd
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
Date:   Sun Jun 12 23:09:38 2022 +0000

    English translations

commit 767b765
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
Date:   Sun Jun 12 22:47:00 2022 +0000

    new logic switch family

    (cherry picked from commit 514a60e)

commit 195c325
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
Date:   Sun Jun 5 07:56:55 2022 +1000

    Update special_functions.cpp

    removed code comment

    (cherry picked from commit 391ad2f44d538c594e278e6be4bfc49714a5ff40)

commit 00030de
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
Date:   Thu Jun 2 21:34:58 2022 +1000

    special functions gui
pfeerick added a commit that referenced this pull request Sep 19, 2024
@pfeerick
Squashed commit of #2085
e43c756 
commit e898e85
Author: Peter Feerick <peter.feerick@gmail.com>
Date:   Wed Dec 7 19:43:16 2022 +1000

    chore: Cleanup

commit e0b2b3e
Author: Peter Feerick <peter.feerick@gmail.com>
Date:   Wed Dec 7 16:30:28 2022 +1000

    fix: Updated translation files

commit 68594e6
Author: Peter Feerick <peter.feerick@gmail.com>
Date:   Wed Dec 7 16:22:03 2022 +1000

    fix: Add missing LR3 and TX12MKII, rebase cleanup

commit 55d0fa5
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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 <neilh713@tpg.com.au>
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+shane-droid@users.noreply.github.com>
Date:   Sun Oct 9 15:27:34 2022 +1100

    display friendly LS name on viewlayout

commit 785c6b6
Author: Peter Feerick <peter.feerick@gmail.com>
Date:   Mon Sep 26 16:40:38 2022 +1000

    chore: Set codename

commit 6533374
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 8 19:13:51 2022 +1100

    TODO: put LS friendly name on radio output window.

commit 29b35fd
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 8 16:47:57 2022 +1100

    companion: dynamily populate list with LS name

commit 2fe540b
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 8 14:36:42 2022 +1100

    Companion: bug: display correct name

commit a54b5e4
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 8 14:15:27 2022 +1100

    companion: display LS friendly name in Comboxes

commit 3e8b1ab
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Thu Oct 6 20:02:19 2022 +1100

    special funcns: stop data loss in selectin new ch

commit 776ead9
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sun Oct 2 13:00:58 2022 +1100

    logic sw & custom fn: friendly name copy & paste

commit 207650e
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 22:40:40 2022 +1000

    Companion: custom function Friendly Name Label

commit 45b0b7b
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 15:29:57 2022 +1000

    Companion: new Logic Switch & Friendly Name Label

commit f380a35
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 15:25:50 2022 +1000

    storage conversions for Logic switch Safe

commit 52601fd
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 15:22:15 2022 +1000

    bug: re enabled logic switch sticky.

commit 7c19f89
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Sat Oct 1 05:16:05 2022 +0000

    print logic switch safe

commit 42331d9
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
Date:   Mon Jun 20 14:30:37 2022 +1000

    translations non English Texts

    (cherry picked from commit 8ee9c82)

commit 19cdbfd
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
Date:   Sun Jun 12 23:09:38 2022 +0000

    English translations

commit 767b765
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
Date:   Sun Jun 12 22:47:00 2022 +0000

    new logic switch family

    (cherry picked from commit 514a60e)

commit 195c325
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
Date:   Sun Jun 5 07:56:55 2022 +1000

    Update special_functions.cpp

    removed code comment

    (cherry picked from commit 391ad2f44d538c594e278e6be4bfc49714a5ff40)

commit 00030de
Author: shane-droid <61736830+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
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+shane-droid@users.noreply.github.com>
Date:   Thu Jun 2 21:34:58 2022 +1000

    special functions gui
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@pfeerick pfeerick

Labels
color Related generally to color LCD radios enhancement ✨ New feature or request UX-UI Related to user experience (UX) or user interface (UI) behaviour
Projects
None yet
Milestone
2.11
Development

Successfully merging this pull request may close these issues.