-
Notifications
You must be signed in to change notification settings - Fork 18.1k
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
AP_Notify: Rework to allow selecting different devices at runtime take 2 #6092
AP_Notify: Rework to allow selecting different devices at runtime take 2 #6092
Conversation
libraries/AP_Notify/AP_Notify.h
Outdated
#ifndef AP_NOTIFY_OREOLED | ||
#define AP_NOTIFY_OREOLED 0 | ||
#endif | ||
//#ifndef AP_NOTIFY_OREOLED |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please remove commented code
libraries/AP_Notify/OreoLED_PX4.cpp
Outdated
@@ -59,6 +59,7 @@ extern "C" int oreoled_main(int, char **); | |||
// init - initialised the device | |||
bool OreoLED_PX4::init() | |||
{ | |||
/* This code is breaking master when the OreoLeds are enabled in PX4-V2 so I guesss no one uses it and its not needed? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please remove commented code
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can't delete this code as it is needed for the OreoLEDs to work, but its breaking the px4_v2 compile so I need a little feedback from Tridge or Randy as to how to handle this.
42d300b
to
5791679
Compare
I haven't yet reviewed this properly but some points:
|
ToneAlarm does seem like it can be merged, so I can work on that, I have removed the unnecessary pointers. |
@jmachuca77 For the parameter, just look at what is done in other libraries (the AP_InertialSensor is probably the best one). |
I've tested this on the Solo and it's working great, thank you. That said, I agree with @OXINARF that it is probably time to put the multitude of tone alarms together. Operationally, there is no reason the Solo a drastically different set of tones. In fact I don't think it needs anything different at all. I will take a look at them and see what the differences are and if they're necessary. |
…ted against compile errors on all boards, and resolved a linker error with px4_v2 and OreoLED_PX4.cpp
…mpile issues with px4_v2
5791679
to
8743da2
Compare
Would like to discuss this on the 5/15 dev call. Especially if @jmachuca77 is available on the call.
|
Replaced by #6340 |
This removes the #defines used at compile time and instead populates the _devices array at runtime based on parameter NTF_BRD_TYPE.
Parameter BRD_TYPE from AP_BoardConfig cannot be used as it is not available on all boards and does not have all boards available.(excluded on Linux Builds)
This is related to issue #5989, and #5986