Skip to content
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

Jump to bottom

autogen log and param fixes #1371

Merged
merged 2 commits into from
Apr 24, 2024
Merged

autogen log and param fixes #1371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37fbdcd
remove defines of twr - standard is 8 now
knmcguire Apr 24, 2024
d358f59
add doxygen ignore line conditions
knmcguire Apr 24, 2024
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
5 changes: 0 additions & 5 deletions src/deck/drivers/interface/lpsTwrTag.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,7 @@
#define LPS_TWR_LPP_PAYLOAD 4

#define LPS_TWR_SEND_LPP_PAYLOAD 1

#ifdef LOCODECK_NR_OF_ANCHORS
#define LOCODECK_NR_OF_TWR_ANCHORS LOCODECK_NR_OF_ANCHORS
#else
#define LOCODECK_NR_OF_TWR_ANCHORS 8
#endif

extern uwbAlgorithm_t uwbTwrTagAlgorithm;

Expand Down
64 changes: 24 additions & 40 deletions src/deck/drivers/src/lpsTwrTag.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,84 +619,68 @@ LOG_GROUP_STOP(twr)
* Log group for distances (ranges) to anchors aquired by Two Way Ranging (TWR)
*/
LOG_GROUP_START(ranging)
#if (LOCODECK_NR_OF_TWR_ANCHORS > 0)
/**
* @brief Distance to anchor 0 [m]
*/
LOG_ADD(LOG_FLOAT, distance0, &state.distance[0])
#endif

#if (LOCODECK_NR_OF_TWR_ANCHORS > 1)
/**
* @brief Distance to anchor 1 [m]
*/
LOG_ADD(LOG_FLOAT, distance1, &state.distance[1])
#endif

#if (LOCODECK_NR_OF_TWR_ANCHORS > 2)
/**
* @brief Distance to anchor 2 [m]
*/
LOG_ADD(LOG_FLOAT, distance2, &state.distance[2])
#endif

#if (LOCODECK_NR_OF_TWR_ANCHORS > 3)
/**
* @brief Distance to anchor 3 [m]
*/
LOG_ADD(LOG_FLOAT, distance3, &state.distance[3])
#endif

#if (LOCODECK_NR_OF_TWR_ANCHORS > 4)
/**
* @brief Distance to anchor 4 [m]
*/
LOG_ADD(LOG_FLOAT, distance4, &state.distance[4])
#endif

#if (LOCODECK_NR_OF_TWR_ANCHORS > 5)
/**
* @brief Distance to anchor 5 [m]
*/
LOG_ADD(LOG_FLOAT, distance5, &state.distance[5])
#endif

#if (LOCODECK_NR_OF_TWR_ANCHORS > 6)
/**
* @brief Distance to anchor 6 [m]
*/
LOG_ADD(LOG_FLOAT, distance6, &state.distance[6])
#endif

#if (LOCODECK_NR_OF_TWR_ANCHORS > 7)
/**
* @brief Distance to anchor 7 [m]
*/
LOG_ADD(LOG_FLOAT, distance7, &state.distance[7])
#endif

#if (LOCODECK_NR_OF_TWR_ANCHORS > 0)
/**
* @brief ASL of anchor 0 [m]
*/
LOG_ADD(LOG_FLOAT, pressure0, &state.pressures[0])
#endif
#if (LOCODECK_NR_OF_TWR_ANCHORS > 1)
/**
* @brief ASL of anchor 1 [m]
*/
LOG_ADD(LOG_FLOAT, pressure1, &state.pressures[1])
#endif
#if (LOCODECK_NR_OF_TWR_ANCHORS > 2)
/**
* @brief ASL of anchor 2 [m]
*/
LOG_ADD(LOG_FLOAT, pressure2, &state.pressures[2])
#endif
#if (LOCODECK_NR_OF_TWR_ANCHORS > 3)
/**
* @brief ASL of anchor 3 [m]
*/
LOG_ADD(LOG_FLOAT, pressure3, &state.pressures[3])
#endif
#if (LOCODECK_NR_OF_TWR_ANCHORS > 4)
/**
* @brief ASL of anchor 4 [m]
*/
LOG_ADD(LOG_FLOAT, pressure4, &state.pressures[4])
#endif
#if (LOCODECK_NR_OF_TWR_ANCHORS > 5)
/**
* @brief ASL of anchor 5 [m]
*/
LOG_ADD(LOG_FLOAT, pressure5, &state.pressures[5])
#endif
#if (LOCODECK_NR_OF_TWR_ANCHORS > 6)
/**
* @brief ASL of anchor 6 [m]
*/
LOG_ADD(LOG_FLOAT, pressure6, &state.pressures[6])
#endif
#if (LOCODECK_NR_OF_TWR_ANCHORS > 7)
/**
* @brief ASL of anchor 7 [m]
*/
LOG_ADD(LOG_FLOAT, pressure7, &state.pressures[7])
#endif
LOG_GROUP_STOP(ranging)
7 changes: 5 additions & 2 deletions src/modules/src/collision_avoidance.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,10 @@ void collisionAvoidanceUpdateSetpointCore(
// Everything below this comment will only be compiled in a firware build made
// with the standard Makefile. Everything depending on FreeRTOS, ARM, params,
// etc. must go here.
//
#ifdef CRAZYFLIE_FW
// \\cond

#ifdef CRAZYFLIE_FW
// \endcond
#include "FreeRTOS.h"
#include "task.h"

Expand Down Expand Up @@ -427,4 +428,6 @@ PARAM_GROUP_START(colAv)
PARAM_ADD(PARAM_INT32, vorIters, &params.voronoiProjectionMaxIters)
PARAM_GROUP_STOP(colAv)

// \\cond
#endif // CRAZYFLIE_FW
// \\endcond
Loading