Skip to content

Commit d2ebfd2

Browse files
jesserockzjesserockz
authored
Merge pull request esphome#2634 from esphome/bump-2021.10.3
2021.10.3
2 parents c7651dc + bd782fc commit d2ebfd2

File tree

20 files changed

+61
-74
lines changed

20 files changed

+61
-74
lines changed

‎esphome/__main__.py

+2
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,8 @@ def run_esptool(baud_rate):
226226
mcu,
227227
"write_flash",
228228
"-z",
229+
"--flash_size",
230+
"detect",
229231
]
230232
for img in flash_images:
231233
cmd += [img.offset, img.path]

‎esphome/components/dsmr/sensor.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,14 @@
7575
UNIT_KILOVOLT_AMPS_REACTIVE_HOURS,
7676
ICON_EMPTY,
7777
3,
78-
DEVICE_CLASS_ENERGY,
78+
DEVICE_CLASS_EMPTY,
7979
STATE_CLASS_NONE,
8080
),
8181
cv.Optional("total_exported_energy"): sensor.sensor_schema(
8282
UNIT_KILOVOLT_AMPS_REACTIVE_HOURS,
8383
ICON_EMPTY,
8484
3,
85-
DEVICE_CLASS_ENERGY,
85+
DEVICE_CLASS_EMPTY,
8686
STATE_CLASS_NONE,
8787
),
8888
cv.Optional("power_delivered"): sensor.sensor_schema(
@@ -166,42 +166,42 @@
166166
UNIT_KILOVOLT_AMPS_REACTIVE,
167167
ICON_EMPTY,
168168
3,
169-
DEVICE_CLASS_POWER,
169+
DEVICE_CLASS_EMPTY,
170170
STATE_CLASS_MEASUREMENT,
171171
),
172172
cv.Optional("reactive_power_delivered_l2"): sensor.sensor_schema(
173173
UNIT_KILOVOLT_AMPS_REACTIVE,
174174
ICON_EMPTY,
175175
3,
176-
DEVICE_CLASS_POWER,
176+
DEVICE_CLASS_EMPTY,
177177
STATE_CLASS_MEASUREMENT,
178178
),
179179
cv.Optional("reactive_power_delivered_l3"): sensor.sensor_schema(
180180
UNIT_KILOVOLT_AMPS_REACTIVE,
181181
ICON_EMPTY,
182182
3,
183-
DEVICE_CLASS_POWER,
183+
DEVICE_CLASS_EMPTY,
184184
STATE_CLASS_MEASUREMENT,
185185
),
186186
cv.Optional("reactive_power_returned_l1"): sensor.sensor_schema(
187187
UNIT_KILOVOLT_AMPS_REACTIVE,
188188
ICON_EMPTY,
189189
3,
190-
DEVICE_CLASS_POWER,
190+
DEVICE_CLASS_EMPTY,
191191
STATE_CLASS_MEASUREMENT,
192192
),
193193
cv.Optional("reactive_power_returned_l2"): sensor.sensor_schema(
194194
UNIT_KILOVOLT_AMPS_REACTIVE,
195195
ICON_EMPTY,
196196
3,
197-
DEVICE_CLASS_POWER,
197+
DEVICE_CLASS_EMPTY,
198198
STATE_CLASS_MEASUREMENT,
199199
),
200200
cv.Optional("reactive_power_returned_l3"): sensor.sensor_schema(
201201
UNIT_KILOVOLT_AMPS_REACTIVE,
202202
ICON_EMPTY,
203203
3,
204-
DEVICE_CLASS_POWER,
204+
DEVICE_CLASS_EMPTY,
205205
STATE_CLASS_MEASUREMENT,
206206
),
207207
cv.Optional("voltage_l1"): sensor.sensor_schema(

‎esphome/components/esp8266/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def _format_framework_arduino_version(ver: cv.Version) -> str:
6363
# The platformio/espressif8266 version to use for arduino 2 framework versions
6464
# - https://github.com/platformio/platform-espressif8266/releases
6565
# - https://api.registry.platformio.org/v3/packages/platformio/platform/espressif8266
66-
ARDUINO_2_PLATFORM_VERSION = cv.Version(2, 6, 2)
66+
ARDUINO_2_PLATFORM_VERSION = cv.Version(2, 6, 3)
6767
# for arduino 3 framework versions
6868
ARDUINO_3_PLATFORM_VERSION = cv.Version(3, 2, 0)
6969

‎esphome/components/havells_solar/sensor.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,12 @@
9393
CONF_VOLTAGE_SAMPLED_BY_SECONDARY_CPU: sensor.sensor_schema(
9494
unit_of_measurement=UNIT_VOLT,
9595
accuracy_decimals=0,
96-
device_class=DEVICE_CLASS_POWER,
96+
device_class=DEVICE_CLASS_VOLTAGE,
9797
state_class=STATE_CLASS_MEASUREMENT,
9898
),
9999
CONF_INSULATION_OF_P_TO_GROUND: sensor.sensor_schema(
100100
unit_of_measurement=UNIT_KOHM,
101101
accuracy_decimals=0,
102-
device_class=DEVICE_CLASS_POWER,
103102
state_class=STATE_CLASS_MEASUREMENT,
104103
),
105104
}
@@ -135,7 +134,6 @@
135134
cv.Optional(CONF_REACTIVE_POWER): sensor.sensor_schema(
136135
unit_of_measurement=UNIT_VOLT_AMPS_REACTIVE,
137136
accuracy_decimals=2,
138-
device_class=DEVICE_CLASS_POWER,
139137
state_class=STATE_CLASS_MEASUREMENT,
140138
),
141139
cv.Optional(CONF_ENERGY_PRODUCTION_DAY): sensor.sensor_schema(

‎esphome/components/modbus_controller/__init__.py

+15
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,21 @@
6161
"FP32_R": SensorValueType.FP32_R,
6262
}
6363

64+
TYPE_REGISTER_MAP = {
65+
"RAW": 1,
66+
"U_WORD": 1,
67+
"S_WORD": 1,
68+
"U_DWORD": 2,
69+
"U_DWORD_R": 2,
70+
"S_DWORD": 2,
71+
"S_DWORD_R": 2,
72+
"U_QWORD": 4,
73+
"U_QWORDU_R": 4,
74+
"S_QWORD": 4,
75+
"U_QWORD_R": 4,
76+
"FP32": 2,
77+
"FP32_R": 2,
78+
}
6479

6580
MULTI_CONF = True
6681

‎esphome/components/modbus_controller/number/__init__.py

+1-16
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
ModbusController,
1818
SENSOR_VALUE_TYPE,
1919
SensorItem,
20+
TYPE_REGISTER_MAP,
2021
)
2122

2223

@@ -39,22 +40,6 @@
3940
"ModbusNumber", cg.Component, number.Number, SensorItem
4041
)
4142

42-
TYPE_REGISTER_MAP = {
43-
"RAW": 1,
44-
"U_WORD": 1,
45-
"S_WORD": 1,
46-
"U_DWORD": 2,
47-
"U_DWORD_R": 2,
48-
"S_DWORD": 2,
49-
"S_DWORD_R": 2,
50-
"U_QWORD": 4,
51-
"U_QWORDU_R": 4,
52-
"S_QWORD": 4,
53-
"U_QWORD_R": 4,
54-
"FP32": 2,
55-
"FP32_R": 2,
56-
}
57-
5843

5944
def validate_min_max(config):
6045
if config[CONF_MAX_VALUE] <= config[CONF_MIN_VALUE]:

‎esphome/components/modbus_controller/output/__init__.py

+12-1
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@
1313
SensorItem,
1414
modbus_controller_ns,
1515
ModbusController,
16+
TYPE_REGISTER_MAP,
1617
)
1718

1819
from ..const import (
1920
CONF_BYTE_OFFSET,
2021
CONF_MODBUS_CONTROLLER_ID,
22+
CONF_REGISTER_COUNT,
2123
CONF_VALUE_TYPE,
2224
CONF_WRITE_LAMBDA,
2325
)
@@ -40,6 +42,7 @@
4042
cv.Optional(CONF_OFFSET, default=0): cv.positive_int,
4143
cv.Optional(CONF_BYTE_OFFSET): cv.positive_int,
4244
cv.Optional(CONF_VALUE_TYPE, default="U_WORD"): cv.enum(SENSOR_VALUE_TYPE),
45+
cv.Optional(CONF_REGISTER_COUNT, default=0): cv.positive_int,
4346
cv.Optional(CONF_WRITE_LAMBDA): cv.returning_lambda,
4447
cv.Optional(CONF_MULTIPLY, default=1.0): cv.float_,
4548
}
@@ -54,8 +57,16 @@ async def to_code(config):
5457
# A CONF_BYTE_OFFSET setting overrides CONF_OFFSET
5558
if CONF_BYTE_OFFSET in config:
5659
byte_offset = config[CONF_BYTE_OFFSET]
60+
value_type = config[CONF_VALUE_TYPE]
61+
reg_count = config[CONF_REGISTER_COUNT]
62+
if reg_count == 0:
63+
reg_count = TYPE_REGISTER_MAP[value_type]
5764
var = cg.new_Pvariable(
58-
config[CONF_ID], config[CONF_ADDRESS], byte_offset, config[CONF_VALUE_TYPE]
65+
config[CONF_ID],
66+
config[CONF_ADDRESS],
67+
byte_offset,
68+
value_type,
69+
reg_count,
5970
)
6071
await output.register_output(var, config)
6172
cg.add(var.set_write_multiply(config[CONF_MULTIPLY]))

‎esphome/components/modbus_controller/output/modbus_output.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ using value_to_data_t = std::function<float>(float);
1111

1212
class ModbusOutput : public output::FloatOutput, public Component, public SensorItem {
1313
public:
14-
ModbusOutput(uint16_t start_address, uint8_t offset, SensorValueType value_type)
14+
ModbusOutput(uint16_t start_address, uint8_t offset, SensorValueType value_type, int register_count)
1515
: output::FloatOutput(), Component() {
1616
this->register_type = ModbusRegisterType::HOLDING;
1717
this->start_address = start_address;
1818
this->offset = offset;
1919
this->bitmask = bitmask;
20+
this->register_count = register_count;
2021
this->sensor_value_type = value_type;
2122
this->skip_updates = 0;
2223
this->start_address += offset;

‎esphome/components/modbus_controller/sensor/__init__.py

+1-17
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
ModbusController,
1010
MODBUS_REGISTER_TYPE,
1111
SENSOR_VALUE_TYPE,
12+
TYPE_REGISTER_MAP,
1213
)
1314
from ..const import (
1415
CONF_BITMASK,
@@ -29,23 +30,6 @@
2930
"ModbusSensor", cg.Component, sensor.Sensor, SensorItem
3031
)
3132

32-
TYPE_REGISTER_MAP = {
33-
"RAW": 1,
34-
"U_WORD": 1,
35-
"S_WORD": 1,
36-
"U_DWORD": 2,
37-
"U_DWORD_R": 2,
38-
"S_DWORD": 2,
39-
"S_DWORD_R": 2,
40-
"U_QWORD": 4,
41-
"U_QWORDU_R": 4,
42-
"S_QWORD": 4,
43-
"U_QWORD_R": 4,
44-
"FP32": 2,
45-
"FP32_R": 2,
46-
}
47-
48-
4933
CONFIG_SCHEMA = cv.All(
5034
sensor.SENSOR_SCHEMA.extend(
5135
{

‎esphome/components/pca9685/pca9685_output.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include "pca9685_output.h"
22
#include "esphome/core/log.h"
33
#include "esphome/core/helpers.h"
4+
#include "esphome/core/hal.h"
45

56
namespace esphome {
67
namespace pca9685 {

‎esphome/components/pipsolar/sensor/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
UNIT_AMPERE, ICON_EMPTY, 1, DEVICE_CLASS_CURRENT
9090
),
9191
CONF_AC_OUTPUT_RATING_APPARENT_POWER: sensor.sensor_schema(
92-
UNIT_VOLT_AMPS, ICON_EMPTY, 1, DEVICE_CLASS_POWER
92+
UNIT_VOLT_AMPS, ICON_EMPTY, 1, DEVICE_CLASS_EMPTY
9393
),
9494
CONF_AC_OUTPUT_RATING_ACTIVE_POWER: sensor.sensor_schema(
9595
UNIT_WATT, ICON_EMPTY, 1, DEVICE_CLASS_POWER
@@ -159,7 +159,7 @@
159159
UNIT_HERTZ, ICON_CURRENT_AC, 1, DEVICE_CLASS_EMPTY
160160
),
161161
CONF_AC_OUTPUT_APPARENT_POWER: sensor.sensor_schema(
162-
UNIT_VOLT_AMPS, ICON_EMPTY, 1, DEVICE_CLASS_POWER
162+
UNIT_VOLT_AMPS, ICON_EMPTY, 1, DEVICE_CLASS_EMPTY
163163
),
164164
CONF_AC_OUTPUT_ACTIVE_POWER: sensor.sensor_schema(
165165
UNIT_WATT, ICON_EMPTY, 1, DEVICE_CLASS_POWER

‎esphome/components/sdm_meter/sensor.py

-4
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,11 @@
6464
CONF_APPARENT_POWER: sensor.sensor_schema(
6565
unit_of_measurement=UNIT_VOLT_AMPS,
6666
accuracy_decimals=2,
67-
device_class=DEVICE_CLASS_POWER,
6867
state_class=STATE_CLASS_MEASUREMENT,
6968
),
7069
CONF_REACTIVE_POWER: sensor.sensor_schema(
7170
unit_of_measurement=UNIT_VOLT_AMPS_REACTIVE,
7271
accuracy_decimals=2,
73-
device_class=DEVICE_CLASS_POWER,
7472
state_class=STATE_CLASS_MEASUREMENT,
7573
),
7674
CONF_POWER_FACTOR: sensor.sensor_schema(
@@ -115,13 +113,11 @@
115113
cv.Optional(CONF_IMPORT_REACTIVE_ENERGY): sensor.sensor_schema(
116114
unit_of_measurement=UNIT_KILOVOLT_AMPS_REACTIVE_HOURS,
117115
accuracy_decimals=2,
118-
device_class=DEVICE_CLASS_ENERGY,
119116
state_class=STATE_CLASS_TOTAL_INCREASING,
120117
),
121118
cv.Optional(CONF_EXPORT_REACTIVE_ENERGY): sensor.sensor_schema(
122119
unit_of_measurement=UNIT_KILOVOLT_AMPS_REACTIVE_HOURS,
123120
accuracy_decimals=2,
124-
device_class=DEVICE_CLASS_ENERGY,
125121
state_class=STATE_CLASS_TOTAL_INCREASING,
126122
),
127123
}

‎esphome/components/selec_meter/sensor.py

-8
Original file line numberDiff line numberDiff line change
@@ -71,25 +71,21 @@
7171
CONF_TOTAL_REACTIVE_ENERGY: sensor.sensor_schema(
7272
unit_of_measurement=UNIT_KILOVOLT_AMPS_REACTIVE_HOURS,
7373
accuracy_decimals=2,
74-
device_class=DEVICE_CLASS_ENERGY,
7574
state_class=STATE_CLASS_TOTAL_INCREASING,
7675
),
7776
CONF_IMPORT_REACTIVE_ENERGY: sensor.sensor_schema(
7877
unit_of_measurement=UNIT_KILOVOLT_AMPS_REACTIVE_HOURS,
7978
accuracy_decimals=2,
80-
device_class=DEVICE_CLASS_ENERGY,
8179
state_class=STATE_CLASS_TOTAL_INCREASING,
8280
),
8381
CONF_EXPORT_REACTIVE_ENERGY: sensor.sensor_schema(
8482
unit_of_measurement=UNIT_KILOVOLT_AMPS_REACTIVE_HOURS,
8583
accuracy_decimals=2,
86-
device_class=DEVICE_CLASS_ENERGY,
8784
state_class=STATE_CLASS_TOTAL_INCREASING,
8885
),
8986
CONF_APPARENT_ENERGY: sensor.sensor_schema(
9087
unit_of_measurement=UNIT_KILOVOLT_AMPS_HOURS,
9188
accuracy_decimals=2,
92-
device_class=DEVICE_CLASS_ENERGY,
9389
state_class=STATE_CLASS_TOTAL_INCREASING,
9490
),
9591
CONF_ACTIVE_POWER: sensor.sensor_schema(
@@ -101,13 +97,11 @@
10197
CONF_REACTIVE_POWER: sensor.sensor_schema(
10298
unit_of_measurement=UNIT_VOLT_AMPS_REACTIVE,
10399
accuracy_decimals=3,
104-
device_class=DEVICE_CLASS_POWER,
105100
state_class=STATE_CLASS_MEASUREMENT,
106101
),
107102
CONF_APPARENT_POWER: sensor.sensor_schema(
108103
unit_of_measurement=UNIT_VOLT_AMPS,
109104
accuracy_decimals=3,
110-
device_class=DEVICE_CLASS_POWER,
111105
state_class=STATE_CLASS_MEASUREMENT,
112106
),
113107
CONF_VOLTAGE: sensor.sensor_schema(
@@ -142,13 +136,11 @@
142136
CONF_MAXIMUM_DEMAND_REACTIVE_POWER: sensor.sensor_schema(
143137
unit_of_measurement=UNIT_VOLT_AMPS_REACTIVE,
144138
accuracy_decimals=3,
145-
device_class=DEVICE_CLASS_POWER,
146139
state_class=STATE_CLASS_MEASUREMENT,
147140
),
148141
CONF_MAXIMUM_DEMAND_APPARENT_POWER: sensor.sensor_schema(
149142
unit_of_measurement=UNIT_VOLT_AMPS,
150143
accuracy_decimals=3,
151-
device_class=DEVICE_CLASS_POWER,
152144
state_class=STATE_CLASS_MEASUREMENT,
153145
),
154146
}

‎esphome/components/select/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,6 @@ async def to_code(config):
9090
async def select_set_to_code(config, action_id, template_arg, args):
9191
paren = await cg.get_variable(config[CONF_ID])
9292
var = cg.new_Pvariable(action_id, template_arg, paren)
93-
template_ = await cg.templatable(config[CONF_OPTION], args, str)
93+
template_ = await cg.templatable(config[CONF_OPTION], args, cg.std_string)
9494
cg.add(var.set_option(template_))
9595
return var

‎esphome/components/sn74hc595/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def _validate_output_mode(value):
6060
{
6161
cv.GenerateID(): cv.declare_id(SN74HC595GPIOPin),
6262
cv.Required(CONF_SN74HC595): cv.use_id(SN74HC595Component),
63-
cv.Required(CONF_NUMBER): cv.int_range(min=0, max=7),
63+
cv.Required(CONF_NUMBER): cv.int_range(min=0, max=31),
6464
cv.Optional(CONF_MODE, default={}): cv.All(
6565
{
6666
cv.Optional(CONF_OUTPUT, default=True): cv.All(

‎esphome/components/teleinfo/sensor/teleinfo_sensor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ void TeleInfoSensor::publish_val(const std::string &val) {
99
auto newval = parse_float(val);
1010
publish_state(*newval);
1111
}
12-
void TeleInfoSensor::dump_config() { LOG_SENSOR(" ", tag.c_str(), this); }
12+
void TeleInfoSensor::dump_config() { LOG_SENSOR(" ", "Teleinfo Sensor", this); }
1313
} // namespace teleinfo
1414
} // namespace esphome

0 commit comments

Comments
 (0)