From 2d615bfa258f6e8b5d13cc4b7aa41f1775871550 Mon Sep 17 00:00:00 2001 From: Florian Bezannier Date: Mon, 22 Nov 2021 23:32:09 +0100 Subject: [PATCH] fix --- charge_control.py | 6 +++--- web/view/views.py | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/charge_control.py b/charge_control.py index 4ded7f2..7c0f3dd 100644 --- a/charge_control.py +++ b/charge_control.py @@ -38,7 +38,7 @@ class ChargeControl: return self._stop_hour def control_charge_with_ack(self, charge: bool): - self.psacc.charge_now(self.vin, charge) + self.psacc.remote_client.charge_now(self.vin, charge) self.retry_count += 1 sleep(ChargeControl.MQTT_TIMEOUT) vehicle_status = self.psacc.get_vehicle_info(self.vin) @@ -47,7 +47,7 @@ class ChargeControl: logger.warning("Car state isn't compatible with charging %s", status) if (status == INPROGRESS) != charge: logger.warning("retry to control the charge of %s", self.vin) - self.psacc.charge_now(self.vin, charge) + self.psacc.remote_client.charge_now(self.vin, charge) self.retry_count += 1 return False self.retry_count = 0 @@ -62,7 +62,7 @@ class ChargeControl: wakeup_timeout = self.wakeup_timeout if (datetime.utcnow().replace(tzinfo=pytz.UTC) - last_update).total_seconds() > 60 * wakeup_timeout: try: - self.psacc.wakeup(self.vin) + self.psacc.remote_client.wakeup(self.vin) except RateLimitException: logger.exception("force_update:") diff --git a/web/view/views.py b/web/view/views.py index 55d8924..e49aa7b 100644 --- a/web/view/views.py +++ b/web/view/views.py @@ -159,25 +159,27 @@ def get_style(): @app.route('/charge_now//') def charge_now(vin, charge): - return jsonify(CONFIG.myp.charge_now(vin, charge != 0)) + return jsonify(CONFIG.myp.remote_client.charge_now(vin, charge != 0)) @app.route('/charge_hour') def change_charge_hour(): - return jsonify(CONFIG.myp.change_charge_hour(request.args['vin'], request.args['hour'], request.args['minute'])) + return jsonify(CONFIG.myp.remote_client.change_charge_hour(request.args['vin'], + request.args['hour'], + request.args['minute'])) @app.route('/wakeup/') def wakeup(vin): try: - return jsonify(CONFIG.myp.wakeup(vin)) + return jsonify(CONFIG.myp.remote_client.wakeup(vin)) except RateLimitException: return jsonify({"error": "Wakeup rate limit exceeded"}) @app.route('/preconditioning//') def preconditioning(vin, activate): - return jsonify(CONFIG.myp.preconditioning(vin, activate)) + return jsonify(CONFIG.myp.remote_client.preconditioning(vin, activate)) @app.route('/position/')