Closed simonjwright closed 6 years ago
Hi @simonjwright
Thanks for you patch, do you mind trying to apply this on my changes in #20 ?
@Fabien-Chouteau, it applied cleanly. Do you need me to do anything else?
Can you rebase on the AdaCore:ravenscar-cf-stable
branch? We just merged the changes from #20.
I hope I’ve done the right thing. I had to do
git checkout adacore # your ravenscar-cf-stable
git pull
git checkout ce-compatibility
git rebase adacore
git pull --rebase # scary
git push
Hi Simon,
It's not right because your commit is below the commits of our branch.
Try the following:
git pull --rebase https://github.com/AdaCore/Certyflie ravenscar-cf-stable
git push
No;
$ git push
To github.com:simonjwright/Certyflie.git
! [rejected] ce-compatibility -> ce-compatibility (non-fast-forward)
error: failed to push some refs to 'git@github.com:simonjwright/Certyflie.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
I don’t really see what the problem was with my first request, since it cherry-picked OK on top of your updated branch, and Github says it can be merged automatically. I’ve force-reset my branch to its original state; if that’s really not enough I’ll close this request and start a new one (from the top of your current branch, of course)
Thanks @simonjwright !
OK!
CE 2018 (and GCC 8) now reports a 'use type' which has no effect. CE 2018 has changed the definition of Interfaces.C.Extensions.bool incompatibly.
crazyflie_support/src/log.adb (Create_Log_Group): Remove ineffective 'use type'. (Append_Log_Variable_To_Group): Likewise. (Log_Append_To_Block): Likewise.
src/free_fall.ads (context): remove Interfaces.C.Extensions. Don't 'use' Interfaces.C. (In_Recovery): now Boolean.
src/free_fall.adb: changed all uses of In_Recovery to be Boolean- compatible.