From 0a0713f0e294425b3b09804c67682b2dc8c5b5c8 Mon Sep 17 00:00:00 2001 From: Otto Winter Date: Wed, 24 Apr 2019 18:11:46 +0200 Subject: [PATCH] Fixes --- esphome/components/servo/servo.h | 4 ++-- esphome/config.py | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/esphome/components/servo/servo.h b/esphome/components/servo/servo.h index 2cb9ca8176..3a0993c0c4 100644 --- a/esphome/components/servo/servo.h +++ b/esphome/components/servo/servo.h @@ -19,9 +19,9 @@ class Servo : public Component { float level; if (value < 0.0) - level = lerp(this->idle_level_, this->min_level_, -value); + level = lerp(-value, this->idle_level_, this->min_level_); else - level = lerp(this->idle_level_, this->max_level_, value); + level = lerp(value, this->idle_level_, this->max_level_); this->output_->set_level(level); this->save_level_(level); diff --git a/esphome/config.py b/esphome/config.py index 7dac04dafc..646108c648 100644 --- a/esphome/config.py +++ b/esphome/config.py @@ -577,11 +577,10 @@ def _format_vol_invalid(ex, config): class InvalidYAMLError(EsphomeError): - def __init__(self, path, base_exc): - message = u"Invalid YAML at {}. Please see YAML syntax reference or use an " \ - u"online YAML syntax validator. ({})".format(path, base_exc) + def __init__(self, base_exc): + message = u"Invalid YAML syntax. Please see YAML syntax reference or use an " \ + u"online YAML syntax validator:\n\n{}".format(base_exc) super(InvalidYAMLError, self).__init__(message) - self.path = path self.base_exc = base_exc @@ -589,7 +588,7 @@ def _load_config(): try: config = yaml_util.load_yaml(CORE.config_path) except EsphomeError as e: - raise InvalidYAMLError(CORE.config_path, e) + raise InvalidYAMLError(e) CORE.raw_config = config try: