diff --git a/sufst-controller/.idea/codeStyles/codeStyleConfig.xml b/sufst-controller/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000000000000000000000000000000000000..a55e7a179bde3e4e772c29c0c85e53354aa54618 --- /dev/null +++ b/sufst-controller/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ +<component name="ProjectCodeStyleConfiguration"> + <state> + <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" /> + </state> +</component> \ No newline at end of file diff --git a/sufst-controller/.idea/misc.xml b/sufst-controller/.idea/misc.xml new file mode 100644 index 0000000000000000000000000000000000000000..28a804d8932aba40f168fd757a74cb718a955a1a --- /dev/null +++ b/sufst-controller/.idea/misc.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="JavaScriptSettings"> + <option name="languageLevel" value="ES6" /> + </component> +</project> \ No newline at end of file diff --git a/sufst-controller/.idea/modules.xml b/sufst-controller/.idea/modules.xml new file mode 100644 index 0000000000000000000000000000000000000000..19b1b163c9fd6aa8fc57e045aecc49c26dac8fce --- /dev/null +++ b/sufst-controller/.idea/modules.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ProjectModuleManager"> + <modules> + <module fileurl="file://$PROJECT_DIR$/.idea/sufst-controller.iml" filepath="$PROJECT_DIR$/.idea/sufst-controller.iml" /> + </modules> + </component> +</project> \ No newline at end of file diff --git a/sufst-controller/.idea/sufst-controller.iml b/sufst-controller/.idea/sufst-controller.iml new file mode 100644 index 0000000000000000000000000000000000000000..bc2cd87409057301f546d83bd548111b9a241cb1 --- /dev/null +++ b/sufst-controller/.idea/sufst-controller.iml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="CPP_MODULE" version="4"> + <component name="NewModuleRootManager"> + <content url="file://$MODULE_DIR$" /> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module> \ No newline at end of file diff --git a/sufst-controller/.idea/vcs.xml b/sufst-controller/.idea/vcs.xml new file mode 100644 index 0000000000000000000000000000000000000000..6c0b8635858dc7ad44b93df54b762707ce49eefc --- /dev/null +++ b/sufst-controller/.idea/vcs.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="VcsDirectoryMappings"> + <mapping directory="$PROJECT_DIR$/.." vcs="Git" /> + </component> +</project> \ No newline at end of file diff --git a/sufst-controller/.idea/workspace.xml b/sufst-controller/.idea/workspace.xml new file mode 100644 index 0000000000000000000000000000000000000000..5518707e6bb640a5e3c1f7148565c114d4605382 --- /dev/null +++ b/sufst-controller/.idea/workspace.xml @@ -0,0 +1,386 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="CMakeRunConfigurationManager" shouldGenerate="true" shouldDeleteObsolete="true"> + <generated /> + </component> + <component name="CMakeSettings"> + <configurations> + <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" /> + </configurations> + </component> + <component name="ChangeListManager"> + <list default="true" id="72eae3b5-2002-428d-bc72-633adb4aa2aa" name="Default Changelist" comment=""> + <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/daq.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/daq.cpp" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/ecuCan.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/ecuCan.cpp" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/sd.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/sd.cpp" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/sufst-controller.ino" beforeDir="false" afterPath="$PROJECT_DIR$/sufst-controller.ino" afterDir="false" /> + </list> + <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> + <option name="SHOW_DIALOG" value="false" /> + <option name="HIGHLIGHT_CONFLICTS" value="true" /> + <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> + <option name="LAST_RESOLUTION" value="IGNORE" /> + </component> + <component name="ClangdSettings"> + <option name="formatViaClangd" value="false" /> + </component> + <component name="FileEditorManager"> + <leaf> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/sufst-controller.ino"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="510"> + <caret line="33" column="16" selection-start-line="33" selection-start-column="16" selection-end-line="33" selection-end-column="16" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/ecuCan.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="187"> + <caret line="11" column="31" selection-start-line="11" selection-start-column="31" selection-end-line="11" selection-end-column="31" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/ecuCan.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="389"> + <caret line="32" column="10" selection-start-line="32" selection-start-column="10" selection-end-line="32" selection-end-column="10" /> + <folding> + <element signature="e#977#1172#0" expanded="true" /> + <element signature="e#1227#1258#0" expanded="true" /> + <element signature="e#1679#1874#0" expanded="true" /> + <element signature="e#1929#1960#0" expanded="true" /> + <element signature="e#2335#2530#0" expanded="true" /> + <element signature="e#2585#2616#0" expanded="true" /> + <element signature="e#3051#3246#0" expanded="true" /> + <element signature="e#3301#3332#0" expanded="true" /> + <element signature="e#3640#3835#0" expanded="true" /> + <element signature="e#3890#3921#0" expanded="true" /> + <element signature="e#4399#4594#0" expanded="true" /> + <element signature="e#4649#4680#0" expanded="true" /> + <element signature="e#4978#5173#0" expanded="true" /> + <element signature="e#5228#5259#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/daq.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="425"> + <caret line="27" selection-start-line="27" selection-end-line="27" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/daq.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="561"> + <caret line="33" column="4" lean-forward="true" selection-start-line="33" selection-start-column="4" selection-end-line="33" selection-end-column="21" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/dashController.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="833"> + <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/can.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="283"> + <caret line="182" selection-start-line="182" selection-end-line="182" selection-end-column="42" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/can.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="289"> + <caret line="17" column="41" lean-forward="true" selection-start-line="17" selection-start-column="41" selection-end-line="17" selection-end-column="41" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/sd.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="832"> + <caret line="63" lean-forward="true" selection-start-line="63" selection-end-line="63" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/sd.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="306"> + <caret line="18" column="15" lean-forward="true" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" /> + </state> + </provider> + </entry> + </file> + </leaf> + </component> + <component name="FindInProjectRecents"> + <findStrings> + <find>HEAD</find> + </findStrings> + </component> + <component name="Git.Settings"> + <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." /> + </component> + <component name="IdeDocumentHistory"> + <option name="CHANGED_PATHS"> + <list> + <option value="$PROJECT_DIR$/can.cpp" /> + <option value="$PROJECT_DIR$/dashController.h" /> + <option value="$PROJECT_DIR$/dashController.cpp" /> + <option value="$PROJECT_DIR$/ecuCan.h" /> + <option value="$PROJECT_DIR$/can.h" /> + <option value="$PROJECT_DIR$/sd.h" /> + <option value="$PROJECT_DIR$/sufst-controller.ino" /> + <option value="$PROJECT_DIR$/ecuCan.cpp" /> + <option value="$PROJECT_DIR$/daq.cpp" /> + <option value="$PROJECT_DIR$/sd.cpp" /> + </list> + </option> + </component> + <component name="ProjectConfigurationFiles"> + <option name="files"> + <list> + <option value="$PROJECT_DIR$/.idea/sufst-controller.iml" /> + <option value="$PROJECT_DIR$/.idea/misc.xml" /> + <option value="$PROJECT_DIR$/.idea/vcs.xml" /> + <option value="$PROJECT_DIR$/.idea/modules.xml" /> + <option value="$PROJECT_DIR$/.idea/codeStyles/codeStyleConfig.xml" /> + </list> + </option> + </component> + <component name="ProjectFrameBounds"> + <option name="x" value="1909" /> + <option name="width" value="1940" /> + <option name="height" value="2111" /> + </component> + <component name="ProjectLevelVcsManager" settingsEditedManually="true" /> + <component name="ProjectView"> + <navigator proportions="" version="1"> + <foldersAlwaysOnTop value="true" /> + </navigator> + <panes> + <pane id="ProjectPane"> + <subPane> + <expand> + <path> + <item name="sufst-controller" type="b2602c69:ProjectViewProjectNode" /> + <item name="sufst-controller" type="462c0819:PsiDirectoryNode" /> + </path> + </expand> + <select /> + </subPane> + </pane> + <pane id="Scope" /> + </panes> + </component> + <component name="PropertiesComponent"> + <property name="ASKED_SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> + <property name="WebServerToolWindowFactoryState" value="false" /> + <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> + <property name="nodejs_npm_path_reset_for_default_project" value="true" /> + <property name="settings.editor.selected.configurable" value="preferences.sourceCode.C/C++" /> + </component> + <component name="RunDashboard"> + <option name="ruleStates"> + <list> + <RuleState> + <option name="name" value="ConfigurationTypeDashboardGroupingRule" /> + </RuleState> + <RuleState> + <option name="name" value="StatusDashboardGroupingRule" /> + </RuleState> + </list> + </option> + </component> + <component name="SvnConfiguration"> + <configuration /> + </component> + <component name="TaskManager"> + <task active="true" id="Default" summary="Default task"> + <changelist id="72eae3b5-2002-428d-bc72-633adb4aa2aa" name="Default Changelist" comment="" /> + <created>1564521695469</created> + <option name="number" value="Default" /> + <option name="presentableId" value="Default" /> + <updated>1564521695469</updated> + <workItem from="1564521697766" duration="5580000" /> + </task> + <servers /> + </component> + <component name="TimeTrackingManager"> + <option name="totallyTimeSpent" value="5580000" /> + </component> + <component name="ToolWindowManager"> + <frame x="1273" y="0" width="1293" height="1407" extended-state="0" /> + <editor active="true" /> + <layout> + <window_info id="Favorites" side_tool="true" /> + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29845905" /> + <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="Terminal" /> + <window_info anchor="bottom" id="Event Log" side_tool="true" /> + <window_info anchor="bottom" id="Message" order="0" /> + <window_info anchor="bottom" id="Find" order="1" /> + <window_info anchor="bottom" id="Run" order="2" /> + <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> + <window_info anchor="bottom" id="TODO" order="6" /> + <window_info anchor="right" id="Database" /> + <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> + <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> + </layout> + </component> + <component name="TypeScriptGeneratedFilesManager"> + <option name="version" value="1" /> + </component> + <component name="editorHistoryManager"> + <entry file="file://$PROJECT_DIR$/buffer.cpp"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/buffer.h"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/checksum.h"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/crc8.c"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/evoScann-p.h"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/wireless.cpp"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/wireless.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="340"> + <caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/evoScann-p.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-36" /> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/dashController.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="187"> + <caret line="11" column="29" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="29" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/dashController.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="833"> + <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/can.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="289"> + <caret line="17" column="41" lean-forward="true" selection-start-line="17" selection-start-column="41" selection-end-line="17" selection-end-column="41" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/can.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="283"> + <caret line="182" selection-start-line="182" selection-end-line="182" selection-end-column="42" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/sd.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="306"> + <caret line="18" column="15" lean-forward="true" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/daq.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="561"> + <caret line="33" column="4" lean-forward="true" selection-start-line="33" selection-start-column="4" selection-end-line="33" selection-end-column="21" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/ecuCan.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="187"> + <caret line="11" column="31" selection-start-line="11" selection-start-column="31" selection-end-line="11" selection-end-column="31" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/ecuCan.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="389"> + <caret line="32" column="10" selection-start-line="32" selection-start-column="10" selection-end-line="32" selection-end-column="10" /> + <folding> + <element signature="e#977#1172#0" expanded="true" /> + <element signature="e#1227#1258#0" expanded="true" /> + <element signature="e#1679#1874#0" expanded="true" /> + <element signature="e#1929#1960#0" expanded="true" /> + <element signature="e#2335#2530#0" expanded="true" /> + <element signature="e#2585#2616#0" expanded="true" /> + <element signature="e#3051#3246#0" expanded="true" /> + <element signature="e#3301#3332#0" expanded="true" /> + <element signature="e#3640#3835#0" expanded="true" /> + <element signature="e#3890#3921#0" expanded="true" /> + <element signature="e#4399#4594#0" expanded="true" /> + <element signature="e#4649#4680#0" expanded="true" /> + <element signature="e#4978#5173#0" expanded="true" /> + <element signature="e#5228#5259#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/sufst-controller.ino"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="510"> + <caret line="33" column="16" selection-start-line="33" selection-start-column="16" selection-end-line="33" selection-end-column="16" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/daq.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="425"> + <caret line="27" selection-start-line="27" selection-end-line="27" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/sd.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="832"> + <caret line="63" lean-forward="true" selection-start-line="63" selection-end-line="63" /> + </state> + </provider> + </entry> + </component> +</project> \ No newline at end of file diff --git a/sufst-controller/.idea/workspace.xml~8b04481845d66fb9baddfd09e8bca7f7f4f1abb2 b/sufst-controller/.idea/workspace.xml~8b04481845d66fb9baddfd09e8bca7f7f4f1abb2 new file mode 100644 index 0000000000000000000000000000000000000000..2f1a7c3bbbb686406a31fc9d95a246baa1f24d6c --- /dev/null +++ b/sufst-controller/.idea/workspace.xml~8b04481845d66fb9baddfd09e8bca7f7f4f1abb2 @@ -0,0 +1,408 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="CMakeRunConfigurationManager" shouldGenerate="true" shouldDeleteObsolete="true"> + <generated /> + </component> + <component name="CMakeSettings"> + <configurations> + <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" /> + </configurations> + </component> + <component name="ChangeListManager"> + <list default="true" id="2070e8be-2952-4d02-bba6-112a351189c8" name="Default Changelist" comment=""> + <change beforePath="$PROJECT_DIR$/can.h" beforeDir="false" afterPath="$PROJECT_DIR$/can.h" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/daq.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/daq.cpp" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/ecuCan.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/ecuCan.cpp" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/sd.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/sd.cpp" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/sufst-controller.ino" beforeDir="false" afterPath="$PROJECT_DIR$/sufst-controller.ino" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/../sufst-dash/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../sufst-dash/.idea/workspace.xml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/../sufst-dash/sufst-dash.ino" beforeDir="false" afterPath="$PROJECT_DIR$/../sufst-dash/sufst-dash.ino" afterDir="false" /> + </list> + <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> + <option name="SHOW_DIALOG" value="false" /> + <option name="HIGHLIGHT_CONFLICTS" value="true" /> + <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> + <option name="LAST_RESOLUTION" value="IGNORE" /> + </component> + <component name="ClangdSettings"> + <option name="formatViaClangd" value="false" /> + </component> + <component name="FileEditorManager"> + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/ecuCan.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="318"> + <caret line="37" lean-forward="true" selection-start-line="37" selection-end-line="37" /> + <folding> + <element signature="e#39#58#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/dashController.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="80"> + <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" /> + <folding> + <element signature="e#40#67#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/evoScann-p.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-597"> + <caret line="36" column="33" lean-forward="true" selection-start-line="36" selection-start-column="33" selection-end-line="36" selection-end-column="33" /> + <folding> + <element signature="e#40#63#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/evoScann-p.h"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + </file> + <file pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/daq.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="459"> + <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" /> + <folding> + <element signature="e#40#56#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/can.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="357"> + <caret line="21" column="22" lean-forward="true" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/sd.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-244"> + <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/can.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="3026"> + <caret line="193" column="1" lean-forward="true" selection-start-line="193" selection-start-column="1" selection-end-line="193" selection-end-column="1" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/sd.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="151"> + <caret line="12" column="19" lean-forward="true" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/sufst-controller.ino"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="12"> + <caret line="21" column="8" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" /> + <folding> + <element signature="e#57#72#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + </leaf> + </component> + <component name="FindInProjectRecents"> + <findStrings> + <find>Serial.print</find> + <find>Se</find> + <find>EcuDataOpenlogger</find> + <find>EcuDataStruct</find> + <find>ecuOpenloggerSave</find> + </findStrings> + <replaceStrings> + <replace>EcuDataStruct</replace> + <replace>EcuDataSaveFormat</replace> + <replace>daqEcuWrite</replace> + </replaceStrings> + </component> + <component name="Git.Settings"> + <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." /> + </component> + <component name="IdeDocumentHistory"> + <option name="CHANGED_PATHS"> + <list> + <option value="$PROJECT_DIR$/../sufst-dash/sufst-dash.ino" /> + <option value="$PROJECT_DIR$/sdTags.h" /> + <option value="$PROJECT_DIR$/sdParserTags.h" /> + <option value="$PROJECT_DIR$/dataTags.h" /> + <option value="$PROJECT_DIR$/dashController.cpp" /> + <option value="$PROJECT_DIR$/crc8.c" /> + <option value="$PROJECT_DIR$/checksum.h" /> + <option value="$PROJECT_DIR$/wireless.h" /> + <option value="$PROJECT_DIR$/wireless.cpp" /> + <option value="$PROJECT_DIR$/sd.h" /> + <option value="$PROJECT_DIR$/daq.h" /> + <option value="$PROJECT_DIR$/can.cpp" /> + <option value="$PROJECT_DIR$/sufst-controller.ino" /> + <option value="$PROJECT_DIR$/daq.cpp" /> + <option value="$PROJECT_DIR$/ecuCan.cpp" /> + <option value="$PROJECT_DIR$/can.h" /> + <option value="$PROJECT_DIR$/sd.cpp" /> + </list> + </option> + </component> + <component name="ProjectFrameBounds"> + <option name="x" value="588" /> + <option name="width" value="1339" /> + <option name="height" value="1038" /> + </component> + <component name="ProjectLevelVcsManager" settingsEditedManually="true" /> + <component name="ProjectView"> + <navigator proportions="" version="1"> + <foldersAlwaysOnTop value="true" /> + </navigator> + <panes> + <pane id="Scope" /> + <pane id="ProjectPane"> + <subPane> + <expand> + <path> + <item name="sufst-controller" type="b2602c69:ProjectViewProjectNode" /> + <item name="sufst-controller" type="462c0819:PsiDirectoryNode" /> + </path> + </expand> + <select /> + </subPane> + </pane> + </panes> + </component> + <component name="PropertiesComponent"> + <property name="ASKED_SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> + <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> + <property name="WebServerToolWindowFactoryState" value="false" /> + <property name="node.js.detected.package.eslint" value="true" /> + <property name="node.js.detected.package.tslint" value="true" /> + <property name="node.js.path.for.package.eslint" value="project" /> + <property name="node.js.path.for.package.tslint" value="project" /> + <property name="node.js.selected.package.eslint" value="(autodetect)" /> + <property name="node.js.selected.package.tslint" value="(autodetect)" /> + <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> + <property name="nodejs_npm_path_reset_for_default_project" value="true" /> + <property name="settings.editor.selected.configurable" value="preferences.sourceCode.C/C++" /> + </component> + <component name="RunDashboard"> + <option name="ruleStates"> + <list> + <RuleState> + <option name="name" value="ConfigurationTypeDashboardGroupingRule" /> + </RuleState> + <RuleState> + <option name="name" value="StatusDashboardGroupingRule" /> + </RuleState> + </list> + </option> + </component> + <component name="SvnConfiguration"> + <configuration /> + </component> + <component name="TaskManager"> + <task active="true" id="Default" summary="Default task"> + <changelist id="2070e8be-2952-4d02-bba6-112a351189c8" name="Default Changelist" comment="" /> + <created>1563993769139</created> + <option name="number" value="Default" /> + <option name="presentableId" value="Default" /> + <updated>1563993769139</updated> + <workItem from="1563993770477" duration="2408000" /> + <workItem from="1564136548177" duration="6195000" /> + <workItem from="1564440384294" duration="10478000" /> + </task> + <servers /> + </component> + <component name="TimeTrackingManager"> + <option name="totallyTimeSpent" value="19081000" /> + </component> + <component name="ToolWindowManager"> + <frame x="471" y="0" width="1071" height="830" extended-state="0" /> + <editor active="true" /> + <layout> + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14243324" /> + <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" /> + <window_info anchor="bottom" id="Find" order="1" /> + <window_info anchor="bottom" id="Run" order="2" /> + <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> + <window_info anchor="bottom" id="TODO" order="6" /> + <window_info anchor="bottom" id="Database Changes" order="7" /> + <window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49950543" weight="0.24212034" /> + <window_info anchor="bottom" id="Terminal" order="9" weight="0.3295129" /> + <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50049454" side_tool="true" weight="0.24212034" /> + <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> + <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> + <window_info anchor="right" id="Database" order="3" /> + </layout> + </component> + <component name="TypeScriptGeneratedFilesManager"> + <option name="version" value="1" /> + </component> + <component name="editorHistoryManager"> + <entry file="file://$PROJECT_DIR$/../sufst-dash/sufst-dash.ino"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="238"> + <caret line="20" column="35" selection-start-line="20" selection-start-column="35" selection-end-line="20" selection-end-column="35" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/openLoggerController.h" /> + <entry file="file://$PROJECT_DIR$/dashController.h"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/checksum.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="51"> + <caret line="3" column="24" selection-start-line="3" selection-start-column="24" selection-end-line="3" selection-end-column="24" /> + <folding> + <element signature="e#1532#1544#0" expanded="true" /> + <element signature="e#1926#1927#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/crc8.c"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="733"> + <caret line="91" selection-start-line="91" selection-end-line="91" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/ecuCan.h"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/daq.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="102"> + <caret line="21" column="18" lean-forward="true" selection-start-line="21" selection-start-column="18" selection-end-line="21" selection-end-column="18" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/wireless.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="884"> + <caret line="52" column="1" lean-forward="true" selection-start-line="52" selection-start-column="1" selection-end-line="52" selection-end-column="1" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/wireless.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="238"> + <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/evoScann-p.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-597"> + <caret line="36" column="33" lean-forward="true" selection-start-line="36" selection-start-column="33" selection-end-line="36" selection-end-column="33" /> + <folding> + <element signature="e#40#63#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/evoScann-p.h"> + <provider selected="true" editor-type-id="text-editor" /> + </entry> + <entry file="file://$PROJECT_DIR$/dashController.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="80"> + <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" /> + <folding> + <element signature="e#40#67#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/sd.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="151"> + <caret line="12" column="19" lean-forward="true" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/sufst-controller.ino"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="12"> + <caret line="21" column="8" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" /> + <folding> + <element signature="e#57#72#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/can.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="3026"> + <caret line="193" column="1" lean-forward="true" selection-start-line="193" selection-start-column="1" selection-end-line="193" selection-end-column="1" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/can.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="357"> + <caret line="21" column="22" lean-forward="true" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/ecuCan.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="318"> + <caret line="37" lean-forward="true" selection-start-line="37" selection-end-line="37" /> + <folding> + <element signature="e#39#58#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/sd.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-244"> + <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/daq.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="459"> + <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" /> + <folding> + <element signature="e#40#56#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </component> +</project> \ No newline at end of file diff --git a/sufst-controller/daq.cpp b/sufst-controller/daq.cpp index 44ac176ffa6c145d039aace3e3905ac63a2f8f54..b60c7f1e46f9df8152a4e4d1f2f63d8edc941fa4 100644 --- a/sufst-controller/daq.cpp +++ b/sufst-controller/daq.cpp @@ -25,4 +25,5 @@ void daqEcuWrite(CanMsgTemplate *canMsg, uint8_t index) daqEcuFormat.endTag = ecuParamterTag; sdWrite(&daqEcuFormat, sizeof(DaqEcuFormat)); + } \ No newline at end of file diff --git a/sufst-controller/sd.cpp b/sufst-controller/sd.cpp index c4a12574d97224fe5fa49fee6a185a52075781d4..0e64bbf441f04621d6eb2d62f012e1a5b7a8f502 100644 --- a/sufst-controller/sd.cpp +++ b/sufst-controller/sd.cpp @@ -64,8 +64,6 @@ uint8_t sdBegin() sdState = stopped; - Serial.println("SD: BUFF ERR"); - return 0; }