diff --git a/DebugVarEdit.exe b/DebugVarEdit.exe index 1c903f2..6c5e0b8 100644 Binary files a/DebugVarEdit.exe and b/DebugVarEdit.exe differ diff --git a/Src/DebugVarEdit_GUI.py b/Src/DebugVarEdit_GUI.py index 2eae162..d99f807 100644 --- a/Src/DebugVarEdit_GUI.py +++ b/Src/DebugVarEdit_GUI.py @@ -26,6 +26,16 @@ from PySide2.QtGui import QTextCursor, QKeyEvent, QIcon from PySide2.QtCore import Qt, QProcess, QObject, Signal, QSettings +var_edit_title = "Редактор переменных для отладки" +xml_path_title = "Путь к XML:" +proj_path_title = "Путь к проекту:" +makefile_path_title = "Пусть к makefile (относительно проекта)" +output_path_title = "Папка для debug_vars.c:" +scan_title = "Обновить переменные" +build_title = "Обновить файл" +add_vars_title = "Добавить переменные" +open_output_title = "Открыть файл" + # 3. UI: таблица с переменными class VarEditor(QWidget): def __init__(self): @@ -44,7 +54,7 @@ class VarEditor(QWidget): self.initUI() def initUI(self): - self.setWindowTitle("Variable Editor") + self.setWindowTitle(var_edit_title) base_path = scanVars.get_base_path() icon_path = os.path.join(base_path, "icon.ico") @@ -56,7 +66,7 @@ class VarEditor(QWidget): # XML Output xml_layout = QHBoxLayout() - xml_layout.addWidget(QLabel("XML Output:")) + xml_layout.addWidget(QLabel(xml_path_title)) self.xml_output_edit = QLineEdit() self.xml_output_edit.returnPressed.connect(self.update) self.xml_output_edit.textChanged.connect(self.__on_xml_path_changed) @@ -68,7 +78,7 @@ class VarEditor(QWidget): # Project Path proj_layout = QHBoxLayout() - proj_layout.addWidget(QLabel("Project Path:")) + proj_layout.addWidget(QLabel(proj_path_title)) self.proj_path_edit = QLineEdit() self.proj_path_edit.returnPressed.connect(self.update) self.proj_path_edit.textChanged.connect(self.__on_proj_path_changed) @@ -80,7 +90,7 @@ class VarEditor(QWidget): # Makefile Path makefile_layout = QHBoxLayout() - makefile_layout.addWidget(QLabel("Makefile Path (relative path):")) + makefile_layout.addWidget(QLabel(makefile_path_title)) self.makefile_edit = QLineEdit() self.makefile_edit.returnPressed.connect(self.update) self.makefile_edit.textChanged.connect(self.__on_makefile_path_changed) @@ -94,7 +104,7 @@ class VarEditor(QWidget): # Source Output File/Directory source_output_layout = QHBoxLayout() - source_output_layout.addWidget(QLabel("Source Output File:")) + source_output_layout.addWidget(QLabel(output_path_title)) self.source_output_edit = QLineEdit() source_output_layout.addWidget(self.source_output_edit) btn_source_output_browse = QPushButton("...") @@ -103,19 +113,19 @@ class VarEditor(QWidget): btn_source_output_browse.clicked.connect(self.__browse_source_output) - self.btn_update_vars = QPushButton("Обновить данные о переменных") + self.btn_update_vars = QPushButton(scan_title) self.btn_update_vars.clicked.connect(self.update_vars_data) # Кнопка сохранения - btn_save = QPushButton("Build") + btn_save = QPushButton(build_title) btn_save.clicked.connect(self.save_build) # Кнопка добавления переменных - self.btn_add_vars = QPushButton("Add Variables") + self.btn_add_vars = QPushButton(add_vars_title) self.btn_add_vars.clicked.connect(self.__open_variable_selector) # Кнопка открыть output-файл с выбором программы - btn_open_output = QPushButton("Открыть Output File...") + btn_open_output = QPushButton(open_output_title) btn_open_output.clicked.connect(self.__open_output_file_with_program) # Таблица self.table = VariableTableWidget() diff --git a/Src/VariableSelector.py b/Src/VariableSelector.py index 461c7fa..b7de590 100644 --- a/Src/VariableSelector.py +++ b/Src/VariableSelector.py @@ -329,6 +329,7 @@ class VariableSelectorDialog(QDialog): for i in range(node.childCount()): stack.append(node.child(i)) return None + def insert_completion(self, text): node = self.find_node_by_fullname(text) @@ -371,7 +372,6 @@ class VariableSelectorDialog(QDialog): self.filter_tree() def on_add_clicked(self): - print("on_add_clicked triggered") self.selected_names = [] self.tree.setFocus() @@ -414,12 +414,10 @@ class VariableSelectorDialog(QDialog): self.all_vars.append(new_var) self.var_map[name] = new_var # Чтобы в будущем не добавлялось повторно - print("accept") self.done(QDialog.Accepted) def on_delete_clicked(self): - print("on_delete_clicked triggered") selected_names = self._get_selected_var_names() if not selected_names: print("nothing selected") @@ -468,7 +466,6 @@ class VariableSelectorDialog(QDialog): ET.ElementTree(root).write(self.xml_path, encoding="utf-8", xml_declaration=True) self.populate_tree() - print("accept") self.done(QDialog.Accepted) diff --git a/Src/VariableTable.py b/Src/VariableTable.py index 6c0617e..6182d4c 100644 --- a/Src/VariableTable.py +++ b/Src/VariableTable.py @@ -67,11 +67,22 @@ class VariableTableWidget(QTableWidget): self.type_options = list(dict.fromkeys(type_map.values())) self.display_type_options = [t.replace('pt_', '') for t in self.type_options] iq_types = ['iq_none', 'iq'] + [f'iq{i}' for i in range(1, 31)] + + # --- ДО: удаляем отображение структур и union-переменных + for var in vars_list: + pt_type = var.get('pt_type', '') + if 'struct' in pt_type or 'union' in pt_type: + var['show_var'] = 'false' + var['enable'] = 'false' + + filtered_vars = [v for v in vars_list if v.get('show_var', 'false') == 'true'] self.setRowCount(len(filtered_vars)) self.verticalHeader().setVisible(False) style_with_padding = "padding-left: 5px; padding-right: 5px; font-size: 14pt;" # регулируй отступы по горизонтали + + for row, var in enumerate(filtered_vars): # № no_item = QTableWidgetItem(str(row)) @@ -190,8 +201,8 @@ class VariableTableWidget(QTableWidget): 'enable': cb.isChecked(), 'name': name, 'pt_type': f'pt_{pt}', - 'iq_type': iq, - 'return_type': ret, + 'iq_type': f't_{iq}', + 'return_type': f't_{ret}', 'shortname': shortname, 'type': origin_type, }) diff --git a/Src/__pycache__/VariableSelector.cpython-37.pyc b/Src/__pycache__/VariableSelector.cpython-37.pyc index a11b893..03b74be 100644 Binary files a/Src/__pycache__/VariableSelector.cpython-37.pyc and b/Src/__pycache__/VariableSelector.cpython-37.pyc differ diff --git a/Src/__pycache__/VariableTable.cpython-37.pyc b/Src/__pycache__/VariableTable.cpython-37.pyc index 1f2f524..f47fabd 100644 Binary files a/Src/__pycache__/VariableTable.cpython-37.pyc and b/Src/__pycache__/VariableTable.cpython-37.pyc differ diff --git a/Src/__pycache__/generateVars.cpython-37.pyc b/Src/__pycache__/generateVars.cpython-37.pyc index dd7c1e5..b1a215b 100644 Binary files a/Src/__pycache__/generateVars.cpython-37.pyc and b/Src/__pycache__/generateVars.cpython-37.pyc differ diff --git a/Src/__pycache__/scanVars.cpython-37.pyc b/Src/__pycache__/scanVars.cpython-37.pyc index 29330bd..708d8b5 100644 Binary files a/Src/__pycache__/scanVars.cpython-37.pyc and b/Src/__pycache__/scanVars.cpython-37.pyc differ diff --git a/Src/generateVars.py b/Src/generateVars.py index 2c18956..b1dccdc 100644 --- a/Src/generateVars.py +++ b/Src/generateVars.py @@ -331,17 +331,25 @@ def generate_vars_file(proj_path, xml_path, output_dir): if not pt_type: pt_type = map_type_to_pt(vtype, vname) + + ret_type = info.get('pt_type') + if not ret_type: + pt_type = 't_iq_none' + # Дополнительные поля, например комментарий comment = info.get("comment", "") short_name = info.get("shortname", f'"{vname}"') short_trimmed = short_name[:10] # ограничиваем длину до 10 - short_str = f'"{short_trimmed}"' # оборачиваем в кавычки if pt_type not in ('pt_struct', 'pt_union'): - formated_name = f'"{vname}"' + f_name = f'{vname},' + f_type = f'{pt_type},' + f_iq = f'{iq_type},' + f_ret_iq = f'{ret_type},' + f_short_name = f'"{short_trimmed}"' # оборачиваем в кавычки # Добавим комментарий после записи, если он есть comment_str = f' // {comment}' if comment else '' - line = f'{{(char *)&{vname:<41} , {pt_type:<21} , {iq_type:<21} , {short_str:<20}}}, \\{comment_str}' + line = f'{{(char *)&{f_name:<45} {f_type:<15} {f_iq:<15} {f_ret_iq:<15} {f_short_name:<21}}}, \\{comment_str}' new_debug_vars[vname] = line else: diff --git a/Src/scanVars.py b/Src/scanVars.py index 3178b28..b190e7e 100644 --- a/Src/scanVars.py +++ b/Src/scanVars.py @@ -216,7 +216,7 @@ def analyze_variables_across_files(c_files, h_files, include_dirs): return vars_in_file optional_printf(PRINT_STATUS, "Parsing header files (.h)...") - optional_printf(PRINT_STATUS, 'Progress: "Parsing variables from headers"') + optional_printf(PRINT_STATUS, 'Progress: "Parsing variables from headers..."') total_h = len(h_files) for i, h in enumerate(h_files, 1): vars_in_h = parse_file(h) @@ -232,7 +232,7 @@ def analyze_variables_across_files(c_files, h_files, include_dirs): optional_printf(PRINT_STATUS, f"Progress: {i}/{total_h}") optional_printf(PRINT_STATUS, "Parsing source files (.c)...") - optional_printf(PRINT_STATUS, 'Progress: "Parsing variables from sources files"') + optional_printf(PRINT_STATUS, 'Progress: "Parsing variables from sources files..."') total_c = len(c_files) for i, c in enumerate(c_files, 1): vars_in_c = parse_file(c) @@ -255,7 +255,7 @@ def analyze_variables_across_files(c_files, h_files, include_dirs): optional_printf(PRINT_STATUS, f"Progress: {i}/{total_c}") optional_printf(PRINT_STATUS, "Checking which variables need explicit extern declaration...") - optional_printf(PRINT_STATUS, 'Progress: "Checking extern declarations"') + optional_printf(PRINT_STATUS, 'Progress: "Checking extern declarations..."') total_vars = len(unique_vars) for i, (name, info) in enumerate(unique_vars.items(), 1): if not info["extern"] and not info["static"] and info["file"].endswith('.c'): @@ -377,7 +377,7 @@ def analyze_typedefs_and_struct(typedefs, structs): substituted_structs[resolved_sname] = substituted_fields """ # Раскрываем typedef'ы - optional_printf(PRINT_STATUS, 'Progress: "Resolving typedefs"') + optional_printf(PRINT_STATUS, 'Progress: "Resolving typedefs..."') total_typedefs = len(typedefs) resolved_typedefs = {} for i, tname in enumerate(typedefs, 1): @@ -387,7 +387,7 @@ def analyze_typedefs_and_struct(typedefs, structs): optional_printf(PRINT_STATUS, f"Progress: {i}/{total_typedefs}") # Теперь раскрываем вложенные структуры - optional_printf(PRINT_STATUS, 'Progress: "Resolving structs"') + optional_printf(PRINT_STATUS, 'Progress: "Resolving structs..."') total_structs = len(structs) resolved_structs = {} for i, (sname, fields) in enumerate(structs.items(), 1): @@ -507,7 +507,7 @@ def analyze_typedefs_and_structs_across_files(c_files, include_dirs): visit(tu.cursor) return typedefs, structs - optional_printf(PRINT_STATUS, 'Progress: "Resolving structs and typedefs"') + optional_printf(PRINT_STATUS, 'Progress: "Resolving structs and typedefs..."') total_files = len(c_files) for i, c_file in enumerate(c_files, 1): typedefs_in_file, structs_in_file = parse_file(c_file) diff --git a/debug_vars.c b/debug_vars.c index 147d98e..b0b7e08 100644 --- a/debug_vars.c +++ b/debug_vars.c @@ -4,32 +4,32 @@ // #include "RS_Functions_modbus.h" -#include "xp_project.h" +#include "dq_to_alphabeta_cos.h" #include "errors.h" #include "v_pwm24.h" -#include "rotation_speed.h" -#include "log_can.h" #include "vector.h" -#include "adc_tools.h" -#include "f281xpwm.h" -#include "pwm_vector_regul.h" -#include "dq_to_alphabeta_cos.h" +#include "xp_project.h" #include "xp_write_xpwm_time.h" +#include "pwm_vector_regul.h" +#include "log_can.h" +#include "f281xpwm.h" +#include "adc_tools.h" +#include "rotation_speed.h" #include "teta_calc.h" #include "RS_Functions.h" -#include "x_parallel_bus.h" +#include "detect_phase_break2.h" +#include "svgen_dq.h" #include "xp_rotation_sensor.h" #include "Spartan2E_Functions.h" #include "xPeriphSP6_loader.h" -#include "x_serial_bus.h" #include "xp_controller.h" -#include "detect_phase_break2.h" -#include "svgen_dq.h" +#include "x_serial_bus.h" +#include "x_parallel_bus.h" +#include "log_params.h" +#include "log_to_memory.h" +#include "global_time.h" #include "CRC_Functions.h" #include "CAN_Setup.h" -#include "log_params.h" -#include "global_time.h" -#include "log_to_memory.h" #include "pid_reg3.h" #include "IQmathLib.h" #include "doors_control.h" @@ -314,8 +314,9 @@ extern int zero_ADC[20]; // -int DebugVar_Qnt = 1; +int DebugVar_Qnt = 2; #pragma DATA_SECTION(dbg_vars,".dbgvar_info") DebugVar_t dbg_vars[] = {\ -{(char *)&ADC0finishAddr , pt_uint8 , iq12 , Addr }, \ +{(char *)&ADC0finishAddr, pt_uint8, iq7, pt_uint8, "asdasjjjjj" }, \ +{(char *)&ADC1finishAddr, pt_int16, iq_none, pt_int16, "ADC1finish" }, \ }; diff --git a/vars.xml b/vars.xml index fcc1100..5fbf42f 100644 --- a/vars.xml +++ b/vars.xml @@ -6,8 +6,8 @@ true asdasjjjjj pt_uint8 - iq12 - iq_none + t_iq7 + t_iq_none int Src/myXilinx/x_example_all.c false @@ -17,105 +17,105 @@ true true asdasd - pt_int16 - iq_none - iq_none + pt_int32 + t_iq_none + t_iq_none int Src/myXilinx/x_example_all.c false false - false + true true - ADC1finishAddr + ADC1finish pt_int16 - iq_none - iq_none + t_iq_none + t_iq_none int Src/myXilinx/x_example_all.c false false - false + true true ADC1startAddr pt_int16 - iq_none - iq_none + t_iq_none + t_iq_none int Src/myXilinx/x_example_all.c false false - false + true true ADC2finishAddr pt_int16 - iq_none - iq_none + t_iq_none + t_iq_none int Src/myXilinx/x_example_all.c false false - false + true true ADC2startAddr pt_int16 - iq_none - iq_none + t_iq_none + t_iq_none int Src/myXilinx/x_example_all.c false false - false - false + true + true ADC_f pt_arr_int16 t_iq_none - int + t_iq_none int[2][16] Src/main/adc_tools.c false false - false - false + true + true ADC_sf pt_arr_int16 t_iq_none - int + t_iq_none int[2][16] Src/main/adc_tools.c false false - false - false + true + true ADDR_FOR_ALL pt_int16 t_iq_none - int + t_iq_none int Src/myXilinx/RS_Functions.c false false - false - false + true + true BUSY pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/CAN_Setup.c false @@ -134,156 +134,156 @@ false - false - false + true + true CAN_answer_wait pt_arr_int16 t_iq_none - int + t_iq_none int[32] Src/myLibs/CAN_Setup.c false false - false - false + true + true CAN_count_cycle_input_units pt_arr_int16 t_iq_none - int + t_iq_none int[8] Src/myLibs/CAN_Setup.c false false - false - false + true + true CAN_no_answer pt_arr_int16 t_iq_none - int + t_iq_none int[32] Src/myLibs/CAN_Setup.c false false - false - false + true + true CAN_refresh_cicle pt_arr_int16 t_iq_none - int + t_iq_none int[32] Src/myLibs/CAN_Setup.c false false - false - false + true + true CAN_request_sent pt_arr_int16 t_iq_none - int + t_iq_none int[32] Src/myLibs/CAN_Setup.c false false - false - false + true + true CAN_timeout pt_arr_int16 t_iq_none - int + t_iq_none int[32] Src/myLibs/CAN_Setup.c false false - false - false + true + true CAN_timeout_cicle pt_arr_int16 t_iq_none - int + t_iq_none int[32] Src/myLibs/CAN_Setup.c false false - false - false + true + true CNTRL_ADDR pt_int16 t_iq_none - int + t_iq_none int Src/myXilinx/RS_Functions.c false false - false - false + true + true CNTRL_ADDR_UNIVERSAL pt_int16 t_iq_none - int + t_iq_none const int Src/myXilinx/RS_Functions.c false false - false - false + true + true CONST_15 pt_int32 t_iq - int + t_iq_none _iq Src/myLibs/mathlib.c false false - false - false + true + true CONST_23 pt_int32 t_iq - int + t_iq_none _iq Src/myLibs/mathlib.c false false - false - false + true + true CanOpenUnites pt_arr_int16 t_iq_none - int + t_iq_none int[30] Src/myLibs/CAN_Setup.c false false - false - false + true + true CanTimeOutErrorTR pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/CAN_Setup.c false @@ -302,456 +302,456 @@ false - false - false + true + true Dpwm pt_int16 t_iq_none - int + t_iq_none int Src/main/PWMTMSHandle.c false false - false - false + true + true Dpwm2 pt_int16 t_iq_none - int + t_iq_none int Src/main/PWMTMSHandle.c false false - false - false + true + true Dpwm4 pt_int16 t_iq_none - int + t_iq_none int Src/main/PWMTMSHandle.c false false - false - false + true + true EvaTimer1InterruptCount pt_int16 t_iq_none - int + t_iq_none int Src/main/281xEvTimersInit.c false false - false - false + true + true EvaTimer2InterruptCount pt_int16 t_iq_none - int + t_iq_none int Src/main/281xEvTimersInit.c false false - false - false + true + true EvbTimer3InterruptCount pt_int16 t_iq_none - int + t_iq_none int Src/main/281xEvTimersInit.c false false - false - false + true + true EvbTimer4InterruptCount pt_int16 t_iq_none - int + t_iq_none int Src/main/281xEvTimersInit.c false false - false - false + true + true Fpwm pt_int16 t_iq_none - int + t_iq_none int Src/main/PWMTMSHandle.c false false - false - false + true + true Gott pt_arr_int8 t_iq_none - int + t_iq_none char[8][16] Src/myLibs/bender.c false True - false - false + true + true IN0finishAddr pt_int16 t_iq_none - int + t_iq_none int Src/myXilinx/x_example_all.c false false - false - false + true + true IN0startAddr pt_int16 t_iq_none - int + t_iq_none int Src/myXilinx/x_example_all.c false false - false - false + true + true IN1finishAddr pt_int16 t_iq_none - int + t_iq_none int Src/myXilinx/x_example_all.c false false - false - false + true + true IN1startAddr pt_int16 t_iq_none - int + t_iq_none int Src/myXilinx/x_example_all.c false false - false - false + true + true IN2finishAddr pt_int16 t_iq_none - int + t_iq_none int Src/myXilinx/x_example_all.c false false - false - false + true + true IN2startAddr pt_int16 t_iq_none - int + t_iq_none int Src/myXilinx/x_example_all.c false false - false - false + true + true IQ_OUT_NOM pt_float t_iq_none - int + t_iq_none float Src/main/params_i_out.c false false - false - false + true + true I_OUT_1_6_NOMINAL_IQ pt_int32 t_iq_none - int + t_iq_none long Src/main/params_i_out.c false false - false - false + true + true I_OUT_1_8_NOMINAL_IQ pt_int32 t_iq_none - int + t_iq_none long Src/main/params_i_out.c false false - false - false + true + true I_OUT_NOMINAL pt_float t_iq_none - int + t_iq_none float Src/main/params_i_out.c false false - false - false + true + true I_OUT_NOMINAL_IQ pt_int32 t_iq_none - int + t_iq_none long Src/main/params_i_out.c false false - false - false + true + true I_ZPT_NOMINAL_IQ pt_int32 t_iq_none - int + t_iq_none long Src/main/params_i_out.c false false - false - false + true + true Id_out_max_full pt_int32 t_iq - int + t_iq_none _iq Src/VectorControl/regul_power.c false false - false - false + true + true Id_out_max_low_speed pt_int32 t_iq - int + t_iq_none _iq Src/VectorControl/regul_power.c false false - false - false + true + true Iq_out_max pt_int32 t_iq - int + t_iq_none _iq Src/main/params_i_out.c false false - false - false + true + true Iq_out_nom pt_int32 t_iq - int + t_iq_none _iq Src/main/params_i_out.c false false - false - false + true + true K_LEM_ADC pt_arr_uint32 t_iq_none - int + t_iq_none const unsigned long[20] Src/main/adc_tools.c false false - false - false + true + true KmodTerm pt_float t_iq_none - int + t_iq_none float Src/myXilinx/RS_Functions.c false false - false - false + true + true ROTfinishAddr pt_int16 t_iq_none - int + t_iq_none int Src/myXilinx/x_example_all.c false false - false - false + true + true RS_Len pt_arr_uint16 t_iq_none - int + t_iq_none unsigned int[70] Src/myXilinx/RS_Functions.c false false - false - false + true + true R_ADC pt_arr_uint16 t_iq_none - int + t_iq_none const unsigned int[20] Src/main/adc_tools.c false false - false - false + true + true RotPlaneStartAddr pt_int16 t_iq_none - int + t_iq_none int Src/myXilinx/x_example_all.c false false - false - false + true + true SQRT_32 pt_int32 t_iq - int + t_iq_none _iq Src/myLibs/mathlib.c false false - false - false + true + true Unites pt_arr_int16 t_iq_none - int + t_iq_none int[8][128] Src/myLibs/CAN_Setup.c false false - false - false + true + true VAR_FREQ_PWM_XTICS pt_int16 t_iq_none - int + t_iq_none int Src/main/PWMTools.c false false - false - false + true + true VAR_PERIOD_MAX_XTICS pt_int16 t_iq_none - int + t_iq_none int Src/main/PWMTools.c false false - false - false + true + true VAR_PERIOD_MIN_BR_XTICS pt_int16 t_iq_none - int + t_iq_none int Src/main/PWMTools.c false false - false - false + true + true VAR_PERIOD_MIN_XTICS pt_int16 t_iq_none - int + t_iq_none int Src/main/PWMTools.c false false - false - false + true + true Zpwm pt_int16 t_iq_none - int + t_iq_none int Src/main/PWMTMSHandle.c false @@ -782,12 +782,12 @@ false - false - false + true + true adr_read_from_modbus3 pt_uint16 t_iq_none - int + t_iq_none unsigned int Src/myXilinx/RS_Functions_modbus.c false @@ -830,144 +830,144 @@ false - false - false + true + true ar_sa_all pt_arr_int16 t_iq_none - int + t_iq_none int[3][6][4][7] Src/main/v_pwm24.c false false - false - false + true + true ar_tph pt_int32 t_iq - int + t_iq_none _iq[7] Src/main/v_pwm24.c false false - false - false + true + true biTemperatureLimits pt_arr_int16 t_iq_none - int + t_iq_none int[12] Src/main/init_protect_levels.c false True - false - false + true + true biTemperatureWarnings pt_arr_int16 t_iq_none - int + t_iq_none int[12] Src/main/init_protect_levels.c false True - false - false + true + true block_size_counter_fast pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/log_to_memory.c false false - false - false + true + true block_size_counter_slow pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/log_to_memory.c false false - false - false + true + true break_result_1 pt_int32 t_iq - int + t_iq_none _iq Src/main/break_regul.c false false - false - false + true + true break_result_2 pt_int32 t_iq - int + t_iq_none _iq Src/main/break_regul.c false false - false - false + true + true break_result_3 pt_int32 t_iq - int + t_iq_none _iq Src/main/break_regul.c false false - false - false + true + true break_result_4 pt_int32 t_iq - int + t_iq_none _iq Src/main/break_regul.c false false - false - false + true + true bvTemperatureLimits pt_arr_int16 t_iq_none - int + t_iq_none int[12] Src/main/init_protect_levels.c false True - false - false + true + true bvTemperatureWarnings pt_arr_int16 t_iq_none - int + t_iq_none int[12] Src/main/init_protect_levels.c false @@ -986,36 +986,36 @@ false - false - false + true + true c_s pt_int32 t_iq_none - int + t_iq_none long Src/main/rotation_speed.c false false - false - false + true + true calibration1 pt_int16 t_iq_none - int + t_iq_none int Src/main/isolation.c false false - false - false + true + true calibration2 pt_int16 t_iq_none - int + t_iq_none int Src/main/isolation.c false @@ -1046,60 +1046,60 @@ false - false - false + true + true capnum0 pt_uint16 t_iq_none - int + t_iq_none unsigned int Src/main/sync_tools.c false false - false - false + true + true capnum1 pt_uint16 t_iq_none - int + t_iq_none unsigned int Src/main/sync_tools.c false false - false - false + true + true capnum2 pt_uint16 t_iq_none - int + t_iq_none unsigned int Src/main/sync_tools.c false false - false - false + true + true capnum3 pt_uint16 t_iq_none - int + t_iq_none unsigned int Src/main/sync_tools.c false false - false - false + true + true chNum pt_uint16 t_iq_none - int + t_iq_none unsigned int Src/myXilinx/x_example_all.c false @@ -1130,84 +1130,84 @@ false - false - false + true + true cmd_3_or_16 pt_int16 t_iq_none - int + t_iq_none int Src/myXilinx/RS_Functions_modbus.c false false - false - false + true + true cmd_crc pt_arr_int8 t_iq_none - int + t_iq_none char[4] Src/myLibs/bender.c false True - false - false + true + true cmd_finish1 pt_int8 t_iq_none - int + t_iq_none char Src/myLibs/bender.c false True - false - false + true + true cmd_finish2 pt_int8 t_iq_none - int + t_iq_none char Src/myLibs/bender.c false True - false - false + true + true cmd_start pt_arr_int8 t_iq_none - int + t_iq_none char[5] Src/myLibs/bender.c false True - false - false + true + true cmd_txt pt_arr_int8 t_iq_none - int + t_iq_none char[4][8] Src/myLibs/bender.c false True - false - false + true + true compress_size pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/alarm_log_can.c false @@ -1238,108 +1238,108 @@ false - false - false + true + true count_error_sync pt_uint16 t_iq_none - int + t_iq_none unsigned int Src/main/sync_tools.c false false - false - false + true + true count_modbus_table_changed pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/modbus_fill_table.c false false - false - false + true + true count_run_pch pt_int16 t_iq_none - int + t_iq_none int Src/main/PWMTools.c false false - false - false + true + true counterSBWriteErrors pt_uint16 t_iq_none - int + t_iq_none unsigned int Src/myXilinx/x_serial_bus.c false True - false - false + true + true crc_16_tab pt_arr_uint16 t_iq_none - int + t_iq_none WORD[256] Src/myXilinx/CRC_Functions.c false false - false - false + true + true crypt pt_arr_int8 t_iq_none - int + t_iq_none char[34] Src/myLibs/bender.c false false - false - false + true + true cur_position_buf_modbus16 pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/message_modbus.c false True - false - false + true + true cur_position_buf_modbus16_can pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/message_modbus.c false false - false - false + true + true cur_position_buf_modbus3 pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/message_modbus.c false @@ -1358,72 +1358,72 @@ false - false - false + true + true data_to_umu1_7f pt_int16 t_iq_none - int + t_iq_none int Src/main/init_protect_levels.c false True - false - false + true + true data_to_umu1_8 pt_int16 t_iq_none - int + t_iq_none int Src/main/init_protect_levels.c false True - false - false + true + true data_to_umu2_7f pt_int16 t_iq_none - int + t_iq_none int Src/main/init_protect_levels.c false True - false - false + true + true data_to_umu2_8 pt_int16 t_iq_none - int + t_iq_none int Src/main/init_protect_levels.c false True - false - false + true + true delta_capnum pt_int16 t_iq_none - int + t_iq_none int Src/main/sync_tools.c false false - false - false + true + true delta_error pt_int16 t_iq_none - int + t_iq_none int Src/main/sync_tools.c false @@ -1454,84 +1454,84 @@ True - false - false + true + true enable_can pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/message_modbus.c false false - false - false + true + true enable_can_recive_after_units_box pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/CAN_Setup.c false false - false - false + true + true err_level_adc pt_int32 t_iq - int + t_iq_none _iq Src/main/adc_tools.c false false - false - false + true + true err_level_adc_on_go pt_int32 t_iq - int + t_iq_none _iq Src/main/adc_tools.c false false - false - false + true + true err_main pt_uint16 t_iq_none - int + t_iq_none unsigned int Src/main/Main.c false false - false - false + true + true err_modbus16 pt_int16 t_iq_none - int + t_iq_none int Src/myXilinx/RS_Functions_modbus.c false false - false - false + true + true err_modbus3 pt_int16 t_iq_none - int + t_iq_none int Src/myXilinx/RS_Functions_modbus.c false @@ -1562,12 +1562,12 @@ false - false - false + true + true fail pt_int16 t_iq_none - int + t_iq_none volatile int Src/myXilinx/xPeriphSP6_loader.c false @@ -1610,132 +1610,132 @@ false - false - false + true + true flag_buf pt_int16 t_iq_none - int + t_iq_none int Src/main/rotation_speed.c false false - false - false + true + true flag_enable_can_from_mpu pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/CAN_Setup.c false false - false - false + true + true flag_enable_can_from_terminal pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/CAN_Setup.c false false - false - false + true + true flag_on_off_pch pt_int16 t_iq_none - int + t_iq_none int Src/main/PWMTools.c false false - false - false + true + true flag_received_first_mess_from_MPU pt_uint16 t_iq_none - int + t_iq_none unsigned int Src/myXilinx/RS_Functions_modbus.c false false - false - false + true + true flag_reverse pt_uint16 t_iq_none - int + t_iq_none unsigned int Src/myLibs/modbus_read_table.c false false - false - false + true + true flag_send_answer_rs pt_uint16 t_iq_none - int + t_iq_none unsigned int Src/myXilinx/RS_Functions_modbus.c false false - false - false + true + true flag_test_tabe_filled pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/modbus_fill_table.c false false - false - false + true + true flag_we_int_pwm_on pt_int16 t_iq_none - int + t_iq_none int Src/main/PWMTools.c false false - false - false + true + true freq1 pt_int32 t_iq - int + t_iq_none _iq Src/main/PWMTools.c false false - false - false + true + true freqTerm pt_float t_iq_none - int + t_iq_none float Src/myXilinx/RS_Functions.c false @@ -1754,24 +1754,24 @@ false - false - false + true + true hb_logs_data pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/log_to_memory.c false false - false - false + true + true i pt_int16 t_iq_none - int + t_iq_none int Src/main/PWMTools.c false @@ -1802,60 +1802,60 @@ false - false - false + true + true init_log pt_arr_int16 t_iq_none - int + t_iq_none int[3] Src/myLibs/log_can.c false false - false - false + true + true iq19_k_norm_ADC pt_int32 t_iq19 - int + t_iq_none _iq19[20] Src/main/adc_tools.c false false - false - false + true + true iq19_zero_ADC pt_int32 t_iq19 - int + t_iq_none _iq19[20] Src/main/adc_tools.c false false - false - false + true + true iq_alfa_coef pt_int32 t_iq - int + t_iq_none _iq Src/main/v_pwm24.c false false - false - false + true + true iq_k_norm_ADC pt_int32 t_iq - int + t_iq_none _iq[20] Src/main/adc_tools.c false @@ -1874,24 +1874,24 @@ false - false - false + true + true iq_max pt_int32 t_iq - int + t_iq_none _iq Src/myLibs/svgen_dq_v2.c false false - false - false + true + true iq_norm_ADC pt_int32 t_iq - int + t_iq_none _iq[20] Src/main/adc_tools.c false @@ -1922,384 +1922,384 @@ false - false - false + true + true k1 pt_int32 t_iq - int + t_iq_none _iq Src/main/PWMTools.c false false - false - false + true + true kI_D pt_float t_iq_none - int + t_iq_none float Src/VectorControl/pwm_vector_regul.c false false - false - false + true + true kI_D_Inv31 pt_float t_iq_none - int + t_iq_none float Src/VectorControl/pwm_vector_regul.c false false - false - false + true + true kI_Q pt_float t_iq_none - int + t_iq_none float Src/VectorControl/pwm_vector_regul.c false false - false - false + true + true kI_Q_Inv31 pt_float t_iq_none - int + t_iq_none float Src/VectorControl/pwm_vector_regul.c false false - false - false + true + true kP_D pt_float t_iq_none - int + t_iq_none float Src/VectorControl/pwm_vector_regul.c false false - false - false + true + true kP_D_Inv31 pt_float t_iq_none - int + t_iq_none float Src/VectorControl/pwm_vector_regul.c false false - false - false + true + true kP_Q pt_float t_iq_none - int + t_iq_none float Src/VectorControl/pwm_vector_regul.c false false - false - false + true + true kP_Q_Inv31 pt_float t_iq_none - int + t_iq_none float Src/VectorControl/pwm_vector_regul.c false false - false - false + true + true kan pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/bender.c false True - false - false + true + true koef_Base_stop_run pt_int32 t_iq - int + t_iq_none _iq Src/main/break_regul.c false false - false - false + true + true koef_Iabc_filter pt_int32 t_iq - int + t_iq_none _iq Src/main/adc_tools.c false false - false - false + true + true koef_Im_filter pt_int32 t_iq - int + t_iq_none _iq Src/main/adc_tools.c false false - false - false + true + true koef_Im_filter_long pt_int32 t_iq - int + t_iq_none _iq Src/main/adc_tools.c false false - false - false + true + true koef_K_stop_run pt_int32 t_iq - int + t_iq_none _iq Src/main/break_regul.c false false - false - false + true + true koef_Krecup pt_int32 t_iq - int + t_iq_none _iq Src/main/break_regul.c false false - false - false + true + true koef_Min_recup pt_int32 t_iq - int + t_iq_none _iq Src/main/break_regul.c false false - false - false + true + true koef_TemperBSU_long_filter pt_int32 t_iq - int + t_iq_none _iq Src/main/adc_tools.c false false - false - false + true + true koef_Ud_fast_filter pt_int32 t_iq - int + t_iq_none _iq Src/main/adc_tools.c false false - false - false + true + true koef_Ud_long_filter pt_int32 t_iq - int + t_iq_none _iq Src/main/adc_tools.c false false - false - false + true + true koef_Wlong pt_int32 t_iq - int + t_iq_none _iq Src/main/adc_tools.c false false - false - false + true + true koef_Wout_filter pt_int32 t_iq - int + t_iq_none _iq Src/main/rotation_speed.c false false - false - false + true + true koef_Wout_filter_long pt_int32 t_iq - int + t_iq_none _iq Src/main/rotation_speed.c false false - false - false + true + true koeff_Fs_filter pt_int32 t_iq_none - int + t_iq_none long Src/VectorControl/pwm_vector_regul.c false false - false - false + true + true koeff_Idq_filter pt_int32 t_iq_none - int + t_iq_none long Src/VectorControl/pwm_vector_regul.c false false - false - false + true + true koeff_Iq_filter pt_int32 t_iq - int + t_iq_none _iq Src/VectorControl/regul_power.c false false - false - false + true + true koeff_Iq_filter_slow pt_int32 t_iq_none - int + t_iq_none long Src/VectorControl/pwm_vector_regul.c false false - false - false + true + true koeff_Ud_filter pt_int32 t_iq_none - int + t_iq_none long Src/VectorControl/pwm_vector_regul.c false false - false - false + true + true koeff_Uq_filter pt_int32 t_iq_none - int + t_iq_none long Src/VectorControl/pwm_vector_regul.c false false - false - false + true + true kom pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/bender.c false True - false - false + true + true length pt_uint32 t_iq_none - int + t_iq_none volatile unsigned long Src/myXilinx/xPeriphSP6_loader.c false false - false - false + true + true level_on_off_break pt_int32 t_iq - int + t_iq_none _iq[13][2] Src/main/break_tools.c false @@ -2342,12 +2342,12 @@ false - false - false + true + true logbuf_sync1 pt_arr_int32 t_iq_none - int + t_iq_none long[10] Src/main/sync_tools.c false @@ -2366,36 +2366,36 @@ false - false - false + true + true mPWM_a pt_int16 t_iq_none - int + t_iq_none int Src/main/PWMTMSHandle.c false True - false - false + true + true mPWM_b pt_int16 t_iq_none - int + t_iq_none int Src/main/PWMTMSHandle.c false True - false - false + true + true m_PWM pt_int16 t_iq_none - int + t_iq_none int Src/main/PWMTMSHandle.c false @@ -2414,12 +2414,12 @@ false - false - false + true + true manufactorerAndProductID pt_int16 t_iq_none - int + t_iq_none int Src/myXilinx/xPeriphSP6_loader.c false @@ -2522,96 +2522,96 @@ false - false - false + true + true mzz_limit_100 pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/modbus_read_table.c false True - false - false + true + true mzz_limit_1000 pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/modbus_read_table.c false True - false - false + true + true mzz_limit_1100 pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/modbus_read_table.c false True - false - false + true + true mzz_limit_1200 pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/modbus_read_table.c false True - false - false + true + true mzz_limit_1400 pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/modbus_read_table.c false True - false - false + true + true mzz_limit_1500 pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/modbus_read_table.c false True - false - false + true + true mzz_limit_2000 pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/modbus_read_table.c false True - false - false + true + true mzz_limit_500 pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/modbus_read_table.c false @@ -2630,36 +2630,36 @@ false - false - false + true + true no_write pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/log_to_memory.c false false - false - false + true + true no_write_slow pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/log_to_memory.c false false - false - false + true + true number_modbus_table_changed pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/modbus_fill_table.c false @@ -2702,12 +2702,12 @@ false - false - false + true + true pidCur_Ki pt_int32 t_iq - int + t_iq_none _iq Src/main/v_pwm24.c false @@ -2750,24 +2750,24 @@ false - false - false + true + true pidFvectKi_test pt_int16 t_iq_none - int + t_iq_none int Src/main/message2.c false false - false - false + true + true pidFvectKp_test pt_int16 t_iq_none - int + t_iq_none int Src/main/message2.c false @@ -2846,24 +2846,24 @@ false - false - false + true + true prev_flag_buf pt_int16 t_iq_none - int + t_iq_none int Src/main/rotation_speed.c false false - false - false + true + true prev_status_received pt_uint16 t_iq_none - int + t_iq_none unsigned int Src/myLibs/log_can.c false @@ -2954,12 +2954,12 @@ false - false - false + true + true return_var pt_int32 t_iq_none - int + t_iq_none long Src/main/Main.c false @@ -3038,84 +3038,84 @@ false - false - false + true + true sincronisationFault pt_uint16 t_iq_none - int + t_iq_none unsigned int Src/myLibs/modbus_read_table.c false false - false - false + true + true size_cmd15 pt_int8 t_iq_none - int + t_iq_none char Src/myXilinx/RS_Functions.c false false - false - false + true + true size_cmd16 pt_int8 t_iq_none - int + t_iq_none char Src/myXilinx/RS_Functions.c false false - false - false + true + true size_fast_done pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/log_to_memory.c false false - false - false + true + true size_slow_done pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/log_to_memory.c false false - false - false + true + true stop_log pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/log_to_memory.c false false - false - false + true + true stop_log_slow pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/log_to_memory.c false @@ -3170,24 +3170,24 @@ false - false - false + true + true temp pt_uint16 t_iq_none - int + t_iq_none unsigned int Src/main/sync_tools.c false false - false - false + true + true temperature_limit_koeff pt_int32 t_iq - int + t_iq_none _iq Src/main/errors_temperature.c false @@ -3266,132 +3266,132 @@ false - false - false + true + true timCNT_alg pt_int16 t_iq_none - int + t_iq_none int Src/myXilinx/Spartan2E_Functions.c false false - false - false + true + true timCNT_prev pt_int16 t_iq_none - int + t_iq_none int Src/myXilinx/Spartan2E_Functions.c false false - false - false + true + true time pt_uint16 t_iq_none - int + t_iq_none unsigned int Src/myXilinx/Spartan2E_Functions.c false false - false - false + true + true timePauseBENDER_Messages pt_uint16 t_iq_none - int + t_iq_none unsigned int Src/main/main22220.c false True - false - false + true + true timePauseCAN_Messages pt_uint16 t_iq_none - int + t_iq_none unsigned int Src/main/main22220.c false True - false - false + true + true time_alg pt_float t_iq_none - int + t_iq_none float Src/myXilinx/Spartan2E_Functions.c false false - false - false + true + true time_pause_enable_can_from_mpu pt_int32 t_iq_none - int + t_iq_none long Src/myLibs/CAN_Setup.c false false - false - false + true + true time_pause_enable_can_from_terminal pt_int32 t_iq_none - int + t_iq_none long Src/myLibs/CAN_Setup.c false false - false - false + true + true time_pause_logs pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/log_can.c false false - false - false + true + true time_pause_titles pt_int16 t_iq_none - int + t_iq_none int Src/myLibs/log_can.c false false - false - false + true + true tryNumb pt_int16 t_iq_none - int + t_iq_none volatile int Src/myXilinx/xPeriphSP6_loader.c false @@ -3410,12 +3410,12 @@ false - false - false + true + true var_numb pt_int32 t_iq_none - int + t_iq_none long Src/main/Main.c false @@ -3446,12 +3446,12 @@ false - false - false + true + true winding_displacement pt_int32 t_iq - int + t_iq_none _iq Src/main/v_pwm24.c false @@ -3518,24 +3518,24 @@ false - false - false + true + true xeeprom_controll_fast pt_uint16 t_iq_none - int + t_iq_none unsigned int Src/myXilinx/Spartan2E_Functions.c false false - false - false + true + true xeeprom_controll_store pt_uint16 t_iq_none - int + t_iq_none unsigned int Src/myXilinx/Spartan2E_Functions.c false @@ -3554,58 +3554,70 @@ false - false - false + true + true zadan_Id_min pt_int32 t_iq - int + t_iq_none _iq Src/VectorControl/pwm_vector_regul.c false false - false - false + true + true zero_ADC pt_arr_int16 t_iq_none - int + t_iq_none int[20] Src/main/adc_tools.c false false + + true + true + project.a + pt_uint16 + t_iq_none + t_iq_none + UInt16 + Src/myXilinx/xp_project.c + false + false + Src/myXilinx/RS_Functions_modbus.h - Src/myXilinx/xp_project.h + Src/VectorControl/dq_to_alphabeta_cos.h Src/main/errors.h Src/main/v_pwm24.h - Src/main/rotation_speed.h - Src/myLibs/log_can.h Src/main/vector.h - Src/main/adc_tools.h - Src/main/f281xpwm.h - Src/VectorControl/pwm_vector_regul.h - Src/VectorControl/dq_to_alphabeta_cos.h + Src/myXilinx/xp_project.h Src/myXilinx/xp_write_xpwm_time.h + Src/VectorControl/pwm_vector_regul.h + Src/myLibs/log_can.h + Src/main/f281xpwm.h + Src/main/adc_tools.h + Src/main/rotation_speed.h Src/VectorControl/teta_calc.h Src/myXilinx/RS_Functions.h - Src/myXilinx/x_parallel_bus.h + Src/myLibs/detect_phase_break2.h + Src/myLibs/svgen_dq.h Src/myXilinx/xp_rotation_sensor.h Src/myXilinx/Spartan2E_Functions.h Src/myXilinx/xPeriphSP6_loader.h - Src/myXilinx/x_serial_bus.h Src/myXilinx/xp_controller.h - Src/myLibs/detect_phase_break2.h - Src/myLibs/svgen_dq.h + Src/myXilinx/x_serial_bus.h + Src/myXilinx/x_parallel_bus.h + Src/myLibs/log_params.h + Src/myLibs/log_to_memory.h + Src/main/global_time.h Src/myXilinx/CRC_Functions.h Src/myLibs/CAN_Setup.h - Src/myLibs/log_params.h - Src/main/global_time.h - Src/myLibs/log_to_memory.h Src/myLibs/pid_reg3.h Src/myLibs/IQmathLib.h Src/main/doors_control.h