From e6e9765a67fc1f26b258a92ff5d584c01fd7f8e3 Mon Sep 17 00:00:00 2001 From: suaveolent Date: Wed, 20 Dec 2023 09:44:28 +0100 Subject: [PATCH] renamed proto names --- hoymiles_wifi/inverter.py | 2 +- hoymiles_wifi/protobuf/SetConfig.proto | 108 ++++++++++++------------ hoymiles_wifi/protobuf/SetConfig_pb2.py | 4 +- 3 files changed, 58 insertions(+), 56 deletions(-) diff --git a/hoymiles_wifi/inverter.py b/hoymiles_wifi/inverter.py index f2999f2..28bc2c5 100644 --- a/hoymiles_wifi/inverter.py +++ b/hoymiles_wifi/inverter.py @@ -93,7 +93,7 @@ class Inverter: request.requested_time = int(time.time()) command = CMD_APP_GET_HIST_POWER_RES return self.send_request(command, request, AppGetHistPower_pb2.AppGetHistPowerReqDTO) - + def send_request(self, command, request, response_type): self.sequence = (self.sequence + 1) & 0xFFFF diff --git a/hoymiles_wifi/protobuf/SetConfig.proto b/hoymiles_wifi/protobuf/SetConfig.proto index 37f80d5..798c2a6 100755 --- a/hoymiles_wifi/protobuf/SetConfig.proto +++ b/hoymiles_wifi/protobuf/SetConfig.proto @@ -1,60 +1,62 @@ syntax = "proto3"; +// Definition of the response message for setting configuration. message SetConfigResDTO { - int32 offset = 1; - uint32 time = 2; - int32 lock_password = 3; - int32 lock_time = 4; - int32 limit_power_mypower = 5; - int32 zero_export_433_addr = 6; - int32 zero_export_enable = 7; - int32 netmode_select = 8; - int32 channel_select = 9; - int32 server_send_time = 10; - int32 serverport = 11; - string apn_set = 12; - string meter_kind = 13; - string meter_interface = 14; - string wifi_ssid = 15; - string wifi_passward = 16; - string server_domain_name = 17; - int32 inv_type = 18; - string dtu_sn = 19; - int32 access_model = 20; - int32 mac_0 = 21; - int32 mac_1 = 22; - int32 mac_2 = 23; - int32 mac_3 = 24; - int32 dhcp_switch = 25; - int32 ip_addr_0 = 26; - int32 ip_addr_1 = 27; - int32 ip_addr_2 = 28; - int32 ip_addr_3 = 29; - int32 subnet_mask_0 = 30; - int32 subnet_mask_1 = 31; - int32 subnet_mask_2 = 32; - int32 subnet_mask_3 = 33; - int32 default_gateway_0 = 34; - int32 default_gateway_1 = 35; - int32 default_gateway_2 = 36; - int32 default_gateway_3 = 37; - string apn_name = 38; - string apn_passward = 39; - int32 sub1g_sweep_switch = 40; - int32 sub1g_work_channel = 41; - int32 cable_dns_0 = 42; - int32 cable_dns_1 = 43; - int32 cable_dns_2 = 44; - int32 cable_dns_3 = 45; - int32 mac_4 = 46; - int32 mac_5 = 47; - string dtu_ap_ssid = 48; - string dtu_ap_pass = 49; - int32 app_page = 50; + int32 offset = 1; // Offset value + uint32 time = 2; // Time value + int32 lock_password = 3; // Lock password + int32 lock_time = 4; // Lock time + int32 limit_power_mypower = 5; // Limit power for mypower + int32 zero_export_433_addr = 6; // Zero export 433 address + int32 zero_export_enable = 7; // Zero export enable flag + int32 netmode_select = 8; // Network mode selection + int32 channel_select = 9; // Channel selection + int32 server_send_time = 10; // Server send time + int32 serverport = 11; // Server port + string apn_set = 12; // Access Point Name (APN) setting + string meter_kind = 13; // Meter kind + string meter_interface = 14; // Meter interface + string wifi_ssid = 15; // Wi-Fi SSID + string wifi_passward = 16; // Wi-Fi password + string server_domain_name = 17; // Server domain name + int32 inv_type = 18; // Inverter type + string dtu_sn = 19; // Data Terminal Unit (DTU) serial number + int32 access_model = 20; // Access model + int32 mac_0 = 21; // MAC address octet 0 + int32 mac_1 = 22; // MAC address octet 1 + int32 mac_2 = 23; // MAC address octet 2 + int32 mac_3 = 24; // MAC address octet 3 + int32 dhcp_switch = 25; // DHCP switch + int32 ip_addr_0 = 26; // IP address octet 0 + int32 ip_addr_1 = 27; // IP address octet 1 + int32 ip_addr_2 = 28; // IP address octet 2 + int32 ip_addr_3 = 29; // IP address octet 3 + int32 subnet_mask_0 = 30; // Subnet mask octet 0 + int32 subnet_mask_1 = 31; // Subnet mask octet 1 + int32 subnet_mask_2 = 32; // Subnet mask octet 2 + int32 subnet_mask_3 = 33; // Subnet mask octet 3 + int32 default_gateway_0 = 34; // Default gateway octet 0 + int32 default_gateway_1 = 35; // Default gateway octet 1 + int32 default_gateway_2 = 36; // Default gateway octet 2 + int32 default_gateway_3 = 37; // Default gateway octet 3 + string apn_name = 38; // APN name + string apn_passward = 39; // APN password + int32 sub1g_sweep_switch = 40; // Sub-1GHz sweep switch + int32 sub1g_work_channel = 41; // Sub-1GHz work channel + int32 cable_dns_0 = 42; // Cable DNS octet 0 + int32 cable_dns_1 = 43; // Cable DNS octet 1 + int32 cable_dns_2 = 44; // Cable DNS octet 2 + int32 cable_dns_3 = 45; // Cable DNS octet 3 + int32 mac_4 = 46; // MAC address octet 4 + int32 mac_5 = 47; // MAC address octet 5 + string dtu_ap_ssid = 48; // DTU AP SSID + string dtu_ap_pass = 49; // DTU AP password + int32 app_page = 50; // App page } +// Definition of the request message for setting configuration. message SetConfigReqDTO { - int32 offset = 1; - uint32 time = 2; - int32 err_code = 3; + int32 offset = 1; // Offset value + uint32 time = 2; // Time value + int32 error_code = 3; // Error code } diff --git a/hoymiles_wifi/protobuf/SetConfig_pb2.py b/hoymiles_wifi/protobuf/SetConfig_pb2.py index 5c815de..728238f 100644 --- a/hoymiles_wifi/protobuf/SetConfig_pb2.py +++ b/hoymiles_wifi/protobuf/SetConfig_pb2.py @@ -14,7 +14,7 @@ _sym_db = _symbol_database.Default() -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0fSetConfig.proto\"\xbd\x08\n\x0fSetConfigResDTO\x12\x0e\n\x06offset\x18\x01 \x01(\x05\x12\x0c\n\x04time\x18\x02 \x01(\r\x12\x15\n\rlock_password\x18\x03 \x01(\x05\x12\x11\n\tlock_time\x18\x04 \x01(\x05\x12\x1b\n\x13limit_power_mypower\x18\x05 \x01(\x05\x12\x1c\n\x14zero_export_433_addr\x18\x06 \x01(\x05\x12\x1a\n\x12zero_export_enable\x18\x07 \x01(\x05\x12\x16\n\x0enetmode_select\x18\x08 \x01(\x05\x12\x16\n\x0e\x63hannel_select\x18\t \x01(\x05\x12\x18\n\x10server_send_time\x18\n \x01(\x05\x12\x12\n\nserverport\x18\x0b \x01(\x05\x12\x0f\n\x07\x61pn_set\x18\x0c \x01(\t\x12\x12\n\nmeter_kind\x18\r \x01(\t\x12\x17\n\x0fmeter_interface\x18\x0e \x01(\t\x12\x11\n\twifi_ssid\x18\x0f \x01(\t\x12\x15\n\rwifi_passward\x18\x10 \x01(\t\x12\x1a\n\x12server_domain_name\x18\x11 \x01(\t\x12\x10\n\x08inv_type\x18\x12 \x01(\x05\x12\x0e\n\x06\x64tu_sn\x18\x13 \x01(\t\x12\x14\n\x0c\x61\x63\x63\x65ss_model\x18\x14 \x01(\x05\x12\r\n\x05mac_0\x18\x15 \x01(\x05\x12\r\n\x05mac_1\x18\x16 \x01(\x05\x12\r\n\x05mac_2\x18\x17 \x01(\x05\x12\r\n\x05mac_3\x18\x18 \x01(\x05\x12\x13\n\x0b\x64hcp_switch\x18\x19 \x01(\x05\x12\x11\n\tip_addr_0\x18\x1a \x01(\x05\x12\x11\n\tip_addr_1\x18\x1b \x01(\x05\x12\x11\n\tip_addr_2\x18\x1c \x01(\x05\x12\x11\n\tip_addr_3\x18\x1d \x01(\x05\x12\x15\n\rsubnet_mask_0\x18\x1e \x01(\x05\x12\x15\n\rsubnet_mask_1\x18\x1f \x01(\x05\x12\x15\n\rsubnet_mask_2\x18 \x01(\x05\x12\x15\n\rsubnet_mask_3\x18! \x01(\x05\x12\x19\n\x11\x64\x65\x66\x61ult_gateway_0\x18\" \x01(\x05\x12\x19\n\x11\x64\x65\x66\x61ult_gateway_1\x18# \x01(\x05\x12\x19\n\x11\x64\x65\x66\x61ult_gateway_2\x18$ \x01(\x05\x12\x19\n\x11\x64\x65\x66\x61ult_gateway_3\x18% \x01(\x05\x12\x10\n\x08\x61pn_name\x18& \x01(\t\x12\x14\n\x0c\x61pn_passward\x18\' \x01(\t\x12\x1a\n\x12sub1g_sweep_switch\x18( \x01(\x05\x12\x1a\n\x12sub1g_work_channel\x18) \x01(\x05\x12\x13\n\x0b\x63\x61\x62le_dns_0\x18* \x01(\x05\x12\x13\n\x0b\x63\x61\x62le_dns_1\x18+ \x01(\x05\x12\x13\n\x0b\x63\x61\x62le_dns_2\x18, \x01(\x05\x12\x13\n\x0b\x63\x61\x62le_dns_3\x18- \x01(\x05\x12\r\n\x05mac_4\x18. \x01(\x05\x12\r\n\x05mac_5\x18/ \x01(\x05\x12\x13\n\x0b\x64tu_ap_ssid\x18\x30 \x01(\t\x12\x13\n\x0b\x64tu_ap_pass\x18\x31 \x01(\t\x12\x10\n\x08\x61pp_page\x18\x32 \x01(\x05\"A\n\x0fSetConfigReqDTO\x12\x0e\n\x06offset\x18\x01 \x01(\x05\x12\x0c\n\x04time\x18\x02 \x01(\r\x12\x10\n\x08\x65rr_code\x18\x03 \x01(\x05\x62\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0fSetConfig.proto\"\xbd\x08\n\x0fSetConfigResDTO\x12\x0e\n\x06offset\x18\x01 \x01(\x05\x12\x0c\n\x04time\x18\x02 \x01(\r\x12\x15\n\rlock_password\x18\x03 \x01(\x05\x12\x11\n\tlock_time\x18\x04 \x01(\x05\x12\x1b\n\x13limit_power_mypower\x18\x05 \x01(\x05\x12\x1c\n\x14zero_export_433_addr\x18\x06 \x01(\x05\x12\x1a\n\x12zero_export_enable\x18\x07 \x01(\x05\x12\x16\n\x0enetmode_select\x18\x08 \x01(\x05\x12\x16\n\x0e\x63hannel_select\x18\t \x01(\x05\x12\x18\n\x10server_send_time\x18\n \x01(\x05\x12\x12\n\nserverport\x18\x0b \x01(\x05\x12\x0f\n\x07\x61pn_set\x18\x0c \x01(\t\x12\x12\n\nmeter_kind\x18\r \x01(\t\x12\x17\n\x0fmeter_interface\x18\x0e \x01(\t\x12\x11\n\twifi_ssid\x18\x0f \x01(\t\x12\x15\n\rwifi_passward\x18\x10 \x01(\t\x12\x1a\n\x12server_domain_name\x18\x11 \x01(\t\x12\x10\n\x08inv_type\x18\x12 \x01(\x05\x12\x0e\n\x06\x64tu_sn\x18\x13 \x01(\t\x12\x14\n\x0c\x61\x63\x63\x65ss_model\x18\x14 \x01(\x05\x12\r\n\x05mac_0\x18\x15 \x01(\x05\x12\r\n\x05mac_1\x18\x16 \x01(\x05\x12\r\n\x05mac_2\x18\x17 \x01(\x05\x12\r\n\x05mac_3\x18\x18 \x01(\x05\x12\x13\n\x0b\x64hcp_switch\x18\x19 \x01(\x05\x12\x11\n\tip_addr_0\x18\x1a \x01(\x05\x12\x11\n\tip_addr_1\x18\x1b \x01(\x05\x12\x11\n\tip_addr_2\x18\x1c \x01(\x05\x12\x11\n\tip_addr_3\x18\x1d \x01(\x05\x12\x15\n\rsubnet_mask_0\x18\x1e \x01(\x05\x12\x15\n\rsubnet_mask_1\x18\x1f \x01(\x05\x12\x15\n\rsubnet_mask_2\x18 \x01(\x05\x12\x15\n\rsubnet_mask_3\x18! \x01(\x05\x12\x19\n\x11\x64\x65\x66\x61ult_gateway_0\x18\" \x01(\x05\x12\x19\n\x11\x64\x65\x66\x61ult_gateway_1\x18# \x01(\x05\x12\x19\n\x11\x64\x65\x66\x61ult_gateway_2\x18$ \x01(\x05\x12\x19\n\x11\x64\x65\x66\x61ult_gateway_3\x18% \x01(\x05\x12\x10\n\x08\x61pn_name\x18& \x01(\t\x12\x14\n\x0c\x61pn_passward\x18\' \x01(\t\x12\x1a\n\x12sub1g_sweep_switch\x18( \x01(\x05\x12\x1a\n\x12sub1g_work_channel\x18) \x01(\x05\x12\x13\n\x0b\x63\x61\x62le_dns_0\x18* \x01(\x05\x12\x13\n\x0b\x63\x61\x62le_dns_1\x18+ \x01(\x05\x12\x13\n\x0b\x63\x61\x62le_dns_2\x18, \x01(\x05\x12\x13\n\x0b\x63\x61\x62le_dns_3\x18- \x01(\x05\x12\r\n\x05mac_4\x18. \x01(\x05\x12\r\n\x05mac_5\x18/ \x01(\x05\x12\x13\n\x0b\x64tu_ap_ssid\x18\x30 \x01(\t\x12\x13\n\x0b\x64tu_ap_pass\x18\x31 \x01(\t\x12\x10\n\x08\x61pp_page\x18\x32 \x01(\x05\"C\n\x0fSetConfigReqDTO\x12\x0e\n\x06offset\x18\x01 \x01(\x05\x12\x0c\n\x04time\x18\x02 \x01(\r\x12\x12\n\nerror_code\x18\x03 \x01(\x05\x62\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -24,5 +24,5 @@ if _descriptor._USE_C_DESCRIPTORS == False: _globals['_SETCONFIGRESDTO']._serialized_start=20 _globals['_SETCONFIGRESDTO']._serialized_end=1105 _globals['_SETCONFIGREQDTO']._serialized_start=1107 - _globals['_SETCONFIGREQDTO']._serialized_end=1172 + _globals['_SETCONFIGREQDTO']._serialized_end=1174 # @@protoc_insertion_point(module_scope)