Merge branch 'RDM-2025-0006-Adding_short_names_for_waterQualityMonitor_MC' into R5

# Conflicts:
#	TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md

TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md

@@ -2064,9 +2064,6 @@ This ModuleClass provides the capabilities to indicate whether or not water has
 #### 5.3.1.98 waterQualityMonitor
 This ModuleClass provides the information of water quality detection.
 
-<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
-
-
 **Table 5.3.1.98-1: DataPoints of waterQualityMonitor ModuleClass**
 
 |Name |Type |R/W |Optional |Unit |Documentation |
@@ -2103,7 +2100,6 @@ This ModuleClass provides the information of water quality detection.
 
 
 
-
 #### 5.3.1.99 weight
 This ModuleClass provides the capability to report the measurement of weight.
 
@@ -6107,7 +6103,11 @@ In protocol bindings resource attributes names for data points of module classes
 |alarm |[motionSensor](#53154-motionsensor), [smokeSensor](#53182-smokesensor), [temperatureAlarm](#53188-temperaturealarm), [waterSensor](#53197-watersensor) |alarm |
 |alarmStatus |[alarmSpeaker](#5317-alarmspeaker) |alaSs |
 |alarmTimestamp | [temperatureAlarm](#53188-temperaturealarm) | alaTp |
+|algae |[waterQualityMonitor](#53198-waterqualitymonitor) |algae |
 |altitude |[geoLocation](#53141-geolocation) |altie |
+|anionics |[waterQualityMonitor](#53198-waterqualitymonitor) |anios |
+|aroh |[waterQualityMonitor](#53198-waterqualitymonitor) |aroh |
+|as |[waterQualityMonitor](#53198-waterqualitymonitor) |as |
 |automode |[airFlow](#5314-airflow) |autoe |
 |availableChannels |[televisionChannel](#53186-televisionchannel) |avaCs |
 |backoffTime |[periodicalReportConfig](#53163-periodicalreportconfig) |bacTe |
@@ -6115,6 +6115,7 @@ In protocol bindings resource attributes names for data points of module classes
 |bath |[hotWaterSupply](#53146-hotwatersupply) |bath |
 |batteryThreshold |[battery](#53110-battery) |batTd |
 |billingNumber |[gasChargingControl](#53138-gaschargingcontrol) |bilNr |
+|biotoxicity |[waterQualityMonitor](#53198-waterqualitymonitor) |bioty |
 |blue |[colour](#53123-colour) |blue |
 |bmi |[bodyCompositionAnalyser](#53114-bodycompositionanalyser) |bmi |
 |bodyLength |[bodyCompositionAnalyser](#53114-bodycompositionanalyser) |bodLh |
@@ -6124,15 +6125,19 @@ In protocol bindings resource attributes names for data points of module classes
 |callerID |[phoneCall](#53164-phonecall) |calID |
 |callState |[phoneCall](#53164-phonecall) |calSe |
 |capacity |[battery](#53110-battery) |capay |
+|cd |[waterQualityMonitor](#53198-waterqualitymonitor) |cd |
 |cellID |[connectivity](#53125-connectivity) |celID |
 |ch2o |[airQualitySensor](#5316-airqualitysensor) |ch2o |
 |channelId |[televisionChannel](#53186-televisionchannel) |chaId |
 |channelName |[televisionChannel](#53186-televisionchannel) |chaNe |
 |charging |[battery](#53110-battery) |charg |
 |chargingCapacity |[electricVehicleConnector](#53131-electricvehicleconnector) |chaCy |
+|chlorophyll_a |[waterQualityMonitor](#53198-waterqualitymonitor) |chloa |
+|cn |[waterQualityMonitor](#53198-waterqualitymonitor) |cn |
 |co |[airQualitySensor](#5316-airqualitysensor) |co |
 |co2 |[airQualitySensor](#5316-airqualitysensor) |co2 |
 |coarseness |[grinder](#53143-grinder) |coars |
+|cod |[waterQualityMonitor](#53198-waterqualitymonitor) |cod |
 |code |[faultDetection](#53134-faultdetection), [filterInfo](#53135-filterinfo) |code |
 |coldWash |[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption) |colWh |
 |colourSaturation |[colourSaturation](#53124-coloursaturation) |colSn |
@@ -6141,6 +6146,7 @@ In protocol bindings resource attributes names for data points of module classes
 |communicationAlarm |[waterMeterAlarm](#53194-watermeteralarm)|comAm |
 |component |[dmFirmware](#585-dmfirmware) |compt |
 |concentration |[glucometer](#53142-glucometer) |concn |
+|conductivity |[waterQualityMonitor](#53198-waterqualitymonitor) |condy |
 |contextCarbohydratesAmount |[glucometer](#53142-glucometer) |coCAt |
 |contextCarbohydratesSource |[glucometer](#53142-glucometer) |coCSe |
 |contextExercise |[glucometer](#53142-glucometer) |conEe |
@@ -6151,6 +6157,8 @@ In protocol bindings resource attributes names for data points of module classes
 |contextTester |[glucometer](#53142-glucometer) |conTr |
 |country |[dmDeviceInfo](#583-dmdeviceinfo) |couny |
 |cpuUsage |[dmAgent](#582-dmagent) |cpuUe |
+|cr6 |[waterQualityMonitor](#53198-waterqualitymonitor) |cr6 |
+|cu |[waterQualityMonitor](#53198-waterqualitymonitor) |cu |
 |cupsNumber |[brewing](#53116-brewing) |cupNr |
 |current |[energyConsumption](#53132-energyconsumption) |currt |
 |currentAdfState |[autoDocumentFeeder](#5319-autodocumentfeeder) |cuASe |
@@ -6187,6 +6195,7 @@ In protocol bindings resource attributes names for data points of module classes
 |displayInterval |[galleryMode](#53137-gallerymode) |disIl |
 |displayOrder |[galleryMode](#53137-gallerymode) |disOr |
 |displayOrientation |[galleryMode](#53137-gallerymode) |disOn |
+|do |[waterQualityMonitor](#53198-waterqualitymonitor) |do |
 |doorState |[doorStatus](#53130-doorstatus) |dooSe |
 |duration |[overcurrentSensor](#53158-overcurrentsensor), [recorder](#53170-recorder) |dur |
 |electricEnergy |[battery](#53110-battery) |eleEy |
@@ -6194,14 +6203,17 @@ In protocol bindings resource attributes names for data points of module classes
 |energy |[pulsemeter](#53168-pulsemeter) |enery |
 |estimatedTimeToEnd |[timer](#53190-timer) |eTTEd |
 |extraRinse |[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption) |extRe |
+|f |[waterQualityMonitor](#53198-waterqualitymonitor) |f |
 |fat |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |fat |
 |fatFreeMass |[bodyCompositionAnalyser](#53114-bodycompositionanalyser) |faFMs |
+|fe |[waterQualityMonitor](#53198-waterqualitymonitor) |fe |
 |filterLifetime |[filterInfo](#53135-filterinfo) |filLe |
 |flowInterval |[waterMeterSetting](#53196-watermetersetting) |floIl |
 |foamingStrength |[foaming](#53136-foaming) |foaSh |
 |frequency |[energyConsumption](#53132-energyconsumption) |freqy |
 |friendlyName |[dmDeviceInfo](#583-dmdeviceinfo) |friNe |
 |friendlyLocation |[location](#5392-location), [localization](#5393-localization) |friLn |
+|ftu |[waterQualityMonitor](#53198-waterqualitymonitor) |ftu |
 |fwVersion |[dmDeviceInfo](#583-dmdeviceinfo)	 |fweVn |
 |generationSource |[energyGeneration](#53133-energygeneration) |genSe |
 |geoJSON |[location](#5392-location) |geoJN |
@@ -6213,6 +6225,7 @@ In protocol bindings resource attributes names for data points of module classes
 |headingAccuracy |[geoLocation](#53141-geolocation) |heaAy |
 |heatingLevel |[heatingZone](#53144-heatingzone) |heaLl |
 |height |[height](#53145-height) |heigt |
+|hg |[waterQualityMonitor](#53198-waterqualitymonitor) |hg |
 |highMagneticAlarm |[magneticSensorParameters](#53161-magneticsensorparameters)|hiMAm |
 |highFlowAlarm |[waterMeterAlarm](#53194-watermeteralarm)|hiFAm |
 |highFlowAlarmThreshold |[waterMeterAlarm](#53194-watermeteralarm)|hFATd |
@@ -6243,6 +6256,7 @@ In protocol bindings resource attributes names for data points of module classes
 |jobStates |[runState](#53175-runstate) |jobSs |
 |kcal |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |kcal |
 |keyNumber |[keypad](#53149-keypad) |keyNr |
+|kmno4 |[waterQualityMonitor](#53198-waterqualitymonitor) |kmno4 |
 |lampTechnology |[slcReportInfo](#53181-slcreportinfo) |lamTy |
 |largeFlowAlarm |[gasMeterAlarm](#53139-gasmeteralarm) |LaFAm |
 |latitude |[geoLocation](#53141-geolocation) |latie |
@@ -6313,13 +6327,16 @@ In protocol bindings resource attributes names for data points of module classes
 |muteEnabled |[audioVolume](#5318-audiovolume) |mutEd |
 |name |[dmPackage](#588-dmpackage), [dmSoftware](#586-dmsoftware) |name |
 |network |[threeDprinter](#5311-threedprinter) |netwk |
+|nh3nh4 |[waterQualityMonitor](#53198-waterqualitymonitor) |nh3n4 |
 |no2 |[airQualitySensor](#5316-airqualitysensor) |no2 |
+|no3n |[waterQualityMonitor](#53198-waterqualitymonitor) |no3n |
 |noise |[airQualitySensor](#5316-airqualitysensor) |noise |
 |numberValue |[numberValue](#53155-numbervalue) |numVe |
 |o3 |[airQualitySensor](#5316-airqualitysensor) |o3 |
 |object |[binaryObject](#53111-binaryobject) |objet |
 |objectType |[binaryObject](#53111-binaryobject) |objTe |
 |odor |[airQualitySensor](#5316-airqualitysensor) |odor |
+|oil |[waterQualityMonitor](#53198-waterqualitymonitor) |oil |
 |onlineStatus |[slcReportInfo](#53181-slcreportinfo) |onlSs |
 |openAlarm |[doorStatus](#53130-doorstatus) |opeAm |
 |openDuration |[doorStatus](#53130-doorstatus) |opeDn |
@@ -6340,8 +6357,10 @@ In protocol bindings resource attributes names for data points of module classes
 |ozoneValuePPM |[ozoneMeter](#53160-ozonemeter) |oVPPM |
 |parkingStatus |[parkingStatus](#53162-parkingstatus) |parSs |
 |password |[credentials](#53127-credentials) |pwd |
+|pb |[waterQualityMonitor](#53198-waterqualitymonitor) |pb |
 |pci |[connectivity](#53125-connectivity) |pci |
 |period |[periodicalReportConfig](#53163-periodicalreportconfig) |perid |
+|ph |[waterQualityMonitor](#53198-waterqualitymonitor) |ph |
 |pm1 |[airQualitySensor](#5316-airqualitysensor) | pm1 |
 |pm10 |[airQualitySensor](#5316-airqualitysensor) |pm10 |
 |pm25 |[airQualitySensor](#5316-airqualitysensor) | pm25 |
@@ -6429,6 +6448,7 @@ In protocol bindings resource attributes names for data points of module classes
 |storageTotal |[dmAgent](#582-dmagent) |stoTl |
 |strength |[brewing](#53116-brewing) |streh |
 |subModel |[dmDeviceInfo](#583-dmdeviceinfo) |subMl |
+|sulfide |[waterQualityMonitor](#53198-waterqualitymonitor) |sulfide |
 |supportedHorizontalDirection |[airFlow](#5314-airflow) |suHDn |
 |supportedMediaSources |[mediaSelect](#53153-mediaselect) |suMSs |
 |supportedMessageValues |[textMessage](#53189-textmessage) |suMVs |
@@ -6449,7 +6469,7 @@ In protocol bindings resource attributes names for data points of module classes
 |targetTemperature |[temperature](#53187-temperature) |tarTe |
 |targetTimeToStart |[timer](#53190-timer) |tTTSt |
 |targetTimeToStop |[timer](#53190-timer) |tTTSp |
-|temperature |[airQualitySensor](#5316-airqualitysensor), [temperatureAlarm](#53188-temperaturealarm) |tempe |
+|temperature |[airQualitySensor](#5316-airqualitysensor), [temperatureAlarm](#53188-temperaturealarm), [waterQualityMonitor](#53198-waterqualitymonitor) |tempe |
 |temperatureThreshold <mark>This data point has been changed to two different data points</mark> |[temperatureAlarm](#53188-temperaturealarm) |temTd |
 |textMessage |[textMessage](#53189-textmessage) |texMe |
 |time |[keepWarm](#53148-keepwarm) |time |
@@ -6457,9 +6477,11 @@ In protocol bindings resource attributes names for data points of module classes
 |timeRange |[slcParameterSetting](#53180-slcparametersetting) |timRe |
 |timeRangeCount |[slcParameterSetting](#53180-slcparametersetting) |tiRCt |
 |timeRangeLightDimmingValue |[slcParameterSetting](#53180-slcparametersetting) |tRLDV |
+|tn |[waterQualityMonitor](#53198-waterqualitymonitor) |tn |
 |token |[credentials](#53127-credentials) |tk |
 |tone |[alarmSpeaker](#5317-alarmspeaker) |tone |
 |totalUseValue |[gasMeterReportInfo](#53140-gasmeterreportinfo) |toUVe |
+|tp |[waterQualityMonitor](#53198-waterqualitymonitor) |tp |
 |tsp |[airQualitySensor](#5316-airqualitysensor) |tsp |
 |turboEnabled |[turbo](#53191-turbo) |turEd |
 |type |[dmEventLog](#587-dmeventlog) |type |
@@ -6497,6 +6519,7 @@ In protocol bindings resource attributes names for data points of module classes
 |weight |[weight](#53199-weight) |weigt |
 |windDirection |[airQualitySensor](#5316-airqualitysensor) |winDn |
 |windSpeed |[airQualitySensor](#5316-airqualitysensor) |winSd |
+|zn |[waterQualityMonitor](#53198-waterqualitymonitor) |zn |