Mbus devices #141
Closed
Mbus devices #141
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
At least the BE and the NL DSMR devices use MBUS. Therefor we make the MBUS obis reference generic, and convert the V5 telegram to use MBUS values. Also remove BELGIUM_MAX_POWER_PER_PHASE as this was a duplicate. Finally set self.maxDiff = None to have a full test output on some tests.
jbouwh
suggested changes
Oct 25, 2023
Comment on lines
-91
to
-116
| BELGIUM_MAX_POWER_PER_PHASE = r'^\d-\d:17\.0\.0.+?\r\n' # Applicable when power limitation is active | ||
| BELGIUM_MAX_CURRENT_PER_PHASE = r'^\d-\d:31\.4\.0.+?\r\n' # Applicable when current limitation is active | ||
|
|
||
| # Multiple 'slaves' can be linked to the main device. | ||
| # Mostly MBUS1 = GAS METER with values on 24.2.3 | ||
| # While WATER METER reports it's values on 24.2.1 | ||
| # The GAS METER also reports its valve state on 24.4.0 | ||
| # Dev type for gas = 7 and water = 8 | ||
| BELGIUM_MBUS1_DEVICE_TYPE = r'^\d-1:24\.1\.0.+?\r\n' | ||
| BELGIUM_MBUS1_EQUIPMENT_IDENTIFIER = r'^\d-1:96\.1\.1.+?\r\n' | ||
| BELGIUM_MBUS1_VALVE_POSITION = r'^\d-1:24\.4\.0.+?\r\n' | ||
| BELGIUM_MBUS1_METER_READING1 = r'^\d-1:24\.2\.1.+?\r\n' | ||
| BELGIUM_MBUS1_METER_READING2 = r'^\d-1:24\.2\.3.+?\r\n' | ||
|
|
||
| BELGIUM_MBUS2_DEVICE_TYPE = r'^\d-2:24\.1\.0.+?\r\n' | ||
| BELGIUM_MBUS2_EQUIPMENT_IDENTIFIER = r'^\d-2:96\.1\.1.+?\r\n' | ||
| BELGIUM_MBUS2_VALVE_POSITION = r'^\d-2:24\.4\.0.+?\r\n' | ||
| BELGIUM_MBUS2_METER_READING1 = r'^\d-2:24\.2\.1.+?\r\n' | ||
| BELGIUM_MBUS2_METER_READING2 = r'^\d-2:24\.2\.3.+?\r\n' | ||
|
|
||
| BELGIUM_MBUS3_DEVICE_TYPE = r'^\d-3:24\.1\.0.+?\r\n' | ||
| BELGIUM_MBUS3_EQUIPMENT_IDENTIFIER = r'^\d-3:96\.1\.1.+?\r\n' | ||
| BELGIUM_MBUS3_VALVE_POSITION = r'^\d-3:24\.4\.0.+?\r\n' | ||
| BELGIUM_MBUS3_METER_READING1 = r'^\d-3:24\.2\.1.+?\r\n' | ||
| BELGIUM_MBUS3_METER_READING2 = r'^\d-3:24\.2\.3.+?\r\n' | ||
|
|
There was a problem hiding this comment.
Removing these might be breaking for anyone using these.
There was a problem hiding this comment.
Correct. But backwards compatibility is not really an issue. You always depend on a specific version.
You neither can have multiple of the same regexes in the same parser, as only the first will match afaik.
Comment on lines
+85
to
+90
| MBUS1_DEVICE_TYPE = r'^\d-1:24\.1\.0.+?\r\n' | ||
| MBUS1_EQUIPMENT_IDENTIFIER = r'^\d-1:96\.1\.0.+?\r\n' | ||
| MBUS1_EQUIPMENT_IDENTIFIER_ALT = r'^\d-1:96\.1\.1.+?\r\n' | ||
| MBUS1_VALVE_POSITION = r'^\d-1:24\.4\.0.+?\r\n' | ||
| MBUS1_METER_READING = r'^\d-1:24\.2\.1.+?\r\n' | ||
| MBUS1_METER_READING_ALT = r'^\d-1:24\.2\.3.+?\r\n' |
There was a problem hiding this comment.
May be these can be generic matching all devices:
Suggested change
| MBUS1_DEVICE_TYPE = r'^\d-1:24\.1\.0.+?\r\n' | |
| MBUS1_EQUIPMENT_IDENTIFIER = r'^\d-1:96\.1\.0.+?\r\n' | |
| MBUS1_EQUIPMENT_IDENTIFIER_ALT = r'^\d-1:96\.1\.1.+?\r\n' | |
| MBUS1_VALVE_POSITION = r'^\d-1:24\.4\.0.+?\r\n' | |
| MBUS1_METER_READING = r'^\d-1:24\.2\.1.+?\r\n' | |
| MBUS1_METER_READING_ALT = r'^\d-1:24\.2\.3.+?\r\n' | |
| MBUS_DEVICE_TYPE = r'^\d-\d:24\.1\.0.+?\r\n' | |
| MBUS_EQUIPMENT_IDENTIFIER = r'^\d-\d:96\.1\.0.+?\r\n' | |
| MBUS_EQUIPMENT_IDENTIFIER_ALT = r'^\d-\d:96\.1\.1.+?\r\n' | |
| MBUS_VALVE_POSITION = r'^\d-\d:24\.4\.0.+?\r\n' | |
| MBUS_METER_READING = r'^\d-\d:24\.2\.1.+?\r\n' | |
| MBUS_METER_READING_ALT = r'^\d-\d:24\.2\.3.+?\r\n' |
The exiting references are generic too. The regex will simple give more matches if there are more devices.
There was a problem hiding this comment.
Afaik there can only be a specific regex per value you want to parse. Otherwise it will only match the first one.
Comment on lines
-433
to
-437
| { | ||
| 'obis_reference': obis.DEVICE_TYPE, | ||
| 'value_parser': CosemParser(ValueParser(int)), | ||
| 'value_name': 'DEVICE_TYPE' | ||
| }, |
There was a problem hiding this comment.
Will cause same issue as above and is to generic as it will match an mbus device type.
Merged
|
Superseded by #142 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Open for comments :)