Skip to content

Commit 6d014c5

Browse files
authored
Remove redundant _SEL suffix (#117)
The group mask selection name is already unique from the MSK_ prefix so there is no need to add a further qualifier.
1 parent 483eb25 commit 6d014c5

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/AppRegs.tt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,10 @@ foreach (var groupMask in DeviceMetadata.GroupMasks)
183183
var mask = groupMask.Value;
184184
var maskSelect = TemplateHelper.GetMaskSelect(mask).ToString("X2");
185185
var maskName = TemplateHelper.GetFirmwareGroupMaskName(groupMask.Key);
186-
var maskNamePadding = new string(' ', maxMaskNameLength - maskName.Length);
186+
var maskNamePadding = new string(' ', maxMaskNameLength - maskName.Length + 4);
187187
var maskSelectPadding = new string(' ', 11 - maskSelect.Length);
188188
#>
189-
#define MSK_<#= maskName #>_SEL<#= maskNamePadding #>0x<#= maskSelect #><#= maskSelectPadding #>//
189+
#define MSK_<#= maskName #><#= maskNamePadding #>0x<#= maskSelect #><#= maskSelectPadding #>//
190190
<#
191191

192192
foreach (var member in mask.Values)

tests/ExpectedOutput/device.app_ios_and_regs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,12 +190,12 @@ typedef struct
190190
#define B_TEST_DI_PORT1 (1<<9) //
191191
#define B_SUPPLY_PORT0 (1<<10) //
192192
#define B_PORT_DIO1 (1<<11) //
193-
#define MSK_PWM_PORT_SEL 0x0F //
193+
#define MSK_PWM_PORT 0x0F //
194194
#define GM_PWM_PORT_PWM0 0x01 //
195195
#define GM_PWM_PORT_PWM1 0x02 //
196196
#define GM_PWM_PORT_PWM2 0x04 //
197197
#define GM_PWM_PORT_PWM3 0x0A //
198-
#define MSK_ENCODER_MODE_SEL 0x01 //
198+
#define MSK_ENCODER_MODE 0x01 //
199199
#define GM_ENCODER_MODE_POSITION 0x00 //
200200
#define GM_ENCODER_MODE_DISPLACEMENT 0x01 //
201201

0 commit comments

Comments
 (0)