diff --git a/python/set_devices/ump_logger.py b/python/set_devices/ump_logger.py index 1ecb4f1..01004d7 100644 --- a/python/set_devices/ump_logger.py +++ b/python/set_devices/ump_logger.py @@ -68,17 +68,20 @@ FIELDS = ( ) -def request(controller: int, function: int, address: int, value: int) -> bytes: +def request(controller: int, function: int, address: int, value: int, *, record_words: int = WORDS) -> bytes: if not 0 <= controller <= 255 or not 0 <= value <= 65535: raise ValueError('Недопустимый адрес контроллера или значение') + if record_words not in (40, 42): + raise ValueError('Неверный размер записи логгера') + capacity = {40: 800, 42: 760}[record_words] if function == 3: valid = ((address == BASE and value == 16) or (address == DATA and 1 <= value <= 120 and (value % WORDS == 0 or value in (42, 84))) or (address == LIVE and value == 124) or (address == EMU_CONTROL and value == 4) or (address == FAST_CAPABILITY and value == 4) - or (FAST_DATA <= address < FAST_DATA + CAPACITY * WORDS - and (address - FAST_DATA) % WORDS == 0 - and 1 <= value <= 120 and value % WORDS == 0 - and address + value <= FAST_DATA + CAPACITY * WORDS)) + or (FAST_DATA <= address < FAST_DATA + capacity * record_words + and (address - FAST_DATA) % record_words == 0 + and 1 <= value <= 120 and value % record_words == 0 + and address + value <= FAST_DATA + capacity * record_words)) else: valid = function == 6 and (address in (BASE, BASE + 1, BASE + 2, BASE + 3) or (address == EMU_CONTROL + 2 and value in (0, 1)))