Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/BlueAndi/RadonUlzer into Se…
Browse files Browse the repository at this point in the history
…nsorFusion/base
  • Loading branch information
jkerpe committed Nov 23, 2023
2 parents 705aca1 + 847d3b9 commit a8bfaa1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
5 changes: 2 additions & 3 deletions lib/APPConvoyLeader/App.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -167,12 +167,11 @@ void App::reportSpeed()
*
* @param[in] payload Motor speed left/right
* @param[in] payloadSize Size of twice motor speeds
* @param[in] userData User data provided by the application.
* @param[in] userData User data
*/
void App_motorSpeedSetpointsChannelCallback(const uint8_t* payload, const uint8_t payloadSize, void* userData)
{
/* Not implemented*/
(void) userData;
(void)userData;
if ((nullptr != payload) && (SPEED_SETPOINT_CHANNEL_DLC == payloadSize))
{
const SpeedData* motorSpeedData = reinterpret_cast<const SpeedData*>(payload);
Expand Down
10 changes: 4 additions & 6 deletions lib/APPRemoteControl/App.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -191,12 +191,11 @@ void App::sendLineSensorsData() const
*
* @param[in] payload Command id
* @param[in] payloadSize Size of command id
* @param[in] userData User data provided by the application.
* @param[in] userData User data
*/
static void App_cmdChannelCallback(const uint8_t* payload, const uint8_t payloadSize, void* userData)
{
/* Not implemented*/
(void) userData;
(void)userData;
if ((nullptr != payload) && (sizeof(RemoteCtrlState::CmdId) == payloadSize))
{
RemoteCtrlState::CmdId cmdId = *reinterpret_cast<const RemoteCtrlState::CmdId*>(payload);
Expand All @@ -210,12 +209,11 @@ static void App_cmdChannelCallback(const uint8_t* payload, const uint8_t payload
*
* @param[in] payload Motor speed left/right
* @param[in] payloadSize Size of twice motor speeds
* @param[in] userData User data provided by the application.
* @param[in] userData User data
*/
static void App_motorSpeedsChannelCallback(const uint8_t* payload, const uint8_t payloadSize, void* userData)
{
/* Not implemented*/
(void) userData;
(void)userData;
if ((nullptr != payload) && (SPEED_SETPOINT_CHANNEL_DLC == payloadSize) && (true == gIsRemoteCtrlActive))
{
const SpeedData* motorSpeedData = reinterpret_cast<const SpeedData*>(payload);
Expand Down

0 comments on commit a8bfaa1

Please sign in to comment.