Re: [Paparazzi-devel] YNT: roll_trim

[Felix Ruess]

Hi Refik,

you have several options...

In general I would recommend to work on your own branch (commit your change there) and merge the paparazzi master branch into your working branch.

Create your own master branch to work on:

  $ git chekout -b master_refik

commit your changes:

  $ git add <changed files>

  $ git commit

or commit all changes files in one go

  $ git commit -am"commit message"

fetch the latest version from paparazzi repo (actually just update all remotes):

  $ git remote update

merge in the paprazzi master branch:

  $ git merge upstream/master

(adjust the name of the upstream paparazzi remote as needed

There are of course other ways to do this, but this is mostly a matter of personal preference...

If these are only small changes and not likely to conflict, you might want to rebase them on top of upstream master instead of merging master in:

git rebase upstream/master

Cheers, Felix

P.S. I would suggest to read up on some git basics ;-)

On Thu, Aug 22, 2013 at 4:19 PM, Refik Sever <address@hidden> wrote:

Hi Felix,

I have a simple question.
We have changed some files in 5.1_devel-126-g1757e2e-dirty branch (common_nav.c etc.). What do I need to type to get  v5.1_devel-148-ga18a74f without affecting our changed files?

Regards,
Refik

---

Kimden: Felix Ruess [address@hidden] adına paparazzi-devel-bounces+refiksever=address@hidden [paparazzi-devel-bounces+refiksever=address@hidden]
Gönderildi: 22 Ağustos 2013 Perşembe 15:49
Kime: Paparazzi devel list
Konu: Re: [Paparazzi-devel] roll_trim

Hi Refik,

Thanks for noticing and reporting this!

Seems the trim commands were not properly initialized.

The values set in the airframe file were directly written to command_x_trim in fbw, only to be overwritten later from the ap_state->command_x_trim values (which are not explicitly initialzed and hence zero). So when you change the trim commands in settings, only then they are actually applied.

Now the command_x_trim values are initialized in ap_state instead of fbw (and the yaw trim is also set from the airframe file, which was apparently missing before).

Should be fixed in v5.1_devel-148-ga18a74f

Please test and report back.

Thanks, Felix

On Thu, Aug 22, 2013 at 2:19 PM, Refik Sever <address@hidden> wrote:

Hello,

I set the roll trim and pitch trim in the airframe file like that:

     <define name="COMMAND_PITCH_TRIM" value="350"/>
      <define name="COMMAND_ROLL_TRIM" value="900"/>

I put the plane on a flat table and powered on. Then I set the roll trim from GCS which is same with airframe (900), then the ailerons move. Same situation for pitch trim. Since the setting value is same, I don't expext them to move. Our paparazzi version is v5.1_devel-126-g1757e2e-dirty.

We are using energy control loops, which updates the aircraft characteristics below. Although there is no variable about roll, can this situation be due to this?

By the way, we want to add the ac_characteristics to the telemetry. Did somebody add it before?

// Automatically found airplane characteristics

160 

161 float ac_char_climb_pitch = 0.0f;

162 float ac_char_climb_max = 0.0f;

163 int ac_char_climb_count = 0;

164 float ac_char_descend_pitch = 0.0f;

165 float ac_char_descend_max = 0.0f;

166 int ac_char_descend_count = 0;

167 float ac_char_cruise_throttle = 0.0f;

168 float ac_char_cruise_pitch = 0.0f;

169 int ac_char_cruise_count = 0;

Regards,
Refik

_______________________________________________
Paparazzi-devel mailing list
address@hidden
https://lists.nongnu.org/mailman/listinfo/paparazzi-devel

_______________________________________________
Paparazzi-devel mailing list
address@hidden
https://lists.nongnu.org/mailman/listinfo/paparazzi-devel