Skip to content

Fix issues #6, #12 and #16 #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
juan-marcos-t wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix issues #6, #12 and #16 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a268857
Fix issue #6
juan-marcos-t Dec 16, 2025
d0182a2
Fixes #16
juan-marcos-t Dec 16, 2025
83449ce
Fixes #12
juan-marcos-t Dec 16, 2025
f38f533
Revert d0182a2 and fix #16 instead by changing header, as function na…
juan-marcos-t Dec 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion euler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ float q_to_roll(float r, float i, float j, float k);

// Get Yaw, Pitch and Roll from quaternion
void q_to_ypr(float r, float i, float j, float k,
float *pRoll, float *pPitch, float *pYaw);
float *pYaw, float *pPitch, float *pRoll);

#endif
8 changes: 5 additions & 3 deletions sh2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,9 +887,11 @@ static void getProdIdRx(sh2_t *pSh2, const uint8_t *payload, uint16_t len)
}

// Complete this operation if there is no storage for more product ids
if ((pSh2->opData.getProdIds.pProdIds == 0) ||
(pSh2->opData.getProdIds.nextEntry >= pSh2->opData.getProdIds.expectedEntries)) {

if (pSh2->opData.getProdIds.pProdIds == 0){
opCompleted(pSh2, SH2_OK);
return;
}
if (pSh2->opData.getProdIds.nextEntry >= pSh2->opData.getProdIds.expectedEntries) {
pSh2->opData.getProdIds.pProdIds->numEntries = pSh2->opData.getProdIds.nextEntry;
opCompleted(pSh2, SH2_OK);
}
Expand Down
21 changes: 11 additions & 10 deletions shtp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,17 @@ static void rxAssemble(shtp_t *pShtp, uint8_t *in, uint16_t len, uint32_t t_us)
chan = in[2];
seq = in[3];

if (chan >= SHTP_MAX_CHANS) {
// Invalid channel id.
pShtp->rxBadChan++;

if (pShtp->eventCallback) {
pShtp->eventCallback(pShtp->eventCookie, SHTP_BAD_RX_CHAN);
}
return;
}


if (seq != pShtp->chan[chan].nextInSeq){
if (pShtp->eventCallback) {
pShtp->eventCallback(pShtp->eventCookie,
Expand All @@ -212,16 +223,6 @@ static void rxAssemble(shtp_t *pShtp, uint8_t *in, uint16_t len, uint32_t t_us)
}
return;
}

if (chan >= SHTP_MAX_CHANS) {
// Invalid channel id.
pShtp->rxBadChan++;

if (pShtp->eventCallback) {
pShtp->eventCallback(pShtp->eventCookie, SHTP_BAD_RX_CHAN);
}
return;
}

// Discard earlier assembly in progress if the received data doesn't match it.
if (pShtp->inRemaining) {
Expand Down