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

Dual dual pwm #1102

Closed
wants to merge 8 commits into from
Closed

Dual dual pwm #1102

wants to merge 8 commits into from

Conversation

dewagter
Copy link
Member

developments that should eventually make it to master...

@@ -153,13 +154,13 @@ void dual_pwm_isr(void)
if (num_pulse == 1) {

set_dual_pwm_timer_s_period(ratio_16ms);
set_dual_pwm_timer_s_oc(actuators_dualpwm_values[FIRST_DUAL_PWM_SERVO]);
set_dual_pwm_timer_s_oc(actuators_dualpwm_values[2],actuators_dualpwm_values[4]);
Copy link
Member

Choose a reason for hiding this comment

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

Seems to be hardcoded now... probably not what we want...
If you really want to keep it hardcoded, at least remove the FIRST_DUAL_PWM_SERVO and SECOND_DUAL_PWM_SERVO defines...

@dewagter
Copy link
Member Author

changed FIRST_DUAL_PWM_SERVO to DUAL_PWM_SERVO_5_P1 and DUAL_PWM_SERVO_5_P2

This should better indicate that the dualpwm pulse comes out of lisa-s servo marked servo5

Unfortunately it is currently not possible to put this defines for servo channels in your airframe file: see #1108

So one should lookup in 'lisa-s.h' that index 0 and 1 pulses come out of servo5 and index 2 and 3 pulses come out of servo6

@@ -0,0 +1,276 @@
<!-- this is a LadyBird quadrotor frame equiped with Lisa/S 1.0 -->
Copy link
Member

Choose a reason for hiding this comment

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

guess it would make sense to provide proper description here (at least remove the ladybird stuff that is not correct)

@flixr
Copy link
Member

flixr commented Feb 14, 2015

What about the FIRST_DUAL_PWM_SERVO defines for LisaM?

@dewagter
Copy link
Member Author

FIRST_DUAL_PWM_SERVO defines were removed. They do not fit in the airframe.xml either and they are non-descriptive. Use DUAL_PWM_SERVO5_P1 en P2 instead.

@flixr
Copy link
Member

flixr commented Feb 15, 2015

I meant the lisa_m_common.h file which still has the old defines...

@dewagter
Copy link
Member Author

Does anybody know where the FIRST_DUAL_PWM_SERVO defines were ever used?

@flixr
Copy link
Member

flixr commented Feb 16, 2015

Seems they were added with #678, no idea if they were actually ever used on LisaM...

@flixr
Copy link
Member

flixr commented Feb 16, 2015

Could you plz update the description in DelFlyDualPWMservo.xml, otherwise it looks good to merge to me...

@flixr flixr closed this in f29b2b4 Feb 16, 2015
@flixr flixr deleted the dual_dual_pwm branch February 16, 2015 22:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants