Add "Enable" button to all CF (#3024) #3038

eshifri · 2023-01-15T02:27:11Z

This PR adds "Enable" switch to all CF/GF for all targets.
By default newly created function is enabled.
Disabled functions are shown with different color.

Companion is supported as well.

Fixes #3024

Summary of changes: add "enable" switch unconditionally, preserve switch status when the function is changed, set special color for disabled function. Split "active" filed filed on the CF structure into "active" and "repeat".

philmoz · 2023-01-15T02:37:33Z

Correct me if I'm wrong; but doesn't this also require a change to the internal data storage for custom functions?

AFAIK the same 8 bit property ('active') in the CustomFunctionData struct is used to store both the 'Active' and 'Repeat' values. So at the moment a CF can have one or the other; but not both.

eshifri · 2023-01-15T02:48:44Z

You are right! I have completely missed it. :-(

elecpower · 2023-01-18T20:25:24Z

From testing so far...

Companion is not writing and reading yml for the repeat value. On write always stores as 1x and on read interprets any value as 1x.
Companion table headings need tidy up

elecpower · 2023-01-18T20:27:23Z

Testing continued...

Companion does not set to enabled by default on new function

eshifri · 2023-01-18T21:50:50Z

Thank you for testing! Will look into it.

elecpower · 2023-01-19T20:59:20Z

@eshifri not sure if you are finished with fixing read/write but just in case Companion is now reading/writing repeat but not TX16S libsim as always 1s on startup

eshifri · 2023-01-19T21:34:32Z

@elecpower Thank you again! I'm almost sure it worked for me last night. :-( Are going into simulator from companion or starting it it as standalone?

elecpower · 2023-01-19T22:36:52Z

@eshifri both methods. Haptic is the function I have been testing.
The Companion log shows what it wrote to the temp directory before the radio had a chance to overwrite. So if this is as expected then radio side.

companion/src/firmwares/customfunctiondata.cpp

companion/src/modeledit/customfunctions.cpp

elecpower · 2023-01-21T19:15:10Z

Tested on TX16S libsim and appears all the functions are being interpreted by the radio correctly.

Side point: currently in the CF grid (this maybe fixed in ui PRs) the enabled button does not show in single line CFs.

elecpower · 2023-01-28T06:33:05Z

@eshifri still some Companion things to do:

column headings
enabled on add

Do you need any assistance?

elecpower · 2023-01-29T20:23:47Z

Latest testing

add new function enabled defaults to ticked- pass
without doing anything else change action and enabled changes from ticked to unticked - fail - expected behaviour is for enabled to remain unchanged
column widths for repeat and enabled are somewhat random - pass as minor - the fix for this can take some trial and error effort and even then not always achieves the ideal result
with the addition of the Enabled column heading the checkbox label 'ON' is somewhat in conflict when the checkbox is unticked - suggest removing checkbox label

eshifri · 2023-01-29T20:36:38Z

@elecpower Thank you! I cannot reproduce your second item: for me all changes are saved.

elecpower · 2023-01-29T21:04:03Z

@elecpower Thank you! I cannot reproduce your second item: for me all changes are saved.

It depends on the before and after action. Steps to reproduce:

set to Haptic and enabled to ticked
change to Set TMR1 and notice enable changes to unticked

refer void CustomFunctionsPanel::functionEdited()

Fix "disabled" when swicthing functions.

elecpower · 2023-02-05T22:15:55Z

@eshifri thinking further about the change of action maybe since enabled is the proposed default then changing an action should also change to the default of enabled rather than keeping old value? The current bug is that it is still applying the old default of disabled.

eshifri · 2023-02-05T22:21:46Z

Isn't it what happens? At least in the simulator?
I have realised it is not the case on the radio. I will change it.

elecpower · 2023-02-06T10:36:37Z

@eshifri retested and same fix required for B&W radios
Companion is working as expected (I must have been using the branch one commit behind the remove ON)

elecpower · 2023-02-06T21:02:42Z

@eshifri retested X9D+ libsim and works as expected
So its a tick from me

eshifri · 2023-02-06T21:24:54Z

@elecpower Thank you for investing your time into this! Your help is much appreciated.

gagarinlg · 2023-05-06T11:41:59Z

radio/src/storage/yaml/yaml_datastructs_funcs.cpp

@@ -1609,26 +1612,24 @@ static bool w_customFn(void* user, uint8_t* data, uint32_t bitoffs,
    break;

  default:
-    add_comma = false;
+    //add_comma = false;


please remove this

gagarinlg · 2023-05-06T11:42:48Z

radio/src/storage/yaml/yaml_datastructs_funcs.cpp

+  if (add_comma) {
+  // ","
+  if (!wf(opaque, ",", 1)) return false;
+  }
+
+  // "0/1"
+  if (!wf(opaque, CFN_ACTIVE(cfn) ? "1" : "0", 1)) return false;
+


please fix the indentation

gagarinlg · 2023-05-06T11:43:44Z

radio/src/storage/yaml/yaml_datastructs_funcs.cpp

  if (!wf(opaque, "\"", 1)) return false;
  return true;


No part of this PR, but this type of formatting should be omitted. The risk of confusing the next person is too high.

gagarinlg · 2023-05-06T11:44:38Z

I generally like that. It reduces complexity by having all SFs behave the same.

pfeerick · 2023-05-16T10:44:29Z

Squash rebased in #3601

eshifri added 2 commits January 14, 2023 18:19

Add "Enable" button to all CF (EdgeTX#3024)

f5c422c

Formatting.

cfe681a

eshifri marked this pull request as draft January 15, 2023 02:49

eshifri and others added 2 commits January 15, 2023 08:49

Merge branch 'EdgeTX:main' into eshifri/enable_all

15eb380

Add B/W and CP support

72356bc

eshifri marked this pull request as ready for review January 17, 2023 02:10

Init enabled to 1

a68d2c9

pfeerick marked this pull request as draft January 19, 2023 02:11

eshifri added 2 commits January 18, 2023 19:44

delete extra file

6500ffb

Fix Save/Read operations

f0d8751

Cleanup and fix R/W

fcfc809

pfeerick mentioned this pull request Jan 20, 2023

Update UI for SD log period settings #3058

Merged

elecpower reviewed Jan 21, 2023

View reviewed changes

companion/src/firmwares/customfunctiondata.cpp Outdated Show resolved Hide resolved

elecpower reviewed Jan 21, 2023

View reviewed changes

companion/src/modeledit/customfunctions.cpp Show resolved Hide resolved

elecpower reviewed Jan 21, 2023

View reviewed changes

companion/src/modeledit/customfunctions.cpp Show resolved Hide resolved

Cleanup based on review

115f3ce

eshifri marked this pull request as ready for review January 21, 2023 21:56

eshifri added 2 commits January 22, 2023 10:41

Change the fields order to match YAML

755afee

change the fields order to match the YAML

2bde13b

pfeerick self-assigned this Jan 27, 2023

pfeerick added the enhancement ✨ New feature or request label Jan 27, 2023

pfeerick modified the milestones: 2.8.1, 2.9 Jan 27, 2023

Add headers, set new CF to enabled

dde8544

Remove "ON" label from "Enabled" field.

cfc8b73

Fix "disabled" when swicthing functions.

Set enable==1 when changing the function.

ff52d97

Set "enabled" if function is changed on B/W radios

8482d00

gagarinlg requested changes May 6, 2023

View reviewed changes

pfeerick mentioned this pull request May 16, 2023

feat: Add "Enable" button to all SF/GF (#3024) #3601

Merged

pfeerick added the needs: rebase A git rebase on top of the latest destination branch version is required label May 16, 2023

pfeerick closed this May 16, 2023

JimB40 mentioned this pull request Oct 5, 2023

UI - GF/SF indicator for Enabled in the list #4155

Closed

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add "Enable" button to all CF (#3024) #3038

Add "Enable" button to all CF (#3024) #3038

eshifri commented Jan 15, 2023 •

edited

Loading

philmoz commented Jan 15, 2023

eshifri commented Jan 15, 2023

elecpower commented Jan 18, 2023

elecpower commented Jan 18, 2023

eshifri commented Jan 18, 2023

elecpower commented Jan 19, 2023

eshifri commented Jan 19, 2023

elecpower commented Jan 19, 2023

elecpower commented Jan 21, 2023

elecpower commented Jan 28, 2023

elecpower commented Jan 29, 2023

eshifri commented Jan 29, 2023

elecpower commented Jan 29, 2023

elecpower commented Feb 5, 2023 •

edited

Loading

eshifri commented Feb 5, 2023 •

edited

Loading

elecpower commented Feb 6, 2023

elecpower commented Feb 6, 2023

eshifri commented Feb 6, 2023

gagarinlg May 6, 2023

gagarinlg May 6, 2023

gagarinlg May 6, 2023

gagarinlg commented May 6, 2023

pfeerick commented May 16, 2023

Add "Enable" button to all CF (#3024) #3038

Add "Enable" button to all CF (#3024) #3038

Conversation

eshifri commented Jan 15, 2023 • edited Loading

philmoz commented Jan 15, 2023

eshifri commented Jan 15, 2023

elecpower commented Jan 18, 2023

elecpower commented Jan 18, 2023

eshifri commented Jan 18, 2023

elecpower commented Jan 19, 2023

eshifri commented Jan 19, 2023

elecpower commented Jan 19, 2023

elecpower commented Jan 21, 2023

elecpower commented Jan 28, 2023

elecpower commented Jan 29, 2023

eshifri commented Jan 29, 2023

elecpower commented Jan 29, 2023

elecpower commented Feb 5, 2023 • edited Loading

eshifri commented Feb 5, 2023 • edited Loading

elecpower commented Feb 6, 2023

elecpower commented Feb 6, 2023

eshifri commented Feb 6, 2023

gagarinlg May 6, 2023

Choose a reason for hiding this comment

gagarinlg May 6, 2023

Choose a reason for hiding this comment

gagarinlg May 6, 2023

Choose a reason for hiding this comment

gagarinlg commented May 6, 2023

pfeerick commented May 16, 2023

eshifri commented Jan 15, 2023 •

edited

Loading

elecpower commented Feb 5, 2023 •

edited

Loading

eshifri commented Feb 5, 2023 •

edited

Loading