ну вроде работает, но опять тормозит

This commit is contained in:
Razvalyaev 2025-07-13 22:17:45 +03:00
parent 42ac3eb65d
commit 21082a38e0
7 changed files with 2064 additions and 1745 deletions

View File

@ -415,14 +415,16 @@ class VarEditor(QWidget):
QMessageBox.critical(self, "Ошибка", f"Не удалось загрузить переменные:\n{e}")
def delete_selected_rows(self):
selected_rows = sorted(set(index.row() for index in self.table.selectedIndexes()), reverse=True)
if not selected_rows:
# Получаем имена всех выбранных переменных из первого столбца
selected_names = self.table.get_selected_var_names()
if not selected_names:
return
for row in selected_rows:
if 0 <= row < len(self.vars_list):
# Меняем флаг show_var для переменной с этим индексом
self.vars_list[row]['show_var'] = 'false'
# Меняем флаг show_var по имени
for var in self.vars_list:
if var.get('name') in selected_names:
var['show_var'] = 'false'
self.table.populate(self.vars_list, self.structs, self.write_to_xml)
self.write_to_xml()
@ -517,6 +519,11 @@ class VarEditor(QWidget):
el = ET.SubElement(parent, tag)
el.text = str(text)
pt_type_val = v_table['pt_type'] if v_table and 'pt_type' in v_table else v.get('pt_type', '')
if 'arr' in pt_type_val or 'struct' in pt_type_val or 'union' in pt_type_val:
continue
show_var_val = str(v.get('show_var', 'false')).lower()
enable_val = str(v_table['enable'] if v_table and 'enable' in v_table else v.get('enable', 'false')).lower()
@ -525,7 +532,6 @@ class VarEditor(QWidget):
# Тут подтягиваем из таблицы, если есть, иначе из v
shortname_val = v_table['shortname'] if v_table and 'shortname' in v_table else v.get('shortname', '')
pt_type_val = v_table['pt_type'] if v_table and 'pt_type' in v_table else v.get('pt_type', '')
iq_type_val = v_table['iq_type'] if v_table and 'iq_type' in v_table else v.get('iq_type', '')
ret_type_val = v_table['return_type'] if v_table and 'return_type' in v_table else v.get('return_type', '')

View File

@ -107,14 +107,11 @@ class VariableSelectorDialog(QDialog):
# --- Код в конце __init__ ---
self.expanded_vars = setupVars.expand_vars(self.all_vars, self.structs, self.typedefs)
self.selected_vars = setupVars.filter_selected_vars(self.expanded_vars)
# Передаем данные в виджет
self.vars_widget.set_data(self.expanded_vars)
self.selected_vars_widget.set_data(self.selected_vars)
self.update_vars_widget()
def on_move_right(self):
# Устанавливаем show_var=True для всех выбранных переменных из ЛЕВОЙ таблицы
selected = self.vars_widget.get_selected_var_names()
selected = self.vars_widget._get_internal_selected_var_names()
if not selected:
return
@ -126,11 +123,11 @@ class VariableSelectorDialog(QDialog):
mark_selected_show_var(var['children'])
mark_selected_show_var(self.expanded_vars)
self.update_selected_vars_widget()
self.update_vars_widget()
def on_move_left(self):
# Сбрасываем show_var=False для всех выбранных переменных из ПРАВОЙ таблицы
selected = self.selected_vars_widget.get_selected_var_names()
selected = self.selected_vars_widget._get_internal_selected_var_names()
if not selected:
return
@ -142,21 +139,25 @@ class VariableSelectorDialog(QDialog):
mark_selected_hide_var(var['children'])
mark_selected_hide_var(self.expanded_vars)
self.update_selected_vars_widget()
self.update_vars_widget()
def update_selected_vars_widget(self):
self.selected_vars = setupVars.filter_selected_vars(self.expanded_vars)
def update_vars_widget(self):
self.selected_vars, self.unselected_vars = setupVars.split_vars_by_show_flag(self.expanded_vars)
self.vars_widget.set_data(self.unselected_vars)
self.vars_widget.filter_tree()
self.selected_vars_widget.set_data(self.selected_vars)
self.selected_vars_widget.filter_tree()
def on_add_clicked(self):
# Получаем все переменные из правой таблицы (selected_vars_widget)
var_names = self.selected_vars_widget.get_all_var_names()
all_items = self.selected_vars_widget.get_all_items()
if not all_items:
return
for item in all_items:
def add_to_var_map_recursively(item):
name = item.text(0)
type_str = item.text(1)
@ -178,41 +179,66 @@ class VariableSelectorDialog(QDialog):
self.all_vars.append(new_var)
self.var_map[name] = new_var
for item in all_items:
add_to_var_map_recursively(item)
self.accept()
def on_delete_clicked(self):
# Получаем все имена переменных из правой таблицы
all_names = self.selected_vars_widget.get_all_var_names()
if not all_names:
# Получаем все элементы (QTreeWidgetItem) из правой таблицы
all_items = self.selected_vars_widget.get_all_items()
if not all_items:
return
for name in all_names:
affected_names = []
def disable_var_recursively(item):
name = item.text(0)
if name in self.var_map:
self.var_map[name]['show_var'] = 'false'
self.var_map[name]['enable'] = 'false'
affected_names.append(name)
self.update_xml_vars(all_names, 'false', 'false')
self.update_selected_vars_widget()
# Рекурсивно отключаем детей
for i in range(item.childCount()):
child = item.child(i)
disable_var_recursively(child)
for item in all_items:
disable_var_recursively(item)
# Обновляем XML и таблицу
self.update_xml_vars(affected_names, 'false', 'false')
self.update_vars_widget()
def update_xml_vars(self, names, show, enable):
"""Обновляет флаги show_var и enable в XML файле."""
"""Обновляет флаги show_var и enable в XML файле, только если у переменной нет вложенных структур."""
if not self.xml_path:
return
root, tree = myXML.safe_parse_xml(self.xml_path)
if root is None: return
if root is None:
return
vars_section = root.find('variables')
if vars_section is None: return
if vars_section is None:
return
for var_elem in vars_section.findall('var'):
if var_elem.attrib.get('name') in names:
# Проверяем наличие вложенных структур или объединений
has_nested_structs = any(
var_elem.find(tag) is not None for tag in ('struct', 'union')
)
if not has_nested_structs:
def set_text(tag, value):
el = var_elem.find(tag)
if el is None: el = ET.SubElement(var_elem, tag)
if el is None:
el = ET.SubElement(var_elem, tag)
el.text = value
set_text('show_var', show)
set_text('enable', enable)
myXML.fwrite(root, self.xml_path)
@ -314,12 +340,16 @@ class VariableSelectorDialog(QDialog):
if removed_any:
myXML.fwrite(root, self.xml_path)
self.filter_tree()
self.update_vars_widget()
def _get_selected_var_names(self):
self.tree.setFocus()
return [item.text(0) for item in self.tree.selectedItems() if item.text(0)]
focused = self.focusWidget()
if focused and focused is self.vars_widget.tree:
return self.vars_widget.get_selected_var_names()
elif focused and focused is self.selected_vars_widget.tree:
return self.selected_vars_widget.get_selected_var_names()
else:
return []
def save_checkbox_state(self):
self.settings.setValue("autocomplete_enabled", self.autocomplete_checkbox.isChecked())

View File

@ -269,3 +269,16 @@ class VariableTableWidget(QTableWidget):
# Надёжная подсветка: через styleSheet
widget.setStyleSheet(css_color)
widget.setToolTip(tooltip if color else "")
def get_selected_var_names(self):
selected_indexes = self.selectedIndexes()
selected_rows = set(index.row() for index in selected_indexes)
names = []
for row in selected_rows:
name_widget = self.cellWidget(row, rows.name)
if name_widget:
name = name_widget.text()
if name:
names.append(name)
return names

View File

@ -187,13 +187,45 @@ class VariableSelectWidget(QWidget):
# self.build_completion_list() # Если нужна полная перестройка списка
self.populate_tree()
def _get_internal_selected_items(self):
"""Возвращает выделенные элементы и всех их потомков."""
selected = self.tree.selectedItems()
all_items = []
def collect_children(item):
items = [item]
for i in range(item.childCount()):
child = item.child(i)
items.extend(collect_children(child))
return items
for item in selected:
all_items.extend(collect_children(item))
return all_items
def _get_internal_selected_var_names(self):
"""Возвращает имена выделенных переменных."""
return [item.text(0) for item in self._get_internal_selected_items() if item.text(0)]
def get_selected_items(self):
"""Возвращает выделенные элементы QTreeWidget."""
return self.tree.selectedItems()
"""Возвращает только конечные (leaf) выделенные элементы, исключая bitfield."""
selected = self.tree.selectedItems()
leaf_items = []
for item in selected:
# Проверка: если нет выбранных/видимых детей — это лист
if all(item.child(i).isHidden() or not item.child(i).isSelected() for i in range(item.childCount())):
item_type = item.data(0, Qt.UserRole)
if item_type and 'bitfield' in str(item_type).lower():
continue # Пропускаем битовые поля
leaf_items.append(item)
return leaf_items
def get_selected_var_names(self):
"""Возвращает имена выделенных переменных."""
return [item.text(0) for item in self.tree.selectedItems() if item.text(0)]
"""Возвращает имена только конечных (leaf) переменных из выделенных."""
return [item.text(0) for item in self.get_selected_items() if item.text(0)]
def populate_tree(self, vars_list=None):
@ -221,15 +253,6 @@ class VariableSelectWidget(QWidget):
return fullname
def get_selected_vars(self):
selected = self.tree.selectedItems()
result = []
for item in selected:
var = item.data(0, Qt.UserRole)
if var:
result.append(var)
return result
def add_tree_item_recursively(self, parent, var):
"""
Рекурсивно добавляет переменную и её дочерние поля в дерево.
@ -519,7 +542,35 @@ class VariableSelectWidget(QWidget):
item.setToolTip(1, text)
def get_all_items(self):
return [self.tree.topLevelItem(i) for i in range(self.tree.topLevelItemCount())]
"""Возвращает все конечные (leaf) элементы, исключая битовые поля и элементы с детьми."""
def collect_leaf_items(parent):
leaf_items = []
for i in range(parent.childCount()):
child = parent.child(i)
if child.isHidden():
continue
if child.childCount() == 0:
item_type = child.text(1)
if item_type and 'bitfield' in str(item_type).lower():
continue
leaf_items.append(child)
else:
leaf_items.extend(collect_leaf_items(child))
return leaf_items
all_leaf_items = []
for i in range(self.tree.topLevelItemCount()):
top = self.tree.topLevelItem(i)
if top.childCount() == 0:
item_type = top.text(1)
if item_type and 'bitfield' in str(item_type).lower():
continue
all_leaf_items.append(top)
else:
all_leaf_items.extend(collect_leaf_items(top))
return all_leaf_items
def get_all_var_names(self):
return [self.tree.topLevelItem(i).text(0) for i in range(self.tree.topLevelItemCount())]
"""Возвращает имена всех конечных (leaf) переменных, исключая битовые поля и группы."""
return [item.text(0) for item in self.get_all_items() if item.text(0)]

View File

@ -7,6 +7,56 @@ from enum import IntEnum
import scanVars
import myXML
# Вспомогательные функции, которые теперь будут использоваться виджетом
def split_path(path):
"""
Разбивает путь на компоненты:
- 'foo[2].bar[1]->baz' ['foo', '[2]', 'bar', '[1]', 'baz']
Если видит '-' в конце строки (без '>' после) обрезает этот '-'
"""
tokens = []
token = ''
i = 0
length = len(path)
while i < length:
c = path[i]
# Разделители: '->' и '.'
if c == '-' and i + 1 < length and path[i:i+2] == '->':
if token:
tokens.append(token)
token = ''
i += 2
continue
elif c == '-' and i == length - 1:
# '-' на конце строки без '>' после — просто пропускаем его
i += 1
continue
elif c == '.':
if token:
tokens.append(token)
token = ''
i += 1
continue
elif c == '[':
if token:
tokens.append(token)
token = ''
idx = ''
while i < length and path[i] != ']':
idx += path[i]
i += 1
if i < length and path[i] == ']':
idx += ']'
i += 1
tokens.append(idx)
continue
else:
token += c
i += 1
if token:
tokens.append(token)
return tokens
def make_absolute_path(path, base_path):
if not os.path.isabs(path) and os.path.isdir(base_path):
@ -405,19 +455,132 @@ def expand_vars(vars_list, structs, typedefs):
return expanded
def filter_selected_vars(expanded_vars):
def build_full_names(parts, full_name):
"""
Восстанавливает вложенные полные имена из списка частей,
ориентируясь на оригинальное полное имя (с '.', '->' и индексами).
Пример:
parts = ['arr', '[0]', '[1]', 'ptr', 'val']
full_name = 'arr[0][1].ptr->val'
[
'arr',
'arr[0]',
'arr[0][1]',
'arr[0][1].ptr',
'arr[0][1].ptr->val'
]
"""
names = []
acc = ''
idx = 0
for part in parts:
pos = full_name.find(part, idx)
if pos == -1:
acc += part
else:
acc = full_name[:pos + len(part)]
idx = pos + len(part)
names.append(acc)
return names
def find_var_by_name(tree, name):
for var in tree:
if var.get('name') == name:
return var
if 'children' in var:
found = find_var_by_name(var['children'], name)
if found:
return found
return None
def add_to_nested_tree(tree, var, path_parts, full_names=None, depth=0, source_tree=None):
if not path_parts:
return
if full_names is None:
full_names = build_full_names(path_parts, var['name'])
current_name = full_names[depth]
for child in tree:
if child.get('name') == current_name:
if depth == len(path_parts) - 1:
child.update(var)
return
if 'children' not in child:
child['children'] = []
add_to_nested_tree(child['children'], var, path_parts, full_names, depth + 1, source_tree)
return
# Ищем в source_tree (expanded_vars) родительский узел по current_name
parent_data = {}
if source_tree:
parent_var = find_var_by_name(source_tree, current_name)
if parent_var:
# Копируем все поля кроме детей (children)
parent_data = {k: v for k, v in parent_var.items() if k != 'children'}
new_node = {
'name': current_name,
'children': []
}
# Обновляем new_node данными родителя
new_node.update(parent_data)
if depth == len(path_parts) - 1:
new_node.update(var)
else:
add_to_nested_tree(new_node['children'], var, path_parts, full_names, depth + 1, source_tree)
tree.append(new_node)
def split_vars_by_show_flag(expanded_vars):
from copy import deepcopy
unselected_vars = deepcopy(expanded_vars)
selected_vars = []
def recurse(vars_list):
for var in vars_list:
show_var = var.get('show_var', 'false').lower()
if show_var == 'true':
selected_vars.append(var)
def find_and_remove(var_list, target_name):
"""Удаляет элемент по полному имени и возвращает его"""
for i, var in enumerate(var_list):
if var.get("name") == target_name:
return var_list.pop(i)
if 'children' in var:
found = find_and_remove(var['children'], target_name)
if found:
return found
return None
# Рекурсивно обходим детей, если есть
children = var.get('children')
if children:
recurse(children)
def collect_selected_nodes(var):
"""Рекурсивно возвращает все show_var=true узлы (включая поддерево)"""
nodes = []
if var.get('show_var', 'false').lower() == 'true':
nodes.append(var)
for child in var.get('children', []):
nodes.extend(collect_selected_nodes(child))
return nodes
recurse(expanded_vars)
return selected_vars
selected_nodes = []
for var in expanded_vars:
selected_nodes.extend(collect_selected_nodes(var))
for node in selected_nodes:
path_parts = split_path(node['name'])
# Вырезать из unselected_vars
removed = find_and_remove(unselected_vars, node['name'])
if removed:
add_to_nested_tree(selected_vars, removed, path_parts)
else:
# вдруг удалённый родитель — создаём вручную
add_to_nested_tree(selected_vars, node, path_parts)
return selected_vars, unselected_vars

File diff suppressed because it is too large Load Diff

550
vars.xml
View File

@ -1,13 +1,13 @@
<?xml version='1.0' encoding='utf-8'?>
<analysis makefile_path="Debug/makefile" proj_path="E:/.WORK/TMS/TMS_new_bus" structs_path="Src/DebugTools/structs.xml">
<analysis proj_path="E:/.WORK/TMS/TMS_new_bus" makefile_path="Debug/makefile" structs_path="Src/DebugTools/structs.xml">
<variables>
<var name="ADC0finishAddr">
<show_var>true</show_var>
<enable>true</enable>
<shortname>ADC0EndAdr</shortname>
<show_var>false</show_var>
<enable>false</enable>
<shortname>ADC0finishAddr</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<return_type>int</return_type>
<type>int</type>
<file>Src/myXilinx/x_example_all.c</file>
<extern>false</extern>
@ -407,7 +407,7 @@
<type>char[8][16]</type>
<file>Src/myLibs/bender.c</file>
<extern>false</extern>
<static>True</static>
<static>true</static>
</var>
<var name="IN0finishAddr">
<show_var>false</show_var>
@ -863,7 +863,7 @@
<type>int[12]</type>
<file>Src/main/init_protect_levels.c</file>
<extern>false</extern>
<static>True</static>
<static>true</static>
</var>
<var name="biTemperatureWarnings">
<show_var>false</show_var>
@ -875,7 +875,7 @@
<type>int[12]</type>
<file>Src/main/init_protect_levels.c</file>
<extern>false</extern>
<static>True</static>
<static>true</static>
</var>
<var name="block_size_counter_fast">
<show_var>false</show_var>
@ -959,7 +959,7 @@
<type>int[12]</type>
<file>Src/main/init_protect_levels.c</file>
<extern>false</extern>
<static>True</static>
<static>true</static>
</var>
<var name="bvTemperatureWarnings">
<show_var>false</show_var>
@ -971,7 +971,7 @@
<type>int[12]</type>
<file>Src/main/init_protect_levels.c</file>
<extern>false</extern>
<static>True</static>
<static>true</static>
</var>
<var name="byte">
<show_var>false</show_var>
@ -1151,7 +1151,7 @@
<type>char[4]</type>
<file>Src/myLibs/bender.c</file>
<extern>false</extern>
<static>True</static>
<static>true</static>
</var>
<var name="cmd_finish1">
<show_var>false</show_var>
@ -1187,7 +1187,7 @@
<type>char[5]</type>
<file>Src/myLibs/bender.c</file>
<extern>false</extern>
<static>True</static>
<static>true</static>
</var>
<var name="cmd_txt">
<show_var>false</show_var>
@ -1199,7 +1199,7 @@
<type>char[4][8]</type>
<file>Src/myLibs/bender.c</file>
<extern>false</extern>
<static>True</static>
<static>true</static>
</var>
<var name="compress_size">
<show_var>false</show_var>
@ -1451,7 +1451,7 @@
<type>DQ_TO_ALPHABETA</type>
<file>Src/main/v_pwm24.c</file>
<extern>false</extern>
<static>True</static>
<static>true</static>
</var>
<var name="enable_can">
<show_var>false</show_var>
@ -2953,6 +2953,18 @@
<extern>false</extern>
<static>false</static>
</var>
<var name="return_var">
<show_var>false</show_var>
<enable>false</enable>
<shortname>return_var</shortname>
<pt_type>pt_int32</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>int</return_type>
<type>long</type>
<file>Src/main/Main.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="rmp_freq">
<show_var>false</show_var>
<enable>false</enable>
@ -3397,6 +3409,18 @@
<extern>false</extern>
<static>false</static>
</var>
<var name="var_numb">
<show_var>false</show_var>
<enable>false</enable>
<shortname>var_numb</shortname>
<pt_type>pt_int32</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>int</return_type>
<type>long</type>
<file>Src/main/Main.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="vect_control">
<show_var>false</show_var>
<enable>false</enable>
@ -3554,9 +3578,9 @@
<static>false</static>
</var>
<var name="ADC_f[0][0]">
<show_var>true</show_var>
<show_var>false</show_var>
<enable>true</enable>
<shortname>ADC_f00</shortname>
<shortname>ADC_f[0][0]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
@ -3566,9 +3590,9 @@
<static>false</static>
</var>
<var name="ADC_f[0][1]">
<show_var>true</show_var>
<show_var>false</show_var>
<enable>true</enable>
<shortname>ADC_f01</shortname>
<shortname>ADC_f[0][1]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
@ -3578,9 +3602,9 @@
<static>false</static>
</var>
<var name="ADC_f[0][2]">
<show_var>true</show_var>
<show_var>false</show_var>
<enable>true</enable>
<shortname>ADC_f02</shortname>
<shortname>ADC_f[0][2]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
@ -3590,9 +3614,9 @@
<static>false</static>
</var>
<var name="ADC_f[0][3]">
<show_var>true</show_var>
<show_var>false</show_var>
<enable>true</enable>
<shortname>ADC_f03</shortname>
<shortname>ADC_f[0][3]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
@ -3602,9 +3626,9 @@
<static>false</static>
</var>
<var name="ADC_f[0][4]">
<show_var>true</show_var>
<show_var>false</show_var>
<enable>true</enable>
<shortname>ADC_f04</shortname>
<shortname>ADC_f[0][4]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
@ -3614,9 +3638,9 @@
<static>false</static>
</var>
<var name="ADC_f[0][5]">
<show_var>true</show_var>
<show_var>false</show_var>
<enable>true</enable>
<shortname>ADC_f05</shortname>
<shortname>ADC_f[0][5]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
@ -3626,9 +3650,9 @@
<static>false</static>
</var>
<var name="ADC_f[0][6]">
<show_var>true</show_var>
<show_var>false</show_var>
<enable>true</enable>
<shortname>ADC_f06</shortname>
<shortname>ADC_f[0][6]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
@ -3638,11 +3662,11 @@
<static>false</static>
</var>
<var name="ADC_f[0][7]">
<show_var>true</show_var>
<show_var>false</show_var>
<enable>true</enable>
<shortname>ADC_f07</shortname>
<shortname>ADC_f[0][7]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq</iq_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
@ -3650,9 +3674,9 @@
<static>false</static>
</var>
<var name="ADC_f[0][8]">
<show_var>true</show_var>
<show_var>false</show_var>
<enable>true</enable>
<shortname>ADC_f08</shortname>
<shortname>ADC_f[0][8]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
@ -3662,9 +3686,9 @@
<static>false</static>
</var>
<var name="ADC_f[0][9]">
<show_var>true</show_var>
<show_var>false</show_var>
<enable>true</enable>
<shortname>ADC_f09</shortname>
<shortname>ADC_f[0][9]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
@ -3674,9 +3698,9 @@
<static>false</static>
</var>
<var name="ADC_f[0][10]">
<show_var>true</show_var>
<show_var>false</show_var>
<enable>true</enable>
<shortname>ADC_f010</shortname>
<shortname>ADC_f[0][10]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
@ -3688,7 +3712,7 @@
<var name="ADC_f[0][11]">
<show_var>true</show_var>
<enable>true</enable>
<shortname>ADC_f011</shortname>
<shortname>ADC_f[0][11]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
@ -3700,7 +3724,7 @@
<var name="ADC_f[0][12]">
<show_var>true</show_var>
<enable>true</enable>
<shortname>ADC_f012</shortname>
<shortname>ADC_f[0][12]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
@ -3712,8 +3736,8 @@
<var name="ADC_f[0][13]">
<show_var>true</show_var>
<enable>true</enable>
<shortname>ADC_f013</shortname>
<pt_type>pt_int16</pt_type>
<shortname>ADC_f[0][13]</shortname>
<pt_type>pt_int32</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
@ -3724,7 +3748,7 @@
<var name="ADC_f[0][14]">
<show_var>true</show_var>
<enable>true</enable>
<shortname>ADC_f014</shortname>
<shortname>ADC_f[0][14]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
@ -3736,7 +3760,7 @@
<var name="ADC_f[0][15]">
<show_var>true</show_var>
<enable>true</enable>
<shortname>ADC_f015</shortname>
<shortname>ADC_f[0][15]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
@ -3745,10 +3769,202 @@
<extern>false</extern>
<static>false</static>
</var>
<var name="project.cds_tk[2].read.sbus.mask_protect_tk.all">
<show_var>false</show_var>
<var name="ADC_f[1][0]">
<show_var>true</show_var>
<enable>true</enable>
<shortname>tk2_ackcur</shortname>
<shortname>ADC_f[1][0]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_f[1][1]">
<show_var>true</show_var>
<enable>true</enable>
<shortname>ADC_f[1][1]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_f[1][2]">
<show_var>true</show_var>
<enable>true</enable>
<shortname>ADC_f[1][2]</shortname>
<pt_type>pt_int64</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_f[1][3]">
<show_var>true</show_var>
<enable>true</enable>
<shortname>ADC_f[1][3]</shortname>
<pt_type>pt_int32</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_f[1][4]">
<show_var>true</show_var>
<enable>true</enable>
<shortname>ADC_f[1][4]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_f[1][5]">
<show_var>true</show_var>
<enable>true</enable>
<shortname>ADC_f[1][5]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_f[1][6]">
<show_var>true</show_var>
<enable>true</enable>
<shortname>ADC_f[1][6]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_f[1][7]">
<show_var>true</show_var>
<enable>true</enable>
<shortname>ADC_f[1][7]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_f[1][8]">
<show_var>true</show_var>
<enable>true</enable>
<shortname>ADC_f[1][8]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_f[1][9]">
<show_var>true</show_var>
<enable>true</enable>
<shortname>ADC_f[1][9]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_f[1][10]">
<show_var>true</show_var>
<enable>true</enable>
<shortname>ADC_f[1][10]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_f[1][11]">
<show_var>true</show_var>
<enable>true</enable>
<shortname>ADC_f[1][11]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq1</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_f[1][12]">
<show_var>true</show_var>
<enable>true</enable>
<shortname>ADC_f[1][12]</shortname>
<pt_type>pt_int32</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_f[1][13]">
<show_var>true</show_var>
<enable>true</enable>
<shortname>ADC_f[1][13]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_f[1][14]">
<show_var>true</show_var>
<enable>true</enable>
<shortname>ADC_f[1][14]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_f[1][15]">
<show_var>true</show_var>
<enable>true</enable>
<shortname>ADC_f[1][15]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="project.cds_in[0].plane_address">
<show_var>true</show_var>
<enable>true</enable>
<shortname>project.cds_in[0].plane_address</shortname>
<pt_type>pt_uint16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
@ -3757,240 +3973,72 @@
<extern>false</extern>
<static>false</static>
</var>
<var name="project.cds_tk[1].plane_address">
<show_var>false</show_var>
<var name="Bender[0].KOhms">
<show_var>true</show_var>
<enable>true</enable>
<shortname>tk1_adr</shortname>
<shortname>Bender[0].KOhms</shortname>
<pt_type>pt_uint16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>UInt16</type>
<file>Src/myXilinx/xp_project.c</file>
<type>unsigned int</type>
<file>Src/myLibs/bender.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_sf[1][0]">
<show_var>false</show_var>
<var name="Bender[0].Times">
<show_var>true</show_var>
<enable>true</enable>
<shortname>ADC_sf[1][0]</shortname>
<pt_type>pt_int16</pt_type>
<shortname>Bender[0].Times</shortname>
<pt_type>pt_uint16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<type>unsigned int</type>
<file>Src/myLibs/bender.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_sf[1][1]">
<show_var>false</show_var>
<var name="Bender[0].Error.all">
<show_var>true</show_var>
<enable>true</enable>
<shortname>ADC_sf[1][1]</shortname>
<pt_type>pt_int16</pt_type>
<shortname>Bender[0].Error.all</shortname>
<pt_type>pt_uint16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_sf[1][2]">
<show_var>false</show_var>
<enable>true</enable>
<shortname>ADC_sf[1][2]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_sf[1][3]">
<show_var>false</show_var>
<enable>true</enable>
<shortname>ADC_sf[1][3]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_sf[1][4]">
<show_var>false</show_var>
<enable>true</enable>
<shortname>ADC_sf[1][4]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_sf[1][5]">
<show_var>false</show_var>
<enable>true</enable>
<shortname>ADC_sf[1][5]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_sf[1][6]">
<show_var>false</show_var>
<enable>true</enable>
<shortname>ADC_sf[1][6]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_sf[1][7]">
<show_var>false</show_var>
<enable>true</enable>
<shortname>ADC_sf[1][7]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_sf[1][8]">
<show_var>false</show_var>
<enable>true</enable>
<shortname>ADC_sf[1][8]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_sf[1][9]">
<show_var>false</show_var>
<enable>true</enable>
<shortname>ADC_sf[1][9]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_sf[1][10]">
<show_var>false</show_var>
<enable>true</enable>
<shortname>ADC_sf[1][10]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_sf[1][11]">
<show_var>false</show_var>
<enable>true</enable>
<shortname>ADC_sf[1][11]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_sf[1][12]">
<show_var>false</show_var>
<enable>true</enable>
<shortname>ADC_sf[1][12]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_sf[1][13]">
<show_var>false</show_var>
<enable>true</enable>
<shortname>ADC_sf[1][13]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_sf[1][14]">
<show_var>false</show_var>
<enable>true</enable>
<shortname>ADC_sf[1][14]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<extern>false</extern>
<static>false</static>
</var>
<var name="ADC_sf[1][15]">
<show_var>false</show_var>
<enable>true</enable>
<shortname>ADC_sf[1][15]</shortname>
<pt_type>pt_int16</pt_type>
<iq_type>t_iq_none</iq_type>
<return_type>t_iq_none</return_type>
<type>int</type>
<file>Src/main/adc_tools.c</file>
<type>unsigned int</type>
<file>Src/myLibs/bender.c</file>
<extern>false</extern>
<static>false</static>
</var>
</variables>
<includes>
<file>Src/main/vector.h</file>
<file>Src/myXilinx/RS_Functions_modbus.h</file>
<file>Src/main/v_pwm24.h</file>
<file>Src/main/f281xpwm.h</file>
<file>Src/myXilinx/xp_project.h</file>
<file>Src/main/adc_tools.h</file>
<file>Src/main/errors.h</file>
<file>Src/myXilinx/xp_write_xpwm_time.h</file>
<file>Src/myLibs/log_can.h</file>
<file>Src/myXilinx/RS_Functions_modbus.h</file>
<file>Src/VectorControl/pwm_vector_regul.h</file>
<file>Src/main/errors.h</file>
<file>Src/main/rotation_speed.h</file>
<file>Src/VectorControl/teta_calc.h</file>
<file>Src/main/v_pwm24.h</file>
<file>Src/main/vector.h</file>
<file>Src/main/adc_tools.h</file>
<file>Src/myLibs/log_can.h</file>
<file>Src/myXilinx/xp_write_xpwm_time.h</file>
<file>Src/VectorControl/dq_to_alphabeta_cos.h</file>
<file>Src/myXilinx/RS_Functions.h</file>
<file>Src/myXilinx/x_serial_bus.h</file>
<file>Src/myLibs/svgen_dq.h</file>
<file>Src/myXilinx/x_parallel_bus.h</file>
<file>Src/myXilinx/x_serial_bus.h</file>
<file>Src/myXilinx/xPeriphSP6_loader.h</file>
<file>Src/myXilinx/Spartan2E_Functions.h</file>
<file>Src/myXilinx/xp_controller.h</file>
<file>Src/myXilinx/xp_rotation_sensor.h</file>
<file>Src/myXilinx/xPeriphSP6_loader.h</file>
<file>Src/myXilinx/RS_Functions.h</file>
<file>Src/myLibs/detect_phase_break2.h</file>
<file>Src/myXilinx/CRC_Functions.h</file>
<file>Src/myLibs/CAN_Setup.h</file>
<file>Src/myLibs/log_params.h</file>
<file>Src/myLibs/log_to_memory.h</file>
<file>Src/main/global_time.h</file>
<file>Src/myLibs/pid_reg3.h</file>
<file>Src/myLibs/svgen_dq.h</file>
<file>Src/myLibs/log_params.h</file>
<file>Src/myXilinx/CRC_Functions.h</file>
<file>Src/main/global_time.h</file>
<file>Src/myLibs/CAN_Setup.h</file>
<file>Src/myLibs/log_to_memory.h</file>
<file>Src/myLibs/IQmathLib.h</file>
<file>Src/main/doors_control.h</file>
<file>Src/main/isolation.h</file>
@ -4868,6 +4916,10 @@
<type>TMS_TO_TERMINAL_TEST_ALL_STRUCT</type>
<file>Src/myXilinx/RS_Functions_modbus.c</file>
</var>
<var name="return_var">
<type>long</type>
<file>Src/main/Main.c</file>
</var>
<var name="rmp_freq">
<type>RMP_MY1</type>
<file>Src/main/PWMTools.c</file>
@ -5008,6 +5060,10 @@
<type>UNITES_CAN_SETUP</type>
<file>Src/myLibs/CAN_Setup.c</file>
</var>
<var name="var_numb">
<type>long</type>
<file>Src/main/Main.c</file>
</var>
<var name="vect_control">
<type>VECTOR_CONTROL</type>
<file>Src/VectorControl/pwm_vector_regul.c</file>