1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00

3714 Commits

Author SHA1 Message Date
sambas
01df38008f Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
Conflicts:
	flight/Libraries/sanitycheck.c
	flight/Modules/System/systemmod.c
2013-04-20 21:25:22 +03:00
Alessio Morale
8011a9476d OP-886 fixed a bug caused by wrong check for xSemaphoreTakeRecursive return code
Conflicts:
	flight/Libraries/alarms.c
2013-04-20 17:17:55 +02:00
sambas
074b391cc0 spring cleaning 2013-04-20 18:07:19 +03:00
Alessio Morale
dd37c31a07 OP-886 Fixes to styles, used enum for ExtendedAlarmStatus
Conflicts:
	flight/Libraries/inc/sanitycheck.h
	shared/uavobjectdefinition/systemalarms.xml
2013-04-20 16:33:38 +02:00
sambas
3512e7a657 Fix allowed frametypes 2013-04-20 15:09:24 +03:00
sambas
8aa5748a8c Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext 2013-04-20 10:59:00 +03:00
Oleg Semyonov
220b4b5042 OP-886: use enum for extended alarm status field
See also:
    http://reviews.openpilot.org/cru/OPReview-430
    http://progress.openpilot.org/browse/OP-915
2013-04-20 02:10:40 +03:00
Oleg Semyonov
343a4b9015 OP-886: cosmetic style and spacing fixes 2013-04-20 00:56:45 +03:00
Oleg Semyonov
cb068f507b Merge remote-tracking branch 'origin/next' into amorale/OP-886_sanitychecks 2013-04-19 23:43:42 +02:00
Oleg Semyonov
491e89b165 make: sort wildcard sources to make binaries identical on all platforms
Thanks to Amedee for finding the cause of the difference and CorvusCorax
for participating in the discussion.
2013-04-19 20:43:31 +02:00
Oleg Semyonov
efeb7c4890 Merge remote-tracking branch 'origin/cyr/yawzero' into next 2013-04-19 15:30:57 +03:00
sambas
36d6c01864 proper floats + formatter 2013-04-17 21:23:49 +03:00
sambas
a40f8f5ebd Bytes!! enable RM CPU temp 2013-04-17 17:29:08 +03:00
sambas
78127ae817 Fix flashsize address, ran thru formatter 2013-04-16 16:50:41 +03:00
sambas
ab8ab4bcc6 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext 2013-04-15 17:41:06 +03:00
Oleg Semyonov
3b3377e6f4 Merge remote-tracking branch 'origin/os/friendly-toolchain-install' into next 2013-04-15 01:24:42 +02:00
sambas
388489226d typo fix, fix EE_BANK usage 2013-04-14 13:08:09 +03:00
sambas
0c13fbbee6 flashsettings and WDG for osd, revert the uavobjectmanager revert. 2013-04-14 12:43:37 +03:00
sambas
bb4aa08a15 Merge remote-tracking branch 'origin/sambas/diffnext' into amorale/osd_settings_on_flash 2013-04-14 12:32:26 +03:00
sambas
589290dbd7 POI orbit + some code run thru code formatter 2013-04-14 12:23:47 +03:00
sambas
6989468d17 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
Conflicts:
	.gitignore
2013-04-14 10:13:51 +03:00
Oleg Semyonov
afbb11f43e Fix 'variable not used' warning. Still needs to be reworked for timing 2013-04-14 02:11:23 +02:00
Oleg Semyonov
03a4ca545f Remove stray '}' in a makefile 2013-04-12 11:51:18 +02:00
Oleg Semyonov
8ab580ae82 Remove stray '}' in a makefile 2013-04-12 12:50:12 +03:00
Oleg Semyonov
34b15fedaf OP-719: make python_install (Windows) 2013-04-12 10:56:10 +02:00
Oleg Semyonov
bc4d25242f makefile: use the same coding style for all make variables 2013-04-12 10:55:23 +02:00
Brian Webb
28bfc2725c Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS 2013-04-11 14:42:49 +01:00
sambas
24f1362cfe Merge remote-tracking branch 'origin/next' into sambas/diffnext 2013-04-07 18:21:59 +03:00
Brian Webb
e27be3f594 Removed code for per message channel hop. 2013-04-07 15:59:31 +01:00
sambas
e87d7f2202 Merge branch 'sambas/diffnext' of ssh://git.openpilot.org/OpenPilot into sambas/diffnext 2013-04-07 14:57:21 +03:00
sambas
fb8273459f Normalize line endings 2013-04-07 09:49:13 +03:00
Brian Webb
90b0987e43 Fixed setting max Tx power on Revo. 2013-04-07 02:17:09 +01:00
Brian Webb
95c150213a Don't send GCSReceiver when using OPLink receiver (on Revo). 2013-04-06 17:57:16 +01:00
Brian Webb
d36cf828bc RFM22B: Don't send a connection request from a non-coordinator. 2013-04-06 16:35:12 +01:00
Brian Webb
4564718708 Added setting of max RF power and initial frequency on Revo. 2013-04-06 04:28:25 +01:00
Brian Webb
fef2c16f5a RFM22B: Changed the connection process. Now the coordinator waits to receive a status packet from a modem that it is bound to before it sends the connection request. 2013-04-06 02:25:59 +01:00
Brian Webb
948038f655 Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS 2013-04-06 01:32:36 +01:00
Brian Webb
c330db3a28 Added setting of min/max frequencies on OPLink coordinator. 2013-04-06 01:32:15 +01:00
Oleg Semyonov
5bb6b56b4a OP-772: Normalize line endings 2013-04-05 23:46:56 +03:00
Oleg Semyonov
3bebec22f7 OP-772: Enforce line ending agreements (git 1.7.2+ required for this to work)
This is a part of OP-726, OP-727 tasks to normalize source code.
Use the following to normalise your local repository to be able to merge:

git rm --cached -r .
git diff --cached --name-only -z | xargs -0 git add
git commit -m "Normalise line endings"
git ls-files -z | xargs -0 rm
git checkout .
2013-04-05 23:43:58 +03:00
Alessio Morale
f30692836a OP-886 Fixes to styles
+review OPReview-430
2013-04-04 20:11:57 +02:00
Oleg Semyonov
de4ca359dd Merge remote-tracking branch 'origin/os/OP-719_arm-sdk-update' into next 2013-04-04 12:09:33 +02:00
Alessio Morale
13dd1178a8 OP-886 Fixes to styles: testing style settings for Eclipse
+review OPReview-430
2013-04-03 19:26:25 +02:00
Brian Webb
61712be03d Added 57600 kbps air datarate mode, and added setting of registers 69 and 58. 2013-04-03 02:05:51 +01:00
sambas
47a7659147 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext 2013-04-02 20:40:41 +03:00
sambas
d776d82518 Does this fix simposix and make bamboo happy 2013-04-02 19:57:40 +03:00
Alessio Morale
23c0c3585c OP-886 Fixes to styles and includes
+review OPReview-430
2013-04-01 16:41:12 +02:00
Brian Webb
4778a12070 Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS 2013-04-01 14:30:46 +01:00
Alessio Morale
9264c8b4e2 Merge remote-tracking branch 'origin/amorale/OP-881_flashautodetect' into next 2013-03-31 18:06:52 +02:00
Brian Webb
538d854627 Changed test for GCSRECEIVER in OPLink to PIOS_INCLUDE_GCSRCVR to match new define in pios_config. 2013-03-31 16:37:14 +01:00