Skip to content
Snippets Groups Projects
Commit 75bf208e authored by nrs1g15's avatar nrs1g15
Browse files

Cant for the life of me work out why about 3000 Kbytes per second is a hard... 

Cant for the life of me work out why about 3000 Kbytes per second is a hard limit before corruption occurs... Worth seeing the uart on the oscilloscope to see if thers something in hardware causing this limit
parent 32c48f09
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 87 additions and 129 deletions
sufst-openlogger/.idea/workspace.xml
+ 30
− 91
View file @ 75bf208e
...@@ -10,20 +10,7 @@ ...@@ -10,20 +10,7 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="81322c4e-6adb-4223-9d00-22249012da89" name="Default Changelist" comment=""> <list default="true" id="81322c4e-6adb-4223-9d00-22249012da89" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/buffer.cpp" afterDir="false" />
<change afterPath="$PROJECT_DIR$/buffer.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/openLogger.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/openLogger.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/openLogger.h" beforeDir="false" afterPath="$PROJECT_DIR$/openLogger.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../sufst-openlogger_controller/.idea/codeStyles/Project.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../sufst-openlogger_controller/.idea/codeStyles/Project.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../sufst-openlogger_controller/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../sufst-openlogger_controller/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../sufst-openlogger_controller/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../sufst-openlogger_controller/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../sufst-openlogger_controller/can.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/../sufst-openlogger_controller/can.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../sufst-openlogger_controller/can.h" beforeDir="false" afterPath="$PROJECT_DIR$/../sufst-openlogger_controller/can.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../sufst-openlogger_controller/circularBuffer.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/../sufst-openlogger_controller/circularBuffer.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../sufst-openlogger_controller/circularBuffer.h" beforeDir="false" afterPath="$PROJECT_DIR$/../sufst-openlogger_controller/circularBuffer.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../sufst-openlogger_controller/openLoggerController.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/../sufst-openlogger_controller/openLoggerController.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../sufst-openlogger_controller/openLoggerController.h" beforeDir="false" afterPath="$PROJECT_DIR$/../sufst-openlogger_controller/openLoggerController.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../sufst-openlogger_controller/sufst-openlogger_controller.ino" beforeDir="false" afterPath="$PROJECT_DIR$/../sufst-openlogger_controller/sufst-openlogger_controller.ino" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -42,38 +29,17 @@ ...@@ -42,38 +29,17 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sufst-openlogger.ino"> <entry file="file://$PROJECT_DIR$/sufst-openlogger.ino">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289"> <state relative-caret-position="357">
<caret line="17" selection-start-line="17" selection-end-line="17" /> <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/openLogger.cpp"> <entry file="file://$PROJECT_DIR$/openLogger.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="517"> <state relative-caret-position="467">
<caret line="212" column="35" selection-start-line="212" selection-start-column="35" selection-end-line="212" selection-end-column="35" /> <caret line="210" column="26" lean-forward="true" selection-start-line="210" selection-start-column="26" selection-end-line="210" selection-end-column="26" />
<folding>
<element signature="e#180#665#0" expanded="true" />
<element signature="e#2546#2627#0" expanded="true" />
<element signature="e#2800#2884#0" expanded="true" />
<element signature="e#3157#3194#0" expanded="true" />
<element signature="e#3371#3453#0" expanded="true" />
<element signature="e#3725#3802#0" expanded="true" />
<element signature="e#5088#5171#0" expanded="true" />
<element signature="e#5408#5449#0" expanded="true" />
<element signature="e#5904#5939#0" expanded="true" />
<element signature="e#5602#5641#0" expanded="true" />
<element signature="e#6603#6674#0" expanded="true" />
<element signature="e#7284#7325#0" expanded="true" />
<element signature="e#7460#7540#0" expanded="true" />
<element signature="e#7641#7681#0" expanded="true" />
<element signature="e#7772#7817#0" expanded="true" />
<element signature="e#7917#8001#0" expanded="true" />
<element signature="e#8118#8153#0" expanded="true" />
<element signature="e#8212#8247#0" expanded="true" />
<element signature="e#8357#8437#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -81,8 +47,8 @@ ...@@ -81,8 +47,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/buffer.cpp"> <entry file="file://$PROJECT_DIR$/buffer.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="577"> <state relative-caret-position="-321">
<caret line="89" column="51" selection-start-line="89" selection-start-column="51" selection-end-line="89" selection-end-column="51" /> <caret line="15" column="5" lean-forward="true" selection-start-line="15" selection-start-column="5" selection-end-line="15" selection-end-column="5" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -90,20 +56,17 @@ ...@@ -90,20 +56,17 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/buffer.h"> <entry file="file://$PROJECT_DIR$/buffer.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="561"> <state relative-caret-position="102">
<caret line="33" column="22" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" /> <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/openLogger.h"> <entry file="file://$PROJECT_DIR$/openLogger.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340"> <state relative-caret-position="391">
<caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" /> <caret line="23" column="40" selection-start-line="23" selection-start-column="40" selection-end-line="23" selection-end-column="40" />
<folding>
<element signature="e#188#230#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -179,7 +142,6 @@ ...@@ -179,7 +142,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -191,6 +153,7 @@ ...@@ -191,6 +153,7 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -240,14 +203,14 @@ ...@@ -240,14 +203,14 @@
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="74105000" /> <option name="totallyTimeSpent" value="74201000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="660" y="0" width="1907" height="1407" extended-state="0" /> <frame x="378" y="0" width="2188" height="1408" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.49803922" visible="true" weight="0.19978343" /> <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4976489" visible="true" weight="0.17528196" />
<window_info active="true" id="Structure" order="1" sideWeight="0.5019608" side_tool="true" visible="true" weight="0.19978343" /> <window_info active="true" id="Structure" order="1" sideWeight="0.5023511" side_tool="true" visible="true" weight="0.17528196" />
<window_info id="Favorites" order="2" side_tool="true" weight="0.32916266" /> <window_info id="Favorites" order="2" side_tool="true" weight="0.32916266" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" /> <window_info anchor="bottom" id="Find" order="1" />
...@@ -274,60 +237,36 @@ ...@@ -274,60 +237,36 @@
<entry file="file://$PROJECT_DIR$/circularBuffer.h" /> <entry file="file://$PROJECT_DIR$/circularBuffer.h" />
<entry file="file://$PROJECT_DIR$/buffer.cpp"> <entry file="file://$PROJECT_DIR$/buffer.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="577"> <state relative-caret-position="-321">
<caret line="89" column="51" selection-start-line="89" selection-start-column="51" selection-end-line="89" selection-end-column="51" /> <caret line="15" column="5" lean-forward="true" selection-start-line="15" selection-start-column="5" selection-end-line="15" selection-end-column="5" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/buffer.h"> <entry file="file://$PROJECT_DIR$/buffer.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="561"> <state relative-caret-position="102">
<caret line="33" column="22" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" /> <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/openLogger.cpp"> <entry file="file://$PROJECT_DIR$/sufst-openlogger.ino">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="517"> <state relative-caret-position="357">
<caret line="212" column="35" selection-start-line="212" selection-start-column="35" selection-end-line="212" selection-end-column="35" /> <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
<folding>
<element signature="e#180#665#0" expanded="true" />
<element signature="e#2546#2627#0" expanded="true" />
<element signature="e#2800#2884#0" expanded="true" />
<element signature="e#3157#3194#0" expanded="true" />
<element signature="e#3371#3453#0" expanded="true" />
<element signature="e#3725#3802#0" expanded="true" />
<element signature="e#5088#5171#0" expanded="true" />
<element signature="e#5408#5449#0" expanded="true" />
<element signature="e#5904#5939#0" expanded="true" />
<element signature="e#5602#5641#0" expanded="true" />
<element signature="e#6603#6674#0" expanded="true" />
<element signature="e#7284#7325#0" expanded="true" />
<element signature="e#7460#7540#0" expanded="true" />
<element signature="e#7641#7681#0" expanded="true" />
<element signature="e#7772#7817#0" expanded="true" />
<element signature="e#7917#8001#0" expanded="true" />
<element signature="e#8118#8153#0" expanded="true" />
<element signature="e#8212#8247#0" expanded="true" />
<element signature="e#8357#8437#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/sufst-openlogger.ino"> <entry file="file://$PROJECT_DIR$/openLogger.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289"> <state relative-caret-position="391">
<caret line="17" selection-start-line="17" selection-end-line="17" /> <caret line="23" column="40" selection-start-line="23" selection-start-column="40" selection-end-line="23" selection-end-column="40" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/openLogger.h"> <entry file="file://$PROJECT_DIR$/openLogger.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340"> <state relative-caret-position="467">
<caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" /> <caret line="210" column="26" lean-forward="true" selection-start-line="210" selection-start-column="26" selection-end-line="210" selection-end-column="26" />
<folding>
<element signature="e#188#230#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
sufst-openlogger_controller/.idea/workspace.xml
+ 45
− 34
View file @ 75bf208e
...@@ -10,15 +10,8 @@ ...@@ -10,15 +10,8 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e173ebdc-c119-4235-9653-364cc21b27a5" name="Default Changelist" comment=""> <list default="true" id="e173ebdc-c119-4235-9653-364cc21b27a5" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/buffer.cpp" afterDir="false" />
<change afterPath="$PROJECT_DIR$/buffer.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../sufst-openlogger/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../sufst-openlogger/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/../sufst-openlogger/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../sufst-openlogger/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/buffer.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/buffer.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$/circularBuffer.cpp" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/circularBuffer.h" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/openLoggerController.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/openLoggerController.cpp" afterDir="false" /> <change beforePath="$PROJECT_DIR$/openLoggerController.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/openLoggerController.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/openLoggerController.h" beforeDir="false" afterPath="$PROJECT_DIR$/openLoggerController.h" afterDir="false" /> <change beforePath="$PROJECT_DIR$/openLoggerController.h" beforeDir="false" afterPath="$PROJECT_DIR$/openLoggerController.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sufst-openlogger_controller.ino" beforeDir="false" afterPath="$PROJECT_DIR$/sufst-openlogger_controller.ino" afterDir="false" /> <change beforePath="$PROJECT_DIR$/sufst-openlogger_controller.ino" beforeDir="false" afterPath="$PROJECT_DIR$/sufst-openlogger_controller.ino" afterDir="false" />
...@@ -54,8 +47,8 @@ ...@@ -54,8 +47,8 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/sufst-openlogger_controller.ino"> <entry file="file://$PROJECT_DIR$/sufst-openlogger_controller.ino">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="561"> <state relative-caret-position="613">
<caret line="372" column="37" selection-start-line="372" selection-start-column="37" selection-end-line="372" selection-end-column="37" /> <caret line="375" column="27" selection-start-line="375" selection-start-column="27" selection-end-line="375" selection-end-column="27" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -63,13 +56,22 @@ ...@@ -63,13 +56,22 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/openLoggerController.cpp"> <entry file="file://$PROJECT_DIR$/openLoggerController.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1312"> <state relative-caret-position="610">
<caret line="177" column="26" selection-start-line="177" selection-start-column="26" selection-end-line="177" selection-end-column="26" /> <caret line="185" lean-forward="true" selection-start-line="185" selection-end-line="185" />
<folding> <folding>
<element signature="e#40#73#0" expanded="true" /> <element signature="e#40#73#0" expanded="true" />
<element signature="e#2292#2367#0" expanded="true" /> <element signature="e#2292#2367#0" expanded="true" />
<element signature="e#2559#2637#0" expanded="true" /> <element signature="e#2559#2637#0" expanded="true" />
<element signature="e#2895#2973#0" expanded="true" /> <element signature="e#2895#2973#0" expanded="true" />
<element signature="e#4435#4468#0" expanded="true" />
<element signature="e#4894#4935#0" expanded="true" />
<element signature="e#5052#5092#0" expanded="true" />
<element signature="e#5210#5251#0" expanded="true" />
<element signature="e#5773#5813#0" expanded="true" />
<element signature="e#5953#6000#0" expanded="true" />
<element signature="e#6138#6185#0" expanded="true" />
<element signature="e#6384#6509#0" expanded="true" />
<element signature="e#7073#7169#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -78,8 +80,8 @@ ...@@ -78,8 +80,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/openLoggerController.h"> <entry file="file://$PROJECT_DIR$/openLoggerController.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187"> <state relative-caret-position="221">
<caret line="11" column="36" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" /> <caret line="13" column="76" selection-start-line="13" selection-start-column="76" selection-end-line="13" selection-end-column="76" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -88,7 +90,7 @@ ...@@ -88,7 +90,7 @@
<entry file="file://$PROJECT_DIR$/buffer.h"> <entry file="file://$PROJECT_DIR$/buffer.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459"> <state relative-caret-position="459">
<caret line="27" column="27" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="27" /> <caret line="27" column="9" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -96,8 +98,8 @@ ...@@ -96,8 +98,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/buffer.cpp"> <entry file="file://$PROJECT_DIR$/buffer.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="560"> <state relative-caret-position="283">
<caret line="92" column="41" lean-forward="true" selection-start-line="92" selection-start-column="41" selection-end-line="92" selection-end-column="41" /> <caret line="82" column="85" selection-start-line="82" selection-start-column="85" selection-end-line="82" selection-end-column="85" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -106,7 +108,7 @@ ...@@ -106,7 +108,7 @@
<entry file="file://$PROJECT_DIR$/can.cpp"> <entry file="file://$PROJECT_DIR$/can.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="32"> <state relative-caret-position="32">
<caret line="210" column="30" lean-forward="true" selection-start-line="210" selection-start-column="30" selection-end-line="210" selection-end-column="30" /> <caret line="210" column="30" selection-start-line="210" selection-start-column="30" selection-end-line="210" selection-end-column="30" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -124,7 +126,6 @@ ...@@ -124,7 +126,6 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>Running</find>
<find>openloggerTxPayload</find> <find>openloggerTxPayload</find>
<find>cirBuffer</find> <find>cirBuffer</find>
<find>openloggerCommandTxCirBuffer</find> <find>openloggerCommandTxCirBuffer</find>
...@@ -152,8 +153,9 @@ ...@@ -152,8 +153,9 @@
<find>cirBufferAvailable</find> <find>cirBufferAvailable</find>
<find>availableForWrite</find> <find>availableForWrite</find>
<find>available</find> <find>available</find>
<find>Serial</find>
<find>tail</find> <find>tail</find>
<find>Serial</find>
<find>OPENLOGGER_TX_BUFFER_LEN</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>Serial1</replace> <replace>Serial1</replace>
...@@ -173,9 +175,9 @@ ...@@ -173,9 +175,9 @@
<option value="$PROJECT_DIR$/can.h" /> <option value="$PROJECT_DIR$/can.h" />
<option value="$PROJECT_DIR$/can.cpp" /> <option value="$PROJECT_DIR$/can.cpp" />
<option value="$PROJECT_DIR$/buffer.h" /> <option value="$PROJECT_DIR$/buffer.h" />
<option value="$PROJECT_DIR$/openLoggerController.h" />
<option value="$PROJECT_DIR$/buffer.cpp" /> <option value="$PROJECT_DIR$/buffer.cpp" />
<option value="$PROJECT_DIR$/openLoggerController.cpp" /> <option value="$PROJECT_DIR$/openLoggerController.cpp" />
<option value="$PROJECT_DIR$/openLoggerController.h" />
<option value="$PROJECT_DIR$/sufst-openlogger_controller.ino" /> <option value="$PROJECT_DIR$/sufst-openlogger_controller.ino" />
</list> </list>
</option> </option>
...@@ -253,7 +255,7 @@ ...@@ -253,7 +255,7 @@
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="78860000" /> <option name="totallyTimeSpent" value="79672000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="380" y="0" width="2188" height="1408" extended-state="0" /> <frame x="380" y="0" width="2188" height="1408" extended-state="0" />
...@@ -301,48 +303,57 @@ ...@@ -301,48 +303,57 @@
<entry file="file://$PROJECT_DIR$/buffer.h"> <entry file="file://$PROJECT_DIR$/buffer.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459"> <state relative-caret-position="459">
<caret line="27" column="27" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="27" /> <caret line="27" column="9" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/can.cpp"> <entry file="file://$PROJECT_DIR$/can.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="32"> <state relative-caret-position="32">
<caret line="210" column="30" lean-forward="true" selection-start-line="210" selection-start-column="30" selection-end-line="210" selection-end-column="30" /> <caret line="210" column="30" selection-start-line="210" selection-start-column="30" selection-end-line="210" selection-end-column="30" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/openLoggerController.h"> <entry file="file://$PROJECT_DIR$/buffer.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187"> <state relative-caret-position="283">
<caret line="11" column="36" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" /> <caret line="82" column="85" selection-start-line="82" selection-start-column="85" selection-end-line="82" selection-end-column="85" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/openLoggerController.cpp"> <entry file="file://$PROJECT_DIR$/openLoggerController.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1312"> <state relative-caret-position="610">
<caret line="177" column="26" selection-start-line="177" selection-start-column="26" selection-end-line="177" selection-end-column="26" /> <caret line="185" lean-forward="true" selection-start-line="185" selection-end-line="185" />
<folding> <folding>
<element signature="e#40#73#0" expanded="true" /> <element signature="e#40#73#0" expanded="true" />
<element signature="e#2292#2367#0" expanded="true" /> <element signature="e#2292#2367#0" expanded="true" />
<element signature="e#2559#2637#0" expanded="true" /> <element signature="e#2559#2637#0" expanded="true" />
<element signature="e#2895#2973#0" expanded="true" /> <element signature="e#2895#2973#0" expanded="true" />
<element signature="e#4435#4468#0" expanded="true" />
<element signature="e#4894#4935#0" expanded="true" />
<element signature="e#5052#5092#0" expanded="true" />
<element signature="e#5210#5251#0" expanded="true" />
<element signature="e#5773#5813#0" expanded="true" />
<element signature="e#5953#6000#0" expanded="true" />
<element signature="e#6138#6185#0" expanded="true" />
<element signature="e#6384#6509#0" expanded="true" />
<element signature="e#7073#7169#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/buffer.cpp"> <entry file="file://$PROJECT_DIR$/openLoggerController.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="560"> <state relative-caret-position="221">
<caret line="92" column="41" lean-forward="true" selection-start-line="92" selection-start-column="41" selection-end-line="92" selection-end-column="41" /> <caret line="13" column="76" selection-start-line="13" selection-start-column="76" selection-end-line="13" selection-end-column="76" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/sufst-openlogger_controller.ino"> <entry file="file://$PROJECT_DIR$/sufst-openlogger_controller.ino">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="561"> <state relative-caret-position="613">
<caret line="372" column="37" selection-start-line="372" selection-start-column="37" selection-end-line="372" selection-end-column="37" /> <caret line="375" column="27" selection-start-line="375" selection-start-column="27" selection-end-line="375" selection-end-column="27" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
sufst-openlogger_controller/buffer.cpp
+ 1
− 1
View file @ 75bf208e
...@@ -80,7 +80,7 @@ void cirBufferWriteBytes(cirBuffer_handle cirBuff, void *src, uint16_t len) ...@@ -80,7 +80,7 @@ void cirBufferWriteBytes(cirBuffer_handle cirBuff, void *src, uint16_t len)
} }
if (cirBuff->full) { if (cirBuff->full) {
cirBuff->tail = (cirBuff->tail + (len - usedBytes)) & cirBuff->capacity; cirBuff->tail = (cirBuff->tail + (len - usedBytes)) & (cirBuff->capacity + 1);
} }
} }
......
sufst-openlogger_controller/openLoggerController.cpp
+ 2
− 1
View file @ 75bf208e
...@@ -182,6 +182,7 @@ void openloggerRunning() ...@@ -182,6 +182,7 @@ void openloggerRunning()
Serial1.write(uartStartByte); Serial1.write(uartStartByte);
Serial1.write(uartTypeData); Serial1.write(uartTypeData);
Serial1.write(uartAmountToTransmit); Serial1.write(uartAmountToTransmit);
Serial1.flush();
uartCurrentlyTransmitting = true; uartCurrentlyTransmitting = true;
} }
...@@ -190,7 +191,7 @@ void openloggerRunning() ...@@ -190,7 +191,7 @@ void openloggerRunning()
if (uartCurrentlyTransmitting) { if (uartCurrentlyTransmitting) {
uint8_t uartAvailableForData = Serial1.availableForWrite() - 2; uint8_t uartAvailableForData = Serial1.availableForWrite();
#if DEBUG_OPENLOGGER #if DEBUG_OPENLOGGER
Serial.println("OPLOG: WRITING"); Serial.println("OPLOG: WRITING");
......
sufst-openlogger_controller/openLoggerController.h
+ 6
− 1
View file @ 75bf208e
...@@ -9,7 +9,12 @@ ...@@ -9,7 +9,12 @@
#define DEBUG_OPENLOGGER 0 #define DEBUG_OPENLOGGER 0
#define OPENLOGGER_TX_BUFFER_LEN 512 /*
* TODO: Investigate why we cant send more than 64 bytes per 20ms without corruption happening.
* Until then keep the buffer size at 64 to prevent transmission corruption
*/
#define OPENLOGGER_TX_BUFFER_LEN 64
#define OPENLOGGER_TX_COMMAND_BUFFER_LEN 8 #define OPENLOGGER_TX_COMMAND_BUFFER_LEN 8
/* /*
......
sufst-openlogger_controller/sufst-openlogger_controller.ino
+ 3
− 1
View file @ 75bf208e
...@@ -369,9 +369,11 @@ void loop() ...@@ -369,9 +369,11 @@ void loop()
if ((currMs - lastSdWriteMs) >= 20) { if ((currMs - lastSdWriteMs) >= 20) {
openloggerWrite(payload, 20); openloggerWrite(payload, 20);
payload[0] = ++cnt;
openloggerWrite(payload, 20); openloggerWrite(payload, 20);
payload[0] = ++cnt;
openloggerWrite(payload, 20); openloggerWrite(payload, 20);
cnt++; payload[0] = ++cnt;
lastSdWriteMs = millis(); lastSdWriteMs = millis();
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment