@@ -99,13 +99,13 @@ private static void GenerateStructDefinitionsPubsAndSubs(
9999 // This contains the *actual* name (modified with GenerateStructNameFromPath) of structs. Same keys as 'structsDictionnary'
100100 var generatedStructName = new Dictionary < string , string > ( ) ;
101101
102- FindLsBusCanValueRefs ( terminalsAndIcons , out var valueRefsUsedForLsBusCan ) ;
102+ FindLsBusTerminalValueRefs ( terminalsAndIcons , out var valueRefsUsedForLsBusTerminals ) ;
103103
104104 foreach ( var variable in modelDescription . Variables )
105105 {
106- if ( valueRefsUsedForLsBusCan . Contains ( variable . Key ) )
106+ if ( valueRefsUsedForLsBusTerminals . Contains ( variable . Key ) )
107107 {
108- // Skip variables that are used for LS-Bus CAN
108+ // Skip variables that are used for LS-Bus terminals ( CAN, Ethernet, RPC)
109109 continue ;
110110 }
111111
@@ -229,21 +229,24 @@ private static void GenerateStructDefinitionsPubsAndSubs(
229229 }
230230 }
231231
232- private static void FindLsBusCanValueRefs (
233- TerminalsAndIcons ? terminalsAndIcons , out List < uint > modelVariablesUsedForLsBusCan )
232+ private static void FindLsBusTerminalValueRefs (
233+ TerminalsAndIcons ? terminalsAndIcons , out List < uint > modelVariablesUsedForLsBusTerminals )
234234 {
235- modelVariablesUsedForLsBusCan = new List < uint > ( ) ;
235+ modelVariablesUsedForLsBusTerminals = new List < uint > ( ) ;
236236
237237 var valuesToAdd = terminalsAndIcons ? . Terminals
238- . Where ( t => t . Value . InternalTerminalKind == InternalTerminalKind . CAN )
238+ . Where ( t => t . Value . InternalTerminalKind is InternalTerminalKind . CAN
239+ or InternalTerminalKind . ETHERNET
240+ or InternalTerminalKind . RPC_CLIENT
241+ or InternalTerminalKind . RPC_SERVER )
239242 . SelectMany (
240243 t => t . Value . TerminalMemberVariables
241244 . Where ( m => m . Value . CorrespondingValueReference != null )
242245 . Select ( m => m . Value . CorrespondingValueReference ! . Value ) ) ;
243246
244247 if ( valuesToAdd != null )
245248 {
246- modelVariablesUsedForLsBusCan . AddRange ( valuesToAdd ) ;
249+ modelVariablesUsedForLsBusTerminals . AddRange ( valuesToAdd ) ;
247250 }
248251 }
249252
0 commit comments