refactor(RemoteChar): Reduce nesting

[thekurtovic]

• Renamed desc_filter_t to NimBLEDescriptorFilter
• Added NimBLERemoteDescriptor pointer to NimBLEDescriptorFilter
• retrieveDescriptors changed to take NimBLEDescriptorFilter pointer
• General cleanup

[h2zero]

Nice cleanup, thanks! Need to make some changes to retrieveDescriptors though.

[thekurtovic]

Only part I'm unsure about right now is whether

if (rc == BLE_HS_EDONE) {
    NimBLEUtils::taskRelease(*pTaskData, rc);
}

should be

if (rc != 0) {
    NimBLEUtils::taskRelease(*pTaskData, rc);
}

Also not sure if it's safe to group this check up with the others. Should it always return zero here or is it fine to return error->status by jumping to the end?

if (pChr->getHandle() != chr_val_handle) {
    return 0; // Descriptor not for this characteristic
}

[h2zero]

Almost there 👍

[h2zero]

Couple of thoughts to extend the changes, let me know what you think.

[thekurtovic]

Moved things around in descriptorDiscCB to avoid goto.
Had to change the definition of desc_filter_t to make the forward declaration work.
Updated documentation.

[h2zero]

Sorry to be a pain, just a couple minor items.

[h2zero]

LGTM! Thanks!

[h2zero]

@thekurtovic Could you please rebase this? Master added a check that should remain.

[thekurtovic]

Still contains the change desc_filter_t

[h2zero]

Might need to try again, I fixed the build issue but there is a merge conflict.

[thekurtovic]

If I resolve the conflict then it adds an additional commit to this PR. Am I supposed to squash everything into my main commit?

[h2zero]

I can squash the commits after when merging.

[h2zero]

Thanks, I rebased it and pushed back to your branch.

[thekurtovic]

Thanks, I was just about to try something myself.

For future reference, would this have worked?

git checkout refactor
git checkout -b temp-squash-branch
...squash commits back my original commit...
git push --force-with-lease origin refactor

Normally I just do git rebase -i HEAD~2 to handle back-to-back commits I've made, but it didn't seem so straight forward this time around since there were other unrelated commits. I guess I'll find out next time

[h2zero]

All I did was:
git rebase master,
fixed the conflicts,
git add .
git rebase --continue
git push -f origin refactor

You could squash before or after this, usually easier before.

[thekurtovic]

Thanks. I was trying to rebase my branch after fixing the conflict but the rebase kept showing me commits from master only for whatever reason. I thought master was being merged into the branch opposed to the other way around. I need to lookup a git tutorial