Commits · a95e03f1cbba6353abf691a25a8d4f778ec63856 · Specifications / Technical Specifications / TS-0023

Feb 27, 2025
- Merge branch 'RDM-2025-0006-Adding_short_names_for_waterQualityMonitor_MC' into R5 · a95e03f1
  Andreas Kraft authored 2 months ago
  
  # Conflicts: # TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md
  a95e03f1
- Merge branch 'RDM-2025-0005-Adding_short_names_for_waterMeterSetting_MC' into R5 · f0207486
  Andreas Kraft authored 2 months ago
  
  # Conflicts: # TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md
  f0207486
- Merge branch 'RDM-2025-0004-Adding_short_names_for_waterMeterAlarm_MC' into R5 · 36925bd1
  Andreas Kraft authored 2 months ago
  
  # Conflicts: # TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md
  36925bd1
- Merge branch 'RDM-2025-0002-Added_missing_link_for_unit_attribute' into R5 · 32adf5c5
  Andreas Kraft authored 2 months ago
  
  32adf5c5
Feb 24, 2025
- Merge branch 'RDM-2025-0001-Adding_short_names_for_temperatureAlarm_MC' into R5 · 9e812f58
  Andreas Kraft authored 2 months ago
  
  9e812f58
- Merge branch 'RDM-2024-0062-Correcting_short_name_for_lightCurrent_attribute' into R5 · 362f3164
  Andreas Kraft authored 2 months ago
  
  362f3164
Feb 11, 2025
- Removed stray characters from CR · 64cf62ba
  Andreas Kraft authored 2 months ago
  
  64cf62ba
Jan 30, 2025
- Adding short names for waterQualityMonitor · 30fab412
  Andreas Kraft authored 3 months ago
  
  30fab412
- Adding short names for waterMeterSetting · 3e773f52
  Andreas Kraft authored 3 months ago
  
  3e773f52
Jan 28, 2025
- Adding short names for waterMeterAlarm · 4cc14691
  Andreas Kraft authored 3 months ago
  
  4cc14691
Jan 22, 2025
- Added missing link for "unit" attribute · 9cb5ad01
  Andreas Kraft authored 3 months ago
  
  9cb5ad01
Jan 21, 2025
- Correcting short names for temperatureAlarm attributes · 117edf58
  Andreas Kraft authored 3 months ago
  
  117edf58
Nov 30, 2024

Correcting short name for lightCurrent attribute · 11b904f3
Andreas Kraft authored 5 months ago

11b904f3

Contribution RDM-2024-0048-Adding_short_names_for_slcReportInfo_MC merged into R5 · ba97f7f2

Andreas Kraft authored 5 months ago

Original contribution:RDM-2024-0048-Adding_short_names_for_slcReportInfo_MC

See merge request !19

# Conflicts:
#	TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md

Resolved merge conflicts

ba97f7f2

Contribution RDM-2024-0047-Adding_short_names_for_slcParameterSetting_MC merged into R5 · fcef142a
Andreas Kraft authored 5 months ago
```
Original contribution: RDM-2024-0047-Adding_short_names_for_slcParameterSetting_MC

See merge request !18
```
fcef142a
Contribution RDM-2024-0046-Adding_short_names_for_slcAlarm_MC merged into R5 · 79a9c303
Andreas Kraft authored 5 months ago
```
Original contribution: RDM-2024-0046-Adding_short_names_for_slcAlarm_MC

See merge request !17
```
79a9c303

Contribution RDM-2024-0045-Adding_short_names_for_periodicalReportConfig_MC merged into R5 · 41010087

Andreas Kraft authored 5 months ago

Original contribution: RDM-2024-0045-Adding_short_names_for_periodicalReportConfig_MC

See merge request !16

# Conflicts:
#	TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md

Resolved merge conflicts

41010087

Contribution RDM-2024-0044-Adding_short_names_for_parkingStatus_MC merged into R5 · 473d4d0c

Andreas Kraft authored 5 months ago

Original contribution: RDM-2024-0044-Adding_short_names_for_parkingStatus_MC

See merge request !15

# Conflicts:
#	TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md

Resolved merge conflicts

473d4d0c

Contribution RDM-2024-0043-Adding_short_names_for_magneticSensorParameters_MC merged into R5 · b6823aa2

Andreas Kraft authored 5 months ago

Original contribution: RDM-2024-0043-Adding_short_names_for_magneticSensorParameters_MC

See merge request !14

# Conflicts:
#	TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md

Resolved merge conflicts

b6823aa2

ContributionRDM-2024-0042R01-Adding_short_names_for_gasMeterReportInfo_MC merged into R5 · 6cdb9a73

Andreas Kraft authored 5 months ago

Original contribution: RDM-2024-0041-Adding_short_names_for_gasMeterAlarm_MC

See merge request !13

# Conflicts:
#	TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md

Resolved merge conflicts

6cdb9a73

Contribution RDM-2024-0041-Adding_short_names_for_gasMeterAlarm_MC merged into R5 · feec9593

Andreas Kraft authored 5 months ago

Original contribution: RDM-2024-0041-Adding_short_names_for_gasMeterAlarm_MC

See merge request !12

# Conflicts:
#	TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md

Resolved merge conflicts

feec9593

Contribution RDM-2024-0040-Adding_short_names_for_gasChargingControl_MC merged into R5 · db991252
Andreas Kraft authored 5 months ago
```
Original contribution: RDM-2024-0040-Adding_short_names_for_gasChargingControl_MC

See merge request !11
```
db991252
Contribution RDM-2024-0039-Adding_short_names_for_galleryMode_MC merged into R5 · 2d854b29
Andreas Kraft authored 5 months ago
```
Original contribution: RDM-2024-0039-Adding_short_names_for_galleryMode_MC

See merge request !10
```
2d854b29

Contribution RDM-2024-0038-Adding_short_names_for_connectivity_MC merged into R5 · 813c14f5

Andreas Kraft authored 5 months ago

Original contribution: RDM-2024-0038-Adding_short_names_for_connectivity_MC

See merge request !9

# Conflicts:
#	TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md

Resolved merge conflicts during merge

813c14f5

Nov 22, 2024
- Contribution RDM-2024-0037R01-Correcting_and_adding_short_names_for_airQualitySensor merged into R5 · 92d18b1c
  Andreas Kraft authored 5 months ago
  
  Original contribution: RDM-2024-0037-Correcting_and_adding_short_names_for_airQualitySensor See merge request !8
  92d18b1c
- Contribution RDM-2024-0036-Correcting_UoM_of_MemorySize_in_threeDprinter_ModuleClass merged into R5 · 1b41f606
  Andreas Kraft authored 5 months ago
  
  Original contribution: RDM-2024-0036-Correcting_UoM_of_MemorySize_in_threeDprinter_ModuleClass See merge request !7
  1b41f606
Oct 31, 2024
- Correct spelling of the shortname of o3 · 534f4809
  Andreas Kraft authored 6 months ago
  
  534f4809
Oct 19, 2024
- Adding short names for slcReportInfo MC · ffb0931b
  Andreas Kraft authored 6 months ago
  
  ffb0931b
- Adding short names for slcParameterSetting MC · a12f589d
  Andreas Kraft authored 6 months ago
  
  a12f589d
- Adding short names for slcAlarm MC · d9fb53d0
  Andreas Kraft authored 6 months ago
  
  d9fb53d0
Oct 18, 2024
- Adding short names for periodicalReportConfig MC · 42443450
  Andreas Kraft authored 6 months ago
  
  42443450
- Adding short names for parkingStatus MC · 46282940
  Andreas Kraft authored 6 months ago
  
  46282940
- Adding short names for magneticSensorParameters MC · ca5112e7
  Andreas Kraft authored 6 months ago
  
  ca5112e7
Oct 17, 2024
- Adding short names for gasMeterReportInfo MC · 416524b1
  Andreas Kraft authored 6 months ago
  
  416524b1
Oct 16, 2024
- Adding short names for gasMeterAlarm MC · eba83094
  Andreas Kraft authored 6 months ago
  
  eba83094
- Adding short names for gasChargingControl MC · 87423c38
  Andreas Kraft authored 6 months ago
  
  87423c38
- Adding short names for galleryMode MC · 5b9797d9
  Andreas Kraft authored 6 months ago
  
  5b9797d9
- Adding short names for connectivity MC · 5b038c18
  Andreas Kraft authored 6 months ago
  
  5b038c18
Oct 15, 2024
- Added to document history · 1cca45ef
  Andreas Kraft authored 6 months ago
  
  1cca45ef
- Correcting and adding short names for airQualitySensor · 6d425430
  Andreas Kraft authored 6 months ago
  
  6d425430