diff --git a/lib/APPConvoyLeader/App.cpp b/lib/APPConvoyLeader/App.cpp index b39a6b75..39a9b6e4 100644 --- a/lib/APPConvoyLeader/App.cpp +++ b/lib/APPConvoyLeader/App.cpp @@ -56,7 +56,7 @@ * Prototypes *****************************************************************************/ -static void App_motorSpeedSetpointsChannelCallback(const uint8_t* payload, const uint8_t payloadSize); +static void App_motorSpeedSetpointsChannelCallback(const uint8_t* payload, const uint8_t payloadSize, void* userData); /****************************************************************************** * Local Variables @@ -167,9 +167,12 @@ 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. */ -void App_motorSpeedSetpointsChannelCallback(const uint8_t* payload, const uint8_t payloadSize) +void App_motorSpeedSetpointsChannelCallback(const uint8_t* payload, const uint8_t payloadSize, void* userData) { + /* Not implemented*/ + (void) userData; if ((nullptr != payload) && (SPEED_SETPOINT_CHANNEL_DLC == payloadSize)) { const SpeedData* motorSpeedData = reinterpret_cast(payload); diff --git a/lib/APPConvoyLeader/library.json b/lib/APPConvoyLeader/library.json index 22269058..7cade5d2 100644 --- a/lib/APPConvoyLeader/library.json +++ b/lib/APPConvoyLeader/library.json @@ -21,7 +21,7 @@ { "owner": "gabryelreyes", "name": "SerialMuxProt", - "version": "^1.0.0" + "version": "^2.0.0" } ], "frameworks": "*", diff --git a/lib/APPRemoteControl/App.cpp b/lib/APPRemoteControl/App.cpp index 86c64930..36985b77 100644 --- a/lib/APPRemoteControl/App.cpp +++ b/lib/APPRemoteControl/App.cpp @@ -58,8 +58,8 @@ * Prototypes *****************************************************************************/ -static void App_cmdChannelCallback(const uint8_t* payload, const uint8_t payloadSize); -static void App_motorSpeedsChannelCallback(const uint8_t* payload, const uint8_t payloadSize); +static void App_cmdChannelCallback(const uint8_t* payload, const uint8_t payloadSize, void* userData); +static void App_motorSpeedsChannelCallback(const uint8_t* payload, const uint8_t payloadSize, void* userData); /****************************************************************************** * Local Variables @@ -191,9 +191,12 @@ 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. */ -static void App_cmdChannelCallback(const uint8_t* payload, const uint8_t payloadSize) +static void App_cmdChannelCallback(const uint8_t* payload, const uint8_t payloadSize, void* userData) { + /* Not implemented*/ + (void) userData; if ((nullptr != payload) && (sizeof(RemoteCtrlState::CmdId) == payloadSize)) { RemoteCtrlState::CmdId cmdId = *reinterpret_cast(payload); @@ -207,9 +210,12 @@ 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. */ -static void App_motorSpeedsChannelCallback(const uint8_t* payload, const uint8_t payloadSize) +static void App_motorSpeedsChannelCallback(const uint8_t* payload, const uint8_t payloadSize, void* userData) { + /* Not implemented*/ + (void) userData; if ((nullptr != payload) && (SPEED_SETPOINT_CHANNEL_DLC == payloadSize) && (true == gIsRemoteCtrlActive)) { const SpeedData* motorSpeedData = reinterpret_cast(payload); diff --git a/lib/APPRemoteControl/library.json b/lib/APPRemoteControl/library.json index 8bcd7d27..490e3052 100644 --- a/lib/APPRemoteControl/library.json +++ b/lib/APPRemoteControl/library.json @@ -21,7 +21,7 @@ { "owner": "gabryelreyes", "name": "SerialMuxProt", - "version": "^1.0.0" + "version": "^2.0.0" } ], "frameworks": "*", diff --git a/lib/APPSensorFusion/library.json b/lib/APPSensorFusion/library.json index 7af62587..41865f20 100644 --- a/lib/APPSensorFusion/library.json +++ b/lib/APPSensorFusion/library.json @@ -1,19 +1,29 @@ { - "name": "SensorFusion", + "name": "APPSensorFusion", "version": "0.1.0", - "description": "SensorFusion application", - "authors": [{ - "name": "Juliane Kerpe", - "email": "juliane.kerpe@web.de", - "url": "https://github.com/jkerpe", - "maintainer": true - }], + "description": "Sensor Fusion application", + "authors": [ + { + "name": "Juliane Kerpe", + "email": "juliane.kerpe@web.de", + "url": "https://github.com/jkerpe", + "maintainer": true + } + ], "license": "MIT", - "dependencies": [{ - "name": "Service" - }, { - "name": "HALInterfaces" - }], + "dependencies": [ + { + "name": "Service" + }, + { + "name": "HALInterfaces" + }, + { + "owner": "gabryelreyes", + "name": "SerialMuxProt", + "version": "^2.0.0" + } + ], "frameworks": "*", "platforms": "*" }