Merge branch 'vedderb:master' into ci

darwinbeing · Apr 8, 2024 · eaf6e29 · eaf6e29
2 parents 4d199ff + f03aca6
commit eaf6e29
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/QCodeEditor/resources/languages/lisp.xml b/QCodeEditor/resources/languages/lisp.xml
@@ -471,6 +471,8 @@
 <name>sleep-config-wakeup-pin</name>
 <name>canmsg-send</name>
 <name>canmsg-recv</name>
+<name>f-connect</name>
+<name>f-disconnect</name>
 <name>f-open</name>
 <name>f-close</name>
 <name>f-read</name>

diff --git a/pages/pageloganalysis.cpp b/pages/pageloganalysis.cpp
@@ -305,6 +305,10 @@ void PageLogAnalysis::setVesc(VescInterface *vesc)
                 fieldNum++;
             }
 
+            if (fieldNum >= 0) {
+                return;
+            }
+
             mLogRtHeader.resize(fieldNum);
 
             if (mLogRtAppendTime) {