[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Paparazzi-devel] lisa m and ppm input

From: Felix Ruess
Subject: Re: [Paparazzi-devel] lisa m and ppm input
Date: Fri, 5 Oct 2012 16:03:33 +0200

Hi Gerard,

no worries..
You basically got it right. It depends if it is a fix for a stable branch or a bigger new feature.
In general you should make a new clean branch based on the one you want your work to be merged into.

E.g. for a fix which should be merged to the stable v4.0 branch:
- make a new branch based on the upstream branch you want it merged into later:
  git checkout -b <fix_foo> <upstream_remote>/v4.0
- hack away and commit (or cherry-pick if you have already existing fixes somewhere else)
  git add <fixed files>
  git commit
- push the branch to your own repository:
  git push <personal_remote>  <fix_foo>
- make a pull request on github

For smaller immediately applicable features you can just replace v4.0 by v4.1 above and make a pull request for that preparation branch.

Otherwise substantial new work should normally be done in a feature branch based on the development branch (master).

Cheers, Felix

On Fri, Oct 5, 2012 at 3:48 PM, Gerard Toonstra <address@hidden> wrote:
Hi Felix,

Allright. As said, I'm still learning this git thing, I have much more experience with subversion and other more server-based systems.

I made a pull request from v4.0 first, but then noticed it had 180 commits on it or so, probably related to a pull from tudelft on my local branch.

What would be the correct set of branches/methods for creating pull requests that are destined for paparazzi upstream, ideally in a set of commands?
Something like:

- git checkout paparazzi v4.0
-  ( git clean -f  ? )
- git branch <new_work>
- git commit
- git push <personal_remote>  <new_work>

[ create pull request on github from there] ?



On Fri, Oct 5, 2012 at 10:28 AM, Felix Ruess <address@hidden> wrote:
Hi Gerard,

thanks a lot!
In master we completely switched from the proprietary/restricted lib from STM to libopencm3, it's organized a bit differently there..

I integrated it into the v4.1 preparation branch (see other email).
Also it would be appreciated if you make pull requests for the main paparazzi repository (unless it is something specific for TU Delft only).

Cheers, Felix

On Fri, Oct 5, 2012 at 9:19 AM, Gerard Toonstra <address@hidden> wrote:

I've put together some code with the improvements that you suggested. I made it such that it's configurable in the airframe file on either
servo pin 6 or uart1.

I'm also pretty new to git, so hope I did this correctly. A pull request was made to tudelft4.0, where I get my changes from. However, I noticed
in master that the vector table is no longer there.



On Fri, Oct 5, 2012 at 2:53 AM, Cédric Marzer (MRSA) <address@hidden> wrote:

Well I think it won’t be necessary. I tried Esden’s commit to use uart1 rx pin and it seems to work very well.

I would suggest that it should be modified on the next stable release but I am no git it might be better if someone else makes what is necessary.



De : paparazzi-devel-bounces+cedric.marzer=address@hidden [mailto:paparazzi-devel-bounces+cedric.marzer=address@hidden] De la part de Sergey Krukowski
Envoyé : jeudi 4 octobre 2012 16:20

À : address@hidden
Objet : Re: [Paparazzi-devel] lisa m and ppm input


If you would be satisfied with a PPM input on a JTAG connector, you can replace the following strings:


GPIO_InitStructure.GPIO_Pin = GPIO_Pin_1;

GPIO_Init(GPIOA, &GPIO_InitStructure);


by the following strings:


GPIO_PinRemapConfig(GPIO_PartialRemap1_TIM2, ENABLE);

GPIO_InitStructure.GPIO_Pin = GPIO_Pin_3;

GPIO_Init(GPIOB, &GPIO_InitStructure);


in ppm_arch_init function in ppm_arch.c file. Then you will have the ppm input on JTAG_TDO pin.




Paparazzi-devel mailing list

Paparazzi-devel mailing list

Paparazzi-devel mailing list

Gerard Toonstra

Paparazzi-devel mailing list

reply via email to

[Prev in Thread] Current Thread [Next in Thread]