Some Refactoring

patrick-dmxc · patrick-dmxc · commit db792633f9fa · 2026-03-26T22:05:04.000+01:00
diff --git a/RDMSharp/RDM/Device/AbstractGeneratedRDMDevice.cs b/RDMSharp/RDM/Device/AbstractGeneratedRDMDevice.cs
@@ -108,7 +108,7 @@ public byte? CurrentPersonalityId
     protected readonly DMX_PersonalityModule? dmxPersonalityModule;
     protected readonly SlotsModule? slotsModule;
     protected readonly SensorsModule? sensorsModule;
-    protected readonly StatusMessageModule? statusMessageModule;
+    protected readonly StatusMessagesModule? statusMessageModule;
 
     private bool discoveryMuted;
     public bool DiscoveryMuted
@@ -171,7 +171,7 @@ private AbstractGeneratedRDMDevice(UID uid, SubDevice subDevice, IRDMDevice[] su
         dmxPersonalityModule = _modules.OfType<DMX_PersonalityModule>().FirstOrDefault();
         slotsModule = _modules.OfType<SlotsModule>().FirstOrDefault();
         sensorsModule = _modules.OfType<SensorsModule>().FirstOrDefault();
-        statusMessageModule = _modules.OfType<StatusMessageModule>().FirstOrDefault();
+        statusMessageModule = _modules.OfType<StatusMessagesModule>().FirstOrDefault();
         if (dmxPersonalityModule is not null)//Remove after Refactoring to Modules
             dmxPersonalityModule.PropertyChanged += DmxPersonalityModule_PropertyChanged;
 
diff --git a/RDMSharp/RDM/Device/Module/AbstractModule.cs b/RDMSharp/RDM/Device/Module/AbstractModule.cs
@@ -14,6 +14,7 @@ public abstract class AbstractModule : IModule
 
     private readonly string _name;
     public string Name { get => _name; }
+    public abstract string DisplayName { get; }
 
     private readonly IReadOnlyCollection<ERDM_Parameter> _supportedParameters;
 
diff --git a/RDMSharp/RDM/Device/Module/BootSoftwareVersionModule.cs b/RDMSharp/RDM/Device/Module/BootSoftwareVersionModule.cs
@@ -3,12 +3,15 @@
 public sealed class BootSoftwareVersionModule : AbstractModule
 {
     private const string _moduleName = "BootSoftwareVersion";
+    private const string _moduleDisplayName = "Boot Software Version";
     private static readonly ERDM_Parameter[] _moduleParameters = new ERDM_Parameter[]
     {
         ERDM_Parameter.BOOT_SOFTWARE_VERSION_ID,
         ERDM_Parameter.BOOT_SOFTWARE_VERSION_LABEL
     };
 
+    public override string DisplayName => _moduleDisplayName;
+
     private uint _bootSoftwareVersionId;
     private string _bootSoftwareVersionLabel;
     public uint BootSoftwareVersionId
diff --git a/RDMSharp/RDM/Device/Module/DMX_PersonalityModule.cs b/RDMSharp/RDM/Device/Module/DMX_PersonalityModule.cs
@@ -10,11 +10,14 @@ namespace RDMSharp.RDM.Device.Module;
 public sealed class DMX_PersonalityModule : AbstractModule
 {
     private const string _moduleName = "DMX_Personality";
+    private const string _moduleDisplayName = "DMX Personality";
     private static readonly ERDM_Parameter[] _moduleParameters = new ERDM_Parameter[]
     {
         ERDM_Parameter.DMX_PERSONALITY,
         ERDM_Parameter.DMX_PERSONALITY_DESCRIPTION
-    };
+    };
+
+    public override string DisplayName => _moduleDisplayName;
 
     private IPersonality currentPersonality;
     public IPersonality CurrentPersonality
diff --git a/RDMSharp/RDM/Device/Module/DMX_StartAddressModule.cs b/RDMSharp/RDM/Device/Module/DMX_StartAddressModule.cs
@@ -6,7 +6,10 @@ namespace RDMSharp.RDM.Device.Module;
 public sealed class DMX_StartAddressModule : AbstractModule
 {
     private const string _moduleName = "DMX_StartAddress";
-    private const ERDM_Parameter _moduleParameter = ERDM_Parameter.DMX_START_ADDRESS;
+    private const string _moduleDisplayName = "DMX Start-Address";
+    private const ERDM_Parameter _moduleParameter = ERDM_Parameter.DMX_START_ADDRESS;
+
+    public override string DisplayName => _moduleDisplayName;
 
     private ushort _dmxAddress;
     public ushort? DMXAddress
diff --git a/RDMSharp/RDM/Device/Module/DeviceInfoModule.cs b/RDMSharp/RDM/Device/Module/DeviceInfoModule.cs
@@ -7,8 +7,10 @@ namespace RDMSharp.RDM.Device.Module;
 public sealed class DeviceInfoModule : AbstractModule
 {
     private const string _moduleName = "DeviceInfo";
+    private const string _moduleDisplayName = "Device Info";
     private const ERDM_Parameter _moduleParameter = ERDM_Parameter.DEVICE_INFO;
 
+    public override string DisplayName => _moduleDisplayName;
     public RDMDeviceInfo DeviceInfo
     {
         get
diff --git a/RDMSharp/RDM/Device/Module/DeviceLabelModule.cs b/RDMSharp/RDM/Device/Module/DeviceLabelModule.cs
@@ -3,8 +3,11 @@
 public sealed class DeviceLabelModule : AbstractModule
 {
     private const string _moduleName = "DeviceLabel";
+    private const string _moduleDisplayName = "Device Label";
     private const ERDM_Parameter _moduleParameter = ERDM_Parameter.DEVICE_LABEL;
 
+    public override string DisplayName => _moduleDisplayName;
+
     private string _deviceLabel;
     public string DeviceLabel
     {
diff --git a/RDMSharp/RDM/Device/Module/DeviceModelDescriptionModule.cs b/RDMSharp/RDM/Device/Module/DeviceModelDescriptionModule.cs
@@ -3,8 +3,11 @@
 public sealed class DeviceModelDescriptionModule : AbstractModule
 {
     private const string _moduleName = "DeviceModelDescription";
+    private const string _moduleDisplayName = "Device Model Description";
     private const ERDM_Parameter _moduleParameter = ERDM_Parameter.DEVICE_MODEL_DESCRIPTION;
 
+    public override string DisplayName => _moduleDisplayName;
+
     private string _deviceModelDescriptionLabel;
     public string DeviceModelDescription
     {
diff --git a/RDMSharp/RDM/Device/Module/IdentifyDeviceModule.cs b/RDMSharp/RDM/Device/Module/IdentifyDeviceModule.cs
@@ -5,7 +5,10 @@ namespace RDMSharp.RDM.Device.Module;
 public sealed class IdentifyDeviceModule : AbstractModule
 {
     private const string _moduleName = "IdentifyDevice";
-    private const ERDM_Parameter _moduleParameter = ERDM_Parameter.IDENTIFY_DEVICE;
+    private const string _moduleDisplayName = "Identify Device";
+    private const ERDM_Parameter _moduleParameter = ERDM_Parameter.IDENTIFY_DEVICE;
+
+    public override string DisplayName => _moduleDisplayName;
 
     private bool _identify;
     public bool Identify
diff --git a/RDMSharp/RDM/Device/Module/InterfaceModule.cs b/RDMSharp/RDM/Device/Module/InterfaceModule.cs
@@ -9,6 +9,7 @@ namespace RDMSharp.RDM.Device.Module;
 public sealed class InterfaceModule : AbstractModule
 {
     private const string _moduleName = "Interface";
+    private const string _moduleDisplayName = "Interface";
     private static readonly ERDM_Parameter[] _moduleParameters = new ERDM_Parameter[]
     {
         ERDM_Parameter.LIST_INTERFACES,
@@ -23,6 +24,8 @@ public sealed class InterfaceModule : AbstractModule
         ERDM_Parameter.INTERFACE_APPLY_CONFIGURATION
     };
 
+    public override string DisplayName => _moduleDisplayName;
+
     private IReadOnlyCollection<Interface> _interfaces;
     public IReadOnlyCollection<Interface> Interfaces
     {
diff --git a/RDMSharp/RDM/Device/Module/ManufacturerLabelModule.cs b/RDMSharp/RDM/Device/Module/ManufacturerLabelModule.cs
@@ -5,8 +5,11 @@ namespace RDMSharp.RDM.Device.Module;
 public sealed class ManufacturerLabelModule : AbstractModule
 {
     private const string _moduleName = "ManufacturerLabel";
+    private const string _moduleDisplayName = "Manufacturer Label";
     private const ERDM_Parameter _moduleParameter = ERDM_Parameter.MANUFACTURER_LABEL;
 
+    public override string DisplayName => _moduleDisplayName;
+
     private string _manufacturerLabel;
     public string ManufacturerLabel
     {
diff --git a/RDMSharp/RDM/Device/Module/PresetsModule.cs b/RDMSharp/RDM/Device/Module/PresetsModule.cs
@@ -3,11 +3,14 @@
 public sealed class PresetsModule : AbstractModule
 {
     private const string _moduleName = "Presets";
+    private const string _moduleDisplayName = "Presets";
     private static readonly ERDM_Parameter[] _moduleParameters = new ERDM_Parameter[]
     {
         ERDM_Parameter.PRESET_PLAYBACK,
         ERDM_Parameter.CAPTURE_PRESET
     };
+    public override string DisplayName => _moduleDisplayName;
+
 
     public PresetsModule() : base(
         _moduleName,
diff --git a/RDMSharp/RDM/Device/Module/ProxiedDevicesModule.cs b/RDMSharp/RDM/Device/Module/ProxiedDevicesModule.cs
@@ -9,12 +9,15 @@ namespace RDMSharp.RDM.Device.Module;
 public sealed class ProxiedDevicesModule : AbstractModule
 {
     private const string _moduleName = "ProxiedDevices";
+    private const string _moduleDisplayName = "Proxied Devices";
     private static readonly ERDM_Parameter[] _moduleParameters = new ERDM_Parameter[]
     {
         ERDM_Parameter.PROXIED_DEVICES,
         ERDM_Parameter.PROXIED_DEVICES_COUNT
     };
 
+    public override string DisplayName => _moduleDisplayName;
+
     public IReadOnlyCollection<UID> DeviceUIDs
     {
         get
diff --git a/RDMSharp/RDM/Device/Module/RealTimeClockModule.cs b/RDMSharp/RDM/Device/Module/RealTimeClockModule.cs
@@ -7,7 +7,10 @@ namespace RDMSharp.RDM.Device.Module;
 public sealed class RealTimeClockModule : AbstractModule
 {
     private const string _moduleName = "RealTimeClock";
-    private const ERDM_Parameter _moduleParameter = ERDM_Parameter.REAL_TIME_CLOCK;
+    private const string _moduleDisplayName = "Real Time Clock";
+    private const ERDM_Parameter _moduleParameter = ERDM_Parameter.REAL_TIME_CLOCK;
+
+    public override string DisplayName => _moduleDisplayName;
 
     public DateTime? RealTimeClock
     {
diff --git a/RDMSharp/RDM/Device/Module/SelfTestsModule.cs b/RDMSharp/RDM/Device/Module/SelfTestsModule.cs
@@ -3,12 +3,15 @@
 public sealed class SelfTestsModule : AbstractModule
 {
     private const string _moduleName = "SelfTests";
+    private const string _moduleDisplayName = "Self Tests";
     private static readonly ERDM_Parameter[] _moduleParameters = new ERDM_Parameter[]
     {
         ERDM_Parameter.PERFORM_SELFTEST,
         ERDM_Parameter.SELF_TEST_DESCRIPTION
     };
 
+    public override string DisplayName => _moduleDisplayName;
+
     public SelfTestsModule() : base(
         _moduleName,
         _moduleParameters)
diff --git a/RDMSharp/RDM/Device/Module/SensorsModule.cs b/RDMSharp/RDM/Device/Module/SensorsModule.cs
@@ -10,6 +10,7 @@ namespace RDMSharp.RDM.Device.Module;
 public sealed class SensorsModule : AbstractModule
 {
     private const string _moduleName = "Sensors";
+    private const string _moduleDisplayName = "Sensors";
     private static readonly ERDM_Parameter[] _moduleParameters = new ERDM_Parameter[]
     {
             ERDM_Parameter.SENSOR_DEFINITION,
@@ -19,6 +20,8 @@ public sealed class SensorsModule : AbstractModule
             ERDM_Parameter.SENSOR_TYPE_CUSTOM
     };
 
+    public override string DisplayName => _moduleDisplayName;
+
     private readonly ConcurrentDictionary<byte, Sensor> sensors = new ConcurrentDictionary<byte, Sensor>();
     public IReadOnlyDictionary<byte, Sensor> Sensors
     {
diff --git a/RDMSharp/RDM/Device/Module/SlotsModule.cs b/RDMSharp/RDM/Device/Module/SlotsModule.cs
@@ -8,13 +8,16 @@ namespace RDMSharp.RDM.Device.Module;
 public sealed class SlotsModule : AbstractModule
 {
     private const string _moduleName = "Slots";
+    private const string _moduleDisplayName = "Slots";
     private static readonly ERDM_Parameter[] _moduleParameters = new ERDM_Parameter[]
     {
         ERDM_Parameter.SLOT_INFO,
         ERDM_Parameter.SLOT_DESCRIPTION,
         ERDM_Parameter.DEFAULT_SLOT_VALUE
     };
 
+    public override string DisplayName => _moduleDisplayName;
+
     public IPersonality CurrentPersonality
     {
         get
diff --git a/RDMSharp/RDM/Device/Module/SoftwareVersionModule.cs b/RDMSharp/RDM/Device/Module/SoftwareVersionModule.cs
@@ -5,7 +5,10 @@ namespace RDMSharp.RDM.Device.Module;
 public sealed class SoftwareVersionModule : AbstractModule
 {
     private const string _moduleName = "SoftwareVersion";
-    private const ERDM_Parameter _moduleParameter = ERDM_Parameter.SOFTWARE_VERSION_LABEL;
+    private const string _moduleDisplayName = "Software Version";
+    private const ERDM_Parameter _moduleParameter = ERDM_Parameter.SOFTWARE_VERSION_LABEL;
+
+    public override string DisplayName => _moduleDisplayName;
 
     private uint _softwareVersionId;
     private string _softwareVersionLabel;
diff --git a/RDMSharp/RDM/Device/Module/StatusMessageModule.cs b/RDMSharp/RDM/Device/Module/StatusMessageModule.cs
@@ -6,23 +6,26 @@
 
 namespace RDMSharp.RDM.Device.Module;
 
-public sealed class StatusMessageModule : AbstractModule
+public sealed class StatusMessagesModule : AbstractModule
 {
-    private const string _moduleName = "StatusMessage";
+    private const string _moduleName = "StatusMessages";
+    private const string _moduleDisplayName = "Status Messages";
     private static readonly ERDM_Parameter[] _moduleParameters = new ERDM_Parameter[]
     {
         ERDM_Parameter.STATUS_MESSAGES,
         ERDM_Parameter.CLEAR_STATUS_ID
     };
 
+    public override string DisplayName => _moduleDisplayName;
+
     private ConcurrentDictionary<int, RDMStatusMessage> statusMessages = new ConcurrentDictionary<int, RDMStatusMessage>();
     public IReadOnlyDictionary<int, RDMStatusMessage> StatusMessages { get { return statusMessages.AsReadOnly(); } }
-    public StatusMessageModule() : base(
+    public StatusMessagesModule() : base(
         _moduleName,
         _moduleParameters)
     {
     }
-    public StatusMessageModule(AbstractRemoteRDMDevice remoteDevice) : base(
+    public StatusMessagesModule(AbstractRemoteRDMDevice remoteDevice) : base(
         remoteDevice,
         _moduleName,
         _moduleParameters)
diff --git a/RDMSharp/RDM/Device/Module/TagsModule.cs b/RDMSharp/RDM/Device/Module/TagsModule.cs
@@ -6,6 +6,7 @@ namespace RDMSharp.RDM.Device.Module;
 public sealed class TagsModule : AbstractModule
 {
     private const string _moduleName = "Tags";
+    private const string _moduleDisplayName = "Tags";
     private static readonly ERDM_Parameter[] _moduleParameters = new ERDM_Parameter[]
     {
         ERDM_Parameter.LIST_TAGS,
@@ -15,6 +16,8 @@ public sealed class TagsModule : AbstractModule
         ERDM_Parameter.CLEAR_TAGS
     };
 
+    public override string DisplayName => _moduleDisplayName;
+
     private List<string> tags = new List<string>();
     public IReadOnlyCollection<string> Tags
     {

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,10 @@ namespace RDMSharp.RDM.Device.Module;`
`7`	`7`	`public sealed class DeviceInfoModule : AbstractModule`
`8`	`8`	`{`
`9`	`9`	`private const string _moduleName = "DeviceInfo";`
	`10`	`+ private const string _moduleDisplayName = "Device Info";`
`10`	`11`	`private const ERDM_Parameter _moduleParameter = ERDM_Parameter.DEVICE_INFO;`
`11`	`12`
	`13`	`+ public override string DisplayName => _moduleDisplayName;`
`12`	`14`	`public RDMDeviceInfo DeviceInfo`
`13`	`15`	`{`
`14`	`16`	`get`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,11 @@`
`3`	`3`	`public sealed class DeviceLabelModule : AbstractModule`
`4`	`4`	`{`
`5`	`5`	`private const string _moduleName = "DeviceLabel";`
	`6`	`+ private const string _moduleDisplayName = "Device Label";`
`6`	`7`	`private const ERDM_Parameter _moduleParameter = ERDM_Parameter.DEVICE_LABEL;`
`7`	`8`
	`9`	`+ public override string DisplayName => _moduleDisplayName;`
	`10`	`+`
`8`	`11`	`private string _deviceLabel;`
`9`	`12`	`public string DeviceLabel`
`10`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,11 @@`
`3`	`3`	`public sealed class DeviceModelDescriptionModule : AbstractModule`
`4`	`4`	`{`
`5`	`5`	`private const string _moduleName = "DeviceModelDescription";`
	`6`	`+ private const string _moduleDisplayName = "Device Model Description";`
`6`	`7`	`private const ERDM_Parameter _moduleParameter = ERDM_Parameter.DEVICE_MODEL_DESCRIPTION;`
`7`	`8`
	`9`	`+ public override string DisplayName => _moduleDisplayName;`
	`10`	`+`
`8`	`11`	`private string _deviceModelDescriptionLabel;`
`9`	`12`	`public string DeviceModelDescription`
`10`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ namespace RDMSharp.RDM.Device.Module;`
`9`	`9`	`public sealed class InterfaceModule : AbstractModule`
`10`	`10`	`{`
`11`	`11`	`private const string _moduleName = "Interface";`
	`12`	`+ private const string _moduleDisplayName = "Interface";`
`12`	`13`	`private static readonly ERDM_Parameter[] _moduleParameters = new ERDM_Parameter[]`
`13`	`14`	`{`
`14`	`15`	`ERDM_Parameter.LIST_INTERFACES,`
`@@ -23,6 +24,8 @@ public sealed class InterfaceModule : AbstractModule`
`23`	`24`	`ERDM_Parameter.INTERFACE_APPLY_CONFIGURATION`
`24`	`25`	`};`
`25`	`26`
	`27`	`+ public override string DisplayName => _moduleDisplayName;`
	`28`	`+`
`26`	`29`	`private IReadOnlyCollection<Interface> _interfaces;`
`27`	`30`	`public IReadOnlyCollection<Interface> Interfaces`
`28`	`31`	`{`