fixed
This commit is contained in:
Tristan Krause
parent
e8f33eb0c0
commit
3f0fe49644
76 changed files with 481 additions and 451 deletions
276
control/src/.idea/workspace.xml
generated
276
control/src/.idea/workspace.xml
generated
|
|
@ -14,201 +14,6 @@
|
|||
<list default="true" id="d13a1bae-0fd7-48fc-b53c-d6dd1aaf95b9" name="Default Changelist" comment="">
|
||||
<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/CMakeCCompilerId_8c_source.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/CMakeCXXCompilerId_8cpp_source.html" beforeDir="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/backup_8cpp_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_19f2f1b99f19c12fa55b8d312cf373ed.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/dir_3d3c8ff3ebf9841b39117ac899f41936.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/dir_587c94d866dbb2f408f78cf41f9b2f8d.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/dir_90e361ec3542f3dd076ea3ad19547437.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/dir_95e29a8b8ee7c54052c171a88bb95675.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/dir_f89abcb304c928c7d889aa5625570de5.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/feature__tests_8c_source.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/feature__tests_8cxx_source.html" 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_10.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/all_10.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/functions_c.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/functions_c.js" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/functions_d.html" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/../../docs/html/search/functions_d.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" />
|
||||
|
|
@ -225,7 +30,7 @@
|
|||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/CMakeLists.txt">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state>
|
||||
<state relative-caret-position="90">
|
||||
<caret line="6" column="8" selection-start-line="6" selection-start-column="8" selection-end-line="6" selection-end-column="8" />
|
||||
</state>
|
||||
</provider>
|
||||
|
|
@ -234,8 +39,11 @@
|
|||
<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="120">
|
||||
<caret line="8" column="19" selection-start-line="8" selection-start-column="19" selection-end-line="8" selection-end-column="19" />
|
||||
<state relative-caret-position="396">
|
||||
<caret line="125" column="8" selection-start-line="125" selection-start-column="8" selection-end-line="125" selection-end-column="8" />
|
||||
<folding>
|
||||
<element signature="e#33#51#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
|
@ -243,8 +51,11 @@
|
|||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/drv/usart.cpp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="315">
|
||||
<caret line="21" column="26" selection-start-line="21" selection-start-column="26" selection-end-line="21" selection-end-column="26" />
|
||||
<state relative-caret-position="186">
|
||||
<caret line="83" column="80" selection-start-line="83" selection-start-column="80" selection-end-line="83" selection-end-column="80" />
|
||||
<folding>
|
||||
<element signature="e#0#20#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
|
@ -252,8 +63,8 @@
|
|||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/drv/backup.cpp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="780">
|
||||
<caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
|
||||
<state relative-caret-position="546">
|
||||
<caret line="52" selection-start-line="52" selection-end-line="52" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
|
@ -261,7 +72,7 @@
|
|||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/drv/b15f.h">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="285">
|
||||
<state relative-caret-position="510">
|
||||
<caret line="34" column="41" selection-start-line="34" selection-start-column="41" selection-end-line="34" selection-end-column="41" />
|
||||
</state>
|
||||
</provider>
|
||||
|
|
@ -270,7 +81,7 @@
|
|||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/drv/b15f.cpp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1620">
|
||||
<state relative-caret-position="546">
|
||||
<caret line="108" column="41" selection-start-line="108" selection-start-column="41" selection-end-line="108" selection-end-column="41" />
|
||||
</state>
|
||||
</provider>
|
||||
|
|
@ -386,17 +197,18 @@
|
|||
<updated>1559118962147</updated>
|
||||
<workItem from="1559118964304" duration="1913000" />
|
||||
<workItem from="1559633658436" duration="5344000" />
|
||||
<workItem from="1559813060146" duration="1344000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="7257000" />
|
||||
<option name="totallyTimeSpent" value="8601000" />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="67" y="25" width="1853" height="1055" extended-state="6" />
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25235197" />
|
||||
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.255119" />
|
||||
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
||||
<window_info id="Favorites" order="2" side_tool="true" />
|
||||
<window_info anchor="bottom" id="Message" order="0" />
|
||||
|
|
@ -423,13 +235,6 @@
|
|||
<option name="version" value="1" />
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://$PROJECT_DIR$/CMakeLists.txt">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state>
|
||||
<caret line="6" column="8" selection-start-line="6" selection-start-column="8" selection-end-line="6" selection-end-column="8" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/drv/usartexception.h">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="43">
|
||||
|
|
@ -437,13 +242,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/drv/b15f.h">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="285">
|
||||
<caret line="34" column="41" selection-start-line="34" selection-start-column="41" selection-end-line="34" selection-end-column="41" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/Makefile">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="106">
|
||||
|
|
@ -451,31 +249,51 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/drv/usart.h">
|
||||
<entry file="file://$PROJECT_DIR$/CMakeLists.txt">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="120">
|
||||
<caret line="8" column="19" selection-start-line="8" selection-start-column="19" selection-end-line="8" selection-end-column="19" />
|
||||
<state relative-caret-position="90">
|
||||
<caret line="6" column="8" selection-start-line="6" selection-start-column="8" selection-end-line="6" selection-end-column="8" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/drv/backup.cpp">
|
||||
<entry file="file://$PROJECT_DIR$/drv/b15f.h">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="780">
|
||||
<caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
|
||||
<state relative-caret-position="510">
|
||||
<caret line="34" column="41" selection-start-line="34" selection-start-column="41" selection-end-line="34" selection-end-column="41" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/drv/b15f.cpp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1620">
|
||||
<state relative-caret-position="546">
|
||||
<caret line="108" column="41" selection-start-line="108" selection-start-column="41" selection-end-line="108" selection-end-column="41" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/drv/backup.cpp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="546">
|
||||
<caret line="52" selection-start-line="52" selection-end-line="52" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/drv/usart.h">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="396">
|
||||
<caret line="125" column="8" selection-start-line="125" selection-start-column="8" selection-end-line="125" selection-end-column="8" />
|
||||
<folding>
|
||||
<element signature="e#33#51#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/drv/usart.cpp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="315">
|
||||
<caret line="21" column="26" selection-start-line="21" selection-start-column="26" selection-end-line="21" selection-end-column="26" />
|
||||
<state relative-caret-position="186">
|
||||
<caret line="83" column="80" selection-start-line="83" selection-start-column="80" selection-end-line="83" selection-end-column="80" />
|
||||
<folding>
|
||||
<element signature="e#0#20#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,13 @@
|
|||
#include <stdexcept>
|
||||
#include "usart.h"
|
||||
|
||||
USART::~USART() {
|
||||
USART::~USART()
|
||||
{
|
||||
closeDevice();
|
||||
}
|
||||
|
||||
void USART::openDevice(std::string device) {
|
||||
void USART::openDevice(std::string device)
|
||||
{
|
||||
// Benutze blockierenden Modus
|
||||
file_desc = open(device.c_str(), O_RDWR | O_NOCTTY);// | O_NDELAY
|
||||
if (file_desc <= 0)
|
||||
|
|
@ -19,7 +22,7 @@ void USART::openDevice(std::string device) {
|
|||
options.c_iflag = IGNPAR;
|
||||
options.c_oflag = 0;
|
||||
options.c_lflag = 0;
|
||||
options.c_cc[VMIN] = 1; // #bytes read returns at least
|
||||
options.c_cc[VMIN] = 0;
|
||||
options.c_cc[VTIME] = timeout;
|
||||
code = cfsetspeed(&options, baudrate);
|
||||
if (code)
|
||||
|
|
@ -37,8 +40,10 @@ void USART::openDevice(std::string device) {
|
|||
clearInputBuffer();
|
||||
}
|
||||
|
||||
void USART::closeDevice() {
|
||||
if (file_desc > 0) {
|
||||
void USART::closeDevice()
|
||||
{
|
||||
if (file_desc > 0)
|
||||
{
|
||||
int code = close(file_desc);
|
||||
if (code)
|
||||
throw USARTException("Fehler beim Schließen des Gerätes");
|
||||
|
|
@ -46,52 +51,72 @@ void USART::closeDevice() {
|
|||
}
|
||||
}
|
||||
|
||||
void USART::clearInputBuffer() {
|
||||
void USART::clearInputBuffer()
|
||||
{
|
||||
int code = tcflush(file_desc, TCIFLUSH);
|
||||
if (code)
|
||||
throw USARTException("Fehler beim Leeren des Eingangspuffers");
|
||||
}
|
||||
|
||||
void USART::clearOutputBuffer() {
|
||||
void USART::clearOutputBuffer()
|
||||
{
|
||||
int code = tcflush(file_desc, TCOFLUSH);
|
||||
if (code)
|
||||
throw USARTException("Fehler beim Leeren des Ausgangspuffers");
|
||||
}
|
||||
|
||||
void USART::flushOutputBuffer() {
|
||||
void USART::flushOutputBuffer()
|
||||
{
|
||||
int code = tcdrain(file_desc);
|
||||
if (code)
|
||||
throw USARTException("Fehler beim Versenden des Ausgangspuffers");
|
||||
}
|
||||
|
||||
void USART::receive(uint8_t *buffer, uint16_t offset, uint8_t len) {
|
||||
int code = read(file_desc, buffer + offset, len);
|
||||
void USART::receive(uint8_t *buffer, uint16_t offset, uint8_t len)
|
||||
{
|
||||
int bytes_avail, code;
|
||||
do
|
||||
{
|
||||
code = ioctl(file_desc, FIONREAD, &bytes_avail);
|
||||
if(code)
|
||||
throw USARTException(
|
||||
std::string(__FUNCTION__) + " failed: " + std::string(__FILE__) + "#" + std::to_string(__LINE__) +
|
||||
", " + strerror(code) + " (code " + std::to_string(code) + ")");
|
||||
}
|
||||
while(bytes_avail < len);
|
||||
|
||||
code = read(file_desc, buffer + offset, len);
|
||||
if (code != len)
|
||||
throw USARTException(
|
||||
std::string(__FUNCTION__) + " failed: " + std::string(__FILE__) + "#" + std::to_string(__LINE__) +
|
||||
", " + strerror(code) + " (code " + std::to_string(code) + " / " + std::to_string(len) + ")");
|
||||
std::string(__FUNCTION__) + " failed: " + std::string(__FILE__) + "#" + std::to_string(__LINE__) +
|
||||
", " + strerror(code) + " (code " + std::to_string(code) + " / " + std::to_string(len) + ")");
|
||||
}
|
||||
|
||||
void USART::transmit(uint8_t *buffer, uint16_t offset, uint8_t len) {
|
||||
void USART::transmit(uint8_t *buffer, uint16_t offset, uint8_t len)
|
||||
{
|
||||
int code = write(file_desc, buffer + offset, len);
|
||||
if (code != len)
|
||||
throw USARTException(
|
||||
std::string(__FUNCTION__) + " failed: " + std::string(__FILE__) + "#" + std::to_string(__LINE__) +
|
||||
", " + strerror(code) + " (code " + std::to_string(code) + " / " + std::to_string(len) + ")");
|
||||
std::string(__FUNCTION__) + " failed: " + std::string(__FILE__) + "#" + std::to_string(__LINE__) +
|
||||
", " + strerror(code) + " (code " + std::to_string(code) + " / " + std::to_string(len) + ")");
|
||||
}
|
||||
|
||||
uint32_t USART::getBaudrate() {
|
||||
uint32_t USART::getBaudrate()
|
||||
{
|
||||
return baudrate;
|
||||
}
|
||||
|
||||
uint8_t USART::getTimeout() {
|
||||
uint8_t USART::getTimeout()
|
||||
{
|
||||
return timeout;
|
||||
}
|
||||
|
||||
void USART::setBaudrate(uint32_t baudrate) {
|
||||
void USART::setBaudrate(uint32_t baudrate)
|
||||
{
|
||||
this->baudrate = baudrate;
|
||||
}
|
||||
|
||||
void USART::setTimeout(uint8_t timeout) {
|
||||
void USART::setTimeout(uint8_t timeout)
|
||||
{
|
||||
this->timeout = timeout;
|
||||
}
|
||||
|
|
|
|||
121
control/src/drv/usart.cpp.orig
Normal file
121
control/src/drv/usart.cpp.orig
Normal file
|
|
@ -0,0 +1,121 @@
|
|||
#include <stdexcept>
|
||||
#include "usart.h"
|
||||
|
||||
USART::~USART()
|
||||
{
|
||||
closeDevice();
|
||||
}
|
||||
|
||||
void USART::openDevice(std::string device)
|
||||
{
|
||||
// Benutze blockierenden Modus
|
||||
file_desc = open(device.c_str(), O_RDWR | O_NOCTTY);// | O_NDELAY
|
||||
if (file_desc <= 0)
|
||||
throw USARTException("Fehler beim Öffnen des Gerätes");
|
||||
|
||||
struct termios options;
|
||||
int code = tcgetattr(file_desc, &options);
|
||||
if (code)
|
||||
throw USARTException("Fehler beim Lesen der Geräteparameter");
|
||||
|
||||
options.c_cflag = CS8 | CLOCAL | CREAD;
|
||||
options.c_iflag = IGNPAR;
|
||||
options.c_oflag = 0;
|
||||
options.c_lflag = 0;
|
||||
options.c_cc[VMIN] = 0;
|
||||
options.c_cc[VTIME] = timeout;
|
||||
code = cfsetspeed(&options, baudrate);
|
||||
if (code)
|
||||
throw USARTException("Fehler beim Setzen der Baudrate");
|
||||
|
||||
code = tcsetattr(file_desc, TCSANOW, &options);
|
||||
if (code)
|
||||
throw USARTException("Fehler beim Setzen der Geräteparameter");
|
||||
|
||||
code = fcntl(file_desc, F_SETFL, 0); // blockierender Modus
|
||||
if (code)
|
||||
throw USARTException("Fehler beim Aktivieren des blockierenden Modus'");
|
||||
|
||||
clearOutputBuffer();
|
||||
clearInputBuffer();
|
||||
}
|
||||
|
||||
void USART::closeDevice()
|
||||
{
|
||||
if (file_desc > 0)
|
||||
{
|
||||
int code = close(file_desc);
|
||||
if (code)
|
||||
throw USARTException("Fehler beim Schließen des Gerätes");
|
||||
file_desc = -1;
|
||||
}
|
||||
}
|
||||
|
||||
void USART::clearInputBuffer()
|
||||
{
|
||||
int code = tcflush(file_desc, TCIFLUSH);
|
||||
if (code)
|
||||
throw USARTException("Fehler beim Leeren des Eingangspuffers");
|
||||
}
|
||||
|
||||
void USART::clearOutputBuffer()
|
||||
{
|
||||
int code = tcflush(file_desc, TCOFLUSH);
|
||||
if (code)
|
||||
throw USARTException("Fehler beim Leeren des Ausgangspuffers");
|
||||
}
|
||||
|
||||
void USART::flushOutputBuffer()
|
||||
{
|
||||
int code = tcdrain(file_desc);
|
||||
if (code)
|
||||
throw USARTException("Fehler beim Versenden des Ausgangspuffers");
|
||||
}
|
||||
|
||||
void USART::receive(uint8_t *buffer, uint16_t offset, uint8_t len)
|
||||
{
|
||||
int bytes_avail, code;
|
||||
do
|
||||
{
|
||||
code = ioctl(file_desc, FIONREAD, &bytes_avail);
|
||||
if(code)
|
||||
throw USARTException(
|
||||
std::string(__FUNCTION__) + " failed: " + std::string(__FILE__) + "#" + std::to_string(__LINE__) +
|
||||
", " + strerror(code) + " (code " + std::to_string(code) + ")");
|
||||
} while(bytes_avail < len);
|
||||
|
||||
code = read(file_desc, buffer + offset, len);
|
||||
if (code != len)
|
||||
throw USARTException(
|
||||
std::string(__FUNCTION__) + " failed: " + std::string(__FILE__) + "#" + std::to_string(__LINE__) +
|
||||
", " + strerror(code) + " (code " + std::to_string(code) + " / " + std::to_string(len) + ")");
|
||||
}
|
||||
|
||||
void USART::transmit(uint8_t *buffer, uint16_t offset, uint8_t len)
|
||||
{
|
||||
int code = write(file_desc, buffer + offset, len);
|
||||
if (code != len)
|
||||
throw USARTException(
|
||||
std::string(__FUNCTION__) + " failed: " + std::string(__FILE__) + "#" + std::to_string(__LINE__) +
|
||||
", " + strerror(code) + " (code " + std::to_string(code) + " / " + std::to_string(len) + ")");
|
||||
}
|
||||
|
||||
uint32_t USART::getBaudrate()
|
||||
{
|
||||
return baudrate;
|
||||
}
|
||||
|
||||
uint8_t USART::getTimeout()
|
||||
{
|
||||
return timeout;
|
||||
}
|
||||
|
||||
void USART::setBaudrate(uint32_t baudrate)
|
||||
{
|
||||
this->baudrate = baudrate;
|
||||
}
|
||||
|
||||
void USART::setTimeout(uint8_t timeout)
|
||||
{
|
||||
this->timeout = timeout;
|
||||
}
|
||||
|
|
@ -5,6 +5,7 @@
|
|||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
#include <termios.h>
|
||||
#include <iostream>
|
||||
#include <sys/ioctl.h>
|
||||
#include <string.h>
|
||||
#include "usartexception.h"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue