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.

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

addition to system identification modules #2810

Merged
merged 3 commits into from
Jan 20, 2022

Conversation

Rollervi97
Copy link
Contributor

Fixed issue on chirp input (integration of chirp signal when noise was not present). Modification of chirp input telemetry message structure (now it includes also the current chirp input value). Addition of two new system identification input signal: doublet and wave.


#include "sys_id_chirp.h"
#include "pprz_chirp.h"

#include "modules/datalink/telemetry.h"
#include "subsystems/datalink/telemetry.h"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there is no subsystems folder anymore on master branch

#ifndef CHIRP_EXPONENTIAL
#define CHIRP_EXPONENTIAL TRUE
#endif
// #ifndef CHIRP_EXPONENTIAL

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove if not used anymore

#include "sys_id_doublet.h"
#include "pprz_doublet.h"

#include "subsystems/datalink/telemetry.h"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change path to modules

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#include "subsystems/datalink/telemetry.h"
#include "modules/datalink/telemetry.h"

sw/airborne/modules/system_identification/sys_id_doublet.h Outdated Show resolved Hide resolved

#include "sys_id_wave.h"

#include "subsystems/datalink/telemetry.h"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change path to modules

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#include "subsystems/datalink/telemetry.h"
#include "modules/datalink/telemetry.h"

sw/airborne/modules/system_identification/sys_id_wave.h Outdated Show resolved Hide resolved
sw/airborne/modules/system_identification/sys_id_chirp.c Outdated Show resolved Hide resolved
sw/airborne/modules/system_identification/pprz_wave.h Outdated Show resolved Hide resolved
sw/airborne/modules/system_identification/pprz_doublet.h Outdated Show resolved Hide resolved
sw/airborne/modules/system_identification/pprz_doublet.c Outdated Show resolved Hide resolved
@gautierhattenberger gautierhattenberger added Airborne Enhancement Improve upon exiting functionality labels Dec 14, 2021
@gautierhattenberger
Copy link
Member

@Rollervi97 it is almost ready to merge, you still need to update the modules path that have changed in latest master branch

@@ -28,15 +28,15 @@
#include "sys_id_chirp.h"
#include "pprz_chirp.h"

#include "modules/datalink/telemetry.h"
#include "subsystems/datalink/telemetry.h"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#include "subsystems/datalink/telemetry.h"
#include "modules/datalink/telemetry.h"


#ifndef SYS_ID_WAVE_H
#define SYS_ID_WAVE_H
#endif // SYS_ID_WAVE_H
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be a the end of the header

@gautierhattenberger gautierhattenberger added this to the v6.1 milestone Jan 3, 2022
@gautierhattenberger
Copy link
Member

@Rollervi97 update ?

@Rollervi97
Copy link
Contributor Author

Sorry for the late reply, in this third push there should be all the modification requested.

@gautierhattenberger gautierhattenberger merged commit 02a9757 into paparazzi:master Jan 20, 2022
FlorianSan pushed a commit to enacuavlab/paparazzi that referenced this pull request May 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Airborne Enhancement Improve upon exiting functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants