Merge pull request #2598 from lordblobo/master

SoC Module evcc: fixed API call

Author: benderl

packages/modules/vehicles/evcc/api.py

@@ -69,13 +69,13 @@ def fetch_soc(
         stub = vehicle_pb2_grpc.VehicleStub(channel)
 
         if not evcc_config.vehicle_id:  # create and fetch vehicle id if not included in config
-            create_and_save_vehicle_id(stub, evcc_config, vehicle)
-#            vehicle_to_fetch = create_vehicle(evcc_config, stub)
-#            log.debug("Vehicle client received: " + str(vehicle_to_fetch))
+            vehicle_to_fetch = create_and_save_vehicle_id(stub, evcc_config, vehicle)
+            # vehicle_to_fetch = create_vehicle(evcc_config, stub)
+            # log.debug("Vehicle client received: " + str(vehicle_to_fetch))
 
             # saving vehicle id in config
-#            topic = "openWB/set/vehicle/" + str(vehicle) + "/soc_module/config"
-#            write_vehicle_id_mqtt(topic, vehicle_to_fetch, evcc_config)
+            # topic = "openWB/set/vehicle/" + str(vehicle) + "/soc_module/config"
+            # write_vehicle_id_mqtt(topic, vehicle_to_fetch, evcc_config)
         else:
             log.debug("Vehicle id found in config: " + str(evcc_config.vehicle_id))
             vehicle_to_fetch = evcc_config.vehicle_id

packages/modules/vehicles/evcc/vehicle_pb2.pyi

@@ -19,11 +19,12 @@ class NewRequest(_message.Message):
         def __init__(self, key: _Optional[str] = ..., value: _Optional[str] = ...) -> None: ...
     TOKEN_FIELD_NUMBER: _ClassVar[int]
     TYPE_FIELD_NUMBER: _ClassVar[int]
+    TEMPLATE_FIELD_NUMBER: _ClassVar[int]
     CONFIG_FIELD_NUMBER: _ClassVar[int]
     token: str
     type: str
     config: _containers.ScalarMap[str, str]
-    def __init__(self, token: _Optional[str] = ..., type: _Optional[str] = ..., config: _Optional[_Mapping[str, str]] = ...) -> None: ...
+    def __init__(self, token: _Optional[str] = ..., type: _Optional[str] = ..., template: _Optional[str] = ..., config: _Optional[_Mapping[str, str]] = ...) -> None: ...
 
 class NewReply(_message.Message):
     __slots__ = ("vehicle_id",)