Solax g2+g4 #2157
Merged
Solax g2+g4 #2157
Conversation
This file contains hidden or 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
LKuemmel
requested changes
Jan 16, 2025
| class SolaxBat(AbstractBat): | ||
| def __init__(self, | ||
| device_id: int, | ||
| device_config: Union[Dict, Solax], |
Contributor
There was a problem hiding this comment.
Suggested change
| device_config: Union[Dict, Solax], | |
| device_config: Solax, |
Das Dictionary wird in der Subdata in eine Klasse konvertiert.
| exported, imported = [value * 10 for value in self.__tcp_client.read_input_registers( | ||
| 0x043D, [ModbusDataType.UINT_32] * 2, wordorder=Endian.Little, unit=unit)] | ||
|
|
||
| if SolaxVersion(self.device_config.configuration.version) == SolaxVersion.G3: |
Contributor
There was a problem hiding this comment.
Suggested change
| if SolaxVersion(self.device_config.configuration.version) == SolaxVersion.G3: | |
| elif SolaxVersion(self.device_config.configuration.version) == SolaxVersion.G3: |
Muss hier nicht ein elif hin? Sonst werden beim G2 die Werte im else-Zweig nochmal versucht auszulesen.
| with self.__tcp_client: | ||
| power = self.__tcp_client.read_input_registers(22, ModbusDataType.INT_16, unit=self.__modbus_id) | ||
| soc = self.__tcp_client.read_input_registers(28, ModbusDataType.UINT_16, unit=self.__modbus_id) | ||
| # kein Speicher für Versionen G2 und G4 |
Contributor
There was a problem hiding this comment.
with self.__tcp_client: Im Device wird in der update-Funktion der Kontext-Handler gestartet. Ist er hier nochmal erforderlich?
| power = self.__tcp_client.read_input_registers(0x0413, ModbusDataType.UINT_16, unit=unit) * -1 | ||
| exported = self.__tcp_client.read_input_registers( | ||
| 0x0423, ModbusDataType.UINT_32, wordorder=Endian.Little, unit=unit) * 100 | ||
| if SolaxVersion(self.device_config.configuration.version) == SolaxVersion.G3: |
Contributor
There was a problem hiding this comment.
Suggested change
| if SolaxVersion(self.device_config.configuration.version) == SolaxVersion.G3: | |
| elif SolaxVersion(self.device_config.configuration.version) == SolaxVersion.G3: |
| class SolaxInverter(AbstractInverter): | ||
| def __init__(self, | ||
| device_id: int, | ||
| device_config: Union[Dict, Solax], |
Contributor
There was a problem hiding this comment.
Suggested change
| device_config: Union[Dict, Solax], | |
| device_config: Solax, |
| class SolaxCounter(AbstractCounter): | ||
| def __init__(self, | ||
| device_id: int, | ||
| device_config: Union[Dict, Solax], |
Contributor
There was a problem hiding this comment.
Suggested change
| device_config: Union[Dict, Solax], | |
| device_config: Solax, |
LKuemmel
reviewed
Jan 16, 2025
| self.modbus_id = modbus_id | ||
| self.ip_address = ip_address | ||
| self.port = port | ||
| self.version = version |
Contributor
There was a problem hiding this comment.
Muss die neue Einstellung version nicht auch noch in update_config hinzugefügt werden?
LKuemmel
approved these changes
Jan 30, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
openWB/openwb-ui-settings#621