-
Notifications
You must be signed in to change notification settings - Fork 1
Expand file tree
/
Copy pathdiff-2024.3.txt
More file actions
251 lines (242 loc) · 8.04 KB
/
diff-2024.3.txt
File metadata and controls
251 lines (242 loc) · 8.04 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
diff --color -p ../../../core/homeassistant/components/rfxtrx/config_flow.py rfxtrx/config_flow.py
*** ../../../core/homeassistant/components/rfxtrx/config_flow.py 2024-03-01 18:17:53
--- rfxtrx/config_flow.py 2024-03-08 11:24:20
*************** RECV_MODES = sorted(itertools.chain(*rfxtrxmod.lowleve
*** 59,64 ****
--- 59,67 ----
RECV_MODES = sorted(itertools.chain(*rfxtrxmod.lowlevel.Status.RECMODES))
+ ##############################
+ from .ext import config_flow as ext_config_flow
+ ##############################
class DeviceData(TypedDict):
"""Dict data representing a device entry."""
*************** class OptionsFlow(config_entries.OptionsFlow):
*** 231,236 ****
--- 234,246 ----
CONF_VENETIAN_BLIND_MODE
]
+ ##############################
+ ext_config_flow.update_device_options(
+ device,
+ user_input
+ )
+ ##############################
+
self.update_config_data(
global_options=self._global_options, devices=devices
)
*************** class OptionsFlow(config_entries.OptionsFlow):
*** 292,297 ****
--- 302,316 ----
),
}
)
+
+ ##############################
+ ext_config_flow.update_data_schema(
+ data_schema,
+ self._selected_device_object,
+ device_data
+ )
+ ##############################
+
replace_devices = {
entry.id: entry.name_by_user if entry.name_by_user else entry.name
for entry in self._device_entries
diff --color -p ../../../core/homeassistant/components/rfxtrx/cover.py rfxtrx/cover.py
*** ../../../core/homeassistant/components/rfxtrx/cover.py 2023-06-05 20:04:47
--- rfxtrx/cover.py 2024-03-08 11:24:20
*************** _LOGGER = logging.getLogger(__name__)
*** 24,30 ****
--- 24,34 ----
_LOGGER = logging.getLogger(__name__)
+ ##############################
+ from .ext import cover as ext_cover
+ ##############################
+
def supported(event: rfxtrxmod.RFXtrxEvent) -> bool:
"""Return whether an event supports cover."""
return bool(event.device.known_to_be_rollershutter)
*************** async def async_setup_entry(
*** 43,48 ****
--- 47,63 ----
device_id: DeviceTuple,
entity_info: dict[str, Any],
) -> list[Entity]:
+ ##############################
+ cover = ext_cover.create_cover_entity(
+ device=event.device,
+ device_id=device_id,
+ entity_info=entity_info,
+ event=event if auto else None,
+ )
+ if cover is not None:
+ return [cover]
+ ##############################
+
return [
RfxtrxCover(
event.device,
*************** async def async_setup_entry(
*** 55,60 ****
--- 70,79 ----
await async_setup_platform_entry(
hass, config_entry, async_add_entities, supported, _constructor
)
+
+ ##############################
+ await ext_cover.async_define_sync_services()
+ ##############################
class RfxtrxCover(RfxtrxCommandEntity, CoverEntity):
Only in rfxtrx: ext
diff --color -p ../../../core/homeassistant/components/rfxtrx/manifest.json rfxtrx/manifest.json
*** ../../../core/homeassistant/components/rfxtrx/manifest.json 2024-03-01 18:17:53
--- rfxtrx/manifest.json 2024-03-08 11:27:54
***************
*** 1,10 ****
{
"domain": "rfxtrx",
! "name": "RFXCOM RFXtrx",
! "codeowners": ["@danielhiversen", "@elupus", "@RobBie1221"],
"config_flow": true,
! "documentation": "https://www.home-assistant.io/integrations/rfxtrx",
"iot_class": "local_push",
! "loggers": ["RFXtrx"],
! "requirements": ["pyRFXtrx==0.31.0"]
! }
--- 1,18 ----
{
"domain": "rfxtrx",
! "name": "RFXCOM RFXtrx + state",
! "codeowners": [
! "@RJArmitage"
! ],
"config_flow": true,
! "documentation": "https://github.com/RJArmitage/rfxtrx-stateful-blinds",
"iot_class": "local_push",
! "issue_tracker": "https://github.com/RJArmitage/rfxtrx-stateful-blinds/issues",
! "loggers": [
! "RFXtrx"
! ],
! "requirements": [
! "pyRFXtrx==0.31.0"
! ],
! "version": "2023.3.0"
! }
\ No newline at end of file
diff --color -p ../../../core/homeassistant/components/rfxtrx/services.yaml rfxtrx/services.yaml
*** ../../../core/homeassistant/components/rfxtrx/services.yaml 2023-08-23 17:28:50
--- rfxtrx/services.yaml 2024-03-08 11:24:20
*************** send:
*** 2,7 ****
fields:
event:
required: true
! example: "0b11009e00e6116202020070"
selector:
text:
--- 2,31 ----
fields:
event:
required: true
! example: '0b11009e00e6116202020070'
! selector:
! text:
!
! update_cover_position:
! target:
! entity:
! domain: cover
! fields:
! position:
! required: true
! selector:
! number:
! min: 0
! max: 100
! unit_of_measurement: '%'
! tilt_position:
! required: true
! selector:
! number:
! min: 0
! max: 100
! unit_of_measurement: '%'
! state:
! required: true
selector:
text:
diff --color -p ../../../core/homeassistant/components/rfxtrx/strings.json rfxtrx/strings.json
*** ../../../core/homeassistant/components/rfxtrx/strings.json 2024-02-21 18:07:25
--- rfxtrx/strings.json 2024-03-08 11:24:20
***************
*** 58,64 ****
"command_on": "Data bits value for command on",
"command_off": "Data bits value for command off",
"venetian_blind_mode": "Venetian blind mode",
! "replace_device": "Select device to replace"
},
"title": "Configure device options"
}
--- 58,79 ----
"command_on": "Data bits value for command on",
"command_off": "Data bits value for command off",
"venetian_blind_mode": "Venetian blind mode",
! "replace_device": "Select device to replace",
! "state_support": "Provide stateful support",
! "midpoint_supported": "Tilting Blind - Supports midpoint access",
! "midpoint_sync": "Sync when crossing midpoint",
! "midpoint_steps": "Tilting Blind - Steps to midpoint",
! "open_seconds": "Open time (secs)",
! "close_seconds": "Close time (secs)",
! "sync_seconds": "Mid open/close time (ms)",
! "tilt1_ms": "Tilting Blind - Lower tilt time from midpoint (ms)",
! "tilt2_ms": "Tilting Blind - Upper tilt time from midpoint (ms)",
! "custom_icon": "Custom cover icon",
! "colour_icon": "Highlight open cover",
! "partial_closed": "Highlight partially open as closed",
! "signal_repetitions": "Number of signal repetitions",
! "signal_repetition_delay": "Delay between signal repetitions (ms)",
! "roller_mid_on_close": "Roller blind close to midpoint"
},
"title": "Configure device options"
}
***************
*** 148,155 ****
"event": {
"name": "Event",
"description": "A hexadecimal string to send."
}
}
}
}
! }
--- 163,188 ----
"event": {
"name": "Event",
"description": "A hexadecimal string to send."
+ }
+ }
+ },
+ "update_cover_position": {
+ "name": "Update position",
+ "description": "Update position of a specific cover",
+ "fields": {
+ "position": {
+ "name": "Position",
+ "description": "Position of the cover"
+ },
+ "tilt_position": {
+ "name": "Tilt position",
+ "description": "Tilt position of the cover"
+ },
+ "state": {
+ "name": "State",
+ "description": "State of the cover"
}
}
}
}
! }
\ No newline at end of file
Only in rfxtrx: translations