Skip to content

Added: method for returning 16 bit channels #32

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

Merged
Witty-Wizard merged 1 commit into from
Dec 6, 2024
Merged

Added: method for returning 16 bit channels #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion src/SerialIO.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,6 @@ void SerialIO::leftShift(uint8_t arr[], size_t size) {
void SerialIO::rightShift(uint8_t arr[], size_t size) {
memmove(arr + 1, arr, size - 1);
arr[0] = 0xFF;
}
}

void SerialIO::getChannel(ibus_channels_t *channelData) {}
7 changes: 7 additions & 0 deletions src/SerialIO.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#ifndef SerialIO_H
#define SerialIO_H
#include <Arduino.h>
#include <ibus/ibus_protocol.h>
#define PACKED __attribute__((packed))

typedef struct rc_channels_s {
Expand Down Expand Up @@ -69,6 +70,12 @@ class SerialIO {
/**************************************************************************/
virtual void getChannel(rc_channels_t *channelData) = 0;

/*!
@brief Get the ChannelData.
*/
/**************************************************************************/
virtual void getChannel(ibus_channels_t *channelData);

protected:
Stream
*_rxPort; // Pointer to the hardware serial port used for communication.
Expand Down
32 changes: 18 additions & 14 deletions src/ibus/ibus.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,20 +51,24 @@ void ibus::processIncoming() {
}

void ibus::getChannel(rc_channels_t *channelData) {
channelData->channel1=_channelData.channel1;
channelData->channel2=_channelData.channel2;
channelData->channel3=_channelData.channel3;
channelData->channel4=_channelData.channel4;
channelData->channel5=_channelData.channel5;
channelData->channel6=_channelData.channel6;
channelData->channel7=_channelData.channel7;
channelData->channel8=_channelData.channel8;
channelData->channel9=_channelData.channel9;
channelData->channel10=_channelData.channel10;
channelData->channel11=_channelData.channel11;
channelData->channel12=_channelData.channel12;
channelData->channel13=_channelData.channel13;
channelData->channel14=_channelData.channel14;
channelData->channel1 = _channelData.channel1;
channelData->channel2 = _channelData.channel2;
channelData->channel3 = _channelData.channel3;
channelData->channel4 = _channelData.channel4;
channelData->channel5 = _channelData.channel5;
channelData->channel6 = _channelData.channel6;
channelData->channel7 = _channelData.channel7;
channelData->channel8 = _channelData.channel8;
channelData->channel9 = _channelData.channel9;
channelData->channel10 = _channelData.channel10;
channelData->channel11 = _channelData.channel11;
channelData->channel12 = _channelData.channel12;
channelData->channel13 = _channelData.channel13;
channelData->channel14 = _channelData.channel14;
}

void ibus::getChannel(ibus_channels_t *channelData) {
*channelData = _channelData;
}

bool ibus::checkSum() {
Expand Down
9 changes: 8 additions & 1 deletion src/ibus/ibus.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,17 @@ class ibus : public SerialIO {

/**
* @brief Gets the decoded RC channels from the IBUS data.
* @param channelData Pointer to a crsf_channels_t struct where the decoded
* @param channelData Pointer to a rc_channels_t struct where the decoded
* channel data will be stored.
*/
void getChannel(rc_channels_t *channelData) override;

/**
* @brief Gets the decoded RC channels from the IBUS data.
* @param channelData Pointer to a ibus_channels_t struct where the decoded
* channel data will be stored.
*/
void getChannel(ibus_channels_t *channelData) override;
};

#endif // IBUS_H
Loading