removed unused timeout
This commit is contained in:
Tristan Krause
parent
8d00bb0600
commit
63d81c6e7e
control/src
|
|
@ -12,221 +12,9 @@
|
|||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="d13a1bae-0fd7-48fc-b53c-d6dd1aaf95b9" name="Default Changelist" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/.idea/src.iml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeCache.txt" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.14.3/CMakeCCompiler.cmake" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.14.3/CMakeCXXCompiler.cmake" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.14.3/CMakeSystem.cmake" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.14.3/CompilerIdC/CMakeCCompilerId.c" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/3.14.3/CompilerIdCXX/CMakeCXXCompilerId.cpp" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/CMakeDirectoryInformation.cmake" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/CMakeOutput.log" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Makefile.cmake" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Makefile2" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/TargetDirectories.txt" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/clion-environment.txt" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/clion-log.txt" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/cmake.check_cache" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/feature_tests.c" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/feature_tests.cxx" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/progress.marks" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/src.dir/DependInfo.cmake" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/src.dir/build.make" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/src.dir/cmake_clean.cmake" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/src.dir/depend.make" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/src.dir/flags.make" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/src.dir/link.txt" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/src.dir/progress.make" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cmake-build-debug/Makefile" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cmake-build-debug/cmake_install.cmake" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/cmake-build-debug/src.cbp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../bin/b15fcli" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/drv/b15f.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/drv/b15f.cpp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/drv/usart.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/drv/usart.cpp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/drv/usart.h" beforeDir="false" afterPath="$PROJECT_DIR$/drv/usart.h" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/annotated.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/b15f_8cpp_source.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/b15f_8h_source.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/bc_s.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/bdwn.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classB15F-members.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classB15F.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classDot-members.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classDot.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classDriverException-members.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classDriverException.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classDriverException.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classPlottyFile-members.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classPlottyFile.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classTimeoutException-members.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classTimeoutException.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classTimeoutException.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classUSART-members.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classUSART.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classUSARTException-members.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classUSARTException.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classUSARTException.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classView-members.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classView.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classView.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classViewInfo-members.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classViewInfo.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classViewInfo.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classViewMonitor-members.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classViewMonitor.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classViewMonitor.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classViewPromt-members.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classViewPromt.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classViewPromt.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classViewSelection-members.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classViewSelection.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classViewSelection.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/classes.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/cli_8cpp_source.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/closed.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/dir_1788f8309b1a812dcb800a185471cf6c.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/dir_587c94d866dbb2f408f78cf41f9b2f8d.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/doc.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/dot_8cpp_source.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/dot_8h_source.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/doxygen.css" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/doxygen.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/driverexception_8h_source.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/dynsections.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/files.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/folderclosed.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/folderopen.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/functions.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/functions_func.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/functions_vars.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/hierarchy.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/index.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/jquery.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/menu.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/menudata.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/nav_f.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/nav_g.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/nav_h.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/open.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/plottyfile_8cpp_source.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/plottyfile_8h_source.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_0.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_0.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_1.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_1.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_2.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_2.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_3.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_3.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_4.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_4.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_5.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_5.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_6.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_6.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_7.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_7.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_8.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_8.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_9.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_9.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_a.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_a.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_b.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_b.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_c.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_c.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_d.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_d.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_e.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_e.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_f.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_f.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/classes_0.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/classes_0.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/classes_1.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/classes_1.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/classes_2.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/classes_2.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/classes_3.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/classes_3.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/classes_4.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/classes_4.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/classes_5.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/classes_5.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/close.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/functions_0.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/functions_0.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/functions_1.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/functions_1.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/functions_2.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/functions_2.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/functions_3.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/functions_3.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/functions_4.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/functions_4.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/functions_5.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/functions_5.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/functions_6.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/functions_6.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/functions_7.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/functions_7.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/functions_8.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/functions_8.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/functions_9.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/functions_9.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/functions_a.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/functions_a.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/functions_b.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/functions_b.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/mag_sel.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/nomatches.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/pages_0.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/pages_0.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/search.css" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/search.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/search_l.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/search_m.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/search_r.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/searchdata.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/variables_0.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/variables_0.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/variables_1.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/variables_1.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/variables_2.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/variables_2.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/variables_3.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/variables_3.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/variables_4.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/variables_4.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/splitbar.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/sync_off.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/sync_on.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/tab_a.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/tab_b.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/tab_h.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/tab_s.png" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/tabs.css" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/timeoutexception_8h_source.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/ui_8cpp_source.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/ui_8h_source.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/usart_8cpp_source.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/usart_8h_source.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/usartexception_8h_source.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/view_8cpp_source.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/view_8h_source.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/view__info_8cpp_source.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/view__info_8h_source.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/view__monitor_8cpp_source.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/view__monitor_8h_source.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/view__promt_8cpp_source.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/view__promt_8h_source.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/view__selection_8cpp_source.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/view__selection_8h_source.html" beforeDir="false" />
|
||||
</list>
|
||||
<ignored path="$PROJECT_DIR$/cmake-build-debug/" />
|
||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||
|
|
@ -250,11 +38,11 @@
|
|||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/drv/usart.h">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="233">
|
||||
<caret line="106" column="42" selection-start-line="106" selection-start-column="42" selection-end-line="106" selection-end-column="42" />
|
||||
<state relative-caret-position="206">
|
||||
<caret line="98" column="61" selection-start-line="98" selection-start-column="61" selection-end-line="98" selection-end-column="61" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
|
@ -262,8 +50,17 @@
|
|||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/drv/usart.cpp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="72">
|
||||
<caret line="167" column="28" selection-start-line="167" selection-start-column="21" selection-end-line="167" selection-end-column="28" />
|
||||
<state relative-caret-position="45">
|
||||
<caret line="87" column="65" selection-start-line="87" selection-start-column="65" selection-end-line="87" selection-end-column="65" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/drv/b15f.cpp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-528">
|
||||
<caret line="362" column="52" selection-start-line="362" selection-start-column="52" selection-end-line="362" selection-end-column="52" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
|
@ -289,8 +86,9 @@
|
|||
<component name="IdeDocumentHistory">
|
||||
<option name="CHANGED_PATHS">
|
||||
<list>
|
||||
<option value="$PROJECT_DIR$/drv/usart.cpp" />
|
||||
<option value="$PROJECT_DIR$/drv/usart.h" />
|
||||
<option value="$PROJECT_DIR$/drv/usart.cpp" />
|
||||
<option value="$PROJECT_DIR$/drv/b15f.cpp" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
|
|
@ -361,24 +159,24 @@
|
|||
<option name="number" value="Default" />
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1559118962147</updated>
|
||||
<workItem from="1559118964304" duration="410000" />
|
||||
<workItem from="1559118964304" duration="620000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="410000" />
|
||||
<option name="totallyTimeSpent" value="620000" />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="67" y="25" width="1853" height="1055" extended-state="6" />
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info id="Favorites" side_tool="true" />
|
||||
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24958494" />
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24958494" />
|
||||
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
||||
<window_info anchor="bottom" id="Database Changes" />
|
||||
<window_info anchor="bottom" id="Version Control" />
|
||||
<window_info anchor="bottom" id="Messages" weight="0.32937366" />
|
||||
<window_info anchor="bottom" id="Terminal" weight="0.32937366" />
|
||||
<window_info anchor="bottom" id="Terminal" visible="true" weight="0.32937366" />
|
||||
<window_info anchor="bottom" id="Event Log" side_tool="true" />
|
||||
<window_info anchor="bottom" id="CMake" weight="0.33045357" />
|
||||
<window_info anchor="bottom" id="Message" order="0" />
|
||||
|
|
@ -406,17 +204,27 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/drv/usart.cpp">
|
||||
<entry file="file://$PROJECT_DIR$/drv/usart.h">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="72">
|
||||
<caret line="167" column="28" selection-start-line="167" selection-start-column="21" selection-end-line="167" selection-end-column="28" />
|
||||
<state relative-caret-position="206">
|
||||
<caret line="98" column="61" selection-start-line="98" selection-start-column="61" selection-end-line="98" selection-end-column="61" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/drv/usart.h">
|
||||
<entry file="file://$PROJECT_DIR$/drv/usart.cpp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="233">
|
||||
<caret line="106" column="42" selection-start-line="106" selection-start-column="42" selection-end-line="106" selection-end-column="42" />
|
||||
<state relative-caret-position="45">
|
||||
<caret line="87" column="65" selection-start-line="87" selection-start-column="65" selection-end-line="87" selection-end-column="65" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/drv/b15f.h">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/drv/b15f.cpp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-528">
|
||||
<caret line="362" column="52" selection-start-line="362" selection-start-column="52" selection-end-line="362" selection-end-column="52" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
|
|
|||
|
|
@ -229,7 +229,7 @@ uint16_t B15F::analogRead(uint8_t channel)
|
|||
channel
|
||||
};
|
||||
|
||||
int n_sent = usart.receive(&rq[0], 0, sizeof(rq), 1000);
|
||||
int n_sent = usart.receive(&rq[0], 0, sizeof(rq));
|
||||
if(n_sent != sizeof(rq))
|
||||
abort("Sent failed");
|
||||
|
||||
|
|
@ -302,7 +302,7 @@ uint8_t B15F::pwmSetFrequency(uint32_t freq)
|
|||
static_cast<uint8_t>((freq >> 24) & 0xFF)
|
||||
};
|
||||
|
||||
int n_sent = usart.receive(&rq[0], 0, sizeof(rq), 1000);
|
||||
int n_sent = usart.receive(&rq[0], 0, sizeof(rq));
|
||||
if(n_sent != sizeof(rq))
|
||||
abort("Sent failed");
|
||||
|
||||
|
|
@ -321,7 +321,7 @@ bool B15F::pwmSetValue(uint8_t value)
|
|||
value
|
||||
};
|
||||
|
||||
int n_sent = usart.receive(&rq[0], 0, sizeof(rq), 1000);
|
||||
int n_sent = usart.receive(&rq[0], 0, sizeof(rq));
|
||||
if(n_sent != sizeof(rq))
|
||||
abort("Sent failed");
|
||||
|
||||
|
|
@ -341,7 +341,7 @@ bool B15F::setRegister(uint8_t adr, uint8_t val)
|
|||
val
|
||||
};
|
||||
|
||||
int n_sent = usart.receive(&rq[0], 0, sizeof(rq), 1000);
|
||||
int n_sent = usart.receive(&rq[0], 0, sizeof(rq));
|
||||
if(n_sent != sizeof(rq))
|
||||
abort("Sent failed");
|
||||
|
||||
|
|
@ -360,7 +360,7 @@ uint8_t B15F::getRegister(uint8_t adr)
|
|||
adr
|
||||
};
|
||||
|
||||
int n_sent = usart.receive(&rq[0], 0, sizeof(rq), 1000);
|
||||
int n_sent = usart.receive(&rq[0], 0, sizeof(rq));
|
||||
if(n_sent != sizeof(rq))
|
||||
abort("Sent failed");
|
||||
|
||||
|
|
|
|||
|
|
@ -57,13 +57,6 @@ void USART::flushOutputBuffer()
|
|||
throw USARTException("Fehler beim Versenden des Ausgangspuffers");
|
||||
}
|
||||
|
||||
void USART::printStatistics()
|
||||
{
|
||||
double pz = 1e2 * n_blocks_failed / n_blocks_total;
|
||||
pz = std::round(pz * 1e2) / 1e2;
|
||||
std::cout << "blocks total: " << n_blocks_total << " ok: " << (n_blocks_total - n_blocks_failed) << " failed: " << n_blocks_failed << " (" << pz << "%)" << std::endl;
|
||||
}
|
||||
|
||||
void USART::writeByte(uint8_t b)
|
||||
{
|
||||
int sent = write(file_desc, &b, 1);
|
||||
|
|
@ -92,7 +85,7 @@ void USART::writeU32(uint32_t w)
|
|||
throw USARTException("Fehler beim Senden: writeU32()");
|
||||
}
|
||||
|
||||
int USART::transmit(uint8_t *buffer, uint16_t offset, uint8_t len, uint32_t timeout)
|
||||
int USART::transmit(uint8_t *buffer, uint16_t offset, uint8_t len)
|
||||
{
|
||||
uint32_t elapsed = 0;
|
||||
int n_read = -1;
|
||||
|
|
@ -111,7 +104,7 @@ int USART::transmit(uint8_t *buffer, uint16_t offset, uint8_t len, uint32_t time
|
|||
return 0;
|
||||
}
|
||||
|
||||
int USART::receive(uint8_t *buffer, uint16_t offset, uint8_t len, uint32_t timeout)
|
||||
int USART::receive(uint8_t *buffer, uint16_t offset, uint8_t len)
|
||||
{
|
||||
uint32_t elapsed = 0;
|
||||
int n_sent = -1;
|
||||
|
|
@ -130,89 +123,6 @@ int USART::receive(uint8_t *buffer, uint16_t offset, uint8_t len, uint32_t timeo
|
|||
|
||||
return n_sent;
|
||||
}
|
||||
|
||||
void USART::writeBlock(uint8_t* buffer, uint16_t offset, uint8_t len)
|
||||
{
|
||||
uint8_t crc;
|
||||
uint8_t aw;
|
||||
const uint16_t us_per_bit = (1000000 / baudrate) * 16;
|
||||
const uint16_t n_total = len + 3;
|
||||
|
||||
n_blocks_total++;
|
||||
bool failed = false;
|
||||
|
||||
do
|
||||
{
|
||||
// calc crc
|
||||
crc = 0;
|
||||
for(uint8_t i = 0; i < len; i++)
|
||||
{
|
||||
crc ^= buffer[i];
|
||||
for (uint8_t k = 0; k < 8; k++)
|
||||
{
|
||||
if (crc & 1)
|
||||
crc ^= CRC7_POLY;
|
||||
crc >>= 1;
|
||||
}
|
||||
}
|
||||
|
||||
// construct block
|
||||
block_buffer[0] = len;
|
||||
std::memcpy(&block_buffer[1], buffer + offset, len);
|
||||
block_buffer[len + 1] = crc;
|
||||
block_buffer[len + 2] = BLOCK_END;
|
||||
|
||||
// send block
|
||||
clearOutputBuffer();
|
||||
clearInputBuffer();
|
||||
int n_sent = receive(&block_buffer[0], 0, len + 3, us_per_bit * n_total);
|
||||
if(n_sent != n_total)
|
||||
throw std::runtime_error("fatal (send): " + std::to_string(n_sent));
|
||||
|
||||
/*for(uint8_t i = 0; i < len + 3; i++)
|
||||
{
|
||||
receive(&block_buffer[i], 0, 1, us_per_bit * n_total);
|
||||
//tcdrain(file_desc);
|
||||
//usleep(1000);
|
||||
}*/
|
||||
|
||||
// flush output data
|
||||
tcdrain(file_desc);
|
||||
|
||||
//usleep(us_per_bit * n_total * 10);
|
||||
|
||||
// check response
|
||||
int n_read = transmit(&aw, 0, 1, us_per_bit * n_blocks_total * 10);
|
||||
for(uint16_t i = 0; i < 255 && n_read != 1; i++)
|
||||
{
|
||||
writeByte(0x80); // Stoppzeichen für Block
|
||||
if(tcdrain(file_desc))
|
||||
{
|
||||
std::cout << "drain failed" << std::endl;
|
||||
}
|
||||
std::cout << "WARNING: read error (" << n_read << "), retry #" << (int) i << std::endl;
|
||||
usleep(us_per_bit*100);
|
||||
n_read = transmit(&aw, 0, 1, us_per_bit);
|
||||
}
|
||||
|
||||
if(n_read != 1)
|
||||
throw std::runtime_error("fatal: " + std::to_string(n_read));
|
||||
|
||||
//clearInputBuffer();
|
||||
|
||||
if(aw != 0xFF)
|
||||
{
|
||||
if(!failed)
|
||||
n_blocks_failed++;
|
||||
failed = true;
|
||||
std::cout << "block failed, retry" << std::endl;
|
||||
}
|
||||
}
|
||||
while(aw != 0xFF);
|
||||
|
||||
//std::cout << "OK" << std::endl;
|
||||
}
|
||||
|
||||
uint8_t USART::readByte(void)
|
||||
{
|
||||
char b;
|
||||
|
|
@ -237,78 +147,6 @@ uint16_t USART::readInt(void)
|
|||
return readByte() | readByte() << 8;
|
||||
}
|
||||
|
||||
bool USART::readBlock(uint8_t* buffer, uint16_t offset)
|
||||
{
|
||||
uint8_t len = readByte();
|
||||
uint8_t crc = 0;
|
||||
buffer += offset;
|
||||
|
||||
uint32_t block_timeout = timeout / 10;
|
||||
|
||||
// wait for block
|
||||
int n_ready;
|
||||
uint16_t elapsed = 0;
|
||||
auto start = std::chrono::steady_clock::now();
|
||||
auto end = start;
|
||||
while(elapsed < block_timeout)
|
||||
{
|
||||
int code = ioctl(file_desc, FIONREAD, &n_ready);
|
||||
if(code != 0)
|
||||
{
|
||||
std::cout << "n_ready code: " << code << std::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
if(n_ready >= len + 1)
|
||||
break;
|
||||
|
||||
end = std::chrono::steady_clock::now();
|
||||
elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count();
|
||||
}
|
||||
if(elapsed >= timeout)
|
||||
{
|
||||
std::cout << "block timeout: " << std::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
while(len--)
|
||||
{
|
||||
*buffer = readByte();
|
||||
|
||||
crc ^= *buffer++;
|
||||
for (uint8_t i = 0; i < 8; i++)
|
||||
{
|
||||
if (crc & 1)
|
||||
crc ^= CRC7_POLY;
|
||||
crc >>= 1;
|
||||
}
|
||||
}
|
||||
|
||||
crc ^= readByte();
|
||||
for (uint8_t i = 0; i < 8; i++)
|
||||
{
|
||||
if (crc & 1)
|
||||
crc ^= CRC7_POLY;
|
||||
crc >>= 1;
|
||||
}
|
||||
|
||||
if(TEST == 1)
|
||||
crc = 1;
|
||||
if(TEST > 100)
|
||||
TEST = 0;
|
||||
|
||||
if (crc == 0)
|
||||
{
|
||||
writeByte(0xFF);
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
writeByte(0xFE);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
uint32_t USART::getBaudrate()
|
||||
{
|
||||
return baudrate;
|
||||
|
|
|
|||
|
|
@ -54,11 +54,6 @@ public:
|
|||
*/
|
||||
void flushOutputBuffer(void);
|
||||
|
||||
/**
|
||||
* Gibt Anzahl an erfolgreichen und fehlgeschlagenen Block-Übertragungen an
|
||||
*/
|
||||
void printStatistics(void);
|
||||
|
||||
/*************************************************/
|
||||
|
||||
|
||||
|
|
@ -100,11 +95,8 @@ public:
|
|||
*/
|
||||
uint16_t readInt(void);
|
||||
|
||||
int transmit(uint8_t *buffer, uint16_t offset, uint8_t len, uint32_t timeout);
|
||||
int receive(uint8_t *buffer, uint16_t offset, uint8_t len, uint32_t timeout);
|
||||
|
||||
void writeBlock(uint8_t* buffer, uint16_t offset, uint8_t len);
|
||||
bool readBlock(uint8_t* buffer, uint16_t offset);
|
||||
int transmit(uint8_t *buffer, uint16_t offset, uint8_t len);
|
||||
int receive(uint8_t *buffer, uint16_t offset, uint8_t len);
|
||||
|
||||
/*************************************/
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue