Skip to content
Snippets Groups Projects
Commit 02453a24 authored by nrs1g15's avatar nrs1g15
Browse files

State of state after trying to work out issue with sd card board... it seems to be a hardware issue

parent 1914bb6d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
sufst-controller/.idea/workspace.xml
+ 113
− 121
View file @ 02453a24
......@@ -9,10 +9,9 @@
</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" />
<list default="true" id="2070e8be-2952-4d02-bba6-112a351189c8" name="Default Changelist" comment="">
<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$/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>
......@@ -26,109 +25,99 @@
<option name="formatViaClangd" value="false" />
</component>
<component name="FileEditorManager">
<leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sufst-controller.ino">
<entry file="file://$PROJECT_DIR$/ecuCan.cpp">
<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 relative-caret-position="-838">
<caret line="35" lean-forward="true" selection-start-line="35" selection-end-line="35" />
<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$/ecuCan.h">
<entry file="file://$PROJECT_DIR$/daq.cpp">
<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 relative-caret-position="323">
<caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
<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$/ecuCan.cpp">
<entry file="file://$PROJECT_DIR$/daq.h">
<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 relative-caret-position="272">
<caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/daq.cpp">
<entry file="file://$PROJECT_DIR$/wireless.h">
<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 relative-caret-position="340">
<caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/daq.h">
<entry file="file://$PROJECT_DIR$/sd.cpp">
<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 relative-caret-position="946">
<caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dashController.cpp">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/can.h">
<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 relative-caret-position="193">
<caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/can.cpp">
<entry file="file://$PROJECT_DIR$/sd.h">
<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 relative-caret-position="34">
<caret line="2" column="2" lean-forward="true" selection-start-line="2" selection-start-column="2" selection-end-line="2" selection-end-column="2" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/can.h">
<entry file="file://$PROJECT_DIR$/ecuCan.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 relative-caret-position="306">
<caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/sd.cpp">
<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="832">
<caret line="63" lean-forward="true" selection-start-line="63" selection-end-line="63" />
<state relative-caret-position="527">
<caret line="34" column="1" lean-forward="true" selection-start-line="34" selection-start-column="1" selection-end-line="34" 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$/can.cpp">
<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 relative-caret-position="272">
<caret line="85" column="15" selection-start-line="85" selection-start-column="15" selection-end-line="85" selection-end-column="15" />
</state>
</provider>
</entry>
......@@ -138,6 +127,7 @@
<component name="FindInProjectRecents">
<findStrings>
<find>HEAD</find>
<find>write</find>
</findStrings>
</component>
<component name="Git.Settings">
......@@ -146,16 +136,17 @@
<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.h" />
<option value="$PROJECT_DIR$/sd.cpp" />
<option value="$PROJECT_DIR$/daq.h" />
<option value="$PROJECT_DIR$/can.cpp" />
<option value="$PROJECT_DIR$/sufst-controller.ino" />
<option value="$PROJECT_DIR$/can.h" />
</list>
</option>
</component>
......@@ -171,9 +162,9 @@
</option>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="1909" />
<option name="width" value="1940" />
<option name="height" value="2111" />
<option name="x" value="952" />
<option name="width" value="977" />
<option name="height" value="1038" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
......@@ -181,6 +172,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
......@@ -192,12 +184,14 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</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.path.for.package.tslint" value="project" />
<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++" />
......@@ -229,19 +223,15 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="5580000" />
<option name="totallyTimeSpent" value="16191000" />
</component>
<component name="ToolWindowManager">
<frame x="1273" y="0" width="1293" height="1407" extended-state="0" />
<frame x="762" y="0" width="781" height="830" 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 active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1997226" />
<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 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" />
......@@ -249,10 +239,14 @@
<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="bottom" id="Version Control" order="7" />
<window_info anchor="bottom" id="Database Changes" order="8" />
<window_info anchor="bottom" id="Terminal" order="9" />
<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" />
<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">
......@@ -277,16 +271,14 @@
<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" />
<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$/dashController.h">
......@@ -298,87 +290,87 @@
</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 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$/can.h">
<entry file="file://$PROJECT_DIR$/wireless.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 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$/can.cpp">
<entry file="file://$PROJECT_DIR$/ecuCan.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 relative-caret-position="-838">
<caret line="35" lean-forward="true" selection-start-line="35" selection-end-line="35" />
<folding>
<element signature="e#39#58#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sd.h">
<entry file="file://$PROJECT_DIR$/daq.cpp">
<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 relative-caret-position="323">
<caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
<folding>
<element signature="e#40#56#0" expanded="true" />
</folding>
</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 relative-caret-position="272">
<caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/ecuCan.h">
<entry file="file://$PROJECT_DIR$/sd.cpp">
<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 relative-caret-position="946">
<caret line="77" lean-forward="true" selection-start-line="77" selection-end-line="77" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/ecuCan.cpp">
<entry file="file://$PROJECT_DIR$/can.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 relative-caret-position="272">
<caret line="85" column="15" selection-start-line="85" selection-start-column="15" selection-end-line="85" selection-end-column="15" />
</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 relative-caret-position="527">
<caret line="34" column="1" lean-forward="true" selection-start-line="34" selection-start-column="1" selection-end-line="34" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/daq.cpp">
<entry file="file://$PROJECT_DIR$/sd.h">
<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 relative-caret-position="34">
<caret line="2" column="2" lean-forward="true" selection-start-line="2" selection-start-column="2" selection-end-line="2" selection-end-column="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sd.cpp">
<entry file="file://$PROJECT_DIR$/ecuCan.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/can.h">
<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 relative-caret-position="193">
<caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
</state>
</provider>
</entry>
......
sufst-controller/can.cpp
+ 7
− 2
View file @ 02453a24
......@@ -236,13 +236,18 @@ void canProcessRx()
interrupts();
}
void canWrite(CanMsgTemplate *canMsg)
{
cirBufferWrite(&canTxCirBuffer, canMsg);
}
uint8_t canProcessTx()
{
uint8_t retVal = 1;
noInterrupts();
while (cirBufferAvailable(&canTxCirBuffer) > 0) {
if (cirBufferAvailable(&canTxCirBuffer) > 0) {
CanMsgTemplate canMsg;
......@@ -266,7 +271,7 @@ uint8_t canProcessTx()
uint8_t canTxWasSuccessful = 0;
for (uint8_t i = 0; i < CAN_TX_RETRY_LIMIT; i++) {
for (uint8_t i = 0; i <= CAN_TX_RETRY_LIMIT; i++) {
if (can.sendMsgBuf(canMsg.id, 1, canMsg.len,
canMsg.data, true) == CAN_OK) {
......
sufst-controller/can.h
+ 2
− 0
View file @ 02453a24
......@@ -64,6 +64,8 @@ void canProcessRx();
uint8_t canProcessTx();
void canWrite(CanMsgTemplate *canMsg);
void canNoActivityResetDevice();
#endif //SUFST_OPENLOGGER_CONTROLLER_CAN_H
sufst-controller/sd.cpp
+ 3
− 1
View file @ 02453a24
......@@ -27,7 +27,7 @@ uint8_t sdBegin()
const uint8_t SD_BASE_NAME_SIZE = sizeof(SD_BASE_FILE_NAME) - 1;
char fileName[13] = SD_BASE_FILE_NAME "00.bin";
if (!sd.begin(SD_CS_PIN, SD_SCK_MHZ(50))) {
if (!sd.begin(SD_CS_PIN, SD_SCK_MHZ(10))) {
sdState = stopped;
......@@ -69,6 +69,8 @@ uint8_t sdBegin()
return 0;
}
Serial.println("SD: WRITING");
sdState = writing;
return 1;
......
sufst-controller/sufst-controller.ino
+ 1
− 2
View file @ 02453a24
......@@ -28,9 +28,8 @@ void loop()
/*
* ALL PROCESSES *MUST* BE NON BLOCKING
*/
canProcessRx();
dashControllerProcess();
sdProcess();
//canProcessTx();
canProcessTx();
}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment