Skip to content

Commit c422ebe

Browse files
yozik04yozik04
committed
Update construct to the latest.
1 parent 1262978 commit c422ebe

File tree

4 files changed

+65
-88
lines changed

4 files changed

+65
-88
lines changed

‎paradox/connections/ip/parsers.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
Pointer(21, Enum(Int8ub, IP150=0x71, IP100=0x70)),
7373
lambda ctx: ctx.ip_module_serial[0],
7474
),
75-
).compile()
75+
)
7676

7777

7878
class EncryptionAdapter(Adapter):
@@ -131,7 +131,7 @@ def _encode(self, obj, context, path):
131131
),
132132
b"",
133133
),
134-
).compile()
134+
)
135135

136136

137137
IPMessageResponse = Struct(
@@ -174,4 +174,4 @@ def _encode(self, obj, context, path):
174174
),
175175
b"",
176176
),
177-
).compile()
177+
)

‎paradox/hardware/evo/parsers.py‎

Lines changed: 60 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
Computed,
1616
Const,
1717
Default,
18-
Embedded,
1918
Enum,
2019
ExprAdapter,
2120
ExprSymmetricAdapter,
@@ -106,90 +105,68 @@
106105
"system_options"
107106
/ BitsSwapped(
108107
BitStruct(
109-
Embedded(
110-
Struct( # EVO section data 3030
111-
"pgm1_smoke" / Flag,
112-
"no_bell_cut_off" / Flag,
113-
"daylight_saving_time" / Flag,
114-
"shabbat_feature" / Flag,
115-
"battery_charge_current" / Flag,
116-
"ac_failure_not_displayed_as_trouble" / Flag,
117-
"clear_bell_limit_trouble" / Flag,
118-
"combus_speed" / Flag,
119-
)
120-
),
108+
# EVO section data 3030
109+
"pgm1_smoke" / Flag,
110+
"no_bell_cut_off" / Flag,
111+
"daylight_saving_time" / Flag,
112+
"shabbat_feature" / Flag,
113+
"battery_charge_current" / Flag,
114+
"ac_failure_not_displayed_as_trouble" / Flag,
115+
"clear_bell_limit_trouble" / Flag,
116+
"combus_speed" / Flag,
121117
"partitions" / StatusFlags(8), # EVO section data 3031
122118
"siren_output_partition" / StatusFlags(8), # EVO section data 3032
123-
Embedded(
124-
Struct( # EVO section data 3033
125-
"multiple_actions_user_menu" / Flag,
126-
"user_code_length_flexible" / Flag,
127-
"user_code_length_6" / Flag,
128-
"power_save_mode" / Flag,
129-
"bypass_not_displayed_when_armed" / Flag,
130-
"trouble_latch" / Flag,
131-
"eol_resistor_on_harwire_zones" / Flag,
132-
"atz" / Flag,
133-
)
134-
),
135-
Embedded(
136-
Struct( # EVO section data 3034
137-
"wireless_transmitter_supervision_options" / BitsInteger(2),
138-
"generate_supervision_failure_on_bypassed_wireless_zone"
139-
/ Flag,
140-
"restrict_arming_on_wireless_transmitter_supervision_failure"
141-
/ Flag,
142-
"tamper_recognition_options" / BitsInteger(2),
143-
"generate_tamper_if_detected_on_bypassed_zone" / Flag,
144-
"restrict_arming_on_tamper" / Flag,
145-
)
146-
),
147-
Embedded(
148-
Struct( # EVO section data 3035
149-
"restrict_arming_on_ac_failure" / Flag,
150-
"restrict_arming_on_battery_failure" / Flag,
151-
"restrict_arming_on_bell_or_aux_failure" / Flag,
152-
"restrict_arming_on_tlm_failure" / Flag,
153-
"restrict_arming_on_module_troubles" / Flag,
154-
"account_number_transmission" / Flag,
155-
"transmit_zone_status_on_serial_port" / Flag,
156-
"serial_port_baud_rate_57600" / Flag,
157-
)
158-
),
159-
Embedded(
160-
Struct( # EVO section data 3036
161-
"telephone_line_monitoring" / BitsInteger(2),
162-
"dialer_reporting" / Flag,
163-
"dialing_method" / Flag,
164-
"pulse_ratio" / Flag,
165-
"busy_tone_detection" / Flag,
166-
"switch_to_pulse_dialing" / Flag,
167-
"bell_siren_upon_communication_failure" / Flag,
168-
)
169-
),
170-
Embedded(
171-
Struct( # EVO section data 3037
172-
"call_back" / Flag,
173-
"automatic_event_buffer_transmission" / Flag,
174-
"autotest_report_transmission_options" / BitsInteger(2),
175-
"keypad_beep_on_successful_arming_disarming_report" / Flag,
176-
"alternate_dialing" / Flag,
177-
"dial_tone_delay" / Flag,
178-
"report_zone_restore" / Flag,
179-
)
180-
),
181-
Embedded(
182-
Struct( # EVO section data 3038
183-
"access_control_feature" / Flag,
184-
"log_request_for_exit" / Flag,
185-
"log_door_left_open_restore" / Flag,
186-
"log_door_forced_restore" / Flag,
187-
"bulglar_alarm_on_forced_door" / Flag,
188-
"skip_exit_delay_when_arming_with_access_card" / Flag,
189-
"bulglar_alarm_on_door_left_open" / Flag,
190-
"who_has_access_during_clock_loss" / Flag,
191-
)
192-
),
119+
# EVO section data 3033
120+
"multiple_actions_user_menu" / Flag,
121+
"user_code_length_flexible" / Flag,
122+
"user_code_length_6" / Flag,
123+
"power_save_mode" / Flag,
124+
"bypass_not_displayed_when_armed" / Flag,
125+
"trouble_latch" / Flag,
126+
"eol_resistor_on_harwire_zones" / Flag,
127+
"atz" / Flag,
128+
# EVO section data 3034
129+
"wireless_transmitter_supervision_options" / BitsInteger(2),
130+
"generate_supervision_failure_on_bypassed_wireless_zone" / Flag,
131+
"restrict_arming_on_wireless_transmitter_supervision_failure"
132+
/ Flag,
133+
"tamper_recognition_options" / BitsInteger(2),
134+
"generate_tamper_if_detected_on_bypassed_zone" / Flag,
135+
"restrict_arming_on_tamper" / Flag,
136+
# EVO section data 3035
137+
"restrict_arming_on_ac_failure" / Flag,
138+
"restrict_arming_on_battery_failure" / Flag,
139+
"restrict_arming_on_bell_or_aux_failure" / Flag,
140+
"restrict_arming_on_tlm_failure" / Flag,
141+
"restrict_arming_on_module_troubles" / Flag,
142+
"account_number_transmission" / Flag,
143+
"transmit_zone_status_on_serial_port" / Flag,
144+
"serial_port_baud_rate_57600" / Flag,
145+
# EVO section data 3036
146+
"telephone_line_monitoring" / BitsInteger(2),
147+
"dialer_reporting" / Flag,
148+
"dialing_method" / Flag,
149+
"pulse_ratio" / Flag,
150+
"busy_tone_detection" / Flag,
151+
"switch_to_pulse_dialing" / Flag,
152+
"bell_siren_upon_communication_failure" / Flag,
153+
# EVO section data 3037
154+
"call_back" / Flag,
155+
"automatic_event_buffer_transmission" / Flag,
156+
"autotest_report_transmission_options" / BitsInteger(2),
157+
"keypad_beep_on_successful_arming_disarming_report" / Flag,
158+
"alternate_dialing" / Flag,
159+
"dial_tone_delay" / Flag,
160+
"report_zone_restore" / Flag,
161+
# EVO section data 3038
162+
"access_control_feature" / Flag,
163+
"log_request_for_exit" / Flag,
164+
"log_door_left_open_restore" / Flag,
165+
"log_door_forced_restore" / Flag,
166+
"bulglar_alarm_on_forced_door" / Flag,
167+
"skip_exit_delay_when_arming_with_access_card" / Flag,
168+
"bulglar_alarm_on_door_left_open" / Flag,
169+
"who_has_access_during_clock_loss" / Flag,
193170
)
194171
),
195172
"_not_used1" / Padding(4),

‎requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
argparse>=1.4.0
2-
construct~=2.9.43
2+
construct~=2.10.70
33
flake8
44
paho_mqtt>=1.5.0,<2
55

‎setup.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ zip_safe = True
2828
packages = find:
2929
python_requires = >=3.8,<3.12
3030
install_requires =
31-
construct~=2.9.43
31+
construct~=2.10.70
3232
argparse>=1.4.0
3333
python-slugify>=4.0.1
3434
pytz>=2021.3

0 commit comments

Comments
 (0)