Skip to content

Commit 7fb7669

Browse files
author
Tobias Haeckel
committed
Applied Changes from PR
1 parent 874384f commit 7fb7669

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

‎lib/APPLineFollowerSensorFusion/src/App.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -286,12 +286,12 @@ void App::SSRTopicCallback(const String& payload)
286286
}
287287
else
288288
{
289-
JsonVariantConst xPos_mm = jsonPayload["positionX"]; // int : in mm
290-
JsonVariantConst yPos_mm = jsonPayload["positionY"]; // int : in mm
291-
JsonVariantConst xVel_mms = jsonPayload["speedX"]; // int : in mm/s
292-
JsonVariantConst yVel_mms = jsonPayload["speedY"]; // int : in mm/s
293-
JsonVariantConst angle_mrad = jsonPayload["angle"]; // int : in mrad
294-
JsonVariantConst id = jsonPayload["identifier"]; // int : unique id of the target
289+
JsonVariantConst xPos_mm = jsonPayload["positionX"]; /* int : in mm */
290+
JsonVariantConst yPos_mm = jsonPayload["positionY"]; /* int : in mm */
291+
JsonVariantConst xVel_mms = jsonPayload["speedX"]; /* int : in mm/s */
292+
JsonVariantConst yVel_mms = jsonPayload["speedY"]; /* int : in mm/s */
293+
JsonVariantConst angle_mrad = jsonPayload["angle"]; /* int : in mrad */
294+
JsonVariantConst id = jsonPayload["identifier"]; /* int : unique id of the target */
295295
LOG_INFO("SSR pose: xPos=%dmm yPos=%dmm angle=%dmrad vx=%dmm/s vy=%dmm/s", xPos_mm, yPos_mm, angle_mrad,
296296
xVel_mms, yVel_mms);
297297
}

‎lib/APPLineFollowerSensorFusion/src/App.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ class App
157157
*
158158
* @param[in] payload The topic payload.
159159
*/
160-
void SSRTopicCallback(const String& payload);
160+
void ssrTopicCallback(const String& payload);
161161

162162
/**
163163
* Copy construction of an instance.

‎scripts/webots_launcher.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
ROBOT_SERIAL_TX_CHANNEL = env.GetProjectOption("webots_robot_serial_tx_channel") # pylint: disable=undefined-variable
4646

4747
PROGRAM_PATH = "$BUILD_DIR/"
48-
PROGRAM_OPTIONS = '--cfgFilePath "../../../data/config/config_zumo1.json" ' \
48+
PROGRAM_OPTIONS = '--cfgFilePath "../../../data/config/config.json" ' \
4949
+ '--serialRxCh ' + ROBOT_SERIAL_RX_CHANNEL + ' ' \
5050
+ '--serialTxCh ' + ROBOT_SERIAL_TX_CHANNEL + ' ' \
5151
+ '-v'

0 commit comments

Comments
 (0)