From f643be2260806e1d118963b6e7e2942250d585ec Mon Sep 17 00:00:00 2001
From: nrs1g15 <nrs1g15@soton.ac.uk>
Date: Tue, 30 Jul 2019 19:24:50 +0100
Subject: [PATCH] Working rpm on car but no sd card saving... need to fix
---
sufst-controller/.idea/workspace.xml | 285 ++++++++++++--------------
sufst-controller/can.cpp | 6 +-
sufst-controller/can.h | 2 +-
sufst-controller/daq.h | 2 +-
sufst-controller/ecuCan.cpp | 26 +--
sufst-controller/sd.cpp | 14 +-
sufst-controller/sufst-controller.ino | 12 +-
7 files changed, 159 insertions(+), 188 deletions(-)
diff --git a/sufst-controller/.idea/workspace.xml b/sufst-controller/.idea/workspace.xml
index 83597d5..8cff62c 100644
--- a/sufst-controller/.idea/workspace.xml
+++ b/sufst-controller/.idea/workspace.xml
@@ -10,47 +10,15 @@
</component>
<component name="ChangeListManager">
<list default="true" id="2070e8be-2952-4d02-bba6-112a351189c8" name="Default Changelist" comment="">
- <change afterPath="$PROJECT_DIR$/daq.cpp" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/daq.h" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/sd.cpp" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/sd.h" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-can-sd-xbee/sufst-can-sd-xbee.ino" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/dashController.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/dashController.cpp" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/can.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/can.cpp" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/can.h" beforeDir="false" afterPath="$PROJECT_DIR$/can.h" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/daq.h" beforeDir="false" afterPath="$PROJECT_DIR$/daq.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ecuCan.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/ecuCan.cpp" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/ecuOpenloggerTags.h" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/openLoggerController.cpp" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/openLoggerController.h" beforeDir="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" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger/.idea/codeStyles/Project.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger/.idea/codeStyles/codeStyleConfig.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger/.idea/misc.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger/.idea/modules.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger/.idea/sufst-openlogger.iml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger/.idea/vcs.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger/.idea/workspace.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger/buffer.cpp" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger/buffer.h" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger/openLogger.cpp" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger/openLogger.h" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger/sufst-openlogger.ino" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger_controller/.idea/codeStyles/Project.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger_controller/.idea/codeStyles/codeStyleConfig.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger_controller/.idea/misc.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger_controller/.idea/modules.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger_controller/.idea/sufst-openlogger_controller.iml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger_controller/.idea/vcs.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger_controller/.idea/workspace.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger_controller/buffer.cpp" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger_controller/buffer.h" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger_controller/can.cpp" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger_controller/can.h" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger_controller/ecuCan.cpp" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger_controller/ecuCan.h" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger_controller/ecuOpenloggerTags.h" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger_controller/openLoggerController.cpp" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger_controller/openLoggerController.h" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/../sufst-openlogger_controller/sufst-openlogger_controller.ino" beforeDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -63,27 +31,13 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file pinned="false" current-in-tab="false">
+ <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/ecuCan.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="272">
- <caret line="21" column="30" selection-start-line="21" selection-start-column="30" selection-end-line="21" selection-end-column="30" />
+ <state relative-caret-position="221">
+ <caret line="30" column="29" selection-start-line="30" selection-start-column="29" selection-end-line="30" selection-end-column="29" />
<folding>
<element signature="e#39#58#0" expanded="true" />
- <element signature="e#2102#2297#0" expanded="true" />
- <element signature="e#2352#2383#0" expanded="true" />
- <element signature="e#1513#1708#0" expanded="true" />
- <element signature="e#1763#1794#0" expanded="true" />
- <element signature="e#2169#2364#0" expanded="true" />
- <element signature="e#2419#2450#0" expanded="true" />
- <element signature="e#2787#2982#0" expanded="true" />
- <element signature="e#3037#3068#0" expanded="true" />
- <element signature="e#3376#3571#0" expanded="true" />
- <element signature="e#3626#3657#0" expanded="true" />
- <element signature="e#3981#4176#0" expanded="true" />
- <element signature="e#4231#4262#0" expanded="true" />
- <element signature="e#4560#4755#0" expanded="true" />
- <element signature="e#4810#4841#0" expanded="true" />
</folding>
</state>
</provider>
@@ -92,8 +46,8 @@
<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="308">
- <caret line="37" column="40" lean-forward="true" selection-start-line="37" selection-start-column="40" selection-end-line="37" selection-end-column="40" />
+ <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>
@@ -102,31 +56,27 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/daq.h">
+ <entry file="file://$PROJECT_DIR$/evoScann-p.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="204">
- <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
+ <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$/can.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="227">
- <caret line="28" column="15" selection-start-line="28" selection-start-column="15" selection-end-line="28" selection-end-column="15" />
- </state>
- </provider>
+ <entry file="file://$PROJECT_DIR$/evoScann-p.h">
+ <provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/daq.cpp">
+ <entry file="file://$PROJECT_DIR$/can.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="291">
- <caret line="34" selection-start-line="34" selection-end-line="34" />
- <folding>
- <element signature="e#40#56#0" expanded="true" />
- </folding>
+ <state relative-caret-position="272">
+ <caret line="16" column="32" lean-forward="true" selection-start-line="16" selection-start-column="32" selection-end-line="16" selection-end-column="32" />
</state>
</provider>
</entry>
@@ -134,39 +84,35 @@
<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="410">
- <caret line="36" selection-start-line="36" selection-end-line="36" />
+ <state relative-caret-position="1049">
+ <caret line="72" lean-forward="true" selection-start-line="72" selection-end-line="72" />
</state>
</provider>
</entry>
</file>
- <file pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/crc8.c">
+ <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="478">
- <caret line="91" selection-start-line="91" selection-end-line="91" />
+ <state relative-caret-position="323">
+ <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$/checksum.h">
+ <entry file="file://$PROJECT_DIR$/wireless.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="51">
- <caret line="3" column="24" lean-forward="true" 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 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>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/sd.h">
+ <entry file="file://$PROJECT_DIR$/wireless.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="374">
- <caret line="22" column="5" selection-start-line="22" selection-start-column="5" selection-end-line="22" selection-end-column="5" />
+ <state relative-caret-position="238">
+ <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
</state>
</provider>
</entry>
@@ -174,8 +120,8 @@
<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="478">
- <caret line="39" column="10" selection-start-line="39" selection-start-column="10" selection-end-line="39" selection-end-column="10" />
+ <state relative-caret-position="221">
+ <caret line="25" column="22" lean-forward="true" selection-start-line="25" selection-start-column="22" selection-end-line="25" selection-end-column="22" />
<folding>
<element signature="e#57#72#0" expanded="true" />
</folding>
@@ -209,21 +155,26 @@
<option value="$PROJECT_DIR$/sdTags.h" />
<option value="$PROJECT_DIR$/sdParserTags.h" />
<option value="$PROJECT_DIR$/dataTags.h" />
- <option value="$PROJECT_DIR$/ecuCan.cpp" />
- <option value="$PROJECT_DIR$/sd.cpp" />
- <option value="$PROJECT_DIR$/sufst-controller.ino" />
- <option value="$PROJECT_DIR$/sd.h" />
- <option value="$PROJECT_DIR$/daq.h" />
- <option value="$PROJECT_DIR$/daq.cpp" />
<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.cpp" />
+ <option value="$PROJECT_DIR$/daq.h" />
+ <option value="$PROJECT_DIR$/can.cpp" />
+ <option value="$PROJECT_DIR$/sd.cpp" />
+ <option value="$PROJECT_DIR$/can.h" />
+ <option value="$PROJECT_DIR$/sufst-controller.ino" />
+ <option value="$PROJECT_DIR$/ecuCan.cpp" />
</list>
</option>
</component>
- <component name="ProjectFrameBounds" extendedState="7">
- <option name="width" value="960" />
- <option name="height" value="1030" />
+ <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">
@@ -231,6 +182,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
+ <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -242,7 +194,6 @@
<select />
</subPane>
</pane>
- <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -283,17 +234,18 @@
<updated>1563993769139</updated>
<workItem from="1563993770477" duration="2408000" />
<workItem from="1564136548177" duration="6195000" />
+ <workItem from="1564440384294" duration="8566000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="8603000" />
+ <option name="totallyTimeSpent" value="17169000" />
</component>
<component name="ToolWindowManager">
- <frame x="-7" y="-7" width="1550" height="838" extended-state="7" />
+ <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.12080537" />
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29871413" />
<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" />
@@ -304,8 +256,8 @@
<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" />
- <window_info anchor="bottom" id="Terminal" order="9" />
+ <window_info anchor="bottom" id="Version Control" order="8" visible="true" weight="0.24212034" />
+ <window_info anchor="bottom" id="Terminal" order="9" weight="0.3295129" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
<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" />
@@ -324,111 +276,130 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/openLoggerController.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-100" />
- </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$/ecuCan.cpp">
+ <entry file="file://$PROJECT_DIR$/checksum.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="272">
- <caret line="21" column="30" selection-start-line="21" selection-start-column="30" selection-end-line="21" selection-end-column="30" />
+ <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#39#58#0" expanded="true" />
- <element signature="e#2102#2297#0" expanded="true" />
- <element signature="e#2352#2383#0" expanded="true" />
- <element signature="e#1513#1708#0" expanded="true" />
- <element signature="e#1763#1794#0" expanded="true" />
- <element signature="e#2169#2364#0" expanded="true" />
- <element signature="e#2419#2450#0" expanded="true" />
- <element signature="e#2787#2982#0" expanded="true" />
- <element signature="e#3037#3068#0" expanded="true" />
- <element signature="e#3376#3571#0" expanded="true" />
- <element signature="e#3626#3657#0" expanded="true" />
- <element signature="e#3981#4176#0" expanded="true" />
- <element signature="e#4231#4262#0" expanded="true" />
- <element signature="e#4560#4755#0" expanded="true" />
- <element signature="e#4810#4841#0" expanded="true" />
+ <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$/can.h">
+ <entry file="file://$PROJECT_DIR$/crc8.c">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="227">
- <caret line="28" column="15" selection-start-line="28" selection-start-column="15" selection-end-line="28" selection-end-column="15" />
+ <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$/sd.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="357">
+ <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/daq.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="204">
- <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
+ <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$/daq.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="291">
- <caret line="34" selection-start-line="34" selection-end-line="34" />
+ <state relative-caret-position="360">
+ <caret line="29" column="1" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
<folding>
<element signature="e#40#56#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/sd.cpp">
+ <entry file="file://$PROJECT_DIR$/wireless.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="410">
- <caret line="36" selection-start-line="36" selection-end-line="36" />
+ <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$/sd.h">
+ <entry file="file://$PROJECT_DIR$/wireless.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="374">
- <caret line="22" column="5" selection-start-line="22" selection-start-column="5" selection-end-line="22" selection-end-column="5" />
+ <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$/dashController.cpp">
+ <entry file="file://$PROJECT_DIR$/can.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="323">
+ <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$/evoScann-p.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="308">
- <caret line="37" column="40" lean-forward="true" selection-start-line="37" selection-start-column="40" selection-end-line="37" selection-end-column="40" />
+ <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#67#0" expanded="true" />
+ <element signature="e#40#63#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/sufst-controller.ino">
+ <entry file="file://$PROJECT_DIR$/evoScann-p.h">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/sd.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1049">
+ <caret line="72" lean-forward="true" selection-start-line="72" selection-end-line="72" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/dashController.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="478">
- <caret line="39" column="10" selection-start-line="39" selection-start-column="10" selection-end-line="39" selection-end-column="10" />
+ <state relative-caret-position="80">
+ <caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
<folding>
- <element signature="e#57#72#0" expanded="true" />
+ <element signature="e#40#67#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/checksum.h">
+ <entry file="file://$PROJECT_DIR$/can.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="51">
- <caret line="3" column="24" lean-forward="true" selection-start-line="3" selection-start-column="24" selection-end-line="3" selection-end-column="24" />
+ <state relative-caret-position="272">
+ <caret line="16" column="32" lean-forward="true" selection-start-line="16" selection-start-column="32" selection-end-line="16" selection-end-column="32" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/sufst-controller.ino">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="221">
+ <caret line="25" column="22" lean-forward="true" selection-start-line="25" selection-start-column="22" selection-end-line="25" selection-end-column="22" />
<folding>
- <element signature="e#1532#1544#0" expanded="true" />
- <element signature="e#1926#1927#0" expanded="true" />
+ <element signature="e#57#72#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/crc8.c">
+ <entry file="file://$PROJECT_DIR$/ecuCan.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="478">
- <caret line="91" selection-start-line="91" selection-end-line="91" />
+ <state relative-caret-position="221">
+ <caret line="30" column="29" selection-start-line="30" selection-start-column="29" selection-end-line="30" selection-end-column="29" />
+ <folding>
+ <element signature="e#39#58#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
diff --git a/sufst-controller/can.cpp b/sufst-controller/can.cpp
index c589acd..e947d17 100644
--- a/sufst-controller/can.cpp
+++ b/sufst-controller/can.cpp
@@ -188,9 +188,9 @@ void canParseRxMsg(CanMsgTemplate *canMsg)
// This removes the need for a long if statement giving significant performance boosts
(*ecuCanFuncPtrs[canMsg->idByte[0]])(canMsg);
}
- else if (canMsg->id == 0x487) {
- evoScannNonMux(canMsg);
- }
+// else if (canMsg->id == 0x487) {
+// evoScannNonMux(canMsg);
+// }
}
void canProcessRx()
diff --git a/sufst-controller/can.h b/sufst-controller/can.h
index 4fc862a..7441235 100644
--- a/sufst-controller/can.h
+++ b/sufst-controller/can.h
@@ -17,7 +17,7 @@
#define CAN_RESET_DEVICE_ON_TIMEOUT 0
#define CAN_NO_MSG_TIMEOUT_RESET_MS 10000
-#define CAN_TX_RETRY_LIMIT 5
+#define CAN_TX_RETRY_LIMIT 0
#define DEBUG_CAN_RX 0
#define DEBUG_CAN_RX_MINIMAL 0
diff --git a/sufst-controller/daq.h b/sufst-controller/daq.h
index 18a6102..c59439c 100644
--- a/sufst-controller/daq.h
+++ b/sufst-controller/daq.h
@@ -19,7 +19,7 @@ struct DaqEvoScannPressureFormat
{
uint8_t startTag;
uint32_t timestamp;
- int data;
+ uint32_t data;
uint8_t endTag;
} __attribute__((packed));
diff --git a/sufst-controller/ecuCan.cpp b/sufst-controller/ecuCan.cpp
index 0027a47..b59efee 100644
--- a/sufst-controller/ecuCan.cpp
+++ b/sufst-controller/ecuCan.cpp
@@ -26,12 +26,12 @@ void ecuCanMsg0x2000(CanMsgTemplate *canMsg)
uint16_t waterTempC = canMsg->data16[2];
uint16_t airTempC = canMsg->data16[3];
- daqEcuWrite(canMsg, 0);
- daqEcuWrite(canMsg, 1);
- daqEcuWrite(canMsg, 2);
+// daqEcuWrite(canMsg, 0);
+// daqEcuWrite(canMsg, 1);
+// daqEcuWrite(canMsg, 2);
- dashEcuSetRpm(rpm);
- dashEcuSetWaterTemp(waterTempC);
+ dashEcuSetRpm(rpm);
+ dashEcuSetWaterTemp(waterTempC);
}
void ecuCanMsg0x2001(CanMsgTemplate *canMsg)
@@ -54,7 +54,7 @@ void ecuCanMsg0x2001(CanMsgTemplate *canMsg)
uint16_t speedKphx10 = canMsg->data16[2];
uint16_t oilPressKpa = canMsg->data16[3];
- daqEcuWrite(canMsg, 1);
+// daqEcuWrite(canMsg, 1);
}
void ecuCanMsg0x2002(CanMsgTemplate *canMsg)
@@ -77,7 +77,7 @@ void ecuCanMsg0x2002(CanMsgTemplate *canMsg)
uint16_t batteryVx10 = canMsg->data16[2];
uint16_t fuelComsumLpHrx10 = canMsg->data16[3];
- daqEcuWrite(canMsg, 2);
+// daqEcuWrite(canMsg, 2);
// Serial.println((float)(batteryVx10 / 10.0));
}
@@ -102,7 +102,7 @@ void ecuCanMsg0x2003(CanMsgTemplate *canMsg)
uint16_t injectionTimeMsx100 = canMsg->data16[2];
uint16_t fuelComsumLp100kMx10 = canMsg->data16[3];
- daqEcuWrite(canMsg, 1);
+// daqEcuWrite(canMsg, 1);
}
void ecuCanMsg0x2004(CanMsgTemplate *canMsg)
@@ -125,7 +125,7 @@ void ecuCanMsg0x2004(CanMsgTemplate *canMsg)
uint16_t ana3mV = canMsg->data16[2];
uint16_t camAdvanceDegx10 = canMsg->data16[3];
- daqEcuWrite(canMsg, 3);
+// daqEcuWrite(canMsg, 3);
}
void ecuCanMsg0x2005(CanMsgTemplate *canMsg)
@@ -148,7 +148,7 @@ void ecuCanMsg0x2005(CanMsgTemplate *canMsg)
uint16_t crankErrorsNr = canMsg->data16[2];
uint16_t camErrorsNr = canMsg->data16[3];
- daqEcuWrite(canMsg, 0);
+// daqEcuWrite(canMsg, 0);
}
void ecuCanMsg0x2006(CanMsgTemplate *canMsg)
@@ -192,9 +192,9 @@ void ecuCanMsg0x2007(CanMsgTemplate *canMsg)
uint16_t lambdaPidAdjPercx10 = canMsg->data16[2];
uint16_t ecuSwitchesBitField = canMsg->data16[3];
//
- daqEcuWrite(canMsg, 0);
- daqEcuWrite(canMsg, 1);
- daqEcuWrite(canMsg, 2);
+// daqEcuWrite(canMsg, 0);
+// daqEcuWrite(canMsg, 1);
+// daqEcuWrite(canMsg, 2);
}
void ecuCanMsg0x2008(CanMsgTemplate *canMsg)
diff --git a/sufst-controller/sd.cpp b/sufst-controller/sd.cpp
index 9decb7a..fa5ed62 100644
--- a/sufst-controller/sd.cpp
+++ b/sufst-controller/sd.cpp
@@ -23,6 +23,13 @@ CirBuffer sdCirBuffer;
uint8_t sdBegin()
{
+ if (!cirBufferBegin(&sdCirBuffer, sdBuffer, SD_BUFFER_LEN, sizeof(uint8_t))) {
+
+ sdState = stopped;
+
+ return 0;
+ }
+
if (!sd.begin(SD_CS_PIN, SD_SCK_MHZ(10))) {
sdState = stopped;
@@ -47,13 +54,6 @@ uint8_t sdBegin()
}
}
- if (!cirBufferBegin(&sdCirBuffer, sdBuffer, SD_BUFFER_LEN, sizeof(uint8_t))) {
-
- sdState = stopped;
-
- return 0;
- }
-
sdState = writing;
return 1;
diff --git a/sufst-controller/sufst-controller.ino b/sufst-controller/sufst-controller.ino
index 44e5db9..34633d4 100644
--- a/sufst-controller/sufst-controller.ino
+++ b/sufst-controller/sufst-controller.ino
@@ -5,7 +5,7 @@
#include "ecuCan.h"
#include "can.h"
#include "dashController.h"
-#include "wireless.h"
+// #include "wireless.h"
void setup()
{
@@ -19,11 +19,11 @@ void setup()
dashBegin();
- sdBegin();
+ //sdBegin();
canBegin();
- wirelessBegin();
+ //wirelessBegin();
}
void loop()
@@ -36,7 +36,7 @@ void loop()
canProcessRx();
dashControllerProcess();
- sdProcess();
- wirelessProcess();
- canProcessTx();
+ //sdProcess();
+ //wirelessProcess();
+ //canProcessTx();
}
\ No newline at end of file
--
GitLab