Skip to content

Commit 6fd47d7

Browse files
shane-droidshane-droid
committed
update gui for new logic switch type
1 parent 0d95f2f commit 6fd47d7

23 files changed

+64
-34
lines changed

‎radio/src/dataconstants.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ enum CurveType {
134134
#endif
135135

136136
#define LEN_SPEC_FN_NAME 10
137+
#define LEN_LOGICSW_NAME 10
137138

138139
#if defined(PCBFRSKY) || defined(PCBNV14)
139140
#define NUM_MODULES 2

‎radio/src/datastructs.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static inline void check_struct()
5151
CHKSIZE(MixData, 20);
5252
CHKSIZE(ExpoData, 17);
5353
CHKSIZE(LimitData, 11);
54-
CHKSIZE(LogicalSwitchData, 9);
54+
CHKSIZE(LogicalSwitchData, 19);
5555
CHKSIZE(CustomFunctionData, 21);
5656
CHKSIZE(FlightModeData, 28 + 2*NUM_TRIMS);
5757
CHKSIZE(TimerData, 11);
@@ -65,7 +65,7 @@ static inline void check_struct()
6565
CHKSIZE(MixData, 20);
6666
CHKSIZE(ExpoData, 17);
6767
CHKSIZE(LimitData, 13);
68-
CHKSIZE(LogicalSwitchData, 9);
68+
CHKSIZE(LogicalSwitchData, 19);
6969
CHKSIZE(CustomFunctionData, 21);
7070
CHKSIZE(FlightModeData, 40);
7171
CHKSIZE(TimerData, 16);
@@ -109,7 +109,7 @@ static inline void check_struct()
109109

110110
#endif /* board specific ifdefs*/
111111

112-
CHKSIZE(LogicalSwitchData, 9);
112+
CHKSIZE(LogicalSwitchData, 19);
113113
CHKSIZE(TelemetrySensor, 14);
114114
CHKSIZE(ModuleData, 29);
115115
CHKSIZE(GVarData, 7);
@@ -118,33 +118,33 @@ static inline void check_struct()
118118

119119
#if defined(PCBXLITES)
120120
CHKSIZE(RadioData, 1501);
121-
CHKSIZE(ModelData, 6801);
121+
CHKSIZE(ModelData, 7441);
122122
#elif defined(PCBXLITE)
123123
CHKSIZE(RadioData, 1499);
124-
CHKSIZE(ModelData, 6801);
124+
CHKSIZE(ModelData, 7441);
125125
#elif defined(RADIO_TPRO)
126126
CHKSIZE(RadioData, 1482);
127-
CHKSIZE(ModelData, 6826);
127+
CHKSIZE(ModelData, 7466);
128128
#elif defined(PCBX7)
129129
CHKSIZE(RadioData, 1505);
130-
CHKSIZE(ModelData, 6801);
130+
CHKSIZE(ModelData, 7441);
131131
#elif defined(PCBX9E)
132132
CHKSIZE(RadioData, 1595);
133-
CHKSIZE(ModelData, 7253);
133+
CHKSIZE(ModelData, 7893);
134134
#elif defined(PCBX9D) || defined(PCBX9DP)
135135
CHKSIZE(RadioData, 1537);
136-
CHKSIZE(ModelData, 7245);
136+
CHKSIZE(ModelData, 7885);
137137
#elif defined(PCBHORUS)
138138
#if defined(PCBX10)
139139
CHKSIZE(RadioData, 1561);
140-
CHKSIZE(ModelData, 11665);
140+
CHKSIZE(ModelData, 12305);
141141
#else
142142
CHKSIZE(RadioData, 1543);
143-
CHKSIZE(ModelData, 11663);
143+
CHKSIZE(ModelData, 12303);
144144
#endif
145145
#elif defined(PCBNV14)
146146
CHKSIZE(RadioData, 1491);
147-
CHKSIZE(ModelData, 11479);
147+
CHKSIZE(ModelData, 12119);
148148
#endif
149149

150150
#undef CHKSIZE

‎radio/src/datastructs_private.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ PACK(struct LogicalSwitchData {
138138
int16_t v2 SKIP;
139139
uint8_t delay;
140140
uint8_t duration;
141+
NOBACKUP(char custName[LEN_LOGICSW_NAME]);
141142
});
142143

143144
/*

‎radio/src/gui/colorlcd/model_logical_switches.cpp

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,10 @@ class LogicalSwitchEditPage: public Page
9494

9595
LogicalSwitchData * cs = lswAddress(index);
9696
uint8_t cstate = lswFamily(cs->func);
97-
97+
// custom label
98+
new StaticText(logicalSwitchOneWindow, grid.getLabelSlot(), STR_CUST_LOGICALSWITCH_LABEL, 0, COLOR_THEME_PRIMARY1);
99+
new ModelTextEdit(logicalSwitchOneWindow, grid.getFieldSlot(), cs->custName, LEN_LOGICSW_NAME);
100+
grid.nextLine();
98101
if (cstate == LS_FAMILY_BOOL || cstate == LS_FAMILY_STICKY || cs->func == LS_FUNC_SAFE) {
99102
new StaticText(logicalSwitchOneWindow, grid.getLabelSlot(), STR_V1, 0, COLOR_THEME_PRIMARY1);
100103
auto choice = new SwitchChoice(logicalSwitchOneWindow, grid.getFieldSlot(), SWSRC_FIRST_IN_LOGICAL_SWITCHES, SWSRC_LAST_IN_LOGICAL_SWITCHES, GET_SET_DEFAULT(cs->v1));
@@ -255,6 +258,7 @@ class LogicalSwitchEditPage: public Page
255258

256259
static constexpr coord_t line1 = FIELD_PADDING_TOP;
257260
static constexpr coord_t line2 = line1 + PAGE_LINE_HEIGHT;
261+
static constexpr coord_t line3 = line2 + PAGE_LINE_HEIGHT;
258262
static constexpr coord_t col1 = 20;
259263
static constexpr coord_t col2 = (LCD_W - 100) / 3 + col1;
260264
static constexpr coord_t col3 = ((LCD_W - 100) / 3) * 2 + col1;
@@ -291,8 +295,8 @@ class LogicalSwitchButton : public Button
291295
uint8_t lsFamily = lswFamily(ls->func);
292296

293297
// CSW func
294-
dc->drawTextAtIndex(col1, line1, STR_VCSWFUNC, ls->func, COLOR_THEME_SECONDARY1);
295-
298+
//dc->drawTextAtIndex(col1, line1, STR_VCSWFUNC, ls->func, COLOR_THEME_SECONDARY1);
299+
dc->drawText(col1, line1, ls->custName, COLOR_THEME_SECONDARY1);
296300
// CSW params
297301
if (lsFamily == LS_FAMILY_BOOL || lsFamily == LS_FAMILY_STICKY || ls->func ==LS_FUNC_SAFE) {
298302
drawSwitch(dc, col2, line1, ls->v1, COLOR_THEME_SECONDARY1);
@@ -324,15 +328,20 @@ class LogicalSwitchButton : public Button
324328
if (lsFamily != LS_FAMILY_EDGE && ls->delay > 0) {
325329
dc->drawNumber(col3, line2, ls->delay, COLOR_THEME_SECONDARY1 | PREC1 | LEFT);
326330
}
331+
// switch custom name
332+
//dc->drawText(col1, line3, "somename", COLOR_THEME_SECONDARY1);
327333
}
328334

329335
void paint(BitmapBuffer* dc) override
330336
{
331-
if (active)
337+
if (active){
332338
dc->drawSolidFilledRect(0, 0, rect.w, rect.h, COLOR_THEME_ACTIVE);
333-
else
339+
dc->drawText(col1, line3, "somename", COLOR_THEME_SECONDARY1);
340+
}
341+
else{
334342
dc->drawSolidFilledRect(0, 0, rect.w, rect.h, COLOR_THEME_PRIMARY2);
335-
343+
dc->drawText(col1, line3, "somename", COLOR_THEME_SECONDARY1);
344+
}
336345
paintLogicalSwitchLine(dc);
337346

338347
// The bounding rect

‎radio/src/storage/yaml/yaml_datastructs_nv14.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,7 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
545545
YAML_PADDING( 16 ),
546546
YAML_UNSIGNED( "delay", 8 ),
547547
YAML_UNSIGNED( "duration", 8 ),
548+
YAML_STRING("custName", 10),
548549
YAML_END
549550
};
550551
static const struct YamlNode struct_SwashRingData[] = {
@@ -859,7 +860,7 @@ static const struct YamlNode struct_ModelData[] = {
859860
YAML_ARRAY("expoData", 136, 64, struct_ExpoData, NULL),
860861
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
861862
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
862-
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
863+
YAML_ARRAY("logicalSw", 152, 64, struct_LogicalSwitchData, NULL),
863864
YAML_ARRAY("customFn", 152, 64, struct_CustomFunctionData, cfn_is_active),
864865
YAML_STRUCT("swashR", 64, struct_SwashRingData, swash_is_active),
865866
YAML_ARRAY("flightModeData", 320, 9, struct_FlightModeData, fmd_is_active),

‎radio/src/storage/yaml/yaml_datastructs_t12.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,7 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
512512
YAML_PADDING( 16 ),
513513
YAML_UNSIGNED( "delay", 8 ),
514514
YAML_UNSIGNED( "duration", 8 ),
515+
YAML_STRING("custName", 10),
515516
YAML_END
516517
};
517518
static const struct YamlNode struct_SwashRingData[] = {
@@ -829,7 +830,7 @@ static const struct YamlNode struct_ModelData[] = {
829830
YAML_ARRAY("expoData", 136, 64, struct_ExpoData, NULL),
830831
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
831832
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
832-
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
833+
YAML_ARRAY("logicalSw", 152, 64, struct_LogicalSwitchData, NULL),
833834
YAML_ARRAY("customFn", 168, 64, struct_CustomFunctionData, cfn_is_active),
834835
YAML_STRUCT("swashR", 64, struct_SwashRingData, swash_is_active),
835836
YAML_ARRAY("flightModeData", 288, 9, struct_FlightModeData, fmd_is_active),

‎radio/src/storage/yaml/yaml_datastructs_t8.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,7 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
512512
YAML_PADDING( 16 ),
513513
YAML_UNSIGNED( "delay", 8 ),
514514
YAML_UNSIGNED( "duration", 8 ),
515+
YAML_STRING("custName", 10),
515516
YAML_END
516517
};
517518
static const struct YamlNode struct_SwashRingData[] = {
@@ -829,7 +830,7 @@ static const struct YamlNode struct_ModelData[] = {
829830
YAML_ARRAY("expoData", 136, 64, struct_ExpoData, NULL),
830831
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
831832
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
832-
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
833+
YAML_ARRAY("logicalSw", 152, 64, struct_LogicalSwitchData, NULL),
833834
YAML_ARRAY("customFn", 168, 64, struct_CustomFunctionData, cfn_is_active),
834835
YAML_STRUCT("swashR", 64, struct_SwashRingData, swash_is_active),
835836
YAML_ARRAY("flightModeData", 288, 9, struct_FlightModeData, fmd_is_active),

‎radio/src/storage/yaml/yaml_datastructs_tlite.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,7 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
512512
YAML_PADDING( 16 ),
513513
YAML_UNSIGNED( "delay", 8 ),
514514
YAML_UNSIGNED( "duration", 8 ),
515+
YAML_STRING("custName", 10),
515516
YAML_END
516517
};
517518
static const struct YamlNode struct_SwashRingData[] = {
@@ -829,7 +830,7 @@ static const struct YamlNode struct_ModelData[] = {
829830
YAML_ARRAY("expoData", 136, 64, struct_ExpoData, NULL),
830831
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
831832
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
832-
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
833+
YAML_ARRAY("logicalSw", 152, 64, struct_LogicalSwitchData, NULL),
833834
YAML_ARRAY("customFn", 168, 64, struct_CustomFunctionData, cfn_is_active),
834835
YAML_STRUCT("swashR", 64, struct_SwashRingData, swash_is_active),
835836
YAML_ARRAY("flightModeData", 288, 9, struct_FlightModeData, fmd_is_active),

‎radio/src/storage/yaml/yaml_datastructs_tpro.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,7 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
518518
YAML_PADDING( 16 ),
519519
YAML_UNSIGNED( "delay", 8 ),
520520
YAML_UNSIGNED( "duration", 8 ),
521+
YAML_STRING("custName", 10),
521522
YAML_END
522523
};
523524
static const struct YamlNode struct_SwashRingData[] = {
@@ -835,7 +836,7 @@ static const struct YamlNode struct_ModelData[] = {
835836
YAML_ARRAY("expoData", 136, 64, struct_ExpoData, NULL),
836837
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
837838
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
838-
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
839+
YAML_ARRAY("logicalSw", 152, 64, struct_LogicalSwitchData, NULL),
839840
YAML_ARRAY("customFn", 168, 64, struct_CustomFunctionData, cfn_is_active),
840841
YAML_STRUCT("swashR", 64, struct_SwashRingData, swash_is_active),
841842
YAML_ARRAY("flightModeData", 288, 9, struct_FlightModeData, fmd_is_active),

‎radio/src/storage/yaml/yaml_datastructs_tx12.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,7 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
512512
YAML_PADDING( 16 ),
513513
YAML_UNSIGNED( "delay", 8 ),
514514
YAML_UNSIGNED( "duration", 8 ),
515+
YAML_STRING("custName", 10),
515516
YAML_END
516517
};
517518
static const struct YamlNode struct_SwashRingData[] = {
@@ -829,7 +830,7 @@ static const struct YamlNode struct_ModelData[] = {
829830
YAML_ARRAY("expoData", 136, 64, struct_ExpoData, NULL),
830831
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
831832
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
832-
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
833+
YAML_ARRAY("logicalSw", 152, 64, struct_LogicalSwitchData, NULL),
833834
YAML_ARRAY("customFn", 168, 64, struct_CustomFunctionData, cfn_is_active),
834835
YAML_STRUCT("swashR", 64, struct_SwashRingData, swash_is_active),
835836
YAML_ARRAY("flightModeData", 288, 9, struct_FlightModeData, fmd_is_active),

‎radio/src/storage/yaml/yaml_datastructs_x10.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,6 +565,7 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
565565
YAML_PADDING( 16 ),
566566
YAML_UNSIGNED( "delay", 8 ),
567567
YAML_UNSIGNED( "duration", 8 ),
568+
YAML_STRING("custName", 10),
568569
YAML_END
569570
};
570571
static const struct YamlNode struct_SwashRingData[] = {
@@ -879,7 +880,7 @@ static const struct YamlNode struct_ModelData[] = {
879880
YAML_ARRAY("expoData", 136, 64, struct_ExpoData, NULL),
880881
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
881882
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
882-
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
883+
YAML_ARRAY("logicalSw", 152, 64, struct_LogicalSwitchData, NULL),
883884
YAML_ARRAY("customFn", 152, 64, struct_CustomFunctionData, cfn_is_active),
884885
YAML_STRUCT("swashR", 64, struct_SwashRingData, swash_is_active),
885886
YAML_ARRAY("flightModeData", 352, 9, struct_FlightModeData, fmd_is_active),

‎radio/src/storage/yaml/yaml_datastructs_x12s.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,6 +563,7 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
563563
YAML_PADDING( 16 ),
564564
YAML_UNSIGNED( "delay", 8 ),
565565
YAML_UNSIGNED( "duration", 8 ),
566+
YAML_STRING("custName", 10),
566567
YAML_END
567568
};
568569
static const struct YamlNode struct_SwashRingData[] = {
@@ -877,7 +878,7 @@ static const struct YamlNode struct_ModelData[] = {
877878
YAML_ARRAY("expoData", 136, 64, struct_ExpoData, NULL),
878879
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
879880
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
880-
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
881+
YAML_ARRAY("logicalSw", 152, 64, struct_LogicalSwitchData, NULL),
881882
YAML_ARRAY("customFn", 152, 64, struct_CustomFunctionData, cfn_is_active),
882883
YAML_STRUCT("swashR", 64, struct_SwashRingData, swash_is_active),
883884
YAML_ARRAY("flightModeData", 352, 9, struct_FlightModeData, fmd_is_active),

‎radio/src/storage/yaml/yaml_datastructs_x7.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,7 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
512512
YAML_PADDING( 16 ),
513513
YAML_UNSIGNED( "delay", 8 ),
514514
YAML_UNSIGNED( "duration", 8 ),
515+
YAML_STRING("custName", 10),
515516
YAML_END
516517
};
517518
static const struct YamlNode struct_SwashRingData[] = {
@@ -829,7 +830,7 @@ static const struct YamlNode struct_ModelData[] = {
829830
YAML_ARRAY("expoData", 136, 64, struct_ExpoData, NULL),
830831
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
831832
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
832-
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
833+
YAML_ARRAY("logicalSw", 152, 64, struct_LogicalSwitchData, NULL),
833834
YAML_ARRAY("customFn", 168, 64, struct_CustomFunctionData, cfn_is_active),
834835
YAML_STRUCT("swashR", 64, struct_SwashRingData, swash_is_active),
835836
YAML_ARRAY("flightModeData", 288, 9, struct_FlightModeData, fmd_is_active),

‎radio/src/storage/yaml/yaml_datastructs_x9d.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,7 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
520520
YAML_PADDING( 16 ),
521521
YAML_UNSIGNED( "delay", 8 ),
522522
YAML_UNSIGNED( "duration", 8 ),
523+
YAML_STRING("custName", 10),
523524
YAML_END
524525
};
525526
static const struct YamlNode struct_SwashRingData[] = {
@@ -842,7 +843,7 @@ static const struct YamlNode struct_ModelData[] = {
842843
YAML_ARRAY("expoData", 136, 64, struct_ExpoData, NULL),
843844
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
844845
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
845-
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
846+
YAML_ARRAY("logicalSw", 152, 64, struct_LogicalSwitchData, NULL),
846847
YAML_ARRAY("customFn", 168, 64, struct_CustomFunctionData, cfn_is_active),
847848
YAML_STRUCT("swashR", 64, struct_SwashRingData, swash_is_active),
848849
YAML_ARRAY("flightModeData", 320, 9, struct_FlightModeData, fmd_is_active),

‎radio/src/storage/yaml/yaml_datastructs_x9e.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,7 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
559559
YAML_PADDING( 16 ),
560560
YAML_UNSIGNED( "delay", 8 ),
561561
YAML_UNSIGNED( "duration", 8 ),
562+
YAML_STRING("custName", 10),
562563
YAML_END
563564
};
564565
static const struct YamlNode struct_SwashRingData[] = {
@@ -881,7 +882,7 @@ static const struct YamlNode struct_ModelData[] = {
881882
YAML_ARRAY("expoData", 136, 64, struct_ExpoData, NULL),
882883
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
883884
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
884-
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
885+
YAML_ARRAY("logicalSw", 152, 64, struct_LogicalSwitchData, NULL),
885886
YAML_ARRAY("customFn", 168, 64, struct_CustomFunctionData, cfn_is_active),
886887
YAML_STRUCT("swashR", 64, struct_SwashRingData, swash_is_active),
887888
YAML_ARRAY("flightModeData", 320, 9, struct_FlightModeData, fmd_is_active),

‎radio/src/storage/yaml/yaml_datastructs_x9lite.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,6 +497,7 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
497497
YAML_PADDING( 16 ),
498498
YAML_UNSIGNED( "delay", 8 ),
499499
YAML_UNSIGNED( "duration", 8 ),
500+
YAML_STRING("custName", 10),
500501
YAML_END
501502
};
502503
static const struct YamlNode struct_SwashRingData[] = {
@@ -814,7 +815,7 @@ static const struct YamlNode struct_ModelData[] = {
814815
YAML_ARRAY("expoData", 136, 64, struct_ExpoData, NULL),
815816
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
816817
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
817-
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
818+
YAML_ARRAY("logicalSw", 152, 64, struct_LogicalSwitchData, NULL),
818819
YAML_ARRAY("customFn", 168, 64, struct_CustomFunctionData, cfn_is_active),
819820
YAML_STRUCT("swashR", 64, struct_SwashRingData, swash_is_active),
820821
YAML_ARRAY("flightModeData", 288, 9, struct_FlightModeData, fmd_is_active),

‎radio/src/storage/yaml/yaml_datastructs_x9lites.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,7 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
507507
YAML_PADDING( 16 ),
508508
YAML_UNSIGNED( "delay", 8 ),
509509
YAML_UNSIGNED( "duration", 8 ),
510+
YAML_STRING("custName", 10),
510511
YAML_END
511512
};
512513
static const struct YamlNode struct_SwashRingData[] = {
@@ -824,7 +825,7 @@ static const struct YamlNode struct_ModelData[] = {
824825
YAML_ARRAY("expoData", 136, 64, struct_ExpoData, NULL),
825826
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
826827
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
827-
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
828+
YAML_ARRAY("logicalSw", 152, 64, struct_LogicalSwitchData, NULL),
828829
YAML_ARRAY("customFn", 168, 64, struct_CustomFunctionData, cfn_is_active),
829830
YAML_STRUCT("swashR", 64, struct_SwashRingData, swash_is_active),
830831
YAML_ARRAY("flightModeData", 288, 9, struct_FlightModeData, fmd_is_active),

‎radio/src/storage/yaml/yaml_datastructs_xlite.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,6 +504,7 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
504504
YAML_PADDING( 16 ),
505505
YAML_UNSIGNED( "delay", 8 ),
506506
YAML_UNSIGNED( "duration", 8 ),
507+
YAML_STRING("custName", 10),
507508
YAML_END
508509
};
509510
static const struct YamlNode struct_SwashRingData[] = {
@@ -821,7 +822,7 @@ static const struct YamlNode struct_ModelData[] = {
821822
YAML_ARRAY("expoData", 136, 64, struct_ExpoData, NULL),
822823
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
823824
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
824-
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
825+
YAML_ARRAY("logicalSw", 152, 64, struct_LogicalSwitchData, NULL),
825826
YAML_ARRAY("customFn", 168, 64, struct_CustomFunctionData, cfn_is_active),
826827
YAML_STRUCT("swashR", 64, struct_SwashRingData, swash_is_active),
827828
YAML_ARRAY("flightModeData", 288, 9, struct_FlightModeData, fmd_is_active),

‎radio/src/storage/yaml/yaml_datastructs_xlites.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,7 @@ static const struct YamlNode struct_LogicalSwitchData[] = {
508508
YAML_PADDING( 16 ),
509509
YAML_UNSIGNED( "delay", 8 ),
510510
YAML_UNSIGNED( "duration", 8 ),
511+
YAML_STRING("custName", 10),
511512
YAML_END
512513
};
513514
static const struct YamlNode struct_SwashRingData[] = {
@@ -825,7 +826,7 @@ static const struct YamlNode struct_ModelData[] = {
825826
YAML_ARRAY("expoData", 136, 64, struct_ExpoData, NULL),
826827
YAML_ARRAY("curves", 32, 32, struct_CurveHeader, NULL),
827828
YAML_ARRAY("points", 8, 512, struct_signed_8, NULL),
828-
YAML_ARRAY("logicalSw", 72, 64, struct_LogicalSwitchData, NULL),
829+
YAML_ARRAY("logicalSw", 152, 64, struct_LogicalSwitchData, NULL),
829830
YAML_ARRAY("customFn", 168, 64, struct_CustomFunctionData, cfn_is_active),
830831
YAML_STRUCT("swashR", 64, struct_SwashRingData, swash_is_active),
831832
YAML_ARRAY("flightModeData", 288, 9, struct_FlightModeData, fmd_is_active),

0 commit comments

Comments
 (0)