component source directory structure refactored

esphome/components/optolink/binary_sensor/__init__.py

@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import binary_sensor
 from esphome.const import CONF_ADDRESS, CONF_ID
-from . import SENSOR_BASE_SCHEMA, optolink_ns, CONF_OPTOLINK_ID
+from .. import SENSOR_BASE_SCHEMA, optolink_ns, CONF_OPTOLINK_ID
 
 OptolinkBinarySensor = optolink_ns.class_(
     "OptolinkBinarySensor", binary_sensor.BinarySensor, cg.PollingComponent

esphome/components/optolink/binary_sensor/optolink_binary_sensor.h

@@ -3,8 +3,8 @@
 #ifdef USE_ARDUINO
 
 #include "esphome/components/binary_sensor/binary_sensor.h"
-#include "optolink.h"
+#include "../optolink.h"
-#include "optolink_sensor_base.h"
+#include "../optolink_sensor_base.h"
 #include "VitoWiFi.h"
 
 namespace esphome {

esphome/components/optolink/number/__init__.py

@@ -10,8 +10,7 @@ from esphome.const import (
     CONF_MIN_VALUE,
     CONF_STEP,
 )
-from .sensor import SENSOR_BASE_SCHEMA
+from .. import optolink_ns, CONF_OPTOLINK_ID, SENSOR_BASE_SCHEMA
-from . import optolink_ns, CONF_OPTOLINK_ID
 
 OptolinkNumber = optolink_ns.class_(
     "OptolinkNumber", number.Number, cg.PollingComponent

esphome/components/optolink/number/optolink_number.cpp

@@ -1,7 +1,7 @@
 #ifdef USE_ARDUINO
 
 #include "optolink_number.h"
-#include "optolink.h"
+#include "../optolink.h"
 #include "VitoWiFi.h"
 
 namespace esphome {

esphome/components/optolink/number/optolink_number.h

@@ -3,8 +3,8 @@
 #ifdef USE_ARDUINO
 
 #include "esphome/components/number/number.h"
-#include "optolink_sensor_base.h"
+#include "../optolink_sensor_base.h"
-#include "optolink.h"
+#include "../optolink.h"
 #include "VitoWiFi.h"
 
 namespace esphome {

esphome/components/optolink/select/__init__.py

@@ -9,8 +9,7 @@ from esphome.const import (
     CONF_ID,
     CONF_TO,
 )
-from . import optolink_ns, CONF_OPTOLINK_ID
+from .. import optolink_ns, CONF_OPTOLINK_ID, SENSOR_BASE_SCHEMA
-from .sensor import SENSOR_BASE_SCHEMA
 
 OptolinkSelect = optolink_ns.class_(
     "OptolinkSelect", select.Select, cg.PollingComponent

esphome/components/optolink/select/optolink_select.cpp

@@ -1,7 +1,7 @@
 #ifdef USE_ARDUINO
 
 #include "optolink_select.h"
-#include "optolink.h"
+#include "../optolink.h"
 #include "VitoWiFi.h"
 
 namespace esphome {

esphome/components/optolink/select/optolink_select.h

@@ -4,8 +4,8 @@
 
 #include <map>
 #include "esphome/components/select/select.h"
-#include "optolink.h"
+#include "../optolink.h"
-#include "optolink_sensor_base.h"
+#include "../optolink_sensor_base.h"
 #include "VitoWiFi.h"
 
 namespace esphome {

esphome/components/optolink/sensor/__init__.py

@@ -7,7 +7,7 @@ from esphome.const import (
     CONF_DIV_RATIO,
     CONF_ID,
 )
-from . import CONF_OPTOLINK_ID, SENSOR_BASE_SCHEMA, optolink_ns
+from .. import CONF_OPTOLINK_ID, SENSOR_BASE_SCHEMA, optolink_ns
 
 OptolinkSensor = optolink_ns.class_(
     "OptolinkSensor", sensor.Sensor, cg.PollingComponent

esphome/components/optolink/sensor/optolink_sensor.h

@@ -3,8 +3,8 @@
 #ifdef USE_ARDUINO
 
 #include "esphome/components/sensor/sensor.h"
-#include "optolink.h"
+#include "../optolink.h"
-#include "optolink_sensor_base.h"
+#include "../optolink_sensor_base.h"
 #include "VitoWiFi.h"
 
 namespace esphome {

esphome/components/optolink/switch/__init__.py

@@ -3,7 +3,7 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import switch
 from esphome.const import CONF_ADDRESS, CONF_ID, CONF_UPDATE_INTERVAL
-from . import OptolinkComponent, optolink_ns
+from .. import OptolinkComponent, optolink_ns
 
 OptolinkSwitch = optolink_ns.class_(
     "OptolinkSwitch", switch.Switch, cg.PollingComponent

esphome/components/optolink/switch/optolink_switch.cpp

@@ -1,7 +1,7 @@
 #ifdef USE_ARDUINO
 
 #include "optolink_switch.h"
-#include "optolink.h"
+#include "../optolink.h"
 #include "VitoWiFi.h"
 
 namespace esphome {

esphome/components/optolink/switch/optolink_switch.h

@@ -3,8 +3,8 @@
 #ifdef USE_ARDUINO
 
 #include "esphome/components/switch/switch.h"
-#include "optolink_sensor_base.h"
+#include "../optolink_sensor_base.h"
-#include "optolink.h"
+#include "../optolink.h"
 #include "VitoWiFi.h"
 
 namespace esphome {

esphome/components/optolink/text_sensor/__init__.py

@@ -8,8 +8,7 @@ from esphome.const import (
     CONF_ID,
     CONF_MODE,
 )
-from . import optolink_ns, CONF_OPTOLINK_ID
+from .. import optolink_ns, CONF_OPTOLINK_ID, SENSOR_BASE_SCHEMA
-from .sensor import SENSOR_BASE_SCHEMA
 
 OptolinkTextSensor = optolink_ns.class_(
     "OptolinkTextSensor", text_sensor.TextSensor, cg.PollingComponent

esphome/components/optolink/text_sensor/optolink_device_info_sensor.h

@@ -3,8 +3,8 @@
 #ifdef USE_ARDUINO
 
 #include "esphome/components/text_sensor/text_sensor.h"
-#include "optolink.h"
+#include "../optolink.h"
-#include "optolink_sensor_base.h"
+#include "../optolink_sensor_base.h"
 #include "VitoWiFi.h"
 
 namespace esphome {

esphome/components/optolink/text_sensor/optolink_state_sensor.h

@@ -3,8 +3,8 @@
 #ifdef USE_ARDUINO
 
 #include "esphome/components/text_sensor/text_sensor.h"
-#include "optolink.h"
+#include "../optolink.h"
-#include "optolink_sensor_base.h"
+#include "../optolink_sensor_base.h"
 #include "VitoWiFi.h"
 
 namespace esphome {

esphome/components/optolink/text_sensor/optolink_text_sensor.cpp

@@ -1,7 +1,7 @@
 #ifdef USE_ARDUINO
 
 #include "optolink_text_sensor.h"
-#include "optolink.h"
+#include "../optolink.h"
 #include "VitoWiFi.h"
 
 namespace esphome {

esphome/components/optolink/text_sensor/optolink_text_sensor.h

@@ -3,8 +3,8 @@
 #ifdef USE_ARDUINO
 
 #include "esphome/components/text_sensor/text_sensor.h"
-#include "optolink.h"
+#include "../optolink.h"
-#include "optolink_sensor_base.h"
+#include "../optolink_sensor_base.h"
 #include "VitoWiFi.h"
 
 namespace esphome {