Skip to content

Commit

Permalink
Merge branch 'vedderb:master' into ci
Browse files Browse the repository at this point in the history
  • Loading branch information
darwinbeing authored Oct 16, 2023
2 parents 0f96762 + c07c597 commit 29c6ca8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 3 additions & 0 deletions QCodeEditor/resources/languages/lisp.xml
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,8 @@
<name>get-current-in</name>
<name>get-id</name>
<name>get-iq</name>
<name>get-id-set</name>
<name>get-iq-set</name>
<name>get-vd</name>
<name>get-vq</name>
<name>get-est-lambda</name>
Expand Down Expand Up @@ -348,6 +350,7 @@
<name>conf-restore-mc</name>
<name>conf-restore-app</name>
<name>conf-dc-cal</name>
<name>conf-get-limits</name>
<name>free</name>
<name>bufcreate</name>
<name>array-create</name>
Expand Down
4 changes: 1 addition & 3 deletions commands.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -596,9 +596,7 @@ void Commands::processPacket(QByteArray data)
values.q3 = vb.vbPopFrontDouble32Auto();
}
if (vb.size() >= 1) {
if (mask & (uint32_t(1) << 16)) {
values.vesc_id = vb.vbPopFrontUint8();
}
values.vesc_id = vb.vbPopFrontUint8();
}

emit valuesImuReceived(values, mask);
Expand Down

0 comments on commit 29c6ca8

Please sign in to comment.