Merge branch 'vedderb:master' into ci

darwinbeing · Dec 4, 2023 · 6e59e95 · 6e59e95
2 parents 03f9011 + 9219abe
commit 6e59e95
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/QCodeEditor/resources/languages/lisp.xml b/QCodeEditor/resources/languages/lisp.xml
@@ -381,6 +381,7 @@
 <name>bufcpy</name>
 <name>bufset-bit</name>
 <name>buf-find</name>
+<name>buf-resize</name>
 <name>load-native-lib</name>
 <name>unload-native-lib</name>
 <name>uavcan-last-rawcmd</name>

diff --git a/mobile/StatPage.qml b/mobile/StatPage.qml
@@ -108,7 +108,7 @@ Item {
             tripText.text =
                     "Time       : " + new Date(val.count_time * 1000).toISOString().substr(11, 8) + "\n" +
                     "Distance   : " + parseFloat(val.distance()).toFixed(2) + " m\n" +
-                    "Efficiency : " + parseFloat(val.efficiency() * impFact).toFixed(3) + " " + efficiencyUnit + "\n" +
+                    "Efficiency : " + parseFloat(val.efficiency() / impFact).toFixed(3) + " " + efficiencyUnit + "\n" +
                     "Energy     : " + parseFloat(val.energy()).toFixed(3) + " Wh\n" +
                     "Ah         : " + parseFloat(val.ah()).toFixed(3) + " Ah\n" +
                     "Speed Avg  : " + parseFloat(val.speed_avg * 3.6 * impFact).toFixed(1) + " " + speedUnit + "\n" +